Commit Graph

1473 Commits

Author SHA1 Message Date
Alessandro 2cfeab53c1 ui modals report 2019-01-17 10:07:30 +01:00
Alessandro 5229ca1798 ui modals report 2019-01-16 16:50:52 +01:00
Alessandro 155f037bbd ui report 2019-01-16 13:54:07 +01:00
Alessandro 4a6149bbb4 ui report 2019-01-16 11:17:36 +01:00
Alessandro c85b8df4d9 Merge branch 'feature/pagination_alarms' into develop 2019-01-15 12:54:10 +01:00
Alessandro 2e36c7ccad fix scada 2019-01-15 12:37:43 +01:00
Alessandro 94b4b015c9 Merge branch 'develop' into feature/pagination_alarms 2019-01-15 11:37:08 +01:00
Alessandro b5caede692 Merge remote-tracking branch 'origin/develop' into develop 2019-01-15 11:29:38 +01:00
Alessandro a255f70da7 ui page 2019-01-15 11:10:48 +01:00
Alessandro 2998a7851a alarm history 2019-01-15 08:53:06 +01:00
Nicola Carminati 3e3aced86d Fix font on selected file info (PP search window) 2019-01-15 08:39:28 +01:00
Alessandro 72f450c6b3 Auto stash before merge of "develop" and "origin/develop" 2019-01-14 18:24:13 +01:00
Alessandro 7e869bb04d Merge remote-tracking branch 'origin/develop' into develop 2019-01-14 15:33:17 +01:00
Alessandro 627f5e8bcc alarms history 2019-01-14 15:30:26 +01:00
Lucio Maranta 50dc27d480 Fix alarm note/file foreign keys and query 2019-01-14 14:57:30 +01:00
Nicola Carminati 4b02a41b59 Added confirm-box on perform maintenance actions & fix translation Bug 2019-01-11 11:50:40 +01:00
Lucio Maranta c27f8ad3ef Added maintener in perform API 2019-01-11 11:48:10 +01:00
Lucio Maranta 81d31f48ef Fix translations on plc messages 2019-01-11 11:09:17 +01:00
Lucio Maranta 6476530975 Fix duplicated alarms 2019-01-11 09:22:05 +01:00
Alessandro Francia b3014a06b3 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-01-10 10:39:46 +01:00
Alessandro Francia 0f556e83d0 alarms history source 2019-01-10 10:39:38 +01:00
Lucio Maranta c7f4805332 Fix alarms filter, removed "type" field added "sources" field 2019-01-10 10:10:56 +01:00
Alessandro Francia dd90f15b87 alarms history 2019-01-09 12:46:59 +01:00
Nicola Carminati 5a05722c56 Fix font on CNC Active Lines 2019-01-09 11:00:51 +01:00
Alessandro Francia 3734d2a2be alarm history 2019-01-09 08:33:29 +01:00
Alessandro Francia 1cde27028a Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-01-07 12:15:49 +01:00
Alessandro Francia e62d8997ae alarm note 2019-01-07 12:13:56 +01:00
Paolo Possanzini c9ac6f55d1 fix filters 2019-01-07 11:31:08 +01:00
Alessandro Francia ceeb22f7f4 alarms 2019-01-07 09:47:06 +01:00
Paolo Possanzini ecdf8479fa fix notes 2019-01-04 12:03:17 +01:00
Paolo Possanzini 0e406f6982 debugger note 2019-01-04 10:02:18 +01:00
Paolo Possanzini d7ae5eb5b5 apertura allegati 2019-01-03 16:01:47 +01:00
Paolo Possanzini 805dc416f0 cancellazione allegati allarmi 2019-01-03 15:53:41 +01:00
Paolo Possanzini c6c3be7688 fix layout upload image 2019-01-03 11:41:19 +01:00
Paolo Possanzini abea2525fc Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-01-03 09:47:26 +01:00
Paolo Possanzini 8fff050126 alarms 2019-01-03 09:47:19 +01:00
Nicola Carminati d77f8b2fae Fix ToolManager Modals 2018-12-27 16:26:53 +01:00
Nicola Carminati 120dc3e343 Added zoom-image on working file-image & maintenance-attachments 2018-12-27 16:26:20 +01:00
Nicola Carminati f8a3faf47e Fix last commit 2018-12-19 17:51:25 +01:00
Nicola Carminati 43ce78d2b1 Added author for performed maintenances 2018-12-19 17:46:02 +01:00
Nicola Carminati f5f32b9559 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-12-18 08:39:15 +01:00
Nicola Carminati ca346233e9 Fix Unit measure of zeroing window 2018-12-18 08:37:46 +01:00
Lucio Maranta 79bcf7d2fa added maintainer data to closed maintenances 2018-12-17 16:11:46 +01:00
Nicola Carminati 2a32268fb2 Added touchscreen functions on zoom-image panel 2018-12-17 14:05:11 +01:00
Nicola Carminati 501f2e7f3f Added Unit-Measure on Axes quotes 2018-12-17 14:04:18 +01:00
Nicola Carminati 1e71a07778 Fix error of import wrong file 2018-12-17 11:40:56 +01:00
Nicola Carminati 746a61846d Fix last commit 2018-12-17 11:32:44 +01:00
Nicola Carminati 50f897bab3 Fix Mainview Handler Behaviour 2018-12-17 10:59:47 +01:00
Nicola Carminati 393641868a Fix zoom-mage view 2018-12-15 12:43:56 +01:00
Nicola Carminati 4b171923f1 Added new feature in Program Loading: Images zooming (First working commit) 2018-12-14 17:53:38 +01:00