From ca777e9ba12fdcda526ed148040f8f7684e5375c Mon Sep 17 00:00:00 2001 From: "b.makharadze" <81828475+bmidf@users.noreply.github.com> Date: Fri, 6 Jun 2025 14:29:34 +0400 Subject: [PATCH 1/3] Updates for JR PB button --- .../views/Simulations/Station_EPC/view.json | 126 +++++++-------- .../views/Simulations/Station_JR_PB/view.json | 52 ++++--- .../Equipment-Views/JR_Button/view.json | 143 +++++------------- .../Equipment-Views/PullChord/view.json | 9 +- .../Equipment-Views/PullChord_End/view.json | 32 +++- .../Equipment-Views/PullChord_Line/view.json | 30 +++- .../PullChord_Line_Vertical/view.json | 32 +++- 7 files changed, 217 insertions(+), 207 deletions(-) diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json index 9570255..93857a0 100644 --- a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json +++ b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json @@ -14,60 +14,29 @@ "name": "Image" }, "position": { - "height": 1080, - "width": 1920, - "x": -2.0088348388671875, - "y": 0.0000629425048828125 + "height": 1, + "width": 1 }, "props": { - "source": "http://127.0.0.1:5500/Station_EPC.svg" + "fit": { + "mode": "fill" + }, + "source": "http://localhost:5500/VFD.svg" }, "type": "ia.display.image" }, - { - "meta": { - "name": "UL1_3_VFD1" - }, - "position": { - "height": 292, - "width": 290, - "x": 813, - "y": 376.979 - }, - "props": { - "params": { - "directionLeft": false, - "forceFaultStatus": null, - "forceRunningStatus": null, - "tagProps": [ - "/System/Conveyor/UL1_3_VFD1", - "value", - "value", - "value", - "value", - "value", - "value", - "value", - "value", - "value" - ] - }, - "path": "Symbol-Views/Equipment-Views/Status" - }, - "type": "ia.display.view" - }, { "meta": { "name": "UL1_3_EPC1_Line" }, "position": { - "height": 30, + "height": 0.0278, "rotate": { "angle": 0 }, - "width": 1376, - "x": 303.83, - "y": 720.21 + "width": 0.7167, + "x": 0.1582, + "y": 0.6669 }, "props": { "params": { @@ -94,13 +63,13 @@ "name": "UL1_3_EPC2_Line" }, "position": { - "height": 30, + "height": 0.0278, "rotate": { "angle": 0 }, - "width": 1360, - "x": 312.93, - "y": 294.02 + "width": 0.7156, + "x": 0.1557, + "y": 0.2722 }, "props": { "params": { @@ -127,13 +96,13 @@ "name": "UL1_3_EPC2" }, "position": { - "height": 178, + "height": 0.1648, "rotate": { "angle": 90 }, - "width": 185, - "x": 134, - "y": 220 + "width": 0.0964, + "x": 0.0698, + "y": 0.2037 }, "props": { "params": { @@ -160,13 +129,13 @@ "name": "UL1_3_EPC1" }, "position": { - "height": 178, + "height": 0.1648, "rotate": { "angle": "90deg" }, - "width": 185, - "x": 134, - "y": 645 + "width": 0.0964, + "x": 0.0698, + "y": 0.5972 }, "props": { "params": { @@ -193,13 +162,13 @@ "name": "UL1_3_EPC1_END" }, "position": { - "height": 150, + "height": 0.1389, "rotate": { "angle": 90 }, - "width": 80, - "x": 1687.89, - "y": 660.19 + "width": 0.0417, + "x": 0.8791, + "y": 0.6113 }, "props": { "params": { @@ -226,13 +195,13 @@ "name": "UL1_3_EPC2_END" }, "position": { - "height": 150, + "height": 0.1389, "rotate": { "angle": 90 }, - "width": 80, - "x": 1682.89, - "y": 235.19 + "width": 0.0417, + "x": 0.8765, + "y": 0.2178 }, "props": { "params": { @@ -253,11 +222,46 @@ "path": "Symbol-Views/Equipment-Views/PullChord_End" }, "type": "ia.display.view" + }, + { + "meta": { + "name": "UL1_3_VFD1" + }, + "position": { + "height": 0.2083, + "width": 0.1255, + "x": 0.4296, + "y": 0.3797 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "/System/Conveyor/UL1_3_VFD1", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" } ], "meta": { "name": "root" }, + "props": { + "mode": "percent" + }, "type": "ia.container.coord" } } \ No newline at end of file diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_JR_PB/view.json b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_JR_PB/view.json index 3de538f..11ef197 100644 --- a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_JR_PB/view.json +++ b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_JR_PB/view.json @@ -14,11 +14,23 @@ "name": "Image" }, "position": { - "height": 1080, - "width": 1920 + "height": 1, + "width": 1 + }, + "propConfig": { + "props.source": { + "binding": { + "config": { + "expression": "\"http://127.0.0.1:5500/VFD.svg?var\" + toMillis(now(1000))" + }, + "type": "expr" + } + } }, "props": { - "source": "http://localhost:5500/Station_JR_PB.svg" + "fit": { + "mode": "fill" + } }, "type": "ia.display.image" }, @@ -27,16 +39,16 @@ "name": "UL1_3_JR_PB1" }, "position": { - "height": 178, - "width": 185, - "x": 554, - "y": 189 + "height": 0.1648, + "width": 0.0964, + "x": 0.0719, + "y": 0.1736 }, "props": { "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Buttons/UL1_3_JR_PB1", + "/System/Station/Buttons/UL1_3_JR_PB1", "value", "value", "value", @@ -57,16 +69,16 @@ "name": "UL1_3_JR_PB2" }, "position": { - "height": 178, - "width": 185, - "x": 553.984, - "y": 677 + "height": 0.1648, + "width": 0.0964, + "x": 0.0719, + "y": 0.6255 }, "props": { "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Buttons/UL1_3_JR_PB2", + "/System/Station/Buttons/UL1_3_JR_PB2", "value", "value", "value", @@ -87,10 +99,10 @@ "name": "UL1_3_VFD1" }, "position": { - "height": 292, - "width": 290, - "x": 813, - "y": 376.979 + "height": 0.2333, + "width": 0.1224, + "x": 0.427, + "y": 0.367 }, "props": { "params": { @@ -118,6 +130,12 @@ "meta": { "name": "root" }, + "props": { + "mode": "percent", + "style": { + "backgroundColor": "#FFFFFF" + } + }, "type": "ia.container.coord" } } \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json index 646ccd1..5b36554 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json @@ -1,18 +1,12 @@ { "custom": { "alarm_message": null, - "covert_mode": true, "disconnected": false, - "display_icon": true, - "error": false, - "isMatch": 0, "plc": "value", "priority": 0, "priority_string": "No active alarms", "searchId": "PLC01", - "state": 5, - "status": 3, - "visible_status": false + "state": 0 }, "params": { "forceFaultStatus": null, @@ -30,24 +24,6 @@ ] }, "propConfig": { - "custom.alarm_message": { - "persistent": true - }, - "custom.covert_mode": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "expression": "case(\t{value},\r\n\t\t0, {session.custom.alarm_filter.show_running},\r\n\t\t1, True,\r\n\t\t2, True,\r\n\t\t3, {session.custom.alarm_filter.show_low_alarm} || {session.custom.alarm_filter.show_running},\r\n\t\t4, {session.custom.alarm_filter.show_diagnostic} || {session.custom.alarm_filter.show_running},\r\n\t\t5, {session.custom.alarm_filter.show_running},\r\n\t\tFalse)", - "type": "expression" - } - ], - "type": "property" - }, - "persistent": true - }, "custom.disconnected": { "binding": { "config": { @@ -69,39 +45,6 @@ }, "persistent": true }, - "custom.display_icon": { - "binding": { - "config": { - "expression": "{this.custom.covert_mode}||{this.custom.isMatch}\u003e0" - }, - "type": "expr" - }, - "persistent": true - }, - "custom.error": { - "binding": { - "config": { - "path": "view.custom.state" - }, - "transforms": [ - { - "expression": "0 \u003c {value} \u0026\u0026 {value} \u003c 5", - "type": "expression" - } - ], - "type": "property" - }, - "persistent": true - }, - "custom.isMatch": { - "binding": { - "config": { - "expression": "if({view.params.tagProps[0]}\u003d\"value\",0,\nif({this.custom.searchId}\u003d{view.params.tagProps[0]},100,0))" - }, - "type": "expr" - }, - "persistent": true - }, "custom.plc": { "binding": { "config": { @@ -129,7 +72,7 @@ "mappings": [ { "input": 1, - "output": 4 + "output": 1 } ], "outputType": "scalar", @@ -143,9 +86,27 @@ "custom.priority_string": { "binding": { "config": { - "expression": "case({view.custom.state},\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")" + "path": "view.custom.state" }, - "type": "expr" + "transforms": [ + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 1, + "output": "High" + }, + { + "input": 0, + "output": "No active alarms" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "property" }, "persistent": true }, @@ -167,7 +128,7 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/ALARMST" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" }, "transforms": [ { @@ -180,11 +141,19 @@ "mappings": [ { "input": 1, - "output": 4 + "output": 1 }, { "input": 0, - "output": 5 + "output": 0 + }, + { + "input": 2, + "output": 2 + }, + { + "input": 3, + "output": 3 } ], "outputType": "scalar", @@ -195,36 +164,6 @@ }, "persistent": true }, - "custom.status": { - "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},{view.params.forceFaultStatus},0)", - "type": "expression" - } - ], - "type": "tag" - }, - "persistent": true - }, - "custom.visible_status": { - "binding": { - "config": { - "expression": "{view.custom.state} !\u003d 5" - }, - "type": "expr" - }, - "persistent": true - }, "params.forceFaultStatus": { "paramDirection": "input", "persistent": true @@ -256,19 +195,13 @@ "config": { "expression": "\u0027#585858\u0027" }, - "transforms": [ - { - "expression": "if({view.custom.display_icon}\u0026\u0026 {view.custom.isMatch}\u003d0,{value},{value}+\u002700\u0027)", - "type": "expression" - } - ], "type": "expr" } }, "props.elements[1].fill.paint": { "binding": { "config": { - "path": "view.custom.status" + "path": "view.custom.state" }, "transforms": [ { @@ -302,7 +235,7 @@ "props.style.classes": { "binding": { "config": { - "expression": "if({session.custom.colours.colour_impaired} \u003d True \u0026\u0026 {view.custom.isMatch} \u003e 0,\r\n{view.custom.state} + 100 + {view.custom.isMatch},\r\n{view.custom.state} + {view.custom.isMatch})" + "expression": "if({session.custom.colours.colour_impaired} \u003d True,\r\n{view.custom.state} + 100,\r\n{view.custom.state})" }, "transforms": [ { @@ -431,7 +364,7 @@ }, "transforms": [ { - "expression": "case({value},\r\n0,{session.custom.colours.state0},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state2},\r\n3,{session.custom.colours.state3},\r\n4,{session.custom.colours.state4},\r\n5,{session.custom.colours.state5},\r\n6,{session.custom.colours.state6},\r\n{session.custom.colours.fallback}\r\n)", + "expression": "case({value},\r\n0,{session.custom.colours.state5},\r\n1,{session.custom.colours.state1},\r\n2,{session.custom.colours.state2},\r\n3,{session.custom.colours.state3},\r\n{session.custom.colours.fallback}\r\n)", "type": "expression" } ], @@ -479,7 +412,7 @@ }, "transforms": [ { - "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#FFFFFF\u0027,\r\n\t\t\t2,\u0027#000000\u0027,\r\n\t\t\t3,\u0027#000000\u0027,\r\n\t\t\t4,\u0027#FFFFFF\u0027,\r\n\t\t\t5,\u0027#FFFFFF\u0027,\r\n\t\t\t\u0027#000000\u0027)\r\n\t)", + "expression": "if({session.custom.colours.colour_impaired},\r\n\t\u0027#000000\u0027,\r\n\tcase(\t{value},\r\n\t\t\t1,\u0027#FFFFFF\u0027,\r\n\t\t\t2,\u0027#000000\u0027,\r\n\t\t\t3,\u0027#000000\u0027,\r\n\t\t\t\u0027#FFFFFF\u0027)\r\n\t)", "type": "expression" } ], @@ -497,7 +430,7 @@ "meta.visible": { "binding": { "config": { - "path": "view.custom.display_icon" + "path": "session.custom.alarm_filter.show_running" }, "type": "property" } diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json index d461dfc..b68f9dc 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/view.json @@ -1,5 +1,6 @@ { "custom": { + "alarm_message": null, "disconnected": false, "plc": "value", "priority": 0, @@ -129,7 +130,7 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" }, "transforms": [ { @@ -137,15 +138,15 @@ "type": "expression" }, { - "fallback": 0, + "fallback": null, "inputType": "scalar", "mappings": [ { - "input": true, + "input": 1, "output": 1 }, { - "input": false, + "input": 0, "output": 0 } ], diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json index f32295b..f4be139 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/view.json @@ -3,7 +3,7 @@ "disconnected": false, "plc": "value", "priority": 0, - "priority_string": "Low", + "priority_string": "No active alarms", "searchId": "PLC01", "state": 0, "state_string": "Normal" @@ -87,9 +87,27 @@ "custom.priority_string": { "binding": { "config": { - "expression": "case({view.custom.state},\r\n1, \"High\",\r\n0, \"Low\",\r\n\"Unknown\")" + "path": "view.custom.state" }, - "type": "expr" + "transforms": [ + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 1, + "output": "High" + }, + { + "input": 0, + "output": "No active alarms" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "property" }, "persistent": true }, @@ -111,7 +129,7 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" }, "transforms": [ { @@ -119,15 +137,15 @@ "type": "expression" }, { - "fallback": 0, + "fallback": null, "inputType": "scalar", "mappings": [ { - "input": true, + "input": 1, "output": 1 }, { - "input": false, + "input": 0, "output": 0 } ], diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json index cbd9e2b..f5a00b8 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/view.json @@ -88,9 +88,27 @@ "custom.priority_string": { "binding": { "config": { - "expression": "case({view.custom.state},\r\n1, \"High\",\r\n0, \"No active alarms\",\r\n\"Unknown\")" + "path": "view.custom.state" }, - "type": "expr" + "transforms": [ + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 1, + "output": "High" + }, + { + "input": 0, + "output": "No active alarms" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "property" }, "persistent": true }, @@ -112,7 +130,7 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" }, "transforms": [ { @@ -120,15 +138,15 @@ "type": "expression" }, { - "fallback": 0, + "fallback": null, "inputType": "scalar", "mappings": [ { - "input": true, + "input": 1, "output": 1 }, { - "input": false, + "input": 0, "output": 0 } ], diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json index 7b2d2cd..8c75160 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/view.json @@ -3,7 +3,7 @@ "disconnected": false, "plc": "value", "priority": 0, - "priority_string": "Unknown", + "priority_string": "No active alarms", "searchId": "PLC01", "state": 0, "state_string": "Normal" @@ -87,9 +87,27 @@ "custom.priority_string": { "binding": { "config": { - "expression": "case({view.custom.state},\r\n1, \"High\",\r\n2, \"Medium\",\r\n3, \"Low\",\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")" + "path": "view.custom.state" }, - "type": "expr" + "transforms": [ + { + "fallback": "Unknown", + "inputType": "scalar", + "mappings": [ + { + "input": 1, + "output": "High" + }, + { + "input": 0, + "output": "No active alarms" + } + ], + "outputType": "scalar", + "type": "map" + } + ], + "type": "property" }, "persistent": true }, @@ -111,7 +129,7 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Estopped" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" }, "transforms": [ { @@ -119,15 +137,15 @@ "type": "expression" }, { - "fallback": 0, + "fallback": null, "inputType": "scalar", "mappings": [ { - "input": true, + "input": 1, "output": 1 }, { - "input": false, + "input": 0, "output": 0 } ], From c329e5a3b1061aae5ab0bfaef633ae075fb25e9e Mon Sep 17 00:00:00 2001 From: "b.makharadze" <81828475+bmidf@users.noreply.github.com> Date: Fri, 6 Jun 2025 18:10:04 +0400 Subject: [PATCH 2/3] Added Filters for Buttons --- .../session-props/props.json | 5 +- .../PopUp-Views/Detail-View-Filter/view.json | 76 +++++++++++++++++++ .../Equipment-Views/Button/view.json | 4 +- .../Equipment-Views/Estop/view.json | 2 +- .../Equipment-Views/JR_Button/view.json | 2 +- .../Equipment-Views/SS_Button/view.json | 8 +- 6 files changed, 87 insertions(+), 10 deletions(-) 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 ef69e7a..cd20fdd 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,6 +3,7 @@ "alarm_filter": { "magnificaiton": "x2", "orderby": false, + "show_buttons": true, "show_camera_jams": true, "show_diagnostic": true, "show_fio": true, @@ -213,13 +214,13 @@ } }, "props": { - "address": "192.168.5.149", + "address": "127.0.0.1", "appBar": { "togglePosition": "hidden" }, "device": {}, "geolocation": {}, "locale": "en-US", - "timeZoneId": "America/Los_Angeles" + "timeZoneId": "Asia/Tbilisi" } } \ No newline at end of file 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 952e6e3..6520bf9 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 @@ -367,6 +367,82 @@ }, "type": "ia.input.checkbox" }, + { + "custom": { + "buttonid": "status_filters/low_alarms" + }, + "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-Buttons", + "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_buttons" + }, + "type": "property" + } + } + }, + "props": { + "checkedIcon": { + "color": { + "disabled": "#FFFFFF", + "enabled": "#FFFFFF" + } + }, + "style": { + "color": "#FFFFFF", + "fontFamily": "Arial", + "fontSize": 12, + "fontWeight": "bold", + "marginLeft": 10, + "marginRight": 10 + }, + "text": "Show Buttons" + }, + "scripts": { + "customMethods": [], + "extensionFunctions": null, + "messageHandlers": [ + { + "messageType": "select-all-filters", + "pageScope": false, + "script": "\tdata \u003d payload[\"data\"]\n\tself.props.selected \u003d data\n\tsystem.perspective.print(data)", + "sessionScope": false, + "viewScope": true + } + ] + }, + "type": "ia.input.checkbox" + }, { "custom": { "buttonid": "status_filters/estops_pullChords" diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json index b5155c6..e3add94 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json @@ -11,7 +11,7 @@ "priority_string": "No active alarms", "searchId": "PLC01", "state": 5, - "status": 1, + "status": 0, "visible_status": false }, "params": { @@ -476,7 +476,7 @@ "meta.visible": { "binding": { "config": { - "path": "view.custom.display_icon" + "path": "session.custom.alarm_filter.show_buttons" }, "type": "property" } diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/view.json index 9c7decd..4f278ad 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/view.json @@ -481,7 +481,7 @@ "meta.visible": { "binding": { "config": { - "path": "view.custom.display_icon" + "path": "session.custom.alarm_filter.show_safety" }, "type": "property" } diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json index 5b36554..aa0b8e3 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json @@ -430,7 +430,7 @@ "meta.visible": { "binding": { "config": { - "path": "session.custom.alarm_filter.show_running" + "path": "session.custom.alarm_filter.show_buttons" }, "type": "property" } diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SS_Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SS_Button/view.json index 7dfaeba..7bcd313 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SS_Button/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SS_Button/view.json @@ -1,6 +1,6 @@ { "custom": { - "activated": true, + "activated": false, "alarm_message": null, "covert_mode": true, "disconnected": false, @@ -14,8 +14,8 @@ "show_error": false, "show_status": true, "state": 5, - "status": 1, - "status_string": "Started", + "status": 0, + "status_string": "Unknown", "visible_status": false }, "params": { @@ -594,7 +594,7 @@ "meta.visible": { "binding": { "config": { - "path": "view.custom.display_icon" + "path": "session.custom.alarm_filter.show_buttons" }, "type": "property" } From 94b46b151d1bb5cb57a408b24157bcd7695e2551 Mon Sep 17 00:00:00 2001 From: "b.makharadze" <81828475+bmidf@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:52:45 +0400 Subject: [PATCH 3/3] fix conflicts --- .../views/Symbol-Views/Equipment-Views/JR_Button/view.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json index aa0b8e3..e0ba022 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json @@ -6,7 +6,9 @@ "priority": 0, "priority_string": "No active alarms", "searchId": "PLC01", - "state": 0 + "state": 5, + "status": 0, + "visible_status": false }, "params": { "forceFaultStatus": null, @@ -328,7 +330,7 @@ "dom": { "onClick": { "config": { - "script": "\tsystem.perspective.openDock(\u0027Docked-East\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})" + "script": "\tsystem.perspective.openDock(\u0027Docked-East-JR\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})" }, "scope": "G", "type": "script"