Aggiunta filtro per articolo

+ fix lettura da redis dossiers

MP.Data/Controllers/MpSpecController.cs

@@ -535,6 +535,25 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Elenco codice articoli che abbiano dati Dossier
+        /// </summary>
+        /// <returns></returns>
+        public List<string> ArticleWithDossier()
+        {
+            List<string> dbResult = new List<string>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetDossiers
+                .AsNoTracking()
+                .Select(i => i.OdlNav.CodArticolo)
+                .Distinct()
+                .ToList();
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco da tabella MappaStatoExpl
         /// </summary>

MP.SPEC/Components/DossiersFilter.razor

@@ -5,7 +5,17 @@
     <div class="px-0 col-8">
         <div class="d-flex px-0 py-1">
             <div class="px-2 input-group">
-                ...filtro ART
+                <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">
+                    <option value="*">--- Tutti ---</option>
+                    @if (ListArticoli != null)
+                    {
+                        foreach (var item in ListArticoli)
+                        {
+                            <option value="@item">@item</option>
+                        }
+                    }
+                </select>
                 <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">
                     <option value="*">--- Tutti ---</option>
@@ -17,6 +27,7 @@
                         }
                     }
                 </select>
+                
                 <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>

MP.SPEC/Components/DossiersFilter.razor.cs

@@ -102,6 +102,7 @@ namespace MP.SPEC.Components
         {
             SelFilterDossier = new SelectDossierParams();
             ListMacchine = await MDService.MacchineWithFlux();
+            ListArticoli = await MDService.ArticleWithDossier();
 #if false
             ListDossier = await MDService.DossiersGetLastFilt(selMacchina, selArticolo, selDtRef, selMaxRecord); 
 #endif
@@ -117,11 +118,13 @@ namespace MP.SPEC.Components
 
         #region Private Fields
 
-#if fase
+#if false
         private List<Dossiers>? ListDossier = null; 
 #endif
         private List<string>? ListMacchine = null;
 
+        private List<string>? ListArticoli = null;
+
         #endregion Private Fields
 
         #region Private Properties

MP.SPEC/Data/MpDataService.cs

@@ -314,7 +314,6 @@ namespace MP.SPEC.Data
         /// macchina (ordinato x data registrazione)
         /// </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 estrazione records</param>
         /// <param name="MaxRec">numero massimo record da restituire</param>
         /// <returns></returns>
@@ -324,7 +323,7 @@ namespace MP.SPEC.Data
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
             string readType = "DB";
-            string currKey = $"{redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtRef:yyyy/MM/dd HH:mm:ss}:{MaxRec}";
+            string currKey = $"{redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtRef}:{MaxRec}";
             // cerco in redis dato valore sel macchina...
             RedisValue rawData = redisDb.StringGet(currKey);
             if (rawData.HasValue)
@@ -560,6 +559,42 @@ namespace MP.SPEC.Data
             return result;
         }
 
+
+        /// <summary>
+        /// Elenco Codice articolo con dati dossier gestiti
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<string>> ArticleWithDossier()
+        {
+            List<string>? result = new List<string>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            string readType = "DB";
+            string currKey = redisArtByDossier;
+            // cerco in redis dato valore sel macchina...
+            RedisValue rawData = redisDb.StringGet(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<string>>($"{rawData}");
+                readType = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.ArticleWithDossier());
+                // serializzp e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache));
+            }
+            if (result == null)
+            {
+                result = new List<string>();
+            }
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Debug($"ArticleWithDossier | Read from {readType}: {ts.TotalMilliseconds}ms");
+            return result;
+        }
+
         /// <summary>
         /// Elenco di tutti i parametri filtrati x macchina
         /// </summary>
@@ -651,6 +686,8 @@ namespace MP.SPEC.Data
 
         private const string redisMacByFlux = redisBaseAddr + "SPEC:Cache:MacByFlux";
 
+        private const string redisArtByDossier = redisBaseAddr + "SPEC:Cache:ArtByDossier";
+
         private const string redisMacList = redisBaseAddr + "SPEC:Cache:MacList";
 
         private const string redisStatoCom = redisBaseAddr + "SPEC:Cache:StatoCom";

MP.SPEC/MP.SPEC.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2210.514</Version>
+    <Version>6.16.2210.515</Version>
   </PropertyGroup>
 
   <ItemGroup>

MP.SPEC/Pages/DOSS.razor

@@ -14,6 +14,7 @@
                 }
                 else
                 {
+                    
                     <DossiersFilter FilterChanged="updateFilter"></DossiersFilter>
                 }
             </div>

MP.SPEC/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2210.514</h4>
+    <h4>Versione: 6.16.2210.515</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.SPEC/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2210.514
+6.16.2210.515

MP.SPEC/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2210.514</version>
+  <version>6.16.2210.515</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>