From 326726adaba18a4fa6f0031c7f2cc2df50b1047c Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com>
Date: Wed, 14 Dec 2022 00:52:42 +0100
Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.svelte             | 19 +++++++++++++++----
 src/pages/Config.svelte    | 25 +++++++++++++++++++------
 src/pages/Dashboard.svelte |  2 +-
 src/pages/System.svelte    | 12 +++++++-----
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 66343cb..514856a 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -34,18 +34,18 @@
   const debug = true;
   const LOG_MAX_MESSAGES = 100;
   const reconnectTimeout = 30000;
-  const waitingAckTimeout = 5000;
+  const waitingAckTimeout = 6000;
   const rebootingTimeout = 20000;
   const updatingTimeout = 130000;
   let opened = false;
   let preventMove = false;
   const blobDebug = false;
-  const devMode = false;
+  const devMode = true;
 
   //****************************************************variable section**********************************************************/
   //******************************************************************************************************************************/
   let myip = document.location.hostname;
-  if (devMode) myip = "192.168.88.237";
+  if (devMode) myip = "192.168.88.229";
 
   //Flags
   let firstDevListRequest = true;
@@ -1242,6 +1242,17 @@
     return d.getMilliseconds();
   }
 
+  function moduleOrder(id, key, value) {
+    console.log("order: ", id, key, value);
+    let json = {
+      id: id,
+      key: key,
+      value: value,
+    };
+    console.log(json);
+    wsSendMsg(selectedWs, "/order|" + JSON.stringify(json));
+  }
+
   function test() {
     //wsSendMsg(selectedWs, "/test|");
     //console.log("[i]", "test");
@@ -1313,7 +1324,7 @@
             <DashboardPage show={pageReady.dash} layoutJson={layoutJson} pages={pages} wsPush={(ws, topic, status) => wsPush(ws, topic, status)} />
           </Route>
           <Route path="/config">
-            <ConfigPage show={pageReady.config} bind:configJson bind:scenarioTxt widgetsJson={widgetsJson} itemsJson={itemsJson} saveConfig={() => saveConfig()} cleanLogs={() => cleanLogs()} rebootEsp={() => rebootEsp()} />
+            <ConfigPage show={pageReady.config} bind:configJson bind:scenarioTxt widgetsJson={widgetsJson} itemsJson={itemsJson} saveConfig={() => saveConfig()} cleanLogs={() => cleanLogs()} rebootEsp={() => rebootEsp()} moduleOrder={(id, key, value) => moduleOrder(id, key, value)} />
           </Route>
           <Route path="/connection">
             <ConnectionPage show={pageReady.connection} rebootEsp={() => rebootEsp()} ssidClick={() => ssidClick()} saveSett={() => saveSett()} saveMqtt={() => saveMqtt()} settingsJson={settingsJson} errorsJson={errorsJson} ssidJson={ssidJson} />
diff --git a/src/pages/Config.svelte b/src/pages/Config.svelte
index 051acb9..81b5ce8 100644
--- a/src/pages/Config.svelte
+++ b/src/pages/Config.svelte
@@ -191,6 +191,8 @@
     let p = str.indexOf(found) + found.length;
     return str.substring(p);
   }
+
+  export let moduleOrder = (id, key, value) => {};
 </script>
 
 {#if show}
@@ -248,12 +250,23 @@
                     <td />
                     <td />
                     <td />
-                    <td class="tbl-bdy-sm text-right">
-                      <p class="txt-ita">{key}</p>
-                    </td>
-                    <td class="tbl-bdy-sm text-center">
-                      <input bind:value={element[key]} class="ipt-sm w-full" type="text" />
-                    </td>
+                    {#if key.startsWith("btn")}
+                      <td class="tbl-bdy-sm text-right">
+                        <button on:click={() => moduleOrder(element.id, key.substring(4), element[key])} class="h-3 sm:h-6 md:h-6 lg:h-6 xl:h-6 2xl:h-6 w-auto bg-blue-100 inline-flex items-center border border-gray-300 hover:bg-blue-200">{key.substring(4)}</button>
+                      </td>
+                      {#if element[key] != "nil"}
+                        <td class="tbl-bdy-sm text-center">
+                          <input bind:value={element[key]} class="ipt-sm w-full" type="text" />
+                        </td>
+                      {/if}
+                    {:else}
+                      <td class="tbl-bdy-sm text-right">
+                        <p class="txt-ita">{key}</p>
+                      </td>
+                      <td class="tbl-bdy-sm text-center">
+                        <input bind:value={element[key]} class="ipt-sm w-full" type="text" />
+                      </td>
+                    {/if}
                   </tr>
                 {/if}
               {/each}
diff --git a/src/pages/Dashboard.svelte b/src/pages/Dashboard.svelte
index 9ca66ed..aac959e 100644
--- a/src/pages/Dashboard.svelte
+++ b/src/pages/Dashboard.svelte
@@ -18,7 +18,7 @@
 
   function timeOut() {
     empty = false;
-    setTimeout(timeIsOut, 1000);
+    setTimeout(timeIsOut, 3000);
   }
 
   export let pages;
diff --git a/src/pages/System.svelte b/src/pages/System.svelte
index b224658..d6602c9 100644
--- a/src/pages/System.svelte
+++ b/src/pages/System.svelte
@@ -168,11 +168,13 @@
         </div>
         <div class="flex justify-center w-1/3">
           <select class="border border-indigo-500 border-4 text-center" bind:value={choosingVersion}>
-            {#each Object.entries(versionsList) as [key, param]}
-              <option value={param}>
-                {param}
-              </option>
-            {/each}
+            {#if versionsList}
+              {#each Object.entries(versionsList) as [key, param]}
+                <option value={param}>
+                  {param}
+                </option>
+              {/each}
+            {/if}
           </select>
         </div>
       </div>