From 862dacabdefac8ba36c5a93f8a44cf0d03848b61 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com>
Date: Sat, 12 Feb 2022 23:20:10 +0100
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B8=D0=B4=D0=B6=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.svelte          | 27 ++++++++++++++++++++-------
 src/pages/System.svelte |  8 ++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 1568bea..44cde72 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -33,8 +33,8 @@
 
   //****************************************************variable section**********************************************************/
   //******************************************************************************************************************************/
-  let myip = document.location.hostname;
-  //let myip = "192.168.88.235";
+  //let myip = document.location.hostname;
+  let myip = "192.168.88.235";
 
   //Flags
   let showInput = false;
@@ -132,7 +132,6 @@
     sendCurrentPageName();
   }
 
-  //отправляем запрос данных для данной страницы и запрос данных для всех страниц - /all
   function sendCurrentPageName() {
     if (selectedWs !== undefined) {
       wsSendMsg(selectedWs, currentPageName);
@@ -233,7 +232,7 @@
           if (data.includes("status")) {
             if (IsJsonParse(data)) {
               let statusJson = JSON.parse(data);
-              udatelayoutJson(statusJson);
+              udateStatusOfWidget(statusJson);
               wigetsUpdate();
               if (debug) console.log("✔", "statusJson parced");
               onParced("status");
@@ -243,8 +242,8 @@
           if (data.includes("params")) {
             if (IsJsonParse(data)) {
               let paramsJson = JSON.parse(data);
-              //udatelayoutJson(statusJson);
-              //wigetsUpdate();
+              udateStatusOfAllWidgets(paramsJson);
+              wigetsUpdate();
               if (debug) console.log("✔", "paramsJson parced");
               onParced("params");
             }
@@ -460,7 +459,7 @@
     return layout;
   }
 
-  function udatelayoutJson(newStatusJson) {
+  function udateStatusOfWidget(newStatusJson) {
     for (let i = 0; i < layoutJson.length; i++) {
       let topic = layoutJson[i].topic;
       if (topic === newStatusJson.topic) {
@@ -470,6 +469,20 @@
     }
   }
 
+  function udateStatusOfAllWidgets(paramsJson) {
+    for (const [key, value] of Object.entries(paramsJson)) {
+      for (let i = 0; i < layoutJson.length; i++) {
+        let topic = layoutJson[i].topic;
+        topic = topic.substring(topic.lastIndexOf("/") + 1, topic.length);
+        if (key === topic) {
+          console.log("[i]", "value " + topic + " updated");
+          layoutJson[i].status = value;
+          break;
+        }
+      }
+    }
+  }
+
   function clearData() {
     configJson = [];
     configJsonBlob.clear();
diff --git a/src/pages/System.svelte b/src/pages/System.svelte
index b5061c2..3ef4fc7 100644
--- a/src/pages/System.svelte
+++ b/src/pages/System.svelte
@@ -108,6 +108,14 @@
         num: true,
       },
     },
+    jse3: {
+      1: {
+        descr: "Ошибка json",
+        color: "text-red-500",
+        txt: "Ошибка чтения файла json с виджетами",
+        cancel: true,
+      },
+    },
   };
 
   import Card from "../components/Card.svelte";