Commit Graph

94 Commits

Author SHA1 Message Date
Lucio Maranta e1d6bd1f91 Fix duplicated user in alarms history 2020-02-25 11:35:44 +01:00
Lucio Maranta 3199ad99d5 Fix password maintenances
Added new machine number config field
2020-02-24 16:42:47 +01:00
Lucio Maranta d9e9c60315 First implementation of watchdog 2020-01-27 16:20:32 +01:00
Lucio Maranta 95e87f2ceb Fix installation date 2020-01-22 15:08:44 +01:00
Nicola Carminati 4c2a0c1c91 End of feature developing 2019-11-26 17:13:37 +01:00
Lucio Maranta 787582958c Fix style & renamed contacts 2019-10-23 16:48:02 +02:00
Lucio Maranta 1ea597af13 Fix Family Name (automatic) 2019-10-18 10:48:43 +02:00
Lucio Maranta 95a6d19cb1 1.3Version 2019-10-16 09:44:55 +02:00
Lucio Maranta f256a4e0f3 Added horizontal scroll to user softkey for long texts 2019-09-11 11:03:04 +02:00
Lucio Maranta 25a0d10d98 Fix integrated file edito
Refactor file names in constants
Fix fanuc upload images
2019-09-03 16:25:08 +02:00
Nicola Carminati 5d2544a2ae Added redis-Setup for Alarms 2019-08-28 11:57:05 +02:00
Nicola Carminati 563bcdb60f Wip Server & Client 2019-08-26 17:12:27 +02:00
Nicola Carminati eea1ecb6d2 Added Server CMSConnect Config 2019-08-22 10:41:57 +02:00
Lucio Maranta f4d1f91699 FIx available language &
Merge branch 'feature/SelectedToolData' into develop

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step/wwwroot/src/app_modules/production/components/head-production.vue
2019-08-19 16:44:14 +02:00
Lucio Maranta 0524cade83 Fix siemens blank screen bug
& fix siemens startup icon
2019-07-30 10:46:53 +02:00
Lucio Maranta cd03649e6c Added new box which enter from right to left
& New icon
2019-07-29 14:16:29 +02:00
Lucio Maranta 3c00401e61 WIP tool mounted in spindle data 2019-07-26 13:01:33 +02:00
Lucio Maranta 7b7399182a Fix production scada
Fix delete alarm attachment
Fix reload page after login
Added delete alarm-history
2019-06-29 16:10:42 +02:00
Lucio Maranta c7ac5de54e WIP custom main program 2019-06-18 15:43:45 +02:00
Lucio Maranta 7ce41d51bb WIP MGI Fanuc
WIP Override & process data
Fix maintainer
2019-06-06 12:45:50 +02:00
Lucio Maranta 306fa43593 Fix error messages
Fix frontend assistedTooling
Fix application closure
2019-05-15 17:28:21 +02:00
Lucio Maranta 8519c60e81 Fix scada textbox alignment
Added autoload tool from NC when database is created
WIP check option consistency
2019-05-14 17:27:16 +02:00
Nicola Carminati 240f27bb76 Fix Nullreference error on Opening window, adde SCADA validator 2019-05-10 17:23:57 +02:00
Nicola Carminati 796f0b32f3 Advanced User Management 2019-04-26 19:22:54 +02:00
Lucio Maranta 15b5ba8ca0 FIX WebApi bearer token authorization 2019-04-17 14:05:13 +02:00
Lucio Maranta 8d6c1fd39a Fix project options & setup 2019-04-10 17:22:55 +02:00
Nicola Carminati eab983d469 Fix SCM/CSM UI 2019-04-05 12:04:27 +02:00
Nicola Carminati 830221b178 Added client SCM/CMS options 2019-04-04 18:33:44 +02:00
Nicola Carminati 13169c7a54 Merge branch 'PSW' into develop 2019-04-02 08:21:34 +02:00
Nicola Carminati d8a5d2de6b Fix features 2019-04-01 12:57:44 +02:00
Lucio Maranta 0ad395bebf Fix import-export tool table
Fix mag position page
2019-03-29 12:38:55 +01:00
Nicola Carminati c519d82f1b Added configurations 2019-03-22 16:57:38 +01:00
Lucio Maranta 3eba8f1ab7 Fix Osai
Added images management to scada
2019-03-22 12:47:21 +01:00
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Nicola Carminati 13f5932754 Added configuration 2019-03-18 18:03:52 +01:00
Lucio Maranta 0da197ebf6 WIP assisisted tooling 2019-03-12 17:41:49 +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 0ed46d2d7b Added new tool&family id management 2019-02-25 17:24:02 +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 6d22f38b77 WP10
General data
Pie chart
TimeLine chart
2019-02-01 13:02:33 +01:00
Lucio Maranta d9a22655b8 Added labels to scada,
Remove network card monitor
2019-01-21 09:29:03 +01:00
Lucio Maranta 5c680f55dc Added API write scada value 2019-01-17 13:17:56 +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 0b63a0e0e6 WIP Scada
Added subribe
Added thread
Fix & refactor
2019-01-14 11:30:53 +01:00
Lucio Maranta e8e9a71a73 Fix demo loading file, moved demo and tmp file in C:/CMS/Active 2019-01-11 13:17:48 +01:00
Lucio Maranta 81d31f48ef Fix translations on plc messages 2019-01-11 11:09:17 +01:00
Nicola Carminati 9994ba10c0 Added Network card monitoring in Server 2018-12-28 15:17:49 +01:00
Lucio Maranta 355067e963 First commit 2018-12-18 17:40:58 +01:00
Lucio Maranta 4d5020665d Added Siemens/Demo M155 SignalR
WIP fix alarm filters
2018-11-15 13:29:15 +01:00