From 754f9d95f9bcc77995842bcb40da2c1cd2cc5176 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Mon, 15 Aug 2022 01:30:59 +0200
Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=200=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.svelte            | 25 +++++++++++++++++++------
 src/widgets/Toggle.svelte | 11 ++---------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 2f02591..c2cd8a0 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -511,7 +511,12 @@
         topic = topic.substring(topic.lastIndexOf("/") + 1, topic.length);
         if (key === topic) {
           console.log("[i]", "value " + topic + " updated");
-          devLayout[i].status = value;
+          if (devLayout[i].widget == "toggle") {
+            if (value == "1") devLayout[i].status = 1;
+            if (value == "0") devLayout[i].status = 0;
+          } else {
+            devLayout[i].status = value;
+          }
           break;
         }
       }
@@ -542,6 +547,16 @@
     }
   }
 
+  function udateSingleStatusOfWidget(newStatus, widgetTopic) {
+    for (let i = 0; i < layoutJson.length; i++) {
+      let topic = layoutJson[i].topic;
+      if (topic === widgetTopic) {
+        layoutJson[i].status = newStatus;
+        break;
+      }
+    }
+  }
+
   async function onParced() {
     if (currentPageName === "/|") {
       clearParcedFlags();
@@ -688,11 +703,9 @@
   function wsPush(ws, topic, status) {
     let msg = topic + " " + status;
     if (debug) console.log("[i]", "ws: ", ws, msg);
-    //if (ws) {
-    wsSendMsg(ws, "/control| " + status); //  "/tst|"
-    //} else {
-    //  console.log("[i]", "ws undefined");
-    //}
+    layoutJson = layoutJson;
+    let key = topic.substring(topic.lastIndexOf("/") + 1, topic.length);
+    wsSendMsg(ws, "/control|" + key + "/" + status);
   }
 
   function wsTestMsgTask() {
diff --git a/src/widgets/Toggle.svelte b/src/widgets/Toggle.svelte
index f3587b7..13ab83a 100644
--- a/src/widgets/Toggle.svelte
+++ b/src/widgets/Toggle.svelte
@@ -1,12 +1,10 @@
 <script>
   import App from "../App.svelte";
-
   export let widget;
   export let value;
-
   value = value;
-
   export let wsPush = (ws, topic, status) => {};
+  //let st = Boolean(widget.status);
 </script>
 
 <div class="crd-itm-psn">
@@ -17,15 +15,10 @@
   <div class="flex justify-end w-1/3">
     <label for={widget.topic} class="items-center cursor-pointer">
       <div class="relative">
-        <input on:change={() => ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:checked={widget.status} id={widget.topic} type="checkbox" class="sr-only" />
+        <input bind:checked={widget.status} on:change={() => wsPush(widget.ws, widget.topic, widget.status ? 1 : 0)} id={widget.topic} type="checkbox" class="sr-only" />
         <div class="block bg-gray-600 w-10 h-6 rounded-full" />
         <div class="dot {widget['send'] == true ? 'bg-red-400' : 'bg-white'} absolute left-1 top-1  w-4 h-4 rounded-full transition" />
       </div>
-      {#if widget.status}
-        <p>yes</p>
-      {:else}
-        <p>no</p>
-      {/if}
     </label>
   </div>
 </div>