diff --git a/.resources/20e9905dd924a766190ecd6285e43f19c6a6753a47dc90ad1187ca13f6d7c193 b/.resources/20e9905dd924a766190ecd6285e43f19c6a6753a47dc90ad1187ca13f6d7c193 deleted file mode 100644 index b8b7091c..00000000 Binary files a/.resources/20e9905dd924a766190ecd6285e43f19c6a6753a47dc90ad1187ca13f6d7c193 and /dev/null differ diff --git a/.resources/41099fb43eb68ee85e8e7abeef9f68cabc1392ed5c1ba9e1cafaef088f9b2be8 b/.resources/3a35acfa9e3e4d8e8c9da90224b6b3feef7430df525ad7611a2739f7674530f8 similarity index 100% rename from .resources/41099fb43eb68ee85e8e7abeef9f68cabc1392ed5c1ba9e1cafaef088f9b2be8 rename to .resources/3a35acfa9e3e4d8e8c9da90224b6b3feef7430df525ad7611a2739f7674530f8 diff --git a/.resources/130042bce8cbe0da94d2de10891ed66bcb10b88d35ff86bcfced99e81f06d9b6 b/.resources/48a0c1796b779145f6c66a536abf210dd8743426723f42d2abf915167806fd80 similarity index 98% rename from .resources/130042bce8cbe0da94d2de10891ed66bcb10b88d35ff86bcfced99e81f06d9b6 rename to .resources/48a0c1796b779145f6c66a536abf210dd8743426723f42d2abf915167806fd80 index 26ef228f..f20e013d 100644 --- a/.resources/130042bce8cbe0da94d2de10891ed66bcb10b88d35ff86bcfced99e81f06d9b6 +++ b/.resources/48a0c1796b779145f6c66a536abf210dd8743426723f42d2abf915167806fd80 @@ -13,7 +13,8 @@ "show_fio_safety": true, "show_map": true, "show_photoeyes": true, - "show_px": true + "show_px": true, + "show_solenoids": true }, "areaHover": [], "currentGraphic": "Windows/Graphics/Overview", diff --git a/.resources/664d855118a499fb9f44efeb8223662dd7dd2cbe6f1e2ca58d3bd672e6a120b8 b/.resources/664d855118a499fb9f44efeb8223662dd7dd2cbe6f1e2ca58d3bd672e6a120b8 new file mode 100644 index 00000000..8146059a Binary files /dev/null and b/.resources/664d855118a499fb9f44efeb8223662dd7dd2cbe6f1e2ca58d3bd672e6a120b8 differ diff --git a/.resources/d32b424e246993d01e8782edddba5afd1cccad5ea3aca847f96460542d4dc2cd b/.resources/66b40c8fca4cab46884bad6d27eb79197b893e419b937336ac07f9df9c083009 similarity index 100% rename from .resources/d32b424e246993d01e8782edddba5afd1cccad5ea3aca847f96460542d4dc2cd rename to .resources/66b40c8fca4cab46884bad6d27eb79197b893e419b937336ac07f9df9c083009 diff --git a/.resources/4a9fa45d74767301d373f5f735489549e9a50bb6acf7161db5f3f876a8c89370 b/.resources/6f871948781c6bee2a2a9bdf77120185f9a659920b0fbdda9819ac6b554285e4 similarity index 100% rename from .resources/4a9fa45d74767301d373f5f735489549e9a50bb6acf7161db5f3f876a8c89370 rename to .resources/6f871948781c6bee2a2a9bdf77120185f9a659920b0fbdda9819ac6b554285e4 diff --git a/.resources/73d6438851e98100cf663bbbe6c6e8fd00ee8732dd5764cbdcbea0c4ebc88d68 b/.resources/73d6438851e98100cf663bbbe6c6e8fd00ee8732dd5764cbdcbea0c4ebc88d68 new file mode 100644 index 00000000..3dff2d1e Binary files /dev/null and b/.resources/73d6438851e98100cf663bbbe6c6e8fd00ee8732dd5764cbdcbea0c4ebc88d68 differ diff --git a/.resources/7453f79a163e8b92f338238be241f378b60d1d49c70197979bdbc8973326a90c b/.resources/7453f79a163e8b92f338238be241f378b60d1d49c70197979bdbc8973326a90c deleted file mode 100644 index b7c4ddf8..00000000 Binary files a/.resources/7453f79a163e8b92f338238be241f378b60d1d49c70197979bdbc8973326a90c and /dev/null differ diff --git a/.resources/ad40ff5e990d1f515fe802bc49cc6205a85a9fa91b78861696d0ad5bfa75cdae b/.resources/cd51892683b06d0bb9406e1049274d78203531f422235cdc6bccb7a90f11792b similarity index 99% rename from .resources/ad40ff5e990d1f515fe802bc49cc6205a85a9fa91b78861696d0ad5bfa75cdae rename to .resources/cd51892683b06d0bb9406e1049274d78203531f422235cdc6bccb7a90f11792b index 6469c543..9928bedf 100644 --- a/.resources/ad40ff5e990d1f515fe802bc49cc6205a85a9fa91b78861696d0ad5bfa75cdae +++ b/.resources/cd51892683b06d0bb9406e1049274d78203531f422235cdc6bccb7a90f11792b @@ -620,7 +620,7 @@ "enabled": true, "rate": "3" }, - "queryPath": "GetActiveAlarmsByLocationAndPriority", + "queryPath": "Alarms-autStand/GetActiveAlarmsByLocationAndPriority", "returnFormat": "json" }, "transforms": [ diff --git a/.resources/f4873ded43213f344d8880534bd1e7dab05c7c30d2ec9c1048f9cbcf0165507d b/.resources/f9032fe0a64bf6722978b88c4c796264ba6c732a9420286d3cd5c49e97276247 similarity index 98% rename from .resources/f4873ded43213f344d8880534bd1e7dab05c7c30d2ec9c1048f9cbcf0165507d rename to .resources/f9032fe0a64bf6722978b88c4c796264ba6c732a9420286d3cd5c49e97276247 index f2595593..f01067fb 100644 --- a/.resources/f4873ded43213f344d8880534bd1e7dab05c7c30d2ec9c1048f9cbcf0165507d +++ b/.resources/f9032fe0a64bf6722978b88c4c796264ba6c732a9420286d3cd5c49e97276247 @@ -2,8 +2,8 @@ "custom": { "plc": "", "searchId": "value", - "state": 1, - "string": "Actuated" + "state": 0, + "string": "Inactive" }, "params": { "tagProps": [ @@ -188,7 +188,7 @@ "meta.visible": { "binding": { "config": { - "path": "session.custom.alarm_filter.show_beacons" + "path": "session.custom.alarm_filter.show_solenoids" }, "type": "property" } diff --git a/.resources/42555c74454e373d3834f1d2894d360fa9a0f9b0259d5fb63b70e6bf81b2442e b/.resources/f9c637614aea99e3a0acb04ab3688083a35565dd6b4a1be245b7d9fb962516ad similarity index 92% rename from .resources/42555c74454e373d3834f1d2894d360fa9a0f9b0259d5fb63b70e6bf81b2442e rename to .resources/f9c637614aea99e3a0acb04ab3688083a35565dd6b4a1be245b7d9fb962516ad index 3ef3878a..b9a38782 100644 --- a/.resources/42555c74454e373d3834f1d2894d360fa9a0f9b0259d5fb63b70e6bf81b2442e +++ b/.resources/f9c637614aea99e3a0acb04ab3688083a35565dd6b4a1be245b7d9fb962516ad @@ -85,7 +85,7 @@ "props.selected": { "binding": { "config": { - "expression": "if({session.custom.alarm_filter.show_dpm_mcm} \u0026\u0026 \r\n{session.custom.alarm_filter.show_beacons} \u0026\u0026\r\n{session.custom.alarm_filter.show_VFD} \u0026\u0026\r\n{session.custom.alarm_filter.show_buttons} \u0026\u0026\r\n{session.custom.alarm_filter.show_photoeyes} \u0026\u0026\r\n{session.custom.alarm_filter.show_encoders} \u0026\u0026\r\n{session.custom.alarm_filter.show_epc} \u0026\u0026\r\n{session.custom.alarm_filter.show_px} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio_safety}, True, False)" + "expression": "if({session.custom.alarm_filter.show_dpm_mcm} \u0026\u0026 \r\n{session.custom.alarm_filter.show_beacons} \u0026\u0026\r\n{session.custom.alarm_filter.show_VFD} \u0026\u0026\r\n{session.custom.alarm_filter.show_buttons} \u0026\u0026\r\n{session.custom.alarm_filter.show_photoeyes} \u0026\u0026\r\n{session.custom.alarm_filter.show_encoders} \u0026\u0026\r\n{session.custom.alarm_filter.show_epc} \u0026\u0026\r\n{session.custom.alarm_filter.show_px} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_solenoids} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio_safety}, True, False)" }, "type": "expr" } @@ -869,6 +869,82 @@ ] }, "type": "ia.input.checkbox" + }, + { + "custom": { + "buttonid": "status_filters/running_status" + }, + "events": { + "component": { + "onActionPerformed": { + "config": { + "script": "\tif not self.props.selected:\n\t\tbuttonid \u003d self.custom.buttonid\n\t\tactivityLog.logger.callLogger(self.view, \u0027click\u0027, buttonid)\n\t\tactivityLog.productMetrics.callLogger(self.view, \u0027click\u0027, buttonid)" + }, + "scope": "G", + "type": "script" + } + } + }, + "meta": { + "name": "Show-Sols", + "tooltip": { + "delay": 250 + } + }, + "position": { + "basis": "36px" + }, + "propConfig": { + "props.enabled": { + "binding": { + "config": { + "expression": "if ({session.custom.alarm_filter.show_map}\u003dTrue \u0026\u0026 {session.custom.view_in_focus}\u003d\u0027/MAP-Home\u0027, True, False)" + }, + "enabled": false, + "type": "expr" + } + }, + "props.selected": { + "binding": { + "config": { + "bidirectional": true, + "path": "session.custom.alarm_filter.show_solenoids" + }, + "type": "property" + } + } + }, + "props": { + "checkedIcon": { + "color": { + "disabled": "#FFFFFF", + "enabled": "#FFFFFF" + } + }, + "style": { + "color": "#FFFFFF", + "fontFamily": "Arial", + "fontSize": 12, + "fontWeight": "bold", + "marginLeft": 10, + "marginRight": 10 + }, + "text": "Show Solenoids" + }, + "scripts": { + "customMethods": [], + "extensionFunctions": null, + "messageHandlers": [ + { + "messageType": "select-all-filters", + "pageScope": false, + "script": "\tdata \u003d payload[\"data\"]\n\tself.props.selected \u003d data", + "sessionScope": false, + "viewScope": true + } + ] + }, + "type": "ia.input.checkbox" } ], "meta": { diff --git a/BNA8/com.inductiveautomation.perspective/page-config/resource.json b/BNA8/com.inductiveautomation.perspective/page-config/resource.json index a7349b37..d8099e20 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-08-18T17:06:14Z" + "timestamp": "2025-08-19T08:33:19Z" }, - "lastModificationSignature": "e233175b59a33bd771a4aa14f8361dc017245fb277350dfec8fe8b28dccbf4d5" + "lastModificationSignature": "cd77e0634eff9d154a6da87d3dbe394d0505c72d038e08114b5bae607d11e284" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json b/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json index 38b72ad7..75c57c37 100644 --- a/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json @@ -9,9 +9,9 @@ ], "attributes": { "lastModification": { - "actor": "admin", - "timestamp": "2025-08-18T17:06:35Z" + "actor": "external", + "timestamp": "2025-08-18T17:10:43Z" }, - "lastModificationSignature": "f7ce6455e576f34a531726016f349810dc2ef53652ec32614f8452f8840bb016" + "lastModificationSignature": "ff4dc5a6ba7255f698a00573d69c699b8b43309b76df1f44b0730680f23f3c1e" } } \ No newline at end of file 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 a721fa00..7f392156 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-08-18T17:06:35Z" + "timestamp": "2025-08-19T08:34:34Z" }, - "lastModificationSignature": "ab4eee9ffbf14a771f611261d4e2b383847e0d0ef4246d845453bca8f3937979" + "lastModificationSignature": "61948bcab0aecbfcfbb060262dd66913e0ddae5cc98d42f23d226982194c7286" } } \ 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 16ea221e..1cc2cea6 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 ddf65b8e..91aa32ac 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 @@ -9,9 +9,9 @@ ], "attributes": { "lastModification": { - "actor": "external", - "timestamp": "2025-08-18T16:55:42Z" + "actor": "admin", + "timestamp": "2025-08-19T08:36:40Z" }, - "lastModificationSignature": "b494201c09ed9c7d5b2d46ceb2cc845f37b6a4b1749e3ebca06c8368e77a81a2" + "lastModificationSignature": "33e6935db616a5830005ef8b0e01e416aeaed54b4f0ddc71deb0f451ce59fe55" } } \ 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 098914f4..c60c7fb1 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/Docked-West/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/view.json index 5fddbd71..ff759ff4 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/view.json @@ -719,10 +719,10 @@ "component": { "onActionPerformed": { "config": { - "script": "\tsystem.perspective.navigateBack()" + "page": "/" }, - "scope": "G", - "type": "script" + "scope": "C", + "type": "nav" } } }, @@ -730,7 +730,7 @@ "name": "Back", "tooltip": { "enabled": true, - "text": "Back" + "text": "Back to DEX" } }, "position": { 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 3f956807..bd08322b 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-08-18T17:10:18Z" + "timestamp": "2025-08-19T08:36:48Z" }, - "lastModificationSignature": "ca8be9c37bbcbadf5ed96232cff9fa89d84bd494ccdc12cb2ac039dcfb4e21e3" + "lastModificationSignature": "66e5b378124ac8f89350bb3e7f20e5350deba2f86531b26524693a89a4fd9dfe" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json index 9928bedf..786f2988 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json @@ -251,40 +251,6 @@ }, "type": "ia.display.icon" }, - { - "events": { - "dom": { - "onClick": { - "config": { - "page": "/" - }, - "scope": "C", - "type": "nav" - } - } - }, - "meta": { - "name": "Back", - "tooltip": { - "enabled": true, - "text": "Go back to DEX" - } - }, - "position": { - "basis": "24px", - "shrink": 0 - }, - "props": { - "color": "#FFFFFF", - "path": "material/arrow_back", - "style": { - "classes": "Header/Icon", - "cursor": "pointer", - "marginRight": "10px" - } - }, - "type": "ia.display.icon" - }, { "children": [ { diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json index 811aaf3d..20e2f1d2 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-08-18T17:01:01Z" + "timestamp": "2025-08-19T08:34:40Z" }, - "lastModificationSignature": "c96954f271301fbe6967d01705c0eb2e394c1b3bd378dcf2031c9ecfbc3d1b87" + "lastModificationSignature": "a1382ca3a17352b6faf6ba1fba9188090bd7729856296047472239fff3495f3b" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png index 69f14c99..277b26fc 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json index 4f4375f0..6760a57c 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json @@ -167,8 +167,8 @@ "position": { "height": 0.037, "width": 0.0208, - "x": 0.9703, - "y": 0.5778 + "x": 0.9755, + "y": 0.5406 }, "props": { "path": "autStand/Equipment/Camera",