51 Commits

Author SHA1 Message Date
9ed9c0354b Merge pull request 'SAT9-30, SAT9-31' (#16) from beka-branch-2 into main
Reviewed-on: #16
2025-05-22 14:54:26 +00:00
01b7da9c2d Merge pull request 'SAT9-33' (#19) from SCADA into main
Reviewed-on: #19
2025-05-22 14:50:45 +00:00
dfd97f22ff SAT9-33 2025-05-22 18:49:48 +04:00
31d179234f Merge pull request 'SAT9-29, SAT9-28,SAT9-27,SAT9-26' (#18) from guga into main
Reviewed-on: #18
2025-05-22 14:31:14 +00:00
gugak
a0abbb0921 Removed extra devices from SCADA and corrected names 2025-05-22 18:19:17 +04:00
812761c394 Merge pull request 'SAT9-29, SAT9-28, SAT9-27, SAT9-26' (#17) from guga into main
Reviewed-on: #17
Reviewed-by: gigi.mamaladze <gigi.mamaladze@lci.ge>
2025-05-22 13:49:08 +00:00
gugak
4387c2d491 Added missing devices and corrected names 2025-05-22 17:42:06 +04:00
e8702101b6 Add MCM02 DPM devices 2025-05-22 17:33:34 +04:00
d3648490ca Add MCM01 DPM devices 2025-05-22 17:32:55 +04:00
c22ea334de Add DPMs and Ethernet 2025-05-22 17:31:34 +04:00
e3dbfa8231 SAT9-30, SAT9-31 2025-05-22 17:29:26 +04:00
758fb7a77c Changed dash to underscore 2025-05-19 18:15:41 +04:00
eacd66edd4 Merge pull request 'Fixed MCM04' (#15) from beka-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/15
2025-05-06 10:18:57 +00:00
eb0e449ada Fixed MCM04 2025-05-06 14:07:54 +04:00
e1d8513dc7 Merge pull request 'SAT9-28, SAT9-29, SAT9-32, SAT9-35, SAT9-37' (#14) from beka-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/14
2025-05-06 10:01:18 +00:00
46dfb12b69 SAT9-28, SAT9-29, SAT9-32, SAT9-35, SAT9-37 2025-05-06 13:22:40 +04:00
Gigi Mamaladze
00b1086530 Deleted unecessary files/views 2025-05-01 14:44:50 +04:00
Gigi Mamaladze
43cd7c5dea Added views, configured tags and fixed buttons 2025-05-01 14:38:04 +04:00
dd9a78840e Merge pull request 'Review and update chute/fio/estop names' (#12) from nk-branch-3 into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/12
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-30 16:51:51 +00:00
641191587a Review and update chute/fio/estop names 2025-04-30 07:14:18 -07:00
Gigi Mamaladze
7df8a2f684 Added perent project, tags, status and statistics windows 2025-04-30 16:33:24 +04:00
907805b5c1 Merge pull request 'SAT9-19, SAT9-20, SAT9-21' (#11) from nk-branch-2 into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/11
2025-04-30 10:50:40 +00:00
7bb8952f9e Add Elements 2025-04-24 06:23:02 -07:00
Gigi Mamaladze
d208c56486 SAT9-19, SAT9-20, SAT9-21 2025-04-22 19:13:43 +04:00
96007f24be Merge pull request 'SAT9-18' (#10) from beka-branch3 into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/10
2025-04-22 08:39:22 +00:00
13bb6f00bb SAT9-18 2025-04-22 12:29:41 +04:00
7234ac724b Merge pull request 'SAT9-17' (#9) from GK-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/9
2025-04-21 17:53:25 +00:00
261fb9f4e1 fixed names 2025-04-21 10:51:20 -07:00
b88719f42e navigation buttons 2025-04-21 10:45:15 -07:00
0f573839a0 Merge pull request 'SAT9-16' (#8) from nk-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/8
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-21 07:48:38 +00:00
6bc5ce9f56 Returned expresion 2025-04-21 11:47:23 +04:00
Gigi Mamaladze
2991f19ba0 deleted duplicated SCADA folder 2025-04-21 11:10:00 +04:00
5b3baad990 SAT9-16 2025-04-21 11:08:35 +04:00
c4642a9506 Merge pull request 'Updated chutes to NonPowered' (#7) from beka-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/7
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-21 06:57:35 +00:00
dbaeb09144 Updated chutes to NonPowered 2025-04-21 10:54:29 +04:00
e7c7b4f55f Merge pull request 'SAT9-14' (#6) from beka-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/6
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-21 06:51:09 +00:00
a8b4b0c51c SAT9-14 2025-04-21 10:47:50 +04:00
7c21700891 Merge pull request 'Added missing chevrons and updated svg' (#5) from GM-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/5
2025-04-18 19:55:50 +00:00
Gigi Mamaladze
683cb1fafe Added missing chevrons and updated svg 2025-04-18 23:55:04 +04:00
74504ac934 Merge pull request 'Renamed SAT9' (#4) from GM-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/4
2025-04-18 19:23:26 +00:00
Gigi Mamaladze
134b4129c3 Renamed SAT9 2025-04-18 23:21:57 +04:00
f78fe4bead Merge pull request 'SAT9-13' (#3) from GM-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/3
2025-04-18 18:45:03 +00:00
Gigi Mamaladze
d171466f45 SAT9-13 2025-04-18 22:43:54 +04:00
5611c9dd0a Merge pull request 'SAT9-12' (#2) from GK-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/2
2025-04-18 16:52:18 +00:00
db906e83ab fix the names in mcm02-mcm03 2025-04-18 09:38:40 -07:00
Gigi Mamaladze
2fb4c78bc1 Changed dataprovider 2025-04-18 20:30:57 +04:00
f685c7a8ab Merge pull request 'SAT9-11' (#1) from GK-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/1
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-18 16:25:28 +00:00
54b2c985e3 fix: chute 2025-04-18 09:22:07 -07:00
d7ab4c51e3 Chutes fix on mcm1 and overview 2025-04-18 09:16:09 -07:00
Gigi Mamaladze
b7b1178a1e Added .gitignore 2025-04-18 19:48:22 +04:00