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

82 Commits

Author SHA1 Message Date
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +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 58fefd3823 Minor fix siemens 2019-01-15 16:34:42 +01:00
Nicola Carminati e130d2bfa5 Fix last commit 2018-12-28 15:36:17 +01:00
Lucio Maranta 355067e963 First commit 2018-12-18 17:40:58 +01:00
Paolo Possanzini f29f2334d1 fix modali nc e modali azzeramento assi 2018-12-04 16:39:58 +01:00
Paolo Possanzini 1b746e0b0f Merge remote-tracking branch 'origin/develop' into develop 2018-12-03 14:39:29 +01:00
Paolo Possanzini 672cc9c670 compila - inizio il bugfixing dopo il refactoring 2018-11-21 12:35:25 +01:00
Lucio Maranta 209c14530f Fix Fanuc library 
WIP alarms filters
 2018-11-14 17:32:21 +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
Lucio Maranta 2294b52a65 Fix Siemens active file 
Fix machine counters
WIP Siemens axes name
 2018-11-07 17:27:44 +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
Lucio Maranta 110ab7be65 Alarm attachments 2018-10-24 11:25:38 +02:00
Lucio Maranta d85bb1fd0e Added alarm notes 
WIP Fanuc tool table
WIP Siemens Active program fix
 2018-10-23 17:33:00 +02:00
Nicola Carminati 3239909610 Added Production Title 2018-10-03 17:58:49 +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 aaa799d958 Fix config 2018-09-21 15:41:25 +02:00
Nicola Carminati adc6adfc11 Added Job Editor in Client CMS 2018-09-21 11:21:45 +02:00
Lucio Maranta 744b11ef6c Fix queue storage 2018-09-21 10:06:23 +02:00
Lucio Maranta 13a143957f Added macros API 
WIP Job backend
 2018-09-20 13:03:02 +02:00
Lucio Maranta 9653abacda Added value to custom job fields, added is job 
Fixed queue
 2018-09-19 16:46:44 +02:00
Lucio Maranta 18d979c50c Fix config 2018-09-11 12:15:57 +02:00
Lucio Maranta b46d043a85 Queue Manager 2018-09-10 17:19:22 +02:00
Lucio Maranta 726fd1242d Conf 2018-09-05 14:37:21 +02:00
Lucio Maranta 3a0e1bc2a4 Fix fileManager 
Added filePath config
 2018-09-04 17:06:54 +02:00
Lucio Maranta 5d6e66347d Fix config 2018-08-30 08:26:47 +02:00
Lucio Maranta 2e22f4db3d Added api to modify offsets 
And magazine signalR
 2018-08-29 17:02:51 +02:00
Lucio Maranta 0b435442e8 Fix osai options 2018-08-27 12:02:11 +02:00
Lucio Maranta 018b784056 Fix config 2018-08-23 15:04:37 +02:00
Lucio Maranta 914c9d28e9 Added following error&Dist to go Siemens 2018-08-23 13:03:35 +02:00
Lucio Maranta 9749ea56a7 WIP Siemens axes 2018-08-23 12:38:48 +02:00
Lucio Maranta 13d8274d8d WIP Family option 2018-08-22 17:12:36 +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 0e6af444d6 Fix merge 2018-08-03 13:16:07 +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 10610c481a Added merged library 2018-08-03 11:51:15 +02:00
Lucio Maranta bd7fbb1503 Add localized maintenances description 2018-07-10 15:07:37 +02:00
Lucio Maranta 30b72ff724 Added offset management 
Added family put
Model fix
 2018-07-05 17:11:45 +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 6315653d44 Fix file download 2018-06-21 16:08:45 +02:00
Lucio Maranta 16c33979d5 Fix update 
Added update maintenance
 2018-06-12 15:13:54 +02:00
Lucio Maranta 2b403685b1 Added list of maintenances api 
Create maintenance api
 2018-06-11 17:46:55 +02:00
Lucio Maranta 83cf50ecab Added fields to maintenances model and config 2018-06-05 16:26:08 +02:00
Nicola Carminati 138bce5b09 Fix Nc-softkey Name 2018-05-02 12:40:25 +02:00