From d79beefeac5ae41a300708c156e5483178d5c542 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 26 Oct 2023 16:11:31 +0200
Subject: [PATCH 1/2] fix machine details

---
 MP-TAB-SERV/Components/MachineBlock.razor   | 89 +++++++++++----------
 MP-TAB-SERV/Components/ProdConfirm.razor    | 10 +--
 MP-TAB-SERV/Components/ProdConfirm.razor.cs |  2 +-
 MP-TAB-SERV/Components/ScrapMan.razor       |  4 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj              |  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, 61 insertions(+), 52 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor
index 164dabfd..c4299ba8 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor
+++ b/MP-TAB-SERV/Components/MachineBlock.razor
@@ -190,54 +190,61 @@ else
                 </div>
             </div>*@
 
-            <div class="cardBlock text-center d-flex justify-content-between px-3 py-1">
-                <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 col-6">
-                        <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="cardBlock 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 class="text-end text-warning d-flex justify-content-between">
-                            <div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
-                            <div class="col-8">@($"{RecMSE.PezziProd:N0}")</div>
-                        </div>
-                        <div class="text-end text-primary d-flex justify-content-between">
-                            <div class="col-4"><i class="fa-brands fa-stack-overflow"></i></div>
-                            <div class="col-8">@($"{RecMSE.extraVal:N0}")</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-4" style="max-height: 8rem; max-width: 8rem;">
-                    <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 class="col-12 px-2 py-1 @RecMSE.Semaforo statusCard">
-                        <div class="d-flex justify-content-between ">
-                            <div class="p-0 mr-auto">
-                                <b>@RecMSE.DescrizioneStato</b>
+                        <div style="font-size: 1rem" class="me-3 col-6">
+                            <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>
-                            <div class="p-0">
-                                @(formatDurata(RecMSE.Durata))
+                            <div class="text-end text-warning d-flex justify-content-between">
+                                <div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
+                                <div class="col-8">@($"{RecMSE.PezziProd:N0}")</div>
+                            </div>
+                            <div class="text-end text-primary d-flex justify-content-between">
+                                <div class="col-4"><i class="fa-brands fa-stack-overflow"></i></div>
+                                <div class="col-8">@($"{RecMSE.extraVal:N0}")</div>
                             </div>
                         </div>
                     </div>
-                    <div>
-                        <div class="text-light d-flex justify-content-between">
-                            <div class="text-start col-4">ART:</div>
-                            <div class="text-end col-8">@($"{RecMSE.CodArticolo}")</div>
+                    <div class="col-4" style="max-height: 8rem; max-width: 8rem;">
+                        <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 class="w-100">
+                            <div class="px-1 w-100">
+                                <button class="btn btn-sm btn-secondary py-2 px-4 w-100">PDF</button>
+                            </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>
+                            <div class="text-light d-flex justify-content-between">
+                                <div class="text-start col-4">ART:</div>
+                                <div class="text-end col-8">@($"{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>
+                            <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>
                         </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>
+                </div>
+                <div class="col-12 mb-2 px-2 py-1 @RecMSE.Semaforo statusCard">
+                    <div class="d-flex justify-content-center ">
+                        <div class="p-0 mr-auto me-1">
+                            <b>@RecMSE.DescrizioneStato</b> :
+                        </div>
+                        <div class="p-0">
+                            @(formatDurata(RecMSE.Durata))
                         </div>
                     </div>
                 </div>
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index 3822eaef..0325038d 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -7,8 +7,8 @@
     <div class="col-8 d-flex justify-content-end">
         @if (odlOk)
         {
-            <div class="px-1">
-                <button class="btn btn-sm @ConfBg py-2 px-4" style="min-width: 72px; min-height: 39px" @onclick="ToggleConfProd">
+            <div class="px-1 col-8">
+                <button class="btn btn-sm @ConfBg py-2 px-4" style="width: 100%" @onclick="ToggleConfProd">
                     <span>@ConfTitle</span>
                 </button>
             </div>
@@ -17,13 +17,13 @@
         {
             <div class="alert alert-warning fs-3">MANCA ODL: conferma NON permessa</div>
         }
-        <div class="px-1">
+        <div class="px-1 col-4">
             <PrintMag RecMSE="RecMSE"></PrintMag>
             @*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
         </div>
-        <div class="px-1">
+        @*<div class="px-1">
             <button class="btn btn-sm btn-secondary py-2 px-4">PDF</button>
-        </div>
+        </div>*@
     </div>
 </div>
 
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
index feb86012..50887bfa 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
@@ -69,7 +69,7 @@ namespace MP_TAB_SERV.Components
 
         protected string ConfTitle
         {
-            get => showInnov ? "CHIUDI" : "CONF";
+            get => showInnov ? "Nascondi conferma" : "Mostra conferma";
         }
         protected string ConfBg
         {
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index 4f6d9fce..9d18452a 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -19,7 +19,9 @@
 }
 else
 {
-    <EgwCoreLib.Razor.PeriodoSel CurrPeriodo="CurrPeriodo" E_PeriodoSel="SetPeriodo"></EgwCoreLib.Razor.PeriodoSel>
+    <div style="font-size: .8rem">
+        <EgwCoreLib.Razor.PeriodoSel CurrPeriodo="CurrPeriodo" E_PeriodoSel="SetPeriodo"></EgwCoreLib.Razor.PeriodoSel>
+    </div>
 }
 <ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
 <div class="cardObj p-2 mt-2">
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index aa655180..b8bd0a26 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.2310.2614</Version>
+      <Version>6.16.2310.2616</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 145b4173..ab18ef6f 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.2310.2614</h4>
+    <h4>Versione: 6.16.2310.2616</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 5757b987..2e838fa3 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2310.2614
+6.16.2310.2616
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index e7944be0..5be9bc05 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.2310.2614</version>
+  <version>6.16.2310.2616</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>

From ad663a70a320caadc6125b187ece405c37c8152d Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 26 Oct 2023 17:05:40 +0200
Subject: [PATCH 2/2] fix machine block

---
 MP-TAB-SERV/Components/MachineBlock.razor | 27 +++++++++++++----------
 MP-TAB-SERV/Components/ProdConfirm.razor  | 18 ++++++++-------
 MP-TAB-SERV/Components/ProdPlanMan.razor  |  2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor
index c4299ba8..40234416 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor
+++ b/MP-TAB-SERV/Components/MachineBlock.razor
@@ -217,13 +217,9 @@ else
                         <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 class="w-100">
-                            <div class="px-1 w-100">
-                                <button class="btn btn-sm btn-secondary py-2 px-4 w-100">PDF</button>
-                            </div>
-                        </div>
+
                         <div>
-                            <div class="text-light d-flex justify-content-between">
+                            <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>
@@ -238,13 +234,20 @@ else
                         </div>
                     </div>
                 </div>
-                <div class="col-12 mb-2 px-2 py-1 @RecMSE.Semaforo statusCard">
-                    <div class="d-flex justify-content-center ">
-                        <div class="p-0 mr-auto me-1">
-                            <b>@RecMSE.DescrizioneStato</b> :
+                <div class="d-flex justify-content-between">
+                    <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">
+                                <b>@RecMSE.DescrizioneStato</b> :
+                            </div>
+                            <div class="p-0">
+                                @(formatDurata(RecMSE.Durata))
+                            </div>
                         </div>
-                        <div class="p-0">
-                            @(formatDurata(RecMSE.Durata))
+                    </div>
+                    <div class="col-2">
+                        <div class="px-1 w-100">
+                            <button class="btn btn-sm btn-secondary w-100"><i class="fa-regular fa-file-pdf"></i></button>
                         </div>
                     </div>
                 </div>
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index 0325038d..452d3266 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -4,7 +4,12 @@
     <div class="col-4">
         <MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
     </div>
+    
     <div class="col-8 d-flex justify-content-end">
+        <div class="px-1 col-4">
+            <PrintMag RecMSE="RecMSE"></PrintMag>
+            @*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
+        </div>
         @if (odlOk)
         {
             <div class="px-1 col-8">
@@ -17,12 +22,9 @@
         {
             <div class="alert alert-warning fs-3">MANCA ODL: conferma NON permessa</div>
         }
-        <div class="px-1 col-4">
-            <PrintMag RecMSE="RecMSE"></PrintMag>
-            @*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
-        </div>
+
         @*<div class="px-1">
-            <button class="btn btn-sm btn-secondary py-2 px-4">PDF</button>
+        <button class="btn btn-sm btn-secondary py-2 px-4">PDF</button>
         </div>*@
     </div>
 </div>
@@ -70,9 +72,9 @@ else
                 <div><span class="text-success">Pz Buoni</span>&nbsp;<span>@lblPz2RecBuoni</span></div>
                 <div><span class="text-danger">Pz scarto</span>&nbsp;<span>@lblPz2RecScarto</span></div>
                 @*<form class="form-floating">
-                    <input type="text" class="form-control" id="floatingInputBuoni" value="@($"{lblPz2RecScarto} {lblPz2RecBuoni}")" disabled />
-                    <label for="floatingInputBuoni" class="text-dark fw-bold">Totale</label>
-                </form>*@
+            <input type="text" class="form-control" id="floatingInputBuoni" value="@($"{lblPz2RecScarto} {lblPz2RecBuoni}")" disabled />
+            <label for="floatingInputBuoni" class="text-dark fw-bold">Totale</label>
+            </form>*@
             </div>
             <div class="col-3 p-1">
                 @if (showConfirm)
diff --git a/MP-TAB-SERV/Components/ProdPlanMan.razor b/MP-TAB-SERV/Components/ProdPlanMan.razor
index 6a5afd01..4a8be05a 100644
--- a/MP-TAB-SERV/Components/ProdPlanMan.razor
+++ b/MP-TAB-SERV/Components/ProdPlanMan.razor
@@ -25,7 +25,7 @@ else
             }
             else
             {
-                <table class="table table-sm table-dark table-striped text-center rounded">
+                <table class="table table-sm table-dark table-striped text-center rounded small">
                     <thead>
                         <tr class="text-center">
                             <th>