From eb115333382db6dbf94f1e651afeed209e081c05 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 21 Oct 2022 12:51:52 +0200
Subject: [PATCH] display filtri attivi fine

---
 MP.SPEC/Components/DossiersFilter.razor    | 24 +++++++++++++++++---
 MP.SPEC/Components/DossiersFilter.razor.cs | 13 ++++++++++-
 MP.SPEC/Components/ParamsFilter.razor      | 26 ++++++++++------------
 MP.SPEC/Components/ParamsFilter.razor.cs   | 21 ++++++++++++-----
 MP.SPEC/MP.SPEC.csproj                     |  2 +-
 MP.SPEC/Pages/ODL.razor                    | 24 +++++++++++++++++---
 MP.SPEC/Pages/ODL.razor.cs                 | 12 ++++++++++
 MP.SPEC/Resources/ChangeLog.html           |  2 +-
 MP.SPEC/Resources/VersNum.txt              |  2 +-
 MP.SPEC/Resources/manifest.xml             |  2 +-
 10 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor
index 145fc9dd..d8607670 100644
--- a/MP.SPEC/Components/DossiersFilter.razor
+++ b/MP.SPEC/Components/DossiersFilter.razor
@@ -1,7 +1,25 @@
 <div class="d-flex justify-content-end">
-    <a class="pt-2 text-dark" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample">
-        <i class="fa-solid fa-bars"></i>
-    </a>
+    <div class="d-flex justify-content-between pt-2">
+        @if (filtActive)
+        {
+            <div class=" rounded small d-flex justify-content-between" title="Filtri attivi">
+                @*<i class="fas fa-exclamation text-warning"></i>*@
+                @if (selMacchina != "*")
+            {
+                    <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetMacchina()" title="Rimuovi Filtro Impianto"><i class="fa-solid fa-hard-drive"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            @if (selArticolo != "*")
+            {
+                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetArticolo()" title="Rimuovi Filtro Articolo"><i class="fa-solid fa-sliders"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            </div>
+        }
+        <div class="p-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/DossiersFilter.razor.cs b/MP.SPEC/Components/DossiersFilter.razor.cs
index f5dd2bbe..98cdbe8f 100644
--- a/MP.SPEC/Components/DossiersFilter.razor.cs
+++ b/MP.SPEC/Components/DossiersFilter.razor.cs
@@ -38,7 +38,18 @@ namespace MP.SPEC.Components
                 }
             }
         }
-
+        private bool filtActive
+        {
+            get => selMacchina != "*" || selArticolo != "*";
+        }
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetArticolo()
+        {
+            selArticolo = "*";
+        }
         protected DateTime selDtMax
         {
             get
diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor
index 279ae55d..a6cfe239 100644
--- a/MP.SPEC/Components/ParamsFilter.razor
+++ b/MP.SPEC/Components/ParamsFilter.razor
@@ -3,13 +3,13 @@
         <div class="px-2">
             @if (!liveUpdate)
             {
-                <button class="btn btn-secondary" type="button" @onclick="() => toggleUpdate()" title="Click per tornare a Valori Live">
+                <button class="btn btn-secondary" type="button" @onclick="() => live()" title="Click per tornare a Valori Live">
                     <small>@lastUpdate</small>
                 </button>
             }
             else
             {
-                <button class="btn btn-primary" type="button" @onclick="() => toggleUpdate()">
+                <button class="btn btn-primary" type="button" @onclick="() => notLive()">
                     <span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
                     Valori live
                 </button>
@@ -41,19 +41,17 @@
     <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>
+            @*<i class="fas fa-exclamation text-warning"></i>*@
+            @if (selMacchina != "*")
+            {
+                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetMacchina()" title="Rimuovi Filtro Impianto"><i class="fa-solid fa-hard-drive"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            @if (selFlux != "*")
+            {
+                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetFase()" title="Rimuovi Filtro Parametro"><i class="fa-solid fa-sliders"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
         }
-        <div class="px-2">
+        <div class="p-2">
             <a class="" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample">
                 <i class="fa-solid fa-bars text-dark"></i>
             </a>
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs
index 0aed527a..c29423a6 100644
--- a/MP.SPEC/Components/ParamsFilter.razor.cs
+++ b/MP.SPEC/Components/ParamsFilter.razor.cs
@@ -211,6 +211,14 @@ namespace MP.SPEC.Components
             aTimer.Enabled = true;
             aTimer.Start();
         }
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetFase()
+        {
+            selFlux = "*";
+        }
 
         protected async Task takeSnapshot()
         {
@@ -234,18 +242,19 @@ namespace MP.SPEC.Components
             selDtMax = null;
         }
 
-        protected async Task toggleUpdate()
+        protected async Task notLive()
         {
-            liveUpdate = !liveUpdate;
+            liveUpdate = false;
             await Task.Delay(1);
             if (!liveUpdate)
             {
                 lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
             }
-            else
-            {
-                selDtMax = null;
-            }
+        }
+        protected async Task live()
+        {
+            liveUpdate = true;
+            await Task.Delay(1);
         }
 
         #endregion Protected Methods
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index b871039a..ae517e0b 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.2110</Version>
+    <Version>6.16.2210.2112</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor
index e1d49972..b31a35a4 100644
--- a/MP.SPEC/Pages/ODL.razor
+++ b/MP.SPEC/Pages/ODL.razor
@@ -20,9 +20,27 @@
                 </div>
             </div>
             <div class="d-flex justify-content-end">
-                <a class="pt-2 text-dark" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample" @onclick="setDtMax">
-                    <i class="fa-solid fa-bars"></i>
-                </a>
+                <div class="d-flex justify-content-between">
+                @if (filtActive)
+                {
+                    <div class=" rounded small d-flex justify-content-between" title="Filtri attivi">
+                        @*<i class="fas fa-exclamation text-warning"></i>*@
+                            @if (selMacchina != "*")
+            {
+                                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetMacchina()" title="Rimuovi Filtro Impianto"><i class="fa-solid fa-hard-drive"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            @if (selStato != "*")
+            {
+                                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetFase()" title="Rimuovi Filtro Parametro"><i class="fa-solid fa-sliders"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+                    </div>
+                }
+                <div class="p-2">
+                    <a class="pt-2 text-dark" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample" @onclick="setDtMax">
+                        <i class="fa-solid fa-bars"></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/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs
index a29dcdd0..592e6c2a 100644
--- a/MP.SPEC/Pages/ODL.razor.cs
+++ b/MP.SPEC/Pages/ODL.razor.cs
@@ -71,7 +71,19 @@ namespace MP.SPEC.Pages
         #endregion Protected Properties
 
         #region Protected Methods
+        private bool filtActive
+        {
+            get => selMacchina != "*" || selStato != "*";
+        }
 
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetFase()
+        {
+            selStato = "*";
+        }
         protected void ForceReload(int newNum)
         {
             numRecord = newNum;
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 84ccf39f..41ed64e1 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.2110</h4>
+    <h4>Versione: 6.16.2210.2112</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 148d3a17..611d3d51 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.2110
+6.16.2210.2112
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 463051c6..a74c9b0c 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.2110</version>
+  <version>6.16.2210.2112</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>