From b41b0242399440895ef1f54531cc43312f57a54a Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sat, 24 Feb 2024 12:40:09 +0100
Subject: [PATCH] =?UTF-8?q?TAB=C2=A3:=20-=20Update=20display=20macchina=20?=
 =?UTF-8?q?con=20immagini?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MP-TAB3/Components/MachineBlock.razor         | 98 ++++++++++++++-----
 MP-TAB3/Components/MachineBlock.razor.css     | 23 ++---
 MP-TAB3/Components/MachineBlock.razor.less    | 18 +---
 MP-TAB3/Components/MachineBlock.razor.min.css |  2 +-
 MP-TAB3/MP-TAB3.csproj                        |  2 +-
 MP-TAB3/Program.cs                            | 13 ++-
 MP-TAB3/Resources/ChangeLog.html              |  2 +-
 MP-TAB3/Resources/VersNum.txt                 |  2 +-
 MP-TAB3/Resources/manifest.xml                |  2 +-
 9 files changed, 97 insertions(+), 65 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 59133270..ac8363c7 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -36,16 +36,16 @@ else
                 <div class="card shadow rounded rounded-4 border-secondary" @onclick="ShowDetail">
                     <img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
                     <div class="bg-black">
-                        <div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
-                            <div class="labelTopDx px-2 w-100">
+                        <div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start">
+                            <div class="labelTop px-2 w-100">
                                 <div class="text-center fs-2 fw-bold">
                                     @RecMSE.Nome
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <div class="card-body p-1">
-                        <div class="@RecMSE.Semaforo borderStd p-1">
+                    <div class="card-body p-0 bg-dark">
+                        <div class="@RecMSE.Semaforo p-0">
                             <div class="d-flex justify-content-center fs-5">
                                 <span><b>@RecMSE.DescrizioneStato</b>: &nbsp; @(FormatDurata(RecMSE.Durata))</span>
                             </div>
@@ -72,29 +72,84 @@ else
                             <div class="col-4">
                                 <EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz rich" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
                             </div>
-                            <div class="col-8" style="line-height: 1.6rem;">
-
+                            <div class="col-8 py-1" style="line-height: 1.6rem;">
                                 <div class="text-center text-light d-flex justify-content-between">
-                                    <div class="col-4"><span>ART:</span></div>
-                                    <div class="col-8">@($"{RecMSE.CodArticolo}")</div>
+                                    <div class="px-1"><span>ART:</span></div>
+                                    <div class="px-1">@($"{RecMSE.CodArticolo}")</div>
                                 </div>
                                 <div class="text-center text-light d-flex justify-content-between small lh-sm">
-                                    <div class="col-4">ODL:</div>
-                                    <div class="col-8">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
+                                    <div class="px-1">ODL:</div>
+                                    <div class="px-1">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
                                 </div>
                                 <div class="text-center text-light d-flex justify-content-between small lh-sm">
-                                    <div class="col-4">PODL:</div>
-                                    <div class="col-8">@($"PODL{RecMSE.IdxPOdl:00000000}")</div>
+                                    <div class="px-1">PODL:</div>
+                                    <div class="px-1">@($"PODL{RecMSE.IdxPOdl:00000000}")</div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-
             }
             else
             {
-                <div class="cardObj shadow" @onclick="ShowDetail">
+                <div class="card shadow rounded rounded-4 border-secondary" @onclick="ShowDetail">
+                    <img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
+                    <div class="bg-black">
+                        <div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start">
+                            <div class="labelTop px-2 py-0 w-100">
+                                <div class="text-center fs-2 fw-bold">
+                                    @RecMSE.Nome
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body p-0 bg-dark">
+                        <div class="@RecMSE.Semaforo py-0 px-1">
+                            <div class="d-flex justify-content-center fs-5">
+                                <span><b>@RecMSE.DescrizioneStato</b>: &nbsp; @(FormatDurata(RecMSE.Durata))</span>
+                            </div>
+                        </div>
+                        <div class="d-flex justify-content-around">
+                            <div class="text-center text-success d-flex justify-content-between">
+                                <div>
+                                    <i class="fa-regular fa-circle-check"></i>&nbsp; @($" {RecMSE.PezziConf}") &nbsp;
+                                </div>
+                                <div class="text-danger">
+                                    @if (datiProdAct != null && datiProdAct.PzConfScarto > 0)
+                                    {
+                                        @($"(- {datiProdAct.PzConfScarto})")
+                                    }
+                                </div>
+                            </div>
+                            <div class="text-center text-warning ">
+                                <div>
+                                    <i class="fa-solid fa-layer-group"></i>&nbsp; @($" {RecMSE.PezziProd}")
+                                </div>
+                            </div>
+                        </div>
+                        <div class="d-flex justify-content-between">
+                            <div class="col-5">
+                                <EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz rich" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
+                            </div>
+                            <div class="col-7 small py-2" style="line-height: 1.6rem; font-size:0.9rem;">
+
+                                <div class="text-center text-light d-flex justify-content-between">
+                                    <div class="px-1"><span>ART:</span></div>
+                                    <div class="px-1">@($"{RecMSE.CodArticolo}")</div>
+                                </div>
+                                <div class="text-center text-light d-flex justify-content-between small lh-sm">
+                                    <div class="px-1">ODL:</div>
+                                    <div class="px-1">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
+                                </div>
+                                <div class="text-center text-light d-flex justify-content-between small lh-sm">
+                                    <div class="px-1">PODL:</div>
+                                    <div class="px-1">@($"PODL{RecMSE.IdxPOdl:00000000}")</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                @* <div class="cardObj shadow" @onclick="ShowDetail">
                     <div class="card-body p-0">
                         <div class="@RecMSE.Semaforo borderStd p-1 text-center">
                             <div class="fs-5" style="line-height: 1.8rem;">
@@ -144,7 +199,7 @@ else
                             </div>
                         }
                     </div>
-                </div>
+                </div> *@
             }
         }
         else
@@ -249,15 +304,6 @@ else
 
 @if (showDraw && RecMSE != null)
 {
-    <PdfDisplay Width="100%" PdfUrl="@($"disegni/{RecMSE.CodArticolo}.pdf")" HeightList="@heightList"></PdfDisplay>
-    @*   if (isMobile)
-    {
-        <h3>Mobile</h3>
-        <iframe src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="50%" />
-    }
-    else
-    {
-        <h3>Desktop</h3>
-        <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" />
-    } *@
+    string docUrl = string.IsNullOrEmpty(RecMSE.Disegno) ? $"disegni/{RecMSE.CodArticolo}.pdf" : $"disegni/{RecMSE.Disegno}.pdf";
+    <PdfDisplay Width="100%" PdfUrl="@docUrl" HeightList="@heightList"></PdfDisplay>
 }
\ No newline at end of file
diff --git a/MP-TAB3/Components/MachineBlock.razor.css b/MP-TAB3/Components/MachineBlock.razor.css
index 4b76a4f8..c63d6b7a 100644
--- a/MP-TAB3/Components/MachineBlock.razor.css
+++ b/MP-TAB3/Components/MachineBlock.razor.css
@@ -16,8 +16,8 @@
   background-image: linear-gradient(#111, #000);
   min-width: 8em;
 }
-.labelTopDx {
-  padding: 0.1em 0.4em;
+.labelTop {
+  padding: 0.1em;
   width: auto;
   min-height: 0;
   top: 0;
@@ -25,16 +25,8 @@
   bottom: auto;
   color: #FFFFFF;
   background: #2200DE;
-  background: rgba(33, 36, 39, 0.7);
+  background: rgba(33, 36, 39, 0.75);
   border-radius: 15px 15px 0 0;
-  /*-webkit-border-top-right-radius: inherit;
-    border-top-right-radius: inherit;
-    -webkit-border-top-left-radius: inherit;
-    border-top-left-radius: inherit;
-    -webkit-border-bottom-left-radius: inherit;
-    border-bottom-left-radius: inherit;
-    -webkit-border-bottom-right-radius: 0;
-    border-bottom-right-radius: 0;*/
 }
 /* area semafori*/
 .sVe {
@@ -81,14 +73,13 @@
   border-radius: 0 0 15px 15px;
 }
 .imgFitToSize {
-    height: 9.5rem;
-    object-fit: contain;
-    border-radius: 15px 15px 0 0;
-    background-color: #383b3f;
+  height: 11rem;
+  object-fit: cover;
+  border-radius: 15px 15px 0 0;
 }
 @media (max-width: 640.98px) {
   .imgFitToSize {
-    height: 5rem;
+    height: 8rem;
   }
   .card-body {
     background-color: transparent;
diff --git a/MP-TAB3/Components/MachineBlock.razor.less b/MP-TAB3/Components/MachineBlock.razor.less
index 90376d2e..64f1bb69 100644
--- a/MP-TAB3/Components/MachineBlock.razor.less
+++ b/MP-TAB3/Components/MachineBlock.razor.less
@@ -18,8 +18,8 @@
     min-width: 8em;
 }
 
-.labelTopDx {
-    padding: 0.1em 0.4em;
+.labelTop {
+    padding: 0.1em;
     width: auto;
     min-height: 0;
     top: 0;
@@ -27,16 +27,8 @@
     bottom: auto;
     color: #FFFFFF;
     background: #2200DE;
-    background: rgba(33,36,39,.7);
+    background: rgba(33,36,39,.75);
     border-radius: 15px 15px 0 0;
-    /*-webkit-border-top-right-radius: inherit;
-    border-top-right-radius: inherit;
-    -webkit-border-top-left-radius: inherit;
-    border-top-left-radius: inherit;
-    -webkit-border-bottom-left-radius: inherit;
-    border-bottom-left-radius: inherit;
-    -webkit-border-bottom-right-radius: 0;
-    border-bottom-right-radius: 0;*/
 }
 
 /* area semafori*/
@@ -89,14 +81,14 @@
 }
 
 .imgFitToSize {
-    height: 7.5rem;
+    height: 11rem;
     object-fit: cover;
     border-radius: 15px 15px 0 0;
 }
 
 @media (max-width: 640.98px){
     .imgFitToSize{
-        height: 5rem;
+        height: 8rem;
     }
     .card-body{
         background-color: transparent;
diff --git a/MP-TAB3/Components/MachineBlock.razor.min.css b/MP-TAB3/Components/MachineBlock.razor.min.css
index ba42cf66..d7b3e5b2 100644
--- a/MP-TAB3/Components/MachineBlock.razor.min.css
+++ b/MP-TAB3/Components/MachineBlock.razor.min.css
@@ -1 +1 @@
-.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.7);border-radius:15px 15px 0 0;}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);border-radius:0 0 15px 15px;}.imgFitToSize{height:7.5rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:5rem;}.card-body{background-color:transparent;}}.statusCard{border-radius:.5rem;}
\ No newline at end of file
+.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTop{padding:.1em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.75);border-radius:15px 15px 0 0;}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);border-radius:0 0 15px 15px;}.imgFitToSize{height:11rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:8rem;}.card-body{background-color:transparent;}}.statusCard{border-radius:.5rem;}
\ No newline at end of file
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 95e35242..cc2ea681 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.2402.2312</Version>
+      <Version>6.16.2402.2412</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Program.cs b/MP-TAB3/Program.cs
index 318e051f..cfe31508 100644
--- a/MP-TAB3/Program.cs
+++ b/MP-TAB3/Program.cs
@@ -61,12 +61,15 @@ app.UseStaticFiles();
 
 // gestione static files: https://learn.microsoft.com/en-us/aspnet/core/fundamentals/static-files?view=aspnetcore-8.0
 string BasePathDisegni = configuration.GetValue<string>("OptConf:BasePathDisegni");
-// gestione cartella x PDF
-app.UseStaticFiles(new StaticFileOptions
+if (!string.IsNullOrEmpty(BasePathDisegni))
 {
-    FileProvider = new PhysicalFileProvider(BasePathDisegni),
-    RequestPath = "/disegni",
-});
+    // gestione cartella x PDF
+    app.UseStaticFiles(new StaticFileOptions
+    {
+        FileProvider = new PhysicalFileProvider(BasePathDisegni),
+        RequestPath = "/disegni",
+    });
+}
 
 app.UseRouting();
 
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 3ed29d2e..84c7f083 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.2402.2312</h4>
+    <h4>Versione: 6.16.2402.2412</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 3d88ebaa..47bbd192 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.2312
+6.16.2402.2412
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index c167789d..3fec1f64 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.2402.2312</version>
+  <version>6.16.2402.2412</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>