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

71 Commits

Author SHA1 Message Date
Nicola Carminati 796f0b32f3 Advanced User Management 2019-04-26 19:22:54 +02:00
Lucio Maranta 15b5ba8ca0 FIX WebApi bearer token authorization 2019-04-17 14:05:13 +02:00
Lucio Maranta 8d6c1fd39a Fix project options & setup 2019-04-10 17:22:55 +02:00
Nicola Carminati eab983d469 Fix SCM/CSM UI 2019-04-05 12:04:27 +02:00
Nicola Carminati 830221b178 Added client SCM/CMS options 2019-04-04 18:33:44 +02:00
Nicola Carminati 13169c7a54 Merge branch 'PSW' into develop 2019-04-02 08:21:34 +02:00
Nicola Carminati d8a5d2de6b Fix features 2019-04-01 12:57:44 +02:00
Lucio Maranta 0ad395bebf Fix import-export tool table 
Fix mag position page
 2019-03-29 12:38:55 +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 13f5932754 Added configuration 2019-03-18 18:03:52 +01:00
Lucio Maranta 0da197ebf6 WIP assisisted tooling 2019-03-12 17:41:49 +01:00
Lucio Maranta 94361f9444 Merge branch 'develop' into feature/FixToolTable 
# Conflicts:
#	Step.Model/Constants.cs
 2019-03-07 12:38:49 +01:00
Lucio Maranta dbc80f653e Added password to cms maintenances 2019-03-07 12:28:59 +01:00
Lucio Maranta 0ed46d2d7b Added new tool&family id management 2019-02-25 17:24:02 +01:00
Lucio Maranta 3253c48501 Fix tooltable 
Frontend - Removed useless delete buttons & bug fix
Backend - fix shanks delete
 2019-02-15 13:34:23 +01:00
Lucio Maranta 6d22f38b77 WP10 
General data
Pie chart
TimeLine chart
 2019-02-01 13:02:33 +01:00
Lucio Maranta d9a22655b8 Added labels to scada, 
Remove network card monitor
 2019-01-21 09:29:03 +01:00
Lucio Maranta 5c680f55dc Added API write scada value 2019-01-17 13:17:56 +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
Lucio Maranta e8e9a71a73 Fix demo loading file, moved demo and tmp file in C:/CMS/Active 2019-01-11 13:17:48 +01:00
Lucio Maranta 81d31f48ef Fix translations on plc messages 2019-01-11 11:09:17 +01:00
Nicola Carminati 9994ba10c0 Added Network card monitoring in Server 2018-12-28 15:17:49 +01:00
Lucio Maranta 355067e963 First commit 2018-12-18 17:40:58 +01:00
Lucio Maranta 4d5020665d Added Siemens/Demo M155 SignalR 
WIP fix alarm filters
 2018-11-15 13:29:15 +01:00
Lucio Maranta e23d1fce89 Fix Alarm API 2018-11-12 12:30:40 +01:00
Lucio Maranta ddced53d73 Added isSelectable to axes buttons 
Added axes funcitonality
 2018-11-08 13:27:30 +01:00
Nicola Carminati 96fc4021d8 Fix Graphic selection on Windows10 2018-11-07 12:19:37 +01:00
Lucio Maranta 76d617d633 Fix cms client primary screen 
Removed shanks from Siemens library
Fix "isInUse" param
etc
 2018-10-31 17:29:25 +01:00
Nicola Carminati 23ac28caeb Fix Application Icons & Names 2018-10-31 17:00:46 +01:00
Lucio Maranta 110ab7be65 Alarm attachments 2018-10-24 11:25:38 +02:00
Lucio Maranta 9fafe86eb8 WIP alarms storaging 2018-10-09 17:29:06 +02:00
Lucio Maranta 3ac93d7eec Load job into queue and load&Activate 
WIP get active job information
 2018-10-02 17:19:24 +02:00
Lucio Maranta 92389956b9 Fix client errors 
WIP job loading in the queue
 2018-10-01 12:17:19 +02:00
Lucio Maranta 06e61c9e3a Minor job fix 2018-09-24 10:58:23 +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 f8eb02aec5 Fix program path & info 2018-09-12 17:06:41 +02:00
Lucio Maranta 089f65c67f Fix demo info 
Fix queue item status
Added start&stop
 2018-09-11 17:14:35 +02:00
Lucio Maranta b46d043a85 Queue Manager 2018-09-10 17:19:22 +02:00
Lucio Maranta 3a0e1bc2a4 Fix fileManager 
Added filePath config
 2018-09-04 17:06:54 +02:00
Lucio Maranta 2e22f4db3d Added api to modify offsets 
And magazine signalR
 2018-08-29 17:02:51 +02:00
Lucio Maranta 25c8948c73 Siemens upload&activate 2018-08-29 10:28:25 +02:00
Lucio Maranta f300423d47 Added new axes comparison 
New multipart manager
Added Siemens file manager
 2018-08-28 17:10:33 +02:00
Nicola Carminati 30a5477961 Added tranlsation in Heads Names 2018-08-08 12:09:48 +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 c3bc730982 Fix tool manager Osai update functions 
Fix UI
 2018-08-01 16:54:54 +02:00