From 9d7502d1a40543df22b801b735f823f4f2bf78ee Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 21 Sep 2022 09:13:39 +0200
Subject: [PATCH] modifiche grafiche e round orario datetime

---
 MP.SPEC/Components/ListDossiers.razor    | 11 +++++++----
 MP.SPEC/Components/ListDossiers.razor.cs | 10 ++++++++--
 MP.SPEC/Data/SelectDossierParams.cs      | 21 ++++++++++++++++++---
 MP.SPEC/MP.SPEC.csproj                   |  2 +-
 MP.SPEC/Resources/ChangeLog.html         |  2 +-
 MP.SPEC/Resources/VersNum.txt            |  2 +-
 MP.SPEC/Resources/manifest.xml           |  2 +-
 7 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor
index 0001cc13..6c04d24c 100644
--- a/MP.SPEC/Components/ListDossiers.razor
+++ b/MP.SPEC/Components/ListDossiers.razor
@@ -58,14 +58,14 @@ else
                 }
                 else
                 {
-                    <table class="table table-sm table-striped small">
+                    <table class="table table-sm table-striped small" style="border: 1px solid;">
                         <thead>
                             <tr>
                                 <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
                                 <th><i class="fa-regular fa-calendar-days"></i> Data</th>
                                 <th><i class="fa-solid fa-sliders"></i> ODL</th>
-                                <th><i class="fa-solid fa-sliders"></i> DATA TYPE</th>
-                                <th></th>
+                                <th><i class="fa-solid fa-sliders"></i> Valore</th>
+                                <th class="d-flex justify-content-end"><button class="btn btn-primary btn-sm py-0 " @onclick="() => unToggleTableFlux()"><i class="fa-solid fa-xmark"></i></button></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -81,8 +81,11 @@ else
                                     <td>
                                         @record.CodFlux
                                     </td>
+                                    <td style="text-align: right;">
+                                        <b>@record.Valore</b>
+                                    </td>
                                     <td>
-                                        @record.Valore
+                                        
                                     </td>
                                 </tr>
                             }
diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs
index 0f64796e..6ef78953 100644
--- a/MP.SPEC/Components/ListDossiers.razor.cs
+++ b/MP.SPEC/Components/ListDossiers.razor.cs
@@ -244,8 +244,14 @@ namespace MP.SPEC.Components
 
         private async Task toggleTableFlux()
         {
-            
-            visualizzaFlux = !visualizzaFlux;
+
+            visualizzaFlux = false;
+            await Task.Delay(1);
+        }
+        private async Task unToggleTableFlux()
+        {
+
+            visualizzaFlux = true;
             await Task.Delay(1);
         }
 
diff --git a/MP.SPEC/Data/SelectDossierParams.cs b/MP.SPEC/Data/SelectDossierParams.cs
index 9c83245a..09a3630f 100644
--- a/MP.SPEC/Data/SelectDossierParams.cs
+++ b/MP.SPEC/Data/SelectDossierParams.cs
@@ -10,10 +10,25 @@
         #endregion Public Constructors
 
         #region Public Properties
+
+        /// <summary>
+        /// Inizializzazione con periodo e arrotondamento
+        /// </summary>
+        /// <param name="minRound"></param>
+        /// <param name="numDayPrev"></param>
+        /// <returns></returns>
+        public static DateTime Init(int minRound, int numDayPrev)
+        {
+            TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today);
+            int minDay = (int)(DayElapsed.TotalMinutes / minRound) * minRound;
+            DateTime endRounded = DateTime.Today.AddMinutes(minDay);
+            return endRounded;
+        }
+
         public string IdxMacchina { get; set; } = "*";
 
         public int MaxRecord { get; set; } = 100;
-        public DateTime DtRef { get; set; } = DateTime.Now;
+        public DateTime DtRef { get; set; } = Init(5, 1);
         public int CurrPage { get; set; } = 1;
 
         #endregion Public Properties
@@ -28,8 +43,8 @@
             if (IdxMacchina != item.IdxMacchina)
                 return false;
 
-            ////if (MaxRecord != item.MaxRecord)
-            ////    return false;
+            if (MaxRecord != item.MaxRecord)
+                return false;
 
             if (DtRef != item.DtRef)
                 return false;
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 33a0391f..3ab99e74 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.15.2209.2017</Version>
+    <Version>6.15.2209.2108</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 2a289b2f..a3441d96 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.15.2209.2017</h4>
+    <h4>Versione: 6.15.2209.2108</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index dd429b18..39734096 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.15.2209.2017
+6.15.2209.2108
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 0f75efa3..8d602ec9 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2209.2017</version>
+  <version>6.15.2209.2108</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>