From 9fc73c5c855540c30291b3149bb9af7dddb47a37 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 7 Oct 2022 18:30:53 +0200
Subject: [PATCH] modifiche richieste

---
 MP.SPEC/Components/ListODL.razor         | 18 +++++-
 MP.SPEC/Components/ParamsFilter.razor.cs | 20 -------
 MP.SPEC/MP.SPEC.csproj                   |  2 +-
 MP.SPEC/Pages/ODL.razor                  | 73 +++++++++++++++++-------
 MP.SPEC/Pages/ODL.razor.cs               | 42 +++++++++++++-
 MP.SPEC/Resources/ChangeLog.html         |  2 +-
 MP.SPEC/Resources/VersNum.txt            |  2 +-
 MP.SPEC/Resources/manifest.xml           |  2 +-
 8 files changed, 112 insertions(+), 49 deletions(-)

diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor
index d09e411d..2deaad4d 100644
--- a/MP.SPEC/Components/ListODL.razor
+++ b/MP.SPEC/Components/ListODL.razor
@@ -80,7 +80,23 @@ else
                                     <b>@record.DurataMinuti</b>
                                 </div>
                                 <div>
-                                    <button class="btn btn-sm btn-primary py-0">stats</button>
+                                    <button class="btn btn-sm btn-primary py-0" type="button" data-bs-toggle="modal" data-bs-target="#staticBackdrop">stats</button>
+                                </div>
+
+                                <!-- Modal -->
+                                <div class="modal fade" id="staticBackdrop" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+                                    <div class="modal-dialog">
+                                        <div class="modal-content">
+                                            <div class="modal-header">
+                                                <h1 class="modal-title fs-5" id="staticBackdropLabel">Modal title</h1>
+                                                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                            </div>
+                                            <div class="modal-body">
+                                                <div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </td>
                         </tr>
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs
index 76cd2905..25f497c7 100644
--- a/MP.SPEC/Components/ParamsFilter.razor.cs
+++ b/MP.SPEC/Components/ParamsFilter.razor.cs
@@ -312,26 +312,6 @@ namespace MP.SPEC.Components
         {
             FilterChanged.InvokeAsync(SelFilter);
         }
-        private void toggleShowParams()
-        {
-            showParam = !showParam;
-        }
-        private void untoggleSelDt()
-        {
-            selDt = false;
-            liveUpdate = true;
-        }
-        private void toggleSelDt()
-        {
-            selDt = true;
-            liveUpdate = false;
-
-            if (selDtMax == null)
-            {
-                setDtMax();
-            }
-
-        }
 
         #endregion Private Methods
     }
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index f8703f9b..e156d2ec 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.717</Version>
+    <Version>6.16.2210.718</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor
index c2c5eef2..4c841cc0 100644
--- a/MP.SPEC/Pages/ODL.razor
+++ b/MP.SPEC/Pages/ODL.razor
@@ -1,15 +1,16 @@
 @page "/ODL"
 
 <div class="card mb-5">
-    <div class="card-header table-primary">
-        <div class="d-flex justify-content-between">
-            <div class="px-1">
-                <div class="d-flex">
-                    <div>
-                        <h3><b>ODL</b></h3>
-                    </div>
-                    <div>
-                        @*<ToggleMode FilterChanged="updateFilter" SelFilter="toggleFilter"></ToggleMode>*@
+    <div class="card-header table-primary ">
+        <div class="d-flex justify-content-between col-12">
+            <div class="px-1 col-4">
+                <div>
+                    <h3><b>ODL</b></h3>
+                </div>
+            </div>
+            <div class="col-4">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-text">
                         <span class="me-1 @leftStringCSS">Completati</span>
                         <span class="form-check form-check-sm form-switch py-1" title="ODL Chiusi / Correnti">
                             <input class="form-check-input" type="checkbox" id="switchActive" @bind="@isActive">
@@ -18,19 +19,47 @@
                     </div>
                 </div>
             </div>
-            <div class="px-2">
-                <div class="input-group input-group">
-                    <label class="input-group-text" for="maxRecord" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
-                    <select @bind="@selStato" 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 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="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>
+                            Seleziona i filtri per:
+                        </div>
+                        <div class="input-group p-2">
+                            <label class="input-group-text" for="maxRecord" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
+                            <select @bind="@selStato" 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 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>
diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs
index e80e047f..6acde664 100644
--- a/MP.SPEC/Pages/ODL.razor.cs
+++ b/MP.SPEC/Pages/ODL.razor.cs
@@ -101,7 +101,6 @@ namespace MP.SPEC.Pages
             set => currFilter.CodStato = value;
         }
 
-        private SelectGlobalToggle toggleFilter { get; set; } = new SelectGlobalToggle();
 
         private int totalCount
         {
@@ -118,6 +117,28 @@ namespace MP.SPEC.Pages
             get => currFilter.IsActive;
             set => currFilter.IsActive = value;
         }
+        protected DateTime selDtStart
+        {
+            get => currFilter.DtStart;
+            set
+            {
+                if (currFilter.DtStart != value)
+                {
+                    currFilter.DtStart = value;
+                }
+            }
+        }
+        protected DateTime selDtEnd
+        {
+            get => currFilter.DtEnd;
+            set
+            {
+                if (currFilter.DtEnd != value)
+                {
+                    currFilter.DtEnd = value;
+                }
+            }
+        }
 
         private string leftStringCSS
         {
@@ -127,7 +148,24 @@ namespace MP.SPEC.Pages
         {
             get => isActive ? "text-dark" : "text-secondary";
         }
-
+        protected void setDtMax()
+        {
+            // copio il filtro
+            currFilter.DtEnd = RoundDatetime(5);
+            currFilter.DtStart = RoundDatetime(5).AddDays(-1);
+        }
+        /// <summary>
+        /// Inizializzazione con periodo e arrotondamento
+        /// </summary>
+        /// <param name="minRound"></param>
+        /// <returns></returns>
+        public static DateTime RoundDatetime(int minRound)
+        {
+            TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today);
+            int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound;
+            DateTime endRounded = DateTime.Today.AddMinutes(minDay);
+            return endRounded;
+        }
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 3bbfb1d3..19394cc4 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.717</h4>
+    <h4>Versione: 6.16.2210.718</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index b1088291..7f2d395c 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.717
+6.16.2210.718
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 0c1a129f..925f8fc6 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.717</version>
+  <version>6.16.2210.718</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>