From 6e09b879b7d84bc35beb0a05dcbec1569925fc4f Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 18:59:02 +0100
Subject: [PATCH] Minor fix pagina dettaglio conf prod

---
 MP-TAB-SERV/Components/CmpFooter.razor.cs |   9 --
 MP-TAB-SERV/Components/ProdConfirm.razor  | 156 +++++++++++-----------
 MP-TAB-SERV/Components/ProdStat.razor     |   6 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj            |   2 +-
 MP-TAB-SERV/Pages/Scrap.razor             |   2 +-
 MP-TAB-SERV/Resources/ChangeLog.html      |   2 +-
 MP-TAB-SERV/Resources/VersNum.txt         |   2 +-
 MP-TAB-SERV/Resources/manifest.xml        |   2 +-
 8 files changed, 84 insertions(+), 97 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index bde5944f..33884c6e 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -25,15 +25,6 @@ namespace MP_TAB_SERV.Components
             var pUpd = Task.Run(async () =>
                    {
                        await InvokeAsync(() => StateHasChanged());
-#if false
-                       await Task.Delay(1);
-                       if (diffOfTime.Minutes >= dtTimerScadenzaLogin)
-                       {
-                           NavMan.NavigateTo("logout");
-                       }
-                       //Log.Trace("CmpFooter Timer elapsed");
-
-#endif
                    });
             pUpd.Wait();
         }
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index 1276a223..ee24ec5a 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -79,11 +79,11 @@
                         }
                         else if (showConfirm && lblPz2RecBuoni < 0 && chkPzBuoniNeg)
                         {
-                            <div class="alert bg-danger text-light fw-bold text-center">Pezzi buoni negativi!</div>
+                            <div class="btn btn-danger btn-lg text-light fw-bold text-center w-100 h-100">Pezzi buoni negativi!</div>
                         }
                         else
                         {
-                            <div class="alert bg-info text-dark fw-bold text-center">Completare le modifiche!</div>
+                            <btn class="btn btn-info btn-lg w-100 h-100" disabled>Completare le modifiche!</btn>
                         }
                     </div>
                 </div>
@@ -94,91 +94,87 @@
     </div>
 }
 <div class="row textCondens mt-2">
-    <div class="col-4 py-1 text-start text-uppercase">
-        <b>Dati Globali ODL</b>
+    <div class="col-12 py-0 text-start text-uppercase lh-1 fw-bold">
+        Dati Globali ODL
     </div>
-
-    <div class="d-flex justify-content-between flex-wrap mt-2">
-
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #fff3cd; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">[A] NUOVI Pz.Prod</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzProdotti2Rec</span>
-                    }
-                </div>
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #fff3cd; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">[A] NUOVI Pz.Prod</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzProdotti2Rec</span>
+                }
             </div>
         </div>
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #cff4fc; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzProdotti</span>
-                    }
-                </div>
-            </div>
-        </div>
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #f8d7da; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">[B] Scarti VERS.</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzScaConf</span>
-                    }
-                </div>
-            </div>
-        </div>
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">[C] Pz Buoni VERS.</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzBuoniConf</span>
-                    }
-                </div>
-            </div>
-        </div>
-
-
     </div>
-    <div class="d-flex justify-content-between p-3 pe-4">
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #cff4fc; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzProdotti</span>
+                }
+            </div>
+        </div>
+    </div>
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #f8d7da; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">[B] Scarti VERS.</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzScaConf</span>
+                }
+            </div>
+        </div>
+    </div>
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">[C] Pz Buoni VERS.</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzBuoniConf</span>
+                }
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row textCondens mt-1 bg-secondary py-2">
         <div class="col-6">
-            <a class="btn btn-info btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="scrap"><i class="fa fa-bug"></i>  Reg. SCARTI</a>
+            <a class="btn btn-info btn-sm w-100 py-2 " style="min-width: 6rem;" href="scrap"><i class="fa fa-bug"></i>  Reg. SCARTI</a>
         </div>
-        <div class="ms-2 col-6">
-            <a class="btn btn-primary btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
+        <div class=" col-6">
+            <a class="btn btn-primary btn-sm w-100 py-2" style="min-width: 6rem;" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
         </div>
-    </div>
+    @* <div class="d-flex justify-content-between p-3 pe-4">
+    </div> *@
 </div>
 @if (!string.IsNullOrEmpty(lblOut))
 {
diff --git a/MP-TAB-SERV/Components/ProdStat.razor b/MP-TAB-SERV/Components/ProdStat.razor
index 90b8fd52..e8e36b83 100644
--- a/MP-TAB-SERV/Components/ProdStat.razor
+++ b/MP-TAB-SERV/Components/ProdStat.razor
@@ -1,9 +1,9 @@
 
-<div class="d-flex justify-content-between">
-    <div class="col-6 py-1 text-start text-uppercase">
+<div class="d-flex justify-content-between mt-2">
+    <div class="col-6 lh-1 text-start text-uppercase">
         <b>Statistiche di produzione</b>
     </div>
-    <div class="col-6 text-end pe-2">
+    <div class="col-6 lh-1 text-end pe-2">
         @if (RecMSE != null)
         {
             <span>@($"ODL: {RecMSE.IdxOdl}")</span>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index d37767e8..f65311d0 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1417</Version>
+      <Version>6.16.2312.1418</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Scrap.razor b/MP-TAB-SERV/Pages/Scrap.razor
index ef0f6528..65c20614 100644
--- a/MP-TAB-SERV/Pages/Scrap.razor
+++ b/MP-TAB-SERV/Pages/Scrap.razor
@@ -1,6 +1,6 @@
 @page "/scrap"
 
-<MseSampler SampleMult="0.5" E_Updated="RefreshData"></MseSampler>
+<MseSampler SampleMult="0.25" E_Updated="RefreshData"></MseSampler>
 @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null)
 {
     <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 08b10a53..66555095 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1417</h4>
+    <h4>Versione: 6.16.2312.1418</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 258cb1a0..bc8f1f5b 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1417
+6.16.2312.1418
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index c6c9e138..f6a7bf8d 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1417</version>
+  <version>6.16.2312.1418</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>