Commit Graph

Select branches

Hide Pull Requests

beka

beka-1

beka-2

beka-4

guga

guga1

main

updated-tags

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• e4e1d27b4f header stil showed null and this time its fixed for good lol guga kakhadze 2025-06-26 21:44:18 +04:00
• e5acbda785 Glowing by priority guga kakhadze 2025-06-26 21:30:08 +04:00
• 458a3e1d7e Merge pull request 'Update PullChord' (#144) from beka-pullchord into main gigi.mamaladze 2025-06-26 15:33:12 +00:00
• 79b6c8b136 Merge pull request 'recource json files were missing' (#145) from guga into main gigi.mamaladze 2025-06-26 14:47:30 +00:00
• e44b5d2bc1 recource json files were missing guga kakhadze 2025-06-26 18:40:23 +04:00
• ee6f3d7d76 Merge pull request 'MCM' (#142) from beka-MCM into main gigi.mamaladze 2025-06-26 14:26:21 +00:00
• f06f72bfcf Merge pull request 'Alarm click events' (#143) from guga into main gigi.mamaladze 2025-06-26 14:25:58 +00:00
• 729a1b6cda getting device and fulltag from the database in active alarms, but not showing in the table. using them to find the highlight the component guga kakhadze 2025-06-26 17:29:58 +04:00
• 1b4dfeffe2 Fixed the header texts overlap. Fixed the active alarms showing null error guga kakhadze 2025-06-26 17:25:51 +04:00
• 6ad1847adc Modified the alarm row click event to handle the case when alarm comes from the MCM. Now highliting the component is universal and no longer requires params or extra bindings. guga kakhadze 2025-06-26 17:06:50 +04:00
• bb13144029 Update PullChord beka makharadze 2025-06-26 16:26:57 +04:00
• f98724dad6 when clicking on the photoeye alarm highlighting the conveyor it is based on guga kakhadze 2025-06-26 15:48:03 +04:00
• 0abb58ffdd first version of showing the alarm in the detailed view when clicking on it in the alarms table guga kakhadze 2025-06-26 14:03:40 +04:00
• 1e311e3c36 Fix button colors beka makharadze 2025-06-26 13:08:27 +04:00
• 7c3d8b70ba Fix Disconnect beka makharadze 2025-06-26 11:21:05 +04:00
• 8242a5bfb6 Update dock beka makharadze 2025-06-25 19:05:07 +04:00
• 59deaf9192 Merge pull request 'Fix' (#141) from project-fix into main gigi.mamaladze 2025-06-25 12:16:50 +00:00
• df526725c2 MCM Symbol and Docked-East beka makharadze 2025-06-25 16:11:24 +04:00
• ecd305570d Fix beka makharadze 2025-06-25 13:28:55 +04:00
• 13a0a49fc3 Merge pull request 'MTN6-263' (#137) from beka-3 into main gigi.mamaladze 2025-06-24 13:12:35 +00:00
• 28f62b23a8 Merge pull request 'fixed the alarm in the header' (#140) from guga into main gigi.mamaladze 2025-06-24 12:40:38 +00:00
• 2633c2703f fixed the alarm in the header guga kakhadze 2025-06-24 16:18:26 +04:00
• ce35a82503 Merge pull request 'Showing alarms on the controller statuses' (#139) from guga into main gigi.mamaladze 2025-06-24 12:08:47 +00:00
• df315a30b3 Showing alarms on the controller statuses guga kakhadze 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 gigi.mamaladze 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. guga kakhadze 2025-06-24 14:30:36 +04:00
• de67dc9f54 MTN6-263 beka makharadze 2025-06-24 11:53:52 +04:00
• 965a4a1e66 MTN6-263 beka makharadze 2025-06-24 11:18:04 +04:00
• bd599b70b1 Merge pull request 'Alarms in Docked-VFD' (#136) from guga into main gigi.mamaladze 2025-06-23 13:57:08 +00:00
• 06bfc3cc2a Merge pull request 'Fix JR button and DeviceStatus' (#135) from beka-3 into main gigi.mamaladze 2025-06-23 13:36:56 +00:00
• cb067a18f8 Fix JR button and DeviceStatus b.makharadze 2025-06-23 17:34:53 +04:00
• 0097bc907e Changed alarm colors in docked-vfd Salijoghli 2025-06-23 17:32:36 +04:00
• 745a200047 showing PE alarms in the docked-vfd Salijoghli 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 gigi.mamaladze 2025-06-23 12:06:30 +00:00
• b7f745ea64 Added no alarms texts to all tables Salijoghli 2025-06-23 15:50:04 +04:00
• afafd1034d Merge pull request 'Handling normal chute' (#134) from beka-3 into main gigi.mamaladze 2025-06-23 11:40:39 +00:00
• e9843607db Added GetActiveAlarms named query, removed extra scripts in the active alarm table Salijoghli 2025-06-23 15:25:37 +04:00
• 1a2c1b2d93 Handling normal chute b.makharadze 2025-06-23 15:10:26 +04:00
• 8d61f5e994 Merge pull request 'MTN6-259' (#133) from beka-3 into main gigi.mamaladze 2025-06-23 09:27:07 +00:00
• 76e026896d Fixed the bug of seeing duplciate alarms in the historical alarms Salijoghli 2025-06-23 13:18:13 +04:00
• b4123c04fb Update props b.makharadze 2025-06-23 10:57:23 +04:00
• a75f6c6277 MTN6-259 b.makharadze 2025-06-23 10:34:55 +04:00
• 543c430448 Changed hardcoded alarm colors to classes Salijoghli 2025-06-20 21:13:53 +04:00
• a1203b24da Hit list and historical alarms now have colors based on priority Salijoghli 2025-06-20 19:01:01 +04:00
• 88bdae9da4 Changed history export to csv file. Salijoghli 2025-06-20 18:39:28 +04:00
• 19cecfad9e Merge pull request 'Add Docked East Device Status' (#132) from beka-2 into main gigi.mamaladze 2025-06-20 14:10:21 +00:00
• 602919b808 Add Docked East Device Status b.makharadze 2025-06-20 18:07:51 +04:00
• afb24b15fe Merge pull request 'fixed the status bug in history' (#127) from guga into main gigi.mamaladze 2025-06-20 13:55:13 +00:00
• d72618affd Merge pull request 'D2C Chutes' (#130) from d2c-chutes into main gigi.mamaladze 2025-06-20 13:55:00 +00:00
• 983193409e Merge pull request 'Updated DeviceStatus' (#131) from device-status into main gigi.mamaladze 2025-06-20 13:54:53 +00:00
• e828c854c1 Remove commands tab b.makharadze 2025-06-20 17:30:23 +04:00
• 6682cea030 Modified sql code to fetch and display location in the historical table Salijoghli 2025-06-20 16:52:14 +04:00
• 20768e84fa Updated DeviceStatus b.makharadze 2025-06-20 16:43:29 +04:00
• 78bdb3ee82 Fixed the error of the export button not getting all the details correctly from table. Salijoghli 2025-06-20 16:39:23 +04:00
• 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. Salijoghli 2025-06-20 16:01:05 +04:00
• f3ec8ee163 Updated D2C b.makharadze 2025-06-20 14:22:21 +04:00
• 4d099b17e1 D2C Chutes b.makharadze 2025-06-20 12:27:14 +04:00
• 4f78ab357a updated alarm view. displaying plc tag. correctly fetching alarms data for history table Salijoghli 2025-06-19 22:13:48 +04:00
• 6cc5c35598 modified real time alarm view. showing plc tags in the active tab. fetching all alarms correctly for history tab. changed sql logic guga1 Salijoghli 2025-06-19 21:42:44 +04:00
• cf8c302e03 MTN6-261 gigi.mamaladze 2025-06-18 16:23:14 +04:00
• d04a4e5f35 Updated legend popup gigi.mamaladze 2025-06-17 19:17:17 +04:00
• 67e5b194c9 fixed dumpers bin files Salijoghli 2025-06-17 18:34:22 +04:00
• f860140612 Uploading the fixed view Salijoghli 2025-06-17 17:13:26 +04:00
• 1438910882 fixed the status bug in history Salijoghli 2025-06-17 17:03:31 +04:00
• f1308f2f52 Added Diverter Arm gigi.mamaladze 2025-06-16 15:25:17 +04:00
• 5e28b9759c Added Global Start and Global Stop buttons gigi.mamaladze 2025-06-16 14:12:38 +04:00
• d288346069 Merge pull request 'MTN6-244' (#124) from beka-branch into main gigi.mamaladze 2025-06-14 13:06:56 +00:00
• 4f06afd19c Merge pull request 'MTN6-18' (#125) from guga into main gigi.mamaladze 2025-06-14 13:06:40 +00:00
• 5a1f902978 Merge pull request 'MTN6-245' (#126) from VFD-Docked into main gigi.mamaladze 2025-06-14 13:06:27 +00:00
• 6ed69c4c95 MTN6-245 gigi.mamaladze 2025-06-14 17:05:02 +04:00
• eb2cc91911 Fix priorities b.makharadze 2025-06-13 15:42:03 +04:00
• f8d22160d6 Fix priorities b.makharadze 2025-06-13 15:13:21 +04:00
• fcab83262d Fix errors for info tab change enable button b.makharadze 2025-06-13 10:51:52 +04:00
• 310db0aed6 refactored active alarm table Salijoghli 2025-06-12 19:45:58 +04:00
• 8b819f2da7 Removed light b.makharadze 2025-06-12 18:42:04 +04:00
• 661be69981 Docked-East view for StatusNonPowered b.makharadze 2025-06-12 17:59:22 +04:00
• 3825881350 Merge pull request 'beka-branch' (#123) from beka-branch into main gigi.mamaladze 2025-06-12 12:08:12 +00:00
• 77ca1115a0 Add proper filter for name to JR-PB docked east b.makharadze 2025-06-12 16:02:21 +04:00
• beb0195875 Add show buttons b.makharadze 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 gigi.mamaladze 2025-06-12 10:32:43 +00:00
• dc3304847f Add Pallet Build Logic to MCM04, Change StatusNonPowered b.makharadze 2025-06-12 14:12:37 +04:00
• 92abdc8d4e Merge pull request 'MTN6-18' (#120) from guga into main gigi.mamaladze 2025-06-11 13:18:55 +00:00
• ef264bbed4 Giving same priority colors in the shelved table and fixed unshelving UI bug Salijoghli 2025-06-11 14:32:11 +04:00
• 34b16fa31c Merge pull request 'MTN6-253, MTN6-247' (#121) from beka-7 into main gigi.mamaladze 2025-06-10 13:32:26 +00:00
• 5a8e0b2466 Button tags fix b.makharadze 2025-06-10 17:26:08 +04:00
• 3597b34f08 Added Button tags b.makharadze 2025-06-10 17:11:38 +04:00
• f802c5a863 MTN6-253, MTN6-247 b.makharadze 2025-06-10 16:52:32 +04:00
• b0b2751ad7 modified refresh rate, changed colors of the alarms and fixed diagnostic alarms not dispalying bug Salijoghli 2025-06-10 14:26:25 +04:00
• b256a52671 Export button on the alarm history. exports whats seen Salijoghli 2025-06-10 13:37:28 +04:00
• 12307a17e8 Merge pull request 'Updates for JR PB button' (#118) from beka-5 into main gigi.mamaladze 2025-06-10 08:58:02 +00:00
• 5e03d48ced fixed filtering in the history Salijoghli 2025-06-10 12:33:06 +04:00
• 94b46b151d fix conflicts b.makharadze 2025-06-10 11:52:45 +04:00
• a5a556a258 Merge pull request 'MTN6-18' (#119) from guga into main gigi.mamaladze 2025-06-10 07:47:13 +00:00
• 1c095306e0 alarms Salijoghli 2025-06-10 11:43:11 +04:00
• 2c4ec92ad5 Updated Simulation_tags and deleted unecessary tag files gigi.mamaladze 2025-06-08 18:09:36 +04:00
• e14fe5c435 Added JR Docked East view gigi.mamaladze 2025-06-06 21:55:04 +04:00
• c329e5a3b1 Added Filters for Buttons b.makharadze 2025-06-06 18:10:04 +04:00
• ca777e9ba1 Updates for JR PB button b.makharadze 2025-06-06 14:29:34 +04:00
• d3d383b240 Merge pull request 'Update Status view' (#117) from Chevron into main gigi.mamaladze 2025-06-05 15:28:04 +00:00
• 448fe2acae Update Status view gigi.mamaladze 2025-06-05 19:26:59 +04:00