 Lucio Maranta
|
50b6e65f90
|
Fix
|
2019-01-23 16:59:09 +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
|
cd82ed78f0
|
fix allarmi
|
2019-01-22 15:41:41 +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 |
|
|
Paolo Possanzini
|
ef81835936
|
Merge branch 'develop' into feature/scada-ui
|
2019-01-22 11:33:36 +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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|