Merge branch 'Release/FirstSpecStableRelease'

- era overlapping parametri/dossiers

.gitlab-ci.yml

@@ -1,5 +1,6 @@
 variables:
  NEXUS_PATH: 'MP-STATS'
+ PROJ_PATH: ''
  APP_NAME: 'MP.Stats'
  SOL_NAME: 'MP-STATS'
 
@@ -120,6 +121,33 @@ MON:build:
   script:
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
 
+SPEC:build:
+  stage: build
+  tags:
+    - win
+  variables:
+    APP_NAME: MP.SPEC
+    SOL_NAME: MP-SPEC
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  script:
+    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+
+# WAMON:build:
+#   stage: build
+#   tags:
+#     - win
+#   variables:
+#     PROJ_PATH: MP.WASM.Mon\Server
+#     APP_NAME: MP.WASM.Mon.Server
+#     SOL_NAME: MP-WAMON
+#   before_script:
+#     - *nuget-fix
+#     - dotnet restore "$env:SOL_NAME.sln"
+#   script:
+#     - dotnet build $env:PROJ_PATH/$env:APP_NAME.csproj
+
 LAND:test:
   stage: test
   tags:
@@ -184,6 +212,39 @@ MON:test:
   script:
     - dotnet test $env:APP_NAME/$env:APP_NAME.csproj
 
+# WAMON:test:
+#   stage: test
+#   tags:
+#     - win
+#   variables:
+#     PROJ_PATH: MP.WASM.Mon\Server
+#     APP_NAME: MP.WASM.Mon.Server
+#     SOL_NAME: MP-WAMON
+#   before_script:
+#     - *nuget-fix
+#     - dotnet restore "$env:SOL_NAME.sln"
+#   only:
+#     - develop
+#   needs: ["WAMON:build"]
+#   script:
+#     - dotnet test $env:PROJ_PATH/$env:APP_NAME.csproj
+
+SPEC:test:
+  stage: test
+  tags:
+    - win
+  variables:
+    APP_NAME: MP.SPEC
+    SOL_NAME: MP-SPEC
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  only:
+    - develop
+  needs: ["SPEC:build"]
+  script:
+    - dotnet test $env:APP_NAME/$env:APP_NAME.csproj
+
 LAND:IIS01:deploy:
   stage: deploy
   tags:
@@ -248,6 +309,39 @@ MON:IIS01:deploy:
   script: 
     - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
 
+# WAMON:IIS01:deploy:
+#   stage: deploy
+#   tags:
+#     - win
+#   variables:
+#     PROJ_PATH: MP.WASM.Mon\Server
+#     APP_NAME: MP.WASM.Mon.Server
+#     SOL_NAME: MP-WAMON
+#   before_script:
+#     - *nuget-fix
+#     - dotnet restore "$env:SOL_NAME.sln"
+#   only:
+#     - develop
+#   needs: ["WAMON:test"]
+#   script: 
+#     - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
+
+SPEC:IIS01:deploy:
+  stage: deploy
+  tags:
+    - win
+  variables:
+    APP_NAME: MP.SPEC
+    SOL_NAME: MP-SPEC
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  only:
+    - develop
+  needs: ["SPEC:test"]
+  script: 
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
+
 LAND:IIS02:deploy:
   stage: deploy
   tags:
@@ -316,6 +410,41 @@ MON:IIS02:deploy:
     - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
     - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
 
+# WAMON:IIS02:deploy:
+#   stage: deploy
+#   tags:
+#     - win
+#   variables:
+#     PROJ_PATH: MP.WASM.Mon\Server
+#     APP_NAME: MP.WASM.Mon.Server
+#     SOL_NAME: MP-WAMON
+#   before_script:
+#     - *nuget-fix
+#     - dotnet restore "$env:SOL_NAME.sln"
+#   only:
+#     - master
+#   needs: ["WAMON:build"]
+#   script: 
+#     - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
+#     - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj
+
+SPEC:IIS02:deploy:
+  stage: deploy
+  tags:
+    - win
+  variables:
+    APP_NAME: MP.SPEC
+    SOL_NAME: MP-SPEC
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  only:
+    - master
+  needs: ["SPEC:build"]
+  script: 
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
+
 LAND:installer:
   stage: installer
   tags:
@@ -400,6 +529,49 @@ MON:installer:
     - *hashBuild
     - *nexusUpload
 
+# WAMON:installer:
+#   stage: installer
+#   tags:
+#     - win
+#   variables:
+#     PROJ_PATH: MP.WASM.Mon\Server
+#     APP_NAME: MP.WASM.Mon.Server
+#     SOL_NAME: MP-WAMON
+#     NEXUS_PATH: MP-WAMON
+#   before_script:
+#     - *nuget-fix
+#     - dotnet restore "$env:SOL_NAME.sln"
+#   only:
+#     - develop
+#     - master
+#   needs: ["WAMON:build"]
+#   script: 
+#     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:PROJ_PATH/$env:APP_NAME.csproj -o:publish
+#     # qui il deploy su nexus...
+#     - *hashBuild
+#     - *nexusUpload
+
+SPEC:installer:
+  stage: installer
+  tags:
+    - win
+  variables:
+    APP_NAME: MP.SPEC
+    SOL_NAME: MP-SPEC
+    NEXUS_PATH: MP-SPEC
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  only:
+    - develop
+    - master
+  needs: ["SPEC:build"]
+  script: 
+    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish
+    # qui il deploy su nexus...
+    - *hashBuild
+    - *nexusUpload
+
 LAND:release:
   stage: release
   tags:
@@ -484,8 +656,6 @@ MON:release:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
   only:
-    #- feature/Deploy_CI_CD
-    # - master
     - tags
   except:
     - branches
@@ -495,3 +665,49 @@ MON:release:
       - publish/
   script:
     - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj
+
+# WAMON:release:
+#   stage: release
+#   tags:
+#     - win
+#   variables:
+#     PROJ_PATH: MP.WASM.Mon\Server
+#     APP_NAME: MP.WASM.Mon.Server
+#     SOL_NAME: MP-WAMON
+#     NEXUS_PATH: MP-WAMON
+#   before_script:
+#     - *nuget-fix
+#     - dotnet restore "$env:SOL_NAME.sln"
+#   only:
+#     - tags
+#   except:
+#     - branches
+#   needs: ["WAMON:build"]
+#   artifacts:
+#     paths:
+#       - publish/
+#   script:
+#     - dotnet publish -c Release -o ./publish $env:PROJ_PATH/$env:APP_NAME.csproj
+
+SPEC:release:
+  stage: release
+  tags:
+    - win
+  variables:
+    APP_NAME: MP.SPEC
+    SOL_NAME: MP-SPEC
+    NEXUS_PATH: MP-SPEC
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  only:
+    - tags
+  except:
+    - branches
+  needs: ["SPEC:build"]
+  artifacts:
+    paths:
+      - publish/
+  script:
+    - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj
+

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-SPEC.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32126.317
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.SPEC", "MP.SPEC\MP.SPEC.csproj", "{C777A098-6F91-45AF-A85E-0AD08CBCAC52}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {632D11D1-088B-4795-97E5-048534002558}
+	EndGlobalSection
+EndGlobal

MP-WAMON.sln

@@ -0,0 +1,43 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32126.317
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Mon", "MP.Mon\MP.Mon.csproj", "{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.WASM.Mon.Server", "MP.WASM.Mon\Server\MP.WASM.Mon.Server.csproj", "{4A98B7F4-4EC6-4284-9D6C-63203DB981B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.WASM.Mon.Client", "MP.WASM.Mon\Client\MP.WASM.Mon.Client.csproj", "{9BF7BDE7-016A-458C-8791-494FD4204301}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BF7BDE7-016A-458C-8791-494FD4204301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BF7BDE7-016A-458C-8791-494FD4204301}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BF7BDE7-016A-458C-8791-494FD4204301}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BF7BDE7-016A-458C-8791-494FD4204301}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {632D11D1-088B-4795-97E5-048534002558}
+	EndGlobalSection
+EndGlobal

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,21 @@
+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_MSE_DATA_KEY = $"{BASE_HASH}:Current:MSE";
+        public static readonly string ACT_BLINK_KEY = $"{BASE_HASH}:Current:Blink";
+        
+    }
+}

MP.Data/Controllers/MpMonController.cs

@@ -10,14 +10,6 @@ namespace MP.Data.Controllers
 {
     public class MpMonController : IDisposable
     {
-        #region Private Fields
-
-        private static IConfiguration _configuration;
-
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-
         #region Public Constructors
 
         public MpMonController(IConfiguration configuration)
@@ -36,13 +28,14 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.AnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
+        public List<DatabaseModels.StatsAnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
         {
-            List<DatabaseModels.AnagArticoli> dbResult = new List<DatabaseModels.AnagArticoli>();
+            List<DatabaseModels.StatsAnagArticoli> dbResult = new List<DatabaseModels.StatsAnagArticoli>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 dbResult = dbCtx
-                .DbSetArticoli
+                .DbSetStatArticoli
+                .AsNoTracking()
                 .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal))
                 .OrderBy(x => x.CodArticolo)
                 .Take(numRecord)
@@ -51,6 +44,24 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Elenco da tabella Macchine
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.ConfigModel> ConfigGetAll()
+        {
+            List<DatabaseModels.ConfigModel> dbResult = new List<DatabaseModels.ConfigModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetConfig
+                .AsNoTracking()
+                .OrderBy(x => x.Chiave)
+                .ToList();
+            }
+            return dbResult;
+        }
+
         public void Dispose()
         {
         }
@@ -66,29 +77,13 @@ namespace MP.Data.Controllers
             {
                 dbResult = dbCtx
                 .DbSetMacchine
+                .AsNoTracking()
                 .OrderBy(x => x.IdxMacchina)
                 .ToList();
             }
             return dbResult;
         }
 
-        /// <summary>
-        /// Elenco da tabella Macchine
-        /// </summary>
-        /// <returns></returns>
-        public List<DatabaseModels.ConfigModel> ConfigGetAll()
-        {
-            List<DatabaseModels.ConfigModel> dbResult = new List<DatabaseModels.ConfigModel>();
-            using (var dbCtx = new MoonProContext(_configuration))
-            {
-                dbResult = dbCtx
-                .DbSetConfig
-                .OrderBy(x => x.Chiave)
-                .ToList();
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Elenco da tabella MappaStatoExpl
         /// </summary>
@@ -103,6 +98,7 @@ namespace MP.Data.Controllers
                 dbResult = dbCtx
                     .DbSetMSE
                     .FromSqlRaw("EXEC stp_MSE_getData @maxAgeSec", maxAgeSec)
+                    .AsNoTracking()
                     .ToList();
             }
             return dbResult;
@@ -134,5 +130,13 @@ namespace MP.Data.Controllers
         }
 
         #endregion Public Methods
+
+        #region Private Fields
+
+        private static IConfiguration _configuration;
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
     }
 }

MP.Data/Controllers/MpSpecController.cs

@@ -0,0 +1,618 @@
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MP.Data.Controllers
+{
+    public class MpSpecController : IDisposable
+    {
+        #region Public Constructors
+
+        public MpSpecController(IConfiguration configuration)
+        {
+            _configuration = configuration;
+            Log.Info("Avviata classe MpSpecController");
+        }
+
+        #endregion Public Constructors
+
+        #region Public Methods
+
+        /// <summary>
+        /// Elenco Gruppi tipo Azienda
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.AnagGruppi> AnagGruppiAziende()
+        {
+            return AnagGruppiGetTipo("AZIENDA");
+        }
+
+        /// <summary>
+        /// Elenco Gruppi tipo Fasi
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.AnagGruppi> AnagGruppiFase()
+        {
+            return AnagGruppiGetTipo("FASE");
+        }
+
+        /// <summary>
+        /// Elenco Gruppi
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.AnagGruppi> AnagGruppiGetAll()
+        {
+            List<DatabaseModels.AnagGruppi> dbResult = new List<DatabaseModels.AnagGruppi>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetAnagGruppi
+                .AsNoTracking()
+                .OrderBy(x => x.CodGruppo)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Gruppi x tipo
+        /// </summary>
+        /// <param name="tipoGruppo"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.AnagGruppi> AnagGruppiGetTipo(string tipoGruppo)
+        {
+            List<DatabaseModels.AnagGruppi> dbResult = new List<DatabaseModels.AnagGruppi>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetAnagGruppi
+                .Where(x => x.TipoGruppo == tipoGruppo)
+                .AsNoTracking()
+                .OrderBy(x => x.CodGruppo)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco valori ammessi x Stati commessa (es Yacht Baglietto)
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.ListValues> AnagStatiComm()
+        {
+            return ListValuesFilt("PODL", "StatoComm");
+        }
+
+        /// <summary>
+        /// Elenco valori ammessi x Tipo articoli
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.ListValues> AnagTipoArtLV()
+        {
+            return ListValuesFilt("AnagArticoli", "Tipo");
+        }
+
+        /// <summary>
+        /// Eliminazione Record
+        /// </summary>
+        /// <param name="currRec"></param>
+        /// <returns></returns>
+        public async Task<bool> ArticoliDeleteRecord(DatabaseModels.AnagArticoli currRec)
+        {
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var currVal = dbCtx
+                                    .DbSetArticoli
+                                    .Where(x => x.CodArticolo == currRec.CodArticolo)
+                                    .FirstOrDefault();
+                    dbCtx
+                        .DbSetArticoli
+                        .Remove(currVal);
+                    await dbCtx.SaveChangesAsync();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante ArticoliDeleteRecord{Environment.NewLine}{exc}");
+                }
+            }
+            return fatto;
+        }
+
+        /// <summary>
+        /// Elenco tabella Articoli da filtro
+        /// </summary>
+        /// <param name="numRecord"></param>
+        /// <param name="searchVal"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.AnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
+        {
+            List<DatabaseModels.AnagArticoli> dbResult = new List<DatabaseModels.AnagArticoli>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetArticoli
+                .AsNoTracking()
+                .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal))
+                .OrderBy(x => x.CodArticolo)
+                .Take(numRecord)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco tabella Articoli da filtro
+        /// </summary>
+        /// <param name="numRecord"></param>
+        /// <param name="azienda"></param>
+        /// <param name="searchVal"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.AnagArticoli> ArticoliGetSearch(int numRecord, string azienda = "*", string searchVal = "")
+        {
+            List<DatabaseModels.AnagArticoli> dbResult = new List<DatabaseModels.AnagArticoli>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetArticoli
+                .AsNoTracking()
+                .Where(x => (x.Azienda == azienda || azienda == "*") && (x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)))
+                .OrderBy(x => x.CodArticolo)
+                .Take(numRecord)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco tabella Articoli IMPIEGATI (da stored stp_ART_getUsed)
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.AnagArticoli> ArticoliGetUsed()
+        {
+            List<DatabaseModels.AnagArticoli> dbResult = new List<DatabaseModels.AnagArticoli>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetArticoli
+                    .FromSqlRaw("EXEC stp_ART_getUsed")
+                    .AsNoTracking()
+                    .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Update Record
+        /// </summary>
+        /// <param name="currRec"></param>
+        /// <returns></returns>
+        public async Task<bool> ArticoliUpdateRecord(DatabaseModels.AnagArticoli editRec)
+        {
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var currRec = dbCtx
+                                    .DbSetArticoli
+                                    .Where(x => x.CodArticolo == editRec.CodArticolo)
+                                    .FirstOrDefault();
+                    if (currRec != null)
+                    {
+                        currRec.Disegno = editRec.Disegno;
+                        currRec.DescArticolo = editRec.DescArticolo;
+                        currRec.Tipo = editRec.Tipo;
+                        currRec.Azienda = editRec.Azienda;
+                        dbCtx.Entry(currRec).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        dbCtx
+                            .DbSetArticoli
+                            .Add(editRec);
+                    }
+                    await dbCtx.SaveChangesAsync();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante ArticoliUpdateRecord{Environment.NewLine}{exc}");
+                }
+            }
+            return fatto;
+        }
+
+        /// <summary>
+        /// Elenco da tabella Config
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.ConfigModel> ConfigGetAll()
+        {
+            List<DatabaseModels.ConfigModel> dbResult = new List<DatabaseModels.ConfigModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetConfig
+                .AsNoTracking()
+                .OrderBy(x => x.Chiave)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Update record config
+        /// </summary>
+        /// <returns></returns>
+        public bool ConfigUpdate(DatabaseModels.ConfigModel updRec)
+        {
+            bool fatto = false;
+            DatabaseModels.ConfigModel dbResult = new DatabaseModels.ConfigModel();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetConfig
+                .Where(x => x.Chiave == updRec.Chiave)
+                .FirstOrDefault();
+                if (dbResult != null)
+                {
+                    dbResult.Valore = updRec.Valore;
+                    dbCtx.SaveChanges();
+                    fatto = true;
+                }
+            }
+            return fatto;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        /// <summary>
+        /// Elenco ultimi n record DOssiers (che contengono ad esempio "salvataggi" di FLuxLog) dato
+        /// macchina (ordinato x data registrazione)
+        /// </summary>
+        /// <param name="IdxMacchina">* = tutte, altrimenti solo x una data macchina</param>
+        /// <param name="DtRef">Data di riferimento (Massima) per estrazioen records</param>
+        /// <param name="MaxRec">numero massimo record da restituire</param>
+        /// <returns></returns>
+        public List<DatabaseModels.Dossiers> DossiersGetLastFilt(string IdxMacchina, DateTime DtRef, int MaxRec)
+        {
+            List<DatabaseModels.Dossiers> dbResult = new List<DatabaseModels.Dossiers>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbSetDossiers
+                            .AsNoTracking()
+                            .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && x.DtRif <= DtRef)
+                            .OrderByDescending(x => x.DtRif)
+                            .Take(MaxRec)
+                            .ToList();
+            }
+            return dbResult;
+        }
+
+        public bool DossiersTakeParamsSnapshot(string idxMacchina, int maxSec)
+        {
+            bool answ = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var pIdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
+                var pMaxSec = new SqlParameter("@MaxSec", maxSec);
+
+                var dbResult = dbCtx
+                    .Database
+                    .ExecuteSqlRaw("EXEC stp_FL_TakeSnapshot @IdxMacchina,@MaxSec", pIdxMacchina, pMaxSec);
+                answ = true;
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Elenco valori link (x home e navMenu laterale)
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.LinkMenu> ElencoLink()
+        {
+            return ListLinkFilt("SpecLink");
+        }
+
+        /// <summary>
+        /// Elenco ultimi n record flux log dato macchina e flusso (ordinato x data registrazione)
+        /// </summary>
+        /// <param name="IdxMacchina">* = tutte, altrimenti solo x una data macchina</param>
+        /// <param name="CodFlux">*=tutti, altrimenti solo selezionato</param>
+        /// <param name="MaxRec">numero massimo record da restituire</param>
+        /// <returns></returns>
+        public List<DatabaseModels.FluxLog> FluxLogGetLastFilt(string IdxMacchina, string CodFlux, int MaxRec)
+        {
+            List<DatabaseModels.FluxLog> dbResult = new List<DatabaseModels.FluxLog>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbSetFluxLog
+                            .AsNoTracking()
+                            .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodFlux == "*" || x.CodFlux == CodFlux))
+                            .OrderByDescending(x => x.dtEvento)
+                            .Take(MaxRec)
+                            .ToList();
+            }
+            return dbResult;
+        }
+
+        public List<DatabaseModels.LinkMenu> ListLinkFilt(string tipoLink)
+        {
+            List<DatabaseModels.LinkMenu> dbResult = new List<DatabaseModels.LinkMenu>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetLinkMenu
+                .Where(x => x.TipoLink == tipoLink)
+                .AsNoTracking()
+                .OrderBy(x => x.ordine)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco ODL filtrati x stato, articolo, KeyRich (che contiene stato)
+        /// </summary>
+        /// <param name="inCorso">Stato ODL: true=in corso/completato</param>
+        /// <param name="codArt">Cod articolo</param>
+        /// <param name="keyRichPart">KeyRich (parziale) da cercare (es cod stato x yacht)</param>
+        /// <returns></returns>
+        public List<DatabaseModels.ODLModel> ListODLFilt(bool inCorso, string codArt, string keyRichPart)
+        {
+            List<DatabaseModels.ODLModel> dbResult = new List<DatabaseModels.ODLModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetODL
+                .Where(x => ((inCorso && x.DataFine == null) || (!inCorso && x.DataFine != null)) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
+                .AsNoTracking()
+                .OrderBy(x => x.IdxOdl)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco PODL non avviati filtrati x articolo, KeyRich (che contiene stato)
+        /// </summary>
+        /// <param name="codArt">Cod articolo</param>
+        /// <param name="keyRichPart">KeyRich (parziale) da cercare (es cod stato x yacht)</param>
+        /// <returns></returns>
+        public List<DatabaseModels.PODLModel> ListPODLFilt(string codArt, string keyRichPart)
+        {
+            List<DatabaseModels.PODLModel> dbResult = new List<DatabaseModels.PODLModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetPODL
+                .Where(x => (x.IdxOdl == 0) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
+                .AsNoTracking()
+                .OrderBy(x => x.InsertDate)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco valori ammessi x tabella/colonna
+        /// </summary>
+        /// <param name="tabName"></param>
+        /// <param name="fieldName"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.ListValues> ListValuesFilt(string tabName, string fieldName)
+        {
+            List<DatabaseModels.ListValues> dbResult = new List<DatabaseModels.ListValues>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetListValues
+                .Where(x => x.TableName == tabName && x.FieldName == fieldName)
+                .AsNoTracking()
+                .OrderBy(x => x.ordinal)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco da tabella Macchine
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.Macchine> MacchineGetAll()
+        {
+            List<DatabaseModels.Macchine> dbResult = new List<DatabaseModels.Macchine>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetMacchine
+                .AsNoTracking()
+                .OrderBy(x => x.IdxMacchina)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco id Macchine che abbiano dati FLuxLog
+        /// </summary>
+        /// <returns></returns>
+        public List<string> MacchineWithFlux()
+        {
+            List<string> dbResult = new List<string>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                .DbSetFluxLog
+                .AsNoTracking()
+                .Select(i => i.IdxMacchina)
+                .Distinct()
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco da tabella MappaStatoExpl
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.MappaStatoExpl> MseGetAll(int maxAge = 2000)
+        {
+            List<DatabaseModels.MappaStatoExpl> dbResult = new List<DatabaseModels.MappaStatoExpl>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var maxAgeSec = new SqlParameter("@maxAgeSec", maxAge);
+
+                dbResult = dbCtx
+                    .DbSetMSE
+                    .FromSqlRaw("EXEC stp_MSE_getData @maxAgeSec", maxAgeSec)
+                    .AsNoTracking()
+                    .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco parametri validi x una data macchina
+        /// </summary>
+        /// <param name="IdxMacchina"></param>
+        /// <returns></returns>
+        public List<string> ParametriGetFilt(string IdxMacchina)
+        {
+            List<string> dbResult = new List<string>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbSetFluxLog
+                            .AsNoTracking()
+                            .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina))
+                            .Select(i => i.CodFlux)
+                            .Distinct()
+                            .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Eliminazione Record
+        /// </summary>
+        /// <param name="currRec"></param>
+        /// <returns></returns>
+        public async Task<bool> PODLDeleteRecord(DatabaseModels.PODLModel currRec)
+        {
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var currVal = dbCtx
+                                    .DbSetPODL
+                                    .Where(x => x.IdxPromessa == currRec.IdxPromessa)
+                                    .FirstOrDefault();
+                    dbCtx
+                        .DbSetPODL
+                        .Remove(currVal);
+                    await dbCtx.SaveChangesAsync();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante PODLDeleteRecord{Environment.NewLine}{exc}");
+                }
+            }
+            return fatto;
+        }
+
+        /// <summary>
+        /// Update Record
+        /// </summary>
+        /// <param name="currRec"></param>
+        /// <returns></returns>
+        public async Task<bool> PODLUpdateRecord(DatabaseModels.PODLModel editRec)
+        {
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var currRec = dbCtx
+                                    .DbSetPODL
+                                    .Where(x => x.IdxPromessa == editRec.IdxPromessa)
+                                    .FirstOrDefault();
+                    if (currRec != null)
+                    {
+                        currRec.CodGruppo = editRec.CodGruppo;
+                        currRec.CodArticolo = editRec.CodArticolo;
+                        currRec.IdxMacchina = editRec.IdxMacchina;
+                        currRec.KeyBCode = editRec.KeyBCode;
+                        currRec.KeyRichiesta = editRec.KeyRichiesta;
+                        currRec.NumPezzi = editRec.NumPezzi;
+                        currRec.Tcassegnato = editRec.Tcassegnato;
+                        dbCtx.Entry(currRec).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        dbCtx
+                            .DbSetPODL
+                            .Add(editRec);
+                    }
+                    await dbCtx.SaveChangesAsync();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante PODLUpdateRecord{Environment.NewLine}{exc}");
+                }
+            }
+            return fatto;
+        }
+
+        /// <summary>
+        /// Annulla modifiche su una specifica entity (cancel update)
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public bool RollBackEntity(object item)
+        {
+            bool answ = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified)
+                    {
+                        dbCtx.Entry(item).Reload();
+                    }
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}");
+                }
+            }
+            return answ;
+        }
+
+        #endregion Public Methods
+
+        #region Private Fields
+
+        private static IConfiguration _configuration;
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+    }
+}

MP.Data/Controllers/MpStatsController.cs

@@ -52,9 +52,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.AnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
+        public List<DatabaseModels.StatsAnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
         {
-            List<DatabaseModels.AnagArticoli> dbResult = new List<DatabaseModels.AnagArticoli>();
+            List<DatabaseModels.StatsAnagArticoli> dbResult = new List<DatabaseModels.StatsAnagArticoli>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 dbResult = dbCtx
@@ -73,9 +73,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.ODL> CommesseGetSearch(int numRecord, string searchVal = "")
+        public List<DatabaseModels.StatsODL> CommesseGetSearch(int numRecord, string searchVal = "")
         {
-            List<DatabaseModels.ODL> dbResult = new List<DatabaseModels.ODL>();
+            List<DatabaseModels.StatsODL> dbResult = new List<DatabaseModels.StatsODL>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 dbResult = dbCtx
@@ -223,9 +223,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.ODL> StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        public List<DatabaseModels.StatsODL> StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
         {
-            List<DatabaseModels.ODL> dbResult = new List<DatabaseModels.ODL>();
+            List<DatabaseModels.StatsODL> dbResult = new List<DatabaseModels.StatsODL>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DataStart);

MP.Data/DTO/DossierFluxLogDTO.cs

@@ -0,0 +1,14 @@
+using MP.Data.DatabaseModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.DTO
+{
+    public class DossierFluxLogDTO
+    {
+        public List<FluxLog> ODL { get; set; } = new List<FluxLog>();
+    }
+}

MP.Data/DatabaseModels/AnagArticoli.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 #nullable disable
 
 namespace MP.Data.DatabaseModels
 {
+    [Table("AnagArticoli")]
     public partial class AnagArticoli
     {
         #region Public Properties
@@ -13,6 +15,7 @@ namespace MP.Data.DatabaseModels
         public string DescArticolo { get; set; }
         public string Disegno { get; set; }
         public string Tipo { get; set; }
+        public string Azienda { get; set; }
 
         #endregion Public Properties
     }

MP.Data/DatabaseModels/AnagGruppi.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    [Table("AnagraficaGruppi")]
+    public partial class AnagGruppi
+    {
+        #region Public Properties
+
+        //[Key, DatabaseGenerated(DatabaseGeneratedOption.None), MaxLength(50)]
+        public string CodGruppo { get; set; }
+        
+        //[MaxLength(50)]
+        public string TipoGruppo { get; set; }
+        
+        //[MaxLength(250)]
+        public string DescrGruppo { get; set; }
+
+        public bool SelEnabled { get; set; }
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/Dossiers.cs

@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    [Table("Dossiers")]
+    public partial class Dossiers
+    {
+        #region Public Properties
+
+        [MaxLength(50)]
+        public string IdxMacchina { get; set; }
+
+        public DateTime DtRif { get; set; }
+
+        public int IdxODL { get; set; }
+
+        [MaxLength(50)]
+        public string DataType { get; set; }
+
+        public string Valore { get; set; }
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/FluxLog.cs

@@ -0,0 +1,29 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    [Table("FluxLog")]
+    public partial class FluxLog
+    {
+        #region Public Properties
+
+        [MaxLength(50)]
+        public string IdxMacchina { get; set; }
+
+        public DateTime dtEvento { get; set; }
+
+        [MaxLength(50)]
+        public string CodFlux { get; set; }
+
+        [MaxLength(250)]
+        public string Valore { get; set; }
+
+        public int Cnt { get; set; }
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/LinkMenuJQM.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    [Table("LinkMenuJQM")]
+    public partial class LinkMenu
+    {
+        #region Public Properties
+
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int idxLink { get; set; }
+
+        [MaxLength(50)]
+        public string TipoLink { get; set; } = "";
+
+        public int ordine { get; set; } = 0;
+
+        [MaxLength(50)]
+        public string Testo { get; set; } = "";
+
+        [MaxLength(50)]
+        public string NavigateUrl { get; set; } = "";
+
+        [MaxLength(50)]
+        public string icona { get; set; } = "";
+
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/ListValues.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    [Table("ListValues")]
+    public partial class ListValues
+    {
+        #region Public Properties
+
+        [MaxLength(50)]
+        public string TableName { get; set; }
+
+        [MaxLength(50)]
+        public string FieldName { get; set; }
+
+        [MaxLength(50)]
+        public string value { get; set; }
+
+        [MaxLength(50)]
+        public string label { get; set; }
+
+        public int ordinal { get; set; }
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/ODLModel.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    [Table("ODL")]
+    public partial class ODLModel
+    {
+        #region Public Properties
+
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int IdxOdl { get; set; }
+        [MaxLength(50)]
+        public string CodArticolo { get; set; } = "";
+        [MaxLength(50)]
+        public string IdxMacchina { get; set; }
+        public int NumPezzi { get; set; }
+        public decimal Tcassegnato { get; set; }
+        public DateTime? DataInizio { get; set; }
+        public DateTime? DataFine { get; set; }
+        [MaxLength(2500)]
+        public string Note { get; set; } = "";
+        [MaxLength(50)]
+        public string KeyRichiesta { get; set; }
+        public int PzPallet { get; set; } = 1;
+        [MaxLength(50)]
+        public string CodCli { get; set; } = "";
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/PODLModel.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    [Table("PromesseODL")]
+    public partial class PODLModel
+    {
+        #region Public Properties
+
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int IdxPromessa { get; set; }
+        [MaxLength(50)]
+        public string KeyRichiesta { get; set; }
+        [MaxLength(50)]
+        public string KeyBCode { get; set; }
+        public bool Attivabile { get; set; } = false;
+        public int IdxOdl { get; set; } = 0;
+        [MaxLength(50)]
+        public string CodArticolo { get; set; } = "";
+        [MaxLength(50)]
+        public string CodGruppo { get; set; } = "";
+        [MaxLength(50)]
+        public string IdxMacchina { get; set; }
+        public int NumPezzi { get; set; } = 1;
+        public decimal Tcassegnato { get; set; } = 1;
+        public DateTime? DueDate { get; set; }
+        public int Priorita { get; set; } = 1;
+        public int PzPallet { get; set; } = 1;
+        [MaxLength(2500)]
+        public string Note { get; set; } = "";
+        [MaxLength(50)]
+        public string CodCli { get; set; } = "";
+        public DateTime InsertDate { get; set; } = DateTime.Now;
+
+        [NotMapped]
+        public string CodFase
+        {
+            get
+            {
+                string answ = "*";
+                var allData = KeyRichiesta.Split('_');
+                if (allData.Length > 0)
+                {
+                    answ = allData[0];
+                }
+                return answ;
+            }
+        }
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/StatsAnagArticoli.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    public partial class StatsAnagArticoli
+    {
+        #region Public Properties
+
+        public string CodArticolo { get; set; }
+        public string DescArticolo { get; set; }
+        public string Disegno { get; set; }
+        public string Tipo { get; set; }
+
+        #endregion Public Properties
+    }
+}

MP.Data/DatabaseModels/StatsODL.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace MP.Data.DatabaseModels
 {
-    public partial class ODL
+    public partial class StatsODL
     {
         #region Public Properties
 

MP.Data/MP.Data.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -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.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
             <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.7" />
+        <PackageReference Include="NLog" Version="5.0.1" />
     </ItemGroup>
 </Project>

MP.Data/MessagePipe.cs

@@ -0,0 +1,135 @@
+using NLog;
+using StackExchange.Redis;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data
+{
+    public class MessagePipe
+    {
+        #region Private Fields
+
+        private bool enableLog = false;
+        private IConnectionMultiplexer redis;
+        private IDatabase? redisDb;
+
+        #endregion Private Fields
+
+        #region Protected Fields
+
+        protected static Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Protected Fields
+
+        #region Public Constructors
+
+        public MessagePipe(IConnectionMultiplexer redisConn, string channelName, bool enableLog = false)
+        {
+            _channel = channelName;
+            redis = redisConn;
+            redisDb = redis.GetDatabase();
+            this.enableLog = enableLog;
+            // aggiungo sottoscrittore
+            setupSubscriber();
+        }
+
+        #endregion Public Constructors
+
+        #region Public Events
+
+        public event EventHandler EA_NewMessage = delegate { };
+
+        #endregion Public Events
+
+        #region Private Properties
+
+        /// <summary>
+        /// Canale associato al gestore pipeline messaggi
+        /// </summary>
+        private string _channel { get; set; } = "";
+
+        #endregion Private Properties
+
+        #region Private Methods
+
+        private void setupSubscriber()
+        {
+            ISubscriber sub = redis.GetSubscriber();
+            //Subscribe to the channel named messages
+            sub.Subscribe(_channel, (channel, message) =>
+            {
+                Log.Trace($"ch {channel} | {message}");
+                // messaggio
+                PubSubEventArgs mea = new PubSubEventArgs(message);
+                // se qualcuno ascolta sollevo evento nuovo valore...
+                if (EA_NewMessage != null)
+                {
+                    EA_NewMessage(this, mea);
+                }
+            });
+            Log.Info($"Subscribed {_channel}");
+        }
+
+        #endregion Private Methods
+
+        #region Public Methods
+
+        public bool saveAndSendMessage(string memKey, string message)
+        {
+            bool answ = false;
+            // invio notifica tramite il canale richiesto
+            answ = sendMessage(message);
+            if (redisDb != null)
+            {
+                redisDb.StringSetAsync(memKey, message);
+                if (enableLog)
+                {
+                    Log.Info($"Redis Cache Key: {memKey}");
+                }
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Invio messaggio sul canale
+        /// </summary>
+        /// <param name="newMess"></param>
+        /// <returns></returns>
+        public bool sendMessage(string newMess)
+        {
+            bool answ = false;
+            ISubscriber sub = redis.GetSubscriber();
+            sub.Publish(_channel, newMess);
+            return answ;
+        }
+
+        #endregion Public Methods
+
+        /// <summary>
+        /// Invio messaggio sul canale + salvataggio in cache REDIS
+        /// </summary>
+        /// <param name="memKey">Chiave REDIS x salvare valore</param>
+        /// <param name="message"></param>
+    }
+
+    public class PubSubEventArgs : EventArgs
+    {
+        #region Public Constructors
+
+        public PubSubEventArgs(string messaggio)
+        {
+            this.newMessage = messaggio;
+        }
+
+        #endregion Public Constructors
+
+        #region Public Properties
+
+        public string newMessage { get; set; } = "";
+
+        #endregion Public Properties
+    }
+}

MP.Data/MoonProContext.cs

@@ -34,10 +34,18 @@ namespace MP.Data
 
         #region Public Properties
 
+        public virtual DbSet<StatsAnagArticoli> DbSetStatArticoli { get; set; }
         public virtual DbSet<AnagArticoli> DbSetArticoli { get; set; }
         public virtual DbSet<Macchine> DbSetMacchine { get; set; }
         public virtual DbSet<MappaStatoExpl> DbSetMSE { get; set; }
         public virtual DbSet<ConfigModel> DbSetConfig { get; set; }
+        public virtual DbSet<AnagGruppi> DbSetAnagGruppi { get; set; }
+        public virtual DbSet<ListValues> DbSetListValues { get; set; }
+        public virtual DbSet<LinkMenu> DbSetLinkMenu { get; set; }
+        public virtual DbSet<ODLModel> DbSetODL { get; set; }
+        public virtual DbSet<PODLModel> DbSetPODL { get; set; }
+        public virtual DbSet<FluxLog> DbSetFluxLog { get; set; }
+        public virtual DbSet<Dossiers> DbSetDossiers { get; set; }
 
         #endregion Public Properties
 
@@ -53,7 +61,15 @@ namespace MP.Data
         {
             if (!optionsBuilder.IsConfigured)
             {
-                string connString = _configuration.GetConnectionString("Mp.Mon");
+                string connString = _configuration.GetConnectionString("Mp.Data");
+                if (string.IsNullOrEmpty(connString))
+                {
+                    connString = _configuration.GetConnectionString("Mp.Mon");
+                }
+                if (string.IsNullOrEmpty(connString))
+                {
+                    connString = _configuration.GetConnectionString("Mp.STATS");
+                }
 
                 optionsBuilder.UseSqlServer(connString);
                 //optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;");
@@ -64,9 +80,9 @@ namespace MP.Data
         {
             modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS");
 
-            modelBuilder.Entity<AnagArticoli>(entity =>
+            modelBuilder.Entity<StatsAnagArticoli>(entity =>
             {
-                entity.HasNoKey();
+                entity.HasKey(e => e.CodArticolo);
 
                 entity.ToView("v_UI_AnagArticoli");
 
@@ -86,10 +102,36 @@ namespace MP.Data
                     .IsRequired()
                     .HasMaxLength(50);
             });
+            modelBuilder.Entity<AnagArticoli>(entity =>
+            {
+                entity.HasKey(e => e.CodArticolo);
+
+                entity.ToView("AnagArticoli");
+
+                entity.Property(e => e.CodArticolo)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.DescArticolo)
+                    .IsRequired()
+                    .HasMaxLength(250);
+
+                entity.Property(e => e.Disegno)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.Tipo)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.Azienda)
+                    .IsRequired()
+                    .HasMaxLength(50);
+            });
 
             modelBuilder.Entity<Macchine>(entity =>
             {
-                entity.HasNoKey();
+                entity.HasKey(e => e.IdxMacchina);
 
                 entity.ToView("Macchine");
 
@@ -223,6 +265,41 @@ namespace MP.Data
                     .HasColumnName("valoreStd")
                     .HasComment("Valore di default/riferimento per la variabile");
             });
+            modelBuilder.Entity<AnagGruppi>(entity =>
+            {
+                entity.HasKey(e => e.CodGruppo);
+
+                entity.Property(e => e.CodGruppo)
+                    .HasMaxLength(50)
+                    .HasColumnName("CodGruppo");
+
+                entity.Property(e => e.TipoGruppo)
+                    .HasMaxLength(50)
+                    .HasColumnName("TipoGruppo");
+
+                entity.Property(e => e.DescrGruppo)
+                    .HasMaxLength(250)
+                    .HasColumnName("DescrGruppo");
+
+                entity.Property(e => e.SelEnabled)
+                    .HasColumnName("SelEnabled");
+
+            });
+            modelBuilder.Entity<ListValues>(entity =>
+            {
+                entity.HasKey(e => new { e.TableName, e.FieldName, e.value });
+
+            });
+            modelBuilder.Entity<FluxLog>(entity =>
+            {
+                entity.HasKey(e => new { e.IdxMacchina, e.dtEvento, e.CodFlux });
+
+            });
+            modelBuilder.Entity<Dossiers>(entity =>
+            {
+                entity.HasKey(e => new { e.IdxMacchina, e.DtRif });
+
+            });
 
             OnModelCreatingPartial(modelBuilder);
         }

MP.Data/MoonPro_STATSContext.cs

@@ -34,12 +34,12 @@ namespace MP.Data
 
         #region Public Properties
 
-        public virtual DbSet<AnagArticoli> DbSetArticoli { get; set; }
+        public virtual DbSet<StatsAnagArticoli> DbSetArticoli { get; set; }
         public virtual DbSet<AzioniUL> DbSetAzioniUL { get; set; }
         public virtual DbSet<ResControlli> DbSetControlli { get; set; }
         public virtual DbSet<DdbTurni> DbSetDdbTurni { get; set; }
         public virtual DbSet<Macchine> DbSetMacchine { get; set; }
-        public virtual DbSet<ODL> DbSetODL { get; set; }
+        public virtual DbSet<StatsODL> DbSetODL { get; set; }
         public virtual DbSet<ResScarti> DbSetScarti { get; set; }
         public virtual DbSet<TurniOee> DbSetTurniOee { get; set; }
         public virtual DbSet<UserActionLog> DbSetUserLog { get; set; }
@@ -98,7 +98,7 @@ namespace MP.Data
                     .HasMaxLength(5);
             });
 
-            modelBuilder.Entity<AnagArticoli>(entity =>
+            modelBuilder.Entity<StatsAnagArticoli>(entity =>
             {
                 entity.HasNoKey();
 
@@ -325,7 +325,7 @@ namespace MP.Data
                     .HasMaxLength(250);
             });
 
-            modelBuilder.Entity<ODL>(entity =>
+            modelBuilder.Entity<StatsODL>(entity =>
             {
                 entity.HasKey(e => e.IdxOdl)
                     .HasName("PK_ODL_1");

MP.Data/Utils.cs

@@ -39,6 +39,30 @@ namespace MP.Data
             await Task.Run(() => File.WriteAllLines(path, lines.ToArray()));
         }
 
+        public static string redKeyArtUsed
+        {
+            get => RedHash($"CACHE:CheckArtUsed");
+        }
+        public static string redKeyTabCheckArt
+        {
+            get => RedHash($"CACHE:TabCheckArt");
+        }
+
+        /// <summary>
+        /// Nome della variabile HASH da utilizzare (dato CodModulo / Server / DB impiegato da funzionalita' DbConfig) + keyName richiesto...
+        /// </summary>
+        public static string RedHash(string keyName)
+        {
+            string answ = keyName;
+            try
+            {
+                answ =$"MP:Data:{keyName}";
+            }
+            catch
+            { }
+            return answ;
+        }
+
         #endregion Public Methods
     }
 }

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/HomeLink.razor

@@ -118,7 +118,7 @@ else // disegno box non cliccabile e licenza mancante
 
     protected string fullUrl(string relUrl)
     {
-        return $"{Configuration["BaseUrl"]}{relUrl}";
+        return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
     }
 
     protected MarkupString traduci(string lemma)

MP.Land/Components/SingleDownload.razor.cs

@@ -81,12 +81,12 @@ namespace MP.Land.Components
 
         protected string fullUrl(string relUrl)
         {
-            return $"{Configuration["BaseUrl"]}{relUrl}";
+            return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
         }
 
         protected string localPath(string localRepo)
         {
-            return @$"{Configuration["downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
+            return @$"{Configuration["ServerConf:downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
         }
 
         protected override void OnInitialized()

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/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.2612</Version>
+        <Version>6.15.2209.1212</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

@@ -64,7 +64,7 @@
                                     <b>@Applicazione</b>
                                 </div>
                             </div>
-                            <div class="d-flex justify-content-between">
+                            <div class="d-flex justify-content-between @licenseCss">
                                 <div class="px-2">
                                     <i class="fa fa-users" aria-hidden="true"></i> Licenze:
                                 </div>
@@ -80,7 +80,7 @@
                                     <b>@($"{Scadenza:yyyy/MM/dd}")</b>
                                 </div>
                             </div>
-                            <div class="d-flex justify-content-between">
+                            <div class="d-flex justify-content-between @licenseCss">
                                 <div class="px-2">
                                     <i class="fa fa-key" aria-hidden="true"></i> Key
                                 </div>

MP.Land/Pages/About.razor.cs

@@ -14,24 +14,27 @@ using Microsoft.JSInterop;
 using MP.Land;
 using MP.Land.Shared;
 using MP.Land.Data;
+using NLog;
 
 namespace MP.Land.Pages
 {
     public partial class About
     {
-        protected string Titolo = "";
-        protected string Messaggio = "";
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private string Titolo = "";
+        private string Messaggio = "";
 
-        protected string ServerStatus = "SrvState";
-        protected string Installazione = "Inst";
-        protected string Applicazione = "App";
-        protected string Licenze = "#";
-        protected DateTime Scadenza = DateTime.Today;
-        protected string MastKey = "########################";
+        private string ServerStatus = "SrvState";
+        private string Installazione = "Inst";
+        private string Applicazione = "App";
+        private string Licenze = "#";
+        private DateTime Scadenza = DateTime.Today;
+        private string MastKey = "########################";
 
-        protected string mainCss = "alert alert-info";
-        protected string remSrvCss = "bg-danger text-warning";
-        protected string expDateCss = "bg-danger text-warning";
+        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()
         {
@@ -45,24 +48,33 @@ namespace MP.Land.Pages
             int cDelay = 5;
             // recupero dati
             await Task.Delay(cDelay);
-            LicServ.InitAkv();
-            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}";
-            // verifico stati
-            ServerStatus = await LicServ.checkLimanServer();
+            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 ? "d-flex justify-content-between" : "d-flex justify-content-between bg-danger text-warning";
-            remSrvCss = okRemoteSrv ? "d-flex justify-content-between" : "d-flex justify-content-between bg-danger text-warning";
+            expDateCss = okScadenza ? "" : "bg-danger text-warning";
+            remSrvCss = okRemoteSrv ? "" : "bg-danger text-warning";
             await Task.Delay(cDelay);
         }
 

MP.Land/Pages/UpdateManager.razor.cs

@@ -121,7 +121,7 @@ namespace MP.Land.Pages
 
         protected string localPath(string localRepo)
         {
-            return @$"{Configuration["downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
+            return @$"{Configuration["ServerConf:downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
         }
 
         protected override void OnInitialized()

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,6 +27,74 @@ namespace MP.Land.Pages
 
         #endregion Protected Fields
 
+        #region Protected Properties
+
+        [Inject]
+        protected MessageService AppMService { get; set; }
+
+        protected string BaseUrlTab
+        {
+            get => $"{Configuration["ServerConf:BaseUrl"]}{Configuration["QrJumpPath"]}";
+        }
+
+        [Inject]
+        protected AppAuthService DataService { get; set; }
+
+        protected string Environment
+        {
+            get => Configuration["Environment"];
+        }
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            AppMService.ShowSearch = true;
+            AppMService.PageName = "User Card";
+            AppMService.PageIcon = "fas fa-qrcode pr-2";
+            await ReloadData();
+            AppMService.EA_SearchUpdated += OnSeachUpdated;
+            AppMService.EA_FilterUpdated += OnFilterUpdated;
+        }
+
+        protected async Task PagerReloadNum(int newNum)
+        {
+            ListRecords = null;
+            numRecord = newNum;
+            await ReloadData();
+            isLoading = false;
+        }
+
+        protected async Task PagerReloadPage(int newNum)
+        {
+            ListRecords = null;
+            currPage = newNum;
+            await ReloadData();
+            isLoading = false;
+        }
+
+        protected MarkupString traduci(string lemma)
+        {
+            MarkupString answ;
+            //string rawHtml = "<li>primo</li><li>secondo</li>";
+            string rawHtml = DataService.Traduci(lemma, "IT");
+            answ = new MarkupString(rawHtml);
+            // cerco nella cache Redis
+            return answ;
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private List<AnagraficaOperatori> ListRecords;
+
+        private List<AnagraficaOperatori> SearchRecords;
+
+        #endregion Private Fields
+
         #region Private Properties
 
         [Inject]
@@ -42,6 +112,14 @@ namespace MP.Land.Pages
             }
         }
 
+        private string groupName
+        {
+            get
+            {
+                return AppMService.CodGruppo;
+            }
+        }
+
         private bool isLoading { get; set; } = false;
 
         private int numRecord
@@ -58,28 +136,16 @@ namespace MP.Land.Pages
 
         #endregion Private Properties
 
-        #region Protected Properties
-
-        [Inject]
-        protected MessageService AppMService { get; set; }
-
-        protected string BaseUrlTab
-        {
-            get => $"{Configuration["BaseUrl"]}{Configuration["QrJumpPath"]}";
-        }
-
-        [Inject]
-        protected AppAuthService DataService { get; set; }
-
-        protected string Environment
-        {
-            get => Configuration["Environment"];
-        }
-
-        #endregion Protected Properties
-
         #region Private Methods
 
+        private async void OnFilterUpdated()
+        {
+            ListRecords = null;
+            currPage = 1;
+            await Task.Delay(1);
+            await ReloadData();
+        }
+
         private async void OnSeachUpdated()
         {
             ListRecords = null;
@@ -88,41 +154,21 @@ namespace MP.Land.Pages
             await ReloadData();
         }
 
-        #endregion Private Methods
-
-        #region Protected Methods
-
-        protected override async Task OnInitializedAsync()
-        {
-            AppMService.ShowSearch = true;
-            AppMService.PageName = "User Card";
-            AppMService.PageIcon = "fas fa-qrcode pr-2";
-            await ReloadData();
-            AppMService.EA_SearchUpdated += OnSeachUpdated;
-        }
-
-        protected async Task PagerReloadNum(int newNum)
-        {
-            ListRecords = null;
-            numRecord = newNum;
-            await ReloadData();
-            isLoading = false;
-        }
-
-        protected async Task PagerReloadPage(int newNum)
-        {
-            ListRecords = null;
-            currPage = newNum;
-            await ReloadData();
-            isLoading = false;
-        }
-
-        protected async Task ReloadData()
+        private async Task ReloadData()
         {
             isLoading = true;
             // importante altrimenti NON mostra update UI
             await Task.Delay(1);
-            SearchRecords = await DataService.AnagOperList(AppMService.SearchVal);
+            // 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);
@@ -130,25 +176,6 @@ namespace MP.Land.Pages
             StateHasChanged();
         }
 
-        protected MarkupString traduci(string lemma)
-        {
-            MarkupString answ;
-            //string rawHtml = "<li>primo</li><li>secondo</li>";
-            string rawHtml = DataService.Traduci(lemma, "IT");
-            answ = new MarkupString(rawHtml);
-            // cerco nella cache Redis
-            return answ;
-        }
-
-        #endregion Protected Methods
-
-        #region Public Methods
-
-        public void Dispose()
-        {
-            AppMService.EA_SearchUpdated -= OnSeachUpdated;
-        }
-
-        #endregion Public Methods
+        #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.2612</h4>
+    <h4>Versione: 6.15.2209.1212</h4>
     <br />
     Note di rilascio:
     <ul>

MP.Land/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2204.2612
+6.15.2209.1212

MP.Land/Resources/manifest.xml

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

@@ -1,21 +1,23 @@
 {
-    "DetailedErrors": true,
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "Environment": "Steam PROD",
-    "BaseUrl": "https://iis02.egalware.com/",
-    "AllowedHosts": "*",
-    "QrJumpPath": "MP/TAB/jumper?",
-    "downloadPath": "C:\\Steamware\\installers\\MP",
-    "appVers": "stable",
-    "ConnectionStrings": {
-        "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
-        "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
-        "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "Environment": "Steam PROD",
+  "AllowedHosts": "*",
+  "QrJumpPath": "MP/TAB/jumper?",
+  "appVers": "stable",
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
+    "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
+  },
+  "ServerConf": {
+    "BaseUrl": "https://iis02.egalware.com/",
+    "downloadPath": "C:\\Steamware\\installers\\MP"
+  }
 }

MP.Land/appsettings.Staging.json

@@ -8,5 +8,8 @@
     }
   },
   "Environment": "Steam DEV",
-  "BaseUrl": "https://iis01.egalware.com/"
+  "ServerConf": {
+    "BaseUrl": "https://iis01.egalware.com/",
+    "downloadPath": "C:\\Steamware\\installers\\MP"
+  }
 }

MP.Land/appsettings.json

@@ -7,19 +7,21 @@
     }
   },
   "AllowedHosts": "*",
-  "BaseUrl": "https://localhost:44309/",
   "QrJumpPath": "MP/TAB/jumper?",
   "Environment": "Steam DEV",
-  "downloadPath": "C:\\Steamware\\installers\\MP",
   "appVers": "stable",
   "ConnectionStrings": {
     "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
     "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
     "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
+  },
+  "ServerConf": {
+    "BaseUrl": "https://localhost:44309/",
+    "downloadPath": "C:\\Steamware\\installers\\MP"
   }
   //"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/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,58 @@
+using NLog;
+
+namespace MP.Mon.Components
+{
+    public partial class CmpFooter
+    {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            //aTimer.Elapsed -= ElapsedTimer;
+            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();
+            //Log.Trace($"Elapsed Timer Footer");
+        }
+
+        public void StartTimer()
+        {
+            int tOutPeriod = 5000;
+            //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 void OnInitialized()
+        {
+            var currAssembly = typeof(Program).Assembly.GetName();
+            version = currAssembly.Version != null ? currAssembly.Version : new Version();
+            StartTimer();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private static System.Timers.Timer aTimer = null!;
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private Version version = null!;
+
+        #endregion Private Fields
+    }
+}

MP.Mon/Components/CmpHeader.razor

@@ -1,12 +1,12 @@
 <div class="px-2">
-    <img class="logoImg img-fluid" src="images/LogoMapo.png" width="80" />
-    <span class="mainHead p-3"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
+    <img class="logoImg img-fluid" src="images/LogoMapo.png" height="24" />
+    <span class="mainHead p-3 align-middle"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
 </div>
 <div class="px-2">
     <span id="text-white text-right">
         @($"{DateTime.Now:dddd dd MMMM yyyy}")
     </span>
-    <img class="logoImg img-fluid" src="images/logoCliente.png" width="32" />
+    <img class="logoImg img-fluid" src="images/logoCliente.png" height="24" />
     EgalWare
 </div>
 

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

@@ -1,64 +1,208 @@
-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 NLog;
 
 namespace MP.Mon.Components
 {
     public partial class DetailMSE
     {
+        #region Public Properties
 
-        protected string baseCss = "sem";
-        protected bool dataLoaded { get; set; } = false;
-        protected int kaFactor = 60 / 2;
+        [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 string showArt { get; set; } = "";
+        public bool doBlink { get; set; } = false;
 
         [Parameter]
         public int keepAliveMin { get; set; } = 5;
-        [Parameter]
-        public MappaStatoExpl? CurrRecord { get; set; } = null;
 
-        private string cssStatus(string codSemaforo)
+        [Parameter]
+        public string showArt { get; set; } = "";
+
+        #endregion Public Properties
+
+        #region Public Methods
+
+        public void Dispose()
         {
-            // se vuoto --> mostra nero!
-            if (string.IsNullOrEmpty(codSemaforo))
+            aTimer.Elapsed -= ElapsedTimer;
+            aTimer.Stop();
+            aTimer.Dispose();
+        }
+
+        public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            var pUpd = Task.Run(async () =>
             {
-                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)
+                await Task.Delay(1);
+                // verifica variazione x blink...
+                bool needUpdate = false;
+                if (CurrRecord == null)
                 {
-                    answ += "_b";
+                    needUpdate = true;
+                }
+                else
+                {
+                    if (OldRecord == null)
+                    {
+                        needUpdate = true;
+                    }
+                    else
+                    {
+                        if (!CurrRecord.Semaforo.Equals(OldRecord.Semaforo) || CurrRecord.Semaforo != "sVe")
+                        {
+                            needUpdate = true;
+                        }
+                    }
+                }
+                if (needUpdate)
+                {
+                    await InvokeAsync(() => StateHasChanged());
+                }
+                OldRecord = CurrRecord;
+            });
+            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 Fields
+
+        protected string baseCss = "sem";
+
+        protected int kaFactor = 60 / 2;
+
+        #endregion Protected Fields
+
+        #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 Protected Methods
+
+        /// <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;
+        }
+
+        /// <summary>
+        /// Verifica se ci sia un override per la riga indicata
+        /// </summary>
+        /// <param name="numRow"></param>
+        /// <returns></returns>
+        protected bool hasRow(int numRow)
+        {
+            bool answ = false;
+            if (currTagConf != null)
+            {
+                if (currTagConf.Count > 0)
+                {
+                    var currVals = rowValues(numRow);
+                    answ = currVals.Count > 0;
                 }
             }
             return answ;
         }
 
+        protected override async Task OnInitializedAsync()
+        {
+            //StartTimer();
+            Random rnd = new Random();
+            await Task.Delay(rnd.Next(5));
+            setupConf();
+            dataLoaded = true;
+        }
+
+        /// <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;
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        private static System.Timers.Timer aTimer { get; set; } = null!;
+
+        /// <summary>
+        /// Valore precedente x calcolo variazione
+        /// </summary>
+        private MappaStatoExpl? OldRecord { get; set; } = null;
+
+        #endregion Private Properties
+
+        #region Private Methods
+
         private string cssComStatus(string semaforo, DateTime? lastUpdateN)
         {
             DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
@@ -77,18 +221,63 @@ 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")
+            {
+                if (doBlink)
+                {
+                    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);
+                if (tSpan.TotalHours < 1)
+                {
+                    answ = $"{tSpan:mm}:{tSpan:ss}";
+                }
+                else
+                {
+                    answ = $"{tSpan.TotalHours:N0}h {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);
@@ -100,45 +289,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/Components/LoadingData.razor

@@ -1,6 +1,10 @@
-<div class="row p-5 m-5 bg-light">
-    <div class="col-12 text-center mt-5 py-5 alert alert-primary">
+<div class="row p-5 m-5 alert alert-primary">
+    <div class="col-6 text-center mt-4 py-3 bg-light">
+        <h1>MAPO MON</h1>
+        EgalWare MES suite <img class="logoImg img-fluid" src="images/logoCliente.png" />
+    </div>
+    <div class="col-6 text-center mt-4 py-3  bg-light">
         <h3>loading data</h3>
-        <i class="fas fa-spinner fa-spin fa-5x"></i>
+        <i class="fas fa-spinner fa-spin fa-4x"></i>
     </div>
 </div>

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,30 @@
-using MP.Data.DatabaseModels;
+using MP.Data;
+using MP.Data.Conf;
+using MP.Data.DatabaseModels;
+using Newtonsoft.Json;
+using NLog;
+using StackExchange.Redis;
+using System.Diagnostics;
 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;
-
-        #endregion Public Fields
-
         #region Public Constructors
 
         public MpDataService(IConfiguration configuration, ILogger<MpDataService> logger)
         {
             _logger = logger;
             _configuration = configuration;
+
+            // setup compoenti REDIS
+            redisConn = ConnectionMultiplexer.Connect(_configuration.GetConnectionString("Redis"));
+            redisDb = redisConn.GetDatabase();
+            // setup canali pub/sub
+            dataPipe = new MessagePipe(redisConn, Constants.ACT_MSE_DATA_KEY);
+            blinkPipe = new MessagePipe(redisConn, Constants.ACT_BLINK_KEY);
+
             // conf DB
             string connStr = _configuration.GetConnectionString("Mp.Mon");
             if (string.IsNullOrEmpty(connStr))
@@ -35,13 +36,33 @@ namespace MP.Mon.Data
                 dbController = new MP.Data.Controllers.MpMonController(configuration);
                 StringBuilder sb = new StringBuilder();
                 sb.AppendLine($"DbController OK");
-                //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();
+
+            // avvio timers...
+            startTimers();
         }
 
         #endregion Public Constructors
 
+        #region Public Properties
+
+        public static MP.Data.Controllers.MpMonController dbController { get; set; } = null!;
+
+        public MessagePipe blinkPipe { get; set; } = null!;
+
+        /// <summary>
+        /// Dizionario dei tag configurati per IOB
+        /// </summary>
+        public Dictionary<string, List<TagData>> currTagConf { get; set; } = new Dictionary<string, List<TagData>>();
+
+        public MessagePipe dataPipe { get; set; } = null!;
+
+        #endregion Public Properties
+
         #region Public Methods
 
         public Task<List<ConfigModel>> ConfigGetAll()
@@ -55,21 +76,234 @@ namespace MP.Mon.Data
             dbController.Dispose();
         }
 
-        public Task<List<Macchine>> MacchineGetAll()
+        /// <summary>
+        /// Richiesta attivazione --&gt; sposto avanti 1 minuto il periodo limite x fast running
+        /// </summary>
+        public void doActivate()
         {
-            return Task.FromResult(dbController.MacchineGetAll().ToList());
+            fastLimit = DateTime.Now.AddMinutes(1);
         }
 
-        public Task<List<MappaStatoExpl>> MseGetAll()
+        /// <summary>
+        /// Elenco setup dei tag conf correnti
+        /// </summary>
+        /// <returns></returns>
+        public Task<Dictionary<string, List<TagData>>> getAllTags()
         {
-            var dbResult = dbController.MseGetAll();
-            if (dbResult == null)
+            return Task.FromResult(currTagConf);
+        }
+
+        /// <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))
             {
-                dbResult = new List<MappaStatoExpl>();
+                outVal = $"{rawData}";
             }
-            return Task.FromResult(dbResult);
+            return outVal;
+        }
+
+        public Task<List<Macchine>> MacchineGetAll()
+        {
+            return Task.FromResult(dbController.MacchineGetAll());
+        }
+
+        public async Task<List<MappaStatoExpl>> MseGetAll()
+        {
+            int maxAge = 2000;
+            int.TryParse(_configuration.GetValue<string>("ServerConf:maxAge"), out maxAge);
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
+            // cerco in redis...
+            RedisValue rawData = await redisDb.StringGetAsync(redisMseKey);
+            if (!string.IsNullOrEmpty($"{rawData}"))
+            {
+                result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>($"{rawData}");
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"Read from REDIS: {ts.TotalMilliseconds}ms");
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.MseGetAll(maxAge));
+                // serializzp e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(redisMseKey, rawData, TimeSpan.FromMilliseconds(maxAge));
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"Read from DB: {ts.TotalMilliseconds}ms");
+            }
+            if (result == null)
+            {
+                result = new List<MappaStatoExpl>();
+            }
+            return result;
         }
 
         #endregion Public Methods
+
+        #region Private Fields
+
+        private static IConfiguration _configuration = null!;
+
+        private static ILogger<MpDataService> _logger = null!;
+
+        private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Limite in formato data-ora per inviare dati rapidamente (incrementato come now + 1 min
+        /// ad ogni chiamata client)
+        /// </summary>
+        private DateTime fastLimit = DateTime.Now;
+
+        private int fastRefreshMs = 1000;
+
+        /// <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!;
+
+        private string redisMseKey = "MP:MON:Cache:MSE";
+
+        #endregion Private Fields
+
+        #region Private Methods
+
+        private void ElapsedFastTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            var pUpd = Task.Run(async () =>
+            {
+                // secondi pari --> blink, secondi dispari --> ricarica
+                DateTime adesso = DateTime.Now;
+                int resto = 0;
+                Math.DivRem(adesso.Second, 2, out resto);
+                if (resto == 0)
+                {
+                    // invio in channel blink il segnale
+                    blinkPipe.sendMessage("true");
+                    Log.Debug("Elapsed Fast Timer Blink");
+                }
+                else
+                {
+                    // invio in channel blink segnale false
+                    blinkPipe.sendMessage("false");
+                    // rileggo dati...
+                    var newData = await MseGetAll();
+                    // invio tramite la pipe...
+                    dataPipe.sendMessage(JsonConvert.SerializeObject(newData));
+                    Log.Debug("Elapsed Fast Timer reload");
+                }
+            });
+            pUpd.Wait();
+        }
+
+        private void startTimers()
+        {
+            fastTimer = new System.Timers.Timer(fastRefreshMs);
+            fastTimer.Elapsed += ElapsedFastTimer;
+            fastTimer.Enabled = true;
+            fastTimer.Start();
+        }
+
+        /// <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.2205.219</Version>
+    <Version>6.15.2209.1411</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,14 +30,20 @@
 
   <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>

MP.Mon/NLog.config

@@ -29,7 +29,7 @@
             layout="${longdate} ${uppercase:${level}} ${message}" />
     -->
         <target xsi:type="File" name="fileTarget" fileName="${basedir}/logs/${shortdate}.log" layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=false} | ${message}" />
-        <target xsi:type="ColoredConsole" name="consoleTarget"  layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=true}| ${message}" />
+        <target xsi:type="ColoredConsole" name="consoleTarget"  layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=true} | ${message}" />
     </targets>
 
     <rules>
@@ -39,7 +39,7 @@
     Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
     <logger name="*" minlevel="Debug" writeTo="f" />
     -->
-        <logger name="*" minlevel="Trace" writeTo="consoleTarget" />
+        <logger name="*" minlevel="Debug" writeTo="consoleTarget" />
         <!--<logger name="Microsoft.*" maxlevel="Info" final="true" />-->
         <logger name="*" minlevel="Info" writeTo="fileTarget" />
     </rules>

MP.Mon/Pages/Index.razor

@@ -2,18 +2,16 @@
 
 
 
-<PageTitle>Index</PageTitle>
-
-
+<PageTitle>MP MON</PageTitle>
 
 <div class="row statusMap mx-1 my-1">
-    @if (ListMSE == null)
+    @if (listMSE == null)
     {
         <div class="col-12">
             <LoadingData></LoadingData>
         </div>
     }
-    else if (ListMSE.Count == 0)
+    else if (listMSE.Count == 0)
     {
         <div class="col-12">
             <div class="alert alert-warning">
@@ -24,23 +22,21 @@
     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" doBlink="@doBlink"></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...
         int currNum = (currIdx % maxCol);
         while (currNum < (maxCol))
         {
-            @((MarkupString)"<div class=\"col machBlock\">&nbsp;</div>")
-            ;
+            @((MarkupString)"<div class=\"col machBlock\">&nbsp;</div>");
             currNum++;
 
         }

MP.Mon/Pages/Index.razor.cs

@@ -1,62 +1,57 @@
-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;
+using MP.Data.Conf;
 using MP.Data.DatabaseModels;
-using MP.Mon.Components;
 using MP.Mon.Data;
+using Newtonsoft.Json;
 using NLog;
 
 namespace MP.Mon.Pages
 {
     public partial class Index : IDisposable
     {
-        protected List<MappaStatoExpl>? ListMSE = null;
-        List<ConfigModel>? CurrConfig = null;
+        #region Public Methods
 
+        public void Dispose()
+        {
+            disposeTimers();
+        }
 
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            listMSE = null;
+            await Task.Delay(10);
+            Log.Info("Elapsed Slow Timer --> full page reload");
+            // dispongo i vari timers...
+            disposeTimers();
+            await Task.Delay(10);
+            // reload pagina
+            NavManager.NavigateTo(NavManager.Uri);
+        }
 
-        protected int keepAliveMin = 1;
+        public void StartTimer()
+        {
+            // timer lento
+            slowTimer = new System.Timers.Timer(slowRefreshMs);
+            slowTimer.Elapsed += ElapsedSlowTimer;
+            slowTimer.Enabled = true;
+            slowTimer.Start();
+        }
 
-        protected int maxCol = 4;
+        #endregion Public Methods
+
+        #region Protected Fields
 
         protected bool doAnimate = true;
-
+        protected int fastRefreshMs = 1000;
+        protected int keepAliveMin = 1;
+        protected int maxCol = 6;
         protected string showArt = "";
-
         protected int slowRefreshSec = 300;
-        protected int fastRefreshSec = 10;
 
+        #endregion Protected Fields
 
-        protected int slowRefreshMs
-        {
-            get => 1000 * slowRefreshSec;
-        }
-        protected int fastRefreshMs
-        {
-            get => 1000 * fastRefreshSec;
-        }
-
-        protected override async Task OnInitializedAsync()
-        {
-            await setupConf();
-            await ReloadData();
-            StartTimer();
-        }
-
+        #region Protected Properties
 
         [Inject]
         protected MpDataService MMDataService { get; set; } = null!;
@@ -64,24 +59,40 @@ namespace MP.Mon.Pages
         [Inject]
         protected NavigationManager NavManager { get; set; } = null!;
 
-        private async Task setupConf()
+        protected int slowRefreshMs
         {
-            CurrConfig = await MMDataService.ConfigGetAll();
+            get
+            {
+                // tempo variabile tra +/- 10% del target
+                int answ = rnd.Next(900, 1100) * slowRefreshSec;
+                return answ;
+            }
+        }
+
+        #endregion Protected Properties
+
+        #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 +117,164 @@ 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;
         }
 
-        private async Task ReloadData()
+        /// <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)
         {
-            ListMSE = await MMDataService.MseGetAll();
+            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;
         }
 
-        public void Dispose()
+        protected override async Task OnInitializedAsync()
         {
-            fastTimer.Stop();
-            fastTimer.Dispose();
+            await setupConf();
+            MMDataService.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage;
+            MMDataService.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage;
+            Random rnd = new Random();
+            await Task.Delay(rnd.Next(1000, 1200));
+            StartTimer();
+        }
+
+
+        #endregion Protected Methods
+
+        #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;
+        private bool doBlink = false;
+        private List<MappaStatoExpl>? listMSE = null;
+        private Random rnd = new Random();
+
+        #endregion Private Fields
+
+        #region Private Methods
+
+        private void BlinkPipe_EA_NewMessage(object? sender, EventArgs e)
+        {
+            PubSubEventArgs currArgs = (PubSubEventArgs)e;
+            // conversione on-the-fly List<string> --> allarmi
+            if (!string.IsNullOrEmpty(currArgs.newMessage))
+            {
+                try
+                {
+                    var dataRaw = JsonConvert.DeserializeObject<string>(currArgs.newMessage);
+                    if (dataRaw != null)
+                    {
+                        bool.TryParse($"{dataRaw}", out doBlink);
+                    }
+                }
+                catch
+                { }
+                InvokeAsync(() =>
+                    {
+                        StateHasChanged();
+                    });
+            }
+        }
+
+        /// <summary>
+        /// Ricevuto nuovi dati da mostrare!
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void DataPipe_EA_NewMessage(object? sender, EventArgs e)
+        {
+            PubSubEventArgs currArgs = (PubSubEventArgs)e;
+            // conversione on-the-fly List<string> --> allarmi
+            if (!string.IsNullOrEmpty(currArgs.newMessage))
+            {
+                try
+                {
+                    var dataList = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(currArgs.newMessage);
+                    if (dataList != null)
+                    {
+#if DEBUG
+                        // hack: legge 4 volte i dati x stressare sistema
+                        var singleData = dataList;
+                        listMSE = new List<MappaStatoExpl>();
+                        for (int i = 0; i < 4; i++)
+                        {
+                            listMSE.AddRange(singleData);
+                        }
+#else
+                listMSE = dataList;
+#endif
+                    }
+                }
+                catch
+                { }
+            }
+            InvokeAsync(() =>
+            {
+#if false
+                // attesa random 0-50ms...
+                Random rnd = new Random();
+                Task.Delay(rnd.Next(5, 50)); 
+#endif
+                StateHasChanged();
+            });
+        }
+
+        private void disposeTimers()
+        {
+            slowTimer.Elapsed -= ElapsedSlowTimer;
             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()
+        private async Task setupConf()
         {
-            // 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);
+                getConfVal("sART", ref showArt);
+
+                Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshMs: {fastRefreshMs}");
+            }
         }
 
-        public async void ElapsedSlowTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            ListMSE = null;
-            NavManager.NavigateTo(NavManager.Uri);
-        }
+        #endregion Private Methods
     }
 }

MP.Mon/Pages/_Host.cshtml

@@ -5,4 +5,4 @@
     Layout = "_Layout";
 }
 
-<component type="typeof(App)" render-mode="ServerPrerendered" />
+<component type="typeof(App)" render-mode="Server" />

MP.Mon/Pages/_Layout.cshtml

@@ -7,6 +7,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="google" content="notranslate">
     <base href="~/" />
     <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
     <link rel="stylesheet" href="css/site.css" />
@@ -28,17 +29,28 @@
         <a class="dismiss">🗙</a>
     </div>
 
-        @* Riconnessione server app: https://www.syncfusion.com/faq/how-do-i-reconnect-blazor-server-side-automatically *@
+    <script src="_framework/blazor.server.js" autostart="false"></script>
+    @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
     <script>
-        Blazor.defaultReconnectionHandler._reconnectCallback = function (d) {
-            document.location.reload();
-        }
+        Blazor.start({
+            reconnectionOptions: {
+                maxRetries: 300,
+                retryIntervalMilliseconds: 2000
+            }
+        }).then(() => {
+                Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
+                    get() {
+                        return this.__reconnectionDisplay;
+                    },
+                    set(value) {
+                        this.__reconnectionDisplay = {
+                            show: () => value.show(),
+                            update: (d) => value.update(d),
+                            rejected: (d) => document.location.reload()
+                        }
+                    }
+                });
+            });
     </script>
-
-    <script src="_framework/blazor.server.js"></script>
-    <script src="lib/Chart.js/chart.js"></script>
-    <script src="lib/luxon/luxon.js"></script>
-    <script src="lib/chartjs-adapter-luxon/chartjs-adapter-luxon.js"></script>
-    <script src="lib/chartBoot.js"></script>
 </body>
 </html>

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/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-04-14T07:37:09.1341280Z;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>
+    <History>True|2022-07-12T14:34:20.2940329Z;True|2022-04-14T09:37:09.1341280+02:00;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.Mon/Resources/ChangeLog.html

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

MP.Mon/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2205.219
+6.15.2209.1411

MP.Mon/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2205.219</version>
+  <version>6.15.2209.1411</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/Shared/MainLayout.razor

@@ -4,19 +4,6 @@
 
 <div class="page">
     <main>
-        @*<div class="top-row px-4 justify-content-between">
-            <div class="px-2">
-            <img class="logoImg img-fluid" src="images/LogoMapo.png" width="80" />
-            <span class="mainHead p-3"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
-            </div>
-            <div class="px-2">
-            <span id="text-white text-right">
-            @($"{DateTime.Now:dddd dd MMMM yyyy, HH:mm}")
-            </span>
-            <img class="logoImg img-fluid" src="images/logoCliente.png" width="32" />
-            EgalWare
-            </div>
-            </div>*@
         <div class="top-row px-4 justify-content-between">
             <CmpHeader></CmpHeader>
         </div>
@@ -27,6 +14,5 @@
         <div class="fixed-bottom bottom-row px-2">
             <CmpFooter></CmpFooter>
         </div>
-
     </main>
 </div>

MP.Mon/Shared/MainLayout.razor.css

@@ -13,14 +13,14 @@ main {
     /*border-bottom: 1px solid #696969;*/
     color: #696969;
     font-size: 1.4em;
-    height: 3rem;
+    height: 2.6rem;
     display: flex;
     align-items: center;
     justify-content: space-evenly;
 }
 
 .mainHead{
-    font-size: 1.7rem;
+    font-size: 1.6rem;
 }
 
 .top-row ::deep a,

MP.Mon/Shared/NavMenu.razor

@@ -1,39 +0,0 @@
-<div class="top-row ps-3 navbar navbar-dark">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="">MP.Mon</a>
-        <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-    </div>
-</div>
-
-<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
-    <nav class="flex-column">
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Home
-            </NavLink>
-        </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
-            </NavLink>
-        </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
-            </NavLink>
-        </div>
-    </nav>
-</div>
-
-@code {
-    private bool collapseNavMenu = true;
-
-    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
-
-    private void ToggleNavMenu()
-    {
-        collapseNavMenu = !collapseNavMenu;
-    }
-}

MP.Mon/Shared/SurveyPrompt.razor

@@ -1,16 +0,0 @@
-<div class="alert alert-secondary mt-4">
-    <span class="oi oi-pencil me-2" aria-hidden="true"></span>
-    <strong>@Title</strong>
-
-    <span class="text-nowrap">
-        Please take our
-        <a target="_blank" class="font-weight-bold link-dark" href="https://go.microsoft.com/fwlink/?linkid=2149017">brief survey</a>
-    </span>
-    and tell us what you think.
-</div>
-
-@code {
-    // Demonstrates how a parent component can supply parameters
-    [Parameter]
-    public string? Title { get; set; }
-}

MP.Mon/appsettings.json

@@ -10,6 +10,9 @@
   "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"
+  },
+  "ServerConf": {
+    "maxAge": "2000"
   }
 }

MP.Mon/libman.json

@@ -7,28 +7,13 @@
       "destination": "wwwroot/lib/bootstrap/"
     },
     {
-      "library": "bootstrap-icons@1.8.1",
+      "library": "bootstrap-icons@1.8.3",
       "destination": "wwwroot/lib/bootstrap-icons/"
     },
     {
       "provider": "cdnjs",
       "library": "font-awesome@6.1.1",
       "destination": "wwwroot/lib/font-awesome/"
-    },
-    {
-      "provider": "cdnjs",
-      "library": "Chart.js@3.7.1",
-      "destination": "wwwroot/lib/Chart.js/"
-    },
-    {
-      "provider": "cdnjs",
-      "library": "chartjs-adapter-luxon@1.1.0",
-      "destination": "wwwroot/lib/chartjs-adapter-luxon/"
-    },
-    {
-      "provider": "cdnjs",
-      "library": "luxon@2.3.1",
-      "destination": "wwwroot/lib/luxon/"
     }
   ]
 }

MP.Mon/wwwroot/css/site.css

@@ -308,7 +308,7 @@ a,
 /* Gestione size caratteri */
 .mainHead,
 .logoImg {
-  height: 1.6em;
+  height: 1.5em;
 }
 @media all and (min-width: 425px) {
   .mainHead {

MP.Mon/wwwroot/lib/Chart.js/helpers.esm.js

@@ -1,7 +0,0 @@
-/*!
- * Chart.js v3.7.1
- * https://www.chartjs.org
- * (c) 2022 Chart.js Contributors
- * Released under the MIT License
- */
-export { H as HALF_PI, aX as INFINITY, P as PI, aW as PITAU, aZ as QUARTER_PI, aY as RAD_PER_DEG, T as TAU, a_ as TWO_THIRDS_PI, Q as _addGrace, V as _alignPixel, a0 as _alignStartEnd, p as _angleBetween, a$ as _angleDiff, _ as _arrayUnique, a6 as _attachContext, aq as _bezierCurveTo, an as _bezierInterpolation, av as _boundSegment, al as _boundSegments, a3 as _capitalize, ak as _computeSegments, a7 as _createResolver, aH as _decimalPlaces, aP as _deprecated, a8 as _descriptors, af as _elementsEqual, M as _factorize, aJ as _filterBetween, F as _getParentNode, U as _int16Range, ah as _isBetween, ag as _isClickEvent, K as _isDomSupported, z as _isPointInArea, w as _limitValue, aI as _longestText, aK as _lookup, x as _lookupByKey, S as _measureText, aN as _merger, aO as _mergerIf, aw as _normalizeAngle, ao as _pointInLine, ai as _readValueToProps, A as _rlookupByKey, aD as _setMinAndMaxByKey, am as _steppedInterpolation, ap as _steppedLineTo, az as _textX, $ as _toLeftRightCenter, aj as _updateBezierControlPoints, as as addRoundedRectPath, aG as almostEquals, aF as almostWhole, O as callback, ad as clearCanvas, W as clipArea, aM as clone, c as color, h as createContext, ab as debounce, j as defined, aC as distanceBetweenPoints, ar as drawPoint, D as each, e as easingEffects, N as finiteOrDefault, aU as fontString, o as formatNumber, B as getAngleFromPoint, aL as getHoverColor, E as getMaximumSize, y as getRelativePosition, ax as getRtlAdapter, aT as getStyle, b as isArray, g as isFinite, a5 as isFunction, k as isNullOrUndef, q as isNumber, i as isObject, l as listenArrayEvents, L as log10, a2 as merge, a9 as mergeIf, aE as niceNum, aB as noop, ay as overrideTextDirection, G as readUsedSize, X as renderText, r as requestAnimFrame, a as resolve, f as resolveObjectKey, aA as restoreTextDirection, ac as retinaScale, ae as setsEqual, s as sign, aR as splineCurve, aS as splineCurveMonotone, J as supportsEventListenerOptions, I as throttled, R as toDegrees, n as toDimension, Z as toFont, aQ as toFontString, aV as toLineHeight, C as toPadding, m as toPercentage, t as toRadians, at as toTRBL, au as toTRBLCorners, aa as uid, Y as unclipArea, u as unlistenArrayEvents, v as valueOrDefault } from './chunks/helpers.segment.js';

MP.Mon/wwwroot/lib/Chart.js/helpers.esm.min.js

@@ -1 +0,0 @@
-export{H as HALF_PI,aX as INFINITY,P as PI,aW as PITAU,aZ as QUARTER_PI,aY as RAD_PER_DEG,T as TAU,a_ as TWO_THIRDS_PI,Q as _addGrace,V as _alignPixel,a0 as _alignStartEnd,p as _angleBetween,a$ as _angleDiff,_ as _arrayUnique,a6 as _attachContext,aq as _bezierCurveTo,an as _bezierInterpolation,av as _boundSegment,al as _boundSegments,a3 as _capitalize,ak as _computeSegments,a7 as _createResolver,aH as _decimalPlaces,aP as _deprecated,a8 as _descriptors,af as _elementsEqual,M as _factorize,aJ as _filterBetween,F as _getParentNode,U as _int16Range,ah as _isBetween,ag as _isClickEvent,K as _isDomSupported,z as _isPointInArea,w as _limitValue,aI as _longestText,aK as _lookup,x as _lookupByKey,S as _measureText,aN as _merger,aO as _mergerIf,aw as _normalizeAngle,ao as _pointInLine,ai as _readValueToProps,A as _rlookupByKey,aD as _setMinAndMaxByKey,am as _steppedInterpolation,ap as _steppedLineTo,az as _textX,$ as _toLeftRightCenter,aj as _updateBezierControlPoints,as as addRoundedRectPath,aG as almostEquals,aF as almostWhole,O as callback,ad as clearCanvas,W as clipArea,aM as clone,c as color,h as createContext,ab as debounce,j as defined,aC as distanceBetweenPoints,ar as drawPoint,D as each,e as easingEffects,N as finiteOrDefault,aU as fontString,o as formatNumber,B as getAngleFromPoint,aL as getHoverColor,E as getMaximumSize,y as getRelativePosition,ax as getRtlAdapter,aT as getStyle,b as isArray,g as isFinite,a5 as isFunction,k as isNullOrUndef,q as isNumber,i as isObject,l as listenArrayEvents,L as log10,a2 as merge,a9 as mergeIf,aE as niceNum,aB as noop,ay as overrideTextDirection,G as readUsedSize,X as renderText,r as requestAnimFrame,a as resolve,f as resolveObjectKey,aA as restoreTextDirection,ac as retinaScale,ae as setsEqual,s as sign,aR as splineCurve,aS as splineCurveMonotone,J as supportsEventListenerOptions,I as throttled,R as toDegrees,n as toDimension,Z as toFont,aQ as toFontString,aV as toLineHeight,C as toPadding,m as toPercentage,t as toRadians,at as toTRBL,au as toTRBLCorners,aa as uid,Y as unclipArea,u as unlistenArrayEvents,v as valueOrDefault}from"./chunks/helpers.segment.js";

MP.Mon/wwwroot/lib/bootstrap-icons/icons/bank.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-bank" viewBox="0 0 16 16">
-  <path d="M8 .95 14.61 4h.89a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.5.5H15v7a.5.5 0 0 1 .485.379l.5 2A.5.5 0 0 1 15.5 17H.5a.5.5 0 0 1-.485-.621l.5-2A.5.5 0 0 1 1 14V7H.5a.5.5 0 0 1-.5-.5v-2A.5.5 0 0 1 .5 4h.89L8 .95zM3.776 4h8.447L8 2.05 3.776 4zM2 7v7h1V7H2zm2 0v7h2.5V7H4zm3.5 0v7h1V7h-1zm2 0v7H12V7H9.5zM13 7v7h1V7h-1zm2-1V5H1v1h14zm-.39 9H1.39l-.25 1h13.72l-.25-1z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/house-heart-fill.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-house-heart-fill" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M8.707 1.5a1 1 0 0 0-1.414 0L.646 8.146a.5.5 0 0 0 .708.707L8 2.207l6.646 6.646a.5.5 0 0 0 .708-.707L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.707 1.5Z"/>
-  <path fill-rule="evenodd" d="m8 3.293 6 6V13.5a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 2 13.5V9.293l6-6Zm0 5.189c1.664-1.673 5.825 1.254 0 5.018-5.825-3.764-1.664-6.691 0-5.018Z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/house-heart.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-house-heart" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M8.707 1.5a1 1 0 0 0-1.414 0L.646 8.146a.5.5 0 0 0 .708.707L2 8.207V13.5A1.5 1.5 0 0 0 3.5 15h9a1.5 1.5 0 0 0 1.5-1.5V8.207l.646.646a.5.5 0 0 0 .708-.707L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.707 1.5ZM13 7.207l-5-5-5 5V13.5a.5.5 0 0 0 .5.5h9a.5.5 0 0 0 .5-.5V7.207Zm-5-.225C9.664 5.309 13.825 8.236 8 12 2.175 8.236 6.336 5.309 8 6.982Z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/pentagon-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pentagon-fill" viewBox="0 0 16 16">
-  <path d="m8 0 8 6.5-3 9.5H3L0 6.5 8 0z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/pentagon-half.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pentagon-half" viewBox="0 0 16 16">
-  <path d="m8 1.288 6.842 5.56L12.267 15H8V1.288zM16 6.5 8 0 0 6.5 3 16h10l3-9.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/pentagon.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pentagon" viewBox="0 0 16 16">
-  <path d="m8 1.288 6.842 5.56L12.267 15H3.733L1.158 6.847 8 1.288zM16 6.5 8 0 0 6.5 3 16h10l3-9.5z"/>
-</svg>