From ff6b9e0fd35ae38a78a4cfa2ddc858158f347ab7 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 6 Nov 2023 17:13:56 +0100
Subject: [PATCH] aggiunta visualizzazione pezzi scarto

---
 MP-TAB-SERV/Components/MachineBlock.razor | 29 ++++++++++++++++++-----
 MP-TAB-SERV/MP-TAB-SERV.csproj            |  2 +-
 MP-TAB-SERV/Pages/StatusMap.razor         |  8 +++----
 MP-TAB-SERV/Resources/ChangeLog.html      |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt         |  2 +-
 MP-TAB-SERV/Resources/manifest.xml        |  2 +-
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor
index fd0e3a77..42835411 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor
+++ b/MP-TAB-SERV/Components/MachineBlock.razor
@@ -56,9 +56,12 @@ else
                             </div>
                             <div class="col-8" style="line-height: 1.6rem;">
                                 <div class="d-flex justify-content-around">
-                                    <div class="text-center text-success ">
+                                    <div class="text-center text-success d-flex justify-content-between">
                                         <div>
-                                            <i class="fa-regular fa-circle-check"></i>&nbsp; @($" {RecMSE.PezziConf:N0}")
+                                            <i class="fa-regular fa-circle-check"></i>&nbsp; @($" {RecMSE.PezziConf:N0}") &nbsp;
+                                        </div>
+                                        <div class="text-danger">
+                                            + &nbsp; @($" {0:N0}")
                                         </div>
                                     </div>
                                     <div class="text-center text-warning ">
@@ -104,9 +107,16 @@ else
                                     <EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz prod" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
                                 </div>
                                 <div style="font-size: 1rem" class="me-3 col-6">
-                                    <div class="text-center text-success d-flex justify-content-between">
+                                    <div class="text-center text-success d-flex justify-content-between pe-2">
                                         <div class="col-4"><i class="fa-regular fa-circle-check"></i></div>
-                                        <div class="col-8">@($"{RecMSE.PezziConf:N0}")</div>
+                                        <div class="col-8 d-flex justify-content-between">
+                                            <div>
+                                                @($"{RecMSE.PezziConf:N0}")
+                                            </div>
+                                            <div class="text-danger">
+                                                + &nbsp; @($" {0:N0}")
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="text-center text-warning d-flex justify-content-between">
                                         <div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
@@ -138,10 +148,17 @@ else
                                 @RecMSE.Nome
                             </h4>
                         </div>
-                        <div style="font-size: 1rem" class="me-3 col-6">
+                        <div style="font-size: 1rem" class="me-3">
                             <div class="text-end text-success d-flex justify-content-between">
                                 <div class="col-4"><i class="fa-regular fa-circle-check"></i></div>
-                                <div class="col-8">@($"{RecMSE.PezziConf:N0}")</div>
+                                <div class="col-8 d-flex justify-content-between">
+                                    <div>
+                                        @($"{RecMSE.PezziConf:N0}")
+                                    </div>
+                                    <div class="text-danger">
+                                        + &nbsp; @($" {0:N0}")
+                                    </div>
+                                </div>
                             </div>
                             <div class="text-end text-warning d-flex justify-content-between">
                                 <div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 26a117b6..be95afa8 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.2311.616</Version>
+      <Version>6.16.2311.617</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/StatusMap.razor b/MP-TAB-SERV/Pages/StatusMap.razor
index 33ecdde8..72bf0725 100644
--- a/MP-TAB-SERV/Pages/StatusMap.razor
+++ b/MP-TAB-SERV/Pages/StatusMap.razor
@@ -6,13 +6,13 @@
 <div class="row">
     @if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
     {
-        @for (int i = 0; i < 10; i++)
+        @*@for (int i = 0; i < 10; i++)
         {
             <div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-2 px-1 bloccoMacc">
-                @*<MachineBlock></MachineBlock>*@
-                <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
+                @*<MachineBlock></MachineBlock>
             </div>
-        }
+        }*@
+                <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
     }
     else
     {
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 8ded14a8..ab48af00 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.2311.616</h4>
+    <h4>Versione: 6.16.2311.617</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 846ec6ea..51413eef 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2311.616
+6.16.2311.617
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 99e2e93d..a340473a 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.2311.616</version>
+  <version>6.16.2311.617</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>