From d7ae9a271ead4130caf57f7fa6a53a5237fe06d4 Mon Sep 17 00:00:00 2001 From: gugak Date: Fri, 2 May 2025 08:13:38 -0700 Subject: [PATCH 1/9] filtering camera jams --- .../PopUp-Views/Detail-View-Filter/view.json | 76 +++++++++++++++++++ .../Equipment-Views/THEA/view.json | 10 ++- 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json index 48deb28..d72fe29 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json @@ -518,6 +518,82 @@ ] }, "type": "ia.input.checkbox" + }, + { + "custom": { + "buttonid": "status_filters/camera_jams" + }, + "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-Camera-Jams", + "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_camera_jams" + }, + "type": "property" + } + } + }, + "props": { + "checkedIcon": { + "color": { + "disabled": "#FFFFFF", + "enabled": "#FFFFFF" + } + }, + "style": { + "color": "#FFFFFF", + "fontFamily": "Arial", + "fontSize": 12, + "fontWeight": "bold", + "marginLeft": 10, + "marginRight": 10 + }, + "text": "Show Camera Jams" + }, + "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/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/view.json index 7c71dff..f4b2e13 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/view.json @@ -10,7 +10,7 @@ "priority": 0, "priority_string": "No active alarms", "running_status": 0, - "searchId": "value", + "searchId": "PLC01", "state": 5, "state_string": "Unknown" }, @@ -584,6 +584,14 @@ "type": "expr" } }, + "meta.visible": { + "binding": { + "config": { + "path": "session.custom.alarm_filter.show_camera_jams" + }, + "type": "property" + } + }, "props.style.classes": { "binding": { "config": { From 7b5f2a8ab5e50dc9ab15d5bf9e41b8c0d84aa6c7 Mon Sep 17 00:00:00 2001 From: gugak Date: Fri, 2 May 2025 08:20:38 -0700 Subject: [PATCH 2/9] filtering fios --- .../Symbol-Views/Device-Views/DeviceStatus/view.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json index 4f60c4b..b646e95 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json @@ -270,6 +270,14 @@ }, "type": "expr" } + }, + "meta.visible": { + "binding": { + "config": { + "path": "session.custom.alarm_filter.show_fio" + }, + "type": "property" + } } }, "props": { From b6f546e78cb4d6e7c69d180934218348923d0ca3 Mon Sep 17 00:00:00 2001 From: gugak Date: Fri, 2 May 2025 08:24:04 -0700 Subject: [PATCH 3/9] fix --- .../PopUp-Views/Detail-View-Filter/view.json | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json index d72fe29..b142797 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json @@ -594,6 +594,82 @@ ] }, "type": "ia.input.checkbox" + }, + { + "custom": { + "buttonid": "status_filters/fio" + }, + "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-Fios", + "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_fio" + }, + "type": "property" + } + } + }, + "props": { + "checkedIcon": { + "color": { + "disabled": "#FFFFFF", + "enabled": "#FFFFFF" + } + }, + "style": { + "color": "#FFFFFF", + "fontFamily": "Arial", + "fontSize": 12, + "fontWeight": "bold", + "marginLeft": 10, + "marginRight": 10 + }, + "text": "Show Fio" + }, + "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": { From c5e7a9e4f64c530bc781a294aa4602df199c8e11 Mon Sep 17 00:00:00 2001 From: gugak Date: Fri, 2 May 2025 08:32:27 -0700 Subject: [PATCH 4/9] fixed naming of the gateway --- .../views/PopUp-Views/Detail-View-Filter/view.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json index b142797..f2265b1 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json @@ -459,7 +459,7 @@ } }, "meta": { - "name": "Show-Gateways", + "name": "Show-DPM-MCM", "tooltip": { "delay": 250 } @@ -502,7 +502,7 @@ "marginLeft": 10, "marginRight": 10 }, - "text": "Show Gateways" + "text": "Show DPM/MCM" }, "scripts": { "customMethods": [], From 226119f2693f6187d992a8071eca8bb8e55f494e Mon Sep 17 00:00:00 2001 From: gugak Date: Fri, 2 May 2025 08:52:23 -0700 Subject: [PATCH 5/9] fixed the naming --- .../views/PopUp-Views/Detail-View-Filter/view.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json index f2265b1..e73f7b9 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json @@ -654,7 +654,7 @@ "marginLeft": 10, "marginRight": 10 }, - "text": "Show Fio" + "text": "Show FIO \u0026 SIO" }, "scripts": { "customMethods": [], From 837ebb20ecbb1c2d2af8a861daf5a0b302798842 Mon Sep 17 00:00:00 2001 From: gugak Date: Fri, 2 May 2025 08:56:44 -0700 Subject: [PATCH 6/9] fixed names --- .../views/PopUp-Views/Detail-View-Filter/view.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json index e73f7b9..c1fbd32 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json @@ -502,7 +502,7 @@ "marginLeft": 10, "marginRight": 10 }, - "text": "Show DPM/MCM" + "text": "Show DPM \u0026 MCM" }, "scripts": { "customMethods": [], @@ -597,7 +597,7 @@ }, { "custom": { - "buttonid": "status_filters/fio" + "buttonid": "status_filters/fio_sio" }, "events": { "component": { From 57f8031d9df7b1d0975c25f22448c067b5295acf Mon Sep 17 00:00:00 2001 From: gugak Date: Mon, 5 May 2025 04:07:36 -0700 Subject: [PATCH 7/9] fixed not found and bad scale errors --- .../PowerTable/FilterMenuItem/view.json | 172 ++++++++++++++++++ .../Navigation-Views/Docked-West/view.json | 2 +- .../PopUp-Views/Detail-View-Filter/view.json | 2 +- 3 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/view.json diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/view.json new file mode 100644 index 0000000..7186949 --- /dev/null +++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/view.json @@ -0,0 +1,172 @@ +{ + "custom": {}, + "params": { + "active": false, + "color": "", + "id": "", + "text": "hello world" + }, + "propConfig": { + "params.active": { + "paramDirection": "inout", + "persistent": true + }, + "params.color": { + "paramDirection": "input", + "persistent": true + }, + "params.id": { + "paramDirection": "input", + "persistent": true + }, + "params.text": { + "paramDirection": "input", + "persistent": true + } + }, + "props": { + "defaultSize": { + "height": 28, + "width": 183 + } + }, + "root": { + "children": [ + { + "events": { + "dom": { + "onClick": { + "config": { + "script": "\tsystem.perspective.sendMessage(\u0027activate-filter\u0027, payload \u003d {\u0027id\u0027:self.view.params.id}, scope \u003d \u0027page\u0027)\n\tself.view.params.active \u003d True " + }, + "scope": "G", + "type": "script" + } + } + }, + "meta": { + "name": "AddButton" + }, + "position": { + "basis": "30px" + }, + "propConfig": { + "position.display": { + "binding": { + "config": { + "expression": "!{view.params.active}" + }, + "type": "expr" + } + }, + "props.color": { + "binding": { + "config": { + "path": "view.params.color" + }, + "type": "property" + } + } + }, + "props": { + "path": "material/add", + "style": { + "cursor": "pointer" + } + }, + "type": "ia.display.icon" + }, + { + "events": { + "dom": { + "onClick": { + "config": { + "script": "\tsystem.perspective.sendMessage(\u0027deactivate-filter\u0027, payload \u003d {\u0027id\u0027:self.view.params.id}, scope \u003d \u0027page\u0027)\n\tself.view.params.active \u003d False " + }, + "scope": "G", + "type": "script" + } + } + }, + "meta": { + "name": "RemoveButton" + }, + "position": { + "basis": "30px" + }, + "propConfig": { + "position.display": { + "binding": { + "config": { + "expression": "{view.params.active}" + }, + "type": "expr" + } + }, + "props.color": { + "binding": { + "config": { + "path": "view.params.color" + }, + "type": "property" + } + } + }, + "props": { + "path": "material/remove", + "style": { + "cursor": "pointer" + } + }, + "type": "ia.display.icon" + }, + { + "meta": { + "name": "FilterText" + }, + "position": { + "basis": "153px" + }, + "propConfig": { + "props.text": { + "binding": { + "config": { + "path": "view.params.text" + }, + "type": "property" + } + } + }, + "props": { + "style": { + "classes": "Page/Text", + "fontSize": 12 + } + }, + "type": "ia.display.label" + } + ], + "meta": { + "name": "root" + }, + "props": { + "style": { + "overflow": "hidden" + } + }, + "scripts": { + "customMethods": [], + "extensionFunctions": null, + "messageHandlers": [ + { + "messageType": "deactivate-filter", + "pageScope": true, + "script": "\t# implement your handler here\n\tif payload[\u0027id\u0027] \u003d\u003d self.view.params.id or payload[\u0027id\u0027] \u003d\u003d -1:\n\t\tself.view.params.active \u003d False", + "sessionScope": false, + "viewScope": false + } + ] + }, + "type": "ia.container.flex" + } +} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json index 33228b6..1736b3b 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json @@ -414,7 +414,7 @@ "custom.filters_active": { "binding": { "config": { - "expression": "if(!{session.custom.alarm_filter.show_diagnostic} ||\r\n!{session.custom.alarm_filter.show_gateways} ||\r\n!{session.custom.alarm_filter.show_low_alarm} ||\r\n{session.custom.alarm_filter.orderby} ||\r\n!{session.custom.alarm_filter.show_running} ||\r\n!{session.custom.alarm_filter.show_safety}, \r\nTrue,\r\nFalse)\r\n" + "expression": "if(!{session.custom.alarm_filter.show_diagnostic} ||\r\n!{session.custom.alarm_filter.show_gateways} ||\r\n!{session.custom.alarm_filter.show_low_alarm} ||\r\n{session.custom.alarm_filter.orderby} ||\r\n!{session.custom.alarm_filter.show_running} ||\r\n!{session.custom.alarm_filter.show_fio} ||\r\n!{session.custom.alarm_filter.show_camera_jams} ||\r\n!{session.custom.alarm_filter.show_safety}, \r\nTrue,\r\nFalse)\r\n" }, "type": "expr" } diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json index c1fbd32..952e6e3 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json @@ -114,7 +114,7 @@ "props.selected": { "binding": { "config": { - "expression": "if({session.custom.alarm_filter.show_diagnostic} \u0026\u0026 \r\n{session.custom.alarm_filter.show_gateways} \u0026\u0026\r\n{session.custom.alarm_filter.show_low_alarm} \u0026\u0026\r\n{session.custom.alarm_filter.show_running} \u0026\u0026 \r\n{session.custom.alarm_filter.show_safety}, True, False)" + "expression": "if({session.custom.alarm_filter.show_diagnostic} \u0026\u0026 \r\n{session.custom.alarm_filter.show_gateways} \u0026\u0026\r\n{session.custom.alarm_filter.show_low_alarm} \u0026\u0026\r\n{session.custom.alarm_filter.show_running} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio} \u0026\u0026\r\n{session.custom.alarm_filter.show_safety}, True, False)" }, "type": "expr" } From ef8914b9318384d4ca898aa91ce5fa041143d03c Mon Sep 17 00:00:00 2001 From: gugak Date: Mon, 5 May 2025 04:38:19 -0700 Subject: [PATCH 8/9] Added props --- .../page-config/resource.json | 6 +++--- .../session-props/props.json | 6 ++++-- .../session-props/resource.json | 6 +++--- .../page-config/resource.json | 6 +++--- .../session-props/props.json | 6 ++++-- .../session-props/resource.json | 6 +++--- .../views/Header/Header/resource.json | 4 ++-- .../views/Navigation-Views/Docked-West/resource.json | 4 ++-- .../views/PopUp-Views/Detail-View-Filter/resource.json | 4 ++-- .../Symbol-Views/Device-Views/DeviceStatus/resource.json | 4 ++-- .../views/Symbol-Views/Equipment-Views/THEA/resource.json | 4 ++-- 11 files changed, 30 insertions(+), 26 deletions(-) diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json index 6a02170..4d87274 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json @@ -8,9 +8,9 @@ ], "attributes": { "lastModification": { - "actor": "ilia-gu-autstand", - "timestamp": "2025-04-18T12:56:12Z" + "actor": "admin", + "timestamp": "2025-05-05T11:33:17Z" }, - "lastModificationSignature": "1c4e28ae538739c912b6f4046df20cbd53ab81ffd41fc6976544a3570bf320cd" + "lastModificationSignature": "69e0b4eb7437508dcdd5bad4cbba406ed92458f5a645da86b5bb9fd81788ec1b" } } \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/props.json b/MTN6_SCADA/com.inductiveautomation.perspective/session-props/props.json index b5b94fb..045f3fe 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/props.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/session-props/props.json @@ -3,7 +3,9 @@ "alarm_filter": { "magnificaiton": "x2", "orderby": false, + "show_camera_jams": true, "show_diagnostic": true, + "show_fio": true, "show_gateways": true, "show_low_alarm": true, "show_map": true, @@ -213,13 +215,13 @@ } }, "props": { - "address": "127.0.0.1", + "address": "192.168.5.149", "appBar": { "togglePosition": "hidden" }, "device": {}, "geolocation": {}, "locale": "en-US", - "timeZoneId": "Asia/Tbilisi" + "timeZoneId": "America/Los_Angeles" } } \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json index efe9f3e..268115c 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json @@ -8,9 +8,9 @@ ], "attributes": { "lastModification": { - "actor": "ilia-gu-autstand", - "timestamp": "2025-04-18T12:57:02Z" + "actor": "admin", + "timestamp": "2025-05-05T11:33:50Z" }, - "lastModificationSignature": "05ab8f4189e958a2574a5dd382d68a0a48ef873c68962b8bf0cccbb604930795" + "lastModificationSignature": "b0f6aa6ac39bc3338d5381747b44b588c0dc933b3f25fa822a373703bed27699" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json index 98e4358..f0620fa 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json @@ -8,9 +8,9 @@ ], "attributes": { "lastModification": { - "actor": "external", - "timestamp": "2025-04-08T09:28:16Z" + "actor": "admin", + "timestamp": "2025-05-05T11:34:22Z" }, - "lastModificationSignature": "d111ed4aae06b606bf8e60bb2cd41c71b6a09a05949e5f7635da94e2c4afb814" + "lastModificationSignature": "5ce6b3b1e290b6fe23bc0f09b69dd5ffce89501248fc27d020feea242b3c8f00" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/props.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/props.json index 2cea4ed..ef69e7a 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/props.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/props.json @@ -3,7 +3,9 @@ "alarm_filter": { "magnificaiton": "x2", "orderby": false, + "show_camera_jams": true, "show_diagnostic": true, + "show_fio": true, "show_gateways": true, "show_low_alarm": true, "show_map": true, @@ -211,13 +213,13 @@ } }, "props": { - "address": "10.10.1.96", + "address": "192.168.5.149", "appBar": { "togglePosition": "hidden" }, "device": {}, "geolocation": {}, "locale": "en-US", - "timeZoneId": "UTC" + "timeZoneId": "America/Los_Angeles" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json index 6f746d3..280d01d 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json @@ -8,9 +8,9 @@ ], "attributes": { "lastModification": { - "actor": "external", - "timestamp": "2025-04-08T09:28:16Z" + "actor": "admin", + "timestamp": "2025-05-05T11:34:37Z" }, - "lastModificationSignature": "10564629d4c4e4b19b7052e86e32227c3f52b9e3ceaf4c368387f024d3973232" + "lastModificationSignature": "f1e43b35cecef48b11eb98d4df5d824e5cc70863454469e76e841a0644cdea6d" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json index df3d746..d3ba5ec 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "external", - "timestamp": "2025-04-08T09:28:16Z" + "timestamp": "2025-05-05T11:32:51Z" }, - "lastModificationSignature": "06ddb0449b703928a3e4774c5b0a07898223175e43d6e75b65816e252328ef09" + "lastModificationSignature": "c4a3f28f3d6918e73fbf5e8cf058655b9fedc96ebc01b55ef96e414aa737b4e0" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json index f9f6776..3557cef 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "external", - "timestamp": "2025-04-08T09:28:16Z" + "timestamp": "2025-05-05T11:32:51Z" }, - "lastModificationSignature": "71dd458df15514c9f077cbc4ab84c1f584b60df90856cc4d46af22190483f0a9" + "lastModificationSignature": "7e37f445b20ca02eb9e75cb3e8c521042113c4196f4aad6602f9f05e2a08a859" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json index a4e95ea..59ee4bf 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "external", - "timestamp": "2025-04-08T09:28:16Z" + "timestamp": "2025-05-05T11:32:51Z" }, - "lastModificationSignature": "afdbc6c55f3c1b63596518adb828168116854c5e2058dd2726594ba76c7575d7" + "lastModificationSignature": "f9a13e113bf9ddb1434c44c39c1cb8ff9abb3289e4f79be67dcaaa20d8ef76c1" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json index f2c6b0c..11494bb 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "external", - "timestamp": "2025-04-08T09:28:16Z" + "timestamp": "2025-05-05T11:32:51Z" }, - "lastModificationSignature": "b970c7e443cf45a6e6471f2f60fb4981a3e56b53a433a445667724e9912c31ad" + "lastModificationSignature": "43a80ff05948c024735279605a4549b0d0c03b5920a4bd87eeb2bd2af6da24de" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json index 0ec940c..fc22b38 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "external", - "timestamp": "2025-04-08T09:28:16Z" + "timestamp": "2025-05-05T11:32:51Z" }, - "lastModificationSignature": "774aa512c5cb95950ea32184d9d85344f66319a3beb05ca4a3fec93b0f82004c" + "lastModificationSignature": "bfc32d1b73d4c2b852bc0b4138d804e75fc123a2ade9d5316609d26e09f096dd" } } \ No newline at end of file From f4b9361d1654bfa1c68c9ceb6004f6071243a83e Mon Sep 17 00:00:00 2001 From: Gigi Mamaladze Date: Mon, 5 May 2025 16:53:53 +0400 Subject: [PATCH 9/9] Fixed FIO issue --- .../views/Symbol-Views/Device-Views/DeviceStatus/view.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json index b646e95..2998733 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json @@ -80,7 +80,7 @@ "meta.visible": { "binding": { "config": { - "expression": "if({parent.custom.state}\u003d1||{parent.custom.covert_mode}||{parent.custom.isMatch}\u003e0,true,false)" + "expression": "true" }, "type": "expr" }