From 244d3925ce952deec1265ab126f1089dabb6dbe2 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Wed, 2 Mar 2022 00:42:55 +0100
Subject: [PATCH] 4.1.2

---
 public/index.html             |  2 +-
 src/App.svelte                | 31 ++++++++++++++++++-------------
 src/pages/Config.svelte       |  2 +-
 src/pages/Dashboard.svelte    |  4 ++--
 src/training/different.svelte |  7 +++++++
 5 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 src/training/different.svelte

diff --git a/public/index.html b/public/index.html
index f11b9fa..1fee065 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1'>
 
-	<title>IoT Manager 4.1.1</title>
+	<title>IoT Manager 4.1.2</title>
 
 	<link rel='icon' type='image/png' href='/favicon.ico'>
 	<link rel='stylesheet' href='/build/bundle.css'>
diff --git a/src/App.svelte b/src/App.svelte
index bfc4fc3..b3ab781 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -40,8 +40,8 @@
 
   //****************************************************variable section**********************************************************/
   //******************************************************************************************************************************/
-  //let myip = document.location.hostname;
-  let myip = "192.168.88.224";
+  let myip = document.location.hostname;
+  //let myip = "192.168.88.224";
 
   //Flags
   let firstDevListRequest = true;
@@ -442,18 +442,17 @@
           if (data === "/st/layout.json") {
           }
           if (data === "/end/layout.json") {
-            dashReady = true;
             createLayoutUnderLoading(ws);
           }
           //сборщик paramsJson сообщений======================================
           if (data.includes('"params":"')) {
             if (IsJsonParse(data)) {
+              //как добавить в объект json новый объект
               paramsJson = {
                 ...paramsJson,
                 ...JSON.parse(data),
               };
               paramsJson = paramsJson;
-              if (paramsJsonParced) console.log("✔", "paramsJson parced", paramsJson);
               onParced();
             }
           }
@@ -462,9 +461,7 @@
             if (IsJsonParse(data)) {
               let statusJson = JSON.parse(data);
               udateStatusOfWidget(statusJson);
-              sortingLayout();
               if (debug) console.log("[i]", statusJson);
-              statusJsonParced = true;
             }
           }
         }
@@ -520,10 +517,6 @@
     }
   }
 
-  //var t0 = performance.now();
-  //var t1 = performance.now();
-  //console.log("layout time: " + (t1 - t0) + " mls");
-
   function udateStatusOfAllWidgets() {
     for (const [key, value] of Object.entries(paramsJson)) {
       for (let i = 0; i < layoutJson.length; i++) {
@@ -549,10 +542,10 @@
   }
 
   async function onParced() {
-    if (currentPageName === "/|" && paramsJsonParced) {
+    if (currentPageName === "/|") {
       clearParcedFlags();
-      if (debug) console.log("✔✔", "dashboard data parced");
-      //createFinalLayout();
+      if (debug) console.log("✔", "dashboard packet received");
+      dashReady = true;
     }
     if (currentPageName === "/config|" && itemsJsonParced && widgetsJsonParced && configJsonParced && settingsJsonParced && scenarioTxtParced) {
       clearParcedFlags();
@@ -736,6 +729,17 @@
 
   //***********************************************************dashboard***************************************************************/
   function sortingLayout() {
+    //сортируем весь layout по алфавиту
+    layoutJson.sort(function (a, b) {
+      if (a.descr < b.descr) {
+        return -1;
+      }
+      if (a.descr > b.descr) {
+        return 1;
+      }
+      return 0;
+    });
+    //формируем json всех карточек
     pages = [];
     const newPage = Array.from(new Set(Array.from(layoutJson, ({ page }) => page)));
     newPage.forEach(function (item, i, arr) {
@@ -748,6 +752,7 @@
         ),
       ];
     });
+    //сортируем карточки по алфавиту
     pages.sort(function (a, b) {
       if (a.page < b.page) {
         return -1;
diff --git a/src/pages/Config.svelte b/src/pages/Config.svelte
index ec88eba..c8b98cb 100644
--- a/src/pages/Config.svelte
+++ b/src/pages/Config.svelte
@@ -120,7 +120,7 @@
   </div>
   <div class="grd-1col1">
     <Card title="Сценарии">
-      <textarea bind:value={scenarioTxt} class="ipt-big h-80 w-full" />
+      <textarea bind:value={scenarioTxt} class="ipt-big h-40 w-full" />
       <div class="grd-2col1">
         <button class="btn-lg" on:click={() => saveConfig()}>{"Сохранить"}</button>
         <button class="btn-lg" on:click={() => rebootEsp()}>{"Перезагрузить"}</button>
diff --git a/src/pages/Dashboard.svelte b/src/pages/Dashboard.svelte
index 992face..b1e7c16 100644
--- a/src/pages/Dashboard.svelte
+++ b/src/pages/Dashboard.svelte
@@ -18,9 +18,9 @@
     {#if layoutJson === []}
       <Card title={"Ваша панель управления пуста, вначале добавьте новые элементы в конфигураторе!"} />
     {/if}
-    {#each pages as pagesName, i}
+    {#each pages as pagesName, p}
       <Card title={pagesName.page}>
-        {#each layoutJson as widget, i}
+        {#each layoutJson as widget, l}
           {#if widget.page === pagesName.page}
             {#if widget.widget === "input"}
               <Input bind:value={widget.status} widget={widget} wsPush={(ws, topic, status) => wsPush(ws, topic, status)} />
diff --git a/src/training/different.svelte b/src/training/different.svelte
new file mode 100644
index 0000000..c504383
--- /dev/null
+++ b/src/training/different.svelte
@@ -0,0 +1,7 @@
+<script>
+  // вывести время чего либо в консоль
+  var t0 = performance.now();
+  var t1 = performance.now();
+  console.log("layout time: " + (t1 - t0) + " mls");
+  //
+</script>