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 1/6] 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>

From 185e27f31d0cc15e84fa72ece977c4750739f97b Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 21 Oct 2022 14:14:12 +0200
Subject: [PATCH 2/6] fix bottone liveupdate

---
 MP.SPEC/Components/ListPARAMS.razor.cs |   2 +-
 MP.SPEC/Components/ParamsFilter.razor  | 171 +++++++++++--------------
 MP.SPEC/Pages/PARAMS.razor.cs          |   4 +-
 3 files changed, 80 insertions(+), 97 deletions(-)

diff --git a/MP.SPEC/Components/ListPARAMS.razor.cs b/MP.SPEC/Components/ListPARAMS.razor.cs
index c1543575..c00ddcbe 100644
--- a/MP.SPEC/Components/ListPARAMS.razor.cs
+++ b/MP.SPEC/Components/ListPARAMS.razor.cs
@@ -238,7 +238,7 @@ namespace MP.SPEC.Components
             // copio il filtro
             var currFilt = SelFilter;
             // fermo update
-            currFilt.LiveUpdate = true;
+            //currFilt.LiveUpdate = true;
             currFilt.CurrPage = 0;
             currFilt.lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
             currFilt.dtMax = RoundDatetime(5);
diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor
index ee176a05..ddd653a1 100644
--- a/MP.SPEC/Components/ParamsFilter.razor
+++ b/MP.SPEC/Components/ParamsFilter.razor
@@ -41,7 +41,6 @@
     <div class="d-flex justify-content-between pt-2">
         @if (filtActive)
         {
-<<<<<<< HEAD
             @*<i class="fas fa-exclamation text-warning"></i>*@
             @if (selMacchina != "*")
             {
@@ -51,24 +50,7 @@
             {
                 <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 border border-secondary rounded small" title="Filtri attivi">
-                @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>
->>>>>>> 8b912101151ab937a6591b756752e1fb82b20f31
-        }
-                @if (selFlux != "*")
-                {
-                    <i class="fa-solid fa-sliders" title="Filtro Parametro"></i>
-                }
-            </div>
+
         }
         <div class="p-2">
             <a class="" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample">
@@ -76,87 +58,88 @@
             </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>
-            <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+</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>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+    <div class="offcanvas-body">
+        <div class="small">
+            <label class="px-2" for="macchina" title="Selezionare impianto">Impianto</label>
         </div>
-        <div class="offcanvas-body">
-            <div class="small">
-                <label class="px-2" for="macchina" title="Selezionare impianto">Impianto</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="macchina" title="Selezionare impianto"><i class="fa-solid fa-hard-drive"></i></label>
-                <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare impianto">
-                    <option value="*">--- Tutti ---</option>
-                    @if (ListMacchine != null)
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="macchina" title="Selezionare impianto"><i class="fa-solid fa-hard-drive"></i></label>
+            <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare impianto">
+                <option value="*">--- Tutti ---</option>
+                @if (ListMacchine != null)
+                {
+                    foreach (var item in ListMacchine)
                     {
-                        foreach (var item in ListMacchine)
-                        {
-                            <option value="@item">@item</option>
-                        }
+                        <option value="@item">@item</option>
                     }
-                </select>
-            </div>
-            <div class="small mt-2">
-                <label class="px-2" for="flusso" title="Selezionare il parametro">Parametro</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="flusso" title="Selezionare il parametro"><i class="fa-solid fa-sliders"></i></label>
-                <select @bind="@selFlux" class="form-select" id="flusso" title="Selezionare il parametro">
-                    <option value="*">--- Tutti ---</option>
-                    @if (ListFlux != null)
+                }
+            </select>
+        </div>
+        <div class="small mt-2">
+            <label class="px-2" for="flusso" title="Selezionare il parametro">Parametro</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="flusso" title="Selezionare il parametro"><i class="fa-solid fa-sliders"></i></label>
+            <select @bind="@selFlux" class="form-select" id="flusso" title="Selezionare il parametro">
+                <option value="*">--- Tutti ---</option>
+                @if (ListFlux != null)
+                {
+                    foreach (var item in ListFlux)
                     {
-                        foreach (var item in ListFlux)
-                        {
-                            <option value="@item">@item</option>
-                        }
+                        <option value="@item">@item</option>
                     }
-                </select>
-            </div>
-            <div class="small mt-2">
-                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Inizio Periodo</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="dtMin" title="Selezionare inizio periodo"><i class="fa-regular fa-calendar-minus"></i></label>
-                <input class="form-control" @bind="@selDtMin" id="dtMin" type="datetime-local" title="Data minima eventi da visualizzare">
-            </div>
-            <div class="small mt-2">
-                <label class="px-2" for="dtMax" title="Selezionare fine periodo">Fine Periodo</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="dtMax" title="Selezionare fine periodo"><i class="fa-regular fa-calendar-plus"></i></label>
-                <input class="form-control" @bind="@selDtMax" id="dtMax" type="datetime-local" title="Selezionare fine periodo">
-            </div>
-            <div class="small mt-2">
-                <label class="px-2" for="tempoAgg" title="Selezionare refresh rate (sec) periodo">Refresh rate (sec)</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="tempoAgg" title="Selezionare refresh rate (sec)"><i class="fa-solid fa-clock"></i></label>
-                <select @bind="@selTempoAgg" class="form-select" id="tempoAgg" title="Selezionare refresh rate (sec)" style="width: 3em;">
-                    <option value="2">2</option>
-                    <option value="5">5</option>
-                    <option value="10">10</option>
-                    <option value="30">30</option>
-                    <option value="60">60</option>
-                </select>
-            </div>
-            <div class="small mt-2">
-                <label class="px-2" for="maxRecord" title="Numero massimo record da mostrare">Max Record</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="maxRecord" title="Numero massimo record da mostrare"><i class="fa-solid fa-list-ol"></i></label>
-                <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Numero massimo record da mostrare">
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="250">250</option>
-                    <option value="500">500</option>
-                    <option value="1000">1000</option>
-                    <option value="2500">2500</option>
-                    <option value="5000">5000</option>
-                </select>
-            </div>
+                }
+            </select>
+        </div>
+        <div class="small mt-2">
+            <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Inizio Periodo</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="dtMin" title="Selezionare inizio periodo"><i class="fa-regular fa-calendar-minus"></i></label>
+            <input class="form-control" @bind="@selDtMin" id="dtMin" type="datetime-local" title="Data minima eventi da visualizzare">
+        </div>
+        <div class="small mt-2">
+            <label class="px-2" for="dtMax" title="Selezionare fine periodo">Fine Periodo</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="dtMax" title="Selezionare fine periodo"><i class="fa-regular fa-calendar-plus"></i></label>
+            <input class="form-control" @bind="@selDtMax" id="dtMax" type="datetime-local" title="Selezionare fine periodo">
+        </div>
+        <div class="small mt-2">
+            <label class="px-2" for="tempoAgg" title="Selezionare refresh rate (sec) periodo">Refresh rate (sec)</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="tempoAgg" title="Selezionare refresh rate (sec)"><i class="fa-solid fa-clock"></i></label>
+            <select @bind="@selTempoAgg" class="form-select" id="tempoAgg" title="Selezionare refresh rate (sec)" style="width: 3em;">
+                <option value="2">2</option>
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="30">30</option>
+                <option value="60">60</option>
+            </select>
+        </div>
+        <div class="small mt-2">
+            <label class="px-2" for="maxRecord" title="Numero massimo record da mostrare">Max Record</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="maxRecord" title="Numero massimo record da mostrare"><i class="fa-solid fa-list-ol"></i></label>
+            <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Numero massimo record da mostrare">
+                <option value="50">50</option>
+                <option value="100">100</option>
+                <option value="250">250</option>
+                <option value="500">500</option>
+                <option value="1000">1000</option>
+                <option value="2500">2500</option>
+                <option value="5000">5000</option>
+            </select>
         </div>
     </div>
 </div>
+</div>
 
diff --git a/MP.SPEC/Pages/PARAMS.razor.cs b/MP.SPEC/Pages/PARAMS.razor.cs
index a04de781..2428b24d 100644
--- a/MP.SPEC/Pages/PARAMS.razor.cs
+++ b/MP.SPEC/Pages/PARAMS.razor.cs
@@ -30,7 +30,7 @@ namespace MP.SPEC.Pages
             currPage = newNum;
             DateTime adesso = DateTime.Now.AddSeconds(1);
             var updFilter = currFilter;
-            updFilter.LiveUpdate = (currPage == 1);
+            //updFilter.LiveUpdate = (currPage == 1);
             updFilter.lastUpdate = updFilter.LiveUpdate ? "-" : $"{adesso:yyyy/MM/dd HH:mm:ss}";
             // salvo filtro
             currFilter = updFilter;
@@ -127,7 +127,7 @@ namespace MP.SPEC.Pages
             }
             else
             {
-                newParams.LiveUpdate = (currPage == 1);
+                //newParams.LiveUpdate = (currPage == 1);
             }
             await Task.Delay(1);
             await InvokeAsync(() => StateHasChanged());

From b07c610edd3e121b2f909839f91602beed0db797 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 21 Oct 2022 15:40:26 +0200
Subject: [PATCH 3/6] fix pagina params

---
 MP.SPEC/Components/ParamsFilter.razor | 1 -
 MP.SPEC/MP.SPEC.csproj                | 2 +-
 MP.SPEC/Resources/ChangeLog.html      | 2 +-
 MP.SPEC/Resources/VersNum.txt         | 2 +-
 MP.SPEC/Resources/manifest.xml        | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor
index ddd653a1..60bfd4ab 100644
--- a/MP.SPEC/Components/ParamsFilter.razor
+++ b/MP.SPEC/Components/ParamsFilter.razor
@@ -141,5 +141,4 @@
         </div>
     </div>
 </div>
-</div>
 
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index ae517e0b..544da043 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.2112</Version>
+    <Version>6.16.2210.2115</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 41ed64e1..77837625 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.2112</h4>
+    <h4>Versione: 6.16.2210.2115</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 611d3d51..aa73f981 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.2112
+6.16.2210.2115
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index a74c9b0c..9448f3cd 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.2112</version>
+  <version>6.16.2210.2115</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>

From ea930b308d4b9d37691dff71252ce5d7e296a88f Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 26 Oct 2022 17:25:09 +0200
Subject: [PATCH 4/6] fix richiesti pagina PODL

---
 MP.SPEC/Components/ListPODL.razor |  6 +++---
 MP.SPEC/MP.SPEC.csproj            |  2 +-
 MP.SPEC/Pages/PODL.razor          | 26 +++++++++++++++++---------
 MP.SPEC/Pages/PODL.razor.cs       | 15 +++++++++++++++
 MP.SPEC/Resources/ChangeLog.html  |  2 +-
 MP.SPEC/Resources/VersNum.txt     |  2 +-
 MP.SPEC/Resources/manifest.xml    |  2 +-
 7 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor
index 85641a6c..4bcc0552 100644
--- a/MP.SPEC/Components/ListPODL.razor
+++ b/MP.SPEC/Components/ListPODL.razor
@@ -37,13 +37,13 @@ else
                                 <button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
                                 @if (canStartOdl(record.IdxMacchina))
                                 {
-                                    <button @onclick="() => startOdl(record)" class="btn btn-success btn-sm" title="Avvia PODL">
+                                    <button @onclick="() => startOdl(record)" class="btn btn-success btn-sm mx-1" title="Avvia PODL">
                                         <i class="far fa-play-circle"></i>
                                     </button>
                                 }
                                 else
-                                { 
-                                    <button class="btn btn-secondary btn-sm disabled" title="ODL ancora in corso">
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled mx-1" title="ODL ancora in corso">
                                         <i class="far fa-play-circle"></i>
                                     </button>}
                             </td>
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 544da043..f0534463 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.2115</Version>
+    <Version>6.16.2210.2617</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index edd74ebb..929bc105 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -12,7 +12,7 @@
                     <div class="px-2">
                         @if (addEnabled)
                         {
-                            <button class="btn btn-success" @onclick="() => reqNewPODL()">@btnNewText <i class="bi bi-plus-square"></i></button>
+                            <button class="btn btn-success" @onclick="() => reqNewPODL()">Nuovo PODL <i class="bi bi-plus-square"></i></button>
                         }
                     </div>
                 </div>
@@ -21,19 +21,20 @@
                 <div class="input-group input-group-sm">
                     @*<label class="input-group-text" for="maxRecord" title="Selezionare l'azienda da visualizzare"><i class="fa-solid fa-industry"></i></label>
                     <select @bind="@currAzienda" class="form-select" title="Selezionare l'azienda da visualizzare">
-                        @if (ListAziende != null)
-                        {
-                            foreach (var item in ListAziende)
-                            {
-                                <option value="@item.CodGruppo">@item.DescrGruppo</option>
-                            }
-                        }
+                    @if (ListAziende != null)
+                    {
+                    foreach (var item in ListAziende)
+                    {
+                    <option value="@item.CodGruppo">@item.DescrGruppo</option>
+                    }
+                    }
                     </select>*@
                     <label class="input-group-text" for="maxRecord" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
                     <select @bind="@currFase" class="form-select" title="Selezionare la fase da visualizzare">
                         <option value="*">--- Tutti ---</option>
                         @if (ListStati != null)
                         {
+
                             foreach (var item in ListStati)
                             {
                                 <option value="@item.value">@item.label</option>
@@ -126,7 +127,14 @@
                                                     {
                                                         foreach (var item in ListMacchine)
                                                         {
-                                                            <option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            if (selectFirst(item.IdxMacchina) == true)
+                                                            {
+                                                                <option selected value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            }
+                                                            else
+                                                            {
+                                                                <option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            }
                                                         }
                                                     }
                                                 </select>
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs
index 56c65581..351d2ed0 100644
--- a/MP.SPEC/Pages/PODL.razor.cs
+++ b/MP.SPEC/Pages/PODL.razor.cs
@@ -203,6 +203,21 @@ namespace MP.SPEC.Pages
             }
         }
 
+        private bool selectFirst(string idxMacchina)
+        {
+            string firstMacchina="";
+            bool ans = false;
+            if (ListMacchine != null)
+            {
+                firstMacchina = ListMacchine.Select(x => x.IdxMacchina).FirstOrDefault();
+            }
+            if (firstMacchina == idxMacchina)
+            {
+                ans = true;
+            }
+            return ans;
+        }
+
         private string btnNewText
         {
             get => currArticolo == "" ? "Sel Articolo" : "Nuovo PODL";
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 77837625..c9794f03 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.2115</h4>
+    <h4>Versione: 6.16.2210.2617</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index aa73f981..8baef796 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.2115
+6.16.2210.2617
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 9448f3cd..867aae92 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.2115</version>
+  <version>6.16.2210.2617</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>

From 39cf45869cc9da8648c3ffd016821b2b33c76f57 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 26 Oct 2022 17:27:45 +0200
Subject: [PATCH 5/6] fix order

---
 MP.Data/Controllers/MpSpecController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 5c169377..7438fee2 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -555,7 +555,7 @@ namespace MP.Data.Controllers
                 .AsNoTracking()
                 .Include(m => m.MachineNav)
                 .Include(a => a.ArticoloNav)
-                .OrderBy(x => x.InsertDate)
+                .OrderByDescending(x => x.InsertDate)
                 .ToList();
             }
             return dbResult;

From 40b16d2e83249f05e0ed2e55e7d86376e2a36368 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 3 Nov 2022 11:28:15 +0100
Subject: [PATCH 6/6] spostato bottone flush cache in top

---
 MP.SPEC/Components/CmpTop.razor  | 25 +++++++++++++++++++++++--
 MP.SPEC/MP.SPEC.csproj           |  2 +-
 MP.SPEC/Resources/ChangeLog.html |  2 +-
 MP.SPEC/Resources/VersNum.txt    |  2 +-
 MP.SPEC/Resources/manifest.xml   |  2 +-
 MP.SPEC/Shared/NavMenu.razor     |  1 +
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/MP.SPEC/Components/CmpTop.razor b/MP.SPEC/Components/CmpTop.razor
index 8061e546..79c66797 100644
--- a/MP.SPEC/Components/CmpTop.razor
+++ b/MP.SPEC/Components/CmpTop.razor
@@ -10,7 +10,10 @@
     <div class="px-2">
         <i class="fas fa-user-alt"></i> <b>@userName</b>
     </div>
-    <div class="px-2 flex-grow-1 text-end">
+    <div class="pe-2">
+        <button class="btn btn-primary" @onclick="() => flushCache()"> Flush Cache </button>
+    </div>
+   @* <div class="px-2 flex-grow-1 text-end">
         <span class="text-secondary">@TipoSearch</span>
     </div>
     <div class="px-2 text-end">
@@ -18,7 +21,7 @@
         {
             <SearchMod></SearchMod>
         }
-    </div>
+    </div>*@
 </div>
 
 @code {
@@ -62,4 +65,22 @@
             userName = "N.A.";
         }
     }
+
+    public async Task flushCache()
+    {
+        await Task.Delay(1);
+        await MDService.FlushRedisCache();
+        await JSRuntime.InvokeAsync<bool>("location.reload");
+        // rimando a home
+        //NavManager.NavigateTo("", true);
+    }
+
+    [Inject]
+    private NavigationManager NavManager { get; set; } = null!;
+
+    [Inject]
+    protected MpDataService MDService { get; set; } = null!;
+
+    [Inject]
+    protected IJSRuntime JSRuntime { get; set; } = null!;
 }
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index f0534463..fc722818 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.2617</Version>
+    <Version>6.16.2211.310</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index c9794f03..5c889378 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.2617</h4>
+    <h4>Versione: 6.16.2211.310</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 8baef796..6656208b 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.2617
+6.16.2211.310
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 867aae92..e1da50ab 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.2617</version>
+  <version>6.16.2211.310</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>
diff --git a/MP.SPEC/Shared/NavMenu.razor b/MP.SPEC/Shared/NavMenu.razor
index a21d13ba..f0496859 100644
--- a/MP.SPEC/Shared/NavMenu.razor
+++ b/MP.SPEC/Shared/NavMenu.razor
@@ -38,6 +38,7 @@
         {
             foreach (var item in ElencoLink)
             {
+                
                 <div class="nav-item px-2 col-12">
                     <NavLink class="nav-link px-2" href="@item.NavigateUrl">
                         <div class="col-2">