From 1dcbf4d8f96f260905297c338ccccf7b39917495 Mon Sep 17 00:00:00 2001
From: beka makharadze <beka.makharadze@lci.ge>
Date: Mon, 7 Jul 2025 15:59:56 +0400
Subject: [PATCH]  MTN6-18 and fix some names

---
 .../MCM01 Fluid Inbound Merges 1-4/view.json      |  6 +++---
 .../MCM02 Fluid Inbound Upper/view.json           |  2 +-
 .../view.json                                     |  8 ++++----
 .../Symbol-Views/Equipment-Views/Button/view.json | 15 ++++++++++-----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json
index 0d10443..4f49df5 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json	
@@ -4260,7 +4260,7 @@
       },
       {
         "meta": {
-          "name": "UL7_4)DPM1"
+          "name": "UL7_4_DPM1"
         },
         "position": {
           "height": 0.0146,
@@ -5904,7 +5904,7 @@
       },
       {
         "meta": {
-          "name": "UL4_4)DPM1"
+          "name": "UL4_4_DPM1"
         },
         "position": {
           "height": 0.0146,
@@ -6688,7 +6688,7 @@
       },
       {
         "meta": {
-          "name": "PS1_DPM1"
+          "name": "PS1_4_DPM1"
         },
         "position": {
           "height": 0.0146,
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json
index 47791f9..c93f4c7 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json	
@@ -3235,7 +3235,7 @@
         "meta": {
           "elementPrefix": null,
           "id": "path14",
-          "name": "UL5_12_FIO1",
+          "name": "PS5_12_FIO1",
           "originalName": "UL21-3"
         },
         "position": {
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json
index 4951698..d20eed8 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json	
@@ -10393,7 +10393,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6-0-9-7",
           "inheritedGroupPrefix": "CON",
-          "name": "PS8_9_FIO2",
+          "name": "PDP14_FIO1",
           "originalName": "PS11-2"
         },
         "position": {
@@ -10433,7 +10433,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6-0-9-7",
           "inheritedGroupPrefix": "CON",
-          "name": "PDP14_FIOH1",
+          "name": "PDP11_FIO1",
           "originalName": "PS11-2"
         },
         "position": {
@@ -10442,8 +10442,8 @@
             "angle": 0
           },
           "width": 0.0108,
-          "x": 0.7453,
-          "y": 0.5517
+          "x": 0.1464,
+          "y": 0.3688
         },
         "props": {
           "params": {
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 2344795..172691e 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
@@ -1,18 +1,19 @@
 {
   "custom": {
     "alarm_message": null,
-    "disconnected": true,
-    "plc": "value",
+    "disconnected": false,
+    "plc": "System",
     "priority": 0,
     "priority_string": "Unknown",
-    "searchId": "PLC01",
+    "searchId": "value",
     "state": 0,
     "state_string": "Normal"
   },
   "params": {
+    "color": 1,
     "forceFaultStatus": null,
     "tagProps": [
-      "value",
+      "System/MCM01/StationR/UL1_3_JR_PB1",
       "value",
       "value",
       "value",
@@ -135,6 +136,10 @@
       },
       "persistent": true
     },
+    "params.color": {
+      "paramDirection": "input",
+      "persistent": true
+    },
     "params.forceFaultStatus": {
       "paramDirection": "input",
       "persistent": true
@@ -172,7 +177,7 @@
           "props.elements[1].fill.paint": {
             "binding": {
               "config": {
-                "expression": "if(\r\n  {view.custom.disconnected},\r\n  \u0027#D5D5D5\u0027,\r\n    if(\r\n      {view.custom.state} \u003d 1,\r\n      \u0027#00D900\u0027,\r\n      \u0027#D5D5D5\u0027\r\n      )\r\n)\r\n"
+                "expression": "if(\r\n  {view.custom.disconnected} \u0026\u0026 {view.params.color} \u003d 1,\r\n  \"#D5D5D5\",\r\n  if(\r\n    {view.custom.disconnected} \u0026\u0026 {view.params.color} \u003d 2,\r\n    \"#00D900\",\r\n    if(\r\n      {view.params.color} \u003d 1,\r\n      if(\r\n        {view.custom.state} \u003d 1,\r\n        \"#FF0000\",\r\n        \"#D5D5D5\"\r\n      ),\r\n      if(\r\n        {view.params.color} \u003d 2,\r\n        if(\r\n          {view.custom.state} \u003d 1,\r\n          \"#FF0000\",\r\n          \"#00D900\"\r\n        ),\r\n        \"#D5D5D5\"\r\n      )\r\n    )\r\n  )\r\n)\r\n"
               },
               "type": "expr"
             }