Commit Graph

326 Commits

Author SHA1 Message Date
Lucio Maranta deba431b08 Fix cooling translations
Fix configurable tool types
2019-12-12 09:13:02 +01:00
Lucio Maranta 7f5b049f18 Merge remote-tracking branch 'origin/feature/Maintenance-Machine-Counter' into develop
# Conflicts:
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/da.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/el.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/nl.xml
#	Step.Utils/languages/pl.xml
#	Step.Utils/languages/pt.xml
#	Step.Utils/languages/ro.xml
#	Step.Utils/languages/ru.xml
#	Step.Utils/languages/sv.xml
2019-12-11 15:13:16 +01:00
Lucio Maranta 665c8cfa54 Added new tool configuration: customizable tools types 2019-12-10 16:32:44 +01:00
Nicola Carminati 61987e4e20 Merge branch 'feature/NewContacts' into develop
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/el.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/nl.xml
#	Step.Utils/languages/pl.xml
#	Step.Utils/languages/ro.xml
#	Step.Utils/languages/ru.xml
#	Step/wwwroot/assets/styles/style.css
2019-12-10 09:26:52 +01:00
Nicola Carminati e890fa136b Added Scm version of the contacts window 2019-12-06 11:39:13 +01:00
Nicola Carminati b16a978588 Fix behaviour 2019-12-03 12:49:02 +01:00
Nicola Carminati c20060f0a7 added features 2019-12-02 18:16:22 +01:00
Nicola Carminati 9d0bcc570f Added features 2019-11-29 16:18:16 +01:00
Nicola Carminati 4c2a0c1c91 End of feature developing 2019-11-26 17:13:37 +01:00
Lucio Maranta 0f0d650e0c Added siemens keyboard option in serverConfig
Removed nc-softkey & changed under-the hood style if the option is active
2019-11-26 11:02:52 +01:00
Lucio Maranta 787582958c Fix style & renamed contacts 2019-10-23 16:48:02 +02:00
Lucio Maranta a8fe58dac6 Open external browser 2019-10-21 16:46:47 +02:00
Lucio Maranta dfea192cf2 First commit of NewContact 2019-10-18 12:10:32 +02:00
Lucio Maranta 1ea597af13 Fix Family Name (automatic) 2019-10-18 10:48:43 +02:00
Lucio Maranta 95a6d19cb1 1.3Version 2019-10-16 09:44:55 +02:00
Lucio Maranta c2c58acca6 Added languages fix
Hided CMS connect
Fix WINDOWS 10 problems
2019-10-08 17:13:59 +02:00
Lucio Maranta 9d9161c6c8 Added siemens mounted tool data
Fix siemens tool table
2019-09-23 16:26:52 +02:00
Lucio Maranta 52247c7553 Fix heads style
Added new family names
2019-09-20 12:20:44 +02:00
Lucio Maranta f256a4e0f3 Added horizontal scroll to user softkey for long texts 2019-09-11 11:03:04 +02:00
Lucio Maranta 06d5139822 Added thinClient API 2019-09-04 12:12:15 +02:00
Lucio Maranta 721a44d947 REFACTOR - renamed handlers to adapters 2019-09-03 16:35:40 +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 563bcdb60f Wip Server & Client 2019-08-26 17:12:27 +02:00
Lucio Maranta a0b2efba38 WIP last uploaded files
And refactor
2019-08-26 17:01:00 +02:00
Nicola Carminati bb45bdf9e5 Wip Wip Wip 2019-08-23 17:15:16 +02:00
Nicola Carminati 457192c032 WIP 2019-08-22 18:03:54 +02:00
Nicola Carminati fc2ddeeb54 First Commit 2019-08-20 17:31:54 +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 08038c33d0 Added Multilanguage on scada buttons 2019-07-30 11:58:11 +02:00
Lucio Maranta 3c00401e61 WIP tool mounted in spindle data 2019-07-26 13:01:33 +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 56a32c54e7 VERSION 1.2.1
Fix scada
Removed axes unit measure
Fix axes round number
Fix bug on alarm history
Fix software version date
REMOVED possibility to load tools with tool type != "generic" on "generic" magazine position
2019-07-22 16:53:38 +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 bb35d1cbc1 Merge branch 'develop' into integratedFileEditor
# Conflicts:
#	Client/Browser_Tools/BrowserJSObject.cs
#	Step/Controllers/WebApi/NcFileController.cs
2019-07-09 11:07:32 +02:00
Lucio Maranta e6da43208e 1.2 VERSION
Fix osai
Fix offsets
FIx language names
2019-07-01 17:38:33 +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 b096632d22 Fix scada
Removed
2019-06-26 15:25:57 +02:00
Lucio Maranta eda1e7fc43 Fix m155
Fix scada
2019-06-25 16:56:56 +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 d609fbe18b Fix new login modal blur
Added new feature: when login modal shows up, area change to "production"
2019-06-17 11:19:28 +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
Nicola Carminati 43b3d87ad6 Changed Client manager on Server 2019-05-17 09:33:53 +02:00