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

287 Commits

Author SHA1 Message Date
Lucio Maranta 4be7e1c736 Fix head style 
Added Siemens tool mounted data
Fix fanuc getFileList()
 2019-09-24 16:21:50 +02:00
Lucio Maranta 9d9161c6c8 Added siemens mounted tool data 
Fix siemens tool table
 2019-09-23 16:26:52 +02:00
Lucio Maranta f256a4e0f3 Added horizontal scroll to user softkey for long texts 2019-09-11 11:03:04 +02:00
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 5d2544a2ae Added redis-Setup for Alarms 2019-08-28 11:57:05 +02:00
Nicola Carminati 563bcdb60f Wip Server & Client 2019-08-26 17:12:27 +02:00
Nicola Carminati 457192c032 WIP 2019-08-22 18:03:54 +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 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 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 cd03649e6c Added new box which enter from right to left 
& New icon
 2019-07-29 14:16:29 +02:00
Lucio Maranta 3c00401e61 WIP tool mounted in spindle data 2019-07-26 13:01:33 +02:00
Lucio Maranta e940d3d632 WIP selected tool sub menu 2019-07-25 12:19:38 +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 95f0ec3e25 Added feed overrides 2019-07-23 15:54:51 +02:00
Lucio Maranta a256c3633d VERSION 1.2.1 
Fix scada
Fix axes unit measure
 2019-07-18 18:05:40 +02:00
Lucio Maranta 7b7399182a Fix production scada 
Fix delete alarm attachment
Fix reload page after login
Added delete alarm-history
 2019-06-29 16:10:42 +02:00
Lucio Maranta c7ac5de54e WIP custom main program 2019-06-18 15:43:45 +02:00
Lucio Maranta a7f6b70111 Fix frontend 
Added Override chart (OSAI FANUC)
Added Offsets data
Update languages
 2019-06-12 17:02:32 +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 708f958b0f Fix build version & scada 2019-05-27 17:15:44 +02:00
Lucio Maranta 306fa43593 Fix error messages 
Fix frontend assistedTooling
Fix application closure
 2019-05-15 17:28:21 +02:00
Lucio Maranta 8519c60e81 Fix scada textbox alignment 
Added autoload tool from NC when database is created
WIP check option consistency
 2019-05-14 17:27:16 +02:00
Nicola Carminati 240f27bb76 Fix Nullreference error on Opening window, adde SCADA validator 2019-05-10 17:23:57 +02:00
Lucio Maranta caab577c25 Fix scada 
WIP auto load tool from NC
 2019-05-10 13:04:27 +02:00
Lucio Maranta fb521a76d8 Added mounted tool data 
Added start needed modal
 2019-05-08 17:23:47 +02:00
Lucio Maranta 297179cc14 Fix null reference 
FIx frontend
Added modal on assistede tooling
 2019-05-06 17:11:09 +02:00
Lucio Maranta 5a8e09bbca Added DIS messages, 
Fix setup SCM icons
 2019-04-30 17:45:55 +02:00
Nicola Carminati 796f0b32f3 Advanced User Management 2019-04-26 19:22:54 +02:00
Lucio Maranta 617586d4bd Added: Restore magazine table lock on startup 
Added tool table import status
 2019-04-24 17:33:28 +02:00
Lucio Maranta 15b5ba8ca0 FIX WebApi bearer token authorization 2019-04-17 14:05:13 +02:00
Nicola Carminati eb98081712 Added close server when close client if the option "autoOpenCmsClient" in server is TRUE 2019-04-11 11:46:19 +02:00
Lucio Maranta 8d6c1fd39a Fix project options & setup 2019-04-10 17:22:55 +02:00
Nicola Carminati ab9bfd3602 Self adaptive Path Step 2019-04-08 17:36:56 +02:00
Nicola Carminati eab983d469 Fix SCM/CSM UI 2019-04-05 12:04:27 +02:00
Lucio Maranta f30403560c Added user deletion 
Refactored project warnings
 2019-04-05 11:20:56 +02:00
Nicola Carminati 830221b178 Added client SCM/CMS options 2019-04-04 18:33:44 +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
Nicola Carminati 45dff79e19 Added Working hours to Frontend 2019-04-02 08:58:35 +02:00
Nicola Carminati 13169c7a54 Merge branch 'PSW' into develop 2019-04-02 08:21:34 +02:00
Lucio Maranta 3750987db0 Fix tool table 
Added field  to scada images ("clickEnabled")
 2019-04-01 17:58:54 +02:00
Nicola Carminati e0b582d329 Adde Working-Time on Heads 2019-04-01 17:52:40 +02:00