Merge branch 'release/UpgradeMapoCoreAll'

- page reload
- Nuget upgrade

Egw.Core/licenseManGLS.cs

@@ -30,7 +30,14 @@ namespace Egw.Core
             {
                 string passPhrase = string.Format("{0}|{1}", cliente.PadLeft(50, ':'), applicativo);
                 plainAuthKey = SteamCrypto.DecryptString(authKey, passPhrase); // uso combinazione cliente+applicativo come passphrase!
-                answ = Convert.ToDateTime(plainAuthKey.Replace(string.Format("{0}#{1}-", cliente, applicativo.PadLeft(20, '-')), "").Replace(string.Format("%{0}%", licenze), ""));
+                string datePart = plainAuthKey.Replace($"{cliente}#{applicativo.PadLeft(20, '-')}-", "").Replace($"%{licenze}%", "");
+                //string datePart = plainAuthKey.Replace(string.Format("{0}#{1}-", cliente, applicativo.PadLeft(20, '-')), "").Replace(string.Format("%{0}%", licenze), "");
+                // se non avesse "bonificato" la parte num licenze (es non corrisponde al max) forzo il trim
+                if (datePart.Contains("%"))
+                {
+                    datePart = datePart.Substring(0, datePart.IndexOf("%"));
+                }
+                answ = Convert.ToDateTime(datePart);
             }
             catch (Exception exc)
             {

MP.AppAuth/AppAuthContext.cs

@@ -54,7 +54,9 @@ namespace MP.AppAuth
 
         #region Public Properties
 
+        public virtual DbSet<AnagraficaGruppi> DbSetAnagraficaGruppi { get; set; }
         public virtual DbSet<AnagraficaOperatori> DbSetAnagOpr { get; set; }
+        public virtual DbSet<Gruppi2Operatori> DbSetGruppi2Oper { get; set; }
         public virtual DbSet<UpdMan> DbSetUpdMan { get; set; }
         public virtual DbSet<Vocabolario> DbSetVocabolario { get; set; }
 
@@ -103,6 +105,37 @@ namespace MP.AppAuth
                     .HasMaxLength(500);
             });
 
+            modelBuilder.Entity<AnagraficaGruppi>(entity =>
+            {
+                entity.HasKey(e => e.CodGruppo);
+
+                entity.ToTable("AnagraficaGruppi");
+
+                entity.Property(e => e.CodGruppo).HasMaxLength(50);
+
+                entity.Property(e => e.DescrGruppo)
+                    .IsRequired()
+                    .HasMaxLength(250)
+                    .HasDefaultValueSql("('')");
+
+                entity.Property(e => e.SelEnabled).HasComment("Indica se sia selezionabile a livello di tendina x inserimento BCode");
+
+                entity.Property(e => e.TipoGruppo)
+                    .IsRequired()
+                    .HasMaxLength(50)
+                    .HasDefaultValueSql("('REPARTO')")
+                    .HasComment("tipo gruppo: reparto (es x gestione operatori assegnati), GRUPPO FASE (es macchien che fanno lo stesso tipo di lavoro), ...");
+            });
+
+            modelBuilder.Entity<Gruppi2Operatori>(entity =>
+            {
+                entity.HasKey(e => new { e.MatrOpr, e.CodGruppo });
+
+                entity.ToTable("Gruppi2Operatori");
+
+                entity.Property(e => e.CodGruppo).HasMaxLength(50);
+            });
+
             //
             modelBuilder.Seed();
 

MP.AppAuth/Controllers/AppAuthController.cs

@@ -31,6 +31,38 @@ namespace MP.AppAuth.Controllers
 
         #region Public Methods
 
+        /// <summary>
+        /// Elenco Record x Gruppi
+        /// </summary>
+        /// <returns></returns>
+        public List<Models.AnagraficaGruppi> AnagGruppiFilt(string codTipo)
+        {
+            List<Models.AnagraficaGruppi> dbResult = new List<Models.AnagraficaGruppi>();
+            using (AppAuthContext localDbCtx = new AppAuthContext(_configuration))
+            {
+                dbResult = localDbCtx
+                            .DbSetAnagraficaGruppi
+                            .Where(x => x.TipoGruppo == codTipo)
+                            .ToList();
+            }
+            return dbResult;
+        }
+        /// <summary>
+        /// Elenco Record x Gruppi
+        /// </summary>
+        /// <returns></returns>
+        public List<Models.AnagraficaGruppi> AnagGruppiGetAll()
+        {
+            List<Models.AnagraficaGruppi> dbResult = new List<Models.AnagraficaGruppi>();
+            using (AppAuthContext localDbCtx = new AppAuthContext(_configuration))
+            {
+                dbResult = localDbCtx
+                            .DbSetAnagraficaGruppi
+                            .ToList();
+            }
+            return dbResult;
+        }
+
         public List<Models.AnagraficaOperatori> AnagOpGetAll(string searchVal)
         {
             List<Models.AnagraficaOperatori> dbResult = new List<Models.AnagraficaOperatori>();
@@ -53,6 +85,41 @@ namespace MP.AppAuth.Controllers
             // ritorno
             return dbResult;
         }
+        public List<Models.AnagraficaOperatori> AnagOpByGruppoGetFilt(string codGruppo, string searchVal)
+        {
+            List<Models.AnagraficaOperatori> dbResult = new List<Models.AnagraficaOperatori>();
+            using (AppAuthContext localDbCtx = new AppAuthContext(_configuration))
+            {
+                if (!string.IsNullOrEmpty(searchVal))
+                {
+                    dbResult = localDbCtx
+                       .DbSetGruppi2Oper
+                       .Where(x => x.CodGruppo == codGruppo || string.IsNullOrEmpty(codGruppo))
+                       .Join(
+                            localDbCtx.DbSetAnagOpr.Where(x => x.Cognome.Contains(searchVal) || x.Nome.Contains(searchVal)),
+                            gruppo => gruppo.MatrOpr,
+                            operatore => operatore.MatrOpr,
+                            (gruppo, operatore) => operatore
+                        )
+                        .ToList();
+                }
+                else
+                {
+                    dbResult = localDbCtx
+                       .DbSetGruppi2Oper
+                       .Where(x => x.CodGruppo == codGruppo || string.IsNullOrEmpty(codGruppo))
+                       .Join(
+                            localDbCtx.DbSetAnagOpr,
+                            gruppo => gruppo.MatrOpr,
+                            operatore => operatore.MatrOpr,
+                            (gruppo, operatore) => operatore
+                        )
+                        .ToList();
+                }
+            }
+            // ritorno
+            return dbResult;
+        }
 
         public void Dispose()
         {

MP.AppAuth/Controllers/MPController .cs

@@ -2,22 +2,17 @@
 using NLog;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MP.AppAuth.Controllers
 {
     public class MPController : IDisposable
     {
-        #region Private Fields
+        #region Public Fields
 
-        private static IConfiguration _configuration;
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
         public static AppAuth.Controllers.MPController dbController;
 
-        #endregion Private Fields
+        #endregion Public Fields
 
         #region Public Constructors
 
@@ -31,12 +26,6 @@ namespace MP.AppAuth.Controllers
 
         #region Public Methods
 
-        public void Dispose()
-        {
-            // Clear database controller
-            dbController.Dispose();
-        }
-
 
         /// <summary>
         /// Elenco Record x AnagKeyValue
@@ -54,7 +43,19 @@ namespace MP.AppAuth.Controllers
             return dbResult;
         }
 
+        public void Dispose()
+        {
+            // Clear database controller
+            dbController.Dispose();
+        }
 
         #endregion Public Methods
+
+        #region Private Fields
+
+        private static IConfiguration _configuration;
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
     }
 }

MP.AppAuth/MP.AppAuth.csproj

@@ -9,18 +9,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NLog" Version="4.7.11" />
+    <PackageReference Include="NLog" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

MP.AppAuth/Models/AnagraficaGruppi.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace MP.AppAuth.Models
+{
+    public partial class AnagraficaGruppi
+    {
+        public string CodGruppo { get; set; }
+        public string TipoGruppo { get; set; }
+        public string DescrGruppo { get; set; }
+        public bool SelEnabled { get; set; }
+    }
+}

MP.AppAuth/Models/Gruppi2Operatori.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace MP.AppAuth.Models
+{
+    public partial class Gruppi2Operatori
+    {
+        public int MatrOpr { get; set; }
+        public string CodGruppo { get; set; }
+    }
+}

MP.AppAuth/MoonProContext.cs

@@ -71,7 +71,7 @@ namespace MP.AppAuth
         public virtual DbSet<ListValue> ListValues { get; set; }
         public virtual DbSet<Macchine> Macchines { get; set; }
         public virtual DbSet<UpdMan> UpdMan { get; set; }
-        public virtual DbSet<Vocabolario> Vocabolario { get; set; }
+        public virtual DbSet<Vocabolario> DbSetVocabolario { get; set; }
 
         #endregion Public Properties
 
@@ -503,6 +503,8 @@ namespace MP.AppAuth
                     .HasMaxLength(500);
             });
 
+
+
             OnModelCreatingPartial(modelBuilder);
         }
 

MP.Data/Conf/IobTags.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.Conf
+{
+    /// <summary>
+    /// Struttura conf del file conf TAG x IOB
+    /// </summary>
+    public class IobTags
+    {
+        /// <summary>
+        /// Oggetto dizionario di configurazione x IOB
+        /// </summary>
+        public Dictionary<string, List<TagData>> IobSetup = new Dictionary<string, List<TagData>>();
+    }
+}

MP.Data/Conf/TagData.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.Conf
+{
+    /// <summary>
+    /// Item da mostrare nei blocchi MON degli impianti come override ai dati MSE
+    /// </summary>
+    public class TagData
+    {
+        /// <summary>
+        /// Indice della colonna (ordine) del dato
+        /// </summary>
+        public int ColNum { get; set; } = 0;
+        /// <summary>
+        /// Indice della riga del dato
+        /// </summary>
+        public int RowNum { get; set; } = 0;
+        /// <summary>
+        /// Override CSS (es fontSmall)
+        /// </summary>
+        public string TagCss { get; set; } = "";
+        /// <summary>
+        /// Etichetta da mostrare
+        /// </summary>
+        public string TagName { get; set; } = "";
+        /// <summary>
+        /// Indicazione della chiave REDIS dove recuperare il tag indicato (già in formato string)
+        /// </summary>
+        public string TagLocation { get; set; } = "";
+
+        /// <summary>
+        /// Clone dell'oggetto
+        /// </summary>
+        /// <returns></returns>
+        public TagData Clone()
+        {
+            return (TagData)this.MemberwiseClone();
+        }
+    }
+}

MP.Data/Constants.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data
+{
+    public  class Constants
+    {
+
+        // dati conf REDIS Cache
+        public static readonly string BASE_HASH = "MAPO";
+
+        // REDIS KEY Dati correnti
+        public static readonly string CONF_MON_KEY = $"{BASE_HASH}:Conf:MonDispData";
+        public static readonly string ACT_FLUX_DATA_KEY = $"{BASE_HASH}:Current:FluxData";
+
+    }
+}

MP.Data/MP.Data.csproj

@@ -12,14 +12,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.4" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.4">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.4" />
-        <PackageReference Include="NLog" Version="4.7.15" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
+        <PackageReference Include="NLog" Version="5.0.1" />
     </ItemGroup>
 </Project>

MP.Land/Components/CmpGroupFilt.razor

@@ -0,0 +1,20 @@
+
+<div class="row">
+    <div class="col-6">
+        Gruppi
+    </div>
+    <div class="col-6 text-right">
+        <select @bind="@groupName" class="form-control form-control-sm">
+            <option value="">--- Tutti ---</option>
+            @if (ListGroups != null)
+            {
+                @foreach (var item in ListGroups)
+                {
+                    <option value="@item.CodGruppo">@item.DescrGruppo</option>
+                }
+            }
+        </select>
+    </div>
+</div>
+
+

MP.Land/Components/CmpGroupFilt.razor.cs

@@ -0,0 +1,54 @@
+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.Models;
+using MP.Land.Data;
+
+namespace MP.Land.Components
+{
+    public partial class CmpGroupFilt
+    {
+
+        [Inject]
+        protected MessageService AppMService { get; set; }
+
+        [Inject]
+        protected AppAuthService DataService { get; set; }
+
+        private List<AnagraficaGruppi> ListGroups;
+        private string groupName
+        {
+            get
+            {
+                return AppMService.CodGruppo;
+            }
+            set
+            {
+                AppMService.CodGruppo = value;
+            }
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await ReloadData();
+        }
+
+        private async Task ReloadData()
+        {
+            // carico i gruppi
+            ListGroups = await DataService.AnagGruppiFilt("REPARTO");
+        }
+    }
+}

MP.Land/Components/DataPager.razor

@@ -42,9 +42,9 @@
                 {
                     <div class="input-group input-group-sm">
                         <select @bind="@PageSize" class="form-control form-control-sm">
-                            <option value="2">2</option>
-                            <option value="4">4</option>
-                            <option value="10">10</option>
+                            <option value="3">3</option>
+                            <option value="6">6</option>
+                            <option value="9">9</option>
                         </select>
                     </div>
                 }

MP.Land/Components/DataPager.razor.cs

@@ -71,7 +71,7 @@ namespace MP.Land.Components
 
         protected int _numPage { get; set; } = 1;
 
-        protected int _numRecord { get; set; } = 4;
+        protected int _numRecord { get; set; } = 6;
 
         protected int percLoading { get; set; } = 0;
 

MP.Land/Components/UserCard.razor

@@ -31,7 +31,7 @@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (!firstRender)
+        if (firstRender)
         {
             await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{CurrItem.MatrOpr}");
             await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{CurrItem.MatrOpr}", rawCode);

MP.Land/Data/AppAuthService.cs

@@ -129,6 +129,46 @@ namespace MP.Land.Data
 
         #region Public Methods
 
+        public async Task<List<AppAuth.Models.AnagraficaGruppi>> AnagGruppiAll()
+        {
+            List<AppAuth.Models.AnagraficaGruppi> dbResult = new List<AppAuth.Models.AnagraficaGruppi>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            dbResult = dbController.AnagGruppiGetAll();
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per AnagGruppiAll: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+
+        public async Task<List<AppAuth.Models.AnagraficaGruppi>> AnagGruppiFilt(string codTipo)
+        {
+            List<AppAuth.Models.AnagraficaGruppi> dbResult = new List<AppAuth.Models.AnagraficaGruppi>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            dbResult = dbController.AnagGruppiFilt(codTipo);
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per AnagGruppiFilt: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+        public async Task<List<AppAuth.Models.AnagraficaOperatori>> AnagOperByGroupList(string codGruppo, string searchVal)
+        {
+            List<AppAuth.Models.AnagraficaOperatori> dbResult = new List<AppAuth.Models.AnagraficaOperatori>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            var rawData = dbController
+                        .AnagOpByGruppoGetFilt(codGruppo, searchVal);
+            dbResult = rawData
+                        .GroupBy(user => user.MatrOpr)
+                        .Select(grp => grp.First())
+                        .ToList();
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per AnagOperByGroupList: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+
         public async Task<List<AppAuth.Models.AnagraficaOperatori>> AnagOperList(string searchVal)
         {
             List<AppAuth.Models.AnagraficaOperatori> dbResult = new List<AppAuth.Models.AnagraficaOperatori>();

MP.Land/Data/LicenseService.cs

@@ -28,6 +28,12 @@ namespace MP.Land.Data
         /// URL dell'API x chiamate gestione licenze
         /// </summary>
         private static string apiUrl = "https://liman.egalware.com/ELM.API/";
+        //private static string apiUrl = "https://localhost:44351/";
+
+        /// <summary>
+        /// Chiave redis x info della licenza
+        /// </summary>
+        private static string rkeyAppInfo = "LongCache:AppInfo";
 
         private readonly IDistributedCache distributedCache;
 
@@ -120,10 +126,26 @@ namespace MP.Land.Data
 
         public DateTime infoExpiry { get; set; } = DateTime.Today.AddDays(1);
 
+        /// <summary>
+        /// Codice cliente/installazione
+        /// </summary>
         public string Installazione { get; set; } = "";
 
+        /// <summary>
+        /// Master key licenza principale
+        /// </summary>
         public string MasterKey { get; set; } = "";
 
+        /// <summary>
+        /// Numero licenze da DB
+        /// </summary>
+        public int NumLicDb { get; set; } = -1;
+
+        /// <summary>
+        /// Numero licenze da auth remota
+        /// </summary>
+        public int NumLicRemote { get; set; } = -1;
+
         public bool ValidData
         {
             get
@@ -160,7 +182,7 @@ namespace MP.Land.Data
             RestClient client = new RestClient(apiUrl);
             //client.Authenticator = new HttpBasicAuthenticator("username", "password");
             string MKeyEnc = HttpUtility.UrlEncode(MasterKey);
-            var request = new RestRequest($"/api/attivazioni/?chiave={MKeyEnc}", Method.Get);
+            var request = new RestRequest($"api/attivazioni/?chiave={MKeyEnc}", Method.Get);
             var response = await client.GetAsync(request);
             // controllo risposta
             if (response.StatusCode == System.Net.HttpStatusCode.OK)
@@ -172,6 +194,29 @@ namespace MP.Land.Data
             return await Task.FromResult(answ);
         }
 
+        /// <summary>
+        /// Recupera info licenza da remoto
+        /// </summary>
+        private async Task<List<LiManObj.ApplicativoDTO>> OnlineAppInfo()
+        {
+            List<LiManObj.ApplicativoDTO> answ = new List<LiManObj.ApplicativoDTO>();
+            // cerco online
+            RestClient client = new RestClient(apiUrl);
+            string MKeyEnc = HttpUtility.UrlEncode(MasterKey);
+            //string mKey = System.Net.WebUtility.UrlEncode(MasterKey);
+            string reqUrl = $"api/licenza/{Installazione}?CodApp={Applicazione}&Chiave={MKeyEnc}";
+            var request = new RestRequest(reqUrl, Method.Get);
+            var response = await client.GetAsync(request);
+            // controllo risposta
+            if (response.StatusCode == System.Net.HttpStatusCode.OK)
+            {
+                // verifico risposta
+                string rawData = $"{response.Content}";
+                answ = JsonConvert.DeserializeObject<List<LiManObj.ApplicativoDTO>?>(rawData);
+            }
+            return await Task.FromResult(answ);
+        }
+
         private void ReportUpdated()
         {
             if (EA_InfoUpdated != null)
@@ -184,6 +229,25 @@ namespace MP.Land.Data
 
         #region Protected Methods
 
+        /// <summary>
+        /// Cerca di recuperare valore INT da elenco AKV
+        /// </summary>
+        /// <param name="varReq">Chiave AKV richiesta</param>
+        /// <returns></returns>
+        protected int getAVKInt(string varReq)
+        {
+            int answ = -9999;
+            if (AKVList != null && AKVList.Count > 0)
+            {
+                var currRec = AKVList.Where(x => x.NomeVar == varReq).FirstOrDefault();
+                if (currRec != null)
+                {
+                    answ = currRec.ValInt ?? 0;
+                }
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Cerca di recuperare valore string da elenco AKV
         /// </summary>
@@ -285,55 +349,6 @@ namespace MP.Land.Data
             return await Task.FromResult(dbResult);
         }
 
-        /// <summary>
-        /// Init della classe con variabili di base da Redis/DB
-        /// </summary>
-        public bool InitAkv()
-        {
-            bool fatto = false;
-            Applicazione = "MAPO";
-            Installazione = getAVKStr("Installazione");
-            MasterKey = getAVKStr(Applicazione);
-            fatto = !string.IsNullOrEmpty($"{Installazione}{MasterKey}");
-            return fatto;
-        }
-
-        /// <summary>
-        /// Init della classe con variabili di base da Redis/DB
-        /// </summary>
-        public async Task<bool> RefreshLicense()
-        {
-            bool fatto = false;
-            var onlineAct = await OnlineActivationList();
-            if (onlineAct != null)
-            {
-                if (onlineAct.Count > 0)
-                {
-                    // scadenza info a 15 gg...
-                    int numDays = 15;
-                    infoExpiry = DateTime.Now.AddDays(numDays);
-                    ActivList = onlineAct;
-                    fatto = await setActivList(onlineAct, numDays);
-                }
-            }
-            await Task.Delay(1);
-            return fatto;
-        }
-
-        public async Task<bool> setActivList(List<LiManObj.AttivazioneDTO> newActList, int numDays)
-        {
-            bool fatto = false;
-            string cacheKey = $"{rKeyAttByLic}:{MasterKey}";
-            var rawData = JsonConvert.SerializeObject(newActList);
-            await setRSV(cacheKey, rawData, numDays * cacheFact * 24);
-            fatto = true;
-            if (EA_InfoUpdated != null)
-            {
-                EA_InfoUpdated?.Invoke();
-            }
-            return fatto;
-        }
-
         /// <summary>
         /// Verifica attivazione licenza
         /// </summary>
@@ -363,6 +378,121 @@ namespace MP.Land.Data
             return answ;
         }
 
+        /// <summary>
+        /// Stato server gestione licenze
+        /// </summary>
+        public async Task<string> checkLimanServer()
+        {
+            string answ = "ND";
+            // cerco online
+            RestClient client = new RestClient(apiUrl);
+            var request = new RestRequest($"api/health", Method.Get);
+            var response = await client.GetAsync(request);
+            // controllo risposta
+            if (response.StatusCode == System.Net.HttpStatusCode.OK)
+            {
+                // verifico risposta
+                answ = response.Content.Replace("\"", "");
+            }
+            return await Task.FromResult(answ);
+        }
+
+        /// <summary>
+        /// Init della classe con variabili di base da Redis/DB
+        /// </summary>
+        public bool InitAkv()
+        {
+            bool fatto = false;
+            Applicazione = "MAPO";
+            Installazione = getAVKStr("Installazione");
+            MasterKey = getAVKStr(Applicazione);
+            NumLicDb = getAVKInt(Applicazione);
+            fatto = !string.IsNullOrEmpty($"{Installazione}{MasterKey}");
+            return fatto;
+        }
+
+        public async Task<List<LiManObj.ApplicativoDTO>> LicAppCache()
+        {
+            List<LiManObj.ApplicativoDTO> dbResult = new List<LiManObj.ApplicativoDTO>();
+            string cacheKey = $"{rkeyAppInfo}:{MasterKey}";
+            trackCache(cacheKey);
+            string rawData = await getRSV(cacheKey);
+            if (!string.IsNullOrEmpty(rawData))
+            {
+                var cacheRes = JsonConvert.DeserializeObject<List<LiManObj.ApplicativoDTO>?>(rawData);
+                if (cacheRes != null)
+                {
+                    dbResult = cacheRes;
+                }
+            }
+
+            return await Task.FromResult(dbResult);
+        }
+
+        /// <summary>
+        /// Init della classe con variabili di base da Redis/DB
+        /// </summary>
+        public async Task<bool> RefreshLicense()
+        {
+            bool fatto = false;
+            // scadenza info a 15 gg...
+            int numDays = 15;
+
+            // dati applicativo
+            var appData = await OnlineAppInfo();
+            if (appData != null)
+            {
+                if (appData.Count > 0)
+                {
+                    fatto = await setAppInfo(appData, numDays);
+                    // salvo info licenza...
+                    NumLicRemote = appData[0].NumLicenze;
+                }
+            }
+
+            // dati attivazioni
+            var onlineAct = await OnlineActivationList();
+            if (onlineAct != null)
+            {
+                if (onlineAct.Count > 0)
+                {
+                    infoExpiry = DateTime.Now.AddDays(numDays);
+                    ActivList = onlineAct;
+                    fatto = await setActivList(onlineAct, numDays);
+                }
+            }
+            await Task.Delay(1);
+            return fatto;
+        }
+
+        public async Task<bool> setActivList(List<LiManObj.AttivazioneDTO> newActList, int numDays)
+        {
+            bool fatto = false;
+            string cacheKey = $"{rKeyAttByLic}:{MasterKey}";
+            var rawData = JsonConvert.SerializeObject(newActList);
+            await setRSV(cacheKey, rawData, numDays * cacheFact * 24);
+            fatto = true;
+            if (EA_InfoUpdated != null)
+            {
+                EA_InfoUpdated?.Invoke();
+            }
+            return fatto;
+        }
+
+        public async Task<bool> setAppInfo(List<LiManObj.ApplicativoDTO> newAppInfo, int numDays)
+        {
+            bool fatto = false;
+            string cacheKey = $"{rkeyAppInfo}:{MasterKey}";
+            var rawData = JsonConvert.SerializeObject(newAppInfo);
+            await setRSV(cacheKey, rawData, numDays * cacheFact * 24);
+            fatto = true;
+            if (EA_InfoUpdated != null)
+            {
+                EA_InfoUpdated?.Invoke();
+            }
+            return fatto;
+        }
+
         #endregion Public Methods
     }
-}
+}

MP.Land/Data/MessageService.cs

@@ -106,6 +106,21 @@ namespace MP.Land.Data
             }
         }
 
+        protected string _groupName { get; set; } = "";
+        public string CodGruppo
+        {
+            get => _groupName;
+            set
+            {
+                if (_groupName != value)
+                {
+                    _groupName = value;
+                    ReportFilter();
+                }
+            }
+        }
+
+
         #endregion Public Properties
 
         #region Private Methods

MP.Land/Data/SelectData.cs

@@ -44,7 +44,7 @@ namespace MP.Land.Data
         public bool OnlyMod { get; set; } = false;
         public bool OnlyNoTag { get; set; } = false;
         public int PageNum { get; set; } = 1;
-        public int PageSize { get; set; } = 4;
+        public int PageSize { get; set; } = 6;
         public string SearchVal { get; set; } = "";
         public string Tag { get; set; } = "";
 

MP.Land/MP.Land.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.15.2204.1216</Version>
+        <Version>6.15.2207.0718</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -45,14 +45,14 @@
     <ItemGroup>
         <PackageReference Include="DiffMatchPatch" Version="1.0.3" />
         <PackageReference Include="Majorsoft.Blazor.Components.Debounce" Version="1.5.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0" />
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.6" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+        <PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
         <PackageReference Include="RestSharp" Version="107.1.2" />
     </ItemGroup>
 

MP.Land/Pages/About.razor

@@ -2,9 +2,10 @@
 @using MP.Land.Data
 
 @inject MessageService AppMService
+@inject LicenseService LicServ
 
 <div class="row mx-2">
-    <div class="col-12 col-lg-8 offset-lg-2">
+    <div class="col-12 col-lg-10 offset-lg-1">
         <div class="card">
             <div class="card-header text-center">
                 <div class="row">
@@ -28,28 +29,71 @@
                         <img src="img/LogoMapoFull.png" class="img-fluid" />
                     </div>
                     <div class="col-lg-3"></div>
-                    <div class="col-12">
+                    <div class="col-6">
                         <h4 class="card-title">@Messaggio</h4>
+                        <br />
                         <p>MoonPro / MAPO sono una suite di applicazioni e dispositivi hw dedicati per l'IOT,l'industry 4.0 e la gestione automatizzata dei processi produttivi.</p>
+                        <hr />
                         <p>Per maggiori informazioni <a href="http://www.steamware.net/iot" target="_blank">visita il link</a> sul nostro sito.</p>
                     </div>
+                    <div class="col-6 text-right">
+                        <div runat="server" id="divCheck" class="@mainCss">
+                            <h4>Info installazione</h4>
+                            <hr />
+                            <div class="d-flex justify-content-between @remSrvCss">
+                                <div class="px-2">
+                                    <i class="fa fa-server" aria-hidden="true"></i> Remote Server:
+                                </div>
+                                <div class="px-2">
+                                    <b>@ServerStatus</b>
+                                </div>
+                            </div>
+                            <div class="d-flex justify-content-between">
+                                <div class="px-2">
+                                    <i class="fa fa-certificate" aria-hidden="true"></i> Cliente:
+                                </div>
+                                <div class="px-2">
+                                    <b>@Installazione</b>
+                                </div>
+                            </div>
+                            <div class="d-flex justify-content-between">
+                                <div class="px-2">
+                                    <i class="fa fa-desktop" aria-hidden="true"></i> App:
+                                </div>
+                                <div class="px-2">
+                                    <b>@Applicazione</b>
+                                </div>
+                            </div>
+                            <div class="d-flex justify-content-between @licenseCss">
+                                <div class="px-2">
+                                    <i class="fa fa-users" aria-hidden="true"></i> Licenze:
+                                </div>
+                                <div class="px-2">
+                                    <b title="# Licenze locali / # Licenze Remote">@Licenze</b>
+                                </div>
+                            </div>
+                            <div class="d-flex justify-content-between @expDateCss">
+                                <div class="px-2">
+                                    <i class="far fa-calendar-check" aria-hidden="true"></i> Scadenza:
+                                </div>
+                                <div class="px-2">
+                                    <b>@($"{Scadenza:yyyy/MM/dd}")</b>
+                                </div>
+                            </div>
+                            <div class="d-flex justify-content-between @licenseCss">
+                                <div class="px-2">
+                                    <i class="fa fa-key" aria-hidden="true"></i> Key
+                                </div>
+                                <div class="px-2">
+                                    <span Font-Size="0.6em" class="small">@MastKey</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 
-@code {
 
-    protected string Titolo = "";
-    protected string Messaggio = "";
-
-    protected override void OnInitialized()
-    {
-        Titolo = "MES | SCADA | IOT";
-        Messaggio = "Soluzione integrata per la gestione della produzione";
-        AppMService.ShowSearch = false;
-        AppMService.PageName = "About";
-        AppMService.PageIcon = "fas fa-info-circle pr-2";
-    }
-}

MP.Land/Pages/About.razor.cs

@@ -0,0 +1,90 @@
+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;
+
+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";
+
+        protected override async Task OnInitializedAsync()
+        {
+            updatePageHead();
+
+            await reloadLicenseData();
+        }
+
+        private async Task reloadLicenseData()
+        {
+            int cDelay = 5;
+            // recupero dati
+            await Task.Delay(cDelay);
+            try
+            {
+                LicServ.InitAkv();
+                // verifico stati
+                ServerStatus = await LicServ.checkLimanServer();
+                Installazione = LicServ.Installazione;
+                Applicazione = LicServ.Applicazione;
+                MastKey = LicServ.MasterKey;
+                await Task.Delay(cDelay);
+                var fatto = await LicServ.RefreshLicense();
+                await Task.Delay(cDelay);
+                Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
+                licenseCss = "";
+            }
+            catch(Exception exc)
+            {
+                licenseCss = "bg-dark text-warning";
+                Log.Error($"Eccezione in reloadLicenseData:{Environment.NewLine}{exc}");
+            }
+            bool okRemoteSrv = ServerStatus == "OK";
+            bool okScadenza = LicServ.checkLicenseActive(LicServ.MasterKey);
+            bool okNumLic = (LicServ.NumLicDb <= LicServ.NumLicRemote);
+
+            // aggiornamento css secondo status colore da check
+            mainCss = okNumLic ? "alert alert-success shadowBox" : "alert alert-warning shadowBox";
+            expDateCss = okScadenza ? "" : "bg-danger text-warning";
+            remSrvCss = okRemoteSrv ? "" : "bg-danger text-warning";
+            await Task.Delay(cDelay);
+        }
+
+        private void updatePageHead()
+        {
+            Titolo = "MES | SCADA | IOT";
+            Messaggio = "Soluzione integrata per la gestione della produzione";
+            AppMService.ShowSearch = false;
+            AppMService.PageName = "About";
+            AppMService.PageIcon = "fas fa-info-circle pr-2";
+        }
+    }
+}

MP.Land/Pages/UserQr.razor

@@ -5,6 +5,7 @@
 
 <div class="card">
     <div class="card-body">
+        <CmpGroupFilt></CmpGroupFilt>
         @if (ListRecords == null)
         {
             <LoadingData></LoadingData>
@@ -15,6 +16,7 @@
         }
         else
         {
+
             <div class="row">
                 @foreach (var item in ListRecords)
                 {

MP.Land/Pages/UserQr.razor.cs

@@ -11,12 +11,14 @@ namespace MP.Land.Pages
 {
     public partial class UserQr : IDisposable
     {
-        #region Private Fields
+        #region Public Methods
 
-        private List<AnagraficaOperatori> ListRecords;
-        private List<AnagraficaOperatori> SearchRecords;
+        public void Dispose()
+        {
+            AppMService.EA_SearchUpdated -= OnSeachUpdated;
+        }
 
-        #endregion Private Fields
+        #endregion Public Methods
 
         #region Protected Fields
 
@@ -25,39 +27,6 @@ namespace MP.Land.Pages
 
         #endregion Protected Fields
 
-        #region Private Properties
-
-        [Inject]
-        private IConfiguration Configuration { get; set; }
-
-        private int currPage
-        {
-            get
-            {
-                return AppMService.SelFilter.PageNum;
-            }
-            set
-            {
-                AppMService.SelFilter.PageNum = value;
-            }
-        }
-
-        private bool isLoading { get; set; } = false;
-
-        private int numRecord
-        {
-            get
-            {
-                return AppMService.SelFilter.PageSize;
-            }
-            set
-            {
-                AppMService.SelFilter.PageSize = value;
-            }
-        }
-
-        #endregion Private Properties
-
         #region Protected Properties
 
         [Inject]
@@ -78,18 +47,6 @@ namespace MP.Land.Pages
 
         #endregion Protected Properties
 
-        #region Private Methods
-
-        private async void OnSeachUpdated()
-        {
-            ListRecords = null;
-            currPage = 1;
-            await Task.Delay(1);
-            await ReloadData();
-        }
-
-        #endregion Private Methods
-
         #region Protected Methods
 
         protected override async Task OnInitializedAsync()
@@ -99,6 +56,7 @@ namespace MP.Land.Pages
             AppMService.PageIcon = "fas fa-qrcode pr-2";
             await ReloadData();
             AppMService.EA_SearchUpdated += OnSeachUpdated;
+            AppMService.EA_FilterUpdated += OnFilterUpdated;
         }
 
         protected async Task PagerReloadNum(int newNum)
@@ -117,19 +75,6 @@ namespace MP.Land.Pages
             isLoading = false;
         }
 
-        protected async Task ReloadData()
-        {
-            isLoading = true;
-            // importante altrimenti NON mostra update UI
-            await Task.Delay(1);
-            SearchRecords = await DataService.AnagOperList(AppMService.SearchVal);
-            ListRecords = SearchRecords.Skip((currPage - 1) * numRecord).Take(numRecord).ToList();
-            totalCount = SearchRecords.Count();
-            await Task.Delay(1);
-            isLoading = false;
-            StateHasChanged();
-        }
-
         protected MarkupString traduci(string lemma)
         {
             MarkupString answ;
@@ -142,13 +87,95 @@ namespace MP.Land.Pages
 
         #endregion Protected Methods
 
-        #region Public Methods
+        #region Private Fields
 
-        public void Dispose()
+        private List<AnagraficaOperatori> ListRecords;
+
+        private List<AnagraficaOperatori> SearchRecords;
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        [Inject]
+        private IConfiguration Configuration { get; set; }
+
+        private int currPage
         {
-            AppMService.EA_SearchUpdated -= OnSeachUpdated;
+            get
+            {
+                return AppMService.SelFilter.PageNum;
+            }
+            set
+            {
+                AppMService.SelFilter.PageNum = value;
+            }
         }
 
-        #endregion Public Methods
+        private string groupName
+        {
+            get
+            {
+                return AppMService.CodGruppo;
+            }
+        }
+
+        private bool isLoading { get; set; } = false;
+
+        private int numRecord
+        {
+            get
+            {
+                return AppMService.SelFilter.PageSize;
+            }
+            set
+            {
+                AppMService.SelFilter.PageSize = value;
+            }
+        }
+
+        #endregion Private Properties
+
+        #region Private Methods
+
+        private async void OnFilterUpdated()
+        {
+            ListRecords = null;
+            currPage = 1;
+            await Task.Delay(1);
+            await ReloadData();
+        }
+
+        private async void OnSeachUpdated()
+        {
+            ListRecords = null;
+            currPage = 1;
+            await Task.Delay(1);
+            await ReloadData();
+        }
+
+        private async Task ReloadData()
+        {
+            isLoading = true;
+            // importante altrimenti NON mostra update UI
+            await Task.Delay(1);
+            // se ho selezionato qualcosa cerco x gruppo
+            //if (groupName != "")
+            //{
+                SearchRecords = await DataService.AnagOperByGroupList(groupName, AppMService.SearchVal);
+            //}
+            //else
+            //{
+            //    //altrimenti TUTTI
+            //    SearchRecords = await DataService.AnagOperList(AppMService.SearchVal);
+            //}
+            ListRecords = SearchRecords.Skip((currPage - 1) * numRecord).Take(numRecord).ToList();
+            totalCount = SearchRecords.Count();
+            await Task.Delay(1);
+            isLoading = false;
+            StateHasChanged();
+        }
+
+        #endregion Private Methods
     }
 }

MP.Land/Pages/_Host.cshtml

@@ -36,11 +36,30 @@
         <a class="dismiss">🗙</a>
     </div>
     
-    @* Riconnessione server app: https://www.syncfusion.com/faq/how-do-i-reconnect-blazor-server-side-automatically *@
+    @*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.defaultReconnectionHandler._reconnectCallback = function (d) {
-            document.location.reload();
-        }
+        //Blazor.start().then(() => {
+        //    Blazor.defaultReconnectionHandler._reconnectionDisplay = {
+        //        show: () => { },
+        //        update: (d) => { },
+        //        rejected: (d) => document.location.reload()
+        //    };
+        //});
+
+        Blazor.start().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()
+                    }
+                }
+            });
+        });
     </script>
 
     <!-- inside of body section and after the div/app tag  -->
@@ -50,33 +69,8 @@
 
     <script src="font-awesome/js/all.min.js"></script>
     <script src="_framework/blazor.server.js"></script>
-
+    
     <script type="text/javascript" src="~/lib/qrcode.js"></script>
-    <script type="text/javascript">
-        function clearContent(elementID) {
-            console.log(elementID);
-            document.getElementById(elementID).innerHTML = "";
-        }
-        // gestione qrcode... da https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity-enable-qrcodes?view=aspnetcore-5.0
-        //var qrcode = new QRCode("qrCodeImg");
-        function displayQr(elementName, rawData) {
-            console.log(elementName);
-            try {
-                if (elementName != "" && rawData != "") {
-                    qrcode = new QRCode(document.getElementById(elementName),
-                        {
-                            text: rawData,
-                            width: 200,
-                            height: 200
-                        });
-                    //qrcode = new QRCode(document.getElementById(elementName));
-                    //qrcode.clear();
-                    //qrcode.makeCode(rawData);
-                }
-            }
-            catch
-            { }
-        }
-    </script>
+    <script type="text/javascript" src="~/lib/qrHelper.js"></script>
 </body>
 </html>

MP.Land/Resources/ChangeLog.html

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

MP.Land/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2204.1216
+6.15.2207.0718

MP.Land/Resources/manifest.xml

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

@@ -18,8 +18,8 @@
     "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
   }
   //"ConnectionStrings": {
-  //  "DefaultConnection": "Server=SQL2016PROD;Database=Valvital_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
-  //  "MP.Land": "Server=SQL2016PROD;Database=Valvital_MoonPro_Prod;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
+  //  "DefaultConnection": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
+  //  "MP.Land": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
   //  "Redis": "localhost:6379,defaultDatabase=11,keepAlive=180,asyncTimeout=5000"
   //}
 }

MP.Land/wwwroot/css/site.css

@@ -63,6 +63,52 @@ a,
 .footer {
   line-height: 1.8em;
 }
+.textTrim {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.maxChar {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.max5Char {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 5rem;
+}
+.max10Char {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 10rem;
+}
+.max20Char {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 20rem;
+}
+.max30Char {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 30rem;
+}
+.max40Char {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 40rem;
+}
+.max50Char {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 50rem;
+}
 /*------------------------------------------------------------------
 [ Shortcuts / .shortcuts ]
 */
@@ -76,7 +122,7 @@ a,
   min-width: 9rem;
   min-height: 5rem;
   display: inline-block;
-  padding: 0.66666667rem 0;
+  padding: 2rem/3 0;
   margin: 0 2px 1em;
   vertical-align: top;
   text-decoration: none;
@@ -89,13 +135,13 @@ a,
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
   border: 1px solid #ddd;
   box-sizing: border-box;
-  border-radius: 0.5rem;
+  border-radius: 1rem/2;
 }
 .shortcuts .shortcut-sm {
   min-width: 4.5rem;
   min-height: 3rem;
   display: inline-block;
-  padding: 0.25rem 0;
+  padding: 1rem/4 0;
   margin: 0 2px 1em;
   vertical-align: top;
   text-decoration: none;
@@ -108,7 +154,7 @@ a,
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
   border: 1px solid #ddd;
   box-sizing: border-box;
-  border-radius: 0.5rem;
+  border-radius: 1rem/2;
 }
 .shortcuts .shortcut .shortcut-icon {
   width: 100%;

MP.Land/wwwroot/css/site.less

@@ -63,6 +63,50 @@ a, .btn-link {
     line-height: 1.8em;
 }
 
+
+.textTrim {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+
+.maxChar {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.max5Char {
+    .maxChar;
+    width: 5rem;
+}
+
+.max10Char {
+    .maxChar;
+    width: 10rem;
+}
+
+.max20Char {
+    .maxChar;
+    width: 20rem;
+}
+
+.max30Char {
+    .maxChar;
+    width: 30rem;
+}
+
+.max40Char {
+    .maxChar;
+    width: 40rem;
+}
+
+.max50Char {
+    .maxChar;
+    width: 50rem;
+}
+
 /*------------------------------------------------------------------
 [ Shortcuts / .shortcuts ]
 */

MP.Land/wwwroot/css/site.min.css

@@ -1 +1 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.min.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif}html,body,.textCondensed{font-family:'Roboto Condensed',sans-serif}a,.btn-link{color:#0366d6}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac}.content{padding-top:1.1rem}.valid.modified:not([type=checkbox]){outline:1px solid #26b050}.invalid{outline:1px solid #f00}.validation-message{color:#f00}.textStriked{text-decoration:line-through}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem}.footer{line-height:1.8em}.shortcuts{text-align:center}.shortcuts .shortcut-icon{font-size:2rem}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#c93}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}@media(max-width:640px){.shortcuts .shortcut{min-width:8rem;min-height:4rem}body{font-size:.8em}}
+@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.min.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif}html,body,.textCondensed{font-family:'Roboto Condensed',sans-serif}a,.btn-link{color:#0366d6}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac}.content{padding-top:1.1rem}.valid.modified:not([type=checkbox]){outline:1px solid #26b050}.invalid{outline:1px solid #f00}.validation-message{color:#f00}.textStriked{text-decoration:line-through}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem}.footer{line-height:1.8em}.textTrim{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.maxChar{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.max5Char{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:5rem}.max10Char{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:10rem}.max20Char{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:20rem}.max30Char{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:30rem}.max40Char{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:40rem}.max50Char{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:50rem}.shortcuts{text-align:center}.shortcuts .shortcut-icon{font-size:2rem}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:2rem/3 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#c93}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}@media(max-width:640px){.shortcuts .shortcut{min-width:8rem;min-height:4rem}body{font-size:.8em}}

MP.Land/wwwroot/lib/qrHelper.js

@@ -0,0 +1,21 @@
+function clearContent(elementID) {
+    //console.log("Remove " + elementID);
+    document.getElementById(elementID).innerHTML = "";
+}
+// gestione qrcode... da https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity-enable-qrcodes?view=aspnetcore-5.0
+//var qrcode = new QRCode("qrCodeImg");
+function displayQr(elementName, rawData) {
+    //console.log("Add " + elementName);
+    try {
+        if (elementName != "" && rawData != "") {
+            qrcode = new QRCode(document.getElementById(elementName),
+                {
+                    text: rawData,
+                    width: 200,
+                    height: 200
+                });
+        }
+    }
+    catch
+    { }
+}

MP.Mon/Components/CmpFooter.razor

@@ -7,41 +7,3 @@
     </div>
 </div>
 
-@code {
-
-    Version version = typeof(Program).Assembly.GetName().Version;
-
-    protected override async Task OnInitializedAsync()
-    {
-        StartTimer();
-    }
-
-    public void Dispose()
-    {
-        aTimer.Stop();
-        aTimer.Dispose();
-    }
-
-    private static System.Timers.Timer aTimer;
-
-    public void StartTimer()
-    {
-        int tOutPeriod = 1000;
-        //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
-        aTimer = new System.Timers.Timer(tOutPeriod);
-        aTimer.Elapsed += ElapsedTimer;
-        aTimer.Enabled = true;
-        aTimer.Start();
-    }
-
-    public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e)
-    {
-        var pUpd = Task.Run(async () =>
-        {
-            //await ReloadData();
-            await Task.Delay(1);
-            await InvokeAsync(StateHasChanged);
-        });
-        pUpd.Wait();
-    }
-}

MP.Mon/Components/CmpFooter.razor.cs

@@ -0,0 +1,55 @@
+namespace MP.Mon.Components
+{
+    public partial class CmpFooter
+    {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            aTimer.Stop();
+            aTimer.Dispose();
+        }
+
+        public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            var pUpd = Task.Run(async () =>
+            {
+                //await ReloadData();
+                await Task.Delay(1);
+                await InvokeAsync(StateHasChanged);
+            });
+            pUpd.Wait();
+        }
+
+        public void StartTimer()
+        {
+            int tOutPeriod = 1000;
+            //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
+            aTimer = new System.Timers.Timer(tOutPeriod);
+            aTimer.Elapsed += ElapsedTimer;
+            aTimer.Enabled = true;
+            aTimer.Start();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            var currAssembly = typeof(Program).Assembly.GetName();
+            version = currAssembly.Version != null ? currAssembly.Version : new Version();
+            StartTimer();
+            await Task.Delay(1);
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private static System.Timers.Timer aTimer = null!;
+        private Version version = null!;
+
+        #endregion Private Fields
+    }
+}

MP.Mon/Components/DetailMSE.razor

@@ -9,44 +9,107 @@
             <div class="d-flex mb-1 ui-title justify-content-center align-items-center text-uppercase">
                 @CurrRecord.Nome
             </div>
-            <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
-                <div class="px-1 pe-0">Art</div>
-                <div class="px-1 ps-0 ui-art">
-                    @if (showArt == "CodArticolo")
+            @if (hasRow(1))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(1))
                     {
-                        <span>@CurrRecord.CodArticolo</span>
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
                     }
-                    else
-                    {
-                        if (string.IsNullOrEmpty(CurrRecord.Disegno))
+                </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
+                    <div class="px-1 pe-0">Art</div>
+                    <div class="px-1 ps-0 ui-art">
+                        @if (showArt == "CodArticolo")
                         {
-                            <span>[@CurrRecord.CodArticolo]</span>
+                            <span>@CurrRecord.CodArticolo</span>
                         }
                         else
                         {
-                            <span>@CurrRecord.Disegno</span>
+                            if (string.IsNullOrEmpty(CurrRecord.Disegno))
+                            {
+                                <span>[@CurrRecord.CodArticolo]</span>
+                            }
+                            else
+                            {
+                                <span>@CurrRecord.Disegno</span>
+                            }
                         }
+                    </div>
+                </div>
+            }
+            @if (hasRow(2))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(2))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
                     }
                 </div>
-            </div>
-            <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall">
-                <div class="px-1 text-uppercase"><b>@CurrRecord.DescrizioneStato</b></div>
-                <div class="px-1 ps-0">@getMinSec((decimal)CurrRecord.Durata)</div>
-            </div>
-            <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
-                @*<div class="col-6 pe-0">OEE</div>
-                    <div class="col-6 ps-0">xx%</div>*@
-                <div class="px-1 pe-0">TCiclo</div>
-                <div class="px-1 ps-0">std: @getMinSec(@CurrRecord.TCAssegnato)</div>
-                <div class="px-1 ps-0">act: @getMinSec(@CurrRecord.TCLavRT)</div>
-            </div>
-            <div class="d-flex justify-content-between pt-0 pb-0 px-1 fontSmall1 text-uppercase">
-                @*<div class="px-1 pe-0">Pezzi</div>
-                <div class="px-1 ps-0">prod: @CurrRecord.PezziProd</div>
-                <div class="px-1 ps-0">ord: @CurrRecord.NumPezzi</div>*@
-                <div class="px-1 pe-0">Pezzi<sub>(prod/ord)</sub></div>
-                <div class="px-1 ps-0">@CurrRecord.PezziProd / @CurrRecord.NumPezzi</div>
-            </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall">
+                    <div class="px-1 text-uppercase"><b>@CurrRecord.DescrizioneStato</b></div>
+                    <div class="px-1 ps-0">@getMinSec(getDecimal(@CurrRecord.Durata))</div>
+                </div>
+            }
+            @if (hasRow(3))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(3))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
+                    @*<div class="col-6 pe-0">OEE</div>
+            <div class="col-6 ps-0">xx%</div>*@
+                    <div class="px-1 pe-0">TCiclo</div>
+                    <div class="px-1 ps-0">std: @getMinSec(@CurrRecord.TCAssegnato)</div>
+                    <div class="px-1 ps-0">act: @getMinSec(@CurrRecord.TCLavRT)</div>
+                </div>
+            }
+            @if (hasRow(4))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(4))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1 fontSmall1 text-uppercase">
+                    <div class="px-1 pe-0">Pezzi<sub>(prod/ord)</sub></div>
+                    <div class="px-1 ps-0">@CurrRecord.PezziProd / @CurrRecord.NumPezzi</div>
+                </div>
+            }
+            @if (hasRow(5))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(5))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
+            @if (hasRow(6))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(6))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
         </div>
         <div class="@cssComStatus(CurrRecord.Semaforo, CurrRecord.LastUpdate) p-1">
             <div class="row fontSmaller mt-1">

MP.Mon/Components/DetailMSE.razor.cs

@@ -15,45 +15,168 @@ using MP.Mon;
 using MP.Mon.Shared;
 using MP.Mon.Components;
 using MP.Data.DatabaseModels;
+using MP.Data.Conf;
 
 namespace MP.Mon.Components
 {
     public partial class DetailMSE
     {
+        #region Protected Fields
 
         protected string baseCss = "sem";
-        protected bool dataLoaded { get; set; } = false;
         protected int kaFactor = 60 / 2;
 
+        #endregion Protected Fields
+
+        #region Private Fields
+
+        private static System.Timers.Timer aTimer = new System.Timers.Timer(60 * 1000);
+
+        #endregion Private Fields
+
+        #region Public Properties
+
+        [Parameter]
+        public MappaStatoExpl? CurrRecord { get; set; } = null;
+
+        [Parameter]
+        public List<TagData>? currTagConf { get; set; } = null;
+
+        [Parameter]
+        public Dictionary<string, string> currTagVal { get; set; } = new Dictionary<string, string>();
+
         [Parameter]
         public bool doAnimate { get; set; } = true;
 
+        [Parameter]
+        public int keepAliveMin { get; set; } = 5;
+
         [Parameter]
         public string showArt { get; set; } = "";
 
-        [Parameter]
-        public int keepAliveMin { get; set; } = 5;
-        [Parameter]
-        public MappaStatoExpl? CurrRecord { get; set; } = null;
+        #endregion Public Properties
 
-        private string cssStatus(string codSemaforo)
+        /// <summary>
+        /// Verifica se ci sia un override per la riga indicata
+        /// </summary>
+        /// <param name="numRow"></param>
+        /// <returns></returns>
+        protected bool hasRow(int numRow)
         {
-            string codColore = codSemaforo.Substring(1, 2);
-            string answ = $"{baseCss}{codColore}";
-            if (doAnimate && codColore != "Ve")
+            bool answ = false;
+            if (currTagConf != null)
             {
-                // blink se secondo pari...
-                DateTime adesso = DateTime.Now;
-                int resto = 0;
-                Math.DivRem(adesso.Second, 2, out resto);
-                if (resto == 0)
+                if (currTagConf.Count > 0)
                 {
-                    answ += "_b";
+                    var currVals = rowValues(numRow);
+                    answ = currVals.Count > 0;
                 }
             }
             return answ;
         }
 
+        /// <summary>
+        /// Restituisce (se presenti) valori di override per la riga indicata
+        /// </summary>
+        /// <param name="numRow"></param>
+        /// <returns></returns>
+        protected List<TagData> rowValues(int numRow)
+        {
+            List<TagData>? rowVals = null;
+            if (currTagConf != null)
+            {
+                if (currTagConf.Count > 0)
+                {
+                    //cerco solo la riga corrente...
+                    rowVals = currTagConf.Where(x => x.RowNum == numRow).ToList();
+                }
+            }
+            if (rowVals == null)
+            {
+                rowVals = new List<TagData>();
+            }
+            return rowVals;
+        }
+
+        /// <summary>
+        /// restituisce il valore data la tagLocation
+        /// </summary>
+        /// <param name="tagLocation"></param>
+        /// <returns></returns>
+        protected string currVal(string tagLocation)
+        {
+            string answ = "";
+            if (currTagVal.ContainsKey(tagLocation))
+            {
+                answ = currTagVal[tagLocation];
+            }
+            return answ;
+        }
+
+        #region Protected Properties
+
+        protected string codIOB
+        {
+            get
+            {
+                string answ = "";
+                if (CurrRecord != null)
+                {
+                    answ = CurrRecord.IdxMacchina;
+                }
+                return answ;
+            }
+        }
+
+        protected bool dataLoaded { get; set; } = false;
+
+        #endregion Protected Properties
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+            aTimer.Stop();
+            aTimer.Dispose();
+        }
+
+        public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            var pUpd = Task.Run(async () =>
+            {
+                await Task.Delay(1);
+                await InvokeAsync(StateHasChanged);
+            });
+            pUpd.Wait();
+        }
+
+        public void StartTimer()
+        {
+            int tOutPeriod = 1000;
+            //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
+            aTimer = new System.Timers.Timer(tOutPeriod);
+            aTimer.Elapsed += ElapsedTimer;
+            aTimer.Enabled = true;
+            aTimer.Start();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            StartTimer();
+            Random rnd = new Random();
+            await Task.Delay(rnd.Next(5));
+            dataLoaded = true;
+            setupConf();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Methods
+
         private string cssComStatus(string semaforo, DateTime? lastUpdateN)
         {
             DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
@@ -72,18 +195,60 @@ namespace MP.Mon.Components
             }
             return answ;
         }
-        protected override async Task OnInitializedAsync()
+
+        private string cssStatus(string codSemaforo)
         {
-            StartTimer();
-            Random rnd = new Random();
-            //await Task.Delay(rnd.Next(500));
-            dataLoaded = true;
-            setupConf();
+            // se vuoto --> mostra nero!
+            if (string.IsNullOrEmpty(codSemaforo))
+            {
+                codSemaforo = "sNe";
+            }
+            string codColore = codSemaforo.Substring(1, 2);
+            string answ = $"{baseCss}{codColore}";
+            if (doAnimate && codColore != "Ve")
+            {
+                // blink se secondo pari...
+                DateTime adesso = DateTime.Now;
+                int resto = 0;
+                Math.DivRem(adesso.Second, 2, out resto);
+                if (resto == 0)
+                {
+                    answ += "_b";
+                }
+            }
+            return answ;
         }
+
+        private decimal getDecimal(object? rawData)
+        {
+            decimal answ = 0;
+            if (rawData != null)
+            {
+                decimal.TryParse($"{rawData}", out answ);
+            }
+            return answ;
+        }
+
+        private string getMinSec(decimal? currTimeMin)
+        {
+            string answ = "nd";
+            TimeSpan tSpan = new TimeSpan(0);
+            try
+            {
+                double cTimeMin = currTimeMin != null ? (double)currTimeMin : 0;
+                tSpan = TimeSpan.FromMinutes(cTimeMin);
+                answ = $"{tSpan:mm}:{tSpan:ss}";
+            }
+            catch
+            { }
+            return answ;
+        }
+
         private void setupConf()
         {
             //baseCss = doAnimate ? "semBlink" : "sem";
         }
+
         private bool showComErr(DateTime? lastUpdateN)
         {
             DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
@@ -95,45 +260,6 @@ namespace MP.Mon.Components
             return answ;
         }
 
-        private string getMinSec(decimal? currTimeMin)
-        {
-            string answ = "nd";
-            TimeSpan tSpan = new TimeSpan(0);
-            try
-            {
-                tSpan = TimeSpan.FromMinutes((double)currTimeMin);
-                answ = $"{tSpan:mm}:{tSpan:ss}";
-            }
-            catch
-            { }
-            return answ;
-        }
-        public void Dispose()
-        {
-            aTimer.Stop();
-            aTimer.Dispose();
-        }
-
-        private static System.Timers.Timer aTimer = new System.Timers.Timer(60 * 1000);
-
-        public void StartTimer()
-        {
-            int tOutPeriod = 1000;
-            //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
-            aTimer = new System.Timers.Timer(tOutPeriod);
-            aTimer.Elapsed += ElapsedTimer;
-            aTimer.Enabled = true;
-            aTimer.Start();
-        }
-
-        public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            var pUpd = Task.Run(async () =>
-            {
-                await Task.Delay(1);
-                await InvokeAsync(StateHasChanged);
-            });
-            pUpd.Wait();
-        }
+        #endregion Private Methods
     }
 }

MP.Mon/Conf/iobTagsConf.json

@@ -0,0 +1,5 @@
+{
+  "IobSetup": {
+    "***": []
+  }
+}

MP.Mon/Conf/iobTagsConf.office.json

@@ -0,0 +1,90 @@
+{
+  "IobSetup": {
+    "***": [
+      {
+        "ColNum": 1,
+        "RowNum": 5,
+        "TagCss": "fontSmall",
+        "TagName": "Feed Over",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:***:FEED_OVER"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 5,
+        "TagCss": "fontSmall",
+        "TagName": "Rapid Over",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:***:RAPID_OVER"
+      }
+    ],
+    "SIMUL_01": [
+      {
+        "ColNum": 1,
+        "RowNum": 6,
+        "TagCss": "fontSmall",
+        "TagName": "Power",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:SIMUL_01:POWER_01"
+      }
+    ],
+    "SIMUL_02": [
+      {
+        "ColNum": 1,
+        "RowNum": 6,
+        "TagCss": "fontSmall",
+        "TagName": "Power",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:SIMUL_02:POWER_01"
+      }
+    ],
+    "GIACO_ICOEL_001": [
+      {
+        "ColNum": 1,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:TonnOra"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:PezziMin"
+      },
+      {
+        "ColNum": 1,
+        "RowNum": 2,
+        "TagName": "Batch SX",
+        "TagLocation": "FluxData:BatchL1"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 2,
+        "TagName": "Batch DX",
+        "TagLocation": "FluxData:BatchL2"
+      }
+    ],
+    "GIACO_ICOEL_002": [
+      {
+        "ColNum": 1,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:TonnOra"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:PezziMin"
+      },
+      {
+        "ColNum": 1,
+        "RowNum": 2,
+        "TagName": "Batch SX",
+        "TagLocation": "FluxData:BatchL1"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 2,
+        "TagName": "Batch DX",
+        "TagLocation": "FluxData:BatchL2"
+      }
+    ]
+  }
+}

MP.Mon/Data/MpDataService.cs

@@ -1,29 +1,53 @@
-using MP.Data.DatabaseModels;
+using MP.Data.Conf;
+using MP.Data.DatabaseModels;
+using Newtonsoft.Json;
+using NLog;
+using StackExchange.Redis;
 using System.Text;
 
 namespace MP.Mon.Data
 {
     public class MpDataService : IDisposable
     {
-        #region Private Fields
-
-        private static IConfiguration _configuration;
-        private static ILogger<MpDataService> _logger;
-
-        #endregion Private Fields
-
         #region Public Fields
 
-        public static MP.Data.Controllers.MpMonController dbController;
+        public static MP.Data.Controllers.MpMonController dbController { get; set; } = null!;
 
         #endregion Public Fields
 
+        #region Private Fields
+
+        private static IConfiguration _configuration = null!;
+        private static ILogger<MpDataService> _logger = null!;
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Oggetto per connessione a REDIS
+        /// </summary>
+        private ConnectionMultiplexer redisConn = null!;
+
+        //ISubscriber sub = redis.GetSubscriber();
+        /// <summary>
+        /// Oggetto DB redis da impiegare x chiamate R/W
+        /// </summary>
+        private IDatabase redisDb = null!;
+
+        #endregion Private Fields
+
         #region Public Constructors
 
         public MpDataService(IConfiguration configuration, ILogger<MpDataService> logger)
         {
             _logger = logger;
             _configuration = configuration;
+
+            // setup compoenti REDIS
+            this.redisConn = ConnectionMultiplexer.Connect(_configuration.GetConnectionString("Redis"));
+            this.redisDb = this.redisConn.GetDatabase();
+            //// setup canali pub/sub
+            //actLogPipe = new MessagePipe(redisConn, Constants.ACT_LOG_M_QUEUE);
+
             // conf DB
             string connStr = _configuration.GetConnectionString("Mp.Mon");
             if (string.IsNullOrEmpty(connStr))
@@ -38,10 +62,22 @@ namespace MP.Mon.Data
                 //sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}");
                 _logger.LogInformation(sb.ToString());
             }
+
+            // setup conf IOB da dizionario
+            tryLoadIobTags();
         }
 
         #endregion Public Constructors
 
+        #region Public Properties
+
+        /// <summary>
+        /// Dizionario dei tag configurati per IOB
+        /// </summary>
+        public Dictionary<string, List<TagData>> currTagConf { get; set; } = new Dictionary<string, List<TagData>>();
+
+        #endregion Public Properties
+
         #region Public Methods
 
         public Task<List<ConfigModel>> ConfigGetAll()
@@ -55,6 +91,23 @@ namespace MP.Mon.Data
             dbController.Dispose();
         }
 
+        /// <summary>
+        /// restituisce il valore da REDIS associato al tag richeisto
+        /// </summary>
+        /// <param name="redKey">Chiave in cui cercare il valore</param>
+        /// <returns></returns>
+        public string getTagConf(string redKey)
+        {
+            string outVal = "";
+            // cerco in REDIS la conf x l'IOB
+            var rawData = redisDb.StringGet(redKey);
+            if (!string.IsNullOrEmpty(rawData))
+            {
+                outVal = $"{rawData}";
+            }
+            return outVal;
+        }
+
         public Task<List<Macchine>> MacchineGetAll()
         {
             return Task.FromResult(dbController.MacchineGetAll().ToList());
@@ -71,5 +124,92 @@ namespace MP.Mon.Data
         }
 
         #endregion Public Methods
+
+        #region Private Methods
+
+        /// <summary>
+        /// Prova a caricare da file la conf degli IOB se presente
+        /// </summary>
+        private void tryLoadIobTags()
+        {
+            Dictionary<string, List<TagData>> currConf = new Dictionary<string, List<TagData>>();
+            string strExeFilePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+            if (!string.IsNullOrEmpty(strExeFilePath))
+            {
+                string? strWorkPath = Path.GetDirectoryName(strExeFilePath);
+                if (!string.IsNullOrEmpty(strWorkPath))
+                {
+                    string filePath = $"{strWorkPath}/Conf/iobTagsConf.json";
+                    if (File.Exists(filePath))
+                    {
+                        string rawData = File.ReadAllText(filePath);
+                        if (!string.IsNullOrEmpty(rawData))
+                        {
+                            var fileConfData = JsonConvert.DeserializeObject<IobTags>(rawData);
+                            if (fileConfData != null)
+                            {
+                                // effettuo esplosione conf SE contenesse il valore "***" = tutti gli IOB
+                                if (fileConfData.IobSetup.ContainsKey("***"))
+                                {
+                                    // recupero elenco macchine...
+                                    var elencoMacc = dbController.MacchineGetAll();
+                                    // x ogni macchina creo le righe standard da conf...
+                                    var baseConf = fileConfData.IobSetup.Where(x => x.Key == "***").FirstOrDefault();
+                                    foreach (var item in elencoMacc)
+                                    {
+                                        if (!string.IsNullOrEmpty(item.IdxMacchina))
+                                        {
+                                            // converto i valori x la macchina corrente...
+                                            // clono in nuovo oggetto
+                                            var specVal = baseConf.Value.Select(i => i.Clone()).ToList();
+                                            // sostituisco segnaposto
+                                            foreach (var singleVal in specVal)
+                                            {
+                                                singleVal.TagLocation = singleVal.TagLocation.Replace("***", item.IdxMacchina);
+                                            }
+                                            // ora aggiungo eventuali valori in override...
+                                            if (fileConfData.IobSetup.ContainsKey(item.IdxMacchina))
+                                            {
+                                                var otConf = fileConfData.IobSetup.Where(x => x.Key == item.IdxMacchina).FirstOrDefault();
+                                                //verifico x ogni valore other...
+                                                foreach (var otTag in otConf.Value)
+                                                {
+                                                    var ovrTag = specVal.Where(x => x.ColNum == otTag.ColNum && x.RowNum == otTag.RowNum).FirstOrDefault();
+                                                    // se contiene --> sovrascrivo
+                                                    if (ovrTag != null)
+                                                    {
+                                                        //ovrTag = otTag.Clone();
+                                                        specVal.Remove(ovrTag);
+                                                        specVal.Add(otTag.Clone());
+                                                    }
+                                                    // se non contiene --> aggiungo
+                                                    else
+                                                    {
+                                                        specVal.Add(otTag);
+                                                    }
+                                                }
+                                            }
+                                            currConf.Add(item.IdxMacchina, specVal);
+                                        }
+                                    }
+
+                                }
+                                // altrimenti copio ed ho finito
+                                else
+                                {
+                                    currConf = fileConfData.IobSetup;
+                                }
+                            }
+                        }
+                    }
+                    if (currConf != null)
+                    {
+                        currTagConf = currConf;
+                    }
+                }
+            }
+        }
+
+        #endregion Private Methods
     }
 }

MP.Mon/MP.Mon.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2204.1416</Version>
+    <Version>6.15.2207.718</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,13 +30,25 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="4.7.15" />
-    <PackageReference Include="StackExchange.Redis" Version="2.5.61" />
+    <PackageReference Include="NLog" Version="5.0.1" />
+    <PackageReference Include="StackExchange.Redis" Version="2.6.48" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MP.Data\MP.Data.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="Conf\iobTagsConf.office.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="logs\.placeholder">
+      <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.Mon/Pages/Index.razor

@@ -24,15 +24,14 @@
     else
     {
         int currIdx = 0;
-        foreach (var macchina in ListMSE)
+        foreach (var recordIob in ListMSE)
         {
-            <DetailMSE CurrRecord="@macchina" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt"></DetailMSE>
+            <DetailMSE CurrRecord="@recordIob" currTagConf="@getIobTag(recordIob.IdxMacchina)" currTagVal="@getTagVal(recordIob.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt"></DetailMSE>
             currIdx++;
             if (currIdx >= maxCol)
             {
                 currIdx = 0;
-                @((MarkupString)"</div><div class=\"row statusMap mx-1 my-1\">")
-                ;
+                @((MarkupString)"</div><div class=\"row statusMap mx-1 my-1\">");
             }
         }
         // controllo se devo "chiudere riga...

MP.Mon/Pages/Index.razor.cs

@@ -1,21 +1,6 @@
-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.Mon;
-using MP.Mon.Shared;
-using MP.Mon.Components;
+using MP.Data.Conf;
 using MP.Data.DatabaseModels;
-using MP.Mon.Components;
 using MP.Mon.Data;
 using NLog;
 
@@ -23,65 +8,113 @@ namespace MP.Mon.Pages
 {
     public partial class Index : IDisposable
     {
-        protected List<MappaStatoExpl>? ListMSE = null;
-        List<ConfigModel>? CurrConfig = null;
-
-
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        protected int keepAliveMin = 1;
-
-        protected int maxCol = 4;
+        #region Protected Fields
 
         protected bool doAnimate = true;
-
-        protected string showArt = "";
-
-        protected int slowRefreshSec = 300;
         protected int fastRefreshSec = 10;
+        protected int keepAliveMin = 1;
+        protected List<MappaStatoExpl>? ListMSE = null;
+        protected int maxCol = 4;
+        protected string showArt = "";
+        protected int slowRefreshSec = 300;
 
+        #endregion Protected Fields
+
+        #region Private Fields
+
+        private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
+        private List<ConfigModel>? CurrConfig = null;
+
+        #endregion Private Fields
+
+        #region Protected Properties
 
-        protected int slowRefreshMs
-        {
-            get => 1000 * slowRefreshSec;
-        }
         protected int fastRefreshMs
         {
             get => 1000 * fastRefreshSec;
         }
 
-        protected override async Task OnInitializedAsync()
-        {
-            await setupConf();
-            await ReloadData();
-            StartTimer();
-        }
-
-
         [Inject]
         protected MpDataService MMDataService { get; set; } = null!;
 
         [Inject]
         protected NavigationManager NavManager { get; set; } = null!;
 
-        private async Task setupConf()
+        protected int slowRefreshMs
         {
-            CurrConfig = await MMDataService.ConfigGetAll();
+            get => 1000 * slowRefreshSec;
+        }
+
+        #endregion Protected Properties
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+            fastTimer.Stop();
+            fastTimer.Dispose();
+            slowTimer.Stop();
+            slowTimer.Dispose();
+        }
+
+        public void ElapsedFastTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            var pUpd = Task.Run(async () =>
+            {
+                await ReloadData();
+                //await Task.Delay(1);
+                await InvokeAsync(StateHasChanged);
+            });
+            pUpd.Wait();
+        }
+
+        public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            ListMSE = null;
+            await Task.Delay(1);
+            NavManager.NavigateTo(NavManager.Uri);
+        }
+
+        public void StartTimer()
+        {
+            // timer veloce
+            fastTimer = new System.Timers.Timer(fastRefreshMs);
+            fastTimer.Elapsed += ElapsedFastTimer;
+            fastTimer.Enabled = true;
+            fastTimer.Start();
+            // timer lento
+            slowTimer = new System.Timers.Timer(slowRefreshMs);
+            slowTimer.Elapsed += ElapsedSlowTimer;
+            slowTimer.Enabled = true;
+            slowTimer.Start();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Recupera il valore e se trovato aggiorna
+        /// </summary>
+        /// <param name="chiave">Valore da cercare</param>
+        /// <param name="varObj">String in cui salvare il valore se trovato</param>
+        /// <returns></returns>
+        protected bool getConfVal(string chiave, ref string varObj)
+        {
+            bool answ = false;
             if (CurrConfig != null && CurrConfig.Count > 0)
             {
                 // sistemo i parametri opzionali...
-
-                getConfValInt("keepAliveMin", ref keepAliveMin);
-                getConfValInt("MON_maxCol", ref maxCol);
-                int intDoAnim = 0;
-                getConfValInt("doAnimate", ref intDoAnim);
-                doAnimate = intDoAnim == 1;
-                getConfValInt("pageRefreshSec", ref slowRefreshSec);
-                getConfValInt("MSE_cacheDuration", ref fastRefreshSec);
-                getConfVal("sART", ref showArt);
-
-                Log.Info($"Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshSec: {fastRefreshSec}");
+                ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
+                if (risultato != null)
+                {
+                    varObj = risultato.Valore;
+                    answ = !string.IsNullOrEmpty(risultato.Valore);
+                }
             }
+            return answ;
         }
 
         /// <summary>
@@ -106,72 +139,78 @@ namespace MP.Mon.Pages
         }
 
         /// <summary>
-        /// Recupera il valore e se trovato aggiorna
+        /// Recupera da conf eventuale setup tag dell'IOB indicato
         /// </summary>
-        /// <param name="chiave">Valore da cercare</param>
-        /// <param name="varObj">String in cui salvare il valore se trovato</param>
+        /// <param name="codIob"></param>
         /// <returns></returns>
-        protected bool getConfVal(string chiave, ref string varObj)
+        protected List<TagData>? getIobTag(string codIob)
         {
-            bool answ = false;
-            if (CurrConfig != null && CurrConfig.Count > 0)
+            List<TagData>? answ = null;
+            if (MMDataService.currTagConf != null)
             {
-                // sistemo i parametri opzionali...
-                ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
-                if (risultato != null)
+                // cerco x chiave IOB...
+                if (MMDataService.currTagConf.ContainsKey(codIob))
                 {
-                    varObj = risultato.Valore;
-                    answ = !string.IsNullOrEmpty(risultato.Valore);
+                    answ = MMDataService.currTagConf[codIob];
                 }
             }
             return answ;
         }
 
+        /// <summary>
+        /// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un dizionario x ottimizzare visualizzazione
+        /// </summary>
+        /// <param name="codIob"></param>
+        /// <returns></returns>
+        protected Dictionary<string, string> getTagVal(string codIob)
+        {
+            Dictionary<string, string> answ = new Dictionary<string, string>();
+            // recupero conf tags...
+            var currTags = getIobTag(codIob);
+            if (currTags != null && currTags.Count > 0)
+            {
+                // FIXME TODO !!!! FARE !!!! - da verificare
+                answ = currTags.ToDictionary(x => x.TagLocation, x => MMDataService.getTagConf(x.TagLocation));
+            }
+            return answ;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await setupConf();
+            await ReloadData();
+            StartTimer();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Methods
+
         private async Task ReloadData()
         {
             ListMSE = await MMDataService.MseGetAll();
         }
 
-        public void Dispose()
+        private async Task setupConf()
         {
-            fastTimer.Stop();
-            fastTimer.Dispose();
-            slowTimer.Stop();
-            slowTimer.Dispose();
-        }
-
-        private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
-        private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
-
-        public void StartTimer()
-        {
-            // timer veloce
-            fastTimer = new System.Timers.Timer(fastRefreshMs);
-            fastTimer.Elapsed += ElapsedFastTimer;
-            fastTimer.Enabled = true;
-            fastTimer.Start();
-            // timer lento
-            slowTimer = new System.Timers.Timer(slowRefreshMs);
-            slowTimer.Elapsed += ElapsedSlowTimer;
-            slowTimer.Enabled = true;
-            slowTimer.Start();
-        }
-
-        public void ElapsedFastTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            var pUpd = Task.Run(async () =>
+            CurrConfig = await MMDataService.ConfigGetAll();
+            if (CurrConfig != null && CurrConfig.Count > 0)
             {
-                await ReloadData();
-                //await Task.Delay(1);
-                await InvokeAsync(StateHasChanged);
-            });
-            pUpd.Wait();
+                // sistemo i parametri opzionali...
+
+                getConfValInt("keepAliveMin", ref keepAliveMin);
+                getConfValInt("MON_maxCol", ref maxCol);
+                int intDoAnim = 0;
+                getConfValInt("doAnimate", ref intDoAnim);
+                doAnimate = intDoAnim == 1;
+                getConfValInt("pageRefreshSec", ref slowRefreshSec);
+                getConfValInt("MSE_cacheDuration", ref fastRefreshSec);
+                getConfVal("sART", ref showArt);
+
+                Log.Info($"Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshSec: {fastRefreshSec}");
+            }
         }
 
-        public async void ElapsedSlowTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            ListMSE = null;
-            NavManager.NavigateTo(NavManager.Uri);
-        }
+        #endregion Private Methods
     }
 }

MP.Mon/Pages/_Layout.cshtml

@@ -28,11 +28,30 @@
         <a class="dismiss">🗙</a>
     </div>
 
-        @* Riconnessione server app: https://www.syncfusion.com/faq/how-do-i-reconnect-blazor-server-side-automatically *@
+    @*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.defaultReconnectionHandler._reconnectCallback = function (d) {
-            document.location.reload();
-        }
+        //Blazor.start().then(() => {
+        //    Blazor.defaultReconnectionHandler._reconnectionDisplay = {
+        //        show: () => { },
+        //        update: (d) => { },
+        //        rejected: (d) => document.location.reload()
+        //    };
+        //});
+
+        Blazor.start().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()
+                    }
+                }
+            });
+        });
     </script>
 
     <script src="_framework/blazor.server.js"></script>

MP.Mon/Program.cs

@@ -21,7 +21,6 @@ string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"))
 // avvio oggetto shared x redis...
 var redisMultiplexer = ConnectionMultiplexer.Connect(connStringRedis);
 
-
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();

MP.Mon/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.15.2204.1416</h4>
+    <h4>Versione: 6.15.2207.718</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.Mon/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2204.1416
+6.15.2207.718

MP.Mon/Resources/manifest.xml

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

MP.Mon/appsettings.Production.json

@@ -0,0 +1,17 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "CodApp": "MP.MON",
+  "ConnectionStrings": {
+    "MP.Mon": "Server=localhost\\SQLEXPRESS;Database=MoonPro; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
+    "MP.Stats": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS; 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"
+  }
+}

MP.Mon/appsettings.json

@@ -10,6 +10,6 @@
   "ConnectionStrings": {
     "MP.Mon": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
     "MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
-    "Redis": "localhost:6379,DefaultDatabase=13,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
+    "Redis": "localhost:6379,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
   }
 }

MP.Stats/Components/DataPager.razor

@@ -36,6 +36,17 @@
                 {
                     <span>@totalCount records</span>
                 }
+                @if (totalCount > 0)
+                {
+                    if (!fileExist)
+                    {
+                        <button class="btn btn-block btn-sm btn-primary" @onclick="() => requestSave()"><span class="oi oi-wrench"></span> Prepare Data</button>
+                    }
+                    else
+                    {
+                        <a target="_blank" href="Download?fileName=@fileName" class="btn btn-block btn-sm btn-success"><span class="oi oi-cloud-download"></span> Download Data</a>
+                    }
+                }
             </div>
             <div class="p-1 flex-fill text-right small">
                 @if (totalCount > 0)

MP.Stats/MP.Stats.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.15.2204.1416</Version>
+        <Version>6.15.2207.0718</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -185,12 +185,12 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="ElmahCore" Version="2.1.1" />
-      <PackageReference Include="ElmahCore.Common" Version="2.1.1" />
-      <PackageReference Include="ElmahCore.Sql" Version="2.1.1" />
-      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.4" />
+      <PackageReference Include="ElmahCore" Version="2.1.2" />
+      <PackageReference Include="ElmahCore.Common" Version="2.1.2" />
+      <PackageReference Include="ElmahCore.Sql" Version="2.1.2" />
+      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-      <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+      <PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
     </ItemGroup>
 
     <ItemGroup>

MP.Stats/Pages/Test.razor.cs

@@ -110,6 +110,7 @@ namespace MP.Stats.Pages
         ;
         private async Task HandleRedraw()
         {
+            await Task.Delay(1);
             // calcolo hist frequenza con EFCore: https://entityframeworkcore.com/knowledge-base/60871048/group-by-and-to-dictionary-in-ef-core-3-1
             randData = RandomizeData();
             //var histDict = randData.GroupBy(r => r).Select(g => new

MP.Stats/Pages/_Host.cshtml

@@ -33,11 +33,30 @@
         <a class="dismiss">🗙</a>
     </div>
     
-    @* Riconnessione server app: https://www.syncfusion.com/faq/how-do-i-reconnect-blazor-server-side-automatically *@
+    @*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.defaultReconnectionHandler._reconnectCallback = function (d) {
-            document.location.reload();
-        }
+        //Blazor.start().then(() => {
+        //    Blazor.defaultReconnectionHandler._reconnectionDisplay = {
+        //        show: () => { },
+        //        update: (d) => { },
+        //        rejected: (d) => document.location.reload()
+        //    };
+        //});
+
+        Blazor.start().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()
+                    }
+                }
+            });
+        });
     </script>
 
     <script src="_framework/blazor.server.js"></script>

MP.Stats/Properties/PublishProfiles/IIS01.pubxml.user

@@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAACFCXZ0UR7Czo59aaRCHU5QAAAAAASAAACgAAAAEAAAACYlKt9E6s77uEikpKwyhdQYAAAAUwae989LovFbsfjRp69HCVpyUQZbqLyYFAAAAMW8mLSAxWmKaOvB4nkDgUpS27/b</EncryptedPassword>
-    <History>True|2022-02-26T17:24:32.0833123Z;False|2022-02-26T18:24:15.3994092+01:00;False|2022-02-26T18:23:44.8358586+01:00;True|2021-05-26T19:49:30.0427896+02:00;False|2021-05-26T19:49:14.9065510+02:00;True|2021-05-25T17:48:33.3901785+02:00;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00;</History>
+    <History>True|2022-07-05T08:07:03.1380003Z;True|2022-02-26T18:24:32.0833123+01:00;False|2022-02-26T18:24:15.3994092+01:00;False|2022-02-26T18:23:44.8358586+01:00;True|2021-05-26T19:49:30.0427896+02:00;False|2021-05-26T19:49:14.9065510+02:00;True|2021-05-25T17:48:33.3901785+02:00;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00;</History>
   </PropertyGroup>
 </Project>

MP.Stats/Properties/PublishProfiles/IIS02.pubxml.user

@@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAAB3zVMW24A4himhWJ5CNqgeAAAAAASAAACgAAAAEAAAAA7IL1n8zHn2/ljDNL4/zlsYAAAAgAEg9RYKHV0xl3wnafZiN9Q954GOBAvdFAAAACSBJkwDndNTiIrUuk7zJls84fN1</EncryptedPassword>
-    <History>True|2022-02-26T17:24:42.6534875Z;True|2021-05-26T19:49:44.3836006+02:00;</History>
+    <History>True|2022-07-05T08:06:48.2207580Z;True|2022-02-26T18:24:42.6534875+01:00;True|2021-05-26T19:49:44.3836006+02:00;</History>
   </PropertyGroup>
 </Project>

MP.Stats/Resources/ChangeLog.html

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

MP.Stats/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2204.1416
+6.15.2207.0718

MP.Stats/Resources/manifest.xml

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