Commit Graph

2980 Commits

Author SHA1 Message Date
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 050c259522 Merge branch 'M155_Window' into develop 2019-01-24 16:01:57 +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
Lucio Maranta f112e75268 Fix right&left check OSAI/FANUC 2019-01-24 12:56:51 +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
Lucio Maranta 16cc96a085 Fix m155 2019-01-24 10:08:12 +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
Lucio Maranta 5054d04319 Fix m155 2019-01-24 08:40:56 +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
Paolo Possanzini 4581e07a12 fix scada 2019-01-22 16:38:44 +01:00
Nicola Carminati ac180398ce Changed Softkey Blk/Blk Behaviour in Osai 2019-01-22 16:25:01 +01:00
Paolo Possanzini 36f7830ea1 Merge branch 'feature/scada-ui' into develop 2019-01-22 15:47:00 +01:00
Paolo Possanzini cd82ed78f0 fix allarmi 2019-01-22 15:41:41 +01:00
Lucio Maranta 91ac08f29f Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-01-22 14:15:04 +01:00
Lucio Maranta b1df676ccb Fix reading of the scada values 2019-01-22 14:14:21 +01:00
Paolo Possanzini e2b4b245a7 Merge branch 'feature/scada-ui' into develop 2019-01-22 13:06:39 +01:00
Paolo Possanzini 7bdd326a00 Merge remote-tracking branch 'origin/develop' into feature/scada-ui 2019-01-22 13:06:10 +01:00
Alessandro 5f3c1f8688 fix alarms 2019-01-22 13:03:40 +01:00
Paolo Possanzini e9bbe1410d fix scada rendering 2019-01-22 13:01:54 +01:00
Nicola Carminati dbbbecd2e5 Fix Tool manager Siemens 2019-01-22 13:00:00 +01:00
Lucio Maranta e52e9128e8 Fix osai 2019-01-22 12:23:04 +01:00
Paolo Possanzini ef81835936 Merge branch 'develop' into feature/scada-ui 2019-01-22 11:33:36 +01:00
Lucio Maranta 1320962122 Fix scada image model 2019-01-22 10:39:18 +01:00
Nicola Carminati 303ea4df9d Merge branch 'magazine_size' into develop 2019-01-21 16:20:30 +01:00
Nicola Carminati 1fb2250235 Fix tool Siemens Things 2019-01-21 16:16:56 +01:00
Nicola Carminati cebf58ee38 Changed Tool Names 2019-01-21 12:25:43 +01:00
Paolo Possanzini d5ed1c954f fix 2019-01-21 12:20:29 +01:00
Alessandro 33b3ea3914 Merge remote-tracking branch 'origin/feature/scada-ui' into feature/scada-ui 2019-01-21 11:19:05 +01:00
Alessandro 73115f802d production scada 2019-01-21 11:18:48 +01:00
Paolo Possanzini 7b2367e1e8 Merge branch 'develop' into feature/scada-ui 2019-01-21 09:55:37 +01:00
Alessandro 6c2ff47726 labels e progress 2019-01-21 09:37:59 +01:00
Lucio Maranta d9a22655b8 Added labels to scada,
Remove network card monitor
2019-01-21 09:29:03 +01:00
Paolo Possanzini 5e7735dcb4 layout 2019-01-18 17:40:02 +01:00
Nicola Carminati 14c829b17d First Commit of Magazine position SIze 2019-01-18 17:20:57 +01:00
Alessandro 6d25dcc55e fix 2019-01-18 17:10:27 +01:00
Paolo Possanzini 72ec4feab4 Merge remote-tracking branch 'origin/develop' into feature/scada-ui 2019-01-18 16:41:04 +01:00