366 Commits

Author SHA1 Message Date
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
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
3825881350 Merge pull request 'beka-branch' (#123) from beka-branch into main
Reviewed-on: #123
2025-06-12 12:08:12 +00:00
b.makharadze
77ca1115a0 Add proper filter for name to JR-PB docked east 2025-06-12 16:02:21 +04:00
b.makharadze
beb0195875 Add show buttons 2025-06-12 15:54:42 +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
5a8e0b2466 Button tags fix 2025-06-10 17:26:08 +04:00
b.makharadze
3597b34f08 Added Button tags 2025-06-10 17:11:38 +04: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
Salijoghli
1c095306e0 alarms 2025-06-10 11:43:11 +04:00
2c4ec92ad5 Updated Simulation_tags and deleted unecessary tag files 2025-06-08 18:09:36 +04:00
e14fe5c435 Added JR Docked East view 2025-06-06 21:55:04 +04:00
b.makharadze
c329e5a3b1 Added Filters for Buttons 2025-06-06 18:10:04 +04:00
b.makharadze
ca777e9ba1 Updates for JR PB button 2025-06-06 14:29:34 +04:00
d3d383b240 Merge pull request 'Update Status view' (#117) from Chevron into main
Reviewed-on: #117
2025-06-05 15:28:04 +00:00
448fe2acae Update Status view 2025-06-05 19:26:59 +04:00
575619a166 Merge pull request 'MTN6-235' (#116) from beka-5 into main
Reviewed-on: #116
2025-06-05 12:51:05 +00:00
b.makharadze
911e613623 Updates to PullChords in parent project 2025-06-05 16:01:21 +04:00
b.makharadze
530e5922b4 MTN6-235 2025-06-04 17:28:52 +04:00
b12691d9a1 Delete Tags.json 2025-06-03 12:54:21 +04:00
b1880f02eb MTN6-251 2025-06-03 12:52:53 +04:00
9c40ab34a0 Merge pull request 'MTN6-19, MTN6-20' (#104) from beka-4 into main
Reviewed-on: #104
2025-06-02 15:41:49 +00:00
b.makharadze
adacc8053b Switch Scanner History to MariaDB 2025-05-29 14:13:56 +04:00
b.makharadze
864bfb126d Switch names 2025-05-29 13:45:07 +04:00
b.makharadze
febb8949f4 Fix query 2025-05-29 13:39:43 +04:00
9aec693ad5 Merge pull request 'MTN6-222-29' (#115) from gugaa into main
Reviewed-on: #115
2025-05-29 08:37:22 +00:00
b.makharadze
d7ca58aa3e Fix query 2025-05-29 11:53:42 +04:00
b.makharadze
831045d5c6 Fix query 2025-05-29 11:43:30 +04:00
b.makharadze
506b860093 Add S02_130CH and S02_230CH 2025-05-29 10:35:42 +04:00
b.makharadze
14be86bf91 Remove useless files 2025-05-28 18:00:22 +04:00