 =
|
ab2abc7c2e
|
Merge remote-tracking branch 'CMS/develop' into develop
|
2020-06-24 11:26:08 +02:00 |
|
|
=
|
8ac729f9bf
|
Merge remote-tracking branch 'refs/remotes/teamdev/develop'
Conflicts:
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
|
2020-06-24 11:25:37 +02:00 |
|
|
=
|
6cabb05270
|
fix produzione e selezione riscaldi
|
2020-06-24 11:23:55 +02:00 |
|
|
Samuele Locatelli
|
9515269f39
|
Fix contention on ncAdapter (high level) maybe?
|
2020-06-23 18:46:49 +02:00 |
|
|
Samuele Locatelli
|
821f91b318
|
Merge branch 'feature/check/alarms' into cleanup
|
2020-06-23 18:22:38 +02:00 |
|
|
Samuele Locatelli
|
6c96d8f259
|
update vers number
|
2020-06-23 18:18:17 +02:00 |
|
|
Samuele Locatelli
|
ed946dcd33
|
forced visible for status bit on recipe parameters
|
2020-06-23 18:18:07 +02:00 |
|
|
Samuele Locatelli
|
684ccab8a0
|
Fix path for Active CLient in Release
|
2020-06-23 18:17:44 +02:00 |
|
|
Samuele Locatelli
|
d88f3f3d47
|
Prod controller: single NC object + fix naming prod/prod
|
2020-06-23 18:17:27 +02:00 |
|
|
Samuele Locatelli
|
ce02165197
|
Warmers controller: single NC object
|
2020-06-23 18:17:12 +02:00 |
|
|
Samuele Locatelli
|
e53f233f42
|
Recipe controller: single NC object
|
2020-06-23 18:17:04 +02:00 |
|
|
Alessio
|
6789f9162b
|
fix gantt component
|
2020-06-23 16:44:11 +02:00 |
|
|
Samuele Locatelli
|
aa78101506
|
change config prod x vue.js UI
|
2020-06-23 16:09:18 +02:00 |
|
|
Samuele Locatelli
|
fe4f91d4ae
|
only siemens HMI doesn't really disconnect
|
2020-06-23 15:08:13 +02:00 |
|
|
Samuele Locatelli
|
fcc404f048
|
fix connect return value
|
2020-06-23 15:07:30 +02:00 |
|
|
Alessio
|
aefad3422c
|
fix component for the gantt graphic
|
2020-06-22 17:08:39 +02:00 |
|
|
Alessio
|
04f67ac97c
|
fix component for the gantt graphic
|
2020-06-22 17:00:39 +02:00 |
|
|
Alessio
|
9eefbe43cc
|
fix processo modal
|
2020-06-22 15:50:43 +02:00 |
|
|
Samuele Locatelli
|
c5bb2f5658
|
Merge branch 'feature/check/alarms' into develop
|
2020-06-22 15:22:44 +02:00 |
|
|
Samuele Locatelli
|
7424af263f
|
Server: with Paolo Possanzini for fixing stsatic json/ttf
|
2020-06-22 15:22:09 +02:00 |
|
|
Alessio
|
8e5d1f82cb
|
add component for the gantt graphic
|
2020-06-22 15:14:31 +02:00 |
|
|
Samuele Locatelli
|
3bd3c5e516
|
change on wwwroot data for ActiveClient
|
2020-06-22 14:20:42 +02:00 |
|
|
Samuele Locatelli
|
f6182aa622
|
fix path for active client & prettybin
|
2020-06-22 13:19:58 +02:00 |
|
|
Samuele Locatelli
|
d7590f46fe
|
developer mode for testing client
|
2020-06-22 13:19:13 +02:00 |
|
|
Samuele Locatelli
|
ed8f87c6d3
|
Pretty bin for active client!
|
2020-06-22 13:19:01 +02:00 |
|
|
Alessio
|
d315eaeca2
|
fix clock
|
2020-06-22 11:48:17 +02:00 |
|
|
Alessio
|
ee4356105a
|
fix preriscaldo dashboard
|
2020-06-22 11:19:42 +02:00 |
|
|
Alessio
|
e921177b38
|
fix preriscaldo dashboard
|
2020-06-22 11:11:15 +02:00 |
|
|
Alessio
|
a133b5d49a
|
fix preriscaldo dashboard
|
2020-06-22 10:53:08 +02:00 |
|
|
Alessio
|
de271c10af
|
fix point 7 and 12
|
2020-06-22 10:20:18 +02:00 |
|
|
Samuele Locatelli
|
a82fc98348
|
Merge branch 'cleanup' into develop
|
2020-06-19 19:28:22 +02:00 |
|
|
Samuele Locatelli
|
5b2841c01b
|
Executed code-cleanup on solution
|
2020-06-19 19:28:07 +02:00 |
|
|
Samuele Locatelli
|
5d3edf46c6
|
Refactoring: MODELS
|
2020-06-19 19:06:02 +02:00 |
|
|
Samuele Locatelli
|
50c4d72464
|
Merge branch 'feature/add/ProdInfo' into develop
|
2020-06-19 18:39:06 +02:00 |
|
|
Samuele Locatelli
|
870d525c41
|
Code cleanup from #if false
|
2020-06-19 18:36:44 +02:00 |
|
|
=
|
0b0523cb28
|
Merge remote-tracking branch 'CMS/develop' into develop
|
2020-06-19 18:13:38 +02:00 |
|
|
=
|
34ab4d7adb
|
Merge remote-tracking branch 'teamdev/develop' into develop
|
2020-06-19 18:08:16 +02:00 |
|
|
=
|
b5d1bc37cf
|
riscaldi inferiore
|
2020-06-19 18:07:34 +02:00 |
|
|
=
|
fdeb79c7e2
|
riscaldi con selezioni a lazo :)
|
2020-06-19 18:00:33 +02:00 |
|
|
Samuele Locatelli
|
cdc7b49387
|
fixed seed duplicating data for features
|
2020-06-19 17:22:37 +02:00 |
|
|
Samuele Locatelli
|
c5cd0b1c92
|
Merge branch 'develop' into feature/add/ProdInfo
|
2020-06-19 16:38:59 +02:00 |
|
|
Samuele Locatelli
|
a48ca84178
|
Removed duplicated task for prodInfo check
|
2020-06-19 16:38:36 +02:00 |
|
|
Samuele Locatelli
|
fa9325c504
|
Fix DB persistence methods
|
2020-06-19 16:37:32 +02:00 |
|
|
Alessio
|
9a7c40e020
|
fix style programmazione preriscaldo
|
2020-06-19 15:52:09 +02:00 |
|
|
Alessio
|
25444bf1a3
|
fix dashboard
|
2020-06-19 15:43:10 +02:00 |
|
|
Samuele Locatelli
|
7a73cc4b08
|
Merge branch 'develop' into feature/add/ProdInfo
|
2020-06-19 15:32:38 +02:00 |
|
|
Samuele Locatelli
|
dc17731a5c
|
Completed update of errors istance name
|
2020-06-19 15:32:29 +02:00 |
|
|
Alessio
|
32510556d6
|
add usage of prodService
|
2020-06-19 15:20:46 +02:00 |
|
|
Samuele Locatelli
|
be747c7e39
|
UPdate CmsError istance name
|
2020-06-19 15:17:21 +02:00 |
|
|
Samuele Locatelli
|
7a48f34fb9
|
Start vers 0.9.5
|
2020-06-19 15:04:15 +02:00 |
|