From 41b080afcf60cbaaa2e138edd592c92c2c772d82 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Tue, 29 Nov 2022 11:05:54 +0100
Subject: [PATCH] fine mostra filtri attivi

---
 MP.Data/Controllers/MpSpecController.cs |  2 +-
 MP.SPEC/Data/SelectXdlParams.cs         |  2 +-
 MP.SPEC/Pages/ODL.razor                 | 87 -----------------------
 MP.SPEC/Pages/PODL.razor                | 91 ++++++++++++++++---------
 4 files changed, 62 insertions(+), 120 deletions(-)

diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 04a91d61..055522b3 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -615,7 +615,7 @@ namespace MP.Data.Controllers
 
                 dbResult = dbCtx
                             .DbSetPODLExp
-                            .FromSqlRaw("EXEC stp_PODL_getByFiltSpec @Lanciato, @KeyRich, @CodGruppo, @IdxMacchina, @DateFrom, @DateFrom", Lanc, KeyRich, CodGrp, IdxMacc, DateFrom, DateTo)
+                            .FromSqlRaw("EXEC stp_PODL_getByFiltSpec @Lanciato, @KeyRich, @CodGruppo, @IdxMacchina, @DateFrom, @DateTo", Lanc, KeyRich, CodGrp, IdxMacc, DateFrom, DateTo)
                             .AsNoTracking()
                             //.AsEnumerable()
                             .ToList();
diff --git a/MP.SPEC/Data/SelectXdlParams.cs b/MP.SPEC/Data/SelectXdlParams.cs
index e52e1b14..a5bd2d66 100644
--- a/MP.SPEC/Data/SelectXdlParams.cs
+++ b/MP.SPEC/Data/SelectXdlParams.cs
@@ -17,7 +17,7 @@ namespace MP.SPEC.Data
         public string CodReparto { get; set; } = "*";
         public int CurrPage { get; set; } = 1;
         public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 5);
-        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-10);
+        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddMonths(-2);
         public bool HasOdl { get; set; } = false;
         public string IdxMacchina { get; set; } = "*";
         public bool IsActive { get; set; } = true;
diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor
index bfb97518..e1a03bdb 100644
--- a/MP.SPEC/Pages/ODL.razor
+++ b/MP.SPEC/Pages/ODL.razor
@@ -48,93 +48,6 @@
                     </div>
                 </div>
                 <SelFilterXDL currFilter="@currFilter" ListMacchine="@ListMacchine" ListStati="@ListStati" ListGruppiFase="@ListGruppiFase" FilterChanged="updateFilter"></SelFilterXDL>
-                @*<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>
-                <div>
-                Seleziona i filtri per:
-                </div>
-                </div>
-                <div>
-
-                <div class="small mt-2">
-                <label class="px-2" for="macchina" title="Selezionare inizio periodo">Reparto</label>
-                </div>
-                <div class="input-group px-2">
-                <label class="input-group-text" for="macchina" title="Selezionare la macchina da visualizzare"><i class="fa-solid fa-hard-drive"></i></label>
-                <select @bind="@selMacchina" id="macchina" class="form-select" title="Selezionare la macchina da visualizzare">
-                <option value="*">--- Tutti ---</option>
-                @if (ListMacchine != null)
-                {
-                foreach (var item in ListMacchine)
-                {
-                <option value="@item">@item</option>
-                }
-                }
-                </select>
-                </div>
-                </div>
-                <div>
-
-                <div class="small mt-2">
-                <label class="px-2" for="macchina" title="Selezionare inizio periodo">Macchina</label>
-                </div>
-                <div class="input-group px-2">
-                <label class="input-group-text" for="macchina" title="Selezionare la macchina da visualizzare"><i class="fa-solid fa-hard-drive"></i></label>
-                <select @bind="@selMacchina" id="macchina" class="form-select" title="Selezionare la macchina da visualizzare">
-                <option value="*">--- Tutti ---</option>
-                @if (ListMacchine != null)
-                {
-                foreach (var item in ListMacchine)
-                {
-                <option value="@item">@item</option>
-                }
-                }
-                </select>
-                </div>
-                </div>
-                <div>
-
-                <div class="small mt-2">
-                <label class="px-2" for="fase" title="Selezionare inizio periodo">Fase</label>
-                </div>
-                <div class="input-group px-2">
-                <label class="input-group-text" for="fase" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
-                <select @bind="@selStato" id="fase" 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>
-                }
-                }
-                </select>
-                </div>
-                </div>
-                @if (!isActive)
-                {
-                <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="@selDtStart" 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="@selDtEnd" id="dtMax" type="datetime-local" title="Selezionare fine periodo">
-                </div>
-                }
-                </div>
-                </div>*@
             </div>
         </div>
     </div>
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index 196b07e5..e1726226 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -21,45 +21,74 @@
                         <button class="btn btn-success" @onclick="() => reqNewPODL()">Nuovo PODL <i class="bi bi-plus-square"></i></button>
                     }
                 </div>
-
-                @*                <div class="px-2">
-
-                </div>*@
             </div>
-            <div class="col-6">
-                @if (filtActive)
-                {
-                    <div class=" rounded small d-flex justify-content-between" title="Filtri attivi">
-                        @*<i class="fas fa-exclamation text-warning"></i>*@
-                        @if (selReparto != "*")
-                        {
-                            <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetReparto()" title="Rimuovi Filtro Reparto"><i class="fa-solid fa-building"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
-                        }
-                        @if (macchina != "*")
-                        {
-                            <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 (StatoSel != "*")
-                        {
-                            <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>
-                }
-                @if (hasOdl)
-                {
-                    <span class="badge bg-secondary mx-2 text-nowrap" title="Filtro Data inizio attivo">@selDtStart &nbsp <i class="fa-solid fa-calendar-days"></i></span>
-                    <span class="badge bg-secondary mx-2 text-nowrap" title="Filtro Data fine attivo">@selDtEnd &nbsp <i class="fa-solid fa-calendar-days"></i></span>
-                }
-                <div class="input-group input-group-sm d-flex flex-row-reverse">
-                    <SelFilterXDL currFilter="@currFilter" ListMacchine="@ListMacchine" ListStati="@ListStati" ListGruppiFase="@ListGruppiFase" FilterChanged="updateFilter"></SelFilterXDL>
-                    <div class="p-2">
+            <div class="d-flex justify-content-end col-6">
+                <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 (selReparto != "*")
+                            {
+                                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetReparto()" title="Rimuovi Filtro Reparto"><i class="fa-solid fa-building"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+                            }
+                            @if (macchina != "*")
+                            {
+                                <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 (StatoSel != "*")
+                            {
+                                <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>
+                    }
+                    @if (hasOdl)
+                    {
+                        <span class="badge bg-secondary mx-2 text-nowrap" title="Filtro Data inizio attivo">@selDtStart &nbsp <i class="fa-solid fa-calendar-days"></i></span>
+                        <span class="badge bg-secondary mx-2 text-nowrap" title="Filtro Data fine attivo">@selDtEnd &nbsp <i class="fa-solid fa-calendar-days"></i></span>
+                    }
+                    <div class="p-2 text-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>
                 </div>
+                <SelFilterXDL currFilter="@currFilter" ListMacchine="@ListMacchine" ListStati="@ListStati" ListGruppiFase="@ListGruppiFase" FilterChanged="updateFilter"></SelFilterXDL>
             </div>
 
+            @*@if (filtActive)
+            {
+            <div class=" rounded small d-flex justify-content-between" title="Filtri attivi">
+            @*<i class="fas fa-exclamation text-warning"></i>
+            @if (selReparto != "*")
+            {
+            <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetReparto()" title="Rimuovi Filtro Reparto"><i class="fa-solid fa-building"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            @if (macchina != "*")
+            {
+            <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 (StatoSel != "*")
+            {
+            <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>
+            }
+            @if (hasOdl)
+            {
+            <span class="badge bg-secondary mx-2 text-nowrap" title="Filtro Data inizio attivo">@selDtStart &nbsp <i class="fa-solid fa-calendar-days"></i></span>
+            <span class="badge bg-secondary mx-2 text-nowrap" title="Filtro Data fine attivo">@selDtEnd &nbsp <i class="fa-solid fa-calendar-days"></i></span>
+            }
+            <SelFilterXDL currFilter="@currFilter" ListMacchine="@ListMacchine" ListStati="@ListStati" ListGruppiFase="@ListGruppiFase" FilterChanged="updateFilter"></SelFilterXDL>
+            <div class="p-2">
+            <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>
+            <div class="input-group input-group-sm d-flex flex-row-reverse">
+            </div>
+            </div>*@
+
         </div>
         @if (currRecord != null)
         {