Merge branch 'Release/UpdateDuplicaDossier'

+ refresh dopo creazione dossier

.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# CS8765: Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes).
+dotnet_diagnostic.CS8765.severity = none

MP-SPEC.sln

@@ -7,6 +7,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.SPEC", "MP.SPEC\MP.SPEC.csproj", "{C777A098-6F91-45AF-A85E-0AD08CBCAC52}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1B6A7550-F6C9-468E-B3B4-C30FF6FE8933}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

MP.Data/Controllers/MpSpecController.cs

@@ -6,7 +6,6 @@ using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 
 namespace MP.Data.Controllers
@@ -99,6 +98,25 @@ namespace MP.Data.Controllers
             return ListValuesFilt("AnagArticoli", "Tipo");
         }
 
+        /// <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.CodArticolo)
+                .Distinct()
+                .ToList();
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Eliminazione Record
         /// </summary>
@@ -165,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;
         }
@@ -192,26 +210,6 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
-        /// <summary>
-        /// Statistiche ODL calcolate (da stored stp_STAT_ODL)
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<StatODLModel>> StatOdl(int IdxOdl)
-        {
-            List<StatODLModel> dbResult = new List<StatODLModel>();
-            using (var dbCtx = new MoonProContext(_configuration))
-            {
-                var IdxODL = new SqlParameter("@IdxODL", IdxOdl);
-
-                dbResult = await dbCtx
-                    .DbSetStatOdl
-                    .FromSqlRaw("EXEC stp_STAT_ODL @IdxODL", IdxODL)
-                    .AsNoTracking()
-                    .ToListAsync();
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Update Record
         /// </summary>
@@ -304,7 +302,7 @@ namespace MP.Data.Controllers
         /// </summary>
         /// <param name="currRec">record dossier da eliminare</param>
         /// <returns></returns>
-        public async Task<bool> DossiersDeleteRecord(Dossiers currRec)
+        public async Task<bool> DossiersDeleteRecord(DossierModel currRec)
         {
             bool answ = false;
             using (var dbCtx = new MoonProContext(_configuration))
@@ -335,28 +333,53 @@ 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<DossierModel> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd)
         {
-            List<Dossiers> dbResult = new List<Dossiers>();
+            List<DossierModel> dbResult = new List<DossierModel>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 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.CodArticolo == CodArticolo) && (x.DtRif >= DtStart && x.DtRif <= DtEnd))
                             .Include(m => m.MachineNav)
-                            .Include(o => o.OdlNav)
-                            .Include(a => a.OdlNav.ArticoloNav)
+                            //.Include(o => o.OdlNav)
+                            .Include(a => a.ArticoloNav)
                             .OrderByDescending(x => x.DtRif)
-                            .Take(MaxRec)
                             .ToList();
             }
             return dbResult;
         }
 
+        /// <summary>
+        /// insert di un record Dossier
+        /// </summary>
+        /// <param name="editRec">record dossier da modificare</param>
+        /// <returns></returns>
+        public async Task<bool> DossiersInsert(DossierModel newRec)
+        {
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    dbCtx
+                        .DbSetDossiers
+                        .Add(newRec);
+                    await dbCtx.SaveChangesAsync();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante DossiersInsert{Environment.NewLine}{exc}");
+                }
+            }
+            return fatto;
+        }
+
         /// <summary>
         /// Effettua salvataggio snapshot parametri (con stored) + svuota eventuale cache redis
         /// </summary>
@@ -404,11 +427,11 @@ namespace MP.Data.Controllers
         }
 
         /// <summary>
-        /// Update ddel campo VALORE di un dossier (che contiene json flux log serializzati)
+        /// Update del campo VALORE di un dossier (che contiene json flux log serializzati)
         /// </summary>
         /// <param name="editRec">record dossier da modificare</param>
         /// <returns></returns>
-        public async Task<bool> DossiersUpdateValore(Dossiers editRec)
+        public async Task<bool> DossiersUpdateValore(DossierModel editRec)
         {
             bool fatto = false;
             using (var dbCtx = new MoonProContext(_configuration))
@@ -421,7 +444,7 @@ namespace MP.Data.Controllers
                                     .FirstOrDefault();
                     if (currRec != null)
                     {
-                        currRec.Valore= editRec.Valore;
+                        currRec.Valore = editRec.Valore;
                         dbCtx.Entry(currRec).State = EntityState.Modified;
                     }
                     else
@@ -440,6 +463,7 @@ namespace MP.Data.Controllers
             }
             return fatto;
         }
+
         /// <summary>
         /// Elenco valori link (x home e navMenu laterale)
         /// </summary>
@@ -449,6 +473,32 @@ namespace MP.Data.Controllers
             return ListLinkFilt("SpecLink");
         }
 
+        /// <summary>
+        /// Aggiunta record EventList
+        /// </summary>
+        /// <param name="newRec"></param>
+        /// <returns></returns>
+        public async Task<bool> EvListInsert(EventListModel newRec)
+        {
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var currRec = dbCtx
+                                    .DbSetEvList
+                                    .Add(newRec);
+                    await dbCtx.SaveChangesAsync();
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante EvListInsert{Environment.NewLine}{exc}");
+                }
+            }
+            await Task.Delay(1);
+            return fatto;
+        }
+
         /// <summary>
         /// Elenco ultimi n record flux log dato macchina e flusso (ordinato x data registrazione)
         /// </summary>
@@ -497,14 +547,14 @@ namespace MP.Data.Controllers
         /// <param name="startDate">Data inizio</param>
         /// <param name="endDate">Data fine</param>
         /// <returns></returns>
-        public List<ODLModel> ListODLFilt(bool inCorso, string codArt, string keyRichPart, DateTime startDate, DateTime endDate)
+        public List<ODLModel> ListODLFilt(bool inCorso, string codArt, string keyRichPart, string IdxMacchina, DateTime startDate, DateTime endDate)
         {
             List<ODLModel> dbResult = new List<ODLModel>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 dbResult = dbCtx
                 .DbSetODL
-                .Where(x => ((inCorso && x.DataFine == null) || ((!inCorso && x.DataFine != null) && x.DataInizio >= startDate && x.DataInizio <= endDate)) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
+                .Where(x => ((inCorso && x.DataFine == null) || ((!inCorso && x.DataFine != null) && x.DataInizio >= startDate && x.DataInizio <= endDate)) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (x.IdxMacchina.Contains(IdxMacchina) || IdxMacchina == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
                 .AsNoTracking()
                 .Include(m => m.MachineNav)
                 .Include(a => a.ArticoloNav)
@@ -531,7 +581,7 @@ namespace MP.Data.Controllers
                 .AsNoTracking()
                 .Include(m => m.MachineNav)
                 .Include(a => a.ArticoloNav)
-                .OrderBy(x => x.InsertDate)
+                .OrderByDescending(x => x.InsertDate)
                 .ToList();
             }
             return dbResult;
@@ -577,10 +627,12 @@ namespace MP.Data.Controllers
         }
 
         /// <summary>
-        /// Elenco id Macchine che abbiano dati FLuxLog
+        /// Elenco id Macchine che abbiano dati FLuxLog, nel periodo indicato
         /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
         /// <returns></returns>
-        public async Task<List<string>> MacchineWithFlux()
+        public async Task<List<string>> MacchineWithFlux(DateTime dtStart, DateTime dtEnd)
         {
             List<string> dbResult = new List<string>();
             using (var dbCtx = new MoonProContext(_configuration))
@@ -588,6 +640,7 @@ namespace MP.Data.Controllers
                 dbResult = await dbCtx
                                 .DbSetFluxLog
                                 .AsNoTracking()
+                                .Where(x => x.dtEvento >= dtStart && x.dtEvento <= dtEnd)
                                 .Select(i => i.IdxMacchina)
                                 .Distinct()
                                 .ToListAsync();
@@ -595,25 +648,6 @@ 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>
@@ -634,6 +668,147 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Chiusura ODL con eventuale conferma pezzi
+        /// </summary>
+        /// <param name="idxOdl">idx odl da chiudere</param>
+        /// <param name="idxMacchina">idx macchina</param>
+        /// <param name="matrOpr">matricola operatore</param>
+        /// <param name="confPezzi">indica se confermare i pezzi prima di chiudere ODL</param>
+        /// <param name="confRett">Conferma con rettifica (ev 121) x pezzi lasciati in macchina</param>
+        /// <param name="modoConfProd">Modo conferma produzione (0=periodo, 1=giorno, 2=turno)</param>
+        /// <returns></returns>
+        public async Task<bool> ODLClose(int idxOdl, string idxMacchina, int matrOpr, bool confPezzi, bool confRett, int modoConfProd)
+        {
+            bool fatto = false;
+            if (idxOdl > 0)
+            {
+                using (var dbCtx = new MoonProContext(_configuration))
+                {
+                    DateTime adesso = DateTime.Now;
+                    // preparo i parametri
+                    var IdxODL = new SqlParameter("@IdxODL", idxOdl);
+                    var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
+
+                    // FARE FIXME TODO !!! da valutare casi setup/autoconferma...
+#if false
+                    // controllo se HO pezzi da confermare...
+                    var statoProd = StatoProdMacchina(idxMacchina);
+                    if (statoProd.pezziNonConfermati < 1)
+                    { }
+#endif
+
+                    // se richiesto confermo produzione
+                    if (confPezzi)
+                    {
+                        var MatrApp = new SqlParameter("@MatrApp", idxMacchina);
+
+                        /* ----------------------------------
+                         * CONFERMA PEZZI
+                         *
+                         * condizioni da verificare:
+                         * - gestione rettifica (ev121) / pezzi da LASCIARE in macchina
+                         * - conferma a zero pezzi (setup) oppure con i pezzi fatti e non ancora confermati
+                         *
+                         *
+                         *
+                         * */
+
+                        // recupero i dati dei pezzi da confermare... con DbSetPzProd + exec
+                        // stp_PzProd_getByMacchina 'SIMUL_01'
+
+                        // stp_ConfermaProduzCompletaFull
+                        /*
+                         *  @idxMacchina    NVARCHAR(50),
+                            @MatrApp        INT,
+                            @dataFrom       DATETIME,
+                            @dataTo         DATETIME,
+                            @pezziConf      INT,
+                            @pezziLasciati  INT,				-- pezzi lasciati = evento 121 (-) pre conferma e (+) dopo --> da lasciare in macchina post conferma
+                            @pezziScar      INT = 0,            -- pezzi scartati (registrati da 2016.11.20) DA INDICARE COME VALORE > 0!!! sennò faccio ABS...
+                            @TipoConf       INT = 0,            -- Tipo intervallo conferma: 0 = periodo intero, 1 = per giorni, 2 = per turni
+                            @DataOraApp     DATETIME = NULL,    -- di norma GETDATE() nel programma - serve per ricalcolo
+                            @TestConferma   BIT = 1             -- TestConferma : 1 = verifica conf. duplicata e inserisci in ElencoConfermeProd, 0 = nessuna verifica e inserimento ( per ricalcolo )
+                         */
+                    }
+
+                    // ora chiudo ODL
+                    try
+                    {
+                        var dbResult = await dbCtx
+                                        .DbSetStatOdl
+                                        .FromSqlRaw("EXEC stp_ODL_fineProd @IdxODL, @IdxMacchina", IdxODL, IdxMacchina)
+                                        .AsNoTracking()
+                                        .ToListAsync();
+                    }
+                    catch (Exception exc)
+                    {
+                        Log.Error($"Eccezione durante ODLClose{Environment.NewLine}{exc}");
+                    }
+                }
+            }
+            return fatto;
+        }
+
+        /// <summary>
+        /// Recupero odl data chiave
+        /// </summary>
+        /// <param name="idxOdl"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public ODLModel OdlGetByKey(int idxOdl)
+        {
+            ODLModel dbResult = new ODLModel();
+
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbSetODL
+                            .FirstOrDefault(x => x.IdxOdl == idxOdl);
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Recupero Odl CORRENTI
+        /// </summary>
+        /// <returns></returns>
+        public List<ODLModel> OdlGetCurrent()
+        {
+            List<ODLModel> dbResult = new List<ODLModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbSetODL
+                            .Where(x => x.DataInizio != null && x.DataFine == null)
+                            .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Statistiche ODL calcolate (da stored stp_STAT_ODL)
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<StatODLModel>> OdlStart(int IdxOdl)
+        {
+            List<StatODLModel> dbResult = new List<StatODLModel>();
+            if (IdxOdl > 0)
+            {
+                using (var dbCtx = new MoonProContext(_configuration))
+                {
+                    var IdxODL = new SqlParameter("@IdxODL", IdxOdl);
+
+                    dbResult = await dbCtx
+                        .DbSetStatOdl
+                        .FromSqlRaw("EXEC stp_STAT_ODL @IdxODL", IdxODL)
+                        .AsNoTracking()
+                        .ToListAsync();
+                }
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco parametri validi x una data macchina
         /// </summary>
@@ -648,13 +823,89 @@ namespace MP.Data.Controllers
                             .DbSetFluxLog
                             .AsNoTracking()
                             .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina))
+                            .Take(1000)
                             .Select(i => i.CodFlux)
                             .Distinct()
+                            .OrderBy(x => x)
                             .ToList();
             }
             return dbResult;
         }
 
+        /// <summary>
+        /// Recupero PODL da chiave
+        /// </summary>
+        /// <param name="idxPODL"></param>
+        /// <returns></returns>
+        public async Task<PODLModel> PODL_getByKey(int idxPODL)
+        {
+            PODLModel dbResult = new PODLModel();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    dbResult = dbCtx
+                                    .DbSetPODL
+                                    .AsNoTracking()
+                                    .Where(x => x.IdxPromessa == idxPODL)
+                                    .FirstOrDefault();
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante PODL_getByKey{Environment.NewLine}{exc}");
+                }
+            }
+            await Task.Delay(1);
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Avvio setup ODL da PODL
+        /// </summary>
+        /// <param name="editRec"></param>
+        /// <param name="matrOpr"></param>
+        /// <param name="tcRich"></param>
+        /// <param name="pzPallet"></param>
+        /// <param name="note"></param>
+        /// <returns></returns>
+        public async Task<bool> PODL_startSetup(PODLModel editRec, int matrOpr, double tcRich, int pzPallet, string note)
+        {
+            bool answ = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var currRec = dbCtx
+                                    .DbSetPODL
+                                    .AsNoTracking()
+                                    .Where(x => x.IdxPromessa == editRec.IdxPromessa)
+                                    .FirstOrDefault();
+
+                    if (currRec != null)
+                    {
+                        // eseguo stored attrezzaggio
+                        var IdxPromessa = new SqlParameter("@idxPromessa", editRec.IdxPromessa);
+                        var MatrOpr = new SqlParameter("@MatrOpr", matrOpr);
+                        var IdxMacchina = new SqlParameter("@IdxMacchina", editRec.IdxMacchina);
+                        var TCRichAttr = new SqlParameter("@TCRichAttr", tcRich);
+                        var PzPallet = new SqlParameter("@PzPallet", pzPallet);
+                        var Note = new SqlParameter("@Note", note);
+                        var callResult = await dbCtx
+                                        .Database
+                                        .ExecuteSqlRawAsync("EXEC stp_ODL_inizioSetupPromessa @idxPromessa, @MatrOpr, @IdxMacchina, @TCRichAttr, @PzPallet, @Note", IdxPromessa, MatrOpr, IdxMacchina, TCRichAttr, PzPallet, Note);
+
+                        answ = true;
+                    }
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante PODL_doSetup{Environment.NewLine}{exc}");
+                }
+            }
+            await Task.Delay(1);
+            return answ;
+        }
+
         /// <summary>
         /// Eliminazione Record
         /// </summary>
@@ -710,6 +961,7 @@ namespace MP.Data.Controllers
                         currRec.KeyRichiesta = editRec.KeyRichiesta;
                         currRec.NumPezzi = editRec.NumPezzi;
                         currRec.Tcassegnato = editRec.Tcassegnato;
+                        currRec.Attivabile = editRec.Attivabile;
                         currRec.Note = editRec.Note;
                         dbCtx.Entry(currRec).State = EntityState.Modified;
                     }
@@ -755,6 +1007,44 @@ namespace MP.Data.Controllers
             return answ;
         }
 
+        /// <summary>
+        /// Stato prod macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public StatoProdModel StatoProdMacchina(string idxMacchina)
+        {
+            StatoProdModel dbResult = new StatoProdModel();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
+                dbResult = dbCtx
+                            .DbSetStatoProd
+                            .FromSqlRaw("EXEC stp_PzProd_getByMacchina @IdxMacchina", IdxMacchina)
+                            .AsNoTracking()
+                            .FirstOrDefault();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco Vocabolario (completo)
+        /// </summary>
+        /// <returns></returns>
+        public List<VocabolarioModel> VocabolarioGetAll()
+        {
+            List<VocabolarioModel> dbResult = new List<VocabolarioModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                    .DbSetVocabolario
+                    .AsNoTracking()
+                    .OrderBy(x => x.Lemma)
+                    .ToList();
+            }
+            return dbResult;
+        }
+
         #endregion Public Methods
 
         #region Private Fields

MP.Data/DatabaseModels/DossierModel.cs

@@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace MP.Data.DatabaseModels
 {
     [Table("Dossiers")]
-    public partial class Dossiers
+    public partial class DossierModel
     {
         #region Public Properties
 
@@ -31,7 +31,8 @@ namespace MP.Data.DatabaseModels
 
         public string Valore { get; set; } = "";
 
-
+        [MaxLength(50)]
+        public string KeyRichiesta { get; set; } = "";
 
         /// <summary>
         /// Navigazione oggetto Machine
@@ -45,6 +46,12 @@ namespace MP.Data.DatabaseModels
         [ForeignKey("IdxODL")]
         public virtual ODLModel OdlNav { get; set; } = null!;
 
+        /// <summary>
+        /// Navigazione oggetto Articolo
+        /// </summary>
+        [ForeignKey("CodArticolo")]
+        public virtual AnagArticoli ArticoloNav { get; set; } = null!;
+
         #endregion Public Properties
     }
 }

MP.Data/DatabaseModels/EventListModel.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+
+#nullable disable
+// <Auto-Generated>
+// This is here so CodeMaid doesn't reorganize this document
+// </Auto-Generated>
+namespace MP.Data.DatabaseModels
+{
+    [Table("EventList")]
+    public partial class EventListModel
+    {
+        #region Public Properties
+
+        [MaxLength(50)]
+        public string IdxMacchina { get; set; } = "NA";
+        public DateTime? InizioStato { get; set; } = DateTime.Now;
+        public int IdxTipo { get; set; } = 0;
+
+        [MaxLength(50)]
+        public string CodArticolo { get; set; } = "";
+
+        [MaxLength(250)]
+        public string Value { get; set; } = "";
+
+        public int MatrOpr { get; set; } = 0;
+
+        [MaxLength(20)]
+        public string pallet { get; set; } = "";
+
+        /// <summary>
+        /// Navigazione oggetto Machine
+        /// </summary>
+        [ForeignKey("IdxMacchina")]
+        public virtual Macchine MachineNav { get; set; } = null!;
+        /// <summary>
+        /// Navigazione oggetto Articolo
+        /// </summary>
+        [ForeignKey("CodArticolo")]
+        public virtual AnagArticoli ArticoloNav { get; set; } = null!;
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/Macchine.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 
 #nullable disable
@@ -8,14 +10,22 @@ using System.Collections.Generic;
 // </Auto-Generated>
 namespace MP.Data.DatabaseModels
 {
+    [Table("Macchine")]
     public partial class Macchine
     {
         #region Public Properties
 
-        public string CodMacchina { get; set; }
-        public string Descrizione { get; set; }
+        [Key]
         public string IdxMacchina { get; set; }
-        public string Nome { get; set; }
+        public string CodMacchina { get; set; } = "";
+        public string Descrizione { get; set; } = "";
+        public string Nome { get; set; } = "";
+        public string Note { get; set; } = "";
+        public string url { get; set; } = "";
+        public string locazione { get; set; } = "";
+        public string css { get; set; } = "";
+        public int RowNum { get; set; } = 0;
+        public int ColNum { get; set; } = 0;
 
         #endregion Public Properties
     }

MP.Data/DatabaseModels/StatoProdModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+// <Auto-Generated>
+// This is here so CodeMaid doesn't reorganize this document
+// </Auto-Generated>
+namespace MP.Data.DatabaseModels
+{
+    public partial class StatoProdModel
+    {
+        [Key]
+        public string idxMacchina { get; set; } = "NA";
+        public int pezziNonConfermati { get; set; } = 0;
+        public DateTime DataFrom { get; set; } = DateTime.Now;
+        public DateTime DataTo { get; set; } = DateTime.Now;
+    }
+}

MP.Data/DatabaseModels/VocabolarioModel.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+// <Auto-Generated>
+// This is here so CodeMaid doesn't reorganize this document
+// </Auto-Generated>
+namespace MP.Data.DatabaseModels
+{
+    [Table("Vocabolario")]
+    public partial class VocabolarioModel
+    {
+        #region Public Properties
+
+        public string Lingua { get; set; }
+        public string Lemma { get; set; }
+        public string Traduzione { get; set; }
+
+        #endregion Public Properties
+    }
+}

MP.Data/MP.Data.csproj

@@ -11,6 +11,10 @@
       <Compile Remove="DatabaseModels\TurniParetoOdl.cs" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Include="..\.editorconfig" Link=".editorconfig" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.9" />

MP.Data/MessagePipe.cs

@@ -69,7 +69,7 @@ namespace MP.Data
 
         private bool enableLog = false;
         private IConnectionMultiplexer redis;
-        private IDatabase? redisDb;
+        private IDatabase redisDb;
 
         #endregion Private Fields
 
@@ -90,7 +90,7 @@ namespace MP.Data
             //Subscribe to the channel named messages
             sub.Subscribe(_channel, (channel, message) =>
             {
-                Log.Trace($"ch {channel} | {message}");
+                Log.Trace($"req setup ch {channel} | {message}");
                 // messaggio
                 PubSubEventArgs mea = new PubSubEventArgs(message);
                 // se qualcuno ascolta sollevo evento nuovo valore...

MP.Data/MoonProContext.cs

@@ -47,8 +47,11 @@ namespace MP.Data
         public virtual DbSet<ODLModel> DbSetODL { get; set; }
         public virtual DbSet<PODLModel> DbSetPODL { get; set; }
         public virtual DbSet<FluxLog> DbSetFluxLog { get; set; }
-        public virtual DbSet<Dossiers> DbSetDossiers { get; set; }
+        public virtual DbSet<DossierModel> DbSetDossiers { get; set; }
         public virtual DbSet<StatODLModel> DbSetStatOdl { get; set; }
+        public virtual DbSet<StatoProdModel> DbSetStatoProd { get; set; }
+        public virtual DbSet<EventListModel> DbSetEvList { get; set; }
+        public virtual DbSet<VocabolarioModel> DbSetVocabolario { get; set; }
 
         #endregion Public Properties
 
@@ -299,6 +302,17 @@ namespace MP.Data
 
             });
 
+            modelBuilder.Entity<EventListModel>(entity =>
+            {
+                entity.HasKey(e => new { e.IdxMacchina, e.InizioStato, e.IdxTipo });
+
+            });
+            modelBuilder.Entity<VocabolarioModel>(entity =>
+            {
+                entity.HasKey(e => new { e.Lingua, e.Lemma });
+
+            });
+
             OnModelCreatingPartial(modelBuilder);
         }
 

MP.Land/Components/CmpTop.razor

@@ -22,62 +22,7 @@
     </div>
 </div>
 
-@code {
 
-    //[CascadingParameter]
-    //private Task<AuthenticationState> AuthenticationStateTask { get; set; }
-
-    [CascadingParameter(Name = "ShowSearch")]
-    private bool ShowSearch { get; set; }
-
-    private string userName = "";
-
-    private string PageName { get; set; }
-    private string PageIcon { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await forceReload();
-    }
-
-    protected override void OnInitialized()
-    {
-        AppMessages.EA_PageUpdated += OnPageUpdate;
-    }
-    public void OnPageUpdate()
-    {
-        PageName = AppMessages.PageName;
-        PageIcon = AppMessages.PageIcon;
-        InvokeAsync(() =>
-        {
-            StateHasChanged();
-        });
-    }
-
-    public void Dispose()
-    {
-        AppMessages.EA_PageUpdated -= OnPageUpdate;
-    }
-
-    private async Task forceReload()
-    {
-        userName = "N.A.";
-        await Task.Delay(1);
-#if false
-var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-var user = authState.User;
-
-if (user.Identity.IsAuthenticated)
-{
-userName = $"{user.Identity.Name}";
-}
-else
-{
-userName = "N.A.";
-}
-#endif
-    }
-}
 
 @*  // Vedere anche:
     // https://docs.microsoft.com/en-us/aspnet/core/blazor/security/?view=aspnetcore-5.0#:~:text=Blazor%20uses%20the%20existing%20ASP.NET%20Core%20authentication%20mechanisms,all%20client-side%20code%20can%20be%20modified%20by%20users

MP.Land/Components/CmpTop.razor.cs

@@ -0,0 +1,83 @@
+using Microsoft.AspNetCore.Components;
+using System;
+using System.Threading.Tasks;
+
+namespace MP.Land.Components
+{
+    public partial class CmpTop
+    {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            AppMessages.EA_PageUpdated -= OnPageUpdate;
+            GC.Collect();
+        }
+
+        public void OnPageUpdate()
+        {
+            PageName = AppMessages.PageName;
+            PageIcon = AppMessages.PageIcon;
+            InvokeAsync(() =>
+            {
+                StateHasChanged();
+            });
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        protected override void OnInitialized()
+        {
+            AppMessages.EA_PageUpdated += OnPageUpdate;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await forceReload();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private string userName = "";
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        private string PageIcon { get; set; }
+
+        private string PageName { get; set; }
+
+        [CascadingParameter(Name = "ShowSearch")]
+        private bool ShowSearch { get; set; }
+
+        #endregion Private Properties
+
+        #region Private Methods
+
+        private async Task forceReload()
+        {
+            userName = "N.A.";
+            await Task.Delay(1);
+#if false
+var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+var user = authState.User;
+
+if (user.Identity.IsAuthenticated)
+{
+userName = $"{user.Identity.Name}";
+}
+else
+{
+userName = "N.A.";
+}
+#endif
+        }
+
+        #endregion Private Methods
+    }
+}

MP.Land/Components/HomeLink.razor

@@ -53,79 +53,3 @@ else // disegno box non cliccabile e licenza mancante
     </div>
 }
 
-@code {
-
-    [Parameter]
-    public UpdMan CurrItem { get; set; }
-
-    protected List<AnagKeyValueModel> AKVList
-    {
-        get
-        {
-            return LicServ.AKVList;
-        }
-        set
-        {
-            LicServ.AKVList = value;
-        }
-    }
-
-
-    protected override async Task OnInitializedAsync()
-    {
-        // check init AKV
-        if (AKVList == null || AKVList.Count == 0)
-        {
-            AKVList = await DataService.AnagKeyValList();
-            LicServ.InitAkv();
-        }
-    }
-
-
-    protected string getAKVString(string nomeVar)
-    {
-        string answ = "";
-        if (AKVList != null)
-        {
-            var currRec = AKVList.FirstOrDefault(x => x.NomeVar == nomeVar);
-            if (currRec != null)
-            {
-                answ = currRec.ValString;
-            }
-        }
-        return answ;
-    }
-
-    protected AnagKeyValueModel getAKVRec(string nomeVar)
-    {
-        AnagKeyValueModel answ = new AnagKeyValueModel();
-        if (AKVList != null)
-        {
-            answ = AKVList.FirstOrDefault(x => x.NomeVar == nomeVar);
-        }
-        return answ;
-    }
-
-    protected bool authOk()
-    {
-        bool allOk = !string.IsNullOrEmpty(CurrItem.LicenseKey);
-        if (allOk)
-        {
-            allOk = LicServ.checkLicenseActive(CurrItem.LicenseKey);
-        }
-        return allOk;
-    }
-
-    protected string fullUrl(string relUrl)
-    {
-        return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
-    }
-
-    protected MarkupString traduci(string lemma)
-    {
-        MarkupString answ;
-        string rawHtml = DataService.Traduci(lemma, "IT");
-        answ = new MarkupString(rawHtml);
-        return answ;
-    }
-}

MP.Land/Components/HomeLink.razor.cs

@@ -0,0 +1,109 @@
+using Microsoft.AspNetCore.Components;
+using MP.AppAuth.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MP.Land.Components
+{
+    public partial class HomeLink : IDisposable
+    {
+        #region Public Properties
+
+        [Parameter]
+        public UpdMan CurrItem { get; set; }
+
+        #endregion Public Properties
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+            GC.Collect();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Properties
+
+        protected List<AnagKeyValueModel> AKVList
+        {
+            get
+            {
+                return LicServ.AKVList;
+            }
+
+            set
+            {
+                LicServ.AKVList = value;
+            }
+        }
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected bool authOk()
+        {
+            bool allOk = !string.IsNullOrEmpty(CurrItem.LicenseKey);
+            if (allOk)
+            {
+                allOk = LicServ.checkLicenseActive(CurrItem.LicenseKey);
+            }
+
+            return allOk;
+        }
+
+        protected string fullUrl(string relUrl)
+        {
+            return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
+        }
+
+        protected AnagKeyValueModel getAKVRec(string nomeVar)
+        {
+            AnagKeyValueModel answ = new AnagKeyValueModel();
+            if (AKVList != null)
+            {
+                answ = AKVList.FirstOrDefault(x => x.NomeVar == nomeVar);
+            }
+
+            return answ;
+        }
+
+        protected string getAKVString(string nomeVar)
+        {
+            string answ = "";
+            if (AKVList != null)
+            {
+                var currRec = AKVList.FirstOrDefault(x => x.NomeVar == nomeVar);
+                if (currRec != null)
+                {
+                    answ = currRec.ValString;
+                }
+            }
+
+            return answ;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            // check init AKV
+            if (AKVList == null || AKVList.Count == 0)
+            {
+                AKVList = await DataService.AnagKeyValList();
+                LicServ.InitAkv();
+            }
+        }
+
+        protected MarkupString traduci(string lemma)
+        {
+            MarkupString answ;
+            string rawHtml = DataService.Traduci(lemma, "IT");
+            answ = new MarkupString(rawHtml);
+            return answ;
+        }
+
+        #endregion Protected Methods
+    }
+}

MP.Land/Data/LicenseService.cs

@@ -372,7 +372,35 @@ namespace MP.Land.Data
                 }
                 else
                 {
-                    _logger.LogInformation($"Record non trovato per {authKey}");
+                    _logger.LogInformation($"checkLicenseActive | Record non trovato per {authKey}");
+                }
+            }
+            return answ;
+        }
+        /// <summary>
+        /// Verifica scadenza licenza
+        /// </summary>
+        /// <param name="authKey"></param>
+        /// <returns></returns>
+        public DateTime getLicenseExpiry(string authKey)
+        {
+            DateTime answ = DateTime.Today.AddDays(-1);
+            //cerco anche nelle info AKV
+            if (AKVList != null)
+            {
+                var recLic = AKVList.Where(x => x.ValString == authKey).FirstOrDefault();
+                int numLic = 0;
+                //cerco in record
+                if (recLic != null)
+                {
+                    numLic = (int)recLic.ValInt;
+                    // verifico scadenza licenza!
+                    DateTime scadenza = licenseManGLS.expiryDateByAuthKey(Installazione, recLic.NomeVar, numLic, authKey);
+                    answ = scadenza;
+                }
+                else
+                {
+                    _logger.LogInformation($"getLicenseExpiry | Record non trovato per {authKey}");
                 }
             }
             return answ;

MP.Land/MP.Land.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.16.2209.2118</Version>
+        <Version>6.16.2211.0416</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -60,6 +60,12 @@
         <ProjectReference Include="..\MP.AppAuth\MP.AppAuth.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="post-build.ps1">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
         <Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
     </Target>

MP.Land/Pages/About.razor.cs

@@ -1,40 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using System.Net.Http;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Virtualization;
-using Microsoft.JSInterop;
-using MP.Land;
-using MP.Land.Shared;
-using MP.Land.Data;
 using NLog;
+using System;
+using System.Threading.Tasks;
 
 namespace MP.Land.Pages
 {
     public partial class About
     {
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-        private string Titolo = "";
-        private string Messaggio = "";
-
-        private string ServerStatus = "SrvState";
-        private string Installazione = "Inst";
-        private string Applicazione = "App";
-        private string Licenze = "#";
-        private DateTime Scadenza = DateTime.Today;
-        private string MastKey = "########################";
-
-        private string mainCss = "alert alert-info";
-        private string remSrvCss = "bg-warning text-secondary";
-        private string expDateCss = "bg-warning text-secondary";
-        private string licenseCss = "bg-warning text-secondary";
+        #region Protected Methods
 
         protected override async Task OnInitializedAsync()
         {
@@ -43,9 +15,31 @@ namespace MP.Land.Pages
             await reloadLicenseData();
         }
 
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private string Applicazione = "App";
+        private string expDateCss = "bg-warning text-secondary";
+        private string Installazione = "Inst";
+        private string licenseCss = "bg-warning text-secondary";
+        private string Licenze = "#";
+        private string mainCss = "alert alert-info";
+        private string MastKey = "########################";
+        private string Messaggio = "";
+        private string remSrvCss = "bg-warning text-secondary";
+        private DateTime Scadenza = DateTime.Today;
+        private string ServerStatus = "SrvState";
+        private string Titolo = "";
+
+        #endregion Private Fields
+
+        #region Private Methods
+
         private async Task reloadLicenseData()
         {
-            int cDelay = 5;
+            int cDelay = 10;
             // recupero dati
             await Task.Delay(cDelay);
             try
@@ -56,13 +50,14 @@ namespace MP.Land.Pages
                 Installazione = LicServ.Installazione;
                 Applicazione = LicServ.Applicazione;
                 MastKey = LicServ.MasterKey;
+                Scadenza = LicServ.getLicenseExpiry(LicServ.MasterKey);
                 await Task.Delay(cDelay);
                 var fatto = await LicServ.RefreshLicense();
                 await Task.Delay(cDelay);
                 Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
                 licenseCss = "";
             }
-            catch(Exception exc)
+            catch (Exception exc)
             {
                 licenseCss = "bg-dark text-warning";
                 Log.Error($"Eccezione in reloadLicenseData:{Environment.NewLine}{exc}");
@@ -86,5 +81,7 @@ namespace MP.Land.Pages
             AppMService.PageName = "About";
             AppMService.PageIcon = "fas fa-info-circle pr-2";
         }
+
+        #endregion Private Methods
     }
 }

MP.Land/Pages/Contacts.razor

@@ -69,17 +69,3 @@
     </div>
 </div>
 
-@code {
-
-    protected string Titolo = "";
-    protected string Messaggio = "";
-
-    protected override void OnInitialized()
-    {
-        Titolo = "Mapo MES";
-        Messaggio = "I nostri contattatti e siti di supporto";
-        AppMService.ShowSearch = false;
-        AppMService.PageName = "Contacts";
-        AppMService.PageIcon = "fas fa-envelope pr-2";
-    }
-}

MP.Land/Pages/Contacts.razor.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace MP.Land.Pages
+{
+    public partial class Contacts : IDisposable
+    {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            GC.Collect();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Fields
+
+        protected string Messaggio = "";
+        protected string Titolo = "";
+
+        #endregion Protected Fields
+
+        #region Protected Methods
+
+        protected override void OnInitialized()
+        {
+            Titolo = "Mapo MES";
+            Messaggio = "I nostri contattatti e siti di supporto";
+            AppMService.ShowSearch = false;
+            AppMService.PageName = "Contacts";
+            AppMService.PageIcon = "fas fa-envelope pr-2";
+        }
+
+        #endregion Protected Methods
+    }
+}

MP.Land/Pages/Index.razor.cs

@@ -1,22 +1,23 @@
-using System;
+using Microsoft.AspNetCore.Components;
+using MP.Land.Data;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MP.Land.Data;
-using MP.Land.Components;
-using Microsoft.AspNetCore.Components;
-using Microsoft.Extensions.Configuration;
-using MP.AppAuth.Models;
 
 namespace MP.Land.Pages
 {
-    public partial class Index
+    public partial class Index : IDisposable
     {
-        #region Private Fields
+        #region Public Methods
 
-        private List<MP.AppAuth.Models.UpdMan> ListRecords;
+        public void Dispose()
+        {
+            ListRecords = null;
+            GC.Collect();
+        }
 
-        #endregion Private Fields
+        #endregion Public Methods
 
         #region Protected Fields
 
@@ -63,5 +64,11 @@ namespace MP.Land.Pages
         }
 
         #endregion Protected Methods
+
+        #region Private Fields
+
+        private List<MP.AppAuth.Models.UpdMan> ListRecords;
+
+        #endregion Private Fields
     }
 }

MP.Land/Pages/SysInfo.razor

@@ -42,25 +42,25 @@
                                         <div class="list-group">
                                             <div class="list-group-item">
                                                 <div class="d-flex w-100 justify-content-between">
-                                                    <h5 class="mb-1">Environment</h5>
+                                                    <b class="mb-1">Environment</b>
                                                 </div>
                                                 <p class="mb-1">@Environment</p>
                                             </div>
                                             <div class="list-group-item">
                                                 <div class="d-flex w-100 justify-content-between">
-                                                    <h5 class="mb-1">Main DB Conf</h5>
+                                                    <b class="mb-1">Main DB Conf</b>
                                                 </div>
                                                 <p class="mb-1">@DbNameExample</p>
                                             </div>
                                             <div class="list-group-item">
                                                 <div class="d-flex w-100 justify-content-between">
-                                                    <h5 class="mb-1">.net framework</h5>
+                                                    <b class="mb-1">.net framework</b>
                                                 </div>
                                                 <p class="mb-1">@currHwSwInfo.runtimeImg</p>
                                             </div>
                                             <div class="list-group-item">
                                                 <div class="d-flex w-100 justify-content-between">
-                                                    <h5 class="mb-1">Main Assembly</h5>
+                                                    <b class="mb-1">Main Assembly</b>
                                                 </div>
                                                 <p class="mb-1">@currHwSwInfo.mainAssembly</p>
                                             </div>
@@ -81,7 +81,7 @@
                                         <div class="list-group">
                                             <div class="list-group-item">
                                                 <div class="d-flex w-100 justify-content-between">
-                                                    <h5 class="mb-1">Server Stats</h5>
+                                                    <b class="mb-1">Server Stats</b>
                                                 </div>
                                                 <p class="mb-1">
                                                     <pre>@currHwSwInfo.ServerStats</pre>
@@ -89,7 +89,7 @@
                                             </div>
                                             <div class="list-group-item">
                                                 <div class="d-flex w-100 justify-content-between">
-                                                    <h5 class="mb-1">IIS Stats</h5>
+                                                    <b class="mb-1">IIS Stats</b>
                                                 </div>
                                                 <p class="mb-1">
                                                     <pre>@currHwSwInfo.IISStats</pre>
@@ -112,7 +112,7 @@
                                         <div class="list-group">
                                             <div class="list-group-item">
                                                 <div class="d-flex w-100 justify-content-between">
-                                                    <h5 class="mb-1">Elenco librerie</h5>
+                                                    <b class="mb-1">Elenco librerie</b>
                                                     <span>@currHwSwInfo.numLibraries</span>
                                                 </div>
                                                 <p class="mb-1">
@@ -133,51 +133,3 @@
         </div>
     </div>
 </div>
-@code {
-
-    // imposto i vari dati da mostrare a video senza indicare come bypassare...
-    protected string Titolo = "MAPO System Info";
-    protected string Messaggio = "HW & SW details";
-    protected HwSwInfo currHwSwInfo = HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly());
-
-    protected string masterLic = "";
-
-    protected override async Task OnInitializedAsync()
-    {
-        await ReloadData();
-    }
-
-    protected async Task ReloadData()
-    {
-        var akvList = await DataService.AnagKeyValList();
-        var licRecord = akvList
-                        .Where(x => x.NomeVar == "MAPO")
-                        .FirstOrDefault();
-        if (licRecord != null)
-        {
-            masterLic = licRecord.ValString;
-        }
-    }
-
-    protected string DbNameExample
-    {
-        get
-        {
-            string answ = Configuration["ConnectionStrings:DefaultConnection"];
-            if (answ.IndexOf(";User ID=") > 0)
-            {
-                answ = answ.Substring(0, answ.IndexOf(";User ID="));
-            }
-            return answ;
-        }
-    }
-    protected string Environment
-    {
-        get
-        {
-            string answ = Configuration["Environment"];
-            return answ;
-        }
-    }
-
-}

MP.Land/Pages/SysInfo.razor.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.Web.Virtualization;
+using Microsoft.JSInterop;
+using MP.Land;
+using MP.Land.Shared;
+using MP.AppAuth;
+using MP.Land.Data;
+using Microsoft.Extensions.Configuration;
+
+namespace MP.Land.Pages
+{
+    public partial class SysInfo : IDisposable
+    {
+        public void Dispose()
+        {
+            GC.Collect();
+        }
+
+        // imposto i vari dati da mostrare a video senza indicare come bypassare...
+        protected string Titolo = "MAPO System Info";
+        protected string Messaggio = "HW & SW details";
+        protected HwSwInfo currHwSwInfo = HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly());
+        protected string masterLic = "";
+        protected override async Task OnInitializedAsync()
+        {
+            await ReloadData();
+        }
+
+        protected async Task ReloadData()
+        {
+            var akvList = await DataService.AnagKeyValList();
+            var licRecord = akvList.Where(x => x.NomeVar == "MAPO").FirstOrDefault();
+            if (licRecord != null)
+            {
+                masterLic = licRecord.ValString;
+            }
+        }
+
+        protected string DbNameExample
+        {
+            get
+            {
+                string answ = Configuration["ConnectionStrings:DefaultConnection"];
+                if (answ.IndexOf(";User ID=") > 0)
+                {
+                    answ = answ.Substring(0, answ.IndexOf(";User ID="));
+                }
+
+                return answ;
+            }
+        }
+
+        protected string Environment
+        {
+            get
+            {
+                string answ = Configuration["Environment"];
+                return answ;
+            }
+        }
+    }
+}

MP.Land/Pages/UpdateManager.razor.cs

@@ -10,22 +10,24 @@ using System.Threading.Tasks;
 
 namespace MP.Land.Pages
 {
-    public partial class UpdateManager
+    public partial class UpdateManager : IDisposable
     {
-        #region Private Fields
+        #region Public Methods
 
-        private List<MP.AppAuth.Models.UpdMan> ListRecords;
+        public void Dispose()
+        {
+            ListRecords = null;
+            GC.Collect();
+        }
 
-        #endregion Private Fields
+        #endregion Public Methods
 
         #region Protected Fields
 
         protected int numDone = 0;
         protected int numTot = 0;
         protected int totalCount = 0;
-
         protected double TotalMb = 0;
-
         protected UpdateMan updateManAuth = new UpdateMan("SWDownloader", "viaD@nte16");
 
         #endregion Protected Fields
@@ -42,34 +44,12 @@ namespace MP.Land.Pages
         protected AppAuthService DataService { get; set; }
 
         protected string outMessages { get; set; } = "";
-
         protected int percLoading { get; set; } = 0;
-
         protected bool showProgress { get; set; } = false;
         protected bool showUpdate { get; set; } = false;
 
         #endregion Protected Properties
 
-        #region Private Methods
-
-        private async Task<long> scaricaSingolo(AppAuth.Models.UpdMan item)
-        {
-            long size = 0;
-            if (item.IsAuth)
-            {
-                size = updateManAuth.downloadLatest(item.ManifestUrl, localPath(item.LocalRepo), item.PackName);
-            }
-            else
-            {
-                size = UpdateMan.obj.downloadLatest(item.ManifestUrl, localPath(item.LocalRepo), item.PackName);
-            }
-            numDone++;
-            percLoading = 100 * numDone / numTot;
-            return await Task.FromResult(size);
-        }
-
-        #endregion Private Methods
-
         #region Protected Methods
 
         /// <summary>
@@ -151,5 +131,31 @@ namespace MP.Land.Pages
         }
 
         #endregion Protected Methods
+
+        #region Private Fields
+
+        private List<MP.AppAuth.Models.UpdMan> ListRecords;
+
+        #endregion Private Fields
+
+        #region Private Methods
+
+        private async Task<long> scaricaSingolo(AppAuth.Models.UpdMan item)
+        {
+            long size = 0;
+            if (item.IsAuth)
+            {
+                size = updateManAuth.downloadLatest(item.ManifestUrl, localPath(item.LocalRepo), item.PackName);
+            }
+            else
+            {
+                size = UpdateMan.obj.downloadLatest(item.ManifestUrl, localPath(item.LocalRepo), item.PackName);
+            }
+            numDone++;
+            percLoading = 100 * numDone / numTot;
+            return await Task.FromResult(size);
+        }
+
+        #endregion Private Methods
     }
 }

MP.Land/Pages/UserQr.razor.cs

@@ -16,6 +16,9 @@ namespace MP.Land.Pages
         public void Dispose()
         {
             AppMService.EA_SearchUpdated -= OnSeachUpdated;
+            AppMService.EA_FilterUpdated -= OnFilterUpdated;
+            ListRecords = null;
+            GC.Collect();
         }
 
         #endregion Public Methods

MP.Land/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.16.2209.2118</h4>
+    <h4>Versione: 6.16.2211.0416</h4>
     <br />
     Note di rilascio:
     <ul>

MP.Land/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2209.2118
+6.16.2211.0416

MP.Land/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2209.2118</version>
+  <version>6.16.2211.0416</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

MP.Land/Shared/MainLayout.razor

@@ -26,35 +26,3 @@
     </CascadingValue>
 </div>
 
-@code {
-    bool ShowSearch { get; set; } = false;
-
-    protected override void OnInitialized()
-    {
-        AppMService.EA_ShowSearch += OnShowSearch;
-        AppMService.EA_HideSearch += OnHideSearch;
-    }
-    public void OnShowSearch()
-    {
-        ShowSearch = true;
-        InvokeAsync(() =>
-        {
-            StateHasChanged();
-        });
-    }
-    public void OnHideSearch()
-    {
-        ShowSearch = false;
-        InvokeAsync(() =>
-        {
-            StateHasChanged();
-        });
-    }
-
-    public void Dispose()
-    {
-        AppMService.EA_ShowSearch -= OnShowSearch;
-        AppMService.EA_ShowSearch -= OnHideSearch;
-    }
-
-}

MP.Land/Shared/MainLayout.razor.cs

@@ -0,0 +1,52 @@
+using System;
+
+namespace MP.Land.Shared
+{
+    public partial class MainLayout
+    {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            AppMService.EA_ShowSearch -= OnShowSearch;
+            AppMService.EA_ShowSearch -= OnHideSearch;
+            GC.Collect();
+        }
+
+        public void OnHideSearch()
+        {
+            ShowSearch = false;
+            InvokeAsync(() =>
+            {
+                StateHasChanged();
+            });
+        }
+
+        public void OnShowSearch()
+        {
+            ShowSearch = true;
+            InvokeAsync(() =>
+            {
+                StateHasChanged();
+            });
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        protected override void OnInitialized()
+        {
+            AppMService.EA_ShowSearch += OnShowSearch;
+            AppMService.EA_HideSearch += OnHideSearch;
+        }
+
+        #endregion Protected Methods
+
+        #region Private Properties
+
+        private bool ShowSearch { get; set; } = false;
+
+        #endregion Private Properties
+    }
+}

MP.Mon/MP.Mon.csproj

@@ -48,6 +48,9 @@
     <None Update="logs\.placeholder">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="post-build.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />

MP.SPEC/Components/Chart/Doughnut.razor.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MP.Data;
+using MP.SPEC.Data;
 using static System.Net.Mime.MediaTypeNames;
 
 namespace MP.SPEC.Components.Chart
@@ -25,13 +26,12 @@ namespace MP.SPEC.Components.Chart
         public ChartType Type { get; set; }
 
         [Parameter]
-        public double[] Data { get; set; }
+        public double[] Data { get; set; } = null!;
+        [Parameter]
+        public List<DoughnutStyling> BackgroundColor { get; set; } = null!;
 
         [Parameter]
-        public string[] BackgroundColor { get; set; }
-
-        [Parameter]
-        public string[] Labels { get; set; }
+        public string[] Labels { get; set; } = null!;
 
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
@@ -46,7 +46,7 @@ namespace MP.SPEC.Components.Chart
                 {
                     Datasets = new[]
                     {
-                    new { Data = Data, BackgroundColor = BackgroundColor
+                    new { Data = Data, BackgroundColor = BackgroundColor.Select(x=>x.color), borderColor = BackgroundColor.Select(x=>x.border), borderWidth= 0, offset= 1, borderRadius = 0
     }
 },
                     Labels = Labels

MP.SPEC/Components/CmpFooter.razor.cs

@@ -39,7 +39,8 @@ namespace MP.SPEC.Components
 
         protected override void OnInitialized()
         {
-            version = typeof(Program).Assembly.GetName().Version;
+            var rawVers = typeof(Program).Assembly.GetName().Version; ;
+            version = rawVers != null ? rawVers : new Version("0.0.0.0");
         }
 
         #endregion Protected Methods

MP.SPEC/Components/CmpTop.razor

@@ -10,7 +10,10 @@
     <div class="px-2">
         <i class="fas fa-user-alt"></i> <b>@userName</b>
     </div>
-    <div class="px-2 flex-grow-1 text-end">
+    <div class="pe-2">
+        <button class="btn btn-primary" @onclick="() => flushCache()" title="Forza Refresh Dati correnti"> Force Reload </button>
+    </div>
+   @* <div class="px-2 flex-grow-1 text-end">
         <span class="text-secondary">@TipoSearch</span>
     </div>
     <div class="px-2 text-end">
@@ -18,48 +21,7 @@
         {
             <SearchMod></SearchMod>
         }
-    </div>
+    </div>*@
 </div>
 
-@code {
-    protected bool ShowSearch
-    {
-        get => MService.ShowSearch;
-        set => MService.ShowSearch = value;
-    }
 
-    private string userName = "";
-
-    private string TipoSearch
-    {
-        get => MService.TipoSearch;
-        set => MService.TipoSearch = value;
-    }
-
-    protected override async Task OnInitializedAsync()
-    {
-        MService.EA_ShowSearch += MService_EA_ShowSearch;
-        await forceReload();
-    }
-    private async void MService_EA_ShowSearch()
-    {
-        await Task.Delay(1);
-        await InvokeAsync(() => StateHasChanged());
-    }
-
-    private async Task forceReload()
-    {
-
-        var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-        var user = authState.User;
-
-        if (user.Identity != null&& user.Identity.IsAuthenticated)
-        {
-            userName = $"{user.Identity.Name}";
-        }
-        else
-        {
-            userName = "N.A.";
-        }
-    }
-}

MP.SPEC/Components/CmpTop.razor.cs

@@ -0,0 +1,84 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.JSInterop;
+using MP.SPEC.Data;
+
+namespace MP.SPEC.Components
+{
+    public partial class CmpTop
+    {
+        #region Public Methods
+
+        public async Task flushCache()
+        {
+            await Task.Delay(1);
+            await MDService.FlushRedisCache();
+            await Task.Delay(1);
+            // rimando a pagina corrente
+            NavManager.NavigateTo(NavManager.Uri, true);
+        }
+
+        #endregion Public Methods
+
+        #region Protected Properties
+
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; } = null!;
+
+        [Inject]
+        protected MpDataService MDService { get; set; } = null!;
+
+        protected bool ShowSearch { get => MService.ShowSearch; set => MService.ShowSearch = value; }
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            MService.EA_ShowSearch += MService_EA_ShowSearch;
+            await forceReload();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private string userName = "";
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        [Inject]
+        private NavigationManager NavManager { get; set; } = null!;
+
+        private string TipoSearch { get => MService.TipoSearch; set => MService.TipoSearch = value; }
+
+        #endregion Private Properties
+
+        #region Private Methods
+
+        private async Task forceReload()
+        {
+            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            var user = authState.User;
+            if (user.Identity != null && user.Identity.IsAuthenticated)
+            {
+                userName = $"{user.Identity.Name}";
+            }
+            else
+            {
+                userName = "N.A.";
+            }
+        }
+
+        private async void MService_EA_ShowSearch()
+        {
+            await Task.Delay(1);
+            await InvokeAsync(() => StateHasChanged());
+        }
+
+        #endregion Private Methods
+    }
+}

MP.SPEC/Components/DataPager.razor.cs

@@ -78,9 +78,9 @@ namespace MP.SPEC.Components
 
         #region Public Methods
 
-        public async Task resetCurrPage()
+        public void resetCurrPage()
         {
-            await Task.Delay(1);
+            //await Task.Delay(1);
             currPage = 1;
         }
 
@@ -98,7 +98,7 @@ namespace MP.SPEC.Components
 
         protected int _numRecord { get; set; } = 10;
 
-        protected int percLoading { get; set; } = 0;
+        protected int percLoading { get; set; } =   0;
 
         #endregion Protected Properties
 

MP.SPEC/Components/DossiersFilter.razor

@@ -1,7 +1,25 @@
 <div class="d-flex justify-content-end">
-    <a class="pt-2 text-dark" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample">
-        <i class="fa-solid fa-bars"></i>
-    </a>
+    <div class="d-flex justify-content-between pt-2">
+        @if (filtActive)
+        {
+            <div class=" rounded small d-flex justify-content-between" title="Filtri attivi">
+                @*<i class="fas fa-exclamation text-warning"></i>*@
+                @if (selMacchina != "*")
+            {
+                    <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetMacchina()" title="Rimuovi Filtro Impianto"><i class="fa-solid fa-hard-drive"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            @if (selArticolo != "*")
+            {
+                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetArticolo()" title="Rimuovi Filtro Articolo"><i class="fa-solid fa-sliders"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            </div>
+        }
+        <div class="p-2">
+            <a class="" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample">
+                <i class="fa-solid fa-bars text-dark"></i>
+            </a>
+        </div>
+    </div>
     <div class="offcanvas offcanvas-end" tabindex="-1" id="paramsFilterExample" aria-labelledby="paramsFilterExampleLabel">
         <div class="offcanvas-header">
             <h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTRI</b></h3>
@@ -11,7 +29,10 @@
             <div>
                 Seleziona i filtri per:
             </div>
-            <div class="input-group p-2">
+            <div class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Articolo</label>
+            </div>
+            <div class="input-group px-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">
                     <option value="*">--- Tutti ---</option>
@@ -24,7 +45,10 @@
                     }
                 </select>
             </div>
-            <div class="input-group p-2">
+            <div class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Macchina</label>
+            </div>
+            <div class="input-group px-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">
                     <option value="*">--- Tutti ---</option>
@@ -37,18 +61,20 @@
                     }
                 </select>
             </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 class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Inizio Periodo</label>
             </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 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>
     </div>

MP.SPEC/Components/DossiersFilter.razor.cs

@@ -38,19 +38,47 @@ namespace MP.SPEC.Components
                 }
             }
         }
-
-        protected DateTime selDtRef
+        private bool filtActive
+        {
+            get => selMacchina != "*" || selArticolo != "*";
+        }
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetArticolo()
+        {
+            selArticolo = "*";
+        }
+        protected DateTime selDtMax
         {
             get
             {
-                return SelFilterDossier.DtRef;
+                return SelFilterDossier.DtEnd;
             }
 
             set
             {
-                if (!SelFilterDossier.DtRef.Equals(value))
+                if (!SelFilterDossier.DtEnd.Equals(value))
                 {
-                    SelFilterDossier.DtRef = value;
+                    SelFilterDossier.DtEnd = value;
+                    reportChange();
+                }
+            }
+        }
+
+        protected DateTime selDtMin
+        {
+            get
+            {
+                return SelFilterDossier.DtStart;
+            }
+
+            set
+            {
+                if (!SelFilterDossier.DtStart.Equals(value))
+                {
+                    SelFilterDossier.DtStart = value;
                     reportChange();
                 }
             }
@@ -101,7 +129,9 @@ namespace MP.SPEC.Components
         protected override async Task OnInitializedAsync()
         {
             SelFilterDossier = new SelectDossierParams();
-            ListMacchine = await MDService.MacchineWithFlux();
+            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);
         }

MP.SPEC/Components/ListDossiers.razor

@@ -1,6 +1,9 @@
 @using MP.SPEC.Components
 @using MP.SPEC.Data
 
+
+
+
 @if (ListRecords == null)
 {
     <LoadingData></LoadingData>
@@ -11,20 +14,208 @@ else if (totalCount == 0)
 }
 else
 {
+    <!--       INIZIO:    MODIFICA FLUSSO            -->
+    @if (currFluxLogDto != null)
+    {
+        <div class="row">
+            <div class="col-12">
+                <div class="card mb-5">
+                    <div class="card-header bg-primary text-light d-flex justify-content-between">
+                        <div>
+                            Modifica Parametro
+                        </div>
+                        <div>
+                            @if (isEditing)
+                            {
+                                <span class="text-light">PENDING CHANGES...</span>
+                            }
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-3 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">MACCHINA</span>
+                                    <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currFluxLogDto.IdxMacchina">
+                                </div>
+                            </div>
+                            <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="@currFluxLogDto.dtEvento">
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">DATA TYPE</span>
+                                    <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currFluxLogDto.CodFlux">
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">VALORE</span>
+                                    <input type="text" class="form-control" aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currFluxLogDto.ValoreEdit" @onclick="()=> enableEditing()">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row pt-4" style="visibility: @css()">
+                            <div class="col-3 pe-0">
+                            </div>
+                            <div class="col-3 pe-0">
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="d-grid gap-2">
+                                    <button @onclick="() => cancel()" class="btn btn-warning">Annulla <i class="bi bi-x-circle"></i></button>
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="d-grid gap-2">
+                                    <button @onclick="() => update(currFluxLogDto)" class="btn btn-success">Save <i class="bi bi-save"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    <!--       FINE:    MODIFICA FLUSSO            -->
+    <!--       INIZIO:    NUOVO DOSSIER            -->
+    @if (currRecordClone != null)
+    {
+        <div class="row">
+            <div class="col-12">
+                <div class="card mb-5">
+                    <div class="card-header bg-primary text-light d-flex justify-content-between">
+                        <div>
+                            Nuovo Dossier
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <!--INIZIO PRIMA RIGA-->
+                        <div class="row">
+                            <div class="col-4 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">MACCHINA</span>
+                                    <select @bind="@currRecordClone.IdxMacchina" class="form-select" id="macchina" title="Selezionare la macchina" @onclick="()=> enableEditing()">
+                                        @if (ListMacchine != null)
+                                        {
+                                            foreach (var item in ListMacchine)
+                                            {
+                                                @if (item.IdxMacchina == currRecordClone.IdxMacchina)
+                                                {
+
+                                                    <option value="@item.IdxMacchina" selected>@item.IdxMacchina | @item.Descrizione</option>
+                                                }
+                                                else
+                                                {
+                                                    <option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                }
+                                            }
+                                        }
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-4 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">FASE</span>
+                                    <select class="form-select" @bind="@currRecordClone.KeyRichiesta" @onclick="()=> enableEditing()" title="Selezionare la fase">
+                                        @if (ListStati != null)
+                                        {
+                                            foreach (var item in ListStati)
+                                            {
+                                                @if (item.value == currRecordClone.KeyRichiesta)
+                                                {
+                                                    <option value="@item.value" selected>@item.label</option>
+                                                }
+                                                else
+                                                {
+                                                    <option value="@item.value">@item.label</option>
+                                                }
+                                            }
+                                        }
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="col-4 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm" @onclick="()=> enableEditing()">ARTICOLI</span>
+
+                                    <select @bind="@currRecordClone.CodArticolo" class="form-select" id="macchina" title="Selezionare l'articolo">
+                                        @if (ListArticoli != null)
+                                        {
+                                            foreach (var item in ListArticoli)
+                                            {
+                                                @if (item.CodArticolo == currRecordClone.CodArticolo)
+                                                {
+                                                    <option value="@item.CodArticolo" selected>@item.CodArticolo | @item.DescArticolo</option>
+                                                }
+                                                else
+                                                {
+                                                    <option value="@item.CodArticolo">@item.CodArticolo | @item.DescArticolo</option>
+                                                }
+                                            }
+                                        }
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <!--FINE PRIMA RIGA-->
+
+
+                        <div class="row pt-4">
+                            <div class="col-3 pe-0">
+                            </div>
+                            <div class="col-3 pe-0">
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="d-grid gap-2">
+                                    <button @onclick="() => cancelNewDoss()" class="btn btn-warning">Annulla <i class="bi bi-x-circle"></i></button>
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="d-grid gap-2">
+                                    <button @onclick="() => newDossier(currRecordClone)" class="btn btn-success">Save <i class="bi bi-save"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+
+    <!--       FINE:    NUOVO DOSSIER            -->
+
+
+
+
+
+
+
     <div class="row">
         <div class="d-flex justify justify-content-between">
             <table class="table table-sm table-striped small">
                 <thead>
                     <tr>
                         <th>
-                            <button @onclick="() => unToggleTableFlux()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                            <div class="text-nowrap">
+
+                                @if (currRecord != null)
+                                {
+                                    <button @onclick="() => closeTableFlux()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                                    <button @onclick="()=> cloneRecord(currRecord)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
+                                }
+                            </div>
                         </th>
                         <th><i class="fa-solid fa-file"></i> Articolo</th>
                         <th><i class="fa-solid fa-screwdriver-wrench"></i> Fase</th>
                         <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
                         <th><i class="fa-regular fa-calendar-days"></i> Data Snap</th>
                         <th><i class="fa-solid fa-sliders"></i> ODL</th>
-                        @*<th><i class="fa-solid fa-circle-info"></i> DATA TYPE</th>*@
                         <th></th>
                     </tr>
                 </thead>
@@ -33,18 +224,28 @@ else
                     {
                         <tr class="@checkSelect(@record)">
                             <td>
-                                <button class="btn btn-primary btn-sm" @onclick="() => selRecord(record)"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                @if (isEditing == false)
+                                {
+                                    <!--SEL RECORD PER VISUALIZZAZIONE FLUSSI-->
+                                    <button class="btn btn-primary btn-sm" @onclick="() => selRecord(record)"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                    <!--SEL RECORD PER CLONA DOSSIER-->
+                                    @*<button @onclick="()=> cloneRecord(record)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>*@
+                                }
+                                else
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                }
                             </td>
                             <td>
-                                @record.OdlNav.CodArticolo
-                                <div class="small textConsensed text-secondary">@record.OdlNav.ArticoloNav.DescArticolo</div>
+                                @record.CodArticolo
+                                <div class="small textConsensed text-secondary">@record.ArticoloNav.DescArticolo</div>
                             </td>
                             <td>
-                                @tradFase(record.OdlNav.KeyRichiesta)
+                                @tradFase(record.KeyRichiesta)
                             </td>
                             <td>
                                 @record.IdxMacchina
-                                <div class="small textConsensed text-secondary">@record.MachineNav.Descrizione</div>
+                                @*<div class="small textConsensed text-secondary">@record.MachineNav.Descrizione</div>*@
                             </td>
                             <td>
                                 @record.DtRif
@@ -52,11 +253,17 @@ else
                             <td>
                                 @record.IdxODL
                             </td>
-                            @*<td>
-                    @record.DataType
-                    </td>*@
                             <td>
-                                <button @onclick="() => deleteRecord(record)" class="btn btn-danger btn-sm"><i class="bi bi-trash-fill"></i></button>
+                                @if (isEditing == false)
+                                {
+
+                                    <button @onclick="() => deleteRecord(record)" class="btn btn-danger btn-sm"><i class="bi bi-trash-fill"></i></button>
+                                }
+                                else
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled"><i class="bi bi-trash-fill"></i></button>
+
+                                }
                             </td>
                         </tr>
                     }
@@ -75,23 +282,21 @@ else
                         <table class="table table-light table-sm table-striped small mb-0">
                             <thead>
                                 <tr>
-                                    <th></th>
+                                    <th>
+                                        <button class="btn btn-info" @onclick="() => closeTableFlux()"><i class="fa-solid fa-xmark"></i></button>
+                                    </th>
                                     <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
                                     <th><i class="fa-regular fa-calendar-days"></i> Data</th>
                                     <th><i class="fa-solid fa-sliders"></i> Data Type</th>
-                                    <th>
-                                        <div class="d-flex justify-content-between col-12">
-                                            <span class="col-11" style="text-align: right;"> Valore </span>
-                                            <button class="btn btn-primary btn-sm py-0" @onclick="() => unToggleTableFlux()"><i class="fa-solid fa-xmark"></i></button>
-
-                                        </div>
+                                    <th style="text-align: right;">
+                                        <span class="col-11"> Valore </span>
                                     </th>
                                 </tr>
                             </thead>
                             <tbody>
                                 @foreach (var record in listaFlux)
                                 {
-                                    <tr>
+                                    <tr class="@checkSelPar(@record)">
                                         <td>
                                             <button @onclick="() => editRecord(record)" class="btn btn-primary btn-sm" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
                                         </td>
@@ -102,11 +307,19 @@ else
                                             @record.dtEvento
                                         </td>
                                         <td>
-                                            @record.CodFlux
+                                            @traduci(record.CodFlux)
+                                            <div class="small textConsensed text-secondary" title="Valore Registrato">@record.CodFlux</div>
                                         </td>
                                         <td style="text-align: right;">
-                                            <div><span class="small text-dark">Modificato:  </span><b>@record.ValoreEdit</b></div>
-                                            <div class="small text-secondary"><span class="small text-dark">Originale:  </span><i>@record.Valore</i></div>
+                                            @if (record.ValoreEdit != record.Valore)
+                                            {
+                                                <div title="Valore Modificato"><span class="small text-dark"></span><b>@record.ValoreEdit</b></div>
+                                                <div class="small text-secondary" title="Valore Registrato">(<i>@record.Valore</i>)</div>
+                                            }
+                                            else
+                                            {
+                                                <div><span class="small text-dark"></span>@record.ValoreEdit</div>
+                                            }
                                         </td>
                                     </tr>
                                 }

MP.SPEC/Components/ListDossiers.razor.cs

@@ -1,17 +1,19 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.DTO;
 using MP.SPEC.Data;
+using Newtonsoft.Json;
 
 namespace MP.SPEC.Components
 {
-    public partial class ListDossiers
+    public partial class ListDossiers : IDisposable
     {
         #region Public Properties
 
         [Parameter]
-        public EventCallback<Dossiers> RecordSel { get; set; }
+        public EventCallback<DossierModel> RecordSel { get; set; }
 
         [Parameter]
         public EventCallback<FluxLogDTO> RecordSelFlux { get; set; }
@@ -26,7 +28,7 @@ namespace MP.SPEC.Components
 
         #region Public Methods
 
-        public string checkSelect(Dossiers recordSel)
+        public string checkSelect(DossierModel recordSel)
         {
             string answ = "";
             if (currRecord != null)
@@ -40,6 +42,52 @@ namespace MP.SPEC.Components
             }
             return answ;
         }
+        private bool selectFirst(string idxMacchina)
+        {
+            //string firstMacchina = "";
+            bool answ = false;
+            if (ListMacchine != null)
+            {
+                if (idxMacchina == idxMacchina)
+                {
+                    answ = true;
+                }
+                else
+                {
+                    answ = false;
+                }
+
+                //var rawData = ListMacchine.Select(x => x.IdxMacchina).FirstOrDefault();
+                //firstMacchina = rawData != null ? rawData : "";
+            }
+            //if (firstMacchina == idxMacchina)
+            //{
+            //    answ = true;
+            //}
+            return answ;
+        }
+        public string checkSelPar(FluxLogDTO recordSel)
+        {
+            string answ = "";
+            if (currFluxLogDto != null)
+            {
+                try
+                {
+                    answ = (currFluxLogDto.CodFlux == recordSel.CodFlux && currFluxLogDto.dtEvento == recordSel.dtEvento) ? "table-info" : "";
+                }
+                catch
+                { }
+            }
+            return answ;
+        }
+
+        public void Dispose()
+        {
+            currRecord = null;
+            SearchRecords = null;
+            ListRecords = null;
+            GC.Collect();
+        }
 
         #endregion Public Methods
 
@@ -51,19 +99,62 @@ namespace MP.SPEC.Components
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MessageService { get; set; } = null!;
-
         #endregion Protected Properties
 
         #region Protected Methods
 
+        protected async Task cancel()
+        {
+            var alert = await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler annullare TUTTE le modifiche? i dati saranno ricaricati.");
+            if (alert)
+            {
+                currFluxLogDto = null;
+                isEditing = false;
+                await Task.Delay(1);
+                if (currRecord != null)
+                {
+                    listaFlux = MDService.getFluxLog(currRecord.Valore);
+                }
+                StateHasChanged();
+            }
+        }
+
+        protected async Task cancelNewDoss()
+        {
+            var alert = await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler annullare l'aggiunta di un nuovo dossier? i dati saranno ricaricati.");
+            if (alert)
+            {
+                currRecordClone = null;
+                isEditing = false;
+                await Task.Delay(1);
+                StateHasChanged();
+            }
+        }
+
+        protected async Task cloneRecord(DossierModel selRec)
+        {
+            // creo record duplicato...
+            DossierModel newRec = new DossierModel()
+            {
+                //IdxDossier = 0,
+                DataType = selRec.DataType,
+                KeyRichiesta = selRec.KeyRichiesta,
+                DtRif = DateTime.Now,
+                IdxMacchina = selRec.IdxMacchina,
+                CodArticolo = selRec.CodArticolo,
+                IdxODL = 0,
+                Valore = selRec.Valore,
+            };
+            currRecordClone = newRec;
+            await Task.Delay(1);
+        }
+
         /// <summary>
         /// Eliminazione record selezionato (previa conferma)
         /// </summary>
         /// <param name="selRec"></param>
         /// <returns></returns>
-        protected async Task deleteRecord(Dossiers selRec)
+        protected async Task deleteRecord(DossierModel selRec)
         {
             if (!await JSRuntime.InvokeAsync<bool>("confirm", "Eliminazione Dossier: sei sicuro di voler procedere?"))
                 return;
@@ -77,30 +168,88 @@ namespace MP.SPEC.Components
 
         protected async Task editRecord(FluxLogDTO selRec)
         {
+            currFluxLogDto = selRec;
             // indico record selezionato
             await RecordSelFlux.InvokeAsync(selRec);
         }
 
-        protected string findRec(FluxLog record)
+        protected async Task newDossier(DossierModel selRec)
         {
-            string answ = "";
-#if false
-            if (ListRecordsMod != null)
+            var alert = await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler creare un nuovo Dossier per l'impianto/articolo selezioanto?");
+
+            if (alert)
             {
-                answ = ListRecordsMod.Where(l => l.IdxMacchina == record.IdxMacchina && l.CodFlux == record.CodFlux).Select(x => x.Valore).SingleOrDefault();
+                await Task.Delay(1);
+                if (currRecordClone != null)
+                {
+                    // serializzo valore x flux log...
+
+                    DossierFluxLogDTO? valoreDeserializzato = JsonConvert.DeserializeObject<DossierFluxLogDTO>(selRec.Valore);
+                    if (valoreDeserializzato != null)
+                    {
+
+                        listaFlux = valoreDeserializzato
+                            .ODL
+                            .OrderBy(x => x.CodFlux)
+                            .ToList();
+                    }
+
+                    if (listaFlux != null)
+                    {
+                        foreach (var item in listaFlux)
+                        {
+                            item.IdxMacchina = selRec.IdxMacchina;
+                            item.Valore = "0";
+                            item.dtEvento = DateTime.Now;
+                        }
+                    }
+
+                    DossierFluxLogDTO updatedResult = new DossierFluxLogDTO() { ODL = listaFlux };
+                    string newVal = JsonConvert.SerializeObject(updatedResult);
+                    // preparo x insert
+                    currRecordClone.DtRif = DateTime.Now;
+                    currRecordClone.IdxMacchina = selRec.IdxMacchina;
+                    currRecordClone.CodArticolo = selRec.CodArticolo;
+                    currRecordClone.KeyRichiesta = selRec.KeyRichiesta;
+                    currRecordClone.Valore = newVal;
+                    // METODO PER UPDATE FLUX
+                    await MDService.DossiersInsert(currRecordClone);
+                    //await reloadData(true);
+                    currRecordClone = null;
+                    isEditing = false;
+                    await Task.Delay(1);
+                    StateHasChanged();
+                    await flushCache();
+                }
+                return;
+            }
+            else
+            {
+                currRecordClone = null;
+                await Task.Delay(1);
+                // TOGLIERE!!!!!
+                NavManager.NavigateTo("DOSS", true);
             }
-#endif
-            return answ;
         }
 
         protected override async Task OnInitializedAsync()
         {
-            MessageService.EA_PageUpdated += MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            ListGruppiFase = await MDService.ElencoGruppiFase();
             ListStati = await MDService.AnagStatiComm();
+            ListArticoli = await MDService.ArticoliGetSearch(100000, "BAGLIETTO", "");
+            ListMacchine = await MDService.MacchineGetAll();
             await reloadData(true);
         }
 
+        protected override async Task OnParametersSetAsync()
+        {
+            if (!lastFilter.Equals(SelFilter))
+            {
+                lastFilter = SelFilter.clone();
+                await reloadData(true);
+            }
+        }
+
         protected async void OnSeachUpdated()
         {
             await InvokeAsync(() =>
@@ -110,7 +259,7 @@ namespace MP.SPEC.Components
             });
         }
 
-        protected async Task selRecord(Dossiers selRec)
+        protected async Task selRecord(DossierModel selRec)
         {
             currRecord = selRec;
             await RecordSel.InvokeAsync(selRec);
@@ -118,6 +267,37 @@ namespace MP.SPEC.Components
             await toggleTableFlux();
         }
 
+        protected async Task update(FluxLogDTO selRec)
+        {
+            var alert = await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler salvare TUTTE le modifiche? queste saranno parte del dossier inviato all'impianto");
+
+            if (alert)
+            {
+                await Task.Delay(1);
+                if (currRecord != null)
+                {
+                    // serializzo valore x flux log...
+                    DossierFluxLogDTO updatedResult = new DossierFluxLogDTO() { ODL = listaFlux };
+                    string newVal = JsonConvert.SerializeObject(updatedResult);
+                    currRecord.Valore = newVal;
+                    // METODO PER UPDATE FLUX
+                    await MDService.DossiersUpdateValore(currRecord);
+                    currFluxLogDto = null;
+                    isEditing = false;
+                    await Task.Delay(1);
+                    StateHasChanged();
+                }
+                return;
+            }
+            else
+            {
+                currFluxLogDto = null;
+                await Task.Delay(1);
+                // rimando a pagina corrente
+                NavManager.NavigateTo(NavManager.Uri, true);
+            }
+        }
+
         protected async Task UpdateData()
         {
             currRecord = null;
@@ -130,13 +310,23 @@ namespace MP.SPEC.Components
 
         private int _totalCount = 0;
 
-        private Dossiers? currRecord = null;
+        private FluxLogDTO? currFluxLogDto = null;
+
+        private DossierModel? currRecord = null;
+
+        private DossierModel? currRecordClone = null;
+
+        private List<AnagGruppi>? ListGruppiFase;
+
+        private List<DossierModel>? ListRecords;
 
-        private FluxLogDTO? currRecordFlux;
-        private List<Dossiers>? ListRecords;
         private List<ListValues>? ListStati;
 
-        private List<Dossiers>? SearchRecords;
+        private List<DossierModel>? SearchRecords;
+
+        private List<Macchine>? ListMacchine;
+
+        private List<AnagArticoli>? ListArticoli;
 
         #endregion Private Fields
 
@@ -144,12 +334,20 @@ namespace MP.SPEC.Components
 
         private int currPage
         {
-            get => MessageService.currPage;
-            set => MessageService.currPage = value;
+            get => SelFilter.CurrPage;
+            set => SelFilter.CurrPage = value;
+        }
+
+        private bool isEditing
+        {
+            get => SelFilter.isEditing;
+            set => SelFilter.isEditing = value;
         }
 
         private bool isLoading { get; set; } = false;
 
+        private SelectDossierParams lastFilter { get; set; } = new SelectDossierParams() { CurrPage = -1 };
+
         private List<FluxLogDTO>? listaFlux { get; set; } = null;
 
         private int MaxRecord
@@ -157,10 +355,13 @@ namespace MP.SPEC.Components
             get => SelFilter.MaxRecord;
         }
 
+        [Inject]
+        private NavigationManager NavManager { get; set; } = null!;
+
         private int numRecord
         {
-            get => MessageService.numRecord;
-            set => MessageService.numRecord = value;
+            get => SelFilter.NumRec;
+            set => SelFilter.NumRec = value;
         }
 
         private string SelArticolo
@@ -168,9 +369,14 @@ namespace MP.SPEC.Components
             get => SelFilter.CodArticolo;
         }
 
-        private DateTime SelDtRef
+        private DateTime SelDtEnd
         {
-            get => SelFilter.DtRef;
+            get => SelFilter.DtEnd;
+        }
+
+        private DateTime SelDtStart
+        {
+            get => SelFilter.DtStart;
         }
 
         private string SelMacchina
@@ -197,15 +403,47 @@ namespace MP.SPEC.Components
 
         #region Private Methods
 
-        private async void MessageService_EA_PageUpdated()
+        private async Task closeTableFlux()
         {
-            await reloadData(true);
+            currFluxLogDto = null;
+            currRecord = null;
+            currRecordClone = null;
+            visualizzaFlux = true;
+            isEditing = false;
+            await RecordSelFlux.InvokeAsync(currFluxLogDto);
+            await Task.Delay(1);
+        }
+        public async Task flushCache()
+        {
+            await Task.Delay(1);
+            await MDService.FlushRedisCache();
+            await Task.Delay(1);
+            // rimando a pagina corrente
+            NavManager.NavigateTo(NavManager.Uri, true);
+        }
+        private string css()
+        {
+            string answ = "";
+            if (isEditing)
+            {
+                answ = "visible";
+            }
+            else
+            {
+                answ = "hidden";
+            }
+            return answ;
+        }
+
+        private void enableEditing()
+        {
+            isEditing = true;
         }
 
         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);
@@ -236,11 +474,10 @@ namespace MP.SPEC.Components
             return answ;
         }
 
-        private async Task unToggleTableFlux()
+        private string traduci(string lemma)
         {
-            currRecord = null;
-            visualizzaFlux = true;
-            await Task.Delay(1);
+            var answ = MDService.Traduci(lemma, "IT");
+            return answ;
         }
 
         #endregion Private Methods

MP.SPEC/Components/ListODL.razor

@@ -12,10 +12,30 @@ else if (totalCount == 0)
 else
 {
     <div class="row">
+        @if (currRecord != null && !showStats && isCurrOdl)
+        {
+            <div class="col-6 col-lg-8">
+                <button @onclick="() => forceSyncDb()" class="btn btn-success btn-sm btn-">Forza sync dati ODL <i class="bi bi-fast-forward-circle"></i></button>
+            </div>
+            <div class="col-6 col-lg-4 text-end">
+                @*<div class="px-2 input-group" title="Selezionare Data-Ora chiusura ODL">
+        <label class="input-group-text" for="dtMax"><i class="fa-regular fa-calendar-minus"></i></label>
+        <input class="form-control" @bind="@selDtFine" id="dtMax" type="datetime-local">
+        <button @onclick="() => chiudiOdl()" class="btn btn-danger btn-sm btn-">Registra chiusura ODL <i class="far fa-stop-circle"></i></button>
+        </div>*@
+                <button @onclick="() => chiudiOdl()" class="btn btn-danger btn-sm btn-">Registra chiusura ODL <i class="far fa-stop-circle"></i></button>
+            </div>
+        }
         <div class="col-12">
             <table class="table table-sm table-striped">
                 <thead>
                     <tr>
+                        <th>
+                            @if (currRecord != null)
+                            {
+                                <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                            }
+                        </th>
                         <th><i class="fa-solid fa-file"></i> Articolo</th>
                         <th><i class="fa-solid fa-screwdriver-wrench"></i> Fase</th>
                         <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
@@ -28,6 +48,17 @@ else
                     @foreach (var record in ListRecords)
                     {
                         <tr class="@checkSelect(@record.IdxOdl)">
+
+                            <td>
+                                @if (isCurrOdl)
+                                {
+                                    <button class="btn btn-primary btn-sm" @onclick="() => selRecord(record)"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                }
+                                else
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                }
+                            </td>
                             <td>
                                 @record.CodArticolo
                                 <div class="small textConsensed text-secondary">@record.ArticoloNav.DescArticolo</div>
@@ -83,7 +114,7 @@ else
                                     <b>@record.DurataMinuti</b>
                                 </div>
                                 <div>
-                                    <button class="btn btn-sm btn-primary py-0" type="button" @onclick="() => selectRecord(record)" data-bs-toggle="modal" data-bs-target="#staticBackdrop" title="Mostra statistiche"><i class="fa-solid fa-chart-pie"></i></button>
+                                    <button class="btn btn-sm btn-primary py-0" type="button" @onclick="() => selectStatRecord(record)" data-bs-toggle="modal" data-bs-target="#myModal" title="Mostra statistiche"><i class="fa-solid fa-chart-pie"></i></button>
                                 </div>
                                 <!-- Modal -->
                             </td>
@@ -91,22 +122,22 @@ else
                     }
                 </tbody>
             </table>
-            <div class="modal fade" id="staticBackdrop" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+            <div class="modal fade" id="myModal" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
                 <div class="modal-dialog modal-dialog-centered modal-xl">
                     <div class="modal-content">
                         <div class="modal-header bg-primary col-12">
-                            @if (currRecord != null)
+                            @if (statRecord != null)
                             {
                                 <div class="col-3">
-                                    <b class="modal-title fs-1" id="staticBackdropLabel"><b>ODL @currRecord.IdxOdl</b></b>
+                                    <b class="modal-title fs-1" id="staticBackdropLabel"><b>ODL @statRecord.IdxOdl</b></b>
                                 </div>
                                 <div class="col-6 fs-5">
-                                    <b>@currRecord.CodArticolo</b>
-                                    <div class="small textConsensed text-light">@currRecord.ArticoloNav.DescArticolo</div>
+                                    <b>@statRecord.CodArticolo</b>
+                                    <div class="small textConsensed text-light">@statRecord.ArticoloNav.DescArticolo</div>
                                 </div>
                                 <div class="col-2 fs-5">
-                                    <b>@currRecord.IdxMacchina</b>
-                                    <div class="small textConsensed text-light">@currRecord.MachineNav.Descrizione</div>
+                                    <b>@statRecord.IdxMacchina</b>
+                                    <div class="small textConsensed text-light">@statRecord.MachineNav.Descrizione</div>
                                 </div>
                             }
                             <div class="col-1 text-end">
@@ -114,7 +145,7 @@ else
                             </div>
                         </div>
                         <div class="modal-body col-12">
-                            @if (currRecord != null)
+                            @if (statRecord != null && showStats)
                             {
                                 <div class="d-flex justify-content-between">
                                     <div class="col-8">
@@ -123,23 +154,23 @@ else
                                                 <tbody>
                                                     <tr>
                                                         <td style="width: 270px">
-                                                            <div class="small textConsensed"><b>N° pezzi:</b> @currRecord.NumPezzi</div>
-                                                            <div class="small textConsensed"><b>T. Ciclo:</b> @currRecord.Tcassegnato.ToString("N3")</div>
+                                                            <div class="small textConsensed"><b>N° pezzi:</b> @statRecord.NumPezzi</div>
+                                                            <div class="small textConsensed"><b>T. Ciclo:</b> @statRecord.Tcassegnato.ToString("N3")</div>
                                                         </td>
                                                         <td style="width: 300px">
                                                             <div class="small d-flex justify-content-between">
                                                                 <div>
-                                                                    <div><b>@($"{@currRecord.DataInizio:yyyy/MM/dd}")</b></div>
-                                                                    <div>@($"{@currRecord.DataInizio:ddd HH:mm:ss}")</div>
+                                                                    <div><b>@($"{@statRecord.DataInizio:yyyy/MM/dd}")</b></div>
+                                                                    <div>@($"{@statRecord.DataInizio:ddd HH:mm:ss}")</div>
                                                                 </div>
                                                                 <div class="p-0">
                                                                     <i class="fa-solid fa-angles-right"></i>
                                                                 </div>
                                                                 <div>
-                                                                    @if (@currRecord.DataFine != null)
+                                                                    @if (@statRecord.DataFine != null)
                                                                     {
-                                                                        <div><b>@($"{@currRecord.DataFine:yyyy/MM/dd}")</b></div>
-                                                                        <div>@($"{@currRecord.DataFine:ddd HH:mm:ss}")</div>
+                                                                        <div><b>@($"{@statRecord.DataFine:yyyy/MM/dd}")</b></div>
+                                                                        <div>@($"{@statRecord.DataFine:ddd HH:mm:ss}")</div>
                                                                     }
                                                                     else
                                                                     {
@@ -151,10 +182,6 @@ else
                                                                 </div>
                                                             </div>
                                                         </td>
-                                                        <td>
-
-                                                            <!-- Modal -->
-                                                        </td>
                                                     </tr>
                                                 </tbody>
                                             </table>
@@ -165,39 +192,49 @@ else
                                                     <tr>
                                                         <td>
                                                             <div>
-                                                                @tradFase(currRecord.KeyRichiesta)
+                                                                @tradFase(statRecord.KeyRichiesta)
                                                             </div>
-                                                            @if (currRecord.Note != "")
+                                                            @if (statRecord.Note != "")
                                                             {
                                                                 <div class="small textConsensed text-secondary badge text-bg-light border border-secondary rounded">
-                                                                    <b class="text-dark"></b> <span class="text-wrap text-start"> @currRecord.Note </span>
+                                                                    <b class="text-dark"></b> <span class="text-wrap text-start"> @statRecord.Note </span>
                                                                 </div>
                                                             }
                                                         </td>
+                                                        <td>
+                                                            <div class="input-group input-group-sm">
+                                                                <div class="input-group-text">
+                                                                    <span class="me-1 @leftStringCSS">Tutti gli Stati</span>
+                                                                    <span class="form-check form-check-sm form-switch py-1" title="Mostra/Nascondi macchina spenta">
+                                                                        <input class="form-check-input" type="checkbox" id="switchSpenta" @onchange="() => toggleSpenta()" value="@hideSpenta">
+                                                                    </span>
+                                                                    <span class="@rightStringCSS">Nascondi Spenta</span>
+                                                                </div>
+                                                            </div>
+                                                        </td>
                                                     </tr>
                                                 </tbody>
                                             </table>
                                         </div>
                                         <div>
-                                            @if (currRecord != null)
+                                            @if (statRecord != null)
                                             {
-
-                                                @if (ListOdlStats != null)
+                                                @if (ListOdlStatsAct != null)
                                                 {
-                                                    @foreach (var statRecord in ListOdlStats)
+                                                    @foreach (var stat in ListOdlStatsAct)
                                                     {
                                                         <div class="p-1">
                                                             <div class="d-flex justify-content-between">
                                                                 <div class="text-uppercase">
-                                                                    @statRecord.Descrizione
+                                                                    @stat.Descrizione
                                                                 </div>
                                                                 <div>
-                                                                    <b>@(formDurata(statRecord.TotDurata))</b>
+                                                                    <b>@(formDurata(stat.TotDurata))</b>
                                                                 </div>
 
                                                             </div>
                                                             <div class="progress">
-                                                                <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" style="width: @Math.Round(calcolaPerc(statRecord.TotDurata),0)%; background-color:@statRecord.Css;" aria-valuemax="100">@($"{calcolaPerc(statRecord.TotDurata):N1}%")</div>
+                                                                <div class="progress-bar @colorChanger(@stat.Css)" role="progressbar" aria-valuenow="0" aria-valuemin="0" style="width: @Math.Round(calcolaPerc(stat.TotDurata),0)%; background-color:@pbStyle(@stat.Css);" aria-valuemax="100">@($"{calcolaPerc(stat.TotDurata):N1}%")</div>
                                                             </div>
                                                         </div>
 
@@ -207,13 +244,16 @@ else
                                         </div>
                                     </div>
                                     <div class="col-4 dcContainer">
-                                        @if (currRecord != null)
+                                        @if (statRecord != null && ListOdlStats != null)
                                         {
                                             <div class="dcBox">
-                                                <ODLPlot SelectedOdl="@currRecord.IdxOdl"></ODLPlot>
+                                                <ODLPlot SelectedOdl="@statRecord.IdxOdl" hideSpenta="@hideSpenta"></ODLPlot>
                                             </div>
-                                            <div class="dcBox dcOverlay">
-                                                <b class="fs-3">@currRecord.DurataMinuti</b>
+                                            <div class="dcBox dcOverlay d-flex">
+                                                <div class="align-self-center text-center w-100">
+                                                    <b class="fs-3">@durataFilt</b>
+                                                    @*<b class="fs-3">@statRecord.DurataMinuti</b>*@
+                                                </div>
                                             </div>
                                         }
                                     </div>
@@ -227,5 +267,3 @@ else
     </div>
 }
 
-<style>
-</style>

MP.SPEC/Components/ListODL.razor.cs

@@ -1,12 +1,13 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using MP.Data;
 using MP.Data.DatabaseModels;
 using MP.SPEC.Data;
+using MP.SPEC.Services;
+using NLog;
 
 namespace MP.SPEC.Components
 {
-    public partial class ListODL
+    public partial class ListODL : IDisposable
     {
         #region Public Properties
 
@@ -38,9 +39,21 @@ namespace MP.SPEC.Components
             return answ;
         }
 
+        public void Dispose()
+        {
+            currRecord = null;
+            SearchRecords = null;
+            ListRecords = null;
+            ListStati = null;
+            ListOdlStats = null;
+            ListOdlStatsNetto = null;
+            statRecord = null;
+            GC.Collect();
+        }
+
         public string formDurata(double durataMin)
         {
-            return Utils.FormDurata(durataMin);
+            return MP.Data.Utils.FormDurata(durataMin);
         }
 
         #endregion Public Methods
@@ -54,12 +67,61 @@ namespace MP.SPEC.Components
         protected MpDataService MDService { get; set; } = null!;
 
         [Inject]
-        protected MessageService MessageService { get; set; } = null!;
+        protected IOApiService MpIoApiCall { get; set; } = null!;
 
         #endregion Protected Properties
 
         #region Protected Methods
 
+        /// <summary>
+        /// Registra chiusura ODL alla data indicata
+        /// </summary>
+        /// <returns></returns>
+        protected async Task chiudiOdl()
+        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sei sicuro di voler chiudere l'ODL corrente?"))
+                return;
+
+            if (currRecord != null)
+            {
+                // effettua chiusura sul DB
+                await MDService.ODLClose(currRecord.IdxOdl, currRecord.IdxMacchina, 0, true);
+                Log.Info($"Effettuata chiusura ODL {currRecord.IdxOdl}");
+                // ricarica...
+                await selRecord(null);
+            }
+            await reloadData();
+        }
+
+        protected string colorChanger(string colorCSS)
+        {
+            string answ = "";
+            if (colorCSS == "yellow")
+            {
+                answ = "text-dark";
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Richiesta invio sync all'IOB-WIN
+        /// </summary>
+        /// <returns></returns>
+        protected async Task forceSyncDb()
+        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sei sicuro di voler reinviare i dati (Articoli, PODL) all'impianto?"))
+                return;
+
+            if (currRecord != null)
+            {
+                await callSyncDb(currRecord.IdxMacchina);
+                Log.Info($"Richiesto forceSyncDb per idxMacc {currRecord.IdxMacchina}");
+                // ricarica...
+                await selRecord(null);
+            }
+            await reloadData();
+        }
+
         protected override async Task OnInitializedAsync()
         {
             ListStati = await MDService.AnagStatiComm();
@@ -75,29 +137,56 @@ namespace MP.SPEC.Components
             await InvokeAsync(() =>
             {
                 PagerResetReq.InvokeAsync(true);
-                //currPage = 1;
                 Task task = UpdateData();
                 StateHasChanged();
             });
         }
 
-        protected async Task selectRecord(ODLModel? currRec)
+        protected async Task resetSel()
         {
+            await selRecord(null);
+            await reloadData();
+        }
+
+        protected async Task selectStatRecord(ODLModel? currRec)
+        {
+            showStats = true;
             await Task.Delay(1);
-            currRecord = currRec;
+            statRecord = currRec;
             if (currRec != null)
             {
-                ListOdlStats = await MDService.StatOdl(currRec.IdxOdl);
+                await reloadStatsData(currRec);
             }
             else
             {
+                showStats = false;
                 ListOdlStats = null;
             }
         }
 
+        protected async Task selRecord(ODLModel? currRec)
+        {
+            await Task.Delay(1);
+            selDtFine = DateTime.Now;
+            currRecord = currRec;
+            showStats = false;
+            ListOdlStats = null;
+            ListOdlStatsNetto = null;
+        }
+
+        protected async Task toggleSpenta()
+        {
+            hideSpenta = !hideSpenta;
+            await Task.Delay(1);
+            if (statRecord != null)
+            {
+                await reloadStatsData(statRecord);
+            }
+        }
+
         protected async Task UpdateData()
         {
-            await selectRecord(null);
+            await selRecord(null);
             await reloadData();
         }
 
@@ -105,49 +194,158 @@ namespace MP.SPEC.Components
 
         #region Private Fields
 
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
         private ODLModel? currRecord = null;
+
         private List<StatODLModel>? ListOdlStats;
-        private List<double>? ListOdlStatsData = new List<double>();
-        private List<string>? ListOdlStatsLabels = new List<string>();
+
+        private List<StatODLModel>? ListOdlStatsNetto;
+
         private List<ODLModel>? ListRecords;
+
         private List<ListValues>? ListStati;
+
         private List<ODLModel>? SearchRecords;
 
+        private ODLModel? statRecord = null;
+
         #endregion Private Fields
 
         #region Private Properties
 
+        private int _totalCount { get; set; } = 0;
+
         private int currPage
         {
-            get => MessageService.currPage;
-            set => MessageService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
+        }
+
+        private string durataFilt
+        {
+            get
+            {
+                string answ = "ND";
+                if (statRecord != null)
+                {
+                    if (hideSpenta)
+                    {
+                        if (ListOdlStatsNetto != null)
+                        {
+                            var tsDurata = TimeSpan.FromMinutes(ListOdlStatsNetto.Sum(x => x.TotDurata));
+                            if (tsDurata.TotalDays < 1)
+                            {
+                                answ = $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'";
+                            }
+                            else
+                            {
+                                answ = $"{tsDurata.Days}gg {tsDurata.Hours:00}h";
+                            }
+                        }
+                    }
+                    else
+                    {
+                        answ = statRecord.DurataMinuti;
+                    }
+                }
+                return answ;
+            }
+        }
+
+        private bool hideSpenta { get; set; } = false;
+
+        /// <summary>
+        /// Indica se si tratti di ODL correnti
+        /// </summary>
+        private bool isCurrOdl
+        {
+            get => currFilter.IsActive;
         }
 
         private bool isLoading { get; set; } = false;
 
-        private int numRecord
+        private string leftStringCSS
         {
-            get => MessageService.numRecord;
-            set => MessageService.numRecord = value;
+            get => hideSpenta ? "text-secondary" : "text-dark fw-bold";
         }
 
-        private int totalCount { get; set; } = 0;
+        private List<StatODLModel>? ListOdlStatsAct
+        {
+            get
+            {
+                List<StatODLModel>? answ = new List<StatODLModel>();
+                if (hideSpenta)
+                {
+                    answ = ListOdlStatsNetto;
+                }
+                else
+                {
+                    answ = ListOdlStats;
+                }
+                return answ;
+            }
+        }
+
+        private int numRecord
+        {
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
+        }
+
+        private string rightStringCSS
+        {
+            get => hideSpenta ? "text-dark fw-bold" : "text-secondary";
+        }
+
+        private DateTime selDtFine { get; set; } = DateTime.Now;
+
+        private bool showStats { get; set; } = false;
+
+        private int totalCount
+        {
+            get => _totalCount;
+            set
+            {
+                if (_totalCount != value)
+                {
+                    _totalCount = value;
+                    updateRecordCount.InvokeAsync(value);
+                }
+            }
+        }
 
         #endregion Private Properties
 
         #region Private Methods
 
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task addTask2Exe(string idxMacc, string taskName, string taskVal)
+        {
+            // compongo URL e chiamo
+            string restUrl = $"IOB/addTask2Exe/{idxMacc}?taskName={taskName}&taskVal={taskVal}";
+            try
+            {
+                var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Errore durante chiamata: {Environment.NewLine}{exc}");
+            }
+        }
+
         private double calcolaPerc(double durata)
         {
             double answ = 0;
 
             double tot = 0;
-            if (ListOdlStats != null)
+            if (ListOdlStatsAct != null)
             {
-                foreach (var item in ListOdlStats)
-                {
-                    tot += item.TotDurata;
-                }
+                tot = ListOdlStatsAct.Sum(x => x.TotDurata);
 
                 double perc = (durata / tot) * 100;
                 if (perc > 1)
@@ -162,23 +360,64 @@ namespace MP.SPEC.Components
             return answ;
         }
 
-        private async void MessageService_EA_PageUpdated()
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="IdxMacc"></param>
+        /// <returns></returns>
+        private async Task callSyncDb(string IdxMacc)
         {
-            await reloadData();
+            // chiamo aggiunta task SyncDb...
+            await addTask2Exe(IdxMacc, "syncDbData", "");
+        }
+
+        private string pbStyle(string css)
+        {
+            string answ = "";
+            if (ListOdlStats != null)
+            {
+                if (css == "yellow")
+                {
+                    answ = "orange";
+                }
+                else if (css == "blue")
+                {
+                    answ = "#2874A6";
+                }
+                else
+                {
+                    answ = css;
+                }
+            }
+            return answ;
         }
 
         private async Task reloadData()
         {
             isLoading = true;
-            SearchRecords = await MDService.ListODLFilt(currFilter.IsActive, currFilter.SearchVal, currFilter.CodStato, currFilter.DtStart, currFilter.DtEnd);
+            SearchRecords = await MDService.ListODLFilt(currFilter.IsActive, currFilter.SearchVal, currFilter.CodStato, currFilter.IdxMacchina, currFilter.DtStart, currFilter.DtEnd);
             totalCount = SearchRecords.Count;
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             await Task.Delay(1);
             await InvokeAsync(() => StateHasChanged());
-            await updateRecordCount.InvokeAsync(totalCount);
             isLoading = false;
         }
 
+        private async Task reloadStatsData(ODLModel? currRec)
+        {
+            showStats = true;
+            if (currRec != null)
+            {
+                ListOdlStats = await MDService.StatOdl(currRec.IdxOdl);
+                ListOdlStatsNetto = ListOdlStats.Where(x => x.Semaforo != "sGr").ToList();
+            }
+            else
+            {
+                ListOdlStats = null;
+                ListOdlStatsNetto = null;
+            }
+        }
+
         private string tradFase(string codFase)
         {
             string answ = codFase;

MP.SPEC/Components/ListPARAMS.razor

@@ -17,11 +17,15 @@ else
                 <thead>
                     <tr>
                         <th>
-                            <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                            @if (currRecord != null)
+                            {
+                                <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                            }
                         </th>
                         <th><i class="fa-regular fa-calendar-days"></i> Data</th>
                         <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
                         <th><i class="fa-solid fa-sliders"></i> Parametro</th>
+                        <th><i class="fa-solid fa-sliders"></i> Nome</th>
                         <th style="text-align: right">Valore</th>
                     </tr>
                 </thead>
@@ -41,6 +45,9 @@ else
                             <td>
                                 @record.CodFlux
                             </td>
+                            <td>
+                                @traduci(record.CodFlux)
+                            </td>
                             <td style="text-align: right">
                                 <b>@record.Valore</b>
                             </td>

MP.SPEC/Components/ListPARAMS.razor.cs

@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.SPEC.Data;
 using System.Diagnostics;
+using MP.Data;
 
 namespace MP.SPEC.Components
 {
@@ -25,7 +26,7 @@ namespace MP.SPEC.Components
         #endregion Public Properties
 
         #region Public Methods
-
+        private SelectFluxParams lastFilter { get; set; } = new SelectFluxParams() { CurrPage = -1 };
         public string checkSelect(FluxLog selRecord)
         {
             string answ = "";
@@ -45,10 +46,10 @@ namespace MP.SPEC.Components
         {
             await Task.Delay(1);
             // se sono cambiati --> rileggo...
-            if (LastFilter==null || !SelFilter.Equals(LastFilter))
+            if (!lastFilter.Equals(SelFilter))
             {
-                await reloadData(false);
-                LastFilter = SelFilter;
+                lastFilter = SelFilter.clone();
+                await reloadData(true);
             }
         }
 
@@ -58,10 +59,12 @@ namespace MP.SPEC.Components
         public void Dispose()
         {
             aTimer.Elapsed -= ElapsedTimer;
-            MessageService.EA_PageUpdated -= MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
             aTimer.Stop();
             aTimer.Dispose();
+            currRecord = null;
+            SearchRecords = null;
+            ListRecords = null;
+            GC.Collect();
         }
 
         public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
@@ -124,9 +127,6 @@ namespace MP.SPEC.Components
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MessageService { get; set; } = null!;
-
         protected int RefreshPeriod
         {
             get => SelFilter.TempoAgg;
@@ -136,10 +136,8 @@ namespace MP.SPEC.Components
 
         #region Protected Methods
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            MessageService.EA_PageUpdated += MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
             StartTimer();
         }
 
@@ -159,6 +157,7 @@ namespace MP.SPEC.Components
         protected async Task resetSel()
         {
             currRecord = null;
+            setDtMax();
             await RecordSel.InvokeAsync(null);
         }
 
@@ -166,8 +165,13 @@ namespace MP.SPEC.Components
         {
             currRecord = selRec;
             SelFilter.IdxMacchina = selRec.IdxMacchina;
+            SelDtMax = selRec.dtEvento;
+            // imposto pag 1 filtro
+            SelFilter.CurrPage = 1;
+            //selDtMin = RoundDatetime(5).AddHours(-25);
             await reloadData(false);
             await RecordSel.InvokeAsync(selRec);
+            await PagerResetReq.InvokeAsync(true);
         }
 
         protected async Task UpdateData()
@@ -178,6 +182,13 @@ namespace MP.SPEC.Components
 
         #endregion Protected Methods
 
+
+        private string traduci(string lemma)
+        {
+            var answ = MDService.Traduci(lemma, "IT");
+            return answ;
+        }
+
         #region Private Fields
 
         private static System.Timers.Timer aTimer = null!;
@@ -193,8 +204,8 @@ namespace MP.SPEC.Components
 
         private int currPage
         {
-            get => MessageService.currPage;
-            set => MessageService.currPage = value;
+            get => SelFilter.CurrPage;
+            set => SelFilter.CurrPage = value;
         }
 
         private bool isLoading { get; set; } = false;
@@ -211,8 +222,8 @@ namespace MP.SPEC.Components
 
         private int numRecord
         {
-            get => MessageService.numRecord;
-            set => MessageService.numRecord = value;
+            get => SelFilter.NumRec;
+            set => SelFilter.NumRec = value;
         }
 
         private string SelFlux
@@ -227,8 +238,33 @@ namespace MP.SPEC.Components
         private DateTime? SelDtMax
         {
             get => SelFilter.dtMax;
+            set => SelFilter.dtMax = value;
+        }
+        protected void setDtMax()
+        {
+            // copio il filtro
+            var currFilt = SelFilter;
+            // fermo update
+            //currFilt.LiveUpdate = true;
+            currFilt.CurrPage = 0;
+            currFilt.lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
+            currFilt.dtMax = RoundDatetime(5);
+            currFilt.dtMin = RoundDatetime(5).AddHours(-25);
+            SelFilter = currFilt;
         }
 
+        /// <summary>
+        /// Inizializzazione con periodo e arrotondamento
+        /// </summary>
+        /// <param name="minRound"></param>
+        /// <returns></returns>
+        public static DateTime RoundDatetime(int minRound)
+        {
+            TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today);
+            int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound;
+            DateTime endRounded = DateTime.Today.AddMinutes(minDay);
+            return endRounded;
+        }
         private int totalCount
         {
             get => _totalCount;
@@ -246,11 +282,6 @@ namespace MP.SPEC.Components
 
         #region Private Methods
 
-        private async void MessageService_EA_PageUpdated()
-        {
-            await reloadData(true);
-        }
-
         #endregion Private Methods
     }
 }

MP.SPEC/Components/ListPODL.razor

@@ -1,7 +1,7 @@
 @using MP.SPEC.Components
 @using MP.SPEC.Data
 
-@if (ListRecords == null)
+@if (ListRecords == null || isLoading)
 {
     <LoadingData></LoadingData>
 }
@@ -17,7 +17,10 @@ else
                 <thead>
                     <tr>
                         <th>
-                            <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                            @if (currRecord != null)
+                            {
+                                <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                            }
                         </th>
                         <th><i class="fa-solid fa-file"></i> Articolo</th>
                         <th><i class="fa-solid fa-screwdriver-wrench"></i> Fase</th>
@@ -35,6 +38,18 @@ else
                             <td class="text-nowrap">
                                 <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
                                 <button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
+                                @if (canStartOdl(record.IdxMacchina))
+                                {
+                                    <button @onclick="() => startOdl(record)" class="btn btn-success btn-sm mx-1" title="Avvia PODL">
+                                        <i class="far fa-play-circle"></i>
+                                    </button>
+                                }
+                                else
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled mx-1" title="ODL ancora in corso">
+                                        <i class="far fa-play-circle"></i>
+                                    </button>
+                                }
                             </td>
                             <td>
                                 @record.CodArticolo

MP.SPEC/Components/ListPODL.razor.cs

@@ -3,13 +3,17 @@ using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.SPEC.Data;
 using MP.SPEC.Services;
+using NLog;
 
 namespace MP.SPEC.Components
 {
-    public partial class ListPODL
+    public partial class ListPODL : IDisposable
     {
         #region Public Properties
 
+        [Parameter]
+        public SelectPOdlParams actFilter { get; set; } = new SelectPOdlParams();
+
         [Parameter]
         public EventCallback<bool> PagerResetReq { get; set; }
 
@@ -38,6 +42,15 @@ namespace MP.SPEC.Components
             return answ;
         }
 
+        public void Dispose()
+        {
+            currRecord = null;
+            SearchRecords = null;
+            ListRecords = null;
+            ListStati = null;
+            GC.Collect();
+        }
+
         #endregion Public Methods
 
         #region Protected Properties
@@ -49,10 +62,7 @@ namespace MP.SPEC.Components
         protected MpDataService MDService { get; set; } = null!;
 
         [Inject]
-        protected IOApiService MpIoApiCall { get; set; }
-
-        [Inject]
-        protected MessageService MsgService { get; set; } = null!;
+        protected IOApiService MpIoApiCall { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -95,7 +105,7 @@ namespace MP.SPEC.Components
                 return;
             await Task.Delay(1);
             var done = await MDService.PODLDeleteRecord(selRec);
-            await callSyncDb(selRec);
+            await callSyncDb(selRec.IdxMacchina);
             currRecord = null;
             await reloadData();
             await Task.Delay(1);
@@ -103,15 +113,17 @@ namespace MP.SPEC.Components
 
         protected override async Task OnInitializedAsync()
         {
-            MsgService.EA_PageUpdated += MessageService_EA_PageUpdated;
-            MsgService.EA_SearchUpdated += OnSeachUpdated;
-            MsgService.EA_StatoSearch += MsgService_EA_StatoSearch;
+            //await FilterChanged.InvokeAsync(actFilter);
             ListStati = await MDService.AnagStatiComm();
         }
 
         protected override async Task OnParametersSetAsync()
         {
-            await reloadData();
+            if (!lastFilter.Equals(actFilter))
+            {
+                lastFilter = actFilter.clone();
+                await reloadData();
+            }
         }
 
         protected async void OnSeachUpdated()
@@ -142,6 +154,52 @@ namespace MP.SPEC.Components
             await RecordSel.InvokeAsync(selRec);
         }
 
+        protected async Task startOdl(PODLModel selRec)
+        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sei sicuro di voler avviare PODL selezionato?"))
+                return;
+
+            if (selRec != null)
+            {
+                int idxEvento = 0;
+                string evMess = "";
+                // verifico ancora NON ci sia ODL corrente/aperto
+                if (canStartOdl(selRec.IdxMacchina))
+                {
+                    await callStartSetup(selRec.IdxMacchina);
+                    await Task.Delay(1);
+                    // chiamo stored stp_ODL_inizioSetupPromessa e recupero ODL corrente
+                    bool fatto = await MDService.POdlDoSetup(selRec);
+                    if (fatto)
+                    {
+                        var currPOdl = await MDService.PODL_getByKey(selRec.IdxPromessa);
+                        var newOdl = await MDService.OdlGetByKey(currPOdl.IdxOdl);
+
+                        // registro evento...
+                        idxEvento = 2;
+                        evMess = $"Inizio Setup | PODL {selRec.IdxPromessa}";
+                        processaEvento(selRec.IdxMacchina, idxEvento, evMess, newOdl.IdxOdl, newOdl.CodArticolo);
+
+                        // aspetto 1 sec
+                        await Task.Delay(1000);
+
+                        // registro inizio produzione
+                        idxEvento = 2;
+                        evMess = $"Registrata inizio Produzione | PODL {selRec.IdxPromessa} | ODL {newOdl.IdxOdl} | ART {newOdl.CodArticolo}";
+                        processaEvento(selRec.IdxMacchina, idxEvento, evMess, newOdl.IdxOdl, newOdl.CodArticolo);
+
+                        // chiamo task x IOB
+                        await callForceUpdate(selRec.IdxMacchina);
+                        await Task.Delay(1);
+                        await callForceUpdate(selRec.IdxMacchina);
+                        await Task.Delay(1);
+                        await callSyncDb(selRec.IdxMacchina);
+                        await Task.Delay(1);
+                    }
+                }
+            }
+        }
+
         protected async Task UpdateData()
         {
             currRecord = null;
@@ -152,44 +210,67 @@ namespace MP.SPEC.Components
 
         #region Private Fields
 
+        private static Logger Log = LogManager.GetCurrentClassLogger();
         private PODLModel? currRecord = null;
-
         private List<PODLModel>? ListRecords;
-
         private List<ListValues>? ListStati;
 
+        /// <summary>
+        /// scadenza validità lista ODL correnti
+        /// </summary>
+        private DateTime odlCurrExp = DateTime.Now.AddMinutes(-1);
+
+        /// <summary>
+        /// Elenco ODL correnti...
+        /// </summary>
+        private List<string> odlCurrList = new List<string>();
+
         private List<PODLModel>? SearchRecords;
 
         #endregion Private Fields
 
         #region Private Properties
 
+        private int _totalCount { get; set; } = 0;
+
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => actFilter.CurrPage;
+            set => actFilter.CurrPage = value;
         }
 
         private bool isLoading { get; set; } = false;
+        private SelectPOdlParams lastFilter { get; set; } = new SelectPOdlParams() { CurrPage = -1 };
 
         private int numRecord
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
+            get => actFilter.NumRec;
+            set => actFilter.NumRec = value;
         }
 
         private string SearchVal
         {
-            get => string.IsNullOrEmpty(MsgService.SearchVal) ? "*" : MsgService.SearchVal;
+            get => string.IsNullOrEmpty(actFilter.SearchVal) ? "*" : actFilter.SearchVal;
         }
 
         private string StatoSel
         {
-            get => MsgService.StateSel;
-            set => MsgService.StateSel = value;
+            get => actFilter.CodFase;
+            set => actFilter.CodFase = value;
         }
 
-        private int totalCount { get; set; } = 0;
+        private int totalCount
+        {
+            get => _totalCount;
+            set
+            {
+                if (_totalCount != value)
+                {
+                    _totalCount = value;
+                    updateRecordCount.InvokeAsync(value);
+                }
+            }
+        }
 
         #endregion Private Properties
 
@@ -200,28 +281,104 @@ namespace MP.SPEC.Components
         /// </summary>
         /// <param name="selRec"></param>
         /// <returns></returns>
-        private async Task callSyncDb(PODLModel selRec)
+        private async Task addTask2Exe(string idxMacc, string taskName, string taskVal)
+        {
+            // compongo URL e chiamo
+            string restUrl = $"IOB/addTask2Exe/{idxMacc}?taskName={taskName}&taskVal={taskVal}";
+            try
+            {
+                var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Errore durante chiamata: {Environment.NewLine}{exc}");
+            }
+        }
+
+        /// <summary>
+        /// Chiama metodo x chiedere force Update
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task callForceUpdate(string IdxMacc)
         {
             // chiamo aggiunta task SyncDb...
-            string idxMacc = selRec.IdxMacchina;
-            string restUrl = $"IOB/addTask2Exe/{idxMacc}?taskName=syncDbData&taskVal=";
-            var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            await addTask2Exe(IdxMacc, "ForceUpdate", $"SPEC|TS:{DateTime.Now:yyMMddHHmmss}");
         }
 
-        private async void MessageService_EA_PageUpdated()
+        /// <summary>
+        /// Chiama metodo x indicare inizio setup
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task callStartSetup(string IdxMacc)
         {
-            await reloadData();
+            // chiamo evento inizio setup
+            await addTask2Exe(IdxMacc, "startSetup", $"SPEC|TS:{DateTime.Now:yyMMddHHmmss}");
         }
 
-        private async void MsgService_EA_StatoSearch()
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="IdxMacc"></param>
+        /// <returns></returns>
+        private async Task callSyncDb(string IdxMacc)
         {
-            await InvokeAsync(() =>
+            // chiamo aggiunta task SyncDb...
+            await addTask2Exe(IdxMacc, "syncDbData", "");
+        }
+
+        /// <summary>
+        /// verifica se sia avviabile ODL x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        private bool canStartOdl(string idxMacchina)
+        {
+            // controllo se lista scaduta...
+            bool answ = false;
+            DateTime adesso = DateTime.Now;
+            if (adesso > odlCurrExp || odlCurrList == null || odlCurrList.Count == 0)
             {
-                PagerResetReq.InvokeAsync(true);
-                //currPage = 1;
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+                odlCurrList = MDService.OdlGetCurrent();
+                odlCurrExp = adesso.AddSeconds(2);
+            }
+            answ = !odlCurrList.Contains(idxMacchina);
+            return answ;
+        }
+
+        /// <summary>
+        /// processa evento richiesto
+        /// </summary>
+        /// <param name="idxMacc"></param>
+        /// <param name="idxEvento"></param>
+        /// <param name="userMsg"></param>
+        /// <param name="idxODL"></param>
+        private async void processaEvento(string idxMacc, int idxEvento, string userMsg, int idxODL, string codArticolo)
+        {
+            // se manca codart calcolo...
+            if (string.IsNullOrEmpty(codArticolo))
+            {
+                var currOdl = await MDService.OdlGetByKey(idxODL);
+                if (currOdl != null)
+                {
+                    codArticolo = currOdl.CodArticolo;
+                }
+            }
+
+            // scrivo evento scriviRigaEventoBarcode
+            EventListModel newRec = new EventListModel()
+            {
+                IdxMacchina = idxMacc,
+                InizioStato = DateTime.Now,
+                IdxTipo = idxEvento,
+                CodArticolo = codArticolo,
+                MatrOpr = 0,
+                pallet = "",
+                Value = userMsg
+            };
+
+            await MDService.EvListInsert(newRec);
         }
 
         private async Task reloadData()
@@ -232,7 +389,7 @@ namespace MP.SPEC.Components
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             await Task.Delay(1);
             await InvokeAsync(() => StateHasChanged());
-            await updateRecordCount.InvokeAsync(totalCount);
+            //await updateRecordCount.InvokeAsync(totalCount);
             isLoading = false;
         }
 

MP.SPEC/Components/ODLPlot.razor

@@ -7,7 +7,7 @@
         }
         else
         {
-            <MP.SPEC.Components.Chart.Doughnut Type="@Chart.Doughnut.ChartType.Doughnut" Data="@Data.ToArray()" BackgroundColor="@colors.ToArray()"></MP.SPEC.Components.Chart.Doughnut>
+            <MP.SPEC.Components.Chart.Doughnut Type="@Chart.Doughnut.ChartType.Doughnut" Data="@Data.ToArray()" BackgroundColor="@colors"></MP.SPEC.Components.Chart.Doughnut>
         }
     </div>
 }

MP.SPEC/Components/ODLPlot.razor.cs

@@ -1,14 +1,25 @@
 using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
-using MP.SPEC.Components;
 using MP.SPEC.Data;
 
 namespace MP.SPEC.Components
 {
     public partial class ODLPlot
     {
-        #region Public Properties        
+        #region Public Fields
+
+        public List<DoughnutStyling> colors = new List<DoughnutStyling>();
+
+        public List<double> Data = new List<double>();
+
+        public List<string> Labels = new List<string>();
+
+        #endregion Public Fields
+
+        #region Public Properties
+
+        [Parameter]
+        public bool hideSpenta { get; set; }
 
         public int OdlId
         {
@@ -29,49 +40,69 @@ namespace MP.SPEC.Components
         //protected DataLogFilter _SelFilter { get; set; } = new DataLogFilter();
         protected int _selParam { get; set; } = -1;
 
+        [Inject]
+        protected MpDataService MDService { get; set; } = null!;
+
         #endregion Protected Properties
 
         #region Protected Methods
 
-        private bool isLoading { get; set; } = false;
-
         protected override async Task OnInitializedAsync()
         {
             isLoading = true;
             await Task.Delay(1);
         }
-        private List<StatODLModel>? ListRecords = null;
+
         protected override async Task OnParametersSetAsync()
         {
             await ReloadData();
             await Task.Delay(1);
         }
 
-        public List<double> Data = new List<double>();
-        public List<string> Labels = new List<string>();
-        public List<string> colors = new List<string>();
-
         protected async Task ReloadData()
         {
             Data.Clear();
             Labels.Clear();
             colors.Clear();
             ListRecords = await MDService.StatOdl(SelectedOdl);
+            // se hideSpenta --> filtro stato 11 = spenta...
+            if (hideSpenta)
+            {
+                ListRecords = ListRecords.Where(x => x.Semaforo != "sGr").ToList();
+            }
             foreach (var record in ListRecords)
             {
                 Data.Add(record.TotDurata);
                 Labels.Add($"{record.Descrizione} - {record.TotDurata:N1}min");
-                colors.Add(record.Css);
+                if (record.Css == "yellow")
+                {
+                    colors.Add(new DoughnutStyling("orange", "ccc"));
+                }
+                else if (record.Css == "blue")
+                {
+                    colors.Add(new DoughnutStyling("#2874A6", "ccc"));
+                }
+                else
+                {
+                    colors.Add(new DoughnutStyling(record.Css, "ccc"));
+                }
             }
             await Task.Delay(1);
             isLoading = false;
         }
 
-
-
-        [Inject]
-        protected MpDataService MDService { get; set; } = null!;
-
         #endregion Protected Methods
+
+        #region Private Fields
+
+        private List<StatODLModel>? ListRecords = null;
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        private bool isLoading { get; set; } = false;
+
+        #endregion Private Properties
     }
 }

MP.SPEC/Components/ParamsFilter.razor

@@ -1,16 +1,15 @@
 <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">
+                <button class="btn btn-secondary" type="button" @onclick="() => live()" title="Click per tornare a Valori Live">
                     <small>@lastUpdate</small>
                 </button>
             }
             else
             {
-                <button class="btn btn-primary" type="button" @onclick="() => toggleUpdate()">
+                <button class="btn btn-primary" type="button" @onclick="() => notLive()">
                     <span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
                     Valori live
                 </button>
@@ -39,89 +38,106 @@
         </div>
 
     </div>
-    <a class="pt-2" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample" @onclick="setDtMax">
-        <i class="fa-solid fa-bars text-dark"></i>
-    </a>
-    <div class="offcanvas offcanvas-end" tabindex="-1" id="paramsFilterExample" aria-labelledby="paramsFilterExampleLabel">
-        <div class="offcanvas-header">
-            <h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTRI</b></h3>
-            <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    <div class="d-flex justify-content-between pt-2">
+        @if (filtActive)
+        {
+            @*<i class="fas fa-exclamation text-warning"></i>*@
+            @if (selMacchina != "*")
+            {
+                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetMacchina()" title="Rimuovi Filtro Impianto"><i class="fa-solid fa-hard-drive"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            @if (selFlux != "*")
+            {
+                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetFase()" title="Rimuovi Filtro Parametro"><i class="fa-solid fa-sliders"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+
+        }
+        <div class="p-2">
+            <a class="" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample">
+                <i class="fa-solid fa-bars text-dark"></i>
+            </a>
         </div>
-        <div class="offcanvas-body">
-            <div class="small">
-                <label class="px-2" for="macchina" title="Selezionare impianto">Impianto</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="macchina" title="Selezionare impianto"><i class="fa-solid fa-hard-drive"></i></label>
-                <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare impianto">
-                    <option value="*">--- Tutti ---</option>
-                    @if (ListMacchine != null)
+    </div>
+</div>
+<div class="offcanvas offcanvas-end" tabindex="-1" id="paramsFilterExample" aria-labelledby="paramsFilterExampleLabel">
+    <div class="offcanvas-header">
+        <h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTRI</b></h3>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+    <div class="offcanvas-body">
+        <div class="small">
+            <label class="px-2" for="macchina" title="Selezionare impianto">Impianto</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="macchina" title="Selezionare impianto"><i class="fa-solid fa-hard-drive"></i></label>
+            <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare impianto">
+                <option value="*">--- Tutti ---</option>
+                @if (ListMacchine != null)
+                {
+                    foreach (var item in ListMacchine)
                     {
-                        foreach (var item in ListMacchine)
-                        {
-                            <option value="@item">@item</option>
-                        }
+                        <option value="@item">@item</option>
                     }
-                </select>
-            </div>
-            <div class="small mt-2">
-                <label class="px-2" for="flusso" title="Selezionare il parametro">Parametro</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="flusso" title="Selezionare il parametro"><i class="fa-solid fa-sliders"></i></label>
-                <select @bind="@selFlux" class="form-select" id="flusso" title="Selezionare il parametro">
-                    <option value="*">--- Tutti ---</option>
-                    @if (ListFlux != null)
+                }
+            </select>
+        </div>
+        <div class="small mt-2">
+            <label class="px-2" for="flusso" title="Selezionare il parametro">Parametro</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="flusso" title="Selezionare il parametro"><i class="fa-solid fa-sliders"></i></label>
+            <select @bind="@selFlux" class="form-select" id="flusso" title="Selezionare il parametro">
+                <option value="*">--- Tutti ---</option>
+                @if (ListFlux != null)
+                {
+                    foreach (var item in ListFlux)
                     {
-                        foreach (var item in ListFlux)
-                        {
-                            <option value="@item">@item</option>
-                        }
+                        <option value="@item">@item</option>
                     }
-                </select>
-            </div>
-            <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="small mt-2">
-                <label class="px-2" for="tempoAgg" title="Selezionare refresh rate (sec) periodo">Refresh rate (sec)</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="tempoAgg" title="Selezionare refresh rate (sec)"><i class="fa-solid fa-clock"></i></label>
-                <select @bind="@selTempoAgg" class="form-select" id="tempoAgg" title="Selezionare refresh rate (sec)" style="width: 3em;">
-                    <option value="2">2</option>
-                    <option value="5">5</option>
-                    <option value="10">10</option>
-                    <option value="30">30</option>
-                    <option value="60">60</option>
-                </select>
-            </div>
-            <div class="small mt-2">
-                <label class="px-2" for="maxRecord" title="Numero massimo record da mostrare">Max Record</label>
-            </div>
-            <div class="px-2 input-group">
-                <label class="input-group-text" for="maxRecord" title="Numero massimo record da mostrare"><i class="fa-solid fa-list-ol"></i></label>
-                <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Numero massimo record da mostrare">
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="250">250</option>
-                    <option value="500">500</option>
-                    <option value="1000">1000</option>
-                    <option value="2500">2500</option>
-                    <option value="5000">5000</option>
-                </select>
-            </div>
+                }
+            </select>
+        </div>
+        <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="small mt-2">
+            <label class="px-2" for="tempoAgg" title="Selezionare refresh rate (sec) periodo">Refresh rate (sec)</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="tempoAgg" title="Selezionare refresh rate (sec)"><i class="fa-solid fa-clock"></i></label>
+            <select @bind="@selTempoAgg" class="form-select" id="tempoAgg" title="Selezionare refresh rate (sec)" style="width: 3em;">
+                <option value="2">2</option>
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="30">30</option>
+                <option value="60">60</option>
+            </select>
+        </div>
+        <div class="small mt-2">
+            <label class="px-2" for="maxRecord" title="Numero massimo record da mostrare">Max Record</label>
+        </div>
+        <div class="px-2 input-group">
+            <label class="input-group-text" for="maxRecord" title="Numero massimo record da mostrare"><i class="fa-solid fa-list-ol"></i></label>
+            <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Numero massimo record da mostrare">
+                <option value="50">50</option>
+                <option value="100">100</option>
+                <option value="250">250</option>
+                <option value="500">500</option>
+                <option value="1000">1000</option>
+                <option value="2500">2500</option>
+                <option value="5000">5000</option>
+            </select>
         </div>
     </div>
 </div>

MP.SPEC/Components/ParamsFilter.razor.cs

@@ -165,17 +165,26 @@ namespace MP.SPEC.Components
             NavManager.NavigateTo("DOSS", true);
         }
 
+        private bool filtActive
+        {
+            get => selMacchina != "*" || selFlux != "*";
+        }
         protected override async Task OnInitializedAsync()
         {
             SelFilter = new SelectFluxParams();
-            ListMacchine = await MDService.MacchineWithFlux();
+            setDtMax();
+            DateTime dtStart = SelFilter.dtMin != null ? (DateTime)SelFilter.dtMin : DateTime.Now.AddDays(-7);
+            DateTime dtEnd = SelFilter.dtMax != null ? (DateTime)SelFilter.dtMax : DateTime.Now;
+            ListMacchine = await MDService.MacchineWithFlux(dtStart, dtEnd);
             ListFlux = await MDService.ParametriGetFilt(selMacchina);
 
             var configData = await MDService.ConfigGetAll();
             var currRec = configData.FirstOrDefault(x => x.Chiave == "numOreAnticipoSnapshot");
             if (currRec != null)
             {
-                int.TryParse(currRec.Valore, out numOreAnticipoSnapshot);
+                var newInt = 40;
+                int.TryParse(currRec.Valore, out newInt);
+                numOreAnticipoSnapshot = newInt;
             }
 
             await FilterChanged.InvokeAsync(SelFilter);
@@ -186,7 +195,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);
@@ -202,6 +211,14 @@ namespace MP.SPEC.Components
             aTimer.Enabled = true;
             aTimer.Start();
         }
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetFase()
+        {
+            selFlux = "*";
+        }
 
         protected async Task takeSnapshot()
         {
@@ -210,9 +227,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
@@ -226,18 +242,19 @@ namespace MP.SPEC.Components
             selDtMax = null;
         }
 
-        protected async Task toggleUpdate()
+        protected async Task notLive()
         {
-            liveUpdate = !liveUpdate;
+            liveUpdate = false;
             await Task.Delay(1);
             if (!liveUpdate)
             {
                 lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
             }
-            else
-            {
-                selDtMax = null;
-            }
+        }
+        protected async Task live()
+        {
+            liveUpdate = true;
+            await Task.Delay(1);
         }
 
         #endregion Protected Methods
@@ -247,7 +264,7 @@ namespace MP.SPEC.Components
         private static System.Timers.Timer aTimer = new System.Timers.Timer();
         private List<string>? ListFlux = null;
         private List<string>? ListMacchine = null;
-        private int numOreAnticipoSnapshot = 5;
+        private int numOreAnticipoSnapshot { get; set; } = 50;
         private bool snapshotDone = false;
 
         #endregion Private Fields
@@ -267,7 +284,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;

MP.SPEC/Data/DoughnutStyling.cs

@@ -0,0 +1,16 @@
+using System.Drawing;
+
+namespace MP.SPEC.Data
+{
+    public class DoughnutStyling
+    {
+        public string color { get; set; }
+        public string border { get; set; }
+
+        public DoughnutStyling(string color, string border)
+        {
+            this.color = color;
+            this.border = border;
+        }
+    }
+}

MP.SPEC/Data/MessageService.cs

@@ -4,13 +4,13 @@
     {
         #region Public Events
 
-        public event Action EA_PageUpdated;
+        public event Action EA_PageUpdated = null!;
 
-        public event Action EA_SearchUpdated;
+        public event Action EA_SearchUpdated = null!;
 
-        public event Action EA_ShowSearch;
+        public event Action EA_ShowSearch = null!;
 
-        public event Action EA_StatoSearch;
+        public event Action EA_StatoSearch = null!;
 
         #endregion Public Events
 

MP.SPEC/Data/SelectArticoliParams.cs

@@ -0,0 +1,74 @@
+namespace MP.SPEC.Data
+{
+    public class SelectArticoliParams
+    {
+        #region Public Constructors
+
+        public SelectArticoliParams()
+        { }
+
+        #endregion Public Constructors
+
+        #region Public Properties
+
+
+        public int CurrPage { get; set; } = 1;
+
+        public string IdxMacchina { get; set; } = "*";
+        public string Azienda { get; set; } = "*";
+
+        public int MaxRecord { get; set; } = 100;
+
+        public int NumRec { get; set; } = 10;
+
+        public int TotCount { get; set; } = 0;
+
+        #endregion Public Properties
+
+        #region Public Methods
+
+        public SelectArticoliParams clone()
+        {
+            SelectArticoliParams clonedData = new SelectArticoliParams()
+            {
+                CurrPage = this.CurrPage,
+                IdxMacchina = this.IdxMacchina,
+                Azienda = this.Azienda,
+                MaxRecord = this.MaxRecord,
+                NumRec = this.NumRec,
+                TotCount = this.TotCount
+            };
+            return clonedData;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is SelectArticoliParams item))
+                return false;
+
+            if (MaxRecord != item.MaxRecord)
+                return false;
+
+            if (NumRec != item.NumRec)
+                return false;
+
+            if (TotCount != item.TotCount)
+                return false;
+
+            if (CurrPage != item.CurrPage)
+                return false;
+
+            if (IdxMacchina != item.IdxMacchina)
+                return false;
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        #endregion Public Methods
+    }
+}

MP.SPEC/Data/SelectDossierParams.cs

@@ -1,4 +1,6 @@
-namespace MP.SPEC.Data
+using MP.Data;
+
+namespace MP.SPEC.Data
 {
     public class SelectDossierParams
     {
@@ -13,29 +15,35 @@
 
         public int CurrPage { get; set; } = 1;
 
-        public DateTime DtRef { get; set; } = InitDatetime(5);
+        public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 15);
+
+        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 15).AddDays(-730);
 
         public string IdxMacchina { get; set; } = "*";
 
         public string CodArticolo { get; set; } = "*";
-
+        public int NumRec { get; set; } = 10;
+        public int TotCount { get; set; } = 0;
         public int MaxRecord { get; set; } = 100;
+        public bool isEditing { get; set; } = false;
 
         #endregion Public Properties
 
         #region Public Methods
-
-        /// <summary>
-        /// Inizializzazione con periodo e arrotondamento
-        /// </summary>
-        /// <param name="minRound"></param>
-        /// <returns></returns>
-        public static DateTime InitDatetime(int minRound)
+        public SelectDossierParams clone()
         {
-            TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today);
-            int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound;
-            DateTime endRounded = DateTime.Today.AddMinutes(minDay);
-            return endRounded;
+            SelectDossierParams clonedData = new SelectDossierParams()
+            {
+                DtEnd = this.DtEnd,
+                DtStart = this.DtStart,
+                CurrPage = this.CurrPage,
+                IdxMacchina = this.IdxMacchina,
+                CodArticolo = this.CodArticolo,
+                MaxRecord = this.MaxRecord,
+                NumRec = this.NumRec,
+                TotCount = this.TotCount
+            };
+            return clonedData;
         }
 
         public override bool Equals(object obj)
@@ -52,14 +60,18 @@
             if (MaxRecord != item.MaxRecord)
                 return false;
 
-            if (DtRef != item.DtRef)
+            if (TotCount != item.TotCount)
+                return false;
+
+            if (NumRec != item.NumRec)
+                return false;
+
+            if (DtEnd != item.DtEnd)
                 return false;
 
             if (CurrPage != item.CurrPage)
                 return false;
 
-            //if (lastUpdate != item.lastUpdate)
-            //    return false;
 
             return true;
         }

MP.SPEC/Data/SelectFluxParams.cs

@@ -19,14 +19,33 @@
         public string IdxMacchina { get; set; } = "*";
         public string lastUpdate { get; set; } = "-";
         public bool LiveUpdate { get; set; } = true;
-
+        public int NumRec { get; set; } = 10;
         public int MaxRecord { get; set; } = 100;
         public int TempoAgg { get; set; } = 10000;
+        public int TotCount { get; set; } = 0;
 
         #endregion Public Properties
 
         #region Public Methods
-
+        public SelectFluxParams clone()
+        {
+            SelectFluxParams clonedData = new SelectFluxParams()
+            {
+                CodFlux = this.CodFlux,
+                CurrPage = this.CurrPage,
+                dtRif = this.dtRif,
+                dtMax = this.dtMax,
+                dtMin = this.dtMin,
+                IdxMacchina = this.IdxMacchina,
+                lastUpdate = this.lastUpdate,
+                LiveUpdate = this.LiveUpdate,
+                NumRec = this.NumRec,
+                MaxRecord = this.MaxRecord,
+                TotCount = this.TotCount,
+                TempoAgg = this.TempoAgg
+            };
+            return clonedData;
+        }
         public override bool Equals(object obj)
         {
             if (!(obj is SelectFluxParams item))
@@ -46,6 +65,12 @@
 
             if (TempoAgg != item.TempoAgg)
                 return false;
+            
+            if (NumRec!= item.NumRec)
+                return false;
+            
+            if (TotCount!= item.TotCount)
+                return false;
 
             if (CurrPage != item.CurrPage)
                 return false;

MP.SPEC/Data/SelectOdlParams.cs

@@ -14,10 +14,12 @@ namespace MP.SPEC.Data
         #region Public Properties
 
         public string CodStato { get; set; } = "*";
+        public string IdxMacchina { get; set; } = "*";
         public int CurrPage { get; set; } = 1;
         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; } = "*";
@@ -37,6 +39,9 @@ namespace MP.SPEC.Data
             if (CodStato != item.CodStato)
                 return false;
 
+            if (IdxMacchina != item.IdxMacchina)
+                return false;
+
             if (MaxRecord != item.MaxRecord)
                 return false;
 

MP.SPEC/Data/SelectPOdlParams.cs

@@ -0,0 +1,83 @@
+namespace MP.SPEC.Data
+{
+    public class SelectPOdlParams
+    {
+        #region Public Constructors
+
+        public SelectPOdlParams()
+        { }
+
+        #endregion Public Constructors
+
+        #region Public Properties
+
+        public string CodFase { get; set; } = "*";
+
+        public int CurrPage { get; set; } = 1;
+
+        public string IdxMacchina { get; set; } = "*";
+
+        public int MaxRecord { get; set; } = 100;
+
+        public int NumRec { get; set; } = 10;
+
+        public string SearchVal { get; set; } = "*";
+
+        public int TotCount { get; set; } = 0;
+
+        #endregion Public Properties
+
+        #region Public Methods
+
+        public SelectPOdlParams clone()
+        {
+            SelectPOdlParams clonedData = new SelectPOdlParams()
+            {
+                CodFase = this.CodFase,
+                CurrPage = this.CurrPage,
+                IdxMacchina = this.IdxMacchina,
+                MaxRecord = this.MaxRecord,
+                NumRec = this.NumRec,
+                SearchVal = this.SearchVal,
+                TotCount = this.TotCount
+            };
+            return clonedData;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is SelectPOdlParams item))
+                return false;
+
+            if (CodFase != item.CodFase)
+                return false;
+
+            if (MaxRecord != item.MaxRecord)
+                return false;
+
+            if (NumRec != item.NumRec)
+                return false;
+
+            if (TotCount != item.TotCount)
+                return false;
+
+            if (CurrPage != item.CurrPage)
+                return false;
+
+            if (IdxMacchina != item.IdxMacchina)
+                return false;
+
+            if (SearchVal != item.SearchVal)
+                return false;
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        #endregion Public Methods
+    }
+}

MP.SPEC/MP.SPEC.csproj

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

MP.SPEC/NLog.config

@@ -39,7 +39,7 @@
     Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
     <logger name="*" minlevel="Debug" writeTo="f" />
     -->
-        <logger name="*" minlevel="Debug" writeTo="consoleTarget" />
+        <logger name="*" minlevel="Trace" writeTo="consoleTarget" />
         <!--<logger name="Microsoft.*" maxlevel="Info" final="true" />-->
         <logger name="*" minlevel="Info" writeTo="fileTarget" />
     </rules>

MP.SPEC/Pages/Articoli.razor

@@ -40,33 +40,21 @@
                         <div class="card-body">
 
                             <div class="row">
-                                <div class="col-4">
+                                <div class="col-3">
                                     <div class="input-group">
                                         <span class="input-group-text">Codice</span>
                                         <input type="text" class="form-control" placeholder="Articolo" @bind-value="@currRecord.CodArticolo">
                                     </div>
                                 </div>
-                                <div class="col-4">
+                                <div class="col-5">
                                     <div class="input-group">
                                         <span class="input-group-text">Disegno</span>
                                         <input type="text" class="form-control" placeholder="Disegno" @bind-value="@currRecord.Disegno">
                                     </div>
                                 </div>
-                                <div class="col-1">
-                                    <div class="input-group" title="Tipo">
-                                        <select @bind="@currRecord.Tipo" class="form-select text-end">
-                                            @if (ListTipoArt != null)
-                                            {
-                                                foreach (var item in ListTipoArt)
-                                                {
-                                                    <option value="@item.value">@item.label</option>
-                                                }
-                                            }
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="col-3">
+                                <div class="col-4">
                                     <div class="input-group" title="Azienda">
+                                        <span class="input-group-text">Azienda</span>
                                         <select @bind="@currRecord.Azienda" class="form-select text-end">
                                             @if (ListAziende != null)
                                             {
@@ -81,8 +69,25 @@
                                 </div>
                             </div>
                             <div class="row mt-2">
-                                <div class="col-8">
-                                    <input type="text" class="form-control" placeholder="Descrizione Articolo" @bind-value="@currRecord.DescArticolo">
+                                <div class="col-3">
+                                    <div class="input-group" title="Tipo">
+                                        <span class="input-group-text">Tipo</span>
+                                        <select @bind="@currRecord.Tipo" class="form-select text-end">
+                                            @if (ListTipoArt != null)
+                                            {
+                                                foreach (var item in ListTipoArt)
+                                                {
+                                                    <option value="@item.value">@item.label</option>
+                                                }
+                                            }
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-5">
+                                    <div class="input-group">
+                                        <span class="input-group-text">Descrizione</span>
+                                        <input type="text" class="form-control" placeholder="Descrizione Articolo" @bind-value="@currRecord.DescArticolo">
+                                    </div>
                                 </div>
                                 <div class="col-2">
                                     <div class="d-grid gap-2">
@@ -120,7 +125,10 @@
                         <thead>
                             <tr>
                                 <th>
-                                    <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                                    @if (currRecord != null)
+                                    {
+                                        <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
+                                    }
                                 </th>
                                 <th><i class="fa-solid fa-file"></i> Articolo</th>
                                 <th><i class="fa-solid fa-compass-drafting"></i> Disegno</th>
@@ -136,7 +144,7 @@
                                 <tr class="@checkSelect(@record.CodArticolo)">
                                     <td>
                                         <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
-                                <button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
+                                        <button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
                                     </td>
                                     <td>
                                         <div>@record.CodArticolo</div>

MP.SPEC/Pages/Articoli.razor.cs

@@ -24,9 +24,17 @@ namespace MP.SPEC.Pages
             return answ;
         }
 
+        private SelectArticoliParams currFilter = new SelectArticoliParams();
+
         public void Dispose()
         {
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+            //MessageService.EA_SearchUpdated -= OnSeachUpdated;
+            currRecord = null;
+            ListTipoArt = null;
+            ListAziende = null;
+            SearchRecords = null;
+            ListRecords = null;
+            GC.Collect();
         }
 
         public async void OnSeachUpdated()
@@ -50,10 +58,7 @@ namespace MP.SPEC.Pages
         protected MpDataService MDService { get; set; } = null!;
 
         [Inject]
-        protected MessageService MessageService { get; set; } = null!;
-
-        [Inject]
-        protected NavigationManager NavManager { get; set; }
+        protected NavigationManager NavManager { get; set; } = null!;
 
         protected int totalCount
         {
@@ -125,9 +130,6 @@ namespace MP.SPEC.Pages
         protected override async Task OnInitializedAsync()
         {
             numRecord = 10;
-            // mostro ricerca
-            MessageService.ShowSearch = true;
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
             configData = await MDService.ConfigGetAll();
             var currRec = configData.FirstOrDefault(x => x.Chiave == "AZIENDA");
             if (currRec != null)
@@ -166,14 +168,14 @@ namespace MP.SPEC.Pages
             {
                 Azienda = selRec.Azienda,
                 CodArticolo = selRec.CodArticolo,
-                DescArticolo = $"CLONE - { selRec.DescArticolo }",
+                DescArticolo = $"CLONE - {selRec.DescArticolo}",
                 Disegno = selRec.Disegno,
-                Tipo=selRec.Tipo
+                Tipo = selRec.Tipo
             };
             currRecord = newRec;
             await Task.Delay(1);
         }
-        
+
 
         protected async Task update(AnagArticoli selRec)
         {
@@ -288,7 +290,7 @@ namespace MP.SPEC.Pages
         private async Task reloadData()
         {
             isLoading = true;
-            SearchRecords = await MDService.ArticoliGetSearch(100000, selAzienda, MessageService.SearchVal);
+            SearchRecords = await MDService.ArticoliGetSearch(100000, selAzienda, "");
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             isLoading = false;
         }

MP.SPEC/Pages/Contacts.razor

@@ -0,0 +1,71 @@
+@page "/Contacts"
+@using MP.SPEC.Data
+
+@inject MessageService AppMService
+
+<div class="row mx-2">
+    <div class="col-12 col-lg-8 offset-lg-2">
+        <div class="card">
+            <div class="card-header text-center">
+                <div class="row">
+                    <div class="col-4"></div>
+                    <div class="col-4">
+                        <h2>@Titolo</h2>
+                    </div>
+                    <div class="col-4">
+                        <div class="badge rounded-pill bg-dark px-4 py-2">
+                            <div class="px-1">
+                                <a class="btn text-light text-decoration-none" href="https://www.egalware.com/" target="_blank">powered by&nbsp;EgalWare <img width="24" class="img-fluid" src="images/LogoEgw.png" /></a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="row">
+                    <div class="col-lg-3"></div>
+                    <div class="col-12 col-lg-6 py-3">
+                        <img src="images/LogoMapoFull.png" class="img-fluid" />
+                    </div>
+                    <div class="col-lg-3"></div>
+                    <div class="col-12">
+                        <h4 class="card-title">@Messaggio</h4>
+                    </div>
+                    <div class="col-sm-4">
+                        <h4>Sede Operativa</h4>
+                        <address>
+                            <strong>EgalWare s.r.l.</strong><br />
+                            via Nazionale, 93<br />
+                            24068 Seriate - BG<br />
+                            <abbr title="Phone">P:</abbr>
+                            035.290178<br />
+                            <abbr title="Phone">P:</abbr>
+                            035.460560
+                        </address>
+                    </div>
+                    <div class="col-sm-4">
+                        <h4>Sede Legale</h4>
+                        <address>
+                            <strong>EgalWare s.r.l.</strong><br />
+                            via Nazionale, 93<br />
+                            24068 Seriate - BG<br />
+                            <br />
+                            <abbr title="P.Iva">VAT:</abbr>03985390164
+                        </address>
+                    </div>
+                    <div class="col-sm-4">
+                        <h4>Supporto</h4>
+                        <address>
+                            <strong>Web:</strong><br />
+                            Accedi al supporto dal <a href="https://support.egalware.com/" target="_blank">nostro sito web</a><br />
+                            <br />
+                            <strong>Email:</strong><br />
+                            Scrivi un email a <a href="mailto:info@egalware.com">info at egalware.com</a>
+                        </address>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+

MP.SPEC/Pages/Contacts.razor.cs

@@ -0,0 +1,32 @@
+namespace MP.SPEC.Pages
+{
+    public partial class Contacts : IDisposable
+    {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            GC.Collect();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Fields
+
+        protected string Messaggio = "";
+        protected string Titolo = "";
+
+        #endregion Protected Fields
+
+        #region Protected Methods
+
+        protected override void OnInitialized()
+        {
+            Titolo = "MP SPEC";
+            Messaggio = "I nostri contattatti e siti di supporto";
+            AppMService.ShowSearch = false;
+        }
+
+        #endregion Protected Methods
+    }
+}

MP.SPEC/Pages/DOSS.razor

@@ -21,72 +21,16 @@
         </div>
     </div>
     <div class="card-body">
-        @if (currDetFluxLogRecord != null)
+        @if (isLoading)
         {
-            <div class="row">
-                <div class="col-12">
-                    <div class="card mb-5">
-                        <div class="card-header bg-primary text-light">Modifica Parametro</div>
-                        <div class="card-body">
-                            <div class="row">
-                                <div class="col-3 pe-0">
-                                    <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">MACCHINA</span>
-                                        <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.IdxMacchina">
-                                    </div>
-                                </div>
-                                <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">
-                                    </div>
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">DATA TYPE</span>
-                                        <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.CodFlux">
-                                    </div>
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">VALORE</span>
-                                        <input type="text" class="form-control" aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.ValoreEdit">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row pt-4">
-                                <div class="col-3 pe-0">
-                                </div>
-                                <div class="col-3 pe-0">
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="d-grid gap-2">
-                                        <button @onclick="() => cancel()" class="btn btn-warning">Annulla <i class="bi bi-x-circle"></i></button>
-                                    </div>
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="d-grid gap-2">
-                                        <button @onclick="() => update(currDetFluxLogRecord)" class="btn btn-success">Save <i class="bi bi-save"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <LoadingData></LoadingData>
+        }
+        else
+        {
+            <ListDossiers SelFilter="@currFilter" RecordSel="@selRecordDoss" TotRecordChanged="updateTotal"></ListDossiers>
         }
     </div>
-    @if (isLoading)
-    {
-        <LoadingData></LoadingData>
-    }
-    else
-    {
-        <ListDossiers SelFilter="@currFilter" RecordSel="@selRecordDoss" RecordSelFlux="@selRecordFlux" TotRecordChanged="updateTotal"></ListDossiers>
-    }
+    <div class="card-footer py-1">
+        <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
+    </div>
 </div>
-<div class="card-footer py-1">
-    <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
-</div>
-
-

MP.SPEC/Pages/DOSS.razor.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
-using MP.Data.DTO;
 using MP.SPEC.Components;
 using MP.SPEC.Data;
 
@@ -11,7 +10,7 @@ namespace MP.SPEC.Pages
     {
         #region Protected Fields
 
-        protected DataPager pagerODL = null!;
+        protected DataPager? pagerODL = null!;
 
         #endregion Protected Fields
 
@@ -23,19 +22,10 @@ namespace MP.SPEC.Pages
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MsgService { get; set; } = null!;
-
         #endregion Protected Properties
 
         #region Protected Methods
 
-        protected async Task cancel()
-        {
-            currDetFluxLogRecord = null;
-            await Task.Delay(1);
-        }
-
         protected void ForceReload(int newNum)
         {
             numRecord = newNum;
@@ -51,9 +41,6 @@ namespace MP.SPEC.Pages
         {
             isLoading = true;
             isFiltering = true;
-            // disabilito ricerca...
-            MsgService.SearchVal = "";
-            MsgService.ShowSearch = false;
             // fix pagina
             await Task.Delay(1);
             var modFilter = currFilter;
@@ -63,78 +50,81 @@ namespace MP.SPEC.Pages
             isFiltering = false;
         }
 
-        protected async Task selRecordDoss(Dossiers selDoss)
+        protected async Task selRecordDoss(DossierModel selDoss)
         {
             currRecordDoss = selDoss;
             await Task.Delay(1);
         }
 
-        protected async Task selRecordFlux(FluxLogDTO selRec)
-        {
-            currDetFluxLogRecord = selRec;
-            await Task.Delay(1);
-        }
-
-        protected async Task update(FluxLogDTO selRec)
-        {
-            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler salvare le modifiche? queste saranno parte del dossier inviato all'impianto"))
-                return;
-
-            await Task.Delay(1);
-            if (currRecordDoss != null)
-            {
-                // METODO PER UPDATE FLUX
-                await MDService.updateDossierValue(currRecordDoss, selRec);
-            }
-            currDetFluxLogRecord = null;
-            await Task.Delay(1);
-        }
-
         protected void updateTotal(int newTotCount)
         {
             totalCount = newTotCount;
         }
 
+        protected void UpdateTotCount(int newTotCount)
+        {
+            totalCount = newTotCount;
+        }
+
         #endregion Protected Methods
 
-        #region Private Fields
-
-        private FluxLogDTO? _currDetFluxLogRecord = null;
-
-        #endregion Private Fields
-
         #region Private Properties
 
-        private FluxLogDTO? currDetFluxLogRecord
-        {
-            get => _currDetFluxLogRecord;
-            set { _currDetFluxLogRecord = value; }
-        }
-
         private SelectDossierParams currFilter { get; set; } = new SelectDossierParams();
 
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
+        }
+
+        private DossierModel? currRecordDoss { get; set; } = null;
+
+        private bool isEditing
+        {
+            get => currFilter.isEditing;
+            set => currFilter.isEditing = value;
         }
 
-        private Dossiers? currRecordDoss { get; set; } = null;
         private bool isFiltering { get; set; } = false;
+
         private bool isLoading { get; set; } = true;
 
         private int numRecord
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
         }
 
-        private int totalCount { get; set; } = 0;
+        private int totalCount
+        {
+            get => currFilter.TotCount;
+            set => currFilter.TotCount = value;
+        }
 
         #endregion Private Properties
 
         #region Private Methods
 
+        private string css()
+        {
+            string answ = "";
+            if (isEditing == false)
+            {
+                answ = "hidden";
+            }
+            else
+            {
+                answ = "visible";
+            }
+            return answ;
+        }
+
+        private void enableEditing()
+        {
+            isEditing = true;
+        }
+
         private async Task updateFilter(SelectDossierParams newParams)
         {
             isFiltering = false;

MP.SPEC/Pages/Index.razor

@@ -11,7 +11,7 @@
             <div class="p-2 align-content-center fs-1">
                 <b>MAPO SPEC</b>
             </div>
-            <div class="p-2 bg-light">
+            <div class="p-2">
                 <img src="images/LogoEgw.png" class="image-fluid" height="64" />
             </div>
         </div>

MP.SPEC/Pages/Index.razor.cs

@@ -18,7 +18,7 @@ namespace MP.SPEC.Pages
         protected MpDataService MDService { get; set; } = null!;
 
         [Inject]
-        protected MessageService MessageService { get; set; }
+        protected MessageService MessageService { get; set; } = null!;
 
         #endregion Protected Properties
 

MP.SPEC/Pages/ODL.razor

@@ -20,9 +20,27 @@
                 </div>
             </div>
             <div class="d-flex justify-content-end">
-                <a class="pt-2 text-dark" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample" @onclick="setDtMax">
-                    <i class="fa-solid fa-bars"></i>
-                </a>
+                <div class="d-flex justify-content-between">
+                @if (filtActive)
+                {
+                    <div class=" rounded small d-flex justify-content-between" title="Filtri attivi">
+                        @*<i class="fas fa-exclamation text-warning"></i>*@
+                            @if (selMacchina != "*")
+            {
+                                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetMacchina()" title="Rimuovi Filtro Impianto"><i class="fa-solid fa-hard-drive"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+            @if (selStato != "*")
+            {
+                                <button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetFase()" title="Rimuovi Filtro Parametro"><i class="fa-solid fa-sliders"></i> &nbsp <i class="fa-solid fa-xmark text-warning"></i></button>
+            }
+                    </div>
+                }
+                <div class="p-2">
+                    <a class="pt-2 text-dark" data-bs-toggle="offcanvas" data-bs-target="#paramsFilterExample" aria-controls="paramsFilterExample" @onclick="setDtMax">
+                        <i class="fa-solid fa-bars"></i>
+                    </a>
+                </div>
+            </div>
                 <div class="offcanvas offcanvas-end" tabindex="-1" id="paramsFilterExample" aria-labelledby="paramsFilterExampleLabel">
                     <div class="offcanvas-header">
                         <h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTRI</b></h3>
@@ -37,11 +55,11 @@
                         <div>
 
                             <div class="small mt-2">
-                                <label class="px-2" for="macchina" title="Selezionare inizio periodo">Macchina</label>
+                                <label class="px-2" for="fase" title="Selezionare inizio periodo">Fase</label>
                             </div>
                             <div class="input-group px-2">
-                                <label class="input-group-text" for="macchina" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
-                                <select @bind="@selStato" id="macchina" class="form-select" title="Selezionare la fase da visualizzare">
+                                <label class="input-group-text" for="fase" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
+                                <select @bind="@selStato" id="fase" class="form-select" title="Selezionare la fase da visualizzare">
                                     <option value="*">--- Tutti ---</option>
                                     @if (ListStati != null)
                                     {
@@ -53,6 +71,25 @@
                                 </select>
                             </div>
                         </div>
+                        <div>
+
+                            <div class="small mt-2">
+                                <label class="px-2" for="macchina" title="Selezionare inizio periodo">Macchina</label>
+                            </div>
+                            <div class="input-group px-2">
+                                <label class="input-group-text" for="macchina" title="Selezionare la macchina da visualizzare"><i class="fa-solid fa-hard-drive"></i></label>
+                                <select @bind="@selMacchina" id="macchina" class="form-select" title="Selezionare la macchina da visualizzare">
+                                    <option value="*">--- Tutti ---</option>
+                                    @if (ListMacchine != null)
+                                    {
+                                        foreach (var item in ListMacchine)
+                                        {
+                                            <option value="@item">@item</option>
+                                        }
+                                    }
+                                </select>
+                            </div>
+                        </div>
                         @if (!isActive)
                         {
                             <div class="small mt-2">
@@ -83,4 +120,3 @@
     </div>
 </div>
 
-

MP.SPEC/Pages/ODL.razor.cs

@@ -26,7 +26,7 @@ namespace MP.SPEC.Pages
 
         #region Protected Fields
 
-        protected DataPager pagerODL;
+        protected DataPager? pagerODL = null!;
 
         #endregion Protected Fields
 
@@ -44,9 +44,6 @@ namespace MP.SPEC.Pages
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MsgService { get; set; } = null!;
-
         protected DateTime selDtEnd
         {
             get => currFilter.DtEnd;
@@ -74,7 +71,19 @@ namespace MP.SPEC.Pages
         #endregion Protected Properties
 
         #region Protected Methods
+        private bool filtActive
+        {
+            get => selMacchina != "*" || selStato != "*";
+        }
 
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetFase()
+        {
+            selStato = "*";
+        }
         protected void ForceReload(int newNum)
         {
             numRecord = newNum;
@@ -87,22 +96,19 @@ namespace MP.SPEC.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            // abilito ricerca...
-            MsgService.ShowSearch = true;
-            // resetto search
-            MsgService.SearchVal = "";
             ListStati = await MDService.AnagStatiComm();
-#if false
-            // carico dati
-            await reloadData();
-#endif
+            ListMacchine = await MDService.MacchineWithFlux(currFilter.DtStart, currFilter.DtEnd);
         }
 
         protected async Task pgResetReq(bool doReset)
         {
             if (doReset)
             {
-                await pagerODL.resetCurrPage();
+                await Task.Delay(1);
+                if (pagerODL != null)
+                {
+                    pagerODL.resetCurrPage();
+                }
             }
         }
 
@@ -110,7 +116,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)
@@ -123,6 +129,7 @@ namespace MP.SPEC.Pages
         #region Private Fields
 
         private List<MP.Data.DatabaseModels.ListValues>? ListStati;
+        private List<string>? ListMacchine;
 
         #endregion Private Fields
 
@@ -132,8 +139,8 @@ namespace MP.SPEC.Pages
 
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
         }
 
         private bool isLoading { get; set; } = false;
@@ -145,8 +152,8 @@ namespace MP.SPEC.Pages
 
         private int numRecord
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
         }
 
         private string rightStringCSS
@@ -159,11 +166,16 @@ namespace MP.SPEC.Pages
             get => currFilter.CodStato;
             set => currFilter.CodStato = value;
         }
+        private string selMacchina
+        {
+            get => currFilter.IdxMacchina;
+            set => currFilter.IdxMacchina = value;
+        }
 
         private int totalCount
         {
-            get => MsgService.totalCount;
-            set => MsgService.totalCount = value;
+            get => currFilter.TotCount;
+            set => currFilter.TotCount = value;
         }
 
         #endregion Private Properties

MP.SPEC/Pages/PARAMS.razor

@@ -25,12 +25,10 @@
         }
         else
         {
-            <ListPARAMS SelFilter="@currFilter" TotRecordChanged="@updateTotal" RecordSel="@detailSel"></ListPARAMS>
+            <ListPARAMS SelFilter="@currFilter" TotRecordChanged="@UpdateTotCount" RecordSel="@detailSel"></ListPARAMS>
         }
     </div>
     <div class="card-footer py-1">
         <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
     </div>
 </div>
-
-

MP.SPEC/Pages/PARAMS.razor.cs

@@ -9,14 +9,12 @@ namespace MP.SPEC.Pages
     {
         #region Protected Fields
 
-        protected DataPager pagerODL = null!;
+        protected DataPager? pagerODL = null!;
 
         #endregion Protected Fields
 
         #region Protected Properties
 
-        [Inject]
-        protected MessageService MsgService { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -32,7 +30,8 @@ namespace MP.SPEC.Pages
             currPage = newNum;
             DateTime adesso = DateTime.Now.AddSeconds(1);
             var updFilter = currFilter;
-            updFilter.LiveUpdate = (currPage == 1);
+            //updFilter.LiveUpdate = (currPage == 1);
+            updFilter.LiveUpdate = (currFilter.CurrPage == 1);
             updFilter.lastUpdate = updFilter.LiveUpdate ? "-" : $"{adesso:yyyy/MM/dd HH:mm:ss}";
             // salvo filtro
             currFilter = updFilter;
@@ -43,9 +42,6 @@ namespace MP.SPEC.Pages
         {
             isLoading = true;
             isFiltering = true;
-            // disabilito ricerca...
-            MsgService.SearchVal = "";
-            MsgService.ShowSearch = false;
             // fix pagina
             await Task.Delay(1);
             var modFilter = currFilter;
@@ -60,7 +56,11 @@ namespace MP.SPEC.Pages
         {
             if (doReset)
             {
-                await pagerODL.resetCurrPage();
+                await Task.Delay(1);
+                if (pagerODL != null)
+                {
+                    pagerODL.resetCurrPage();
+                }
             }
         }
 
@@ -100,8 +100,8 @@ namespace MP.SPEC.Pages
 
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
         }
 
         private bool isFiltering { get; set; } = false;
@@ -109,8 +109,8 @@ namespace MP.SPEC.Pages
 
         private int numRecord
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
         }
 
         private int totalCount { get; set; } = 0;
@@ -128,18 +128,21 @@ namespace MP.SPEC.Pages
             if (newParams.CurrPage == 0)
             {
                 newParams.CurrPage = 1;
-                newParams.LiveUpdate = false;
+                //newParams.LiveUpdate = false;
             }
             else
             {
-                newParams.LiveUpdate = (currPage == 1);
+                //newParams.LiveUpdate = (currPage == 1);
             }
             await Task.Delay(1);
             await InvokeAsync(() => StateHasChanged());
             currFilter = newParams;
             isLoading = false;
         }
-
+        protected void UpdateTotCount(int newTotCount)
+        {
+            totalCount = newTotCount;
+        }
         #endregion Private Methods
     }
 }

MP.SPEC/Pages/PODL.razor

@@ -4,7 +4,7 @@
 <div class="card mb-5">
     <div class="card-header table-primary">
         <div class="d-flex justify-content-between">
-            <div class="col-6">
+            <div class="col-6 col-lg-8">
                 <div class="d-flex">
                     <div class="px-2">
                         <h3><b>P</b>romesse <b>ODL</b></h3>
@@ -12,28 +12,29 @@
                     <div class="px-2">
                         @if (addEnabled)
                         {
-                            <button class="btn btn-success" @onclick="() => reqNewPODL()">@btnNewText <i class="bi bi-plus-square"></i></button>
+                            <button class="btn btn-success" @onclick="() => reqNewPODL()">Nuovo PODL <i class="bi bi-plus-square"></i></button>
                         }
                     </div>
                 </div>
             </div>
-            <div class="col-6">
+            <div class="col-6 col-lg-4">
                 <div class="input-group input-group-sm">
-                    <label class="input-group-text" for="maxRecord" title="Selezionare l'azienda da visualizzare"><i class="fa-solid fa-industry"></i></label>
+                    @*<label class="input-group-text" for="maxRecord" title="Selezionare l'azienda da visualizzare"><i class="fa-solid fa-industry"></i></label>
                     <select @bind="@currAzienda" class="form-select" title="Selezionare l'azienda da visualizzare">
-                        @if (ListAziende != null)
-                        {
-                            foreach (var item in ListAziende)
-                            {
-                                <option value="@item.CodGruppo">@item.DescrGruppo</option>
-                            }
-                        }
-                    </select>
+                    @if (ListAziende != null)
+                    {
+                    foreach (var item in ListAziende)
+                    {
+                    <option value="@item.CodGruppo">@item.DescrGruppo</option>
+                    }
+                    }
+                    </select>*@
                     <label class="input-group-text" for="maxRecord" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
-                    <select @bind="@selStato" class="form-select" title="Selezionare la fase da visualizzare">
+                    <select @bind="@currFase" class="form-select" title="Selezionare la fase da visualizzare">
                         <option value="*">--- Tutti ---</option>
                         @if (ListStati != null)
                         {
+
                             foreach (var item in ListStati)
                             {
                                 <option value="@item.value">@item.label</option>
@@ -126,7 +127,14 @@
                                                     {
                                                         foreach (var item in ListMacchine)
                                                         {
-                                                            <option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            if (selectFirst(item.IdxMacchina) == true)
+                                                            {
+                                                                <option selected value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            }
+                                                            else
+                                                            {
+                                                                <option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            }
                                                         }
                                                     }
                                                 </select>
@@ -222,13 +230,10 @@
         }
         else
         {
-            <ListPODL PagerResetReq="pgResetReq" RecordSel="@selRecord" updateRecordCount="UpdateTotCount"></ListPODL>
+            <ListPODL PagerResetReq="pgResetReq" RecordSel="@selRecord" updateRecordCount="UpdateTotCount" actFilter="@currFilter"></ListPODL>
         }
     </div>
     <div class="card-footer py-1">
-        <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
+        <DataPager @ref="pagerODL" PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="@isLoading" />
     </div>
-</div>
-
-
-
+</div>

MP.SPEC/Pages/PODL.razor.cs

@@ -4,6 +4,7 @@ using MP.Data.DatabaseModels;
 using MP.SPEC.Components;
 using MP.SPEC.Data;
 using MP.SPEC.Services;
+using NLog;
 
 namespace MP.SPEC.Pages
 {
@@ -11,7 +12,7 @@ namespace MP.SPEC.Pages
     {
         #region Protected Fields
 
-        protected DataPager pagerODL;
+        protected DataPager pagerODL = null!;
 
         protected bool reqNew = false;
 
@@ -20,19 +21,16 @@ namespace MP.SPEC.Pages
         #region Protected Properties
 
         [Inject]
-        protected IJSRuntime JSRuntime { get; set; }
+        protected IJSRuntime JSRuntime { get; set; } = null!;
 
         [Inject]
-        protected MpDataService MDService { get; set; }
+        protected MpDataService MDService { get; set; } = null!;
 
         [Inject]
-        protected IOApiService MpIoApiCall { get; set; }
+        protected IOApiService MpIoApiCall { get; set; } = null!;
 
         [Inject]
-        protected MessageService MsgService { get; set; }
-
-        [Inject]
-        protected NavigationManager NavManager { get; set; }
+        protected NavigationManager NavManager { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -70,10 +68,6 @@ namespace MP.SPEC.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            // abilito ricerca...
-            MsgService.ShowSearch = true;
-            // resetto search
-            MsgService.SearchVal = "";
             ListAziende = await MDService.ElencoAziende();
             ListGruppiFase = await MDService.ElencoGruppiFase();
             ListMacchine = await MDService.MacchineGetAll();
@@ -93,7 +87,8 @@ namespace MP.SPEC.Pages
         {
             if (doReset)
             {
-                await pagerODL.resetCurrPage();
+                await Task.Delay(1);
+                pagerODL.resetCurrPage();
             }
         }
 
@@ -110,7 +105,7 @@ namespace MP.SPEC.Pages
                 var firstArt = ListArticoli.FirstOrDefault();
                 currArticolo = firstArt != null ? firstArt.CodArticolo : "";
             }
-            string codExt = $"{selStato}";
+            string codExt = $"{currFase}";
             string codGruppo = "";
             if (ListGruppiFase != null && ListGruppiFase.Count > 0)
             {
@@ -157,6 +152,9 @@ namespace MP.SPEC.Pages
             await callSyncDb(selRec);
             currRecord = null;
             await reloadData();
+            // forzo update parametri
+            await Task.Delay(1);
+            currFase = "*";
             await Task.Delay(1);
         }
 
@@ -169,16 +167,12 @@ namespace MP.SPEC.Pages
 
         #region Private Fields
 
+        private static Logger Log = LogManager.GetCurrentClassLogger();
         private PODLModel? _currRecord = null;
-
         private List<AnagArticoli>? ListArticoli;
-
         private List<AnagGruppi>? ListAziende;
-
         private List<AnagGruppi>? ListGruppiFase;
-
         private List<Macchine>? ListMacchine;
-
         private List<ListValues>? ListStati;
 
         #endregion Private Fields
@@ -186,12 +180,11 @@ namespace MP.SPEC.Pages
         #region Private Properties
 
         private string _artSearch { get; set; } = "";
-
         private string _currAzienda { get; set; } = "*";
 
         private bool addEnabled
         {
-            get => selStato != "*";
+            get => currFase != "*";
         }
 
         private string artSearch
@@ -211,13 +204,28 @@ namespace MP.SPEC.Pages
             }
         }
 
+        private bool selectFirst(string idxMacchina)
+        {
+            string firstMacchina="";
+            bool answ = false;
+            if (ListMacchine != null)
+            {
+                var rawData = ListMacchine.Select(x => x.IdxMacchina).FirstOrDefault();
+                firstMacchina = rawData != null ? rawData : "";
+            }
+            if (firstMacchina == idxMacchina)
+            {
+                answ = true;
+            }
+            return answ;
+        }
+
         private string btnNewText
         {
             get => currArticolo == "" ? "Sel Articolo" : "Nuovo PODL";
         }
 
         private List<ConfigModel>? configData { get; set; } = null;
-
         private string currArticolo { get; set; } = "";
 
         private string currAzienda
@@ -237,10 +245,25 @@ namespace MP.SPEC.Pages
             }
         }
 
+        private string currFase
+        {
+            get => currFilter.CodFase;
+            set
+            {
+                if (!currFilter.CodFase.Equals(value))
+                {
+                    currFilter.CodFase = value;
+                    currPage = 1;
+                }
+            }
+        }
+
+        private SelectPOdlParams currFilter { get; set; } = new SelectPOdlParams();
+
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
         }
 
         private PODLModel? currRecord
@@ -257,20 +280,14 @@ namespace MP.SPEC.Pages
 
         private int numRecord
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
-        }
-
-        private string selStato
-        {
-            get => MsgService.StateSel;
-            set => MsgService.StateSel = value;
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
         }
 
         private int totalCount
         {
-            get => MsgService.totalCount;
-            set => MsgService.totalCount = value;
+            get => currFilter.TotCount;
+            set => currFilter.TotCount = value;
         }
 
         #endregion Private Properties
@@ -287,7 +304,14 @@ namespace MP.SPEC.Pages
             // chiamo aggiunta task SyncDb...
             string idxMacc = selRec.IdxMacchina;
             string restUrl = $"IOB/addTask2Exe/{idxMacc}?taskName=syncDbData&taskVal=";
-            var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            try
+            {
+                var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Errore durante chiamata: {Environment.NewLine}{exc}");
+            }
         }
 
         private async Task reloadData()

MP.SPEC/Pages/_Layout.cshtml

@@ -32,8 +32,8 @@
 
     <script src="lib/bootstrap/js/bootstrap.bundle.min.js"></script>
     <script src="_framework/blazor.server.js" autostart="false"></script>
-    <script src="lib/chartjs-adapter-luxon/chartjs-adapter-luxon.js"></script>
     <script src="lib/chartBoot.js"></script>
+    <script src="lib/modalHandler.js"></script>
     <script src="lib/Chart.js/chart.js"></script>
 
     @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@

MP.SPEC/Resources/ChangeLog.html

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

MP.SPEC/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2210.1417
+6.16.2211.416

MP.SPEC/Resources/manifest.xml

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

MP.SPEC/Services/IOApiService.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using MP.SPEC.Data;
+using NLog;
 using System.Text.Json;
 
 namespace MP.SPEC.Services
@@ -18,6 +19,9 @@ namespace MP.SPEC.Services
         private static IConfiguration _configuration = null!;
 
 
+
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
         private static string MpIoBaseUrl = "";
 
         public IOApiService(IHttpClientFactory clientFactory, IConfiguration configuration, ILogger<MpDataService> logger)
@@ -40,15 +44,18 @@ namespace MP.SPEC.Services
             var request = new HttpRequestMessage(HttpMethod.Get, $"{MpIoBaseUrl}{relUrl}");
             request.Headers.Add("Accept", "application/vnd.github.v3+json");
             var client = _clientFactory.CreateClient();
+            Log.Info($"Richiesta call per {MpIoBaseUrl}{relUrl}");
             var response = await client.SendAsync(request);
             if (response.IsSuccessStatusCode)
             {
                 var stringResponse = await response.Content.ReadAsStringAsync();
                 result = stringResponse;
+                Log.Info($"Richiesta call per {MpIoBaseUrl}{relUrl}");
             }
             else
             {
                 result = "NO";
+                Log.Error($"Errore in chaimata | code {response.StatusCode} | {response.Content}");
             }
             return result;
         }

MP.SPEC/Shared/NavMenu.razor

@@ -38,6 +38,7 @@
         {
             foreach (var item in ElencoLink)
             {
+                
                 <div class="nav-item px-2 col-12">
                     <NavLink class="nav-link px-2" href="@item.NavigateUrl">
                         <div class="col-2">

MP.SPEC/appsettings.Development.json

@@ -5,5 +5,11 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "ServerConf": {
+    "maxAge": "2000",
+    "cacheCheckArtUsato": 2,
+    "redisLongTimeCache": 15,
+    "MpIoBaseUrl": "https://iis01.egalware.com/MP/IO/"
   }
 }

MP.SPEC/appsettings.Staging.json

@@ -0,0 +1,15 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "ServerConf": {
+    "maxAge": "2000",
+    "cacheCheckArtUsato": 2,
+    "redisLongTimeCache": 15,
+    "MpIoBaseUrl": "http://localhost/MP/IO/"
+  }
+}

MP.SPEC/appsettings.json

@@ -14,8 +14,8 @@
   },
   "ServerConf": {
     "maxAge": "2000",
-    "cacheCheckArtUsato": 2,
-    "redisLongTimeCache": 15,
+    "cacheCheckArtUsato": "2",
+    "redisLongTimeCache": "15",
     "MpIoBaseUrl": "http://localhost:20967/"
   }
 }

MP.SPEC/wwwroot/css/site.css

@@ -95,7 +95,6 @@ a,
 }
 .dcOverlay {
   z-index: 9;
-  margin: 8.5rem;
 }
 #blazor-error-ui {
   background: lightyellow;
@@ -327,4 +326,23 @@ a,
     min-width: 8rem;
     min-height: 4rem;
   }
+}
+/* Colori!*/
+blue {
+  color: purple;
+  background-color: purple;
+}
+.dc_yellow {
+  color: yellow;
+  background-color: yellow;
+}
+.dc_gray {
+  color: gray;
+}
+.dc_red {
+  color: red;
+}
+.dc_green {
+  color: green;
+  background-color: green;
 }

MP.SPEC/wwwroot/css/site.less

@@ -102,7 +102,6 @@ a, .btn-link {
 
 .dcOverlay {
     z-index: 9;
-    margin: 8.5rem;
 }
 
 #blazor-error-ui {
@@ -376,4 +375,25 @@ a, .btn-link {
         min-width: @blSCut * 8;
         min-height: @blSCut * 4;
     }
+}
+
+
+/* Colori!*/
+blue {
+    color: purple;
+    background-color: purple;
+}
+.dc_yellow {
+    color: yellow;
+    background-color: yellow;
+}
+.dc_gray {
+    color: gray;
+}
+.dc_red {
+    color: red;
+}
+.dc_green {
+    color: green;
+    background-color: green;
 }

MP.SPEC/wwwroot/lib/chartBoot.js

@@ -1,20 +1,12 @@
 ///Setup del chart desiderato con id univoco
 window.setup = (id, config) => {
     var ctx = document.getElementById(id).getContext('2d');
-    //let currentDate = new Date();
-    //console.log(currentDate + " - Calling setup...");
-    console.log(id);
     if (window['myChart'] instanceof Chart) {
-        //window.myChart.destroy();
         window['myChart'].destroy();
-        console.log("Chart " + id + " destroyed!");
         window['myChart'] = new Chart(ctx, config);
     }
-    else
-    {
+    else {
         window['myChart'] = new Chart(ctx, config);
-        //console.log("Chart " + id + " created!");
-        console.log(window['myChart']);
     }
 
 }

MP.SPEC/wwwroot/lib/modalHandler.js

@@ -0,0 +1,21 @@
+////TENTATIVO POPOLAMENTO HELPER PER POTER INVOCARE IL METODO DOPO
+//let helper;
+
+//window.setHelper = (dotNetHelper) => {
+//    helper = dotNetHelper.invokeMethodAsync('setHelper');
+//    console.log(helper);
+//    return dotNetHelper.invokeMethodAsync('setHelper');
+//}
+
+////BECCA QUANDO LA MODALE VIENE CHIUSA ED ESEGUE 
+//document.addEventListener('click', function (e) {
+//    if (e.target.id === 'myModal') {
+//        console.log('chiuso');
+
+//        //return helper.invokeMethodAsync('svuotaRecord');
+//        console.log("fatto");
+//    } else {
+//        console.log('aperto');
+//    }
+//    e.stopPropagation();
+//}, false);

MP.Stats/MP.Stats.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2210.0716</Version>
+        <Version>6.16.2210.2110</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -203,6 +203,9 @@
         <None Update="logs\.placeholder">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
+        <None Update="post-build.ps1">
+          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
         <None Update="temp\.placeholder">
           <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>

MP.Stats/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2210.0716</h4>
+    <h4>Versione: 6.16.2210.2110</h4>
     <br />
     Note di rilascio:
     <ul>

MP.Stats/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2210.0716
+6.16.2210.2110

MP.Stats/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2210.0716</version>
+  <version>6.16.2210.2110</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>