From 9f9f44f6044c44c824ce2470daaee85c5e2c8545 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 21 Oct 2022 10:20:08 +0200
Subject: [PATCH] Bozza display filtri attivi

---
 MP.SPEC/Components/DossiersFilter.razor  |  4 ++--
 MP.SPEC/Components/ListPARAMS.razor.cs   |  3 +++
 MP.SPEC/Components/ParamsFilter.razor    | 24 +++++++++++++++++++++---
 MP.SPEC/Components/ParamsFilter.razor.cs |  4 ++++
 MP.SPEC/MP.SPEC.csproj                   |  2 +-
 MP.SPEC/Resources/ChangeLog.html         |  2 +-
 MP.SPEC/Resources/VersNum.txt            |  2 +-
 MP.SPEC/Resources/manifest.xml           |  2 +-
 8 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor
index df7df4c3..145fc9dd 100644
--- a/MP.SPEC/Components/DossiersFilter.razor
+++ b/MP.SPEC/Components/DossiersFilter.razor
@@ -14,7 +14,7 @@
             <div class="small mt-2">
                 <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Articolo</label>
             </div>
-            <div class="input-group p-2">
+            <div class="input-group px-2">
                 <label class="input-group-text" for="macchina" title="Selezionare l'articolo"><i class="fa-solid fa-file"></i></label>
                 <select @bind="@selArticolo" class="form-select" id="macchina" title="Selezionare la macchina">
                     <option value="*">--- Tutti ---</option>
@@ -30,7 +30,7 @@
             <div class="small mt-2">
                 <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Macchina</label>
             </div>
-            <div class="input-group p-2">
+            <div class="input-group px-2">
                 <label class="input-group-text" for="macchina" title="Selezionare la macchina"><i class="fa-solid fa-hard-drive"></i></label>
                 <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare la macchina">
                     <option value="*">--- Tutti ---</option>
diff --git a/MP.SPEC/Components/ListPARAMS.razor.cs b/MP.SPEC/Components/ListPARAMS.razor.cs
index 31574c02..c1543575 100644
--- a/MP.SPEC/Components/ListPARAMS.razor.cs
+++ b/MP.SPEC/Components/ListPARAMS.razor.cs
@@ -166,9 +166,12 @@ namespace MP.SPEC.Components
             currRecord = selRec;
             SelFilter.IdxMacchina = selRec.IdxMacchina;
             SelDtMax = selRec.dtEvento;
+            // imposto pag 1 filtro
+            SelFilter.CurrPage = 1;
             //selDtMin = RoundDatetime(5).AddHours(-25);
             await reloadData(false);
             await RecordSel.InvokeAsync(selRec);
+            await PagerResetReq.InvokeAsync(true);
         }
 
         protected async Task UpdateData()
diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor
index ae01c039..279ae55d 100644
--- a/MP.SPEC/Components/ParamsFilter.razor
+++ b/MP.SPEC/Components/ParamsFilter.razor
@@ -38,9 +38,27 @@
         </div>
 
     </div>
-    <a class="pt-2" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample" >
-        <i class="fa-solid fa-bars text-dark"></i>
-    </a>
+    <div class="d-flex justify-content-between pt-2">
+        @if (filtActive)
+        {
+            <div class="px-2 border border-secondary rounded small" title="Filtri attivi">
+                @*<i class="fas fa-exclamation text-warning"></i>*@
+                @if (selMacchina != "*")
+                {
+                    <i class="fa-solid fa-hard-drive text-secondary" title="Filtro Impianto"></i>
+                }
+                @if (selFlux != "*")
+                {
+                    <i class="fa-solid fa-sliders" title="Filtro Parametro"></i>
+                }
+            </div>
+        }
+        <div class="px-2">
+            <a class="" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample">
+                <i class="fa-solid fa-bars text-dark"></i>
+            </a>
+        </div>
+    </div>
     <div class="offcanvas offcanvas-end" tabindex="-1" id="paramsFilterExample" aria-labelledby="paramsFilterExampleLabel">
         <div class="offcanvas-header">
             <h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTRI</b></h3>
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs
index 219b6633..0aed527a 100644
--- a/MP.SPEC/Components/ParamsFilter.razor.cs
+++ b/MP.SPEC/Components/ParamsFilter.razor.cs
@@ -165,6 +165,10 @@ namespace MP.SPEC.Components
             NavManager.NavigateTo("DOSS", true);
         }
 
+        private bool filtActive
+        {
+            get => selMacchina != "*" || selFlux != "*";
+        }
         protected override async Task OnInitializedAsync()
         {
             SelFilter = new SelectFluxParams();
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 27a3af44..b871039a 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.2210.2109</Version>
+    <Version>6.16.2210.2110</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 889923ac..84ccf39f 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.2210.2109</h4>
+    <h4>Versione: 6.16.2210.2110</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 51b08b69..148d3a17 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.2109
+6.16.2210.2110
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 81a51989..463051c6 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.2210.2109</version>
+  <version>6.16.2210.2110</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>