From ec0fc6c69748a7c0aeca1875d375ad525efacd96 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 12 Dec 2022 18:11:44 +0100
Subject: [PATCH] Riorganizzazione scheda plant x 6 impianti

---
 GWMS.UI/Components/PlantOverview.razor | 30 +++++++++++++++-----------
 GWMS.UI/GWMS.UI.csproj                 |  2 +-
 GWMS.UI/Pages/PlantStatus.razor        |  2 +-
 GWMS.UI/Shared/MainLayout.razor.css    |  2 +-
 GWMS.UI/Shared/NavMenu.razor           | 28 ++++++++++++------------
 Resources/ChangeLog.html               |  2 +-
 Resources/VersNum.txt                  |  2 +-
 Resources/manifest.xml                 |  2 +-
 8 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/GWMS.UI/Components/PlantOverview.razor b/GWMS.UI/Components/PlantOverview.razor
index 3c875ef..9ae0a86 100644
--- a/GWMS.UI/Components/PlantOverview.razor
+++ b/GWMS.UI/Components/PlantOverview.razor
@@ -29,10 +29,10 @@
                             <li class="list-group-item d-flex justify-content-between align-items-center p-1 p-md-2">
                                 <span><i class="fas fa-gas-pump"></i> Pressione:</span> <span style="font-size:1.2em;"><b>@currItem.PressAct["Main"].ToString("N1")</b> <span class="small"> <sub>bar</sub></span></span>
                             </li>
-                            <li class="list-group-item-primary d-flex justify-content-between align-items-center p-2">
+                            <li class="list-group-item-primary d-flex justify-content-between align-items-center py-1 px-2">
                                 <span><i class="fas fa-compress-arrows-alt"></i> PB Alta</span>
                             </li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 p-md-2">
+                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 px-md-2">
                                 @if (getPressData("BH", "N1") != "")
                                 {
                                     <span> Stoccaggio:</span> <span><b>@getPressData("BH", "N1")</b> <sub>bar</sub></span>
@@ -42,7 +42,7 @@
                                     <span> Stoccaggio:</span> <span><b>ND</b> <sub>bar</sub></span>
                                 }
                             </li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 p-md-2">
+                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 px-md-2">
                                 @if (getPressData("BHA", "N1") != "")
                                 {
                                     <span> Alimentazione:</span> <span><b>@getPressData("BHA", "N1")</b> <sub>bar</sub></span>
@@ -52,10 +52,10 @@
                                     <span> Alimentazione:</span> <span><b>ND</b> <sub>bar</sub></span>
                                 }
                             </li>
-                            <li class="list-group-item-primary d-flex justify-content-between align-items-center p-2">
+                            <li class="list-group-item-primary d-flex justify-content-between align-items-center py-1 px-2">
                                 <span><i class="fas fa-compress-arrows-alt"></i> PB Media</span>
                             </li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 p-md-2">
+                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 px-md-2">
                                 @if (getPressData("BL", "N1") != "")
                                 {
                                     <span> Stoccaggio:</span> <span><b>@getPressData("BL", "N1")</b> <sub>bar</sub></span>
@@ -65,7 +65,7 @@
                                     <span> Stoccaggio:</span> <span><b>ND</b> <sub>bar</sub></span>
                                 }
                             </li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 p-md-2">
+                            <li class="list-group-item d-flex justify-content-between align-items-center small p-1 px-md-2">
                                 @if (getPressData("BLA", "N1") != "")
                                 {
                                     <span> Alimentazione:</span> <span><b>@getPressData("BLA", "N1")</b> <sub>bar</sub></span>
@@ -93,10 +93,10 @@
                             </li>
                             <li class="list-group-item align-items-center px-1 py-2">
                                 <div class="d-flex flex-column">
-                                    <div class="p-1 flex-grow-1">
+                                    <div class="px-1 py-0 flex-grow-1">
                                         <ProgressBar Value="@currItem.LevelRatio" Striped="false" Animated="false" />
                                     </div>
-                                    <div class="p-1 py-md-2">
+                                    <div class="py-0 px-1">
                                         @if (LevelVal == null || LevelVal.Count == 0)
                                         {
                                             <LoadingDataSmall></LoadingDataSmall>
@@ -112,21 +112,25 @@
                                 <div class="col-6">
                                     @if (currItem.SoldTS != null && currItem.SoldTS.Count > 0 && currItem.SoldTS[0].ValDouble > 0)
                                     {
-                                        <span><i class="fas fa-file-invoice-dollar"></i> Venduto Ieri: </span> <span style="font-size:1em;"><b>@currItem.SoldTS[0].ValDouble.ToString("N1")</b> <span class="small"> <sub>kg</sub></span></span>
+                                        <div><i class="fas fa-file-invoice-dollar"></i> Venduto Ieri: </div>
+                                        <div style="font-size:1.2em;"><b>@currItem.SoldTS[0].ValDouble.ToString("N1")</b> <span class="small"> <sub>kg</sub></span></div>
                                     }
                                     else
                                     {
-                                        <span><i class="fas fa-file-invoice-dollar"></i> Venduto Ieri: </span> <span style="font-size:1em;"><b>ND</b> <span class="small"> <sub>kg</sub></span></span>
+                                        <div><i class="fas fa-file-invoice-dollar"></i> Venduto Ieri: </div>
+                                        <div style="font-size:1.2em;"><b>ND</b> <span class="small"> <sub>kg</sub></span></div>
                                     }
                                 </div>
-                                <div class="col-6">
+                                <div class="col-6 text-right">
                                     @if (currItem.SoldTS != null && currItem.SoldTS.Count > 1 && currItem.SoldTS[1].ValDouble > 0)
                                     {
-                                        <span><i class="fas fa-file-invoice-dollar"></i> Venduto Oggi: </span> <span style="font-size:1em;"><b>@currItem.SoldTS[1].ValDouble.ToString("N1")</b> <span class="small"> <sub>kg</sub></span></span>
+                                        <div><i class="fas fa-file-invoice-dollar"></i> Venduto Oggi: </div>
+                                        <div style="font-size:1.2em;"><b>@currItem.SoldTS[1].ValDouble.ToString("N1")</b> <span class="small"> <sub>kg</sub></span></div>
                                     }
                                     else
                                     {
-                                        <span><i class="fas fa-file-invoice-dollar"></i> Venduto Oggi: </span> <span style="font-size:1em;"><b>ND</b> <span class="small"> <sub>kg</sub></span></span>
+                                        <div><i class="fas fa-file-invoice-dollar"></i> Venduto Oggi: </div>
+                                        <div style="font-size:1.2em;"><b>ND</b> <span class="small"> <sub>kg</sub></span></div>
                                     }
                                 </div>
                             </li>
diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj
index 20a7aa3..725fea9 100644
--- a/GWMS.UI/GWMS.UI.csproj
+++ b/GWMS.UI/GWMS.UI.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>1.0.2203.0818</Version>
+		<Version>1.0.2212.1217</Version>
 		<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
diff --git a/GWMS.UI/Pages/PlantStatus.razor b/GWMS.UI/Pages/PlantStatus.razor
index 8a7441d..5198317 100644
--- a/GWMS.UI/Pages/PlantStatus.razor
+++ b/GWMS.UI/Pages/PlantStatus.razor
@@ -21,7 +21,7 @@
             <div class="row">
                 @foreach (var record in ListRecords)
                 {
-                    <div class="col-12 col-xl-6 py-2">
+                    <div class="col-12 col-md-6 col-lg-4 py-2 px-1">
                         <PlantOverview currItem="@record"></PlantOverview>
                     </div>
                 }
diff --git a/GWMS.UI/Shared/MainLayout.razor.css b/GWMS.UI/Shared/MainLayout.razor.css
index 333ac90..fb08f62 100644
--- a/GWMS.UI/Shared/MainLayout.razor.css
+++ b/GWMS.UI/Shared/MainLayout.razor.css
@@ -44,7 +44,7 @@
     }
 
     .sidebar {
-        width: 250px;
+        width: 230px;
         height: 100vh;
         position: sticky;
         top: 0;
diff --git a/GWMS.UI/Shared/NavMenu.razor b/GWMS.UI/Shared/NavMenu.razor
index 830c173..90767ac 100644
--- a/GWMS.UI/Shared/NavMenu.razor
+++ b/GWMS.UI/Shared/NavMenu.razor
@@ -9,6 +9,9 @@
             <a class="navbar-brand" @onclick="() => ToggleCompress()" title="Comprimi">
                 <img src="./img/EgalwareLogo.svg" class="img-fluid" width="32" />
                 @*<i class="fas fa-2x fa-chevron-left"></i>*@
+                <span class="text-light">
+                    MAPO.GWMS <i class="fas fa-caret-square-left"></i>
+                </span>
             </a>
         }
         else
@@ -16,17 +19,14 @@
             <a class="navbar-brand" @onclick="() => ToggleCompress()" title="Comprimi">
                 <img src="./img/EgalwareLogo.svg" class="img-fluid" width="32" />
                 @*<i class="fas fa-2x fa-chevron-right"></i>*@
+                <i class="fas fa-caret-square-right"></i>
             </a>
         }
-        <a class="navbar-brand" href="">
-            <span class="@hideText">MAPO.GWMS</span>
-        </a>
     </div>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>
 </div>
-
 <div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
     <ul class="nav flex-column">
         <li class="nav-item px-3" title="Home">
@@ -134,17 +134,17 @@
         </AuthorizeView>
 
         @*<li class="nav-item px-3" title="Utenti">
-                <NavLink class="nav-link" href="UserManager">
-                    <i class="fas fa-2x fa-users pr-2" aria-hidden="true"></i>
-                    <span class="@hideText">Utenti</span>
-                </NavLink>
-            </li>*@
+        <NavLink class="nav-link" href="UserManager">
+        <i class="fas fa-2x fa-users pr-2" aria-hidden="true"></i>
+        <span class="@hideText">Utenti</span>
+        </NavLink>
+        </li>*@
         @*<li class="nav-item px-3" title="Job Scheduler">
-                <NavLink class="nav-link" href="Scheduler">
-                    <i class="fas fa-2x fa-calendar-alt pr-2" aria-hidden="true"></i>
-                    <span class="@hideText">Job Scheduler</span>
-                </NavLink>
-            </li>*@
+        <NavLink class="nav-link" href="Scheduler">
+        <i class="fas fa-2x fa-calendar-alt pr-2" aria-hidden="true"></i>
+        <span class="@hideText">Job Scheduler</span>
+        </NavLink>
+        </li>*@
     </ul>
 </div>
 
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 7b21de6..6e4e16d 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2203.0818</h4>
+    <h4>Versione: 1.0.2212.1217</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index ab37a37..f04fb99 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2203.0818
+1.0.2212.1217
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 96bf645..04c6084 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2203.0818</version>
+  <version>1.0.2212.1217</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>