From 16c7b0bc6b2d142a341540e5b08c1e53e816dea2 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 21 Sep 2022 14:21:22 +0200
Subject: [PATCH] modifiche grafiche + fix paginazione

---
 MP.SPEC/Components/DossiersFilter.razor | 51 +------------------------
 MP.SPEC/Components/ListDossiers.razor   |  7 +---
 MP.SPEC/MP.SPEC.csproj                  |  2 +-
 MP.SPEC/Pages/DOSS.razor                |  2 +-
 MP.SPEC/Pages/DOSS.razor.cs             |  6 ++-
 MP.SPEC/Resources/ChangeLog.html        |  2 +-
 MP.SPEC/Resources/VersNum.txt           |  2 +-
 MP.SPEC/Resources/manifest.xml          |  2 +-
 8 files changed, 14 insertions(+), 60 deletions(-)

diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor
index 5aae30d9..906f5c56 100644
--- a/MP.SPEC/Components/DossiersFilter.razor
+++ b/MP.SPEC/Components/DossiersFilter.razor
@@ -5,53 +5,6 @@
 
     <div class="px-0 col-6">
         <div class="">
-            @*@if (showEditPar)
-            {
-                <div class="px-0 input-group py-1" id="basic-addon1">
-                        <button class="btn btn-primary" @onclick="() => toggleParams()"> <i class="fa-solid fa-arrow-right"></i></button>
-                    <label class="input-group-text" for="tempoAgg" title="Selezionare il tempo di aggiornamento dei dati"><i class="fa-solid fa-clock"></i></label>
-                    <select @bind="@selTempoAgg" class="form-select" id="tempoAgg" title="Selezionare il tempo di aggiornamento dei dati">
-                        <option value="2">2</option>
-                        <option value="3">3</option>
-                        <option value="4">4</option>
-                        <option value="5">5</option>
-                        <option value="6">6</option>
-                        <option value="7">7</option>
-                        <option value="8">8</option>
-                        <option value="9">9</option>
-                        <option value="10">10</option>
-                        <option value="11">11</option>
-                        <option value="12">12</option>
-                        <option value="13">13</option>
-                        <option value="14">14</option>
-                        <option value="15">15</option>
-                        <option value="16">16</option>
-                        <option value="17">17</option>
-                        <option value="18">18</option>
-                        <option value="19">19</option>
-                        <option value="20">20</option>
-                    </select>
-                    <label class="input-group-text" for="maxRecord" title="Selezionare il numero massimo di record da visualizzare"><i class="fa-solid fa-list-ol"></i></label>
-                    <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Selezionare il numero massimo di record da visualizzare">
-                        <option value="50">50</option>
-                        <option value="100">100</option>
-                        <option value="150">150</option>
-                        <option value="200">200</option>
-                        <option value="250">250</option>
-                        <option value="300">300</option>
-                        <option value="350">350</option>
-                        <option value="400">400</option>
-                        <option value="450">450</option>
-                        <option value="500">500</option>
-                    </select>
-                </div>
-            }
-            else
-            {
-                <div class="px-2 py-1">
-                    <button class="btn btn-primary" @onclick="() => toggleParams()"><i class="fa-solid fa-arrow-left"></i></button>
-                </div>
-            }*@
             <div class="px-0 py-1">
                 <div class="px-2 input-group" id="basic-addon1">
                     <label class="input-group-text" for="macchina" title="Selezionare la macchina"><i class="fa-solid fa-hard-drive"></i></label>
@@ -65,8 +18,8 @@
                             }
                         }
                     </select>
-                    <label class="input-group-text" for="DtRef" title="Selezionare il tipo di flusso"><i class="fa-solid fa-calendar-check"></i></label>
-                    <input @bind="@selDtRef" id="DtRef" class="form-control" type="datetime-local" />
+                    <label class="input-group-text" for="DtRef" title="Selezionare la data da visualizzare"><i class="fa-solid fa-calendar-check"></i></label>
+                    <input @bind="@selDtRef" id="DtRef" class="form-control" type="datetime-local" title="Selezionare la data da visualizzare" />
                 </div>
             </div>
         </div>
diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor
index 03ffa350..16e5bcf8 100644
--- a/MP.SPEC/Components/ListDossiers.razor
+++ b/MP.SPEC/Components/ListDossiers.razor
@@ -22,7 +22,7 @@ else
                         <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><i class="fa-solid fa-circle-info"></i> DATA TYPE</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -64,8 +64,7 @@ else
                                     <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 class="d-flex justify-content-between"><i class="fa-solid fa-sliders"></i> Valore <button class="btn btn-primary btn-sm py-0" @onclick="() => unToggleTableFlux()"><i class="fa-solid fa-xmark"></i></button></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>*@
+                                    <th class="d-flex justify-content-between"> Valore <button class="btn btn-primary btn-sm py-0" @onclick="() => unToggleTableFlux()"><i class="fa-solid fa-xmark"></i></button></th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -84,8 +83,6 @@ else
                                         <td style="text-align: right;">
                                             <b>@record.Valore</b>
                                         </td>
-                                       @* <td>
-                                        </td>*@
                                     </tr>
                                 }
                             </tbody>
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 55d5b54d..151ff646 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.16.2209.2110</Version>
+    <Version>6.16.2209.2114</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/DOSS.razor b/MP.SPEC/Pages/DOSS.razor
index 0b62dd06..ff778773 100644
--- a/MP.SPEC/Pages/DOSS.razor
+++ b/MP.SPEC/Pages/DOSS.razor
@@ -30,7 +30,7 @@
         }
     </div>
     <div class="card-footer py-1">
-        <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" totalCount="totalCount" showLoading="isLoading" />
+        <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
     </div>
 </div>
 
diff --git a/MP.SPEC/Pages/DOSS.razor.cs b/MP.SPEC/Pages/DOSS.razor.cs
index 2038917f..430be307 100644
--- a/MP.SPEC/Pages/DOSS.razor.cs
+++ b/MP.SPEC/Pages/DOSS.razor.cs
@@ -20,7 +20,11 @@ namespace MP.SPEC.Pages
         #endregion Protected Properties
 
         #region Protected Methods
-
+        protected void ForceReloadPage(int newNum)
+        {
+            currPage = newNum;
+            StateHasChanged();
+        }
         protected void ForceReload(int newNum)
         {
             numRecord = newNum;
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 59ec5ae7..0c240837 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.16.2209.2110</h4>
+    <h4>Versione: 6.16.2209.2114</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 86a8516f..cdb59656 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2209.2110
+6.16.2209.2114
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 0cdb93c2..1d850cf1 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.16.2209.2110</version>
+  <version>6.16.2209.2114</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>