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

57 Commits

Author SHA1 Message Date
Lucio Maranta ea8e2683cf Merge branch 'feature/IntegrityCheckField' into develop 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.NC/SiemensToolTableAdapter.cs
 2019-12-11 15:06:11 +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
Lucio Maranta 024d32e5c9 Added integrity check field to tools data 2019-12-03 14:31:19 +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 c2c58acca6 Added languages fix 
Hided CMS connect
Fix WINDOWS 10 problems
 2019-10-08 17:13:59 +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
Nicola Carminati eea1ecb6d2 Added Server CMSConnect Config 2019-08-22 10:41:57 +02:00
Lucio Maranta fd9e08a0d2 WIP file editor 2019-08-20 16:40:15 +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 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 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
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Lucio Maranta 5e25896c32 WIP Assisted tooling 2019-03-19 17:14:42 +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 ede0e5b926 Fix alarm & added autodelete 2019-02-12 16:58:20 +01:00
Lucio Maranta 9242987d76 Fix scada 
WIP M154
 2019-01-31 13:24:49 +01:00
Lucio Maranta d9a22655b8 Added labels to scada, 
Remove network card monitor
 2019-01-21 09:29:03 +01:00
Nicola Carminati e130d2bfa5 Fix last commit 2018-12-28 15:36:17 +01:00
Lucio Maranta a35bce643a Added magazines names, auto open cms client... 
Fix alarm bug
 2018-09-24 15:28:19 +02:00
Lucio Maranta 3a0e1bc2a4 Fix fileManager 
Added filePath config
 2018-09-04 17:06:54 +02:00
Lucio Maranta 5f5ead4f2e Fix tools params 2018-08-21 10:42:55 +02:00
Lucio Maranta 8856ff1390 Added cooling translation 2018-08-20 17:26:01 +02:00
Lucio Maranta 37669e5a63 WIP 2018-08-20 12:54:24 +02:00
Nicola Carminati 30a5477961 Added tranlsation in Heads Names 2018-08-08 12:09:48 +02:00
Lucio Maranta bbd4535dbf Merge branch 'feature/Osai_ToolTable' into develop 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Core/ThreadsFunctions.cs
#	Step.Core/ThreadsHandler.cs
#	Step.Database/DatabaseContext.cs
#	Step.Database/Migrations/201806220920193_InitMigration.Designer.cs
#	Step.Database/Migrations/201806220920193_InitMigration.cs
#	Step.Database/Migrations/201807120908403_InitMigration.Designer.cs
#	Step.Database/Migrations/201807120908403_InitMigration.cs
#	Step.Database/Migrations/201807120908403_InitMigration.resx
#	Step.Database/Migrations/201807251330036_InitMigration.Designer.cs
#	Step.Database/Migrations/201807251330036_InitMigration.cs
#	Step.Database/Step.Database.csproj
#	Step.Model/Constants.cs
#	Step.NC/NcHandler.cs
#	Step/Listeners/ListenersHandler.cs
#	Step/Step.csproj
 2018-08-03 12:59:14 +02:00
Lucio Maranta bd7fbb1503 Add localized maintenances description 2018-07-10 15:07:37 +02:00
Lucio Maranta 4accaacc06 Fix shanks query 
Added options config
 2018-07-03 17:22:32 +02:00
Lucio Maranta 83cf50ecab Added fields to maintenances model and config 2018-06-05 16:26:08 +02:00
Lucio Maranta ca272f4515 Added readonly field to NC softkeys 2018-03-22 16:17:23 +01:00
Lucio Maranta 14ed9d010a Added NC softkeys: 
- API config
- SignalR thread
- SignalR click handler
 2018-03-20 09:04:48 +01:00
Lucio Maranta fb908a8903 Refactor constants and functionality name 
Added signalR override management
Fix head configuration
 2018-03-15 14:46:14 +01:00
Lucio Maranta b0b7659ada * Refactored configuration 
* Added Selected process and select process action
* Added Heads signalR and configuration
 2018-03-14 17:36:13 +01:00
Lucio Maranta 6930a8f904 Added new alarm managament 2018-03-13 09:51:18 +01:00
Lucio Maranta 306ed6c515 User input hub comunication 
Added signalR comunication -> client
Adedd new library and nhandler softkey management
 2018-03-07 17:03:04 +01:00
Lucio Maranta 6332ed9732 First softkey implementation 
Added config and API
Added Thread and signal
 2018-03-06 17:58:02 +01:00
Nicola Carminati 01017bbeb8 Added Server-Ip-Address configuration (used for filtering Network card). 2018-03-05 15:54:29 +01:00
Lucio Maranta 04da2e5e6b Added configurable database url 2018-03-01 08:09:18 +01:00
Lucio Maranta ac91aa08aa WIP 
Added new library with maintenances counters
Added maintenances thread
 2018-02-14 17:33:05 +01:00
Lucio Maranta ff11711599 WIP maintenances 2018-02-13 17:25:30 +01:00
Lucio Maranta d1cc7d5b8c Revert "erge" 
This reverts commit 79276ad3eb.
 2018-01-25 12:54:15 +01:00
Paolo Possanzini 79276ad3eb erge 2018-01-25 12:42:07 +01:00
Lucio Maranta c4b9dd1b26 + Added Nc Needed in the Areas configuration API 
+ Added signalR notification when nc is disconnected
 2018-01-25 11:07:48 +01:00