From 3e2dd95c0e272f86228ce968ee9502858d748beb Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Tue, 16 Aug 2022 00:54:14 +0200
Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=B2=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D0=B1=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.svelte            |  9 +++------
 src/widgets/Input.svelte  | 10 ++++------
 src/widgets/Toggle.svelte | 22 +++++++++-------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index af5d8b1..b8d1228 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -511,12 +511,7 @@
         topic = topic.substring(topic.lastIndexOf("/") + 1, topic.length);
         if (key === topic) {
           console.log("[i]", "value " + topic + " updated");
-          //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 +537,8 @@
       let topic = layoutJson[i].topic;
       if (topic === newStatusJson.topic) {
         layoutJson[i].status = newStatusJson.status;
+        //получен ответ - выключаем красный цвет
+        layoutJson[i].sent = false;
         break;
       }
     }
@@ -1125,7 +1122,7 @@
           <Route path="/">
             <DashboardPage show={dashReady} layoutJson={layoutJson} pages={pages} wsPush={(ws, topic, status) => wsPush(ws, topic, status)} />
             <!--<button class="btn-lg" on:click={() => createFinalLayout()}>{"Test"}</button>-->
-            <textarea value={JSON.stringify(layoutJson)} class="ipt-big h-40 w-full" />
+            <!--<textarea value={JSON.stringify(layoutJson)} class="ipt-big h-40 w-full" />-->
           </Route>
           <Route path="/config">
             <ConfigPage show={configReady} configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} bind:scenarioTxt saveConfig={() => saveConfig()} rebootEsp={() => rebootEsp()} />
diff --git a/src/widgets/Input.svelte b/src/widgets/Input.svelte
index 857154c..09cec50 100644
--- a/src/widgets/Input.svelte
+++ b/src/widgets/Input.svelte
@@ -1,8 +1,6 @@
 <script>
   export let widget;
   export let wsPush = (ws, topic, status) => {};
-  export let value;
-  value = value;
 </script>
 
 <div class="crd-itm-psn">
@@ -12,16 +10,16 @@
   </div>
   <div class="flex justify-end w-1/3">
     {#if widget.type == "number"}
-      <input class={widget["send"] == true ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} step="0.1" type="number" />
+      <input class={widget.sent ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget.sent = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} step="0.01" type="number" />
     {/if}
     {#if widget.type == "text"}
-      <input class={widget["send"] == true ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="text" />
+      <input class={widget.sent ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget.sent = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="text" />
     {/if}
     {#if widget.type == "date"}
-      <input class={widget["send"] == true ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="date" />
+      <input class={widget.sent ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget.sent = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="date" />
     {/if}
     {#if widget.type == "time"}
-      <input class={widget["send"] == true ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="time" />
+      <input class={widget.sent ? "ipt-rnd text-right border-red-500" : "ipt-rnd text-right focus:border-indigo-500"} on:change={() => ((widget.sent = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="time" />
     {/if}
   </div>
 </div>
diff --git a/src/widgets/Toggle.svelte b/src/widgets/Toggle.svelte
index 66ef37f..40cec49 100644
--- a/src/widgets/Toggle.svelte
+++ b/src/widgets/Toggle.svelte
@@ -1,26 +1,22 @@
 <script>
   import App from "../App.svelte";
-  import { onMount } from "svelte";
-  import { handle_promise } from "svelte/internal";
-  onMount(async () => {
-    setDefaultValue();
-  });
   export let widget;
-
+  export let toggleState = false;
   export let wsPush = (ws, topic, status) => {};
 
-  let st = false;
+  $: widget.status, setValue();
 
-  function setDefaultValue() {
+  function setValue() {
     if (widget.status == "1") {
-      st = true;
+      toggleState = true;
     } else if (widget.status == "0") {
-      st = false;
+      toggleState = false;
     }
   }
 
   function changeValue() {
-    if (st) {
+    widget.sent = true;
+    if (toggleState) {
       widget.status = "1";
     } else {
       widget.status = "0";
@@ -36,9 +32,9 @@
   <div class="flex justify-end w-1/3">
     <label for={widget.topic} class="items-center cursor-pointer">
       <div class="relative">
-        <input bind:checked={st} on:change={() => (changeValue(), wsPush(widget.ws, widget.topic, widget.status))} id={widget.topic} type="checkbox" class="sr-only" />
+        <input bind:checked={toggleState} on:change={() => (changeValue(), wsPush(widget.ws, widget.topic, widget.status))} 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 class="dot {widget.sent ? 'bg-red-400' : 'bg-white'} absolute left-1 top-1  w-4 h-4 rounded-full transition" />
       </div>
     </label>
   </div>