Commit Graph

65 Commits

Author SHA1 Message Date
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 13f5932754 Added configuration 2019-03-18 18:03:52 +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
Nicola Carminati dbbbecd2e5 Fix Tool manager Siemens 2019-01-22 13:00:00 +01:00
Lucio Maranta d9a22655b8 Added labels to scada,
Remove network card monitor
2019-01-21 09:29:03 +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 0b63a0e0e6 WIP Scada
Added subribe
Added thread
Fix & refactor
2019-01-14 11:30:53 +01:00
Nicola Carminati e130d2bfa5 Fix last commit 2018-12-28 15:36:17 +01:00
Lucio Maranta ebfbfd2d9e Added API
WIP Thread
2018-12-20 13:18:06 +01:00
Lucio Maranta 4a27b1dba4 WIP 2018-12-19 17:10:11 +01:00
Lucio Maranta 355067e963 First commit 2018-12-18 17:40:58 +01:00
Lucio Maranta 0f15f2e367 Added OriginPosition
Fixed fanuc TT
& Minorfixes
2018-11-30 13:26:46 +01:00
Lucio Maranta 00c7297ee2 WIP minor fix 2018-11-26 17:26:38 +01:00
Lucio Maranta e47d48aea9 Added new alarm filter 2018-10-29 17:00:35 +01:00
Lucio Maranta 1191750fe6 WIP removed autoincrement 2018-09-25 15:27:58 +02:00
Lucio Maranta a35bce643a Added magazines names, auto open cms client...
Fix alarm bug
2018-09-24 15:28:19 +02:00
Nicola Carminati adc6adfc11 Added Job Editor in Client CMS 2018-09-21 11:21:45 +02:00
Lucio Maranta 13a143957f Added macros API
WIP Job backend
2018-09-20 13:03:02 +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 485e35cdc1 Fix Heads translate Read Config 2018-08-09 16:32:44 +02:00
Nicola Carminati 80f628d596 Fix Server reading configuration. Now the validators are a Embedded resources 2018-08-07 17:27:54 +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 fa335443f3 FIx query and returned data
First shank option management
2018-07-04 17:27:22 +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 f2fa6dc87e Moved restorationIsActive field to signalR alarms Channel 2018-04-13 15:45:38 +02:00
Lucio Maranta 63d2ce8f4a Fix configuration
Fix Functionality and PLC id matching
2018-03-28 17:31:32 +02:00
Lucio Maranta e40d9cd64e Fix heads IDs
Fix head WJ
2018-03-26 10:41:40 +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 bfc8bc8451 Fix sofkey config and name
Added refresh alarm
2018-03-15 17:27:43 +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