90 Commits

Author SHA1 Message Date
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
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
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
Salijoghli
76e026896d Fixed the bug of seeing duplciate alarms in the historical alarms 2025-06-23 13:18:13 +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
d72618affd Merge pull request 'D2C Chutes' (#130) from d2c-chutes into main
Reviewed-on: #130
2025-06-20 13:55:00 +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
f1308f2f52 Added Diverter Arm 2025-06-16 15:25:17 +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
b.makharadze
fcab83262d Fix errors for info tab change enable button 2025-06-13 10:51:52 +04:00
Salijoghli
310db0aed6 refactored active alarm table 2025-06-12 19:45:58 +04:00
b.makharadze
8b819f2da7 Removed light 2025-06-12 18:42:04 +04:00
b.makharadze
661be69981 Docked-East view for StatusNonPowered 2025-06-12 17:59:22 +04:00
b.makharadze
77ca1115a0 Add proper filter for name to JR-PB docked east 2025-06-12 16:02:21 +04:00
4c23e73e54 Merge pull request 'Add Pallet Build Logic to MCM04, Change StatusNonPowered' (#122) from beka-branch into main
Reviewed-on: #122
2025-06-12 10:32:43 +00:00
b.makharadze
dc3304847f Add Pallet Build Logic to MCM04, Change StatusNonPowered 2025-06-12 14:12:37 +04:00
92abdc8d4e Merge pull request 'MTN6-18' (#120) from guga into main
Reviewed-on: #120
2025-06-11 13:18:55 +00:00
Salijoghli
ef264bbed4 Giving same priority colors in the shelved table and fixed unshelving UI bug 2025-06-11 14:32:11 +04:00
34b16fa31c Merge pull request 'MTN6-253, MTN6-247' (#121) from beka-7 into main
Reviewed-on: #121
2025-06-10 13:32:26 +00:00
b.makharadze
f802c5a863 MTN6-253, MTN6-247 2025-06-10 16:52:32 +04:00
Salijoghli
b0b2751ad7 modified refresh rate, changed colors of the alarms and fixed diagnostic alarms not dispalying bug 2025-06-10 14:26:25 +04:00
Salijoghli
b256a52671 Export button on the alarm history. exports whats seen 2025-06-10 13:37:28 +04:00
12307a17e8 Merge pull request 'Updates for JR PB button' (#118) from beka-5 into main
Reviewed-on: #118
2025-06-10 08:58:02 +00:00
Salijoghli
5e03d48ced fixed filtering in the history 2025-06-10 12:33:06 +04:00
b.makharadze
94b46b151d fix conflicts 2025-06-10 11:52:45 +04:00
a5a556a258 Merge pull request 'MTN6-18' (#119) from guga into main
Reviewed-on: #119
2025-06-10 07:47:13 +00:00