From d1f9dc03abaed16f7dc921b57d651209a80e3d93 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 8 Mar 2025 08:06:03 +0100
Subject: [PATCH] TAB3: - fix placeholder mappa stato

---
 MP-TAB3/Components/MachineBlock.razor   | 82 ++++++++++++++++++++-----
 MP-TAB3/Components/ProdConfirm.razor.cs |  8 ---
 MP-TAB3/MP-TAB3.csproj                  |  2 +-
 MP-TAB3/Resources/ChangeLog.html        |  2 +-
 MP-TAB3/Resources/VersNum.txt           |  2 +-
 MP-TAB3/Resources/manifest.xml          |  2 +-
 6 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 1f3fb84d..e7925ce5 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -1,22 +1,74 @@
 @if (isLoading)
 {
-    <div class="card text-white mapBlock shadow bg-secondary p-0 m-0">
-        <div class="card-body">
-            <div class="placeholder-glow">
-                <span class="placeholder col-4"></span>
-                <span class="placeholder col-7"></span>
-                <span class="placeholder col-12 pholderHeight"></span>
-                <span class="placeholder col-12"></span>
-                <span class="placeholder col-3"></span>
-                <span class="placeholder col-8"></span>
-                <span class="placeholder col-3"></span>
-                <span class="placeholder col-7"></span>
-                <span class="placeholder col-3"></span>
-                <span class="placeholder col-8"></span>
-                <span>...loading stage 1...</span>
+    @if (FullMode)
+    {
+        <div class="card text-white2 shadow bg-dark p-0 m-0">
+            <div class="card-body rounded rounded-3">
+                <div class="row">
+                    <div class="col-12 placeholder-glow text-center mb-2">
+                        <span class="placeholder col-12 fs-2 bg-light pholderHeight"></span>
+                    </div>
+                    <div class="col-12 placeholder-glow text-center">
+                        <span class="placeholder col-12 fs-2 bg-success"></span>
+                    </div>
+                    <div class="col-12 placeholder-glow text-center my-1">
+                        <span class="placeholder placeholder-lg col-4 bg-success"></span>
+                        <span class="placeholder placeholder-lg col-3 bg-danger"></span>
+                        <span class="placeholder placeholder-lg col-4 bg-warning"></span>
+                    </div>
+                    <div class="col-4 placeholder-glow text-center">
+                        <span class="placeholder col-9 bg-success fs-2"></span>
+                    </div>
+                    <div class="col-8 placeholder-glow">
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
+    }
+    else
+    {
+        <div class="card text-white2 shadow bg-dark p-0 m-0">
+            <div class="card-body rounded rounded-3">
+                <div class="row">
+                    <div class="col-12 placeholder-glow text-center mb-2">
+                        <span class="placeholder col-3 fs-2 bg-light"></span>
+                    </div>
+                    <div class="col-4 placeholder-glow">
+                        <span class="placeholder placeholder-lg col-12"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                    </div>
+                    <div class="col-4 placeholder-glow text-center">
+                        <span class="placeholder col-9 bg-success pholderHeight"></span>
+                    </div>
+                    <div class="col-4 placeholder-glow">
+                        <span class="placeholder placeholder-lg col-12"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                        <span class="placeholder col-9"></span>
+                        <span class="placeholder col-2"></span>
+                    </div>
+                    <div class="col-12 placeholder-glow text-center mt-2">
+                        <span class="placeholder placeholder-lg col-2 bg-warning"></span>
+                        <span class="placeholder placeholder-lg col-7 bg-primary"></span>
+                        <span class="placeholder placeholder-lg col-2 bg-info"></span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
 }
 else
 {
diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs
index 5809c2c9..a336c64e 100644
--- a/MP-TAB3/Components/ProdConfirm.razor.cs
+++ b/MP-TAB3/Components/ProdConfirm.razor.cs
@@ -274,18 +274,14 @@ namespace MP_TAB3.Components
 
         protected async Task SalvaConfPz()
         {
-            int delay = 1;
             isProcessing = true;
             Log.Info("Conf 01");
             // effettua conferma con conf da DB del tipo (giorni / turni / periodo
             bool fatto = effettuaConfermaProd();
-            await Task.Delay(delay);
             await TabDServ.FlushCache("StatoProd");
-            await Task.Delay(delay);
             Log.Info("Conf 02");
             // refresh tabella dati tablet...
             await TabDServ.RicalcMse(IdxMaccSel, 0);
-            await Task.Delay(delay);
             Log.Info("Conf 03");
             // rileggo e salvo..
             var ListMSE = await SDService.MseGetAll(true);
@@ -296,20 +292,16 @@ namespace MP_TAB3.Components
                 // aggiorno MSE attuale
                 RecMSE = ListMSE.Find(x => x.IdxMacchina == IdxMaccSel);
             }
-            await Task.Delay(delay);
             // mostro output
             lblOut = $"Confermata produzione {numPzConfermati - numPzLasciati} pezzi (+{numPzLasciati} pz lasciati, +{numPzScarto2Rec} pz scarto) |{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}";
             // cambio button conferma...
             confProdActive = false;
             numPzLasciati = 0;
-            await Task.Delay(delay);
             dtReqUpdate = DateTime.Now;
             // azzero cache pezzi conf
             SDService.MachNumPzSet(IdxMaccSel, -1);
             await DoUpdate();
-            await Task.Delay(delay);
             await RefreshData();
-            await Task.Delay(delay);
             TabDServ.NotifyDataInvalidated(IdxMaccSel);
             Log.Info("Conf 04");
             isProcessing = false;
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 13c9afb6..10cc639d 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2503.722</Version>
+      <Version>6.16.2503.807</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index eae63147..a35f518c 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2503.722</h4>
+    <h4>Versione: 6.16.2503.807</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 8a473663..6b0df209 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2503.722
+6.16.2503.807
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 95ddc311..e1a9c666 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2503.722</version>
+  <version>6.16.2503.807</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>