From adf48ce6fe3f6e41ff2e22715d43ee3a9240a7aa Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 19 Oct 2023 16:00:31 +0200
Subject: [PATCH] fix grafici machine block

---
 MP-TAB-SERV/Components/MachineBlock.razor         | 6 +++---
 MP-TAB-SERV/Components/MachineBlock.razor.cs      | 4 ++--
 MP-TAB-SERV/Components/MachineBlock.razor.css     | 3 +--
 MP-TAB-SERV/Components/MachineBlock.razor.less    | 3 +--
 MP-TAB-SERV/Components/MachineBlock.razor.min.css | 2 +-
 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 +-
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor
index 7a76a500..697db176 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor
+++ b/MP-TAB-SERV/Components/MachineBlock.razor
@@ -106,7 +106,7 @@ else
             </div>*@
             if (Width > 640)
             {
-                <div class="card shadow" @onclick="ShowDetail" style="border-radius: 15px">
+                <div class="card shadow" @onclick="ShowDetail" style="border-radius: 15px; border: 0 solid transparent;">
                     @*<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">*@
                     <img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
                     <div class="bg-black">
@@ -118,8 +118,8 @@ else
                             </div>
                         </div>
                     </div>
-                    <div class="card-body p-1" style="background-color: #212427; border-radius: 0 0 15px 15px">
-                        <div class="@RecMSE.Semaforo p-1" style="border-radius: 15px">
+                    <div class="card-body p-1" style="background-color: currentColor; background-image: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); border-radius: 0 0 15px 15px">
+                        <div class="@RecMSE.Semaforo p-1" style="border-radius: .375rem">
                             <div class="d-flex justify-content-center fs-5">
                                 <span><b>@RecMSE.DescrizioneStato</b>: &nbsp; @(formatDurata(RecMSE.Durata))</span>
                             </div>
diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.cs b/MP-TAB-SERV/Components/MachineBlock.razor.cs
index 8506709b..1ca77a1a 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.cs
+++ b/MP-TAB-SERV/Components/MachineBlock.razor.cs
@@ -60,11 +60,11 @@ namespace MP_TAB_SERV.Components
                 innerCircleVals.Clear();
                 outerCircleVals.Clear();
                 currMaxVal = int.Parse(RecMSE.NumPezzi.ToString()!);
-                innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#DCFD15", Value = RecMSE.PezziProd });
+                innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#FFC107", Value = RecMSE.PezziProd });
 
                 if (RecMSE.PezziConf > 0)
                 {
-                    innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#13FD67", Value = RecMSE.PezziConf });
+                    innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#198754", Value = RecMSE.PezziConf });
                 }
 
                 if (RecMSE.extraVal > 0)
diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.css b/MP-TAB-SERV/Components/MachineBlock.razor.css
index b19ec40a..63ec5c8b 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.css
+++ b/MP-TAB-SERV/Components/MachineBlock.razor.css
@@ -39,7 +39,6 @@
 /* area semafori*/
 .sVe {
   text-align: left;
-  background: #009036;
   background: #198754;
   /*background: rgba(0,255,80,.6);*/
   /*padding: 0px 4px 0px 4px;*/
@@ -48,7 +47,7 @@
 }
 .sGi {
   text-align: left;
-  background: #ffec00;
+  background: #ffc107;
   background: rgba(255, 220, 0, 0.6);
   color: #fff;
   /*padding: 0px 4px 0px 4px;*/
diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.less b/MP-TAB-SERV/Components/MachineBlock.razor.less
index f79ce3ec..fd29b6ab 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.less
+++ b/MP-TAB-SERV/Components/MachineBlock.razor.less
@@ -42,7 +42,6 @@
 /* area semafori*/
 .sVe {
     text-align: left;
-    background: #009036;
     background: #198754;
     /*background: rgba(0,255,80,.6);*/
     /*padding: 0px 4px 0px 4px;*/
@@ -52,7 +51,7 @@
 
 .sGi {
     text-align: left;
-    background: #ffec00;
+    background: #ffc107;
     background: rgba(255,220,0,.6);
     color: #fff;
     /*padding: 0px 4px 0px 4px;*/
diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.min.css b/MP-TAB-SERV/Components/MachineBlock.razor.min.css
index 7492cf8d..448d6dea 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.min.css
+++ b/MP-TAB-SERV/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:#009036;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffec00;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;}.imgFitToSize{height:7.5rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height: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;}.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;}.imgFitToSize{height:7.5rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:5rem;}}
\ No newline at end of file
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 591dfdee..3c34cd23 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.1619</Version>
+      <Version>6.16.2310.1915</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 26516930..8e5a4d07 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.1619</h4>
+    <h4>Versione: 6.16.2310.1915</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index fc590c92..173ba33e 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2310.1619
+6.16.2310.1915
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 838932b5..3553fc34 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.1619</version>
+  <version>6.16.2310.1915</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>