Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,254 Commits 24 Branches 19 Tags
4be7e1c736d02007eb9dc2e7023601fa23cb294f
Commit Graph

174 Commits

Author SHA1 Message Date
Lucio Maranta 25a0d10d98 Fix integrated file edito 
Refactor file names in constants
Fix fanuc upload images
 2019-09-03 16:25:08 +02:00
Lucio Maranta 7c2cb28a56 Merge remote-tracking branch 'origin/CmsConnectGateway' into develop 
# Conflicts:
#	Step.Model/ConfigModels/ServerConfigModel.cs
#	Step/Controllers/WebApi/ConfigurationController.cs
 2019-08-28 14:33:54 +02:00
Lucio Maranta b379270a09 Merge branch 'integratedFileEditor' into develop 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/ro.xml
 2019-08-28 14:29:51 +02:00
Nicola Carminati eea1ecb6d2 Added Server CMSConnect Config 2019-08-22 10:41:57 +02:00
Lucio Maranta 4bf329caee Fix scada validator & scada in production 2019-08-22 10:34:17 +02:00
Lucio Maranta a216bff621 Added reload file after changes 
Fix modal style & translations
 2019-08-21 15:06:38 +02:00
Lucio Maranta fd9e08a0d2 WIP file editor 2019-08-20 16:40:15 +02:00
Lucio Maranta f4d1f91699 FIx available language & 
Merge branch 'feature/SelectedToolData' into develop

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step/wwwroot/src/app_modules/production/components/head-production.vue
 2019-08-19 16:44:14 +02:00
Lucio Maranta 66c36eea9c Added new animation & arrow 
Added scroll bar to scada tab
 2019-08-19 16:36:16 +02:00
Lucio Maranta 037c312850 Re-insert Added scada validator 2019-07-31 12:00:03 +02:00
Lucio Maranta ffa880adfb Merge branch '1.2.2_BRANCH' into develop 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
 2019-07-30 11:09:43 +02:00
Lucio Maranta 0524cade83 Fix siemens blank screen bug 
& fix siemens startup icon
 2019-07-30 10:46:53 +02:00
Lucio Maranta acac7094c9 1.2.2 Version 2019-07-29 16:50:58 +02:00
Lucio Maranta e3cdd83fea Added scada multilanguage & label visibility management 
WIP tool data in production page
 2019-07-24 17:03:13 +02:00
Lucio Maranta 4624c47f32 Fix external program opening 2019-07-09 10:18:47 +02:00
Lucio Maranta b096632d22 Fix scada 
Removed
 2019-06-26 15:25:57 +02:00
Lucio Maranta 09be892704 Added: 
- Empty alarms table
- Change page after login if not authorized
Fix:
- Scada
- alarm export performance
 2019-06-24 17:20:14 +02:00
Lucio Maranta c7ac5de54e WIP custom main program 2019-06-18 15:43:45 +02:00
Lucio Maranta 7ce41d51bb WIP MGI Fanuc 
WIP Override & process data
Fix maintainer
 2019-06-06 12:45:50 +02:00
Lucio Maranta a93aaba321 Added maintenances contact 
Fix offsets
 2019-06-05 16:54:20 +02:00
Lucio Maranta 96d19f4779 Added realRadius & realLength 
Added .NET heidiSQL check on setup
Fix incremental softkey x10..
 2019-06-04 17:15:58 +02:00
Lucio Maranta deb89a4a34 added overstroke 2019-05-21 16:37:04 +02:00
Lucio Maranta 306fa43593 Fix error messages 
Fix frontend assistedTooling
Fix application closure
 2019-05-15 17:28:21 +02:00
Lucio Maranta 3a386849a3 Fix scada 
WIP upload tool from NC
 2019-05-13 17:19:14 +02:00
Nicola Carminati 240f27bb76 Fix Nullreference error on Opening window, adde SCADA validator 2019-05-10 17:23:57 +02:00
Nicola Carminati 05aab2600f Fix Client exception when "showNcHMI" option is False 2019-04-17 18:51:23 +02:00
Lucio Maranta 7fb8c632ae Moved external programs config into "serverConfig.xml" 2019-04-04 12:18:30 +02:00
Lucio Maranta 38b138942f Added config "FixedHead" 
FIx tool table
 2019-04-02 17:12:01 +02:00
Lucio Maranta 3750987db0 Fix tool table 
Added field  to scada images ("clickEnabled")
 2019-04-01 17:58:54 +02:00
Lucio Maranta 7ed87452a4 Fix ACTIVE error management 
Fix tool table cancel buttons
Removed deleted button in edit
 2019-03-26 17:01:29 +01:00
Nicola Carminati c519d82f1b Added configurations 2019-03-22 16:57:38 +01:00
Lucio Maranta 3eba8f1ab7 Fix Osai 
Added images management to scada
 2019-03-22 12:47:21 +01:00
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Nicola Carminati a2aa8630f6 Merge branch 'User_Manager' into develop 2019-03-20 17:05:04 +01:00
Lucio Maranta 4892340a26 Assistedtooling fix 
Fix siemens tool table
Added dynamic tool in spindle
 2019-03-20 16:56:10 +01:00
Nicola Carminati ea4420dff7 Merge branch 'develop' into User_Manager 2019-03-20 16:28:19 +01:00
Lucio Maranta 5e25896c32 WIP Assisted tooling 2019-03-19 17:14:42 +01:00
Nicola Carminati 13f5932754 Added configuration 2019-03-18 18:03:52 +01:00
Lucio Maranta 09b6e4e009 Fix timeline date 2019-03-12 09:56:58 +01:00
Nicola Carminati 83f22592c8 Added Softkey "Visible" attribute + AutoIncrement Versioning 2019-03-07 16:39:09 +01:00
Lucio Maranta be9c0b6a2a Fix tool table 
Added installation date
Added W10 programs api
 2019-02-22 12:59:08 +01:00
Nicola Carminati c690f175f5 First commit CMS-Connect M154 2019-02-19 20:04:31 +01:00
Lucio Maranta 0ac7982c93 Fix tooltable & maintenances 2019-02-18 12:03:40 +01:00
Lucio Maranta ede0e5b926 Fix alarm & added autodelete 2019-02-12 16:58:20 +01:00
Nicola Carminati 2a41d03716 Fix Overstroke Softkey 2019-02-12 11:07:19 +01:00
Lucio Maranta a0be095759 Fix alarm history 2019-02-08 16:41:25 +01:00
Lucio Maranta 6d22f38b77 WP10 
General data
Pie chart
TimeLine chart
 2019-02-01 13:02:33 +01:00
Nicola Carminati a599447922 Fix ServerConfig Read 2019-01-31 15:51:42 +01:00
Lucio Maranta 9242987d76 Fix scada 
WIP M154
 2019-01-31 13:24:49 +01:00
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +01:00