 Paolo Possanzini
|
732a4a7daa
|
ui
|
2019-01-18 16:40:29 +01:00 |
|
|
Alessandro
|
fa056ef6d2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-01-18 16:33:50 +01:00 |
|
|
Alessandro
|
6152a564ba
|
Merge branch 'feature/report_ui_table' into develop
|
2019-01-18 16:33:15 +01:00 |
|
|
Alessandro
|
9ab9624fb6
|
fix
|
2019-01-18 16:31:37 +01:00 |
|
|
Paolo Possanzini
|
ea84a2d3f1
|
scada services
|
2019-01-18 16:18:31 +01:00 |
|
|
Alessandro
|
2fd52e9890
|
machine status ui
|
2019-01-18 16:10:35 +01:00 |
|
|
Alessandro
|
75956d9a90
|
select timeline ui
|
2019-01-18 15:56:15 +01:00 |
|
|
Alessandro
|
4ee6171db2
|
timeline ui
|
2019-01-18 15:28:29 +01:00 |
|
|
Paolo Possanzini
|
b0bfc632a8
|
scada store
|
2019-01-18 14:30:05 +01:00 |
|
|
Alessandro
|
d1a3207c97
|
detail filter ui
|
2019-01-18 10:44:35 +01:00 |
|
|
Alessandro
|
a3be062238
|
table
|
2019-01-17 17:29:21 +01:00 |
|
|
Nicola Carminati
|
5a40b84862
|
Added Position SIze check during load tools
|
2019-01-17 17:13:59 +01:00 |
|
|
Nicola Carminati
|
7e7f0ee6c4
|
Fix "Edit" button behaviour in Tooling-Equipment
|
2019-01-17 15:01:39 +01:00 |
|
|
Lucio Maranta
|
5c680f55dc
|
Added API write scada value
|
2019-01-17 13:17:56 +01:00 |
|
|
Lucio Maranta
|
16f2ff382e
|
Fix previous commit
|
2019-01-17 12:54:29 +01:00 |
|
|
Lucio Maranta
|
42e31f9f32
|
Fix
|
2019-01-17 12:46:53 +01:00 |
|
|
Lucio Maranta
|
1aa5f1e37a
|
Added mounted tool in loadinMag API
|
2019-01-17 12:33:37 +01:00 |
|
|
Alessandro
|
fb21037a79
|
calendar
|
2019-01-17 11:48:50 +01:00 |
|
|
Lucio Maranta
|
0339d82a65
|
Fix scada input enabled name
|
2019-01-17 10:19:00 +01:00 |
|
|
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 |
|
|
Lucio Maranta
|
724ac2afb8
|
Merge branch 'feature/Scada' into develop
# Conflicts:
# Client.Utils/Constants.cs
# Client/View/NcWindow.cs
# Libs/CMS_CORE_Library.dll
# Step.Config/Config/serverConfig.xml
# Step.Core/ThreadsFunctions.cs
# Step.Model/Constants.cs
# Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
# Step.Model/DatabaseModels/NcMagazinePositionModel.cs
# Step.Model/Step.Model.csproj
|
2019-01-15 16:58:18 +01:00 |
|
|
Lucio Maranta
|
58fefd3823
|
Minor fix siemens
|
2019-01-15 16:34:42 +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 |
|
|
Nicola Carminati
|
8b7c7f91d0
|
Fix Client Config Path Step -> Active
|
2019-01-15 08:38:09 +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 |
|
|
Lucio Maranta
|
0b63a0e0e6
|
WIP Scada
Added subribe
Added thread
Fix & refactor
|
2019-01-14 11:30:53 +01:00 |
|
|
Lucio Maranta
|
4146b49856
|
Fix path error
|
2019-01-11 15:15:50 +01:00 |
|
|
Lucio Maranta
|
eaed853391
|
Fix active program image path
|
2019-01-11 13:26:15 +01:00 |
|
|
Lucio Maranta
|
e8e9a71a73
|
Fix demo loading file, moved demo and tmp file in C:/CMS/Active
|
2019-01-11 13:17:48 +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 |
|