From 2a1602c5b9ef95b047788c1ca364eef35812b8f1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 Oct 2022 16:33:48 +0200
Subject: [PATCH 1/2] Update metodi dossier

---
 MP.SPEC/Components/DossiersFilter.razor | 19 ++++++-------------
 MP.SPEC/Data/MpDataService.cs           | 19 +++++++++----------
 MP.SPEC/Data/SelectDossierParams.cs     |  4 ++--
 MP.SPEC/Data/SelectOdlParams.cs         |  2 +-
 MP.SPEC/MP.SPEC.csproj                  |  2 +-
 MP.SPEC/Pages/ODL.razor.cs              |  2 +-
 MP.SPEC/Resources/ChangeLog.html        |  2 +-
 MP.SPEC/Resources/VersNum.txt           |  2 +-
 MP.SPEC/Resources/manifest.xml          |  2 +-
 9 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor
index 7a6a8689..df7df4c3 100644
--- a/MP.SPEC/Components/DossiersFilter.razor
+++ b/MP.SPEC/Components/DossiersFilter.razor
@@ -11,6 +11,9 @@
             <div>
                 Seleziona i filtri per:
             </div>
+            <div class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Articolo</label>
+            </div>
             <div class="input-group p-2">
                 <label class="input-group-text" for="macchina" title="Selezionare l'articolo"><i class="fa-solid fa-file"></i></label>
                 <select @bind="@selArticolo" class="form-select" id="macchina" title="Selezionare la macchina">
@@ -24,6 +27,9 @@
                     }
                 </select>
             </div>
+            <div class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Macchina</label>
+            </div>
             <div class="input-group p-2">
                 <label class="input-group-text" for="macchina" title="Selezionare la macchina"><i class="fa-solid fa-hard-drive"></i></label>
                 <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare la macchina">
@@ -52,19 +58,6 @@
                 <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>
-            <div class="input-group p-2">
-                <label class="input-group-text" for="maxRecord" title="Selezionare il numero massimo di record da visualizzare"><i class="fa-solid fa-list-ol"></i></label>
-                <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Selezionare il numero massimo di record da visualizzare">
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="250">250</option>
-                    <option value="500">500</option>
-                </select>
-            </div>*@
         </div>
     </div>
 </div>
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index f0b9eaf8..11e118f8 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -388,11 +388,10 @@ namespace MP.SPEC.Data
             await Task.Delay(1);
             // chiamo stored x salvare parametri
             dbController.DossiersTakeParamsSnapshot(IdxMacchina, MaxSec, DtRif);
-            // svuoto cache redis x macchina
-            string currKey = $"{redisDossByMac}:{IdxMacchina}";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
-            currKey = $"{redisDossByMac}:*";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
+            // elimino cache redis...
+            RedisValue pattern = new RedisValue($"{redisDossByMac}:*");
+            answ = await ExecFlushRedisPattern(pattern);
+            Log.Info($"Svuotata cache dossier | {pattern}");
             return answ;
         }
 
@@ -407,13 +406,13 @@ namespace MP.SPEC.Data
         {
             bool answ = false;
             await Task.Delay(1);
+            Log.Info($"Richiesta snapshot per macchina {IdxMacchina} | periodo {dtMin} --> {dtMax}");
             // chiamo stored x salvare parametri
             dbController.DossiersTakeParamsSnapshotLast(IdxMacchina, dtMin, dtMax);
-            // svuoto cache redis x macchina
-            string currKey = $"{redisDossByMac}:{IdxMacchina}";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
-            currKey = $"{redisDossByMac}:*";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
+            // elimino cache redis...
+            RedisValue pattern = new RedisValue($"{redisDossByMac}:*");
+            answ = await ExecFlushRedisPattern(pattern);
+            Log.Info($"Svuotata cache dossier | {pattern}");
             return answ;
         }
 
diff --git a/MP.SPEC/Data/SelectDossierParams.cs b/MP.SPEC/Data/SelectDossierParams.cs
index 4ffac42b..e3db1ea0 100644
--- a/MP.SPEC/Data/SelectDossierParams.cs
+++ b/MP.SPEC/Data/SelectDossierParams.cs
@@ -15,9 +15,9 @@ namespace MP.SPEC.Data
 
         public int CurrPage { get; set; } = 1;
 
-        public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 5);
+        public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 15);
 
-        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-730);
+        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 15).AddDays(-730);
 
         public string IdxMacchina { get; set; } = "*";
 
diff --git a/MP.SPEC/Data/SelectOdlParams.cs b/MP.SPEC/Data/SelectOdlParams.cs
index f9c089dd..87f4defe 100644
--- a/MP.SPEC/Data/SelectOdlParams.cs
+++ b/MP.SPEC/Data/SelectOdlParams.cs
@@ -19,7 +19,7 @@ namespace MP.SPEC.Data
         public int NumRec { get; set; } = 10;
         public int TotCount { get; set; } = 0;
         public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 5);
-        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-7);
+        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-10);
         public int MaxRecord { get; set; } = 100;
         public bool IsActive { get; set; } = true;
         public string SearchVal { get; set; } = "*";
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 048240b5..df742d8d 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.2014</Version>
+    <Version>6.16.2210.2016</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs
index 432543ee..a29dcdd0 100644
--- a/MP.SPEC/Pages/ODL.razor.cs
+++ b/MP.SPEC/Pages/ODL.razor.cs
@@ -100,7 +100,7 @@ namespace MP.SPEC.Pages
         {
             // copio il filtro
             currFilter.DtEnd = RoundDatetime(5);
-            currFilter.DtStart = RoundDatetime(5).AddDays(-1);
+            currFilter.DtStart = RoundDatetime(5).AddDays(-10);
         }
 
         protected void UpdateTotCount(int newTotCount)
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 7340bae7..5f180bf9 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.2014</h4>
+    <h4>Versione: 6.16.2210.2016</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index e162c512..29c80e49 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.2014
+6.16.2210.2016
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index e20c57d4..e270f9ff 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.2014</version>
+  <version>6.16.2210.2016</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 d78c2d317300e11a4a85911712b49d081b17c1c0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 Oct 2022 16:52:47 +0200
Subject: [PATCH 2/2] Fix ricerca articoli

---
 MP.Data/Controllers/MpSpecController.cs | 10 ++++-----
 MP.SPEC/Data/MpDataService.cs           | 29 ++++++++++++++++++++++++-
 MP.SPEC/Pages/Articoli.razor.cs         |  2 +-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 535274d2..5c169377 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -183,11 +183,11 @@ namespace MP.Data.Controllers
             {
                 dbResult = dbCtx
                 .DbSetArticoli
-                .AsNoTracking()
-                .Where(x => (x.Azienda == azienda || azienda == "*") && (x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)))
-                .OrderBy(x => x.CodArticolo)
-                .Take(numRecord)
-                .ToList();
+                    .AsNoTracking()
+                    .Where(x => (x.Azienda == azienda || azienda == "*") && (x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)))
+                    .OrderBy(x => x.CodArticolo)
+                    .Take(numRecord)
+                    .ToList();
             }
             return dbResult;
         }
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index 11e118f8..12805cc6 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -180,7 +180,33 @@ namespace MP.SPEC.Data
         /// <returns></returns>
         public async Task<List<AnagArticoli>> ArticoliGetSearch(int numRecord, string azienda, string searchVal)
         {
-            return await Task.FromResult(dbController.ArticoliGetSearch(numRecord, azienda, searchVal));
+            List<AnagArticoli> result = new List<AnagArticoli>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            string readType = "DB";
+            string currKey = $"{redisArtList}:{azienda}";
+            // cerco in redis dato valore sel macchina...
+            RedisValue rawData = redisDb.StringGet(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<AnagArticoli>>($"{rawData}");
+                readType = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.ArticoliGetSearch(numRecord, azienda, searchVal));
+                // serializzo e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache/5));
+            }
+            if (result == null)
+            {
+                result = new List<AnagArticoli>();
+            }
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Debug($"ArticoliGetSearch | Read from {readType}: {ts.TotalMilliseconds}ms");
+            return result;
         }
 
         /// <summary>
@@ -920,6 +946,7 @@ namespace MP.SPEC.Data
         #region Private Fields
 
         private const string redisArtByDossier = redisBaseAddr + "SPEC:Cache:ArtByDossier";
+        private const string redisArtList = redisBaseAddr + "SPEC:Cache:ArtList";
         private const string redisBaseAddr = "MP:";
 
         private const string redisConfKey = redisBaseAddr + "SPEC:Cache:Config";
diff --git a/MP.SPEC/Pages/Articoli.razor.cs b/MP.SPEC/Pages/Articoli.razor.cs
index fec8a210..ffb568d3 100644
--- a/MP.SPEC/Pages/Articoli.razor.cs
+++ b/MP.SPEC/Pages/Articoli.razor.cs
@@ -290,7 +290,7 @@ namespace MP.SPEC.Pages
         private async Task reloadData()
         {
             isLoading = true;
-            SearchRecords = await MDService.ArticoliGetSearch(100000, selAzienda, "*");
+            SearchRecords = await MDService.ArticoliGetSearch(100000, selAzienda, "");
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             isLoading = false;
         }