Commit Graph

1565 Commits

Author SHA1 Message Date
Alessandro 4e4d43dcf4 fix alarms 2019-02-06 11:38:03 +01:00
Paolo Possanzini 0df87e6880 fix scada 2019-02-05 19:15:34 +01:00
Nicola Carminati 3048f70e7a Tool manager OSAI/FANUC Fix 2019-02-05 18:29:49 +01:00
Nicola Carminati 76c60574ac Fix SCADA Style 2019-02-05 18:01:08 +01:00
Lucio Maranta 4bae9b4259 Added edit lock when tool is loaded in spindle
Fix OsaiFanuc delete tool
2019-02-05 13:31:23 +01:00
Lucio Maranta 69733580e8 Fix m154 2019-02-04 17:34:42 +01:00
Alessandro 83a93407b5 fix 2019-02-04 15:39:24 +01:00
Lucio Maranta 19cc6d83c9 Added mockup filters 2019-02-01 13:17:45 +01:00
Lucio Maranta 6d22f38b77 WP10
General data
Pie chart
TimeLine chart
2019-02-01 13:02:33 +01:00
Paolo Possanzini 99b6c7bec5 fix scada 2019-01-31 16:38:17 +01:00
Paolo Possanzini cb90b57443 fix scada 2019-01-31 15:48:44 +01:00
Paolo Possanzini d2099ddb3d fix scada 2019-01-31 15:26:40 +01:00
Paolo Possanzini 17247388ff fix scada produztion 2019-01-31 15:09:51 +01:00
Lucio Maranta 3d28c0c5fe Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-01-31 13:26:07 +01:00
Lucio Maranta 9242987d76 Fix scada
WIP M154
2019-01-31 13:24:49 +01:00
Paolo Possanzini 7e0c438177 Merge branch 'feature/scada-ui' into develop 2019-01-31 10:05:47 +01:00
Paolo Possanzini eaca10d04b fix scada values 2019-01-31 10:04:48 +01:00
Paolo Possanzini a7b14a2745 Merge branch 'feature/scada-ui' into develop 2019-01-31 09:33:28 +01:00
Paolo Possanzini a37ddc923b fix scada activation deactivation 2019-01-31 09:32:00 +01:00
Paolo Possanzini 27d246332a scala less 2019-01-31 09:05:17 +01:00
Paolo Possanzini a437a2ef23 fix layout scada production 2019-01-31 09:05:06 +01:00
Lucio Maranta d40f5ba410 Fix 2019-01-30 16:49:02 +01:00
Nicola Carminati a8d4e5ca76 Fix Siemens requests during test 2019-01-29 12:28:20 +01:00
Paolo Possanzini ecf407030f fix alarms query 2019-01-29 09:13:37 +01:00
Lucio Maranta dc94950fae Fix osai tool update 2019-01-28 16:50:40 +01:00
Nicola Carminati 4ee6165706 Fix UI Frontend 2019-01-26 10:35:11 +01:00
Nicola Carminati 7b29215122 Clean files 2019-01-26 10:34:28 +01:00
Nicola Carminati 6cd3732db7 Fix Tool manager of Osai/Fanuc Sizes 2019-01-25 14:40:07 +01:00
Lucio Maranta 9d97d3b43a Fix 2019-01-25 12:48:54 +01:00
Alessandro 56b7194e64 Merge branch 'feature/wp10' into develop 2019-01-25 09:32:09 +01:00
Alessandro 6513d6c416 fix card-report-timeline 2019-01-25 09:13:14 +01:00
Alessandro a5a586224e card-report-timeline 2019-01-24 17:48:12 +01:00
Alessandro 977949aed3 card-report-production, events, machinestatus 2019-01-24 16:04:15 +01:00
Nicola Carminati 7ff9364531 Fix Translations 2019-01-24 14:43:40 +01:00
Nicola Carminati 39bf408b2d Added message when try to change app in pending mode 2019-01-24 14:32:27 +01:00
Nicola Carminati 95f278ba0b Fix M155 Command 2019-01-24 11:35:04 +01:00
Paolo Possanzini 2dfc725dcc fix modale 2019-01-24 10:22:07 +01:00
Alessandro 5c59642da2 fix 2019-01-24 09:37:31 +01:00
Nicola Carminati eea7fb2403 Merge remote-tracking branch 'origin/develop' into M155_Window 2019-01-24 08:44:58 +01:00
Nicola Carminati 000cad3884 First Commit of M155 2019-01-23 17:57:14 +01:00
Alessandro bd35d6467e more card-report events alarms machine status 2019-01-23 17:02:26 +01:00
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +01:00
Alessandro d00cc5efc1 fix modal-report-select-column 2019-01-23 15:11:28 +01:00
Alessandro 9ef6d77ab8 card-report-production 2019-01-23 11:39:12 +01:00
Alessandro 9c6b79d18e start refactoring 2019-01-23 10:30:51 +01:00
Nicola Carminati 16d4ab959a Fix tool manager Modal call 2019-01-23 09:39:02 +01:00
Alessandro 11abeb96c8 fix 2019-01-23 09:04:11 +01:00
Nicola Carminati 76ed13b91a Fix Route SCADA & removed "Old style" Loader 2019-01-23 08:26:32 +01:00
Paolo Possanzini 38c303633c Merge branch 'feature/scada-ui' into develop 2019-01-22 17:35:26 +01:00
Paolo Possanzini 5432014a17 fix rendering scada 2019-01-22 17:34:57 +01:00