 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 |
|
|
Nicola Carminati
|
15f8e0e834
|
fix some styles
|
2018-08-02 16:54:15 +02:00 |
|
|
Nicola Carminati
|
cb5a98d06e
|
Fix unauthorized errors
|
2018-08-01 17:41:32 +02:00 |
|
|
Nicola Carminati
|
981c496634
|
Changed starting page
|
2018-08-01 17:05:50 +02:00 |
|
|
Lucio Maranta
|
c3bc730982
|
Fix tool manager Osai update functions
Fix UI
|
2018-08-01 16:54:54 +02:00 |
|
|
Nicola Carminati
|
3c8282387f
|
Fix WP6 program loading UI
|
2018-08-01 16:53:28 +02:00 |
|
|
Lucio Maranta
|
6594411105
|
Added deactivate program API
|
2018-07-31 17:12:49 +02:00 |
|
|
Nicola Carminati
|
a5f89520de
|
Fix
|
2018-07-31 16:39:14 +02:00 |
|
|
Nicola Carminati
|
851c96e666
|
Added new functionalities in program-info
|
2018-07-31 16:32:46 +02:00 |
|
|
Nicola Carminati
|
bc1d0a7e20
|
Fix queue on processes
|
2018-07-31 15:17:48 +02:00 |
|
|
Paolo Possanzini
|
c2430edea2
|
fix
|
2018-07-31 14:53:18 +02:00 |
|
|
Lucio Maranta
|
d3902dd203
|
Added update NC file when tool is updated by PLC
|
2018-07-31 14:32:37 +02:00 |
|
|
Paolo Possanzini
|
d0f9824995
|
commit
|
2018-07-31 14:16:35 +02:00 |
|
|
Nicola Carminati
|
ce1b6a87cc
|
First Try to Upload-file Async
|
2018-07-31 12:39:19 +02:00 |
|
|
Paolo Possanzini
|
45e5a903ea
|
fix
|
2018-07-31 10:47:24 +02:00 |
|
|
Paolo Possanzini
|
f7e7b79122
|
fix upload
|
2018-07-31 10:33:26 +02:00 |
|
|
Lucio Maranta
|
e9f47c90e1
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
|
2018-07-31 09:30:19 +02:00 |
|
|
Lucio Maranta
|
5ded98480b
|
Added upload to NC mock
|
2018-07-31 09:27:14 +02:00 |
|
|
Paolo Possanzini
|
17368ea354
|
fix
|
2018-07-30 18:17:57 +02:00 |
|
|
Paolo Possanzini
|
64ce49a3cf
|
fix
|
2018-07-30 18:01:38 +02:00 |
|
|
Paolo Possanzini
|
67a6255384
|
caricamento al CN dei programmi
|
2018-07-30 18:00:59 +02:00 |
|
|
Lucio Maranta
|
01553b84d8
|
Added active program broadcast at connection
|
2018-07-30 17:32:14 +02:00 |
|
|
Lucio Maranta
|
019939a616
|
Added active program management
|
2018-07-30 17:30:19 +02:00 |
|
|
Nicola Carminati
|
861726005d
|
Added softey preferred actions
|
2018-07-30 16:38:01 +02:00 |
|
|
Paolo Possanzini
|
167fb83113
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
|
2018-07-30 16:28:47 +02:00 |
|
|
Paolo Possanzini
|
05ea08223b
|
fix
|
2018-07-30 16:28:38 +02:00 |
|
|
Nicola Carminati
|
c49ff87500
|
Added awaiter function on all events
|
2018-07-30 16:28:24 +02:00 |
|
|
Paolo Possanzini
|
4d6e32cefd
|
fix
|
2018-07-30 16:19:23 +02:00 |
|
|
Paolo Possanzini
|
14d0ea044a
|
fix
|
2018-07-30 16:15:59 +02:00 |
|
|
Paolo Possanzini
|
196b58280d
|
layout ed elemento selezionato
|
2018-07-30 16:08:36 +02:00 |
|
|
Paolo Possanzini
|
6bf3783cdf
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
|
2018-07-30 15:39:47 +02:00 |
|
|
Paolo Possanzini
|
fc5e8831fa
|
layout e breadcrumb
|
2018-07-30 15:27:06 +02:00 |
|
|
Lucio Maranta
|
189f268d03
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
|
2018-07-30 14:45:45 +02:00 |
|
|
Lucio Maranta
|
51f04beb74
|
Fix file info
|
2018-07-30 14:42:11 +02:00 |
|
|
Paolo Possanzini
|
abadd2fed7
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
|
2018-07-30 13:26:30 +02:00 |
|
|
Paolo Possanzini
|
1665d635e1
|
cn files navigation
|
2018-07-30 13:26:23 +02:00 |
|
|
Nicola Carminati
|
59520cfcc2
|
implemented Technicians requests on Maintenace manager
|
2018-07-30 12:12:58 +02:00 |
|
|
Alessandro Francia
|
9f04c62858
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
|
2018-07-27 16:54:19 +02:00 |
|
|
Alessandro Francia
|
2ddd4f9741
|
improvements load program production
|
2018-07-27 16:53:56 +02:00 |
|
|
Nicola Carminati
|
ea17107ca0
|
Added Icon on Maintenance Creation
|
2018-07-27 16:37:09 +02:00 |
|
|
Nicola Carminati
|
60a755f6f4
|
Fix UI style technicians requests in Maintenance.
|
2018-07-27 16:32:57 +02:00 |
|
|
Lucio Maranta
|
9259c80154
|
Added file manager DEMO
|
2018-07-27 13:33:57 +02:00 |
|
|
Alessandro Francia
|
a2863ca9b5
|
filter search second column load program production
|
2018-07-27 11:21:55 +02:00 |
|
|
Alessandro Francia
|
5eac5bc6f6
|
improvements graphic load program production
|
2018-07-27 10:35:09 +02:00 |
|
|
Lucio Maranta
|
8bac6c2a63
|
Fix right&left check
|
2018-07-27 10:20:37 +02:00 |
|
|
Alessandro Francia
|
133a8f060c
|
fix load program
|
2018-07-26 17:12:00 +02:00 |
|
|
Lucio Maranta
|
e8c9c9104d
|
WIP
Check right&left before loading a tool
|
2018-07-26 13:25:12 +02:00 |
|
|
Lucio Maranta
|
746ff140c5
|
Added 8 bit status
Added update tool status & life thread/signalR
|
2018-07-25 17:47:33 +02:00 |
|
|
Alessandro Francia
|
072c173a97
|
fix load program production
|
2018-07-25 17:07:55 +02:00 |
|