diff --git a/.resources/09cd2c241e175cc66ec93c1dc74607bc670554d1488bef7a3c725014dad2ed9d b/.resources/09cd2c241e175cc66ec93c1dc74607bc670554d1488bef7a3c725014dad2ed9d new file mode 100644 index 00000000..0a11c204 Binary files /dev/null and b/.resources/09cd2c241e175cc66ec93c1dc74607bc670554d1488bef7a3c725014dad2ed9d differ diff --git a/.resources/127f05fc1605e48a6bf0dd9e2ed077735ea899855ae995e56e6d11d06ab76e53 b/.resources/0df3e8269d560bc7a340ed7a259fdf95ba1799349fd95d737c0d1de455a19d65 similarity index 81% rename from .resources/127f05fc1605e48a6bf0dd9e2ed077735ea899855ae995e56e6d11d06ab76e53 rename to .resources/0df3e8269d560bc7a340ed7a259fdf95ba1799349fd95d737c0d1de455a19d65 index 7572a70a..d9402ade 100644 --- a/.resources/127f05fc1605e48a6bf0dd9e2ed077735ea899855ae995e56e6d11d06ab76e53 +++ b/.resources/0df3e8269d560bc7a340ed7a259fdf95ba1799349fd95d737c0d1de455a19d65 @@ -337,6 +337,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", @@ -587,6 +631,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", @@ -641,6 +729,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", @@ -708,6 +840,34 @@ "size": 600, "viewParams": {}, "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" } ], "top": [ @@ -764,6 +924,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", diff --git a/.resources/16e9d7308d2a813f55e1a8322272fd0671372c8f807b8f68c69503f2c100e655 b/.resources/16e9d7308d2a813f55e1a8322272fd0671372c8f807b8f68c69503f2c100e655 new file mode 100644 index 00000000..3d0031d5 Binary files /dev/null and b/.resources/16e9d7308d2a813f55e1a8322272fd0671372c8f807b8f68c69503f2c100e655 differ diff --git a/.resources/19bec8cadac97c26da67b11e66a265cf110ddfbd7cfe05406109fee1e84c957c b/.resources/19bec8cadac97c26da67b11e66a265cf110ddfbd7cfe05406109fee1e84c957c new file mode 100644 index 00000000..16c41145 --- /dev/null +++ b/.resources/19bec8cadac97c26da67b11e66a265cf110ddfbd7cfe05406109fee1e84c957c @@ -0,0 +1,83 @@ +def deviceType(self, path, props): + try: + docked_view = "Docked-East-" + + devices = [] + tags = [] + + if "Conveyor" in path: + docked_view += "Conv" + devices = autStand.devices.build_device_table(self) + system.perspective.print(devices) + elif "VFD" in path: + docked_view += "VFD" + else: + docked_view += "Device" + + tags = autStand.devices.getAllTags(self, props[0]) + + return [docked_view, tags, devices] + + except Exception as e: + import traceback + msg = "Error in deviceType: {}\n{}".format(str(e), traceback.format_exc()) + system.perspective.print(msg) + return None + + +def handleTagHighlight(view, currentValue): + tag_priority = currentValue.value + + # --- CASE 1: Remove all highlights by applying CLEAR class --- + if str(tag_priority).upper() == "CLEAR": + for child in view.rootContainer.getChildren()[0].getChildren(): + try: + currentClasses = child.props.style['classes'].split(" ") + filtered = [c for c in currentClasses if not c.startswith("Highlight/")] + child.props.style.classes = " ".join(filtered) + except: + pass + return False + + parts = str(tag_priority).split("||") + + tag = parts[0] + + splitedTag = tag.split("/") + deviceName = splitedTag[-1] + + components = view.rootContainer.getChildren()[0].getChildren() + + priority = parts[1] + + foundMatch = False + +# clear all highlights and apply new one when found + for child in components: + params = child.props.get("params", {}) + tagProps = params.get("tagProps", {}) + tagsList = list(tagProps) + + if len(tagsList) == 0: + continue + + +# child.props.style.classes = "" + currentClasses = child.props.style['classes'].split(" ") + + # strip only highlight-related classes + filtered = [c for c in currentClasses if not c.startswith("Highlight/")] + + child.props.style["classes"] = " ".join(filtered) + + tagPath = tagsList[0] + + if tag == tagPath: + child.props.style["classes"] += " Highlight/Pulse-" + priority + path = child.props.get("path") + docked_view = deviceType(view, path, tagProps) + system.perspective.openDock(docked_view[0], params = {'tagProps':tagProps, 'tags': docked_view[1], 'devices':docked_view[2]}) + foundMatch = True + + return foundMatch + diff --git a/.resources/231d9ef89d5b164fc0a83e77af04894f69b86ed674a64050d6b31913a9a0759e b/.resources/231d9ef89d5b164fc0a83e77af04894f69b86ed674a64050d6b31913a9a0759e deleted file mode 100644 index 7861a898..00000000 Binary files a/.resources/231d9ef89d5b164fc0a83e77af04894f69b86ed674a64050d6b31913a9a0759e and /dev/null differ diff --git a/.resources/3dc800e54c3d4feade7b5fbf2f20296575c20c56080e2d9be24b886b8f44ba16 b/.resources/3dc800e54c3d4feade7b5fbf2f20296575c20c56080e2d9be24b886b8f44ba16 new file mode 100644 index 00000000..7cb96a1f Binary files /dev/null and b/.resources/3dc800e54c3d4feade7b5fbf2f20296575c20c56080e2d9be24b886b8f44ba16 differ diff --git a/.resources/c8d8613fbd5f0394a8a444356ed1a5281a3483b3046afe288da85bb865fb26c4 b/.resources/5c75b6987249bb575115ca736f8d52aa07861efcc5d13946d28948e41a49bc21 similarity index 98% rename from .resources/c8d8613fbd5f0394a8a444356ed1a5281a3483b3046afe288da85bb865fb26c4 rename to .resources/5c75b6987249bb575115ca736f8d52aa07861efcc5d13946d28948e41a49bc21 index 61f621cb..a20ee357 100644 --- a/.resources/c8d8613fbd5f0394a8a444356ed1a5281a3483b3046afe288da85bb865fb26c4 +++ b/.resources/5c75b6987249bb575115ca736f8d52aa07861efcc5d13946d28948e41a49bc21 @@ -113,8 +113,8 @@ } }, "rotation": "0deg", - "show_dpm_device_view": false, - "show_dpm_view": false, + "show_dpm_device_view": true, + "show_dpm_view": true, "timewidget": { "endDate": { "$": [ diff --git a/.resources/37bfb5baa73f0ee9c4099fb61aa1d5f27a89b539d98b63e7d582cec9048f6585 b/.resources/60bdd033d88ee6004e4eae58ec05b7b763e4b341d1e3a226c7fc2b0604ff85ed similarity index 99% rename from .resources/37bfb5baa73f0ee9c4099fb61aa1d5f27a89b539d98b63e7d582cec9048f6585 rename to .resources/60bdd033d88ee6004e4eae58ec05b7b763e4b341d1e3a226c7fc2b0604ff85ed index 8e12c572..59e8e6ff 100644 --- a/.resources/37bfb5baa73f0ee9c4099fb61aa1d5f27a89b539d98b63e7d582cec9048f6585 +++ b/.resources/60bdd033d88ee6004e4eae58ec05b7b763e4b341d1e3a226c7fc2b0604ff85ed @@ -1,7 +1,7 @@ { "custom": {}, "params": { - "Tab_ID": 1, + "Tab_ID": 2, "Table": "Status_tab" }, "propConfig": { @@ -1641,7 +1641,7 @@ "width": 1.0016 }, "props": { - "currentTabIndex": 1, + "currentTabIndex": 2, "tabSize": { "width": 130 }, @@ -3372,7 +3372,7 @@ }, "props": { "dismissOnSelect": false, - "formattedValue": "Sep 29, 2025 3:12 PM", + "formattedValue": "Sep 29, 2025 5:08 PM", "formattedValues": { "date": "Mar 26, 2021", "datetime": "Mar 26, 2021 12:00 AM", @@ -3382,9 +3382,9 @@ "$": [ "ts", 192, - 1759151556791 + 1759158491988 ], - "$ts": 1759144356000 + "$ts": 1759151291000 } }, "type": "ia.input.date-time-input" @@ -3532,7 +3532,7 @@ }, "props": { "dismissOnSelect": false, - "formattedValue": "Sep 29, 2025 5:12 PM", + "formattedValue": "Sep 29, 2025 7:08 PM", "formattedValues": { "date": "Mar 29, 2021", "datetime": "Mar 29, 2021 1:37 PM", @@ -3542,9 +3542,9 @@ "$": [ "ts", 192, - 1759151556791 + 1759158491988 ], - "$ts": 1759151556000 + "$ts": 1759158491000 } }, "type": "ia.input.date-time-input" diff --git a/.resources/6c6139e5dfc7ac7f35403478f62658bf34ff1f3477d64f301cb6b9ed819d9b19 b/.resources/6c6139e5dfc7ac7f35403478f62658bf34ff1f3477d64f301cb6b9ed819d9b19 deleted file mode 100644 index af910620..00000000 Binary files a/.resources/6c6139e5dfc7ac7f35403478f62658bf34ff1f3477d64f301cb6b9ed819d9b19 and /dev/null differ diff --git a/.resources/6d66e4add4081b1bbdedfd102d4ebb32bae80a0b63c562d5138934f6b4a067b8 b/.resources/6d66e4add4081b1bbdedfd102d4ebb32bae80a0b63c562d5138934f6b4a067b8 deleted file mode 100644 index 1f15d7ba..00000000 Binary files a/.resources/6d66e4add4081b1bbdedfd102d4ebb32bae80a0b63c562d5138934f6b4a067b8 and /dev/null differ diff --git a/.resources/74a180921b6636b39f498774de464a7b394b8e41a35aff1df78cd8dadbf3bb43 b/.resources/74a180921b6636b39f498774de464a7b394b8e41a35aff1df78cd8dadbf3bb43 deleted file mode 100644 index 2d0e7010..00000000 Binary files a/.resources/74a180921b6636b39f498774de464a7b394b8e41a35aff1df78cd8dadbf3bb43 and /dev/null differ diff --git a/.resources/8821b5aa7130ed43a313df2e5d8d3a6b4565b600ac4321eb9687df25509f7c65 b/.resources/8821b5aa7130ed43a313df2e5d8d3a6b4565b600ac4321eb9687df25509f7c65 deleted file mode 100644 index 633a0409..00000000 Binary files a/.resources/8821b5aa7130ed43a313df2e5d8d3a6b4565b600ac4321eb9687df25509f7c65 and /dev/null differ diff --git a/.resources/8a04ff7778ca80036f5d30f501c7f686381e87437b5c6dfb42e1b78f5e1d4607 b/.resources/8a04ff7778ca80036f5d30f501c7f686381e87437b5c6dfb42e1b78f5e1d4607 new file mode 100644 index 00000000..164ea9c9 Binary files /dev/null and b/.resources/8a04ff7778ca80036f5d30f501c7f686381e87437b5c6dfb42e1b78f5e1d4607 differ diff --git a/.resources/8afe154f385ae7a496e584476d08bae7288ae1f6c14fd01f07036b3f7dcc992f b/.resources/8afe154f385ae7a496e584476d08bae7288ae1f6c14fd01f07036b3f7dcc992f new file mode 100644 index 00000000..d1de8190 --- /dev/null +++ b/.resources/8afe154f385ae7a496e584476d08bae7288ae1f6c14fd01f07036b3f7dcc992f @@ -0,0 +1,519 @@ +{ + "custom": { + "color": "#C2C2C2", + "priority": "No Active Alarms", + "state": "Closed", + "string": "Non Powered Equipment" + }, + "params": { + "tagProps": [ + "System/MCM01/Conveyors/Ul15_1", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "propConfig": { + "custom.color": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Color" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "#000000", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "#C2C2C2" + }, + { + "input": 1, + "output": "#FF0000" + }, + { + "input": 2, + "output": "#FFA500" + }, + { + "input": 3, + "output": "#0008FF" + }, + { + "input": 4, + "output": "#00FF00" + }, + { + "input": 5, + "output": "#FFF700" + }, + { + "input": 6, + "output": "#87CEEB" + }, + { + "input": 7, + "output": "#90EE90" + }, + { + "input": 8, + "output": "#964B00" + }, + { + "input": 9, + "output": "#FFFFFF" + }, + { + "input": 10, + "output": "#000000" + }, + { + "input": 11, + "output": "#8B0000" + }, + { + "input": 12, + "output": "#808080" + }, + { + "input": 13, + "output": "#8B8000" + }, + { + "input": 14, + "output": "#006400" + }, + { + "input": 15, + "output": "#FFFFC5" + }, + { + "input": 16, + "output": "#00008B" + }, + { + "input": 17, + "output": "#FF7276" + }, + { + "input": 18, + "output": "#556B2F" + }, + { + "input": 19, + "output": "#B43434" + }, + { + "input": 20, + "output": "#4682B4" + }, + { + "input": 21, + "output": "#FFD700" + } + ], + "outputType": "color", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "custom.priority": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Priority" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": null, + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "No Active Alarms" + }, + { + "input": 1, + "output": "High" + }, + { + "input": 2, + "output": "Medium" + }, + { + "input": 3, + "output": "Low" + }, + { + "input": 4, + "output": "Diagnostic" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "custom.state": { + "binding": { + "config": { + "fallbackDelay": 2.5, + "mode": "indirect", + "references": { + "0": "{view.params.tagProps[0]}", + "fc": "{session.custom.fc}" + }, + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/State" + }, + "transforms": [ + { + "expression": "coalesce({value},0)", + "type": "expression" + }, + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 0, + "output": "Closed" + }, + { + "input": 1, + "output": "Actuated" + }, + { + "input": 2, + "output": "Communication Faulted" + }, + { + "input": 3, + "output": "Conveyor Running In Maintenance Mode" + }, + { + "input": 4, + "output": "Disabled" + }, + { + "input": 5, + "output": "Disconnected" + }, + { + "input": 6, + "output": "Stopped" + }, + { + "input": 7, + "output": "Enabled Not Running" + }, + { + "input": 8, + "output": "Encoder Fault" + }, + { + "input": 9, + "output": "Energy Management" + }, + { + "input": 10, + "output": "ESTOP Was Actuated" + }, + { + "input": 11, + "output": "EStopped" + }, + { + "input": 12, + "output": "EStopped Locally" + }, + { + "input": 13, + "output": "Extended Faulted" + }, + { + "input": 14, + "output": "Full" + }, + { + "input": 15, + "output": "Gaylord Start Pressed" + }, + { + "input": 16, + "output": "Jam Fault" + }, + { + "input": 17, + "output": "Jammed" + }, + { + "input": 18, + "output": "Loading Allowed" + }, + { + "input": 19, + "output": "Loading Not Allowed" + }, + { + "input": 20, + "output": "Low Air Pressure Fault Was Present" + }, + { + "input": 21, + "output": "Maintenance Mode" + }, + { + "input": 22, + "output": "Conveyor Stopped In Maintenance Mode" + }, + { + "input": 23, + "output": "Motor Faulted" + }, + { + "input": 24, + "output": "Motor Was Faulted" + }, + { + "input": 25, + "output": "Normal" + }, + { + "input": 26, + "output": "Off Inactive" + }, + { + "input": 27, + "output": "Open" + }, + { + "input": 28, + "output": "PLC Ready To Run" + }, + { + "input": 29, + "output": "Package Release Pressed" + }, + { + "input": 30, + "output": "Power Branch Was Faulted" + }, + { + "input": 31, + "output": "Pressed" + }, + { + "input": 32, + "output": "Ready To Receive" + }, + { + "input": 33, + "output": "Running" + }, + { + "input": 34, + "output": "Started" + }, + { + "input": 35, + "output": "Stopped" + }, + { + "input": 36, + "output": "System Started" + }, + { + "input": 37, + "output": "Unknown" + }, + { + "input": 38, + "output": "VFD Fault" + }, + { + "input": 39, + "output": "Conveyor Running In Power Saving Mode" + }, + { + "input": 40, + "output": "Conveyor Jogging In Maintenance Mode" + }, + { + "input": 41, + "output": "VFD Reset Required" + }, + { + "input": 42, + "output": "Jam Reset Push Button Pressed" + }, + { + "input": 43, + "output": "Start Push Button Pressed" + }, + { + "input": 44, + "output": "Stop Push Button Pressed" + }, + { + "input": 45, + "output": "No Container" + }, + { + "input": 46, + "output": "Ready To Be Enabled" + }, + { + "input": 47, + "output": "Half Full" + }, + { + "input": 48, + "output": "Enabled" + }, + { + "input": 49, + "output": "Tipper Faulted" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "tag" + }, + "persistent": true + }, + "params.tagProps": { + "paramDirection": "input", + "persistent": true + } + }, + "props": { + "defaultSize": { + "height": 69, + "width": 49 + } + }, + "root": { + "children": [ + { + "meta": { + "name": "Conveyor45" + }, + "position": { + "height": 0.9855, + "width": 0.9796 + }, + "propConfig": { + "props.elements[1].elements[0].fill.paint": { + "binding": { + "config": { + "path": "view.custom.color" + }, + "type": "property" + } + } + }, + "props": { + "elements": [ + { + "id": "defs1", + "name": "defs1", + "type": "defs" + }, + { + "elements": [ + { + "d": "m 0.61872656,19.047242 0.185181,-7.76481 C 2.3211966,6.4490419 5.3844746,3.4831579 9.6680236,0.93748089 L 13.582549,7.8726519 c -2.984985,1.33473 -4.2291194,3.3482401 -4.9990764,6.5174301 l -0.08744,4.67802 z", + "fill": { + "opacity": "1" + }, + "id": "path26615", + "name": "path26615", + "stroke": { + "dasharray": "none", + "opacity": "1", + "paint": "#000000", + "width": 0.45 + }, + "type": "path" + } + ], + "id": "layer1", + "name": "layer1", + "type": "group" + } + ], + "viewBox": "0 0 14 19" + }, + "type": "ia.shapes.svg" + } + ], + "events": { + "dom": { + "onClick": { + "config": { + "script": "\t#create devices and tags lists for the conveyor\n\tprops \u003d self.view.params.tagProps[0]\n\tautStand.devices.build_device_mapping(props)\n\tdevice_table_dataset \u003d autStand.devices.build_device_table(self)\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props)\n\tsystem.perspective.openDock(\u0027Docked-East-Conv\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps, \"devices\": device_table_dataset, \"tags\":tags_table_dataset})" + }, + "scope": "G", + "type": "script" + } + } + }, + "meta": { + "name": "root", + "tooltip": { + "enabled": true + } + }, + "propConfig": { + "meta.tooltip.text": { + "binding": { + "config": { + "expression": "if(\n {view.custom.state} !\u003d \"Closed\",\n \"Source Id: \" + {view.params.tagProps[0]} + \", Priority: \" + {view.custom.priority} + \", State: \" + {view.custom.state},\n \"Device Disconnected\"\n)\n" + }, + "type": "expr" + } + } + }, + "props": { + "mode": "percent", + "style": { + "cursor": "pointer" + } + }, + "type": "ia.container.coord" + } +} \ No newline at end of file diff --git a/.resources/97523261a181c3ed46d416e8ea8a1cab30e35a38193d6201d4779de3e7e4314d b/.resources/97523261a181c3ed46d416e8ea8a1cab30e35a38193d6201d4779de3e7e4314d deleted file mode 100644 index 5406125c..00000000 Binary files a/.resources/97523261a181c3ed46d416e8ea8a1cab30e35a38193d6201d4779de3e7e4314d and /dev/null differ diff --git a/.resources/a2176de72621750c5f51f8539ed9849f71610dfddcd883c41a4117fc776814d2 b/.resources/a2176de72621750c5f51f8539ed9849f71610dfddcd883c41a4117fc776814d2 new file mode 100644 index 00000000..ad78b5c8 Binary files /dev/null and b/.resources/a2176de72621750c5f51f8539ed9849f71610dfddcd883c41a4117fc776814d2 differ diff --git a/.resources/a4545c3599397663c65f10dc5928bfc950f6b4d55f182205b72fa6d9cdd56b69 b/.resources/a4545c3599397663c65f10dc5928bfc950f6b4d55f182205b72fa6d9cdd56b69 new file mode 100644 index 00000000..00b6559b Binary files /dev/null and b/.resources/a4545c3599397663c65f10dc5928bfc950f6b4d55f182205b72fa6d9cdd56b69 differ diff --git a/.resources/a6d65c65332e59630c63e4055db2d69032b7745c5311a90f62c0dda7a7258b83 b/.resources/a6d65c65332e59630c63e4055db2d69032b7745c5311a90f62c0dda7a7258b83 deleted file mode 100644 index 94abd337..00000000 Binary files a/.resources/a6d65c65332e59630c63e4055db2d69032b7745c5311a90f62c0dda7a7258b83 and /dev/null differ diff --git a/.resources/c8aa2f9702c383220916bb156ff15e3dc458d6e0b69698ba27bd0f57e610fe60 b/.resources/c8aa2f9702c383220916bb156ff15e3dc458d6e0b69698ba27bd0f57e610fe60 new file mode 100644 index 00000000..0f44daa7 Binary files /dev/null and b/.resources/c8aa2f9702c383220916bb156ff15e3dc458d6e0b69698ba27bd0f57e610fe60 differ diff --git a/.resources/a2592c5a0e76e240425d97250874adef651de1dce7e5830bb67f3d7ad9a7f2cf b/.resources/d9f0dab7b014b05e8b903d56937abf4c12aacb3419db5d0f9ff07a646d20e384 similarity index 99% rename from .resources/a2592c5a0e76e240425d97250874adef651de1dce7e5830bb67f3d7ad9a7f2cf rename to .resources/d9f0dab7b014b05e8b903d56937abf4c12aacb3419db5d0f9ff07a646d20e384 index 5bde8931..5fe8a4d6 100644 --- a/.resources/a2592c5a0e76e240425d97250874adef651de1dce7e5830bb67f3d7ad9a7f2cf +++ b/.resources/d9f0dab7b014b05e8b903d56937abf4c12aacb3419db5d0f9ff07a646d20e384 @@ -1733,11 +1733,11 @@ "position": { "height": 0.0185, "rotate": { - "angle": "270deg" + "angle": "90deg" }, "width": 0.0286, "x": 0.7716, - "y": 0.2878 + "y": 0.2777 }, "props": { "params": { @@ -1756,7 +1756,7 @@ }, "path": "autStand/Equipment/Photoeye_Tracking", "style": { - "classes": "hover", + "classes": "hover-90", "overflow": "visible" } }, diff --git a/.resources/da76026f78ec230d35914a6f5d54b21472040aaa2d15c98353d509775909a881 b/.resources/da76026f78ec230d35914a6f5d54b21472040aaa2d15c98353d509775909a881 new file mode 100644 index 00000000..cd5b0198 Binary files /dev/null and b/.resources/da76026f78ec230d35914a6f5d54b21472040aaa2d15c98353d509775909a881 differ diff --git a/.resources/e38b7d75d0420110add092fab4a0b09ae5fde62c760c98be66dfd3d4c034bc81 b/.resources/e38b7d75d0420110add092fab4a0b09ae5fde62c760c98be66dfd3d4c034bc81 new file mode 100644 index 00000000..32b2eb3d Binary files /dev/null and b/.resources/e38b7d75d0420110add092fab4a0b09ae5fde62c760c98be66dfd3d4c034bc81 differ diff --git a/.resources/f62c3d8bf33a66ae8e37d3f7de5b1e4d0235250214ddb1ec127ca9d4ee84bb43 b/.resources/f62c3d8bf33a66ae8e37d3f7de5b1e4d0235250214ddb1ec127ca9d4ee84bb43 deleted file mode 100644 index 898a1a60..00000000 Binary files a/.resources/f62c3d8bf33a66ae8e37d3f7de5b1e4d0235250214ddb1ec127ca9d4ee84bb43 and /dev/null differ diff --git a/BNA8/com.inductiveautomation.perspective/page-config/config.json b/BNA8/com.inductiveautomation.perspective/page-config/config.json index 7572a70a..d9402ade 100644 --- a/BNA8/com.inductiveautomation.perspective/page-config/config.json +++ b/BNA8/com.inductiveautomation.perspective/page-config/config.json @@ -337,6 +337,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", @@ -587,6 +631,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", @@ -641,6 +729,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", @@ -708,6 +840,34 @@ "size": 600, "viewParams": {}, "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" } ], "top": [ @@ -764,6 +924,50 @@ "viewPath": "autStand/Docked_Views/Docked-West" } ], + "right": [ + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Device", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Device" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-Conv", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-Conv" + }, + { + "anchor": "fixed", + "autoBreakpoint": 480, + "content": "cover", + "handle": "hide", + "iconUrl": "", + "id": "Docked-East-VFD", + "modal": false, + "resizable": false, + "show": "onDemand", + "size": 600, + "viewParams": {}, + "viewPath": "autStand/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD" + } + ], "top": [ { "anchor": "fixed", diff --git a/BNA8/com.inductiveautomation.perspective/page-config/resource.json b/BNA8/com.inductiveautomation.perspective/page-config/resource.json index 53a9b86d..edc4b173 100644 --- a/BNA8/com.inductiveautomation.perspective/page-config/resource.json +++ b/BNA8/com.inductiveautomation.perspective/page-config/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-26T12:13:18Z" + "timestamp": "2025-09-29T13:52:16Z" }, - "lastModificationSignature": "fa3d02925a7e5e1c1202b72fcda7e62d918e394c7f8f4f0c9cf669e9e7484490" + "lastModificationSignature": "52f13e0e3f755c4ef7d1d1bda49fcf6e8b1b8f6a8e73a1359a664d4464ec1be9" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/session-props/props.json b/BNA8/com.inductiveautomation.perspective/session-props/props.json index 61f621cb..a20ee357 100644 --- a/BNA8/com.inductiveautomation.perspective/session-props/props.json +++ b/BNA8/com.inductiveautomation.perspective/session-props/props.json @@ -113,8 +113,8 @@ } }, "rotation": "0deg", - "show_dpm_device_view": false, - "show_dpm_view": false, + "show_dpm_device_view": true, + "show_dpm_view": true, "timewidget": { "endDate": { "$": [ diff --git a/BNA8/com.inductiveautomation.perspective/session-props/resource.json b/BNA8/com.inductiveautomation.perspective/session-props/resource.json index ef56658b..ed106a10 100644 --- a/BNA8/com.inductiveautomation.perspective/session-props/resource.json +++ b/BNA8/com.inductiveautomation.perspective/session-props/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-29T13:03:45Z" + "timestamp": "2025-09-29T14:47:31Z" }, - "lastModificationSignature": "1522202a7aeaaf110b164a96f656d592f4442a5c03bb5ab1239eeb2cc0f6bfd9" + "lastModificationSignature": "4410eb4115cd2e23bbb9f6230ecf61de49fea5ccefecd63ca1c4086571c02de0" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json index c29137f4..bfb8d0ac 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-26T10:20:00Z" + "timestamp": "2025-09-29T14:46:56Z" }, - "lastModificationSignature": "b3fc73fd8ffeaf745bb873ac10084bd1142c865d5d251d593f0c1b091d3129df" + "lastModificationSignature": "17ebe02474fe0e5c320055c4c0659ca9b15daacd29a8c058199cec38217cb411" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png index af910620..0a11c204 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json index 31689433..20bd0d05 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-29T10:28:07Z" + "timestamp": "2025-09-29T15:02:00Z" }, - "lastModificationSignature": "65262ff76e1274005d9f075c3a9aa4510a2dbe24efc100841d7ac670e31645bd" + "lastModificationSignature": "b148aabc6cae1ef8c7aee06edb4dc45140d8f9d039eb7d8daafcca7a4697f4a6" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png index 1f15d7ba..cd5b0198 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json index 5bde8931..5fe8a4d6 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json @@ -1733,11 +1733,11 @@ "position": { "height": 0.0185, "rotate": { - "angle": "270deg" + "angle": "90deg" }, "width": 0.0286, "x": 0.7716, - "y": 0.2878 + "y": 0.2777 }, "props": { "params": { @@ -1756,7 +1756,7 @@ }, "path": "autStand/Equipment/Photoeye_Tracking", "style": { - "classes": "hover", + "classes": "hover-90", "overflow": "visible" } }, diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json index 348b696f..d5f886e5 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-26T12:25:47Z" + "timestamp": "2025-09-29T14:46:51Z" }, - "lastModificationSignature": "30bb392f05e8c509d2132b1bd61710f7174fa89c1267c163a2d7a9f496a4276b" + "lastModificationSignature": "78969bcb47c6469a41e9a24c256eba638944aa58546571cbedf47584b369dd29" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/thumbnail.png index 94abd337..0f44daa7 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json index f1447509..5b0452ee 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-25T14:18:03Z" + "timestamp": "2025-09-29T15:03:16Z" }, - "lastModificationSignature": "c683041b40921a3da08a3f5e1e1d96d3e72e1ba6a44b5b93e48621278d53428a" + "lastModificationSignature": "0e5be2c7eaebc021b3cce47b16a6e8a502585638d615f177b71299dfd7a8a43a" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png index 1ac7fb31..7cb96a1f 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json index 121cd6c3..b4fe39ff 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-26T10:00:33Z" + "timestamp": "2025-09-29T14:43:17Z" }, - "lastModificationSignature": "b191dbce708da5fb71ed970b53fcf1d5b1dbc17753ba4094e6d3656ddf01506b" + "lastModificationSignature": "a24afddb67821ef84448eeda2304112da26cb750bbcad1a7b7d81775573fc69f" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png index 633a0409..00b6559b 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/resource.json index 3e61ea59..400d202a 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-26T13:14:19Z" + "timestamp": "2025-09-29T13:38:54Z" }, - "lastModificationSignature": "5d680280778a17d8abf4a8343937c865b00d0171186881028a1fd05ce17cd0ab" + "lastModificationSignature": "44d789ea51d7ffae05d47f986137a8bba531163ee7a40ae52096aafe0b4cd0a6" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/thumbnail.png index 7861a898..3d0031d5 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/view.json index dd494d3f..d1de8190 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Conveyor45/view.json @@ -511,8 +511,7 @@ "props": { "mode": "percent", "style": { - "cursor": "pointer", - "overflow": "hidden" + "cursor": "pointer" } }, "type": "ia.container.coord" diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/resource.json index 263de320..1e0af246 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-29T13:12:37Z" + "timestamp": "2025-09-29T15:08:12Z" }, - "lastModificationSignature": "389f01fd13a9dafc5f002b77858a2fd7e170339f81d14bd17047549c9ad04f40" + "lastModificationSignature": "9ff85561bcc9b1c82d66b076daf32df80eb50c0fca5069f1012f96b42b72dc31" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/thumbnail.png index 5406125c..32b2eb3d 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/view.json index 8e12c572..59e8e6ff 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Windows/Status/view.json @@ -1,7 +1,7 @@ { "custom": {}, "params": { - "Tab_ID": 1, + "Tab_ID": 2, "Table": "Status_tab" }, "propConfig": { @@ -1641,7 +1641,7 @@ "width": 1.0016 }, "props": { - "currentTabIndex": 1, + "currentTabIndex": 2, "tabSize": { "width": 130 }, @@ -3372,7 +3372,7 @@ }, "props": { "dismissOnSelect": false, - "formattedValue": "Sep 29, 2025 3:12 PM", + "formattedValue": "Sep 29, 2025 5:08 PM", "formattedValues": { "date": "Mar 26, 2021", "datetime": "Mar 26, 2021 12:00 AM", @@ -3382,9 +3382,9 @@ "$": [ "ts", 192, - 1759151556791 + 1759158491988 ], - "$ts": 1759144356000 + "$ts": 1759151291000 } }, "type": "ia.input.date-time-input" @@ -3532,7 +3532,7 @@ }, "props": { "dismissOnSelect": false, - "formattedValue": "Sep 29, 2025 5:12 PM", + "formattedValue": "Sep 29, 2025 7:08 PM", "formattedValues": { "date": "Mar 29, 2021", "datetime": "Mar 29, 2021 1:37 PM", @@ -3542,9 +3542,9 @@ "$": [ "ts", 192, - 1759151556791 + 1759158491988 ], - "$ts": 1759151556000 + "$ts": 1759158491000 } }, "type": "ia.input.date-time-input" diff --git a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/data.bin b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/data.bin index 2d0e7010..164ea9c9 100644 Binary files a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/data.bin and b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/data.bin differ diff --git a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/resource.json b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/resource.json index 29c28d6f..31f30095 100644 --- a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/resource.json +++ b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Lane Divert vs Full/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-29T13:12:37Z" + "timestamp": "2025-09-29T15:08:12Z" }, - "lastModificationSignature": "a69ec02dca3e11e6e956ab40df1d3b03738d7acdcf3e912d7000e7b86107c67e" + "lastModificationSignature": "3e671b12b5266677a2495110dd9e8db595b96262d45a818bcf0423d31d0d7808" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/data.bin b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/data.bin index 898a1a60..ad78b5c8 100644 Binary files a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/data.bin and b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/data.bin differ diff --git a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/resource.json b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/resource.json index 840846b1..0829740b 100644 --- a/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/resource.json +++ b/BNA8/com.inductiveautomation.reporting/reports/Statistics/Shipping Sorter Statistics/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-29T13:12:37Z" + "timestamp": "2025-09-29T15:08:12Z" }, - "lastModificationSignature": "417448126696558992635ed6e66340279b255b794c7b15c249bc3318e19437b0" + "lastModificationSignature": "bb359db8a1e01343fb33eda82566aaee11d9c85c1f19911c62f066eddc3949d9" } } \ No newline at end of file diff --git a/BNA8/ignition/script-python/autStand/Utils/code.py b/BNA8/ignition/script-python/autStand/Utils/code.py index af47700e..16c41145 100644 --- a/BNA8/ignition/script-python/autStand/Utils/code.py +++ b/BNA8/ignition/script-python/autStand/Utils/code.py @@ -15,9 +15,7 @@ def deviceType(self, path, props): docked_view += "Device" tags = autStand.devices.getAllTags(self, props[0]) - system.perspective.print(tags) -# return 1 return [docked_view, tags, devices] except Exception as e: @@ -29,24 +27,22 @@ def deviceType(self, path, props): def handleTagHighlight(view, currentValue): tag_priority = currentValue.value - - if not "||" in tag_priority: - return # --- CASE 1: Remove all highlights by applying CLEAR class --- - if not tag_priority or str(tag_priority).upper() == "CLEAR": + if str(tag_priority).upper() == "CLEAR": for child in view.rootContainer.getChildren()[0].getChildren(): try: - child.props.style.classes = "" + currentClasses = child.props.style['classes'].split(" ") + filtered = [c for c in currentClasses if not c.startswith("Highlight/")] + child.props.style.classes = " ".join(filtered) except: - pass + pass return False parts = str(tag_priority).split("||") tag = parts[0] - system.perspective.print(tag) splitedTag = tag.split("/") deviceName = splitedTag[-1] @@ -54,8 +50,6 @@ def handleTagHighlight(view, currentValue): priority = parts[1] - system.perspective.print(priority) - foundMatch = False # clear all highlights and apply new one when found @@ -67,12 +61,19 @@ def handleTagHighlight(view, currentValue): if len(tagsList) == 0: continue - child.props.style.classes = "" + +# child.props.style.classes = "" + currentClasses = child.props.style['classes'].split(" ") + + # strip only highlight-related classes + filtered = [c for c in currentClasses if not c.startswith("Highlight/")] + + child.props.style["classes"] = " ".join(filtered) tagPath = tagsList[0] if tag == tagPath: - child.props.style["classes"] = "Highlight/Pulse-" + priority + child.props.style["classes"] += " Highlight/Pulse-" + priority path = child.props.get("path") docked_view = deviceType(view, path, tagProps) system.perspective.openDock(docked_view[0], params = {'tagProps':tagProps, 'tags': docked_view[1], 'devices':docked_view[2]}) diff --git a/BNA8/ignition/script-python/autStand/Utils/resource.json b/BNA8/ignition/script-python/autStand/Utils/resource.json index 9d8f22f7..cd3d41b7 100644 --- a/BNA8/ignition/script-python/autStand/Utils/resource.json +++ b/BNA8/ignition/script-python/autStand/Utils/resource.json @@ -9,9 +9,9 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-25T13:05:53Z" + "timestamp": "2025-09-29T15:08:12Z" }, "hintScope": 2, - "lastModificationSignature": "db71169d0b0acd29c4e789322d8721171c733a24db2a19994da3a55ba662489e" + "lastModificationSignature": "f4c805a7a2b9a133a66fce364da748644fd71a3d9e1349162a95fdd5882f3e2a" } } \ No newline at end of file