Commit Graph

142 Commits

Author SHA1 Message Date
Lucio Maranta 0ad395bebf Fix import-export tool table
Fix mag position page
2019-03-29 12:38:55 +01:00
Lucio Maranta 3ae585b734 Added import-export tool table
Added scada new image field "negate"
2019-03-28 13:03:35 +01:00
Lucio Maranta 63ecfc2820 Fix alarms user
Loadin magazine
2019-03-21 11:28:37 +01:00
Nicola Carminati ea4420dff7 Merge branch 'develop' into User_Manager 2019-03-20 16:28:19 +01:00
Nicola Carminati ec020e4b8e added "change password" feature 2019-03-20 15:41:00 +01:00
Lucio Maranta 5e25896c32 WIP Assisted tooling 2019-03-19 17:14:42 +01:00
Lucio Maranta 436c9efb21 FIX assisted tooling
Fix maintenances
2019-03-15 12:49:18 +01:00
Lucio Maranta f635419c30 WIP Assisted tooling
Fix sofkeys
2019-03-13 16:31:31 +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 321f6bd9e0 WIP maintenances with password
Fix Siemens library
2019-03-04 17:23:13 +01:00
Nicola Carminati 47b25f7343 Fix M154 codes on SIEMENS 2019-02-26 14:01:42 +01:00
Lucio Maranta 0ed46d2d7b Added new tool&family id management 2019-02-25 17:24:02 +01:00
Lucio Maranta c4761926f4 Fix users
Added Origins & active tool offset
2019-02-20 17:02:29 +01:00
Lucio Maranta d82bf59cfb Create User API 2019-02-20 09:40:20 +01:00
Nicola Carminati c690f175f5 First commit CMS-Connect M154 2019-02-19 20:04:31 +01:00
Lucio Maranta 94fe44d055 Added user management 2019-02-19 17:13:18 +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 ede0e5b926 Fix alarm & added autodelete 2019-02-12 16:58:20 +01:00
Lucio Maranta 8db492a0df Fix alarms 2019-02-12 12:50:55 +01:00
Lucio Maranta bc81d9fe25 Minor fixes 2019-02-11 17:02:31 +01:00
Lucio Maranta a0be095759 Fix alarm history 2019-02-08 16:41:25 +01:00
Lucio Maranta bbc619ee66 Fix osai/fanuc 2019-02-07 17:23:55 +01:00
Lucio Maranta 4bae9b4259 Added edit lock when tool is loaded in spindle
Fix OsaiFanuc delete tool
2019-02-05 13:31:23 +01:00
Lucio Maranta 9ee805a0fa Fixes 2019-01-28 11:24:27 +01:00
Nicola Carminati 5983e04788 Fix load tool on magazine in Server 2019-01-25 14:30:15 +01:00
Lucio Maranta 9d97d3b43a Fix 2019-01-25 12:48:54 +01:00
Lucio Maranta 2b165926ab Fix mounted shanks query 2019-01-25 12:22:28 +01:00
Lucio Maranta fbaeebb384 Added maxRight/Left 2019-01-25 11:54:06 +01:00
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +01:00
Lucio Maranta 50dc27d480 Fix alarm note/file foreign keys and query 2019-01-14 14:57:30 +01:00
Lucio Maranta c7f4805332 Fix alarms filter, removed "type" field added "sources" field 2019-01-10 10:10:56 +01:00
Lucio Maranta 79bcf7d2fa added maintainer data to closed maintenances 2018-12-17 16:11:46 +01:00
Lucio Maranta 0f15f2e367 Added OriginPosition
Fixed fanuc TT
& Minorfixes
2018-11-30 13:26:46 +01:00
Lucio Maranta bb31d3fe84 Fix fanuc
Added noUserLogged filter in Alarms
2018-11-22 17:30:59 +01:00
Lucio Maranta 0e009dc6ec Fanuc TT
& alarm Fixes
2018-11-21 17:26:58 +01:00
Lucio Maranta b1628f11d9 WriteM155 response 2018-11-16 12:06:22 +01:00
Lucio Maranta 4d5020665d Added Siemens/Demo M155 SignalR
WIP fix alarm filters
2018-11-15 13:29:15 +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 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 e47d48aea9 Added new alarm filter 2018-10-29 17:00:35 +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
Lucio Maranta a36c2aa951 Fix siemens shank
Added AlarmsData
2018-10-18 13:08:49 +02:00
Lucio Maranta 29c4747785 Merge branch 'feature/Remove_autoinc_from_db' into develop
# Conflicts:
#	Step.Database/Migrations/201809181022557_InitMigration.Designer.cs
#	Step.Database/Migrations/201809181022557_InitMigration.cs
#	Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
#	Step.Database/Migrations/201810041521424_InitMigration.cs
#	Step.Database/Migrations/201810100646276_InitMigration.Designer.cs
#	Step.Database/Migrations/201810100646276_InitMigration.cs
#	Step.Database/Step.Database.csproj
WIP Alarm
2018-10-16 16:57:46 +02:00
Lucio Maranta 5f3496a925 WIP Alarms 2018-10-15 16:16:53 +02:00
Lucio Maranta 23c173a82e WIP Alarm 2018-10-11 17:41:56 +02:00
Lucio Maranta 3d544a4a35 WIP Alarm test 2018-10-11 17:23:02 +02:00