From 01d4cd62550bacadea28acb3940ced477854fca8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 24 Feb 2025 15:52:00 +0100
Subject: [PATCH] Update display tab3 in conferma prod e display continuo

---
 MP-TAB3/Components/MachineBlock.razor    | 38 +++++++++++++++++-------
 MP-TAB3/Components/MachineBlock.razor.cs |  5 ++++
 MP-TAB3/Components/ProdConfirm.razor     | 10 +++----
 MP-TAB3/Components/ProdConfirm.razor.cs  |  4 +--
 4 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index a9698580..04a957c6 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -188,39 +188,57 @@ else
                     </div>
                     <div class="col-4 fs-4">
                         <div class="lh-1">
-                            <div class="text-end text-light fw-bold d-flex justify-content-between">
+                            <div class="text-end text-light fw-bold d-flex justify-content-between border-bottom border-secondary">
                                 <div class="px-0">
                                     Cicli Prod
                                 </div>
-                                <div class="px-0">@($"{RecMSE.PezziProd}")</div>
+                                @if (datiProdAct != null)
+                                {
+                                    <div class="px-0">@($"{datiProdAct.PzTotODL}")</div>
+                                }
+                                else
+                                {
+                                    <div class="px-0">@($"{RecMSE.PezziProd}")</div>
+                                }
                             </div>
                             @if (datiProdAct != null)
                             {
-                                @if (datiProdAct.PzConfScarto > 0)
+                                @if (datiProdAct.Pz2RecTot > 0)
                                 {
-                                    <div class="text-end text-danger d-flex justify-content-between">
+                                    <div class="fs-5 text-end text-warning d-flex justify-content-between">
                                         <div class="px-0">
-                                            Scarti Vers
+                                            Da Confermare
                                         </div>
                                         <div class="px-0">
-                                            @($"- {datiProdAct.PzConfScarto}")
+                                            @($"{datiProdAct.Pz2RecTot}")
+                                        </div>
+                                    </div>
+                                }
+                                @if (NumScartiConf > 0)
+                                {
+                                    <div class="fs-5 text-end text-danger d-flex justify-content-between">
+                                        <div class="px-0">
+                                            Scarti Versati
+                                        </div>
+                                        <div class="px-0">
+                                            @($"{NumScartiConf}")
                                         </div>
                                     </div>
                                 }
                                 @if (datiProdAct.PzConfRilav > 0)
                                 {
-                                    <div class="text-end text-warning d-flex justify-content-between">
+                                    <div class="fs-5 text-end text-info d-flex justify-content-between">
                                         <div class="px-0">
-                                            Rilav Vers
+                                            Rilav Versati
                                         </div>
                                         <div class="px-0">
-                                            @($"- {datiProdAct.PzConfRilav}")
+                                            @($"{datiProdAct.PzConfRilav}")
                                         </div>
                                     </div>
                                 }
                                 <div class="text-end text-success d-flex justify-content-between">
                                     <div class="px-0">
-                                        Buoni Vers
+                                        Buoni Versati
                                     </div>
                                     <div class="px-0">
                                         @($"{datiProdAct.PzConfBuoni}")
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs
index cfb945ab..187adf45 100644
--- a/MP-TAB3/Components/MachineBlock.razor.cs
+++ b/MP-TAB3/Components/MachineBlock.razor.cs
@@ -82,6 +82,11 @@ namespace MP_TAB3.Components
             return fullPath;
         }
 
+        protected int NumScartiConf
+        {
+            get => datiProdAct != null ? datiProdAct.PzConfScarto - datiProdAct.PzConfRilav : 0;
+        }
+
         #endregion Public Methods
 
         #region Protected Fields
diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor
index 894b35d6..51121c8d 100644
--- a/MP-TAB3/Components/ProdConfirm.razor
+++ b/MP-TAB3/Components/ProdConfirm.razor
@@ -79,7 +79,7 @@
                                 <span class="text-secondary">@lblPz2RecScarto</span>
                             }
                         </div>
-                        <div class="d-flex justify-content-between lh-sm text-warning">
+                        <div class="d-flex justify-content-between lh-sm text-info">
                             @if (lblCicliRilavorati > 0)
                             {
                                 <span>Cicli Rilav.</span>
@@ -140,11 +140,11 @@
         </div>
     </div>
     <div class="col-6 col-sm p-1">
-        <div class="text-center h-100 px-2" style=" background-color: #cff4fc; border-radius: .5rem;">
+        <div class="text-center text-light h-100 px-2 border border-light" style=" background-color: #363636; border-radius: .5rem;">
             <div class="text-truncate lh-sm pt-1">
-                <span class="text-dark small">Cicli Prod <b>[A+B+C+D]</b></span>
+                <span class="small">Cicli Prod <b>[A+B+C+D]</b></span>
             </div>
-            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+            <div class="d-flex align-items-center text-center justify-content-center">
                 @if (isProcessing)
                 {
                     <i class="fa-solid fa-spinner span"></i>
@@ -174,7 +174,7 @@
         </div>
     </div>
     <div class="col-6 col-sm p-1">
-        <div class="text-center h-100 px-2" style=" background-color: #f8c7cd; border-radius: .5rem;">
+        <div class="text-center h-100 px-2" style=" background-color: #cff4fc; border-radius: .5rem;">
             <div class="text-truncate lh-sm pt-1">
                 <span class="text-dark small"><b>[C]</b> Rilav Vers.</span>
             </div>
diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs
index bb3363b2..3a416d2a 100644
--- a/MP-TAB3/Components/ProdConfirm.razor.cs
+++ b/MP-TAB3/Components/ProdConfirm.razor.cs
@@ -155,7 +155,7 @@ namespace MP_TAB3.Components
 
         protected int numPzProdotti2Rec { get; set; } = 0;
 
-        protected int numPzRilavConf{ get; set; } = 0;
+        protected int numPzRilavConf { get; set; } = 0;
         protected int numPzRilav2Rec { get; set; } = 0;
         protected int numPzScaConf { get; set; } = 0;
 
@@ -222,7 +222,7 @@ namespace MP_TAB3.Components
             numPz2Rec = datiProdAct.Pz2RecTot;
             numPzBuoniConf = datiProdAct.PzConfBuoni;
             numPzRilavConf = datiProdAct.PzConfRilav;
-            numPzScaConf = datiProdAct.PzConfScarto;
+            numPzScaConf = datiProdAct.PzConfScarto - datiProdAct.PzConfRilav;
             numPzProdotti2Rec = datiProdAct.Pz2RecTot;
             numPzRilav2Rec = datiProdAct.Pz2RecRilav;
             numPzScarto2Rec = datiProdAct.Pz2RecScarto;