 Lucio Maranta
|
6903513d0f
|
Merge branch 'feature/FixToolTable' into develop
|
2019-03-11 09:27:18 +01:00 |
|
|
Nicola Carminati
|
83f22592c8
|
Added Softkey "Visible" attribute + AutoIncrement Versioning
|
2019-03-07 16:39:09 +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 |
|
|
Nicola Carminati
|
9116c198cc
|
Fix Read M155
|
2019-02-26 17:56:01 +01:00 |
|
|
Lucio Maranta
|
0ed46d2d7b
|
Added new tool&family id management
|
2019-02-25 17:24:02 +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 |
|
|
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
|
bbc619ee66
|
Fix osai/fanuc
|
2019-02-07 17:23:55 +01:00 |
|
|
Lucio Maranta
|
6d22f38b77
|
WP10
General data
Pie chart
TimeLine chart
|
2019-02-01 13:02:33 +01:00 |
|
|
Lucio Maranta
|
9242987d76
|
Fix scada
WIP M154
|
2019-01-31 13:24:49 +01:00 |
|
|
Lucio Maranta
|
d40f5ba410
|
Fix
|
2019-01-30 16:49:02 +01:00 |
|
|
Lucio Maranta
|
153c31de56
|
Can load program && siemens tool data
|
2019-01-30 12:12:34 +01:00 |
|
|
Lucio Maranta
|
fbaeebb384
|
Added maxRight/Left
|
2019-01-25 11:54:06 +01:00 |
|
|
Lucio Maranta
|
1320962122
|
Fix scada image model
|
2019-01-22 10:39:18 +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
|
0339d82a65
|
Fix scada input enabled name
|
2019-01-17 10:19:00 +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
|
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 |
|
|
Lucio Maranta
|
c7f4805332
|
Fix alarms filter, removed "type" field added "sources" field
|
2019-01-10 10:10:56 +01:00 |
|
|
Lucio Maranta
|
3b0ea2854f
|
Fix network monitor thread
|
2019-01-08 10:03:56 +01:00 |
|
|
Lucio Maranta
|
2b0f3a2e5d
|
Fix model
|
2019-01-07 14:53:03 +01:00 |
|
|
Lucio Maranta
|
b4535fdc92
|
Fix alarmIds
|
2019-01-07 11:48:53 +01:00 |
|
|
Nicola Carminati
|
e130d2bfa5
|
Fix last commit
|
2018-12-28 15:36:17 +01:00 |
|
|
Nicola Carminati
|
9994ba10c0
|
Added Network card monitoring in Server
|
2018-12-28 15:17:49 +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
|
4a27b1dba4
|
WIP
|
2018-12-19 17:10:11 +01:00 |
|
|
Lucio Maranta
|
355067e963
|
First commit
|
2018-12-18 17:40:58 +01:00 |
|
|
Lucio Maranta
|
76b882ce19
|
Fix previus commit
|
2018-12-18 17:03:27 +01:00 |
|
|
Lucio Maranta
|
79bcf7d2fa
|
added maintainer data to closed maintenances
|
2018-12-17 16:11:46 +01:00 |
|
|
Lucio Maranta
|
2d01d818cf
|
Added axis type
Fix siemens part program info
Added unit of measure
|
2018-12-14 16:59:09 +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
|
0f15f2e367
|
Added OriginPosition
Fixed fanuc TT
& Minorfixes
|
2018-11-30 13:26:46 +01:00 |
|
|
Lucio Maranta
|
00c7297ee2
|
WIP minor fix
|
2018-11-26 17:26:38 +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 |
|