Compare commits

...

53 Commits

Author SHA1 Message Date
f81b5c0a4e Merge pull request 'UPDATE WHOLE PROJECT' (#22) from beka into main
Reviewed-on: #22
2025-09-04 00:39:27 +00:00
b.makharadze
57d51dbf46 Update Tipper and MCM01, MCM02 2025-09-04 04:36:47 +04:00
b.makharadze
01fc2db279 Fix thumbnails and resources to all files 2025-09-01 15:53:57 +04:00
b.makharadze
012f7b21dd Update whole project 2025-09-01 13:55:43 +04:00
4f4dae8056 Merge pull request 'SAT9-236, SAT9-239, SAT9-237, SAT9-238, SAT9-241' (#21) from alarms-statistics-search into main
Reviewed-on: #21
2025-08-06 12:57:03 +00:00
3120744bb5 change tagprops 2025-08-06 13:21:29 +04:00
d325489641 Apply tags 2025-08-06 13:19:12 +04:00
ce78ab8ffa Add statuses, fix views. 2025-08-06 12:29:02 +04:00
193d5a309a Add thumbnails 2025-08-05 16:19:49 +04:00
5226f1da1c Add resources 2025-08-05 16:09:18 +04:00
cecec88011 Fix search, docked-east and symbols on all views 2025-08-05 15:41:00 +04:00
9cc78c5b27 SAT9-236, SAT9-239, SAT9-237 2025-08-04 19:34:47 +04:00
848644c03a Added Docked East Views 2025-08-01 19:17:51 +04:00
74005f7126 Updated Parent Project 2025-08-01 17:46:39 +04:00
a23c3dcaf8 Merge pull request 'SAT9-32' (#20) from guga into main
Reviewed-on: #20
2025-05-23 14:40:27 +00:00
gugak
6819fa396c fixed filter error 2025-05-22 19:04:06 +04:00
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
1056 changed files with 290915 additions and 56760 deletions

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,17 @@
{
"base": {
"style": {
"backgroundColor": "transparent",
"borderBottomColor": "var(--neutral-30)",
"borderBottomStyle": "solid",
"borderBottomWidth": "1px",
"color": "var(--neutral-80)",
"fontSize": "12px",
"fontWeight": "bold",
"paddingLeft": "6px",
"paddingRight": "6px",
"textTransform": "uppercase",
"fill": "var(--neutral-70)"
}
}
}

View File

@ -0,0 +1,15 @@
{
"base": {
"style": {
"backgroundColor": "#2B2B2B",
"borderColor": "#909090",
"borderStyle": "solid",
"borderWidth": "0.5px",
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontSize": "14px",
"fontWeight": "bold",
"textAlign": "center"
}
}
}

View File

@ -0,0 +1,13 @@
{
"base": {
"animation": {
"duration": "1s",
"keyframes": {
"0%": {
"backgroundColor": "#00CC00"
},
"100%": {}
}
}
}
}

View File

@ -0,0 +1,7 @@
{
"base": {
"style": {
"borderStyle": "none"
}
}
}

View File

@ -0,0 +1,8 @@
{
"base": {
"style": {
"backgroundColor": "transparent",
"margin": "1px"
}
}
}

View File

@ -0,0 +1,17 @@
{
"base": {
"style": {
"backgroundColor": "var(--error)",
"borderTopLeftRadius": "4px",
"borderTopRightRadius": "4px",
"borderBottomLeftRadius": "4px",
"borderBottomRightRadius": "4px",
"color": "var(--neutral-10)",
"fontSize": "12px",
"fontWeight": "bold",
"lineHeight": "16px",
"padding": "2px",
"textAlign": "center"
}
}
}

View File

@ -0,0 +1,7 @@
{
"base": {
"style": {
"color": "#808080"
}
}
}

View File

@ -0,0 +1,33 @@
{
"base": {
"style": {
"backgroundColor": "var(--neutral-10)",
"borderColor": "var(--warning)",
"borderStyle": "solid",
"borderWidth": "1px",
"boxShadow": "none",
"color": "var(--warning)",
"fontWeight": "normal",
"margin": "5px",
"textTransform": "uppercase",
"fill": "var(--warning)"
}
},
"variants": [
{
"pseudo": "hover",
"animation": {
"duration": "0.2s",
"direction": "normal",
"iterationCount": "1",
"timingFunction": "ease",
"keyframes": {
"0%": {},
"100%": {
"backgroundColor": "var(--neutral-20)"
}
}
}
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -0,0 +1,133 @@
{
"pages": {
"/": {
"title": "",
"viewPath": "Main-Views/Home"
},
"/Command": {
"title": "",
"viewPath": "Main-Views/CommandControl"
},
"/CustomView/:customView": {
"title": "",
"viewPath": "Custom-Views/Detail"
},
"/DetailedView/:detailedView/:plcTagPath": {
"title": "DetailedView",
"viewPath": "Detailed-Views/Detail"
},
"/DetailedView/MCM01 Bulk Inbound": {
"title": "",
"viewPath": "Detailed-Views/MCM01 Bulk Inbound"
},
"/DetailedView/MCM02 \u0026 MCM03 Fluid Inbound": {
"title": "",
"viewPath": "Detailed-Views/MCM02-MCM03 Fluid Inbound"
},
"/DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass": {
"title": "",
"viewPath": "Detailed-Views/MCM04-MCM05 Sorter Destination, chutes and Bypass"
},
"/Device-manager": {
"viewPath": "Main-Views/Device-Manager/DeviceManager"
},
"/Help": {
"title": "Help",
"viewPath": "Main-Views/Help"
},
"/MAP-Home": {
"title": "",
"viewPath": "Additional-Home-View/SAT9"
},
"/Monitron": {
"title": "",
"viewPath": "Main-Views/Monitron"
},
"/Oil": {
"viewPath": "Main-Views/OilMonitoring"
},
"/Temperature": {
"title": "",
"viewPath": "Main-Views/TempMonitoring"
},
"/Tools": {
"title": "Tools",
"viewPath": "Main-Views/ToolBox"
},
"/Windows/Statistics": {
"title": "",
"viewPath": "Windows/Statistics"
},
"/Windows/Status": {
"title": "",
"viewPath": "Windows/Status"
}
},
"sharedDocks": {
"bottom": [
{
"anchor": "fixed",
"autoBreakpoint": 480,
"content": "cover",
"handle": "show",
"iconUrl": "material/notifications_active",
"id": "Docked-South",
"modal": false,
"resizable": false,
"show": "onDemand",
"size": 165,
"viewParams": {},
"viewPath": "Navigation-Views/Docked-South"
}
],
"cornerPriority": "top-bottom",
"left": [
{
"anchor": "fixed",
"autoBreakpoint": 805,
"content": "auto",
"handle": "autoHide",
"iconUrl": "",
"id": "Docked-West",
"modal": false,
"resizable": false,
"show": "auto",
"size": 70,
"viewParams": {},
"viewPath": "Navigation-Views/Docked-West"
}
],
"right": [
{
"anchor": "fixed",
"autoBreakpoint": 480,
"content": "cover",
"handle": "hide",
"iconUrl": "",
"id": "Docked-East",
"modal": false,
"resizable": false,
"show": "onDemand",
"size": 400,
"viewParams": {},
"viewPath": "PopUp-Views/Controller-Equipment/Information-Docked-East"
}
],
"top": [
{
"anchor": "fixed",
"autoBreakpoint": 480,
"content": "auto",
"handle": "hide",
"iconUrl": "",
"id": "",
"modal": false,
"resizable": false,
"show": "visible",
"size": 50,
"viewParams": {},
"viewPath": "Framework/Breakpoint"
}
]
}
}

View File

@ -0,0 +1,7 @@
{
"base": {
"style": {
"backgroundColor": "#EEEEEE"
}
}
}

View File

@ -0,0 +1,17 @@
{
"base": {
"style": {
"backgroundColor": "var(--neutral-20)",
"borderBottomColor": "var(--neutral-30)",
"borderBottomStyle": "solid",
"borderBottomWidth": "1px",
"color": "var(--neutral-80)",
"fontSize": "12px",
"fontWeight": "bold",
"paddingLeft": "6px",
"paddingRight": "6px",
"textTransform": "uppercase",
"fill": "var(--neutral-70)"
}
}
}

View File

@ -0,0 +1,9 @@
{
"base": {
"style": {
"backgroundColor": "#FFFFFF",
"color": "#000000",
"fontFamily": "Arial"
}
}
}

View File

@ -0,0 +1,10 @@
{
"base": {
"style": {
"backgroundColor": "#00CC00",
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontWeight": "bold"
}
}
}

View File

@ -0,0 +1,13 @@
{
"base": {
"animation": {
"duration": "1s",
"keyframes": {
"0%": {
"backgroundColor": "#FF8000B3"
},
"100%": {}
}
}
}
}

View File

@ -0,0 +1,11 @@
{
"base": {
"style": {
"borderColor": "#CCCCCC",
"borderStyle": "solid",
"borderWidth": "1px",
"borderRadius": "4px",
"padding": "4px"
}
}
}

View File

@ -0,0 +1,13 @@
{
"base": {
"animation": {
"duration": "1s",
"keyframes": {
"0%": {
"backgroundColor": "#007DFA"
},
"100%": {}
}
}
}
}

View File

@ -44,6 +44,14 @@
"title": "Tools",
"viewPath": "Main-Views/ToolBox"
},
"/Windows/Statistics": {
"title": "",
"viewPath": ""
},
"/Windows/Status": {
"title": "",
"viewPath": ""
},
"/config": {
"title": "",
"viewPath": "CommissioningTool/PageConfig"

View File

@ -0,0 +1,16 @@
{
"base": {
"style": {
"cursor": "pointer",
"fill": "var(--callToAction)"
}
},
"variants": [
{
"pseudo": "hover",
"style": {
"fill": "var(--callToAction--hover)"
}
}
]
}

View File

@ -0,0 +1,15 @@
{
"base": {
"style": {
"backgroundColor": "#008000",
"borderColor": "#000000",
"borderStyle": "solid",
"borderWidth": "0.5px",
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontSize": "14px",
"fontWeight": "bold",
"textAlign": "center"
}
}
}

View File

@ -0,0 +1,7 @@
{
"base": {
"style": {
"fontWeight": "bold"
}
}
}

View File

@ -0,0 +1,8 @@
{
"base": {
"style": {
"backgroundColor": "#3B3B3B",
"color": "#FFFFFF"
}
}
}

View File

@ -0,0 +1,7 @@
{
"base": {
"style": {
"backgroundColor": "#FFDC00"
}
}
}

View File

@ -0,0 +1,9 @@
{
"base": {
"style": {
"backgroundColor": "#2F73BF",
"fontFamily": "Arial",
"fontSize": "12px"
}
}
}

View File

@ -0,0 +1,10 @@
{
"base": {
"style": {
"color": "var(--neutral-80)",
"fontSize": "min(2.0vw, 36px)",
"fontWeight": "bold",
"textAlign": "center"
}
}
}

View File

@ -0,0 +1,10 @@
{
"base": {
"style": {
"fontFamily": "Arial",
"fontSize": "10px",
"fontWeight": "bold",
"textAlign": "left"
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

View File

@ -0,0 +1,33 @@
{
"base": {
"style": {
"backgroundColor": "var(--neutral-10)",
"borderColor": "var(--success)",
"borderStyle": "solid",
"borderWidth": "1px",
"boxShadow": "none",
"color": "var(--success)",
"fontWeight": "normal",
"margin": "5px",
"textTransform": "uppercase",
"fill": "var(--success)"
}
},
"variants": [
{
"pseudo": "hover",
"animation": {
"duration": "0.2s",
"direction": "normal",
"iterationCount": "1",
"timingFunction": "ease",
"keyframes": {
"0%": {},
"100%": {
"backgroundColor": "var(--neutral-20)"
}
}
}
}
]
}

View File

@ -0,0 +1,13 @@
{
"base": {
"animation": {
"duration": "1s",
"keyframes": {
"0%": {
"backgroundColor": "#007EFCB3"
},
"100%": {}
}
}
}
}

View File

@ -0,0 +1,8 @@
{
"base": {
"style": {
"color": "#FAFAFA",
"fontSize": "14px"
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@ -6,9 +6,9 @@
"$": [
"ts",
192,
1715164723047
1746010658533
],
"$ts": 1715164723045
"$ts": 1746010658516
}
}
},
@ -235,6 +235,7 @@
"config": {
"path": "this.custom.s3URI"
},
"enabled": false,
"transforms": [
{
"code": "\treturn AWS.s3.getPresignedURL(self, value)",
@ -247,9 +248,10 @@
},
"props": {
"fit": {
"height": 40,
"height": 30,
"mode": "fill"
}
},
"source": "/system/images/Builtin/amazon_rme_logo.png"
},
"type": "ia.display.image"
},

View File

@ -0,0 +1,38 @@
def get_devices(fc):
tag_path = "[%s_SCADA_TAG_PROVIDER]Configuration/DetailedViews" % (fc)
tags_to_read = system.tag.readBlocking([tag_path])
devices = system.util.jsonDecode(tags_to_read[0].value)
device_list = []
for k,v in devices.items():
for i in v:
device_list.append(i)
return(device_list)
def reset_disconnect_tags(whid, device_list):
tags_to_write = []
values_to_write = []
for i in device_list:
tag_path = "[%s_SCADA_TAG_PROVIDER]%s/DCN" % (whid, i)
tags_to_write.append(tag_path)
values_to_write.append(0)
system.tag.writeAsync(tags_to_write, values_to_write)
def get_tag_paths(fc):
tags_to_read = system.tag.readBlocking(["Configuration/FC"])
fc = tags_to_read[0].value
results = system.tag.browse(path ="["+fc+"_SCADA_TAG_PROVIDER]", filter = {"recursive":True, "tagType": "Folder"})
tag_list = results.getResults()
source_list = []
items_to_exclude = ["Configuration", "System","_types_"]
for i in tag_list:
full_path = str(i["fullPath"])
try:
source_id = full_path.split("]")[1]
except IndexError:
continue
if source_id not in items_to_exclude:
item_to_add = {"value": source_id, "label": source_id}
source_list.append(item_to_add)
return(source_list)

View File

@ -0,0 +1,7 @@
{
"base": {
"style": {
"color": "#CCCCFF"
}
}
}

View File

@ -0,0 +1,13 @@
{
"base": {
"style": {
"backgroundColor": "#FAFAFA",
"borderColor": "#D5D5D5",
"borderStyle": "solid",
"borderWidth": "1px",
"borderRadius": "4px",
"boxShadow": "0px 2px 4px rgba(0, 0, 40, 0.15)",
"margin": "5px"
}
}
}

View File

@ -0,0 +1,10 @@
{
"base": {
"style": {
"backgroundColor": "#007DFA",
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontWeight": "bold"
}
}
}

View File

@ -0,0 +1,12 @@
{
"base": {
"style": {
"backgroundColor": "#AAAAAA",
"borderColor": "#808080",
"borderStyle": "none",
"color": "#555555",
"margin": "5px",
"fill": "#2B2B2B"
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

@ -0,0 +1,9 @@
{
"base": {
"style": {
"margin": "5px",
"marginLeft": "0px",
"marginRight": "0px"
}
}
}

View File

@ -0,0 +1,10 @@
{
"base": {
"style": {
"backgroundColor": "#FF0000",
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontWeight": "bold"
}
}
}

View File

@ -6,9 +6,9 @@
"$": [
"ts",
192,
1710802671820
1746012819449
],
"$ts": 1710802671820
"$ts": 1746012819449
}
}
},

View File

@ -0,0 +1,9 @@
{
"base": {
"style": {
"fontFamily": "Arial",
"fontSize": "10px",
"textAlign": "center"
}
}
}

View File

@ -0,0 +1,10 @@
{
"base": {
"style": {
"overflowWrap": "normal",
"paddingLeft": "4px",
"paddingRight": "4px",
"textAlign": "center"
}
}
}

Some files were not shown because too many files have changed in this diff Show More