Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

MP-TAB-SERV/Components/ProdStopMan.razor

@@ -1,10 +1,10 @@
-<div class="p-2 col-4 col-sm-4 col-md-4 col-lg-2 ">
+<div class="p-2 col-3 col-sm-3 col-md-3 col-lg-2 flex-fill">
     <div class="@objCss text-center card w-100" @onclick="() => ReportSelected()">
         <div class="card-body text-light">
             <i class="@objIcon" style="font-size: 8vw"></i>
         </div>
-        <div class="card-footer text-center bg-dark text-light opacity-50">
-            <span class="text-nowrap text-center" style="font-size: .9rem;">@objTxt</span>
+        <div class="card-footer text-center h-100 bg-dark text-light opacity-50 p-1">
+            <span class=" text-center" style="font-size: .9rem;">@objTxt</span>
         </div>
     </div>
 </div>

MP-TAB-SERV/Pages/ProdStop.razor.cs

@@ -16,7 +16,7 @@ namespace MP_TAB_SERV.Pages
 
 
         /// <summary>
-        /// Determina se insert sia Realtime o batch con DataOra (in base a diff tra DataOra selezionata e realtime, se superiore ad X minuti NON è realtime)
+        /// Determina se insert sia Realtime o batch con DataOra (in base a diff tra DataOra selezionata e realtime, se superiore ad X minuti NON � realtime)
         /// </summary>
         public bool insRealtime
         {
@@ -102,7 +102,7 @@ namespace MP_TAB_SERV.Pages
                         { }
                         // update commento!
                         commento = string.Format("999 - Dich StartEvt: {0} [{1}]", evento, codRich);
-                        // recupero data/ora evento da inserire (quella selezionata) ed AGGIUNGO 1 sec!!! così rimane traccia
+                        // recupero data/ora evento da inserire (quella selezionata) ed AGGIUNGO 1 sec!!! cos� rimane traccia
                         DataLayerObj.scriviRigaEventoBarcode(idxMacchina, IdxEv, rigaStato.CodArticolo, commento, DataLayerObj.MatrOpr, rigaStato.pallet, dataOraEv.AddSeconds(1), DateTime.Now);
                         // eseguo ricalcolo!
                         DateTime startRicalcolo = dataOraEv.AddMinutes(memLayer.ML.CRI("minAnticipoRicalcolo"));
@@ -184,6 +184,11 @@ namespace MP_TAB_SERV.Pages
                 {
                     CurrMSE = await MsgServ.GetMachineMse(IdxMacc);
                 }
+                var eventsAll = await TabSrv.AnagEventiGetAll(IdxMacc);
+                if (eventsAll != null)
+                {
+                    events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.Label).ToList();
+                }
             }
 
             var eventsAll = await TabSrv.AnagEventiGetAll();

MP.Data/Controllers/MpTabController.cs

@@ -6,6 +6,7 @@ using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace MP.Data.Controllers
 {
@@ -27,15 +28,19 @@ namespace MP.Data.Controllers
         /// Restituisce l'anagrafica EVENTI per intero
         /// </summary>
         /// <returns></returns>
-        public List<AnagEventiModel> AnagEventiGetAll()
+        public List<AnagEventiModel> AnagEventiGetAll(string IdxMac)
         {
             List<AnagEventiModel> dbResult = new List<AnagEventiModel>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
+                var IdxMacch = new SqlParameter("@idxMacchina", IdxMac);
+
                 dbResult = dbCtx
-                            .DbSetAnagEventi
-                            .AsNoTracking()
-                            .ToList();
+                           .DbSetAnagEventi
+                           .FromSqlRaw("exec dbo.stp_vseb_getByIdxMacchinaFull @idxMacchina", IdxMacch)
+                           .AsNoTracking()
+                           .AsEnumerable()
+                           .ToList();
             }
             return dbResult;
         }

MP.Data/DatabaseModels/AnagEventiModel.cs

@@ -13,12 +13,8 @@ namespace MP.Data.DatabaseModels
     {
         [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int IdxTipo { get; set; } = 0;
-        public string Nome { get; set; } = "";
-        public string TabAzione { get; set; } = "";
-        public string Azione { get; set; } = "";
-        public string KeyEvento { get; set; } = "";
+        public string Label { get; set; } = "";
         public bool EventoTablet { get; set; } = true;
-        public string NoteEvento { get; set; } = "";
         public string CssClass { get; set; } = "";
         public string Icon { get; set; } = "";
     }

MP.Data/Services/TabDataService.cs

@@ -106,7 +106,7 @@ namespace MP.Data.Services
             sw.Start();
             List<AnagEventiModel>? result = new List<AnagEventiModel>();
             // cerco in redis...
-            string currKey = $"{redisBaseKey}:AnagEventi";
+            string currKey = $"{redisBaseKey}:AnagEventi:{IdxMacch}";
             RedisValue rawData = await redisDb.StringGetAsync(currKey);
             if (!string.IsNullOrEmpty($"{rawData}"))
             {
@@ -115,7 +115,7 @@ namespace MP.Data.Services
             }
             else
             {
-                result = dbTabController.AnagEventiGetAll();
+                result = dbTabController.AnagEventiGetAll(IdxMacch);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
                 await redisDb.StringSetAsync(currKey, rawData, LongCache);