From 595ea40e6cedbae78579b2a96991bb8048030de0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 9 Jan 2024 08:29:22 +0100
Subject: [PATCH] Fix grafico dettaglio macchina

---
 MP-TAB3/Components/MachineBlock.razor | 87 ++++++++++++++-------------
 MP-TAB3/MP-TAB3.csproj                |  2 +-
 MP-TAB3/Resources/ChangeLog.html      |  2 +-
 MP-TAB3/Resources/VersNum.txt         |  2 +-
 MP-TAB3/Resources/manifest.xml        |  2 +-
 5 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 11a0cd91..e24b1eab 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -150,77 +150,80 @@ else
         else
         {
             <div class="cardObj px-3 py-1">
-                <div class="text-center d-flex justify-content-between ">
-                    <div class="col-4">
-                        <div class="py-2">
-                            <h4 class="text-start mb-0 fw-bold">
-                                @RecMSE.Nome
-                            </h4>
-                        </div>
-                        <div style="font-size: 1rem" class="me-3">
+                <div class="text-center d-flex justify-content-between align-items-center ">
+                    <div class="col-4 fs-5">
+                        <div class="lh-1">
                             <div class="text-end text-success d-flex justify-content-between">
-                                <div class="col-4">
-                                    Pz.Confermati
-                                    <i class="fa-regular fa-circle-check"></i>
+                                <div class="px-0">
+                                    Confermati
+                                    @* <i class="fa-regular fa-circle-check"></i> *@
                                 </div>
-                                <div class="col-8 text-end">
-                                    <div class="text-success">
-                                        @($"{RecMSE.PezziConf}")
-                                    </div>
-                                    <div class="text-danger">
-                                        @if (datiProdAct != null && datiProdAct.PzConfScarto > 0)
-                                        {
-                                            @($"(- {datiProdAct.PzConfScarto})")
-                                        }
-                                    </div>
+                                <div class="px-0">
+                                    @($"{RecMSE.PezziConf}")
                                 </div>
                             </div>
-                            <div class="text-end text-warning d-flex justify-content-between">
-                                <div class="col-4">
-                                    Pz.Prodotti
-                                    <i class="fa-solid fa-layer-group"></i>
+                            @if (datiProdAct != null && datiProdAct.PzConfScarto > 0)
+                            {
+                                <div class="text-end text-danger d-flex justify-content-between">
+                                    <div class="px-0">
+                                        Scarto
+                                    </div>
+                                    <div class="px-0">
+                                        @($"- {datiProdAct.PzConfScarto}")
+                                    </div>
                                 </div>
-                                <div class="col-8">@($"{RecMSE.PezziProd}")</div>
+                            }
+                            <div class="text-end text-warning d-flex justify-content-between">
+                                <div class="px-0">
+                                    Prodotti
+                                    @* <i class="fa-solid fa-layer-group"></i> *@
+                                </div>
+                                <div class="px-0">@($"{RecMSE.PezziProd}")</div>
                             </div>
                             @if (RecMSE.extraVal > 0)
                             {
                                 <div class="text-end text-primary d-flex justify-content-between">
-                                    <div class="col-4">
+                                    <div class="px-0">
                                         Extra
-                                        <i class="fa-brands fa-stack-overflow">
-                                        </i></div>
-                                    <div class="col-8">@($"{RecMSE.extraVal}")</div>
+                                        @* <i class="fa-brands fa-stack-overflow"></i> *@
+                                    </div>
+                                    <div class="px-0">@($"{RecMSE.extraVal}")</div>
                                 </div>
                             }
                         </div>
                     </div>
-                    <div class="col-4" style="max-height: 8rem; max-width: 8rem;">
+                    <div class="col-4" style="max-height: 8rem; max-width: 6rem;">
+                        <h4 class="text-center mb-0 fw-bold">
+                            @RecMSE.Nome
+                        </h4>
                         <EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz prod" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
                     </div>
-                    <div class="col-4 d-flex flex-wrap justify-content-center align-items-center " style="line-height: 1.6rem;">
-                        <div>
+                    <div class="col-4 d-flex flex-wrap justify-content-center align-items-center lh-1">
+                        <div class="w-100">
                             @if (!string.IsNullOrEmpty(IdxMacchSub))
                             {
-                                <div class="text-warning border border-warning rounded-3 px-2">
-                                    @IdxMacchSub <i class="fa-solid fa-triangle-exclamation"></i>
+                                <div class="text-warning border border-warning rounded-3 small px-2 py-1 mb-1">
+                                    @IdxMacchSub
                                 </div>
                             }
+                        </div>
+                        <div class="w-100 fs-5">
                             <div class="text-light d-flex justify-content-between small lh-sm">
-                                <div class="text-start col-4">ART:</div>
-                                <div class="text-end col-8">@($"{RecMSE.CodArticolo}")</div>
+                                <div class="px-0">ART</div>
+                                <div class="px-0">@RecMSE.CodArticolo</div>
                             </div>
                             <div class="text-end text-light d-flex justify-content-between small lh-sm">
-                                <div class="text-start col-4">ODL:</div>
-                                <div class="text-end col-8">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
+                                <div class="px-0">ODL</div>
+                                <div class="px-0">@RecMSE.IdxOdl</div>
                             </div>
                             <div class="text-end text-light d-flex justify-content-between small lh-sm">
-                                <div class="text-start col-4">PODL:</div>
-                                <div class="text-end col-8">@($"PODL{RecMSE.IdxPOdl:00000000}")</div>
+                                <div class="px-0">PODL:</div>
+                                <div class="px-0">@RecMSE.IdxPOdl</div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="d-flex justify-content-between">
+                <div class="d-flex justify-content-between mt-1">
                     <div class="col-10 mb-2 px-2 py-1 @RecMSE.Semaforo statusCard">
                         <div class="d-flex justify-content-center ">
                             <div class="p-0 mr-auto me-1">
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 644f2716..f0034ddb 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.2401.820</Version>
+      <Version>6.16.2401.908</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index fbef759e..94813b65 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.2401.820</h4>
+    <h4>Versione: 6.16.2401.908</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 6b4cf5ee..11439f7d 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2401.820
+6.16.2401.908
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 184126ca..19f0b99e 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.2401.820</version>
+  <version>6.16.2401.908</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>