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

139 Commits

Author SHA1 Message Date
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 1cba58baac Fix load in magazine 
Fix unload into shank
 2018-08-03 11:21:29 +02:00
Lucio Maranta c3bc730982 Fix tool manager Osai update functions 
Fix UI
 2018-08-01 16:54:54 +02:00
Lucio Maranta 6594411105 Added deactivate program API 2018-07-31 17:12:49 +02:00
Nicola Carminati ce1b6a87cc First Try to Upload-file Async 2018-07-31 12:39:19 +02:00
Lucio Maranta 5ded98480b Added upload to NC mock 2018-07-31 09:27:14 +02:00
Lucio Maranta 019939a616 Added active program management 2018-07-30 17:30:19 +02:00
Lucio Maranta 51f04beb74 Fix file info 2018-07-30 14:42:11 +02:00
Lucio Maranta 9259c80154 Added file manager DEMO 2018-07-27 13:33:57 +02:00
Lucio Maranta 8bac6c2a63 Fix right&left check 2018-07-27 10:20:37 +02:00
Lucio Maranta e8c9c9104d WIP 
Check right&left before loading a tool
 2018-07-26 13:25:12 +02:00
Lucio Maranta 9a961a8a7b WIP 
Read updated tool life and status
 2018-07-24 17:27:11 +02:00
Lucio Maranta a0630adf43 Added strobe management 
Added auto-populate magazine position at startup
 2018-07-23 17:23:27 +02:00
Lucio Maranta 547c6f7483 Added tooling start/stop 2018-07-17 17:09:25 +02:00
Lucio Maranta a2f7a97485 Fix osai file writing 
Testing transaction
 2018-07-17 14:36:53 +02:00
Lucio Maranta 5e81d377fd WIP start&stop edit magazine 2018-07-16 17:29:58 +02:00
Lucio Maranta 9f5dadfc49 Added softkey data in the Favorite softkey API 2018-07-12 15:54:46 +02:00
Lucio Maranta e81e705f78 Fix add favorite key 2018-07-12 12:55:23 +02:00
Lucio Maranta 7e9d0dfe97 Added favorite softkey API 2018-07-12 11:41:37 +02:00
Lucio Maranta e124cb511c Added start/stop edit OSAI 
WIP write file
 2018-07-12 10:05:28 +02:00
Lucio Maranta bd7fbb1503 Add localized maintenances description 2018-07-10 15:07:37 +02:00
Lucio Maranta 243fbb37b6 Added load/unload into shank 
Fixed magazine position returned data
WIP loading/unloading rules
 2018-07-09 13:02:16 +02:00
Lucio Maranta 28e65cbdda Fix tool update 2018-07-05 17:35:34 +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 d461fde0e8 Added load/Unloading in magazine 
Available tools/mounted tools
Added Osai configuration
 2018-07-02 17:31:11 +02:00
Lucio Maranta 028770dd0a Added PUT & DELETE API 2018-06-28 17:20:47 +02:00
Lucio Maranta b5d499e6ed WIP Added family/tool/shank add API 2018-06-27 13:01:15 +02:00
Lucio Maranta 8c8e168832 Added models and GET API 2018-06-26 17:21:58 +02:00
Lucio Maranta a791886cea Fix tool api 2018-06-25 16:17:51 +02:00
Lucio Maranta 2037b6d173 Added user in attachment 
Check userId before delete attachment
New database
 2018-06-22 12:04:55 +02:00
Lucio Maranta db9e32e366 Fix header 2018-06-21 16:41:31 +02:00
Lucio Maranta 1fc2629979 Fix download image 2018-06-21 16:24:37 +02:00
Lucio Maranta 6315653d44 Fix file download 2018-06-21 16:08:45 +02:00
Lucio Maranta c86d7bf56b Merge branch 'feature/Attachments' into develop 
# Conflicts:
#	Step/Controllers/WebApi/MaintenanceController.cs
 2018-06-19 17:12:44 +02:00
Lucio Maranta c636745421 Fix maintenance attachments API 2018-06-19 17:06:03 +02:00
Lucio Maranta 5e46caab8d fix returned data in performed api 2018-06-19 15:42:53 +02:00
Lucio Maranta 8151ca9154 Added return value to perform value 2018-06-19 14:26:32 +02:00
Lucio Maranta 34c50889ef Added: 
- CanPerform field
- Perform maintenance API
 2018-06-19 11:13:48 +02:00
Lucio Maranta 4802ff09c9 Added maintenance attachments API 2018-06-18 17:17:14 +02:00
Lucio Maranta 90938fab20 Added delete And update note 
And bug fixing
 2018-06-14 14:56:10 +02:00
Lucio Maranta c3fa10c899 Fix canEdit field in maintenance model 2018-06-14 09:21:28 +02:00
Lucio Maranta 81b4c60abd Added delete maintenance 
GET/POST maintenance note API
 2018-06-13 14:36:15 +02:00
Lucio Maranta 16c33979d5 Fix update 
Added update maintenance
 2018-06-12 15:13:54 +02:00
Lucio Maranta 8afd17c2e1 Merge branch 'feature/MaintenancesWP5' into develop 2018-06-11 17:48:21 +02:00
Lucio Maranta 2b403685b1 Added list of maintenances api 
Create maintenance api
 2018-06-11 17:46:55 +02:00
Lucio Maranta c35bbbf911 Fix Nc Data API 2018-06-06 16:23:36 +02:00
Lucio Maranta 0d8b897385 Added response into load/unload 2018-05-30 16:50:44 +02:00
Lucio Maranta b3b2632e8e Fix siemens library 
Change load/unload in magazine API
 2018-05-30 15:09:24 +02:00