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

@@ -98,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>
@@ -164,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;
         }
@@ -183,7 +202,7 @@ namespace MP.Data.Controllers
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 dbResult = dbCtx
-                .DbSetArticoli
+                    .DbSetArticoli
                     .FromSqlRaw("EXEC stp_ART_getUsed")
                     .AsNoTracking()
                     .ToList();
@@ -283,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))
@@ -313,25 +332,54 @@ namespace MP.Data.Controllers
         /// macchina (ordinato x data registrazione)
         /// </summary>
         /// <param name="IdxMacchina">* = tutte, altrimenti solo x una data macchina</param>
-        /// <param name="DtRef">Data di riferimento (Massima) per estrazioen records</param>
-        /// <param name="MaxRec">numero massimo record da restituire</param>
+        /// <param name="CodArticolo">* = tutti, altrimenti solo x un dato articolo</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, 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) && 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.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>
@@ -355,6 +403,67 @@ namespace MP.Data.Controllers
             return answ;
         }
 
+        /// <summary>
+        /// Effettua salvataggio snapshot parametri (con stored) + svuota eventuale cache redis
+        /// </summary>
+        /// <param name="idxMacchina">macchina</param>
+        /// <param name="dtMin">Data min x selezione</param>
+        /// <param name="dtMax">Data MAX x selezione</param>
+        public bool DossiersTakeParamsSnapshotLast(string idxMacchina, DateTime dtMin, DateTime dtMax)
+        {
+            bool answ = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var pIdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
+                var pDtMin = new SqlParameter("@DtMin", dtMin);
+                var pDtMax = new SqlParameter("@DtMax", dtMax);
+
+                var dbResult = dbCtx
+                    .Database
+                    .ExecuteSqlRaw("EXEC stp_FL_TakeSnapshotLast @IdxMacchina,@DtMin,@DtMax", pIdxMacchina, pDtMin, pDtMax);
+                answ = true;
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// 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(DossierModel editRec)
+        {
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var currRec = dbCtx
+                                    .DbSetDossiers
+                                    .Where(x => x.IdxDossier == editRec.IdxDossier)
+                                    .FirstOrDefault();
+                    if (currRec != null)
+                    {
+                        currRec.Valore = editRec.Valore;
+                        dbCtx.Entry(currRec).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        dbCtx
+                            .DbSetDossiers
+                            .Add(editRec);
+                    }
+                    await dbCtx.SaveChangesAsync();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante DossiersUpdateRecord{Environment.NewLine}{exc}");
+                }
+            }
+            return fatto;
+        }
+
         /// <summary>
         /// Elenco valori link (x home e navMenu laterale)
         /// </summary>
@@ -364,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>
@@ -409,17 +544,21 @@ namespace MP.Data.Controllers
         /// <param name="inCorso">Stato ODL: true=in corso/completato</param>
         /// <param name="codArt">Cod articolo</param>
         /// <param name="keyRichPart">KeyRich (parziale) da cercare (es cod stato x yacht)</param>
+        /// <param name="startDate">Data inizio</param>
+        /// <param name="endDate">Data fine</param>
         /// <returns></returns>
-        public List<ODLModel> ListODLFilt(bool inCorso, string codArt, string keyRichPart)
+        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.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()
-                .OrderBy(x => x.IdxOdl)
+                .Include(m => m.MachineNav)
+                .Include(a => a.ArticoloNav)
+                .OrderByDescending(x => x.IdxOdl)
                 .ToList();
             }
             return dbResult;
@@ -440,7 +579,9 @@ namespace MP.Data.Controllers
                 .DbSetPODL
                 .Where(x => (x.IdxOdl == 0) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
                 .AsNoTracking()
-                .OrderBy(x => x.InsertDate)
+                .Include(m => m.MachineNav)
+                .Include(a => a.ArticoloNav)
+                .OrderByDescending(x => x.InsertDate)
                 .ToList();
             }
             return dbResult;
@@ -486,20 +627,23 @@ 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 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))
             {
-                dbResult = dbCtx
-                .DbSetFluxLog
-                .AsNoTracking()
-                .Select(i => i.IdxMacchina)
-                .Distinct()
-                .ToList();
+                dbResult = await dbCtx
+                                .DbSetFluxLog
+                                .AsNoTracking()
+                                .Where(x => x.dtEvento >= dtStart && x.dtEvento <= dtEnd)
+                                .Select(i => i.IdxMacchina)
+                                .Distinct()
+                                .ToListAsync();
             }
             return dbResult;
         }
@@ -524,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>
@@ -538,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>
@@ -600,6 +961,8 @@ 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;
                     }
                     else
@@ -644,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/DTO/DossierFluxLogDTO.cs

@@ -13,6 +13,10 @@ namespace MP.Data.DTO
 {
     public class DossierFluxLogDTO
     {
-        public List<FluxLog> ODL { get; set; } = new List<FluxLog>();
+        /// <summary>
+        /// Elenco valori FluxLogDTO serializzato (compreso valori edit)
+        /// </summary>
+        public List<FluxLogDTO> ODL { get; set; } = new List<FluxLogDTO>();
+
     }
 }

MP.Data/DTO/FluxLogDTO.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.DTO
+{
+    public class FluxLogDTO
+    {
+        public string IdxMacchina { get; set; }
+
+        public DateTime dtEvento { get; set; }
+
+        public string CodFlux { get; set; }
+
+        public string Valore { get; set; }
+
+        public string ValoreEdit { get; set; }
+
+    }
+}

MP.Data/DatabaseModels/DossierModel.cs

@@ -0,0 +1,57 @@
+using System;
+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("Dossiers")]
+    public partial class DossierModel
+    {
+        #region Public Properties
+
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int IdxDossier { get; set; }
+
+        [MaxLength(50)]
+        public string DataType { get; set; }
+
+        public DateTime DtRif { get; set; }
+
+        [MaxLength(50)]
+        public string IdxMacchina { get; set; } = "";
+        [MaxLength(50)]
+        public string CodArticolo { get; set; } = "";
+
+        public int IdxODL { get; set; } = 0;
+
+        public string Valore { get; set; } = "";
+
+        [MaxLength(50)]
+        public string KeyRichiesta { get; set; } = "";
+
+        /// <summary>
+        /// Navigazione oggetto Machine
+        /// </summary>
+        [ForeignKey("IdxMacchina")]
+        public virtual Macchine MachineNav { get; set; } = null!;
+
+        /// <summary>
+        /// Navigazione oggetto ODL 
+        /// </summary>
+        [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/Dossiers.cs

@@ -1,33 +0,0 @@
-using System;
-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("Dossiers")]
-    public partial class Dossiers
-    {
-        #region Public Properties
-
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int IdxDossier { get; set; }
-
-        [MaxLength(50)]
-        public string DataType { get; set; }
-
-        public DateTime DtRif { get; set; }
-
-        [MaxLength(50)]
-        public string IdxMacchina { get; set; }
-
-        public int IdxODL { get; set; }
-        public string Valore { get; set; }
-
-        #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/ODLModel.cs

@@ -33,6 +33,37 @@ namespace MP.Data.DatabaseModels
         [MaxLength(50)]
         public string CodCli { get; set; } = "";
 
+        [NotMapped]
+        public string DurataMinuti
+        {
+            get
+            {
+                string answ = "";
+                DateTime end = DataFine != null ? (DateTime)DataFine : DateTime.Now;
+                var tsDurata = (end).Subtract((DateTime)DataInizio);
+                if (tsDurata.TotalDays < 1)
+                {
+                    answ = $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'";
+                }
+                else
+                {
+                    answ = $"{tsDurata.Days}gg {tsDurata.Hours:00}h";
+                }
+                return answ;
+            }
+        }
+
+        /// <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/PODLModel.cs

@@ -55,6 +55,17 @@ namespace MP.Data.DatabaseModels
             }
         }
 
+        /// <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/StatODLModel.cs

@@ -0,0 +1,26 @@
+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 StatODLModel
+    {
+        #region Public Properties
+
+        [Key]
+        public int IdxStato { get; set; }
+        public string Descrizione { get; set; } = "";
+        public string Semaforo { get; set; }
+        public string Css { get; set; }
+        public double TotDurata { get; set; }
+
+        #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,7 +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
 
@@ -298,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.Data/Utils.cs

@@ -57,17 +57,54 @@ namespace MP.Data
             return answ;
         }
 
-        public static async Task SaveToCsv<T>(List<T> reportData, string path)
+        /// <summary>
+        /// Effettua salvataggio in file di un generico oggetto in formato CSV
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="reportData"></param>
+        /// <param name="path"></param>
+        /// <param name="separator">Separatore da impiegare</param>
+        /// <returns></returns>
+        public static async Task SaveToCsv<T>(List<T> reportData, string path, char separator)
         {
             var lines = new List<string>();
             IEnumerable<PropertyDescriptor> props = TypeDescriptor.GetProperties(typeof(T)).OfType<PropertyDescriptor>();
             var header = string.Join(";", props.ToList().Select(x => x.Name));
             lines.Add(header);
-            var valueLines = reportData.Select(row => string.Join(";", header.Split(';').Select(a => row.GetType().GetProperty(a).GetValue(row, null))));
+            var valueLines = reportData.Select(row => string.Join(separator, header.Split(separator).Select(a => row.GetType().GetProperty(a).GetValue(row, null))));
+            //var valueLines = reportData.Select(row => string.Join(";", header.Split(';').Select(a => row.GetType().GetProperty(a).GetValue(row, null))));
             lines.AddRange(valueLines);
             await Task.Run(() => File.WriteAllLines(path, lines.ToArray()));
         }
 
+        /// <summary>
+        /// Inizializzazione con periodo e arrotondamento
+        /// </summary>
+        /// <param name="minRound"></param>
+        /// <returns></returns>
+        public static DateTime InitDatetime(DateTime dtRif, int minRound)
+        {
+            TimeSpan DayElapsed = dtRif.Subtract(dtRif.Date);
+            int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound;
+            DateTime endRounded = DateTime.Today.AddMinutes(minDay);
+            return endRounded;
+        }
+
+        public static string FormDurata(double durataMinuti)
+        {
+            string answ = "";
+            TimeSpan tsDurata = TimeSpan.FromMinutes(durataMinuti);
+            if (tsDurata.TotalDays < 1)
+            {
+                answ = $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'";
+            }
+            else
+            {
+                answ = $"{tsDurata.Days}gg {tsDurata.Hours:00}h";
+            }
+            return answ;
+        }
+
         #endregion Public Methods
     }
 }

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

@@ -0,0 +1 @@
+<canvas id="@Id"></canvas>

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

@@ -0,0 +1,59 @@
+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
+{
+    public partial class Doughnut
+    {
+        [Inject]
+        private IJSRuntime JSRuntime { get; set; } = null!;
+
+
+        public enum ChartType
+        {
+            Pie,
+            Bar,
+            Doughnut
+        }
+
+        //[Parameter]
+        public string Id { get; set; } = "myChart";
+
+        [Parameter]
+        public ChartType Type { get; set; }
+
+        [Parameter]
+        public double[] Data { get; set; } = null!;
+        [Parameter]
+        public List<DoughnutStyling> BackgroundColor { get; set; } = null!;
+
+        [Parameter]
+        public string[] Labels { get; set; } = null!;
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            var config = new
+            {
+                Type = Type.ToString().ToLower(),
+                Options = new
+                {
+                    Responsive = true,
+                },
+                Data = new
+                {
+                    Datasets = new[]
+                    {
+                    new { Data = Data, BackgroundColor = BackgroundColor.Select(x=>x.color), borderColor = BackgroundColor.Select(x=>x.border), borderWidth= 0, offset= 1, borderRadius = 0
+    }
+},
+                    Labels = Labels
+                }
+            };
+
+            await JSRuntime.InvokeVoidAsync("setup", Id, config);
+        }
+    }
+}

MP.SPEC/Components/Chart/Line.razor

@@ -0,0 +1 @@
+<canvas id="@Id"></canvas>

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

@@ -0,0 +1,162 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using MP.Data;
+
+namespace MP.SPEC.Components.Chart
+{
+    public partial class Line
+    {
+        #region Public Properties
+
+        [Parameter]
+        public double AspRatio { get; set; } = 0;
+
+        [Parameter]
+        public List<string> backColor { get; set; } = new List<string>();
+
+        [Parameter]
+        public string ChartId
+        {
+            get
+            {
+                return Id;
+            }
+            set
+            {
+                Id = value;
+            }
+        }
+
+        [Parameter]
+        public List<chartJsData.chartJsTSerie> DataTS
+        {
+            get
+            {
+                return _DataTS;
+            }
+
+            set
+            {
+                _DataTS = value;
+                //var pUpd = Task.Run(async () => await renderChart());
+                //pUpd.Wait();
+            }
+        }
+
+        [Parameter]
+        public List<string> Labels { get; set; } = new List<string>();
+
+        [Parameter]
+        public List<string> lineColor { get; set; } = new List<string>();
+
+        [Parameter]
+        public int lTens { get; set; } = 0;
+
+        [Parameter]
+        public string MaxValue { get; set; } = "0";
+
+        [Parameter]
+        public string MinValue { get; set; } = "0";
+
+        [Parameter]
+        public List<string> pointColor { get; set; } = new List<string>();
+
+        [Parameter]
+        public string Title { get; set; } = "Demo Line";
+
+        #endregion Public Properties
+
+        #region Protected Properties
+
+        protected string Id { get; set; } = "CurrId";
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Inizializzazione rendering componente
+        ///
+        /// partendo da qui: https://www.williamleme.com/posts/2020/003-chartjs-blazor/
+        /// https://www.puresourcecode.com/dotnet/blazor/using-chart-js-with-blazor/ https://www.tutorialsteacher.com/csharp/csharp-anonymous-type
+        /// </summary>
+        /// <param name="firstRender"></param>
+        /// <returns></returns>
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            await renderChart();
+        }
+
+        /// <summary>
+        /// Inizializzazione rendering componente
+        ///
+        /// partendo da qui: https://www.williamleme.com/posts/2020/003-chartjs-blazor/
+        /// https://www.puresourcecode.com/dotnet/blazor/using-chart-js-with-blazor/ https://www.tutorialsteacher.com/csharp/csharp-anonymous-type
+        /// </summary>
+        /// <param name="firstRender"></param>
+        /// <returns></returns>
+        protected async Task renderChart()
+        {
+            // creazione di un oggetto anonymous type con tutte le opzioni da passare a chart.js
+            var config = new
+            {
+                type = "line",
+                options = new
+                {
+                    responsive = true,
+                    scales = new
+                    {
+                        yAxes = new
+                        {
+                            display = true,
+                            position = "right",
+                            ticks = new
+                            {
+                                maxTicksLimit = 10
+                            },
+                            suggestedMin = MinValue != MaxValue ? MinValue : "auto",
+                            suggestedMax = MinValue != MaxValue ? MaxValue : "auto"
+                        },
+                        xAxes = new
+                        {
+                            type = "time",
+                            distribution = "linear",
+                        }
+                    },
+                    plugins = new
+                    {
+                        legend = new
+                        {
+                            display = false
+                        },
+                    },
+                    Animation = false,
+                    AspectRatio = AspRatio == 0 ? "auto" : $"{AspRatio}"
+                },
+                data = new
+                {
+                    labels = Labels,
+                    datasets = new[]{new
+                        {
+                            data = DataTS, pointBorderColor = backColor, borderColor = lineColor, backgroundColor = backColor, fill = true, PointRadius = 2, BorderWidth = 1, lineTension = lTens, stepped = false, label = Title
+                        }
+                    }
+                }
+            }
+
+            ;
+            await JSRuntime.InvokeVoidAsync("setup", Id, config);
+        }
+
+        #endregion Protected Methods
+
+        #region Private Properties
+
+        private List<chartJsData.chartJsTSerie> _DataTS { get; set; } = null!;
+
+        [Inject]
+        private IJSRuntime JSRuntime { get; set; } = null!;
+
+        #endregion Private Properties
+    }
+}

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,26 +1,80 @@
-<div class="d-flex justify-content-between">
-    <div class="px-0 py-1">
-        
+<div class="d-flex justify-content-end">
+    <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="px-0 col-6">
-        <div class="">
-            <div class="px-0 py-1">
-                <div class="px-2 input-group" id="basic-addon1">
-                    <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>
-                        @if (ListMacchine != null)
+    <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>
+                Seleziona i filtri per:
+            </div>
+            <div class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Articolo</label>
+            </div>
+            <div class="input-group 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>
+                    @if (ListArticoli != null)
+                    {
+                        foreach (var item in ListArticoli)
                         {
-                            foreach (var item in ListMacchine)
-                            {
-                                <option value="@item">@item</option>
-                            }
+                            <option value="@item">@item</option>
                         }
-                    </select>
-                    <label class="input-group-text" for="DtRef" title="Selezionare la data da visualizzare"><i class="fa-solid fa-calendar-check"></i></label>
-                    <input @bind="@selDtRef" id="DtRef" class="form-control" type="datetime-local" title="Selezionare la data da visualizzare" />
-                </div>
+                    }
+                </select>
+            </div>
+            <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>
+                    @if (ListMacchine != null)
+                    {
+                        foreach (var item in ListMacchine)
+                        {
+                            <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>
     </div>

MP.SPEC/Components/DossiersFilter.razor.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
 using MP.SPEC.Data;
 
 namespace MP.SPEC.Components
@@ -21,18 +20,65 @@ namespace MP.SPEC.Components
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        protected DateTime selDtRef
+        protected string selArticolo
         {
             get
             {
-                return SelFilterDossier.DtRef;
+                return SelFilterDossier.CodArticolo;
+            }
+            set
+            {
+                if (!SelFilterDossier.CodArticolo.Equals(value))
+                {
+                    SelFilterDossier.CurrPage = 1;
+                    SelFilterDossier.CodArticolo = value;
+                    StateHasChanged();
+                    Task.Delay(1);
+                    reportChange();
+                }
+            }
+        }
+        private bool filtActive
+        {
+            get => selMacchina != "*" || selArticolo != "*";
+        }
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetArticolo()
+        {
+            selArticolo = "*";
+        }
+        protected DateTime selDtMax
+        {
+            get
+            {
+                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();
                 }
             }
@@ -74,6 +120,8 @@ namespace MP.SPEC.Components
             }
         }
 
+        protected bool showParam { get; set; } = false;
+
         #endregion Protected Properties
 
         #region Protected Methods
@@ -81,8 +129,10 @@ namespace MP.SPEC.Components
         protected override async Task OnInitializedAsync()
         {
             SelFilterDossier = new SelectDossierParams();
-            ListMacchine = await MDService.MacchineWithFlux();
-            ListDossier = await MDService.DossiersGetLastFilt(selMacchina, selDtRef, selMaxRecord);
+            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);
         }
 
@@ -95,7 +145,7 @@ namespace MP.SPEC.Components
 
         #region Private Fields
 
-        private List<Dossiers>? ListDossier = null;
+        private List<string>? ListArticoli = null;
         private List<string>? ListMacchine = null;
 
         #endregion Private Fields
@@ -113,6 +163,11 @@ namespace MP.SPEC.Components
             FilterChanged.InvokeAsync(SelFilterDossier);
         }
 
+        private void toggleShowParams()
+        {
+            showParam = !showParam;
+        }
+
         #endregion Private Methods
     }
 }

MP.SPEC/Components/ListDossiers.razor

@@ -1,6 +1,9 @@
 @using MP.SPEC.Components
 @using MP.SPEC.Data
 
+
+
+
 @if (ListRecords == null)
 {
     <LoadingData></LoadingData>
@@ -11,18 +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</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>
@@ -31,10 +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.CodArticolo
+                                <div class="small textConsensed text-secondary">@record.ArticoloNav.DescArticolo</div>
+                            </td>
+                            <td>
+                                @tradFase(record.KeyRichiesta)
                             </td>
                             <td>
                                 @record.IdxMacchina
+                                @*<div class="small textConsensed text-secondary">@record.MachineNav.Descrizione</div>*@
                             </td>
                             <td>
                                 @record.DtRif
@@ -43,10 +254,17 @@ else
                                 @record.IdxODL
                             </td>
                             <td>
-                                @record.DataType
+                                @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>
-                            <td>
-                        <button @onclick="() => deleteRecord(record)" class="btn btn-danger btn-sm"><i class="bi bi-trash-fill"></i></button></td>
                         </tr>
                     }
                 </tbody>
@@ -64,16 +282,24 @@ else
                         <table class="table table-light table-sm table-striped small mb-0">
                             <thead>
                                 <tr>
+                                    <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 class="d-flex justify-content-between"> Valore <button class="btn btn-primary btn-sm py-0" @onclick="() => unToggleTableFlux()"><i class="fa-solid fa-xmark"></i></button></th>
+                                    <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>
                                         <td>
                                             @record.IdxMacchina
                                         </td>
@@ -81,10 +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;">
-                                            <b>@record.Valore</b>
+                                            @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>
                                 }
@@ -100,3 +335,5 @@ else
 
 
 
+
+

MP.SPEC/Components/ListDossiers.razor.cs

@@ -1,16 +1,22 @@
 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; }
 
         [Parameter]
         public SelectDossierParams SelFilter { get; set; } = null!;
@@ -22,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)
@@ -36,35 +42,51 @@ namespace MP.SPEC.Components
             }
             return answ;
         }
-
-        /// <summary>
-        /// Eliminazione record selezionato (previa conferma)
-        /// </summary>
-        /// <param name="selRec"></param>
-        /// <returns></returns>
-        protected async Task deleteRecord(Dossiers selRec)
+        private bool selectFirst(string idxMacchina)
         {
-            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Eliminazione Dossier: sei sicuro di voler procedere?"))
-                return;
-            await Task.Delay(1);
-            var done = await MDService.DossiersDeleteRecord(selRec);
-            currRecord = null;
-            await reloadData();
-            await Task.Delay(1);
+            //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 async Task reloadData(bool setChanged)
+        public void Dispose()
         {
-            isLoading = true;
-            SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelDtRef, MaxRecord);
-            totalCount = SearchRecords.Count;
-            ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-            await Task.Delay(1);
-            if (setChanged)
-            {
-                await InvokeAsync(() => StateHasChanged());
-            }
-            isLoading = false;
+            currRecord = null;
+            SearchRecords = null;
+            ListRecords = null;
+            GC.Collect();
         }
 
         #endregion Public Methods
@@ -77,21 +99,155 @@ 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(DossierModel selRec)
+        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Eliminazione Dossier: sei sicuro di voler procedere?"))
+                return;
+            await Task.Delay(1);
+            var done = await MDService.DossiersDeleteRecord(selRec);
+            currRecord = null;
+            await reloadData(true);
+            visualizzaFlux = true;
+            await Task.Delay(1);
+        }
+
+        protected async Task editRecord(FluxLogDTO selRec)
+        {
+            currFluxLogDto = selRec;
+            // indico record selezionato
+            await RecordSelFlux.InvokeAsync(selRec);
+        }
+
+        protected async Task newDossier(DossierModel selRec)
+        {
+            var alert = await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler creare un nuovo Dossier per l'impianto/articolo selezioanto?");
+
+            if (alert)
+            {
+                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);
+            }
+        }
+
         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);
+        }
 
-            ListRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelDtRef, MaxRecord);
-
-            await reloadData();
+        protected override async Task OnParametersSetAsync()
+        {
+            if (!lastFilter.Equals(SelFilter))
+            {
+                lastFilter = SelFilter.clone();
+                await reloadData(true);
+            }
         }
 
         protected async void OnSeachUpdated()
@@ -103,14 +259,45 @@ namespace MP.SPEC.Components
             });
         }
 
-        protected async Task selRecord(Dossiers selRec)
+        protected async Task selRecord(DossierModel selRec)
         {
             currRecord = selRec;
             await RecordSel.InvokeAsync(selRec);
-            listaFlux = MDService.convertToFluxLog(selRec.Valore);
+            listaFlux = MDService.getFluxLog(selRec.Valore);
             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;
@@ -122,9 +309,24 @@ namespace MP.SPEC.Components
         #region Private Fields
 
         private int _totalCount = 0;
-        private Dossiers? currRecord = null;
-        private List<Dossiers>? ListRecords;
-        private List<Dossiers>? SearchRecords;
+
+        private FluxLogDTO? currFluxLogDto = null;
+
+        private DossierModel? currRecord = null;
+
+        private DossierModel? currRecordClone = null;
+
+        private List<AnagGruppi>? ListGruppiFase;
+
+        private List<DossierModel>? ListRecords;
+
+        private List<ListValues>? ListStati;
+
+        private List<DossierModel>? SearchRecords;
+
+        private List<Macchine>? ListMacchine;
+
+        private List<AnagArticoli>? ListArticoli;
 
         #endregion Private Fields
 
@@ -132,27 +334,49 @@ 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 List<FluxLog>? listaFlux { get; set; } = null;
+
+        private SelectDossierParams lastFilter { get; set; } = new SelectDossierParams() { CurrPage = -1 };
+
+        private List<FluxLogDTO>? listaFlux { get; set; } = null;
 
         private int MaxRecord
         {
             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 DateTime SelDtRef
+        private string SelArticolo
         {
-            get => SelFilter.DtRef;
+            get => SelFilter.CodArticolo;
+        }
+
+        private DateTime SelDtEnd
+        {
+            get => SelFilter.DtEnd;
+        }
+
+        private DateTime SelDtStart
+        {
+            get => SelFilter.DtStart;
         }
 
         private string SelMacchina
@@ -179,19 +403,54 @@ namespace MP.SPEC.Components
 
         #region Private Methods
 
-        private async void MessageService_EA_PageUpdated()
+        private async Task closeTableFlux()
         {
-            await reloadData();
+            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 async Task reloadData()
+        private void enableEditing()
+        {
+            isEditing = true;
+        }
+
+        private async Task reloadData(bool setChanged)
         {
             isLoading = true;
-            SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, 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);
-            await InvokeAsync(() => StateHasChanged());
+            if (setChanged)
+            {
+                await InvokeAsync(() => StateHasChanged());
+            }
             isLoading = false;
         }
 
@@ -201,11 +460,24 @@ namespace MP.SPEC.Components
             await Task.Delay(1);
         }
 
-        private async Task unToggleTableFlux()
+        private string tradFase(string codFase)
         {
-            currRecord = null;
-            visualizzaFlux = true;
-            await Task.Delay(1);
+            string answ = codFase;
+            if (ListStati != null && ListStati.Count > 0)
+            {
+                var recSel = ListStati.FirstOrDefault(x => x.value == codFase);
+                if (recSel != null)
+                {
+                    answ = recSel.label;
+                }
+            }
+            return answ;
+        }
+
+        private string traduci(string lemma)
+        {
+            var answ = MDService.Traduci(lemma, "IT");
+            return answ;
         }
 
         #endregion Private Methods

MP.SPEC/Components/ListODL.razor

@@ -12,57 +12,258 @@ 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>
-                            @*<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>
                         <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
-                        <th># pz</th>
-                        <th><i class="fa-solid fa-clock"></i> T.Ciclo</th>
-                        <th><i class="fa-solid fa-play"></i> Inizio</th>
-                        <th><i class="fa-solid fa-pen-to-square"></i> Note</th>
-                        <th><i class="fa-solid fa-code-pull-request"></i> Richiesta</th>
-                        <th></th>
+                        <th><i class="fa-solid fa-circle-info"></i> Info ciclo</th>
+                        <th><i class="fa-solid fa-calendar-day"></i> Periodo</th>
+                        <th title="Durata in ore:min"><i class="fa-solid fa-clock"></i> Durata</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach (var record in ListRecords)
                     {
-                        <tr class="@checkSelect(@record.CodArticolo)">
+                        <tr class="@checkSelect(@record.IdxOdl)">
+
                             <td>
-                                @*<button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm"><i class="bi bi-pencil-square"></i></button>*@
+                                @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>
                             </td>
+                            <td>
+                                <div>
+                                    @tradFase(record.KeyRichiesta)
+                                </div>
+                                @if (record.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"> @record.Note </span>
+                                    </div>
+                                }
+                            </td>
+
                             <td>
                                 @record.IdxMacchina
+                                <div class="small textConsensed text-secondary">@record.MachineNav.Descrizione</div>
                             </td>
                             <td>
-                                @record.NumPezzi
+                                <div class="small textConsensed"><b>N° pezzi:</b> @record.NumPezzi</div>
+                                <div class="small textConsensed"><b>T. Ciclo:</b> @record.Tcassegnato.ToString("N3")</div>
+
                             </td>
                             <td>
-                                @record.Tcassegnato.ToString("N3")
+                                <div class="small d-flex justify-content-between">
+                                    <div>
+                                        <div><b>@($"{@record.DataInizio:yyyy/MM/dd}")</b></div>
+                                        <div>@($"{@record.DataInizio:ddd HH:mm:ss}")</div>
+                                    </div>
+                                    <div class="p-0">
+                                        <i class="fa-solid fa-angles-right"></i>
+                                    </div>
+                                    <div>
+                                        @if (@record.DataFine != null)
+                                        {
+                                            <div><b>@($"{@record.DataFine:yyyy/MM/dd}")</b></div>
+                                            <div>@($"{@record.DataFine:ddd HH:mm:ss}")</div>
+                                        }
+                                        else
+                                        {
+                                            <div class="text-secondary">
+                                                <div><b>@($"{DateTime.Now:yyyy/MM/dd}")</b></div>
+                                                <div>@($"{DateTime.Now:ddd HH:mm:ss}")</div>
+                                            </div>
+                                        }
+                                    </div>
+                                </div>
                             </td>
                             <td>
-                                <div>@record.DataInizio</div>
-                            </td>
-                            <td>@record.Note</td>
-                            <td>@record.KeyRichiesta</td>
-                            <td>
-                                @*@if (ArticoloDelEnabled(record.CodArticolo))
-                        {
-                        <button @onclick="() => deleteRecord(record)" class="btn btn-danger btn-sm"><i class="bi bi-trash-fill"></i></button>
-                        }*@
+                                <div>
+                                    <b>@record.DurataMinuti</b>
+                                </div>
+                                <div>
+                                    <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>
                         </tr>
                     }
                 </tbody>
             </table>
+            <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 (statRecord != null)
+                            {
+                                <div class="col-3">
+                                    <b class="modal-title fs-1" id="staticBackdropLabel"><b>ODL @statRecord.IdxOdl</b></b>
+                                </div>
+                                <div class="col-6 fs-5">
+                                    <b>@statRecord.CodArticolo</b>
+                                    <div class="small textConsensed text-light">@statRecord.ArticoloNav.DescArticolo</div>
+                                </div>
+                                <div class="col-2 fs-5">
+                                    <b>@statRecord.IdxMacchina</b>
+                                    <div class="small textConsensed text-light">@statRecord.MachineNav.Descrizione</div>
+                                </div>
+                            }
+                            <div class="col-1 text-end">
+                                <button type="button" class="btn btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                            </div>
+                        </div>
+                        <div class="modal-body col-12">
+                            @if (statRecord != null && showStats)
+                            {
+                                <div class="d-flex justify-content-between">
+                                    <div class="col-8">
+                                        <div>
+                                            <table class="table">
+                                                <tbody>
+                                                    <tr>
+                                                        <td style="width: 270px">
+                                                            <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>@($"{@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 (@statRecord.DataFine != null)
+                                                                    {
+                                                                        <div><b>@($"{@statRecord.DataFine:yyyy/MM/dd}")</b></div>
+                                                                        <div>@($"{@statRecord.DataFine:ddd HH:mm:ss}")</div>
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        <div class="text-secondary">
+                                                                            <div><b>@($"{DateTime.Now:yyyy/MM/dd}")</b></div>
+                                                                            <div>@($"{DateTime.Now:ddd HH:mm:ss}")</div>
+                                                                        </div>
+                                                                    }
+                                                                </div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                        <div>
+                                            <table class="table">
+                                                <tbody>
+                                                    <tr>
+                                                        <td>
+                                                            <div>
+                                                                @tradFase(statRecord.KeyRichiesta)
+                                                            </div>
+                                                            @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"> @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 (statRecord != null)
+                                            {
+                                                @if (ListOdlStatsAct != null)
+                                                {
+                                                    @foreach (var stat in ListOdlStatsAct)
+                                                    {
+                                                        <div class="p-1">
+                                                            <div class="d-flex justify-content-between">
+                                                                <div class="text-uppercase">
+                                                                    @stat.Descrizione
+                                                                </div>
+                                                                <div>
+                                                                    <b>@(formDurata(stat.TotDurata))</b>
+                                                                </div>
+
+                                                            </div>
+                                                            <div class="progress">
+                                                                <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>
+
+                                                    }
+                                                }
+                                            }
+                                        </div>
+                                    </div>
+                                    <div class="col-4 dcContainer">
+                                        @if (statRecord != null && ListOdlStats != null)
+                                        {
+                                            <div class="dcBox">
+                                                <ODLPlot SelectedOdl="@statRecord.IdxOdl" hideSpenta="@hideSpenta"></ODLPlot>
+                                            </div>
+                                            <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>
+                                </div>
+                            }
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 }
+

MP.SPEC/Components/ListODL.razor.cs

@@ -2,43 +2,36 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 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
 
+        [Parameter]
+        public SelectOdlParams currFilter { get; set; } = null!;
+
         [Parameter]
         public EventCallback<bool> PagerResetReq { get; set; }
 
         [Parameter]
-        public string StatoSel
-        {
-            get => _statoSel;
-            set
-            {
-                if (_statoSel != value)
-                {
-                    _statoSel = value;
-                    var pUpd = Task.Run(async () => await reloadData());
-                    pUpd.Wait();
-                }
-            }
-        }
+        public EventCallback<int> updateRecordCount { get; set; }
 
         #endregion Public Properties
 
         #region Public Methods
 
-        public string checkSelect(string CodArticolo)
+        public string checkSelect(int IdxOdl)
         {
             string answ = "";
             if (currRecord != null)
             {
                 try
                 {
-                    answ = (currRecord.CodArticolo == CodArticolo) ? "table-info" : "";
+                    answ = (currRecord.IdxOdl == IdxOdl) ? "table-info" : "";
                 }
                 catch
                 { }
@@ -46,6 +39,23 @@ 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 MP.Data.Utils.FormDurata(durataMin);
+        }
+
         #endregion Public Methods
 
         #region Protected Properties
@@ -57,16 +67,68 @@ 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()
         {
-            MessageService.EA_PageUpdated += MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            ListStati = await MDService.AnagStatiComm();
+        }
+
+        protected override async Task OnParametersSetAsync()
+        {
             await reloadData();
         }
 
@@ -75,15 +137,56 @@ namespace MP.SPEC.Components
             await InvokeAsync(() =>
             {
                 PagerResetReq.InvokeAsync(true);
-                //currPage = 1;
                 Task task = UpdateData();
                 StateHasChanged();
             });
         }
 
+        protected async Task resetSel()
+        {
+            await selRecord(null);
+            await reloadData();
+        }
+
+        protected async Task selectStatRecord(ODLModel? currRec)
+        {
+            showStats = true;
+            await Task.Delay(1);
+            statRecord = currRec;
+            if (currRec != null)
+            {
+                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()
         {
-            currRecord = null;
+            await selRecord(null);
             await reloadData();
         }
 
@@ -91,56 +194,208 @@ namespace MP.SPEC.Components
 
         #region Private Fields
 
-        private string _statoSel = "*";
+        private static Logger Log = LogManager.GetCurrentClassLogger();
 
         private ODLModel? currRecord = null;
 
+        private List<StatODLModel>? ListOdlStats;
+
+        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 string SearchVal
+        private List<StatODLModel>? ListOdlStatsAct
         {
-            get => string.IsNullOrEmpty(MessageService.SearchVal) ? "*" : MessageService.SearchVal;
+            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 => MessageService.totalCount;
-            set => MessageService.totalCount = value;
+            get => _totalCount;
+            set
+            {
+                if (_totalCount != value)
+                {
+                    _totalCount = value;
+                    updateRecordCount.InvokeAsync(value);
+                }
+            }
         }
 
         #endregion Private Properties
 
         #region Private Methods
 
-        private async void MessageService_EA_PageUpdated()
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task addTask2Exe(string idxMacc, string taskName, string taskVal)
         {
-            await reloadData();
+            // 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 (ListOdlStatsAct != null)
+            {
+                tot = ListOdlStatsAct.Sum(x => x.TotDurata);
+
+                double perc = (durata / tot) * 100;
+                if (perc > 1)
+                {
+                    answ = Math.Round(perc, 2);
+                }
+                else
+                {
+                    answ = Math.Round(perc, 4);
+                }
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="IdxMacc"></param>
+        /// <returns></returns>
+        private async Task callSyncDb(string IdxMacc)
+        {
+            // 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(true, SearchVal, StatoSel);
+            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);
@@ -148,6 +403,35 @@ namespace MP.SPEC.Components
             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;
+            if (ListStati != null && ListStati.Count > 0)
+            {
+                var recSel = ListStati.FirstOrDefault(x => x.value == codFase);
+                if (recSel != null)
+                {
+                    answ = recSel.label;
+                }
+            }
+            return answ;
+        }
+
         #endregion Private Methods
     }
 }

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,38 +17,74 @@ 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>
                         <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
-                        <th># pz</th>
-                        <th><i class="fa-solid fa-clock"></i> T.Ciclo</th>
-                        <th><i class="fa-solid fa-pen-to-square"></i> Note</th>
+                        <th><i class="fa-solid fa-circle-info"></i> Info ciclo</th>
+                        @*<th><i class="fa-solid fa-pen-to-square"></i> Note</th>*@
+                        <th title="Attivabile"><i class="fa-regular fa-square-check"></i> Att</th>
                         <th></th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach (var record in ListRecords)
                     {
-                        <tr class="@checkSelect(@record.CodArticolo)">
-                            <td>
-                                <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm"><i class="bi bi-pencil-square"></i></button>
+                        <tr class="@checkSelect(@record)">
+                            <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
+                                <div class="small textConsensed text-secondary">@record.ArticoloNav.DescArticolo</div>
+                            </td>
+                            <td>
+                                <div>
+                                    @tradFase(record.KeyRichiesta)
+                                </div>
+                                @if (record.Note != "")
+                                {
+                                    <div class="small textConsensed text-secondary badge text-bg-light border border-primary rounded">
+                                        <b class="text-dark">Note:</b> @record.Note
+                                    </div>
+                                }
                             </td>
-                            <td>@tradFase(record.KeyRichiesta)</td>
                             <td>
                                 @record.IdxMacchina
+                                <div class="small textConsensed text-secondary">@record.MachineNav.Descrizione</div>
                             </td>
                             <td>
-                                @record.NumPezzi
+                                <div class="small textConsensed"><b>N° pezzi:</b> @record.NumPezzi</div>
+                                <div class="small textConsensed"><b>T. Ciclo:</b> @record.Tcassegnato.ToString("N3")</div>
                             </td>
+                            @*<td>@record.Note</td>*@
                             <td>
-                                @record.Tcassegnato.ToString("N3")
+                                @if (@record.Attivabile)
+                                {
+                                    <i class="fa-regular fa-square-check text-success"></i>
+                                }
+                                else
+                                {
+                                    <i class="fa-regular fa-square text-secondary"></i>
+                                }
                             </td>
-                            <td>@record.Note</td>
                             <td>
                                 @if (POdlDelEnabled(record.IdxOdl))
                                 {

MP.SPEC/Components/ListPODL.razor.cs

@@ -2,31 +2,39 @@
 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; }
 
         [Parameter]
         public EventCallback<PODLModel> RecordSel { get; set; }
 
+        [Parameter]
+        public EventCallback<int> updateRecordCount { get; set; }
+
         #endregion Public Properties
 
         #region Public Methods
 
-        public string checkSelect(string CodArticolo)
+        public string checkSelect(PODLModel record)
         {
             string answ = "";
             if (currRecord != null)
             {
                 try
                 {
-                    answ = (currRecord.CodArticolo == CodArticolo) ? "table-info" : "";
+                    answ = ((currRecord.IdxMacchina == record.IdxMacchina) && (currRecord.CodArticolo == record.CodArticolo) && (currRecord.CodFase == record.CodFase)) ? "table-info" : "";
                 }
                 catch
                 { }
@@ -34,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
@@ -45,12 +62,38 @@ namespace MP.SPEC.Components
         protected MpDataService MDService { get; set; } = null!;
 
         [Inject]
-        protected MessageService MsgService { get; set; } = null!;
+        protected IOApiService MpIoApiCall { get; set; } = null!;
 
         #endregion Protected Properties
 
         #region Protected Methods
 
+        protected async Task cloneRecord(PODLModel selRec)
+        {
+            // creo record duplicato...
+            PODLModel newRec = new PODLModel()
+            {
+                Attivabile = selRec.Attivabile,
+                CodArticolo = selRec.CodArticolo,
+                CodCli = selRec.CodCli,
+                CodGruppo = selRec.CodGruppo,
+                DueDate = selRec.DueDate,
+                IdxMacchina = selRec.IdxMacchina,
+                IdxOdl = selRec.IdxOdl,
+                IdxPromessa = 0,
+                InsertDate = selRec.InsertDate,
+                KeyBCode = selRec.KeyBCode,
+                KeyRichiesta = selRec.KeyRichiesta,
+                Note = $"DUPLICATED - {selRec.Note}",
+                NumPezzi = selRec.NumPezzi,
+                Priorita = selRec.Priorita,
+                PzPallet = selRec.PzPallet,
+                Tcassegnato = selRec.Tcassegnato
+            };
+            currRecord = selRec;
+            await RecordSel.InvokeAsync(newRec);
+        }
+
         /// <summary>
         /// Eliminazione record selezionato (previa conferma)
         /// </summary>
@@ -62,6 +105,7 @@ namespace MP.SPEC.Components
                 return;
             await Task.Delay(1);
             var done = await MDService.PODLDeleteRecord(selRec);
+            await callSyncDb(selRec.IdxMacchina);
             currRecord = null;
             await reloadData();
             await Task.Delay(1);
@@ -69,11 +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();
-            await reloadData();
+        }
+
+        protected override async Task OnParametersSetAsync()
+        {
+            if (!lastFilter.Equals(actFilter))
+            {
+                lastFilter = actFilter.clone();
+                await reloadData();
+            }
         }
 
         protected async void OnSeachUpdated()
@@ -94,14 +144,62 @@ namespace MP.SPEC.Components
 
         protected async Task resetSel()
         {
+            currRecord = null;
             await RecordSel.InvokeAsync(null);
         }
 
         protected async Task selRecord(PODLModel selRec)
         {
+            currRecord = selRec;
             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;
@@ -112,66 +210,175 @@ 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 => MsgService.totalCount;
-            set => MsgService.totalCount = value;
+            get => _totalCount;
+            set
+            {
+                if (_totalCount != value)
+                {
+                    _totalCount = value;
+                    updateRecordCount.InvokeAsync(value);
+                }
+            }
         }
 
         #endregion Private Properties
 
         #region Private Methods
 
-        private async void MessageService_EA_PageUpdated()
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task addTask2Exe(string idxMacc, string taskName, string taskVal)
         {
-            await reloadData();
+            // 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 async void MsgService_EA_StatoSearch()
+        /// <summary>
+        /// Chiama metodo x chiedere force Update
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task callForceUpdate(string IdxMacc)
         {
-            await InvokeAsync(() =>
+            // chiamo aggiunta task SyncDb...
+            await addTask2Exe(IdxMacc, "ForceUpdate", $"SPEC|TS:{DateTime.Now:yyMMddHHmmss}");
+        }
+
+        /// <summary>
+        /// Chiama metodo x indicare inizio setup
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task callStartSetup(string IdxMacc)
+        {
+            // chiamo evento inizio setup
+            await addTask2Exe(IdxMacc, "startSetup", $"SPEC|TS:{DateTime.Now:yyMMddHHmmss}");
+        }
+
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="IdxMacc"></param>
+        /// <returns></returns>
+        private async Task callSyncDb(string IdxMacc)
+        {
+            // 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()
@@ -182,6 +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);
             isLoading = false;
         }
 

MP.SPEC/Components/ODLPlot.razor

@@ -0,0 +1,13 @@
+@if (@SelectedOdl != -1)
+{
+    <div class="px-1 flex-fill">
+        @if (isLoading)
+        {
+            <LoadingDataSmall></LoadingDataSmall>
+        }
+        else
+        {
+            <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

@@ -0,0 +1,108 @@
+using Microsoft.AspNetCore.Components;
+using MP.Data.DatabaseModels;
+using MP.SPEC.Data;
+
+namespace MP.SPEC.Components
+{
+    public partial class ODLPlot
+    {
+        #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
+        {
+            get => _selParam;
+        }
+
+        [Parameter]
+        public int SelectedOdl
+        {
+            get => _selParam;
+            set => _selParam = value;
+        }
+
+        #endregion Public Properties
+
+        #region Protected Properties
+
+        //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
+
+        protected override async Task OnInitializedAsync()
+        {
+            isLoading = true;
+            await Task.Delay(1);
+        }
+
+        protected override async Task OnParametersSetAsync()
+        {
+            await ReloadData();
+            await Task.Delay(1);
+        }
+
+        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");
+                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;
+        }
+
+        #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,114 +1,143 @@
-
 <div class="d-flex justify-content-between">
-    <div class="px-0 py-1">
-        <div class="d-flex justify-content-between">
-            <div class="px-2">
-
-                @if (!liveUpdate)
-                {
-                    <button class="btn btn-secondary" type="button" @onclick="() => toggleUpdate()" title="Click per tornare a Valori Live">
-                        <small>@lastUpdate</small>
-                    </button>
-                }
-                else
-                {
-                    <button class="btn btn-primary" type="button" @onclick="() => toggleUpdate()">
-                        <span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
-                        Valori live
-                    </button>
-                }
-            </div>
-            <div class="px-2">
-                @if (selMacchina != "*")
-                {
-                    <button class="btn btn-warning" type="button" @onclick="() => takeSnapshot()">
-                        <i class="fa-solid fa-camera"></i>
-                        @snapMode
-                    </button>
-                }
-            </div>
-            <div class="px-2">
-                @if (snapshotDone)
-                {
-                    <button class="btn btn-success" type="button" @onclick="() => navDossier()">
-                        <div class="spinner-border spinner-border-sm" role="status">
-                            <span class="visually-hidden">Loading...</span>
-                        </div>
-                        <i class="fa-solid fa-camera"></i>
-                        Fatto! Mostra Dossier
-                    </button>
-                }
-            </div>
-        </div>
-    </div>
-
-    <div class="px-0">
-        <div class="d-flex justify-content-end">
-            @if (showEditPar)
+    <div class="d-flex justify-content-between pt-1 mb-1">
+        <div class="px-2">
+            @if (!liveUpdate)
             {
-                <div class="px-0 input-group py-1">
-                    <button class="btn btn-primary" @onclick="() => toggleParams()"> <i class="fa-solid fa-arrow-right"></i></button>
-                    <label class="input-group-text" for="tempoAgg" title="Selezionare il tempo di aggiornamento dei dati"><i class="fa-solid fa-clock"></i></label>
-                    <select @bind="@selTempoAgg" class="form-select" id="tempoAgg" title="Selezionare il tempo di aggiornamento dei dati" 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>
-                    <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>
-                        <option value="1000">1000</option>
-                        <option value="2500">2500</option>
-                        <option value="5000">5000</option>
-                    </select>
-                </div>
+                <button class="btn btn-secondary" type="button" @onclick="() => live()" title="Click per tornare a Valori Live">
+                    <small>@lastUpdate</small>
+                </button>
             }
             else
             {
-                <div class="px-2 py-1">
-                    <button class="btn btn-primary" @onclick="() => toggleParams()"><i class="fa-solid fa-arrow-left"></i></button>
-                </div>
+                <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>
             }
-            <div class="px-0 py-1">
-                <div class="px-2 input-group">
-                    <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>
-                        @if (ListMacchine != null)
-                        {
-                            foreach (var item in ListMacchine)
-                            {
-                                <option value="@item">@item</option>
-                            }
-                        }
-                    </select>
-                    <label class="input-group-text" for="flusso" title="Selezionare il tipo di flusso"><i class="fa-solid fa-sliders"></i></label>
-                    <select @bind="@selFlux" class="form-select" id="flusso" title="Selezionare il tipo di flusso">
-                        <option value="*">--- Tutti ---</option>
-                        @if (ListFlux != null)
-                        {
-                            foreach (var item in ListFlux)
-                            {
-                                <option value="@item">@item</option>
-                            }
-                        }
-                    </select>
-                    @if (dtMax == null)
+        </div>
+        <div class="px-2">
+            @if (selMacchina != "*")
+            {
+                <button class="btn btn-warning" type="button" @onclick="() => takeSnapshot()">
+                    <i class="fa-solid fa-camera"></i>
+                    @snapMode
+                </button>
+            }
+        </div>
+        <div class="px-2">
+            @if (snapshotDone)
+            {
+                <button class="btn btn-success" type="button" @onclick="() => navDossier()">
+                    <div class="spinner-border spinner-border-sm" role="status">
+                        <span class="visually-hidden">Loading...</span>
+                    </div>
+                    <i class="fa-solid fa-camera"></i>
+                    Fatto! Mostra Dossier
+                </button>
+            }
+        </div>
+
+    </div>
+    <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>
+</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)
                     {
-                        <button class="btn btn-primary" @onclick="() => setDtMax()"><i class="fa-regular fa-calendar-check"></i></button>
+                        <option value="@item">@item</option>
                     }
-                    else
+                }
+            </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)
                     {
-                        <label class="input-group-text" for="flusso" title="Selezionare il tipo di flusso"><i class="fa-solid fa-sliders"></i></label>
-                        <input class="form" @bind="@dtMax" type="datetime-local" title="Data massima eventi da visualizzare">
+                        <option value="@item">@item</option>
                     }
-                </div>
-            </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

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Components;
 using MP.SPEC.Data;
-using System.Runtime.CompilerServices;
 
 namespace MP.SPEC.Components
 {
@@ -100,7 +99,8 @@ namespace MP.SPEC.Components
                 }
             }
         }
-
+        protected bool showParam { get; set; } = false;
+        protected bool selDt { get; set; } = false;
         protected string selMacchina
         {
             get => SelFilter.IdxMacchina;
@@ -165,11 +165,28 @@ 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)
+            {
+                var newInt = 40;
+                int.TryParse(currRec.Valore, out newInt);
+                numOreAnticipoSnapshot = newInt;
+            }
+
             await FilterChanged.InvokeAsync(SelFilter);
         }
 
@@ -178,13 +195,15 @@ 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);
+            currFilt.dtMin = RoundDatetime(5).AddHours(-numOreAnticipoSnapshot);
             SelFilter = currFilt;
         }
 
+
         protected void startTimer()
         {
             aTimer = new System.Timers.Timer(5000);
@@ -192,39 +211,50 @@ namespace MP.SPEC.Components
             aTimer.Enabled = true;
             aTimer.Start();
         }
+        protected void resetMacchina()
+        {
+            selMacchina = "*";
+        }
+        protected void resetFase()
+        {
+            selFlux = "*";
+        }
 
         protected async Task takeSnapshot()
         {
-            // indico snapshot fatto
-            snapshotDone = true;
-            startTimer();
             // fermo udpate
             liveUpdate = false;
             // se non ho data rif uso adesso...
-            DateTime dtRif = SelFilter.dtRif == null ? DateTime.Now : (DateTime)SelFilter.dtRif;
-            // aggiungo 2 sec
-            dtRif = dtRif.AddSeconds(1);
-            await MDService.DossiersTakeParamsSnapshot(selMacchina, 10, dtRif);
+            DateTime dtMax = selDtMax == null ? RoundDatetime(5) : (DateTime)selDtMax;
+            DateTime dtMin = selDtMin == null ? RoundDatetime(5).AddHours(-numOreAnticipoSnapshot) : (DateTime)selDtMin;
+            // aggiungo 15 sec
+            dtMax = dtMax.AddSeconds(15);
+            await MDService.DossiersTakeParamsSnapshotLast(selMacchina, dtMin, dtMax);
             lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
+            // indico snapshot fatto
+            snapshotDone = true;
+            startTimer();
         }
 
         protected void toggleParams()
         {
             showEditPar = !showEditPar;
+            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
-            {
-                dtMax = null;
-            }
+        }
+        protected async Task live()
+        {
+            liveUpdate = true;
+            await Task.Delay(1);
         }
 
         #endregion Protected Methods
@@ -233,16 +263,18 @@ 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 { get; set; } = 50;
         private bool snapshotDone = false;
 
         #endregion Private Fields
 
         #region Private Properties
 
-        private DateTime? dtMax
+        [Inject]
+        private NavigationManager NavManager { get; set; } = null!;
+
+        private DateTime? selDtMax
         {
             get => SelFilter.dtMax;
             set
@@ -252,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;
@@ -262,8 +294,25 @@ namespace MP.SPEC.Components
             }
         }
 
-        [Inject]
-        private NavigationManager NavManager { get; set; } = null!;
+        private DateTime? selDtMin
+        {
+            get => SelFilter.dtMin;
+            set
+            {
+                if (SelFilter.dtMin != value)
+                {
+                    // copio il filtro
+                    var currFilt = SelFilter;
+                    // fermo update
+                    currFilt.LiveUpdate = false;
+                    currFilt.CurrPage = 0;
+                    currFilt.lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}";
+                    currFilt.dtMin = value;
+                    SelFilter = currFilt;
+                    reportChange();
+                }
+            }
+        }
 
         private bool showEditPar { get; set; } = false;
 

MP.SPEC/Components/ToggleMode.razor

@@ -0,0 +1,12 @@
+<div class="input-group input-group-sm">
+    <div class="input-group-text">
+        <span class="me-1 @leftStringCSS">@leftString</span>
+        <div class="form-check form-check-sm form-switch py-1" title="Parameter View Mode (RealTime / LogData)">
+            <input class="form-check-input" type="checkbox" id="mySwitch" name="setupAlarms" checked @onclick="() => toggle()">
+        </div>
+        <span class="@rightStringCSS">@rightString</span>
+    </div>
+</div>
+
+
+

MP.SPEC/Components/ToggleMode.razor.cs

@@ -0,0 +1,127 @@
+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.SPEC;
+using MP.SPEC.Shared;
+using MP.SPEC.Components;
+using MP.SPEC.Data;
+
+namespace MP.SPEC.Components
+{
+    public partial class ToggleMode
+    {
+        [Parameter]
+        public EventCallback<SelectGlobalToggle> FilterChanged { get; set; }
+
+        [Parameter]
+        public SelectGlobalToggle SelFilter { get; set; } = new SelectGlobalToggle();
+
+        protected bool isActive
+        {
+            get => SelFilter.isActive;
+            set
+            {
+                if (SelFilter.isActive != value)
+                {
+                    SelFilter.isActive = value;
+                    reportChange();
+                }
+            }
+        }
+
+        protected string leftString
+        {
+            get => SelFilter.leftString;
+            set
+            {
+                if (SelFilter.leftString != value)
+                {
+                    SelFilter.leftString = value;
+                    reportChange();
+                }
+            }
+        }
+        protected string leftStringCSS
+        {
+            get => SelFilter.leftStringCSS;
+            set
+            {
+                if (SelFilter.leftStringCSS != value)
+                {
+                    SelFilter.leftStringCSS = value;
+                    reportChange();
+                }
+            }
+        }
+        protected string rightString
+        {
+            get => SelFilter.rightString;
+            set
+            {
+                if (SelFilter.rightString != value)
+                {
+                    SelFilter.rightString = value;
+                    reportChange();
+                }
+            }
+        }
+        protected string rightStringCSS
+        {
+            get => SelFilter.rightStringCSS;
+            set
+            {
+                if (SelFilter.rightStringCSS != value)
+                {
+                    SelFilter.rightStringCSS = value;
+                    reportChange();
+                }
+            }
+        }
+
+        protected void toggle()
+        {
+            var currFilt = SelFilter;
+            currFilt.isActive = !currFilt.isActive;
+            SelFilter = currFilt;
+            if (isActive)
+            {
+                rightStringCSS = "fw-bold";
+                leftStringCSS = "text-secondary";
+            }
+            else
+            {
+                leftStringCSS = "fw-bold";
+                rightStringCSS = "text-secondary";
+            }
+        }
+        protected override async Task OnInitializedAsync()
+        {
+            if (isActive)
+            {
+                rightStringCSS = "fw-bold";
+                leftStringCSS = "text-secondary";
+            }
+            else
+            {
+                leftStringCSS = "fw-bold";
+                rightStringCSS = "text-secondary";
+            }
+            await FilterChanged.InvokeAsync(SelFilter);
+        }
+
+        private void reportChange()
+        {
+            FilterChanged.InvokeAsync(SelFilter);
+        }
+    }
+}

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,27 +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)
@@ -44,17 +54,24 @@
             if (IdxMacchina != item.IdxMacchina)
                 return false;
 
+            if (CodArticolo != item.CodArticolo)
+                return false;
+
             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

@@ -15,17 +15,37 @@
         public int CurrPage { get; set; } = 1;
         public DateTime? dtRif { get; set; } = null;
         public DateTime? dtMax { get; set; } = null;
+        public DateTime? dtMin { get; set; } = null;
         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))
@@ -45,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/SelectGlobalToggle.cs

@@ -0,0 +1,74 @@
+namespace MP.SPEC.Data
+{
+    public class SelectGlobalToggle
+    {
+        #region Public Constructors
+
+        public SelectGlobalToggle()
+        { }
+
+        #endregion Public Constructors
+
+        #region Public Properties
+
+        /// <summary>
+        /// Bool: indica se il toggle è attivo
+        /// </summary>
+        public bool isActive { get; set; } = true;
+
+        /// <summary>
+        /// string: stringa da mostrare a sinistra (disattivo onInitialize)
+        /// </summary>
+        public string leftString { get; set; } = "";
+
+        /// <summary>
+        /// string: stringa da mostrare a destra (attivo onInitialize)
+        /// </summary>
+        public string rightString { get; set; } = "";
+
+        /// <summary>
+        /// string: stile stringa da mostrare a sinistra (disattivo onInitialize)
+        /// </summary>
+        public string leftStringCSS { get; set; } = "";
+
+        /// <summary>
+        /// string: stile stringa da mostrare a destra (attivo onInitialize)
+        /// </summary>
+        public string rightStringCSS { get; set; } = "";
+
+
+        #endregion Public Properties
+
+        #region Public Methods
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is SelectGlobalToggle item))
+                return false;
+
+            if (isActive != item.isActive)
+                return false;
+
+            if (leftString != item.leftString)
+                return false;
+
+            if (rightString != item.rightString)
+                return false;
+
+            if (leftStringCSS != item.leftStringCSS)
+                return false;
+
+            if (rightStringCSS != item.rightStringCSS)
+                return false;
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        #endregion Public Methods
+    }
+}

MP.SPEC/Data/SelectOdlParams.cs

@@ -0,0 +1,73 @@
+using MP.Data;
+
+namespace MP.SPEC.Data
+{
+    public class SelectOdlParams
+    {
+        #region Public Constructors
+
+        public SelectOdlParams()
+        { }
+
+        #endregion Public Constructors
+
+        #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(-10);
+        public int MaxRecord { get; set; } = 100;
+        public bool IsActive { get; set; } = true;
+        public string SearchVal { get; set; } = "*";
+
+        #endregion Public Properties
+
+        #region Public Methods
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is SelectOdlParams item))
+                return false;
+
+            if (IsActive != item.IsActive)
+                return false;
+
+            if (CodStato != item.CodStato)
+                return false;
+
+            if (IdxMacchina != item.IdxMacchina)
+                return false;
+
+            if (MaxRecord != item.MaxRecord)
+                return false;
+
+            if (NumRec != item.NumRec)
+                return false;
+
+            if (DtStart != item.DtStart)
+                return false;
+
+            if (DtEnd != item.DtEnd)
+                return false;
+
+            if (CurrPage != item.CurrPage)
+                return false;
+
+            if (SearchVal != item.SearchVal)
+                return false;
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        #endregion Public Methods
+    }
+}

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.2209.2711</Version>
+    <Version>6.16.2211.416</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,6 +14,16 @@
 
   <ItemGroup>
     <None Include="compilerconfig.json" />
+    <None Include="wwwroot\lib\Chart.js\chart.esm.js" />
+    <None Include="wwwroot\lib\Chart.js\chart.esm.min.js" />
+    <None Include="wwwroot\lib\Chart.js\chart.js" />
+    <None Include="wwwroot\lib\Chart.js\chart.min.js" />
+    <None Include="wwwroot\lib\Chart.js\helpers.esm.js" />
+    <None Include="wwwroot\lib\Chart.js\helpers.esm.min.js" />
+    <None Include="wwwroot\lib\chartjs-adapter-luxon\chartjs-adapter-luxon.esm.js" />
+    <None Include="wwwroot\lib\chartjs-adapter-luxon\chartjs-adapter-luxon.esm.min.js" />
+    <None Include="wwwroot\lib\chartjs-adapter-luxon\chartjs-adapter-luxon.js" />
+    <None Include="wwwroot\lib\chartjs-adapter-luxon\chartjs-adapter-luxon.min.js" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,10 +31,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\lib\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\MP.Data\MP.Data.csproj" />
   </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>
@@ -135,7 +143,8 @@
                             {
                                 <tr class="@checkSelect(@record.CodArticolo)">
                                     <td>
-                                        <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm"><i class="bi bi-pencil-square"></i></button>
+                                        <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>
                                     </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)
@@ -136,6 +138,10 @@ namespace MP.SPEC.Pages
             }
             ListAziende = await MDService.ElencoAziende();
             ListTipoArt = await MDService.AnagTipoArtLV();
+        }
+
+        protected override async Task OnParametersSetAsync()
+        {
             await reloadData();
         }
 
@@ -155,6 +161,21 @@ namespace MP.SPEC.Pages
             currRecord = selRec;
             await Task.Delay(1);
         }
+        protected async Task cloneRecord(AnagArticoli selRec)
+        {
+            // creo record duplicato...
+            AnagArticoli newRec = new AnagArticoli()
+            {
+                Azienda = selRec.Azienda,
+                CodArticolo = selRec.CodArticolo,
+                DescArticolo = $"CLONE - {selRec.DescArticolo}",
+                Disegno = selRec.Disegno,
+                Tipo = selRec.Tipo
+            };
+            currRecord = newRec;
+            await Task.Delay(1);
+        }
+
 
         protected async Task update(AnagArticoli selRec)
         {
@@ -269,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

@@ -14,6 +14,7 @@
                 }
                 else
                 {
+
                     <DossiersFilter FilterChanged="updateFilter"></DossiersFilter>
                 }
             </div>
@@ -26,12 +27,10 @@
         }
         else
         {
-            <ListDossiers SelFilter="@currFilter" TotRecordChanged="updateTotal"></ListDossiers>
+            <ListDossiers SelFilter="@currFilter" RecordSel="@selRecordDoss" TotRecordChanged="updateTotal"></ListDossiers>
         }
     </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/DOSS.razor.cs

@@ -1,4 +1,6 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using MP.Data.DatabaseModels;
 using MP.SPEC.Components;
 using MP.SPEC.Data;
 
@@ -8,14 +10,17 @@ 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!;
+        protected IJSRuntime JSRuntime { get; set; } = null!;
+
+        [Inject]
+        protected MpDataService MDService { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -36,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;
@@ -48,11 +50,22 @@ namespace MP.SPEC.Pages
             isFiltering = false;
         }
 
+        protected async Task selRecordDoss(DossierModel selDoss)
+        {
+            currRecordDoss = selDoss;
+            await Task.Delay(1);
+        }
+
         protected void updateTotal(int newTotCount)
         {
             totalCount = newTotCount;
         }
 
+        protected void UpdateTotCount(int newTotCount)
+        {
+            totalCount = newTotCount;
+        }
+
         #endregion Protected Methods
 
         #region Private Properties
@@ -61,25 +74,57 @@ namespace MP.SPEC.Pages
 
         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 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,14 +11,14 @@
             <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>
 
     </div>
     <div class="card-body text-center">
-        <div class="shortcuts my-5 py-5">
+        <div class="shortcuts my-3 py-3">
             <div class="row">
                 <div class="col-12">
                     @if (ElencoLink == null)
@@ -33,6 +33,7 @@
                     }
                     else
                     {
+
                         foreach (var item in ElencoLink)
                         {
                             <a href="@item.NavigateUrl" class="shortcut">

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

@@ -1,34 +1,122 @@
 @page "/ODL"
 
 <div class="card mb-5">
-    <div class="card-header table-primary">
-        <div class="d-flex justify-content-between">
-            <div class="px-1">
-                <h3><b>ODL</b></h3>
+    <div class="card-header table-primary ">
+        <div class="d-flex justify-content-between col-12">
+            <div class="px-1 col-4">
+                <div>
+                    <h3><b>ODL</b></h3>
+                </div>
             </div>
-            <div class="px-2">
-                <div class="input-group input-group">
-                    <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">
-                        <option value="*">--- Tutti ---</option>
-                        @if (ListStati != null)
+            <div class="col-4">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-text">
+                        <span class="me-1 @leftStringCSS">Completati</span>
+                        <span class="form-check form-check-sm form-switch py-1" title="ODL Chiusi / Correnti">
+                            <input class="form-check-input" type="checkbox" id="switchActive" @bind="@isActive">
+                        </span>
+                        <span class="@rightStringCSS">In Corso</span>
+                    </div>
+                </div>
+            </div>
+            <div class="d-flex justify-content-end">
+                <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>
+                        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+                    </div>
+                    <div class="offcanvas-body">
+                        <div>
+                            <div>
+                                Seleziona i filtri per:
+                            </div>
+                        </div>
+                        <div>
+
+                            <div class="small mt-2">
+                                <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="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)
+                                    {
+                                        foreach (var item in ListStati)
+                                        {
+                                            <option value="@item.value">@item.label</option>
+                                        }
+                                    }
+                                </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)
                         {
-                            foreach (var item in ListStati)
-                            {
-                                <option value="@item.value">@item.label</option>
-                            }
+                            <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="@selDtStart" 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="@selDtEnd" id="dtMax" type="datetime-local" title="Selezionare fine periodo">
+                            </div>
                         }
-                    </select>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
     <div class="card-body">
-        <ListODL StatoSel="@selStato" PagerResetReq="pgResetReq"></ListODL>
+        <ListODL PagerResetReq="pgResetReq" updateRecordCount="UpdateTotCount" currFilter="@currFilter"></ListODL>
     </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/ODL.razor.cs

@@ -7,27 +7,83 @@ namespace MP.SPEC.Pages
 {
     public partial class ODL
     {
+        #region Public Methods
+
+        /// <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;
+        }
+
+        #endregion Public Methods
+
         #region Protected Fields
 
-        protected DataPager pagerODL;
+        protected DataPager? pagerODL = null!;
 
         #endregion Protected Fields
 
         #region Protected Properties
 
+        protected bool isActive
+        {
+            get => currFilter.IsActive;
+            set => currFilter.IsActive = value;
+        }
+
         [Inject]
         protected IJSRuntime JSRuntime { get; set; } = null!;
 
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MsgService { get; set; } = null!;
+        protected DateTime selDtEnd
+        {
+            get => currFilter.DtEnd;
+            set
+            {
+                if (currFilter.DtEnd != value)
+                {
+                    currFilter.DtEnd = value;
+                }
+            }
+        }
+
+        protected DateTime selDtStart
+        {
+            get => currFilter.DtStart;
+            set
+            {
+                if (currFilter.DtStart != value)
+                {
+                    currFilter.DtStart = value;
+                }
+            }
+        }
 
         #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;
@@ -40,72 +96,88 @@ namespace MP.SPEC.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            // abilito ricerca...
-            MsgService.ShowSearch = true;
-            // resetto search
-            MsgService.SearchVal = "";
-            ListAziende = await MDService.ElencoAziende();
             ListStati = await MDService.AnagStatiComm();
-            // carico dati
-            await reloadData();
+            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();
+                }
             }
         }
 
+        protected void setDtMax()
+        {
+            // copio il filtro
+            currFilter.DtEnd = RoundDatetime(5);
+            currFilter.DtStart = RoundDatetime(5).AddDays(-10);
+        }
+
+        protected void UpdateTotCount(int newTotCount)
+        {
+            totalCount = newTotCount;
+        }
+
         #endregion Protected Methods
 
         #region Private Fields
 
-        private MP.Data.DatabaseModels.ODLModel? currRecordOdl = null;
-        private MP.Data.DatabaseModels.PODLModel? currRecordPOdl = null;
-        private List<MP.Data.DatabaseModels.AnagGruppi>? ListAziende;
         private List<MP.Data.DatabaseModels.ListValues>? ListStati;
+        private List<string>? ListMacchine;
 
         #endregion Private Fields
 
         #region Private Properties
 
-        private string currAzienda { get; set; } = "*";
+        private SelectOdlParams currFilter { get; set; } = new SelectOdlParams();
 
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
         }
 
         private bool isLoading { get; set; } = false;
 
-        private int numRecord
+        private string leftStringCSS
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
+            get => isActive ? "text-secondary" : "text-dark fw-bold";
         }
 
-        private string selStato { get; set; } = "*";
+        private int numRecord
+        {
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
+        }
+
+        private string rightStringCSS
+        {
+            get => isActive ? "text-dark fw-bold" : "text-secondary";
+        }
+
+        private string selStato
+        {
+            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
-
-        #region Private Methods
-
-        private async Task reloadData()
-        {
-            isLoading = true;
-            await Task.Delay(1);
-            isLoading = false;
-        }
-
-        #endregion Private Methods
     }
 }

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>
@@ -42,7 +43,7 @@
                     </select>
                 </div>
             </div>
-            
+
         </div>
         @if (currRecord != null)
         {
@@ -77,6 +78,12 @@
                                     </div>
                                 </div>
                                 <div class="col-3">
+                                    <div class="input-group input-group-sm">
+                                        <span class="input-group-text" id="inputGroup-sizing-sm"># pz</span>
+                                        <input type="text" class="form-control" aria-label="Num Pezzi" aria-describedby="inputGroup-sizing-sm" @bind-value="@currRecord.NumPezzi">
+                                        <span class="input-group-text" id="inputGroup-sizing-sm">T.Ciclo</span>
+                                        <input type="text" class="form-control" aria-label="Tempo Ciclo" aria-describedby="inputGroup-sizing-sm" @bind-value="@currRecord.Tcassegnato">
+                                    </div>
                                 </div>
                                 <div class="col-3">
                                     <div class="input-group input-group-sm">
@@ -94,7 +101,6 @@
                                 </div>
                             </div>
                             <div class="row mt-2">
-
                                 <div class="col-3">
                                     <div class="input-group input-group-sm">
                                         <div class="input-group input-group-sm">
@@ -121,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>
@@ -129,6 +142,28 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="col-6">
+                                    <div class="input-group input-group-sm">
+                                        <span class="input-group-text" id="inputGroup-sizing-sm">Note</span>
+                                        <input type="text" class="form-control" aria-label="Note" aria-describedby="inputGroup-sizing-sm" @bind-value="@currRecord.Note">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row mt-2">
+                                <div class="col-3">
+                                    <div class="input-group input-group-sm d-flex justify-content-between">
+                                        <div class="input-group-text" id="inputGroup-sizing-sm">
+                                            <div class="pe-3" title="Attivabile">
+                                                Attivabile
+                                            </div>
+                                            <div class="form-check form-check-sm form-switch py-1" title="Attivabile">
+                                                <input class="form-check-input" type="checkbox" id="mySwitch" name="setupAlarms" title="Attivabile" @bind="@currRecord.Attivabile">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-3">
+                                </div>
                                 <div class="col-3">
                                     <div class="d-grid gap-2">
                                         <button class="btn btn-warning" @onclick="() => cancel()">Annulla <i class="bi bi-x-circle"></i></button>
@@ -195,13 +230,10 @@
         }
         else
         {
-            <ListPODL PagerResetReq="pgResetReq" RecordSel="@selRecord"></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

@@ -3,6 +3,8 @@ using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.SPEC.Components;
 using MP.SPEC.Data;
+using MP.SPEC.Services;
+using NLog;
 
 namespace MP.SPEC.Pages
 {
@@ -10,7 +12,7 @@ namespace MP.SPEC.Pages
     {
         #region Protected Fields
 
-        protected DataPager pagerODL;
+        protected DataPager pagerODL = null!;
 
         protected bool reqNew = false;
 
@@ -19,16 +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 MessageService MsgService { get; set; }
+        protected IOApiService MpIoApiCall { get; set; } = null!;
 
         [Inject]
-        protected NavigationManager NavManager { get; set; }
+        protected NavigationManager NavManager { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -66,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();
@@ -89,7 +87,8 @@ namespace MP.SPEC.Pages
         {
             if (doReset)
             {
-                await pagerODL.resetCurrPage();
+                await Task.Delay(1);
+                pagerODL.resetCurrPage();
             }
         }
 
@@ -106,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)
             {
@@ -150,15 +149,25 @@ namespace MP.SPEC.Pages
                 return;
             await Task.Delay(1);
             var done = await MDService.POdlUpdateRecord(selRec);
+            await callSyncDb(selRec);
             currRecord = null;
             await reloadData();
+            // forzo update parametri
             await Task.Delay(1);
+            currFase = "*";
+            await Task.Delay(1);
+        }
+
+        protected void UpdateTotCount(int newTotCount)
+        {
+            totalCount = newTotCount;
         }
 
         #endregion Protected Methods
 
         #region Private Fields
 
+        private static Logger Log = LogManager.GetCurrentClassLogger();
         private PODLModel? _currRecord = null;
         private List<AnagArticoli>? ListArticoli;
         private List<AnagGruppi>? ListAziende;
@@ -175,7 +184,7 @@ namespace MP.SPEC.Pages
 
         private bool addEnabled
         {
-            get => selStato != "*";
+            get => currFase != "*";
         }
 
         private string artSearch
@@ -195,6 +204,22 @@ 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";
@@ -220,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
@@ -240,26 +280,40 @@ 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
 
         #region Private Methods
 
+        /// <summary>
+        /// Chiama metodo x chiedere sync DB
+        /// </summary>
+        /// <param name="selRec"></param>
+        /// <returns></returns>
+        private async Task callSyncDb(PODLModel selRec)
+        {
+            // chiamo aggiunta task SyncDb...
+            string idxMacc = selRec.IdxMacchina;
+            string restUrl = $"IOB/addTask2Exe/{idxMacc}?taskName=syncDbData&taskVal=";
+            try
+            {
+                var response = await MpIoApiCall.callMpIoUrlGet(restUrl);
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Errore durante chiamata: {Environment.NewLine}{exc}");
+            }
+        }
+
         private async Task reloadData()
         {
             isLoading = true;

MP.SPEC/Pages/Test.razor

@@ -0,0 +1,32 @@
+@page "/Test"
+
+<h3>Test</h3>
+
+<button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
+    Button with data-bs-target
+</button>
+<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvasExample" aria-labelledby="offcanvasExampleLabel">
+    <div class="offcanvas-header">
+        <h5 class="offcanvas-title" id="offcanvasExampleLabel">Offcanvas</h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+    <div class="offcanvas-body">
+        <div>
+            Some text as placeholder. In real life you can have the elements you have chosen. Like, text, images, lists, etc.
+        </div>
+        <div class="dropdown mt-3">
+            <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown">
+                Dropdown button
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                <li><a class="dropdown-item" href="#">Action</a></li>
+                <li><a class="dropdown-item" href="#">Another action</a></li>
+                <li><a class="dropdown-item" href="#">Something else here</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+@code {
+
+}

MP.SPEC/Pages/Utils.razor

@@ -5,6 +5,6 @@
 
 <h3>Utils</h3>
 
-<div class="px-2">
+<div class="">
     <button class="btn btn-primary" @onclick="() => flushCache()"> Flush Cache </button>
 </div>

MP.SPEC/Pages/Utils.razor.cs

@@ -11,14 +11,19 @@ namespace MP.SPEC.Pages
         {
             await Task.Delay(1);
             await MDService.FlushRedisCache();
+            // rimando a home
+            NavManager.NavigateTo("", true);
         }
 
+        [Inject]
+        private NavigationManager NavManager { get; set; } = null!;
+
         #endregion Public Methods
 
         #region Protected Properties
 
         [Inject]
-        protected MpDataService MDService { get; set; }
+        protected MpDataService MDService { get; set; } = null!;
 
         #endregion Protected Properties
     }

MP.SPEC/Pages/_Layout.cshtml

@@ -30,7 +30,12 @@
         <a class="dismiss">🗙</a>
     </div>
 
+    <script src="lib/bootstrap/js/bootstrap.bundle.min.js"></script>
     <script src="_framework/blazor.server.js" autostart="false"></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)*@
     <script>
         Blazor.start({
@@ -39,19 +44,19 @@
                 retryIntervalMilliseconds: 2000
             }
         }).then(() => {
-                Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
-                    get() {
-                        return this.__reconnectionDisplay;
-                    },
-                    set(value) {
-                        this.__reconnectionDisplay = {
-                            show: () => value.show(),
-                            update: (d) => value.update(d),
-                            rejected: (d) => document.location.reload()
-                        }
+            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
+                get() {
+                    return this.__reconnectionDisplay;
+                },
+                set(value) {
+                    this.__reconnectionDisplay = {
+                        show: () => value.show(),
+                        update: (d) => value.update(d),
+                        rejected: (d) => document.location.reload()
                     }
-                });
+                }
             });
+        });
     </script>
 </body>
 </html>

MP.SPEC/Program.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using MP.SPEC.Components;
 using MP.SPEC.Data;
+using MP.SPEC.Services;
 using StackExchange.Redis;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -38,6 +39,9 @@ builder.Services.AddSingleton<IConnectionMultiplexer>(redisMultiplexer);
 builder.Services.AddSingleton<MpDataService>();
 builder.Services.AddScoped<MessageService>();
 
+builder.Services.AddHttpClient();
+builder.Services.AddSingleton<IOApiService>();
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.

MP.SPEC/Resources/ChangeLog.html

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

MP.SPEC/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2209.2711
+6.16.2211.416

MP.SPEC/Resources/manifest.xml

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

@@ -0,0 +1,63 @@
+using Microsoft.Extensions.Configuration;
+using MP.SPEC.Data;
+using NLog;
+using System.Text.Json;
+
+namespace MP.SPEC.Services
+{
+    /// <summary>
+    /// Classe per chiamare metodi da MP-IO
+    /// 
+    /// rif: 
+    /// https://www.ezzylearning.net/tutorial/making-http-requests-in-blazor-server-apps
+    /// https://wellsb.com/csharp/aspnet/blazor-httpclientfactory-and-web-api/
+    /// </summary>
+    public class IOApiService
+    {
+        private readonly IHttpClientFactory _clientFactory;
+        private static ILogger<MpDataService> _logger = null!;
+        private static IConfiguration _configuration = null!;
+
+
+
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+        private static string MpIoBaseUrl = "";
+
+        public IOApiService(IHttpClientFactory clientFactory, IConfiguration configuration, ILogger<MpDataService> logger)
+        {
+            _logger = logger;
+            _logger.LogInformation("Starting IOApiService INIT");
+            _configuration = configuration;
+            _clientFactory = clientFactory;
+            // conf url x chiamate REST
+            MpIoBaseUrl = _configuration.GetValue<string>("ServerConf:MpIoBaseUrl");
+        }
+        /// <summary>
+        /// Effettua chiamata ad MP-IO
+        /// </summary>
+        /// <param name="relUrl">URL metodo relativo alla base path di MP-IO</param>
+        /// <returns></returns>
+        public async Task<string> callMpIoUrlGet(string relUrl)
+        {
+            string result = "";
+            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

@@ -20,9 +20,14 @@
 
 <div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
     <nav class="flex-column">
-        <div class="nav-item px-2">
+        <div class="nav-item px-2 col-12">
             <NavLink class="nav-link px-2" href="" Match="NavLinkMatch.All">
-                <span class="fa-solid fa-house px-2" aria-hidden="true"></span> <span class="@hideText">Home</span>
+                <div class ="col-2">
+                    <span class="fa-solid fa-house px-2" aria-hidden="true"></span>
+                </div>
+                <div>
+                    <span class="@hideText">Home</span>
+                </div>
             </NavLink>
         </div>
         @if (ElencoLink == null)
@@ -33,9 +38,15 @@
         {
             foreach (var item in ElencoLink)
             {
-                <div class="nav-item px-2">
+                
+                <div class="nav-item px-2 col-12">
                     <NavLink class="nav-link px-2" href="@item.NavigateUrl">
-                        <span class="@item.icona px-2" aria-hidden="true"></span> <span class="@hideText">@item.Testo</span>
+                        <div class="col-2">
+                            <span class="@item.icona px-2" aria-hidden="true"></span>
+                        </div>
+                        <div>
+                            <span class="@hideText">@item.Testo</span>
+                        </div>
                     </NavLink>
                 </div>
             }

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.Production.json

@@ -12,5 +12,11 @@
   "ConnectionStrings": {
     "Mp.Data": "Server=localhost\\SQLEXPRESS;Database=MoonPro; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
     "Redis": "localhost:6379,DefaultDatabase=13,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
+  },
+  "ServerConf": {
+    "maxAge": "2000",
+    "cacheCheckArtUsato": 2,
+    "redisLongTimeCache": 15,
+    "MpIoBaseUrl": "http://localhost/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/"
+  }
+}