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] 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"