From aebae6b4065b2767a37cdf726d41aef9910f97ad Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 18 Oct 2022 20:01:53 +0200
Subject: [PATCH] Update selezione dossier: - selezione x periodo - ancora
 check ottimizzazione sel distinct

---
 MP.Data/Controllers/MpSpecController.cs    |  9 ++++----
 MP.SPEC/Components/DossiersFilter.razor    | 19 ++++++++++++++--
 MP.SPEC/Components/DossiersFilter.razor.cs | 23 +++++++++++++++++--
 MP.SPEC/Components/ListDossiers.razor.cs   |  8 +++++--
 MP.SPEC/Components/ParamsFilter.razor      |  1 -
 MP.SPEC/Components/ParamsFilter.razor.cs   |  7 +++---
 MP.SPEC/Data/MpDataService.cs              | 10 ++++-----
 MP.SPEC/Data/SelectDossierParams.cs        |  4 +---
 MP.SPEC/MP.SPEC.csproj                     |  2 +-
 MP.SPEC/Pages/DOSS.razor                   | 26 ++++++++++------------
 MP.SPEC/Pages/PARAMS.razor                 |  2 --
 MP.SPEC/Pages/PARAMS.razor.cs              |  2 +-
 MP.SPEC/Resources/ChangeLog.html           |  2 +-
 MP.SPEC/Resources/VersNum.txt              |  2 +-
 MP.SPEC/Resources/manifest.xml             |  2 +-
 15 files changed, 74 insertions(+), 45 deletions(-)

diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index bd8d87de..535274d2 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -333,10 +333,10 @@ namespace MP.Data.Controllers
         /// </summary>
         /// <param name="IdxMacchina">* = tutte, altrimenti solo x una data macchina</param>
         /// <param name="CodArticolo">* = tutti, altrimenti solo x un dato articolo</param>
-        /// <param name="DtRef">Data di riferimento (Massima) per estrazioen records</param>
-        /// <param name="MaxRec">numero massimo record da restituire</param>
+        /// <param name="DtStart">Data minima per estrazione records</param>
+        /// <param name="DtEnd">Data Massima per estrazione records</param>
         /// <returns></returns>
-        public List<Dossiers> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtRef, int MaxRec)
+        public List<Dossiers> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd)
         {
             List<Dossiers> dbResult = new List<Dossiers>();
             using (var dbCtx = new MoonProContext(_configuration))
@@ -344,12 +344,11 @@ namespace MP.Data.Controllers
                 dbResult = dbCtx
                             .DbSetDossiers
                             .AsNoTracking()
-                            .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodArticolo == "*" || x.OdlNav.CodArticolo == CodArticolo) && x.DtRif <= DtRef)
+                            .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodArticolo == "*" || x.OdlNav.CodArticolo == CodArticolo) && (x.DtRif >= DtStart && x.DtRif <= DtEnd))
                             .Include(m => m.MachineNav)
                             .Include(o => o.OdlNav)
                             .Include(a => a.OdlNav.ArticoloNav)
                             .OrderByDescending(x => x.DtRif)
-                            .Take(MaxRec)
                             .ToList();
             }
             return dbResult;
diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor
index 9d549e93..7a6a8689 100644
--- a/MP.SPEC/Components/DossiersFilter.razor
+++ b/MP.SPEC/Components/DossiersFilter.razor
@@ -37,7 +37,22 @@
                     }
                 </select>
             </div>
-            <div class="input-group p-2">
+
+            <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="input-group p-2">
                 <label class="input-group-text" for="DtMin" title="Selezionare la data da visualizzare"><i class="fa-solid fa-calendar-check"></i></label>
                 <input @bind="@selDtRef" id="DtMin" class="form-control" type="datetime-local" title="Selezionare la data minima da visualizzare" />
             </div>
@@ -49,7 +64,7 @@
                     <option value="250">250</option>
                     <option value="500">500</option>
                 </select>
-            </div>
+            </div>*@
         </div>
     </div>
 </div>
diff --git a/MP.SPEC/Components/DossiersFilter.razor.cs b/MP.SPEC/Components/DossiersFilter.razor.cs
index 3e5694c1..f5dd2bbe 100644
--- a/MP.SPEC/Components/DossiersFilter.razor.cs
+++ b/MP.SPEC/Components/DossiersFilter.razor.cs
@@ -39,7 +39,7 @@ namespace MP.SPEC.Components
             }
         }
 
-        protected DateTime selDtRef
+        protected DateTime selDtMax
         {
             get
             {
@@ -56,6 +56,23 @@ namespace MP.SPEC.Components
             }
         }
 
+        protected DateTime selDtMin
+        {
+            get
+            {
+                return SelFilterDossier.DtStart;
+            }
+
+            set
+            {
+                if (!SelFilterDossier.DtStart.Equals(value))
+                {
+                    SelFilterDossier.DtStart = value;
+                    reportChange();
+                }
+            }
+        }
+
         protected string selMacchina
         {
             get
@@ -101,7 +118,9 @@ namespace MP.SPEC.Components
         protected override async Task OnInitializedAsync()
         {
             SelFilterDossier = new SelectDossierParams();
-            ListMacchine = await MDService.MacchineWithFlux(SelFilterDossier.DtStart, SelFilterDossier.DtEnd);
+            DateTime dtEnd = SelFilterDossier.DtEnd;
+            DateTime dtStart = dtEnd.Subtract(SelFilterDossier.DtStart).TotalDays < 15 ? SelFilterDossier.DtStart : dtEnd.AddDays(-14);
+            ListMacchine = await MDService.MacchineWithFlux(dtStart, dtEnd);
             ListArticoli = await MDService.ArticleWithDossier();
             await FilterChanged.InvokeAsync(SelFilterDossier);
         }
diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs
index 99255735..b3882a7b 100644
--- a/MP.SPEC/Components/ListDossiers.razor.cs
+++ b/MP.SPEC/Components/ListDossiers.razor.cs
@@ -185,10 +185,14 @@ namespace MP.SPEC.Components
             get => SelFilter.CodArticolo;
         }
 
-        private DateTime SelDtRef
+        private DateTime SelDtEnd
         {
             get => SelFilter.DtEnd;
         }
+        private DateTime SelDtStart
+        {
+            get => SelFilter.DtStart;
+        }
 
         private string SelMacchina
         {
@@ -222,7 +226,7 @@ namespace MP.SPEC.Components
         private async Task reloadData(bool setChanged)
         {
             isLoading = true;
-            SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtRef, MaxRecord);
+            SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtStart, SelDtEnd);
             totalCount = SearchRecords.Count;
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             await Task.Delay(1);
diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor
index 06434455..769761eb 100644
--- a/MP.SPEC/Components/ParamsFilter.razor
+++ b/MP.SPEC/Components/ParamsFilter.razor
@@ -1,7 +1,6 @@
 <div class="d-flex justify-content-between">
     <div class="d-flex justify-content-between pt-1 mb-1">
         <div class="px-2">
-
             @if (!liveUpdate)
             {
                 <button class="btn btn-secondary" type="button" @onclick="() => toggleUpdate()" title="Click per tornare a Valori Live">
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs
index aff65476..4d00b75c 100644
--- a/MP.SPEC/Components/ParamsFilter.razor.cs
+++ b/MP.SPEC/Components/ParamsFilter.razor.cs
@@ -189,7 +189,7 @@ namespace MP.SPEC.Components
             // copio il filtro
             var currFilt = SelFilter;
             // fermo update
-            //currFilt.LiveUpdate = false;
+            currFilt.LiveUpdate = true;
             currFilt.CurrPage = 0;
             currFilt.lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
             currFilt.dtMax = RoundDatetime(5);
@@ -213,9 +213,8 @@ namespace MP.SPEC.Components
             // se non ho data rif uso adesso...
             DateTime dtMax = selDtMax == null ? RoundDatetime(5) : (DateTime)selDtMax;
             DateTime dtMin = selDtMin == null ? RoundDatetime(5).AddHours(-numOreAnticipoSnapshot) : (DateTime)selDtMin;
-            // aggiungo 2 sec
+            // aggiungo 15 sec
             dtMax = dtMax.AddSeconds(15);
-            //dtMin = dtMin.AddMinutes(-30);
             await MDService.DossiersTakeParamsSnapshotLast(selMacchina, dtMin, dtMax);
             lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
             // indico snapshot fatto
@@ -270,7 +269,7 @@ namespace MP.SPEC.Components
                     // copio il filtro
                     var currFilt = SelFilter;
                     // fermo update
-                    currFilt.LiveUpdate = false;
+                    currFilt.LiveUpdate = (value == null);
                     currFilt.CurrPage = 0;
                     currFilt.lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
                     currFilt.dtMax = value;
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index 54ba37e7..6a872982 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -341,16 +341,16 @@ namespace MP.SPEC.Data
         /// macchina (ordinato x data registrazione)
         /// </summary>
         /// <param name="IdxMacchina">* = tutte, altrimenti solo x una data macchina</param>
-        /// <param name="DtRef">Data di riferimento (Massima) per estrazione records</param>
-        /// <param name="MaxRec">numero massimo record da restituire</param>
+        /// <param name="DtStart">Data minima per estrazione records</param>
+        /// <param name="DtEnd">Data Massima per estrazione records</param>
         /// <returns></returns>
-        public async Task<List<Dossiers>> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtRef, int MaxRec)
+        public async Task<List<Dossiers>> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd)
         {
             List<Dossiers>? result = new List<Dossiers>();
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
             string readType = "DB";
-            string currKey = $"{redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtRef}:{MaxRec}";
+            string currKey = $"{redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtStart:yyyyMMddHHmm}:{DtEnd:yyyyMMddHHmm}";
             // cerco in redis dato valore sel macchina...
             RedisValue rawData = redisDb.StringGet(currKey);
             if (rawData.HasValue)
@@ -360,7 +360,7 @@ namespace MP.SPEC.Data
             }
             else
             {
-                result = await Task.FromResult(dbController.DossiersGetLastFilt(IdxMacchina, CodArticolo, DtRef, MaxRec));
+                result = await Task.FromResult(dbController.DossiersGetLastFilt(IdxMacchina, CodArticolo, DtStart, DtEnd));
                 // serializzo e salvo...
                 rawData = JsonConvert.SerializeObject(result);
                 redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache / 5));
diff --git a/MP.SPEC/Data/SelectDossierParams.cs b/MP.SPEC/Data/SelectDossierParams.cs
index 8e9b4d15..c743e535 100644
--- a/MP.SPEC/Data/SelectDossierParams.cs
+++ b/MP.SPEC/Data/SelectDossierParams.cs
@@ -15,7 +15,7 @@
 
         public DateTime DtEnd { get; set; } = InitDatetime(5);
 
-        public DateTime DtStart { get; set; } = InitDatetime(5).AddDays(-7);
+        public DateTime DtStart { get; set; } = InitDatetime(5).AddDays(-730);
 
         public string IdxMacchina { get; set; } = "*";
 
@@ -60,8 +60,6 @@
             if (CurrPage != item.CurrPage)
                 return false;
 
-            //if (lastUpdate != item.lastUpdate)
-            //    return false;
 
             return true;
         }
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index f7cd5bff..dd2fa825 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.1819</Version>
+    <Version>6.16.2210.1820</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/DOSS.razor b/MP.SPEC/Pages/DOSS.razor
index 5cbf93c3..3ce277cd 100644
--- a/MP.SPEC/Pages/DOSS.razor
+++ b/MP.SPEC/Pages/DOSS.razor
@@ -38,7 +38,7 @@
                                 <div class="col-3 pe-0">
                                     <div class="input-group input-group-sm">
                                         <span class="input-group-text" id="inputGroup-sizing-sm">DATA</span>
-                                        <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm"  @bind-value="@currDetFluxLogRecord.dtEvento">
+                                        <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.dtEvento">
                                     </div>
                                 </div>
                                 <div class="col-3 pe-0">
@@ -75,18 +75,16 @@
                 </div>
             </div>
         }
+        @if (isLoading)
+        {
+            <LoadingData></LoadingData>
+        }
+        else
+        {
+            <ListDossiers SelFilter="@currFilter" RecordSel="@selRecordDoss" RecordSelFlux="@selRecordFlux" TotRecordChanged="updateTotal"></ListDossiers>
+        }
+    </div>
+    <div class="card-footer py-1">
+        <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
     </div>
-    @if (isLoading)
-    {
-        <LoadingData></LoadingData>
-    }
-    else
-    {
-        <ListDossiers SelFilter="@currFilter" RecordSel="@selRecordDoss" RecordSelFlux="@selRecordFlux" TotRecordChanged="updateTotal"></ListDossiers>
-    }
 </div>
-<div class="card-footer py-1">
-    <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
-</div>
-
-
diff --git a/MP.SPEC/Pages/PARAMS.razor b/MP.SPEC/Pages/PARAMS.razor
index 8b4777f0..43c1c7b9 100644
--- a/MP.SPEC/Pages/PARAMS.razor
+++ b/MP.SPEC/Pages/PARAMS.razor
@@ -32,5 +32,3 @@
         <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
     </div>
 </div>
-
-
diff --git a/MP.SPEC/Pages/PARAMS.razor.cs b/MP.SPEC/Pages/PARAMS.razor.cs
index 8d05027f..e30c73ad 100644
--- a/MP.SPEC/Pages/PARAMS.razor.cs
+++ b/MP.SPEC/Pages/PARAMS.razor.cs
@@ -128,7 +128,7 @@ namespace MP.SPEC.Pages
             if (newParams.CurrPage == 0)
             {
                 newParams.CurrPage = 1;
-                newParams.LiveUpdate = false;
+                //newParams.LiveUpdate = false;
             }
             else
             {
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 8de38dd8..38873420 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.1819</h4>
+    <h4>Versione: 6.16.2210.1820</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 4782147c..57be2c69 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.1819
+6.16.2210.1820
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index eb0c777c..c55595cd 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.1819</version>
+  <version>6.16.2210.1820</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>