From e70d2b191561b1b691e8dacf2ce7b155fb4dca59 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 24 Feb 2026 17:50:28 +0100
Subject: [PATCH] Aggiunto display stato MSE

---
 MP.SPEC/Components/ListMacc.razor    |   6 +-
 MP.SPEC/Components/ListMacc.razor.cs |  44 ++++++-
 MP.SPEC/Data/MpDataService.cs        | 181 ++++++++++++++++-----------
 MP.SPEC/MP.SPEC.csproj               |   2 +-
 MP.SPEC/Pages/RepStop.razor          |   2 +-
 MP.SPEC/Pages/RepStop.razor.cs       |  12 +-
 MP.SPEC/Resources/ChangeLog.html     |   2 +-
 MP.SPEC/Resources/VersNum.txt        |   2 +-
 MP.SPEC/Resources/manifest.xml       |   2 +-
 9 files changed, 168 insertions(+), 85 deletions(-)

diff --git a/MP.SPEC/Components/ListMacc.razor b/MP.SPEC/Components/ListMacc.razor
index c1b23165..cb1a9aac 100644
--- a/MP.SPEC/Components/ListMacc.razor
+++ b/MP.SPEC/Components/ListMacc.razor
@@ -16,7 +16,7 @@
         </div>
     </div>
     <div class="card-body">
-        @if (ListRecords == null || ListRecords.Count==0)
+        @if (ListRecords == null || ListRecords.Count == 0)
         {
             <div class="alert alert-warning fs-3">Nessun Record Trovato</div>
         }
@@ -59,9 +59,9 @@
                                 }
                             </td>
                             <td>@record.CodMacchina</td>
-                            <td>@record.Descrizione</td>
+                            <td>@record.Nome</td>
                             <td>
-                                <span class="badge text-bg-info bg-opacity-50">Stato: TBD</span>
+                                <span class="rounded bg-opacity-75 p-1 @cssClassBorder(record.Semaforo)">@record.DescrizioneStato</span>
                             </td>
                         </tr>
                     }
diff --git a/MP.SPEC/Components/ListMacc.razor.cs b/MP.SPEC/Components/ListMacc.razor.cs
index 3be9f83d..1b7b9696 100644
--- a/MP.SPEC/Components/ListMacc.razor.cs
+++ b/MP.SPEC/Components/ListMacc.razor.cs
@@ -8,7 +8,7 @@ namespace MP.SPEC.Components
         #region Public Properties
 
         [Parameter]
-        public List<MacchineModel> ListMSE { get; set; } = null!;
+        public List<MappaStatoExplModel> ListMSE { get; set; } = null!;
 
 
         [Parameter]
@@ -35,7 +35,7 @@ namespace MP.SPEC.Components
 
         #region Protected Methods
 
-        protected string CheckSelect(MacchineModel currRec)
+        protected string CheckSelect(MappaStatoExplModel currRec)
         {
             string answ = "";
             if (CurrList.Contains(currRec.CodMacchina))
@@ -45,6 +45,44 @@ namespace MP.SPEC.Components
             return answ;
         }
 
+        /// <summary>
+        /// CSS Class bordo da stato macchina
+        /// </summary>
+        protected string cssClassBorder(string semaforo)
+        {
+            string answ = "";
+            if (!string.IsNullOrEmpty(semaforo))
+            {
+                switch (semaforo)
+                {
+                    case "sGi":
+                        answ += " text-bg-warning";
+                        break;
+
+                    case "sRo":
+                        answ += " text-bg-danger";
+                        break;
+
+                    case "sGr":
+                        answ += " text-bg-dark";
+                        break;
+
+                    case "sBl":
+                        answ += " text-bg-rimary";
+                        break;
+
+                    case "sVe":
+                        answ += " text-bg-success";
+                        break;
+
+                    default:
+                        answ += " text-bg-secondary";
+                        break;
+                }
+            }
+            return answ;
+        }
+
         protected override async Task OnParametersSetAsync()
         {
             totalCount = ListMSE.Count();
@@ -115,7 +153,7 @@ namespace MP.SPEC.Components
         private int currPage = 1;
         private bool isLoading = false;
 
-        private List<MacchineModel> ListRecords = new();
+        private List<MappaStatoExplModel> ListRecords = new();
         private int numRecord = 10;
         private int totalCount = 0;
 
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index 7da30c24..4629e0db 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -10,6 +10,7 @@ using MP.Data.Controllers;
 using MP.Data.DbModels;
 using MP.Data.MgModels;
 using MP.Data.Services;
+using MP.SPEC.Components.ProdKit;
 using Newtonsoft.Json;
 using NLog;
 using StackExchange.Redis;
@@ -161,43 +162,6 @@ namespace MP.SPEC.Data
             return result;
         }
 
-        /// <summary>
-        /// Elenco EVENTI validi x macchina
-        /// </summary>
-        /// <returns></returns>
-        public List<vSelEventiBCodeModel> AnagEventiGetByMacch(string IdxMacch)
-        {
-            using var activity = ActivitySource.StartActivity("AnagEventiGetByMacch");
-            string source = "DB";
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
-            List<vSelEventiBCodeModel>? result = new List<vSelEventiBCodeModel>();
-            // cerco in redisConn...
-            string currKey = $"{Utils.redisEventList}:VSEB:{IdxMacch}";
-            RedisValue rawData = redisDb.StringGet(currKey);
-            if (rawData.HasValue)
-            {
-                result = JsonConvert.DeserializeObject<List<vSelEventiBCodeModel>>($"{rawData}");
-                source = "REDIS";
-            }
-            else
-            {
-                result = dbController.AnagEventiGetByMacc(IdxMacch);
-                // serializzo e salvo...
-                rawData = JsonConvert.SerializeObject(result);
-                redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache));
-            }
-            if (result == null)
-            {
-                result = new List<vSelEventiBCodeModel>();
-            }
-            sw.Stop();
-            Log.Debug($"AnagEventiGetByMacch | {source} | {sw.Elapsed.TotalMilliseconds}ms");
-            activity?.SetTag("data.source", source);
-            activity?.SetTag("result.count", result.Count);
-            return result;
-        }
-
         /// <summary>
         /// Elenco EVENTI validi x ogni macchina secondo conf standard macchina
         /// </summary>
@@ -235,6 +199,43 @@ namespace MP.SPEC.Data
             return result;
         }
 
+        /// <summary>
+        /// Elenco EVENTI validi x macchina
+        /// </summary>
+        /// <returns></returns>
+        public List<vSelEventiBCodeModel> AnagEventiGetByMacch(string IdxMacch)
+        {
+            using var activity = ActivitySource.StartActivity("AnagEventiGetByMacch");
+            string source = "DB";
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
+            List<vSelEventiBCodeModel>? result = new List<vSelEventiBCodeModel>();
+            // cerco in redisConn...
+            string currKey = $"{Utils.redisEventList}:VSEB:{IdxMacch}";
+            RedisValue rawData = redisDb.StringGet(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<vSelEventiBCodeModel>>($"{rawData}");
+                source = "REDIS";
+            }
+            else
+            {
+                result = dbController.AnagEventiGetByMacc(IdxMacch);
+                // serializzo e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache));
+            }
+            if (result == null)
+            {
+                result = new List<vSelEventiBCodeModel>();
+            }
+            sw.Stop();
+            Log.Debug($"AnagEventiGetByMacch | {source} | {sw.Elapsed.TotalMilliseconds}ms");
+            activity?.SetTag("data.source", source);
+            activity?.SetTag("result.count", result.Count);
+            return result;
+        }
+
         /// <summary>
         /// Delete record AnagraficaGruppi
         /// </summary>
@@ -278,11 +279,6 @@ namespace MP.SPEC.Data
             return result;
         }
 
-        /// <summary>
-        /// Oggetto per collezione dati Activity (span in Uptrace)
-        /// </summary>
-        private static readonly ActivitySource ActivitySource = new ActivitySource("MP.DATA.Tracer");
-
         /// <summary>
         /// Elenco Gruppi
         /// </summary>
@@ -1403,14 +1399,6 @@ namespace MP.SPEC.Data
             activity?.SetTag("data.source", "DB+REDIS");
             return result;
         }
-        /// <summary>
-        /// Reset macchine e gruppi
-        /// </summary>
-        private void ResetMacGrpCache()
-        {
-            ExecFlushRedisPattern($"{Utils.redisAnagGruppi}:*");
-            ExecFlushRedisPattern($"{Utils.redisMacList}:*");
-        }
 
         /// <summary>
         /// Eliminazione di un record operatore dal gruppo
@@ -1454,15 +1442,6 @@ namespace MP.SPEC.Data
             return result;
         }
 
-        /// <summary>
-        /// Reset cache operatori e gruppi
-        /// </summary>
-        private void ResetOprGrpCache()
-        {
-            ExecFlushRedisPattern($"{Utils.redisAnagGruppi}:*");
-            ExecFlushRedisPattern($"{Utils.redisOprList}:*");
-        }
-
         /// <summary>
         /// Init ricetta
         /// </summary>
@@ -1906,6 +1885,43 @@ namespace MP.SPEC.Data
             return answ;
         }
 
+        /// <summary>
+        /// Elenco MSE stato amcchine
+        /// </summary>
+        /// <param name="forceDb"></param>
+        /// <returns></returns>
+        public async Task<List<MappaStatoExplModel>> MseGetAll(bool forceDb = false)
+        {
+            using var activity = ActivitySource.StartActivity("MseGetAll");
+            Stopwatch sw = new Stopwatch();
+            string source = "DB";
+            sw.Start();
+            List<MappaStatoExplModel>? result = new List<MappaStatoExplModel>();
+            // cerco in redisConn...
+            RedisValue rawData = redisDb.StringGet(Constants.redisMseKey);
+            if (rawData.HasValue && !forceDb)
+            {
+                result = JsonConvert.DeserializeObject<List<MappaStatoExplModel>>($"{rawData}");
+                source = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.MseGetAll(2000));
+                // serializzp e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(Constants.redisMseKey, rawData, TimeSpan.FromSeconds(1));
+            }
+            if (result == null)
+            {
+                result = new List<MappaStatoExplModel>();
+            }
+            sw.Stop();
+            Log.Debug($"MseGetAll | {source} | {sw.Elapsed.TotalMilliseconds}ms");
+            activity?.SetTag("data.source", source);
+            activity?.SetTag("result.count", result.Count);
+            return result;
+        }
+
         /// <summary>
         /// Invio notifica rilettura (con parametro)
         /// </summary>
@@ -2999,18 +3015,6 @@ namespace MP.SPEC.Data
             return fatto;
         }
 
-        /// <summary>
-        /// Svuota cache creazione KIT
-        /// </summary>
-        private void EmptyWipCache()
-        {
-            string pattern = $"{Utils.redisKitWip}:*";
-            if (!string.IsNullOrEmpty(pattern))
-            {
-                ExecFlushRedisPattern(pattern);
-            }
-        }
-
         /// <summary>
         /// Elenco Template KIT da ricerca
         /// </summary>
@@ -3158,6 +3162,11 @@ namespace MP.SPEC.Data
 
         #region Private Fields
 
+        /// <summary>
+        /// Oggetto per collezione dati Activity (span in Uptrace)
+        /// </summary>
+        private static readonly ActivitySource ActivitySource = new ActivitySource("MP.DATA.Tracer");
+
         private static IConfiguration _configuration = null!;
 
         private static ILogger<MpDataService> _logger = null!;
@@ -3203,6 +3212,18 @@ namespace MP.SPEC.Data
 
         #region Private Methods
 
+        /// <summary>
+        /// Svuota cache creazione KIT
+        /// </summary>
+        private void EmptyWipCache()
+        {
+            string pattern = $"{Utils.redisKitWip}:*";
+            if (!string.IsNullOrEmpty(pattern))
+            {
+                ExecFlushRedisPattern(pattern);
+            }
+        }
+
         private async Task<bool> POdlFlushCache()
         {
             using var activity = ActivitySource.StartActivity("POdlFlushCache");
@@ -3244,6 +3265,24 @@ namespace MP.SPEC.Data
             activity?.SetTag("data.source", "REDIS");
         }
 
+        /// <summary>
+        /// Reset macchine e gruppi
+        /// </summary>
+        private void ResetMacGrpCache()
+        {
+            ExecFlushRedisPattern($"{Utils.redisAnagGruppi}:*");
+            ExecFlushRedisPattern($"{Utils.redisMacList}:*");
+        }
+
+        /// <summary>
+        /// Reset cache operatori e gruppi
+        /// </summary>
+        private void ResetOprGrpCache()
+        {
+            ExecFlushRedisPattern($"{Utils.redisAnagGruppi}:*");
+            ExecFlushRedisPattern($"{Utils.redisOprList}:*");
+        }
+
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 7d653d3f..45f53f1b 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.2602.2416</Version>
+    <Version>6.16.2602.2417</Version>
     <UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
diff --git a/MP.SPEC/Pages/RepStop.razor b/MP.SPEC/Pages/RepStop.razor
index 3f5d58e2..98ee38e8 100644
--- a/MP.SPEC/Pages/RepStop.razor
+++ b/MP.SPEC/Pages/RepStop.razor
@@ -24,7 +24,7 @@
         {
             <div class="row">
                 <div class="col-5">
-                    <ListMacc ListMSE="@SearchMacchine" EC_Selected="CheckSelection"></ListMacc>
+                    <ListMacc ListMSE="CurrMSE" EC_Selected="CheckSelection"></ListMacc>
                 </div>
                 <div class="col-7">
                     @if (showFermate)
diff --git a/MP.SPEC/Pages/RepStop.razor.cs b/MP.SPEC/Pages/RepStop.razor.cs
index 473ee56f..c80dccc8 100644
--- a/MP.SPEC/Pages/RepStop.razor.cs
+++ b/MP.SPEC/Pages/RepStop.razor.cs
@@ -19,11 +19,14 @@ namespace MP.SPEC.Pages
 
         #region Protected Methods
 
-        protected override void OnInitialized()
+        protected override async Task OnInitializedAsync()
         {
+#if false
             var rawList = MDService.MacchineGetFilt("*");
             // prendo solo macchine VALIDE
-            SearchMacchine = rawList.Where(x => !string.IsNullOrEmpty(x.locazione)).ToList();
+            SearchMacchine = rawList.Where(x => !string.IsNullOrEmpty(x.locazione)).ToList(); 
+#endif
+            CurrMSE = await MDService.MseGetAll(false);
             SearchFermate = MDService.AnagEventiGeneral();
         }
 
@@ -34,7 +37,10 @@ namespace MP.SPEC.Pages
         private bool isLoading = false;
         private bool showFermate = false;
 
-        private List<MacchineModel> SearchMacchine = new();
+#if false
+        private List<MacchineModel> SearchMacchine = new(); 
+#endif
+        private List<MappaStatoExplModel> CurrMSE = new();
         List<vSelEventiBCodeModel> SearchFermate = new();
 
         #endregion Private Fields
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 6a51e69a..c370e1e9 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.2602.2416</h4>
+    <h4>Versione: 6.16.2602.2417</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 26913b83..090c7a27 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2602.2416
+6.16.2602.2417
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 8ad48abd..b6f5fc18 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.2602.2416</version>
+  <version>6.16.2602.2417</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>