Commit Graph

240 Commits

Author SHA1 Message Date
Lucio Maranta 09b6e4e009 Fix timeline date 2019-03-12 09:56:58 +01:00
Lucio Maranta c391a161c5 Fix tooltable
WIP Assisted tooling
2019-03-11 17:17:24 +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 4338e64d7d Fix frontend tool table
WIP password on maintenances
2019-03-06 17:00:56 +01:00
Lucio Maranta 21877760be Added pages to programs report 2019-03-06 14:15:44 +01:00
Lucio Maranta 321f6bd9e0 WIP maintenances with password
Fix Siemens library
2019-03-04 17:23:13 +01:00
Lucio Maranta f5e26fac77 Fix favorite softkey
Added origin & offset FANUC
2019-03-01 12:46:57 +01:00
Lucio Maranta 64c0c654d9 Added frequency to report 2019-02-26 10:17:33 +01:00
Lucio Maranta 0ed46d2d7b Added new tool&family id management 2019-02-25 17:24:02 +01:00
Lucio Maranta 4b735db1ee WP 10 program list 2019-02-25 14:21:12 +01:00
Lucio Maranta be9c0b6a2a Fix tool table
Added installation date
Added W10 programs api
2019-02-22 12:59:08 +01:00
Lucio Maranta 28783d3e02 Fixes
WIP WP10
2019-02-21 13:11:16 +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
Lucio Maranta 94fe44d055 Added user management 2019-02-19 17:13:18 +01:00
Lucio Maranta 0ac7982c93 Fix tooltable & maintenances 2019-02-18 12:03:40 +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 b8b8127eb0 Fix tool manager (backend-frontend) 2019-02-14 13:32:00 +01:00
Lucio Maranta 8db492a0df Fix alarms 2019-02-12 12:50: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 19cc6d83c9 Added mockup filters 2019-02-01 13:17:45 +01:00
Lucio Maranta 6d22f38b77 WP10
General data
Pie chart
TimeLine chart
2019-02-01 13:02:33 +01:00
Lucio Maranta dc94950fae Fix osai tool update 2019-01-28 16:50:40 +01:00
Lucio Maranta 9d97d3b43a Fix 2019-01-25 12:48:54 +01:00
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +01:00
Lucio Maranta 5c680f55dc Added API write scada value 2019-01-17 13:17:56 +01:00
Lucio Maranta 1aa5f1e37a Added mounted tool in loadinMag API 2019-01-17 12:33:37 +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 50dc27d480 Fix alarm note/file foreign keys and query 2019-01-14 14:57:30 +01:00
Lucio Maranta 0b63a0e0e6 WIP Scada
Added subribe
Added thread
Fix & refactor
2019-01-14 11:30:53 +01:00
Lucio Maranta c27f8ad3ef Added maintener in perform API 2019-01-11 11:48:10 +01:00
Lucio Maranta 81d31f48ef Fix translations on plc messages 2019-01-11 11:09:17 +01:00
Lucio Maranta c7f4805332 Fix alarms filter, removed "type" field added "sources" field 2019-01-10 10:10:56 +01:00
Lucio Maranta c379ed8f22 WIP Scada
Fanuc fix
2018-12-21 13:12:56 +01:00
Lucio Maranta ebfbfd2d9e Added API
WIP Thread
2018-12-20 13:18:06 +01:00
Lucio Maranta 5167ba49be Added new fields in siemens tool table
Fix axes position
fix alarms
2018-12-11 16:59:59 +01:00
Lucio Maranta b9a3c1bb1f Fix alarm api 2018-12-10 16:55:44 +01:00
Lucio Maranta 019f0cd5fc Fix siemens library
Minor Fixes
2018-12-04 16:51:12 +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 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