Commit Graph

2980 Commits

Author SHA1 Message Date
Nicola Carminati e734530870 Fix Alarms 2019-02-10 17:34:06 +01:00
Lucio Maranta a0be095759 Fix alarm history 2019-02-08 16:41:25 +01:00
Nicola Carminati 491113f71a Fix Alarms History UI 2019-02-08 16:00:31 +01:00
Lucio Maranta bbc619ee66 Fix osai/fanuc 2019-02-07 17:23:55 +01:00
Alessandro 98816d1559 fix alarms 2019-02-07 17:12:20 +01:00
Nicola Carminati 96c8874925 Fix Scada UI 2019-02-07 15:37:22 +01:00
Nicola Carminati 116b1fb57d Changed UI 2019-02-06 16:29:44 +01:00
Nicola Carminati 6d062d10b8 Merge branch 'develop' into User_Manager 2019-02-06 12:29:21 +01:00
Nicola Carminati bd15456b83 Fix error in tool Manager 2019-02-06 12:21:19 +01:00
Alessandro 4e4d43dcf4 fix alarms 2019-02-06 11:38:03 +01:00
Nicola Carminati 263911d675 First commit 2019-02-06 08:27:02 +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
Nicola Carminati a599447922 Fix ServerConfig Read 2019-01-31 15:51:42 +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
Lucio Maranta 153c31de56 Can load program && siemens tool data 2019-01-30 12:12:34 +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
Lucio Maranta 805b5f9f1c Fix siemens dir 2019-01-28 12:58:42 +01:00
Lucio Maranta 9ee805a0fa Fixes 2019-01-28 11:24:27 +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
Nicola Carminati 5983e04788 Fix load tool on magazine in Server 2019-01-25 14:30:15 +01:00
Lucio Maranta abc2c1059a WIP Osai life read 2019-01-25 13:13:22 +01:00
Lucio Maranta 938b9bf201 Fix 2019-01-25 13:11:22 +01:00
Lucio Maranta 9d97d3b43a Fix 2019-01-25 12:48:54 +01:00
Lucio Maranta 2b165926ab Fix mounted shanks query 2019-01-25 12:22:28 +01:00
Lucio Maranta fbaeebb384 Added maxRight/Left 2019-01-25 11:54:06 +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