508 Commits

Author SHA1 Message Date
2633c2703f fixed the alarm in the header 2025-06-24 16:18:26 +04:00
ce35a82503 Merge pull request 'Showing alarms on the controller statuses' (#139) from guga into main
Reviewed-on: #139
2025-06-24 12:08:47 +00:00
df315a30b3 Showing alarms on the controller statuses 2025-06-24 15:58:55 +04:00
38a0aa27cb Merge pull request 'Docked South alarm footer is funcitonal now. Minor adjustments in the Realtime View. Added missing recource file for the GetAlarmsWithCount sql query.' (#138) from guga into main
Reviewed-on: #138
2025-06-24 11:56:44 +00:00
dcc770fd51 Docked South alarm footer is funcitonal now. Minor adjustments in the Realtime View. Added missing recource file for the GetAlarmsWithCount sql query. 2025-06-24 14:30:36 +04:00
beka makharadze
de67dc9f54 MTN6-263 2025-06-24 11:53:52 +04:00
beka makharadze
965a4a1e66 MTN6-263 2025-06-24 11:18:04 +04:00
bd599b70b1 Merge pull request 'Alarms in Docked-VFD' (#136) from guga into main
Reviewed-on: #136
2025-06-23 13:57:08 +00:00
06bfc3cc2a Merge pull request 'Fix JR button and DeviceStatus' (#135) from beka-3 into main
Reviewed-on: #135
2025-06-23 13:36:56 +00:00
b.makharadze
cb067a18f8 Fix JR button and DeviceStatus 2025-06-23 17:34:53 +04:00
Salijoghli
0097bc907e Changed alarm colors in docked-vfd 2025-06-23 17:32:36 +04:00
Salijoghli
745a200047 showing PE alarms in the docked-vfd 2025-06-23 16:56:40 +04:00
ce9bba6ae9 Merge pull request 'updated alarm view. displaying plc tag. correctly fetching alarms data for history table' (#129) from kakhadze into main
Reviewed-on: #129
2025-06-23 12:06:30 +00:00
Salijoghli
b7f745ea64 Added no alarms texts to all tables 2025-06-23 15:50:04 +04:00
afafd1034d Merge pull request 'Handling normal chute' (#134) from beka-3 into main
Reviewed-on: #134
2025-06-23 11:40:39 +00:00
Salijoghli
e9843607db Added GetActiveAlarms named query, removed extra scripts in the active alarm table 2025-06-23 15:25:37 +04:00
b.makharadze
1a2c1b2d93 Handling normal chute 2025-06-23 15:10:26 +04:00
8d61f5e994 Merge pull request 'MTN6-259' (#133) from beka-3 into main
Reviewed-on: #133
2025-06-23 09:27:07 +00:00
Salijoghli
76e026896d Fixed the bug of seeing duplciate alarms in the historical alarms 2025-06-23 13:18:13 +04:00
b.makharadze
b4123c04fb Update props 2025-06-23 10:57:23 +04:00
b.makharadze
a75f6c6277 MTN6-259 2025-06-23 10:34:55 +04:00
Salijoghli
543c430448 Changed hardcoded alarm colors to classes 2025-06-20 21:13:53 +04:00
Salijoghli
a1203b24da Hit list and historical alarms now have colors based on priority 2025-06-20 19:01:01 +04:00
Salijoghli
88bdae9da4 Changed history export to csv file. 2025-06-20 18:39:28 +04:00
19cecfad9e Merge pull request 'Add Docked East Device Status' (#132) from beka-2 into main
Reviewed-on: #132
2025-06-20 14:10:21 +00:00
b.makharadze
602919b808 Add Docked East Device Status 2025-06-20 18:07:51 +04:00
afb24b15fe Merge pull request 'fixed the status bug in history' (#127) from guga into main
Reviewed-on: #127
2025-06-20 13:55:13 +00:00
d72618affd Merge pull request 'D2C Chutes' (#130) from d2c-chutes into main
Reviewed-on: #130
2025-06-20 13:55:00 +00:00
983193409e Merge pull request 'Updated DeviceStatus' (#131) from device-status into main
Reviewed-on: #131
2025-06-20 13:54:53 +00:00
b.makharadze
e828c854c1 Remove commands tab 2025-06-20 17:30:23 +04:00
Salijoghli
6682cea030 Modified sql code to fetch and display location in the historical table 2025-06-20 16:52:14 +04:00
b.makharadze
20768e84fa Updated DeviceStatus 2025-06-20 16:43:29 +04:00
Salijoghli
78bdb3ee82 Fixed the error of the export button not getting all the details correctly from table. 2025-06-20 16:39:23 +04:00
Salijoghli
2a734daf74 Removed shelve/unshelve buttons. Fixed the MCM not displaying correctly. Removed Shelved alarms view and created ALarm HIt List view. Created SQL query for the hit list table. 2025-06-20 16:01:05 +04:00
b.makharadze
f3ec8ee163 Updated D2C 2025-06-20 14:22:21 +04:00
b.makharadze
4d099b17e1 D2C Chutes 2025-06-20 12:27:14 +04:00
Salijoghli
4f78ab357a updated alarm view. displaying plc tag. correctly fetching alarms data for history table 2025-06-19 22:13:48 +04:00
cf8c302e03 MTN6-261 2025-06-18 16:23:14 +04:00
d04a4e5f35 Updated legend popup 2025-06-17 19:17:17 +04:00
Salijoghli
67e5b194c9 fixed dumpers bin files 2025-06-17 18:34:22 +04:00
Salijoghli
f860140612 Uploading the fixed view 2025-06-17 17:13:26 +04:00
Salijoghli
1438910882 fixed the status bug in history 2025-06-17 17:03:31 +04:00
f1308f2f52 Added Diverter Arm 2025-06-16 15:25:17 +04:00
5e28b9759c Added Global Start and Global Stop buttons 2025-06-16 14:12:38 +04:00
d288346069 Merge pull request 'MTN6-244' (#124) from beka-branch into main
Reviewed-on: #124
2025-06-14 13:06:56 +00:00
4f06afd19c Merge pull request 'MTN6-18' (#125) from guga into main
Reviewed-on: #125
2025-06-14 13:06:40 +00:00
5a1f902978 Merge pull request 'MTN6-245' (#126) from VFD-Docked into main
Reviewed-on: #126
2025-06-14 13:06:27 +00:00
6ed69c4c95 MTN6-245 2025-06-14 17:05:02 +04:00
b.makharadze
eb2cc91911 Fix priorities 2025-06-13 15:42:03 +04:00
b.makharadze
f8d22160d6 Fix priorities 2025-06-13 15:13:21 +04:00