Merge branch 'release/UpdateSlowTimerElapse'

- attesa refresh variabile x client
- esclusione compilazione WASM (NON pronta)

.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,20 @@ MON:build:
   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 +199,23 @@ 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
+
 LAND:IIS01:deploy:
   stage: deploy
   tags:
@@ -248,6 +280,23 @@ 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
+
 LAND:IIS02:deploy:
   stage: deploy
   tags:
@@ -316,6 +365,24 @@ 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
+
 LAND:installer:
   stage: installer
   tags:
@@ -400,6 +467,28 @@ 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
+
 LAND:release:
   stage: release
   tags:
@@ -484,8 +573,6 @@ MON:release:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
   only:
-    #- feature/Deploy_CI_CD
-    # - master
     - tags
   except:
     - branches
@@ -495,3 +582,27 @@ 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
+

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/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.Data/Constants.cs

@@ -14,7 +14,8 @@ namespace MP.Data
 
         // REDIS KEY Dati correnti
         public static readonly string CONF_MON_KEY = $"{BASE_HASH}:Conf:MonDispData";
-        public static readonly string ACT_FLUX_DATA_KEY = $"{BASE_HASH}:Current:FluxData";
-
+        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

@@ -43,6 +43,7 @@ namespace MP.Data.Controllers
             {
                 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)
@@ -66,6 +67,7 @@ namespace MP.Data.Controllers
             {
                 dbResult = dbCtx
                 .DbSetMacchine
+                .AsNoTracking()
                 .OrderBy(x => x.IdxMacchina)
                 .ToList();
             }
@@ -83,6 +85,7 @@ namespace MP.Data.Controllers
             {
                 dbResult = dbCtx
                 .DbSetConfig
+                .AsNoTracking()
                 .OrderBy(x => x.Chiave)
                 .ToList();
             }
@@ -103,6 +106,7 @@ namespace MP.Data.Controllers
                 dbResult = dbCtx
                     .DbSetMSE
                     .FromSqlRaw("EXEC stp_MSE_getData @maxAgeSec", maxAgeSec)
+                    .AsNoTracking()
                     .ToList();
             }
             return dbResult;

MP.Data/MP.Data.csproj

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

MP.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.Land/MP.Land.csproj

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

MP.Land/Pages/_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  -->

MP.Land/Resources/ChangeLog.html

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

MP.Land/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2207.0613
+6.15.2207.0718

MP.Land/Resources/manifest.xml

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

MP.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" />
+    <img class="logoImg img-fluid" src="images/LogoMapo.png" height="24" />
     <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}")
     </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

@@ -54,7 +54,7 @@
             {
                 <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 class="px-1 ps-0">@getMinSec(getDecimal(@CurrRecord.Durata))</div>
                 </div>
             }
             @if (hasRow(3))

MP.Mon/Components/DetailMSE.razor.cs

@@ -1,39 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using System.Net.Http;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Virtualization;
-using Microsoft.JSInterop;
-using MP.Mon;
-using MP.Mon.Shared;
-using MP.Mon.Components;
-using MP.Data.DatabaseModels;
 using MP.Data.Conf;
+using MP.Data.DatabaseModels;
+using NLog;
 
 namespace MP.Mon.Components
 {
     public partial class DetailMSE
     {
-        #region Protected Fields
-
-        protected string baseCss = "sem";
-        protected int kaFactor = 60 / 2;
-
-        #endregion Protected Fields
-
-        #region Private Fields
-
-        private static System.Timers.Timer aTimer = new System.Timers.Timer(60 * 1000);
-
-        #endregion Private Fields
-
         #region Public Properties
 
         [Parameter]
@@ -48,6 +21,9 @@ namespace MP.Mon.Components
         [Parameter]
         public bool doAnimate { get; set; } = true;
 
+        [Parameter]
+        public bool doBlink { get; set; } = false;
+
         [Parameter]
         public int keepAliveMin { get; set; } = 5;
 
@@ -56,6 +32,109 @@ namespace MP.Mon.Components
 
         #endregion Public Properties
 
+        #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);
+                // verifica variazione x blink...
+                bool needUpdate = false;
+                if (CurrRecord == null)
+                {
+                    needUpdate = true;
+                }
+                else
+                {
+                    if (OldRecord == null)
+                    {
+                        needUpdate = true;
+                    }
+                    else
+                    {
+                        if (!CurrRecord.Semaforo.Equals(OldRecord.Semaforo) || CurrRecord.Semaforo != "sVe")
+                        {
+                            needUpdate = true;
+                        }
+                    }
+                }
+                if (needUpdate)
+                {
+                    if (false)
+                    {
+                        Log.Trace($"Elapsed Timer {CurrRecord?.CodMacchina}");
+                    }
+                    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>
@@ -75,6 +154,15 @@ namespace MP.Mon.Components
             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>
@@ -98,83 +186,25 @@ namespace MP.Mon.Components
             return rowVals;
         }
 
-        /// <summary>
-        /// restituisce il valore data la tagLocation
-        /// </summary>
-        /// <param name="tagLocation"></param>
-        /// <returns></returns>
-        protected string currVal(string tagLocation)
-        {
-            string answ = "";
-            if (currTagVal.ContainsKey(tagLocation))
-            {
-                answ = currTagVal[tagLocation];
-            }
-            return answ;
-        }
-
-        #region Protected Properties
-
-        protected string codIOB
-        {
-            get
-            {
-                string answ = "";
-                if (CurrRecord != null)
-                {
-                    answ = CurrRecord.IdxMacchina;
-                }
-                return answ;
-            }
-        }
-
-        protected bool dataLoaded { get; set; } = false;
-
-        #endregion Protected Properties
-
-        #region Public Methods
-
-        public void Dispose()
-        {
-            aTimer.Stop();
-            aTimer.Dispose();
-        }
-
-        public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            var pUpd = Task.Run(async () =>
-            {
-                await Task.Delay(1);
-                await InvokeAsync(StateHasChanged);
-            });
-            pUpd.Wait();
-        }
-
-        public void StartTimer()
-        {
-            int tOutPeriod = 1000;
-            //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
-            aTimer = new System.Timers.Timer(tOutPeriod);
-            aTimer.Elapsed += ElapsedTimer;
-            aTimer.Enabled = true;
-            aTimer.Start();
-        }
-
-        #endregion Public Methods
-
-        #region Protected Methods
-
-        protected override async Task OnInitializedAsync()
-        {
-            StartTimer();
-            Random rnd = new Random();
-            //await Task.Delay(rnd.Next(500));
-            dataLoaded = true;
-            setupConf();
-        }
-
         #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)
@@ -207,11 +237,7 @@ namespace MP.Mon.Components
             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)
+                if (doBlink)
                 {
                     answ += "_b";
                 }
@@ -219,13 +245,24 @@ namespace MP.Mon.Components
             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
             {
-                tSpan = TimeSpan.FromMinutes((double)currTimeMin);
+                double cTimeMin = currTimeMin != null ? (double)currTimeMin : 0;
+                tSpan = TimeSpan.FromMinutes(cTimeMin);
                 answ = $"{tSpan:mm}:{tSpan:ss}";
             }
             catch

MP.Mon/Conf/iobTagsConf.json

@@ -1,90 +1,5 @@
 {
   "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/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,40 +1,16 @@
-using MP.Data.Conf;
+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 Public Fields
-
-        public static MP.Data.Controllers.MpMonController dbController;
-
-        #endregion Public Fields
-
-        #region Private Fields
-
-        private static IConfiguration _configuration;
-        private static ILogger<MpDataService> _logger;
-
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        /// <summary>
-        /// Oggetto per connessione a REDIS
-        /// </summary>
-        private ConnectionMultiplexer redisConn = null!;
-
-        //ISubscriber sub = redis.GetSubscriber();
-        /// <summary>
-        /// Oggetto DB redis da impiegare x chiamate R/W
-        /// </summary>
-        private IDatabase redisDb = null!;
-
-        #endregion Private Fields
-
         #region Public Constructors
 
         public MpDataService(IConfiguration configuration, ILogger<MpDataService> logger)
@@ -43,10 +19,11 @@ namespace MP.Mon.Data
             _configuration = configuration;
 
             // setup compoenti REDIS
-            this.redisConn = ConnectionMultiplexer.Connect(_configuration.GetConnectionString("Redis"));
-            this.redisDb = this.redisConn.GetDatabase();
-            //// setup canali pub/sub
-            //actLogPipe = new MessagePipe(redisConn, Constants.ACT_LOG_M_QUEUE);
+            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");
@@ -59,23 +36,31 @@ 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
@@ -91,6 +76,23 @@ namespace MP.Mon.Data
             dbController.Dispose();
         }
 
+        /// <summary>
+        /// Richiesta attivazione --&gt; sposto avanti 1 minuto il periodo limite x fast running
+        /// </summary>
+        public void doActivate()
+        {
+            fastLimit = DateTime.Now.AddMinutes(1);
+        }
+
+        /// <summary>
+        /// Elenco setup dei tag conf correnti
+        /// </summary>
+        /// <returns></returns>
+        public Task<Dictionary<string, List<TagData>>> getAllTags()
+        {
+            return Task.FromResult(currTagConf);
+        }
+
         /// <summary>
         /// restituisce il valore da REDIS associato al tag richeisto
         /// </summary>
@@ -100,33 +102,123 @@ namespace MP.Mon.Data
         {
             string outVal = "";
             // cerco in REDIS la conf x l'IOB
-            string rawData = redisDb.StringGet(redKey);
+            var rawData = redisDb.StringGet(redKey);
             if (!string.IsNullOrEmpty(rawData))
             {
-                outVal = rawData;
+                outVal = $"{rawData}";
             }
             return outVal;
         }
 
         public Task<List<Macchine>> MacchineGetAll()
         {
-            return Task.FromResult(dbController.MacchineGetAll().ToList());
+            return Task.FromResult(dbController.MacchineGetAll());
         }
 
-        public Task<List<MappaStatoExpl>> MseGetAll()
+        public async Task<List<MappaStatoExpl>> MseGetAll()
         {
-            var dbResult = dbController.MseGetAll();
-            if (dbResult == null)
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            List<MappaStatoExpl> result = new List<MappaStatoExpl>();
+            // cerco in redis...
+            var rawData = await redisDb.StringGetAsync(redisMseKey);
+            if (!string.IsNullOrEmpty(rawData))
             {
-                dbResult = new List<MappaStatoExpl>();
+                result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(rawData);
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"Read from REDIS: {ts.TotalMilliseconds}ms");
             }
-            return Task.FromResult(dbResult);
+            else
+            {
+                result = await Task.FromResult(dbController.MseGetAll());
+                // serializzp e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(redisMseKey, rawData, TimeSpan.FromSeconds(2));
+                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>
@@ -148,7 +240,8 @@ namespace MP.Mon.Data
                             var fileConfData = JsonConvert.DeserializeObject<IobTags>(rawData);
                             if (fileConfData != null)
                             {
-                                // effettuo esplosione conf SE contenesse il valore "***" = tutti gli IOB
+                                // effettuo esplosione conf SE contenesse il valore "***" = tutti
+                                // gli IOB
                                 if (fileConfData.IobSetup.ContainsKey("***"))
                                 {
                                     // recupero elenco macchine...
@@ -159,8 +252,8 @@ namespace MP.Mon.Data
                                     {
                                         if (!string.IsNullOrEmpty(item.IdxMacchina))
                                         {
-                                            // converto i valori x la macchina corrente...
-                                            // clono in nuovo oggetto
+                                            // 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)
@@ -192,7 +285,6 @@ namespace MP.Mon.Data
                                             currConf.Add(item.IdxMacchina, specVal);
                                         }
                                     }
-
                                 }
                                 // altrimenti copio ed ho finito
                                 else

MP.Mon/MP.Mon.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2206.616</Version>
+    <Version>6.15.2207.1219</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,17 @@
 
 
 
-<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,9 +23,9 @@
     else
     {
         int currIdx = 0;
-        foreach (var recordIob in ListMSE)
+        foreach (var recordIob in listMSE)
         {
-            <DetailMSE CurrRecord="@recordIob" currTagConf="@getIobTag(recordIob.IdxMacchina)" currTagVal="@getTagVal(recordIob.IdxMacchina)" 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)
             {
@@ -38,8 +37,7 @@
         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,41 +1,58 @@
 using Microsoft.AspNetCore.Components;
+using MP.Data;
 using MP.Data.Conf;
 using MP.Data.DatabaseModels;
 using MP.Mon.Data;
+using Newtonsoft.Json;
 using NLog;
 
 namespace MP.Mon.Pages
 {
     public partial class Index : IDisposable
     {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            disposeTimers();
+        }
+
+        public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            listMSE = null;
+            await Task.Delay(1);
+            Log.Info("Elapsed Slow Timer --> full page reload");
+            // dispongo i vari timers...
+            disposeTimers();
+            await Task.Delay(1);
+            // reload pagina
+            NavManager.NavigateTo(NavManager.Uri);
+        }
+
+        public void StartTimer()
+        {
+            // timer lento
+            slowTimer = new System.Timers.Timer(slowRefreshMs);
+            slowTimer.Elapsed += ElapsedSlowTimer;
+            slowTimer.Enabled = true;
+            slowTimer.Start();
+        }
+
+        #endregion Public Methods
+
         #region Protected Fields
 
         protected bool doAnimate = true;
-        protected int fastRefreshSec = 10;
+        protected int fastRefreshMs = 1000;
         protected int keepAliveMin = 1;
-        protected List<MappaStatoExpl>? ListMSE = null;
-        protected int maxCol = 4;
+        protected int maxCol = 6;
         protected string showArt = "";
         protected int slowRefreshSec = 300;
 
         #endregion Protected Fields
 
-        #region Private Fields
-
-        private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-        private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
-        private List<ConfigModel>? CurrConfig = null;
-
-        #endregion Private Fields
-
         #region Protected Properties
 
-        protected int fastRefreshMs
-        {
-            get => 1000 * fastRefreshSec;
-        }
-
         [Inject]
         protected MpDataService MMDataService { get; set; } = null!;
 
@@ -44,54 +61,16 @@ namespace MP.Mon.Pages
 
         protected int slowRefreshMs
         {
-            get => 1000 * slowRefreshSec;
+            get
+            {
+                // tempo variabile tra +/- 10% del target
+                int answ = rnd.Next(900, 1100) * slowRefreshSec;
+                return answ;
+            }
         }
 
         #endregion Protected Properties
 
-        #region Public Methods
-
-        public void Dispose()
-        {
-            fastTimer.Stop();
-            fastTimer.Dispose();
-            slowTimer.Stop();
-            slowTimer.Dispose();
-        }
-
-        public void ElapsedFastTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            var pUpd = Task.Run(async () =>
-            {
-                await ReloadData();
-                //await Task.Delay(1);
-                await InvokeAsync(StateHasChanged);
-            });
-            pUpd.Wait();
-        }
-
-        public async void ElapsedSlowTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            ListMSE = null;
-            NavManager.NavigateTo(NavManager.Uri);
-        }
-
-        public void StartTimer()
-        {
-            // timer veloce
-            fastTimer = new System.Timers.Timer(fastRefreshMs);
-            fastTimer.Elapsed += ElapsedFastTimer;
-            fastTimer.Enabled = true;
-            fastTimer.Start();
-            // timer lento
-            slowTimer = new System.Timers.Timer(slowRefreshMs);
-            slowTimer.Elapsed += ElapsedSlowTimer;
-            slowTimer.Enabled = true;
-            slowTimer.Start();
-        }
-
-        #endregion Public Methods
-
         #region Protected Methods
 
         /// <summary>
@@ -157,7 +136,8 @@ namespace MP.Mon.Pages
         }
 
         /// <summary>
-        /// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un dizionario x ottimizzare visualizzazione
+        /// 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>
@@ -177,17 +157,101 @@ namespace MP.Mon.Pages
         protected override async Task OnInitializedAsync()
         {
             await setupConf();
-            await ReloadData();
+            //await ReloadData();
+            MMDataService.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage;
+            MMDataService.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage;
             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 async Task ReloadData()
+        private void BlinkPipe_EA_NewMessage(object? sender, EventArgs e)
         {
-            ListMSE = await MMDataService.MseGetAll();
+            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)
+        {
+            //fastTimer.Stop();
+            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(() =>
+            {
+                // attesa random 0-50ms...
+                Random rnd = new Random();
+                Task.Delay(rnd.Next(5, 50));
+                StateHasChanged();
+            });
+            //fastTimer.Start();
+        }
+
+        private void disposeTimers()
+        {
+            slowTimer.Elapsed -= ElapsedSlowTimer;
+            slowTimer.Stop();
+            slowTimer.Dispose();
         }
 
         private async Task setupConf()
@@ -203,10 +267,9 @@ namespace MP.Mon.Pages
                 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}");
+                Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshMs: {fastRefreshMs}");
             }
         }
 

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

@@ -28,17 +28,24 @@
         <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(() => {
+            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/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.2206.616</h4>
+    <h4>Versione: 6.15.2207.1219</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.Mon/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2206.616
+6.15.2207.1219

MP.Mon/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2206.616</version>
+  <version>6.15.2207.1219</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/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/NavMenu.razor.css

@@ -1,62 +0,0 @@
-.navbar-toggler {
-    background-color: rgba(255, 255, 255, 0.1);
-}
-
-.top-row {
-    height: 3.5rem;
-    background-color: rgba(0,0,0,0.4);
-}
-
-.navbar-brand {
-    font-size: 1.1rem;
-}
-
-.oi {
-    width: 2rem;
-    font-size: 1.1rem;
-    vertical-align: text-top;
-    top: -2px;
-}
-
-.nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-    .nav-item:first-of-type {
-        padding-top: 1rem;
-    }
-
-    .nav-item:last-of-type {
-        padding-bottom: 1rem;
-    }
-
-    .nav-item ::deep a {
-        color: #d7d7d7;
-        border-radius: 4px;
-        height: 3rem;
-        display: flex;
-        align-items: center;
-        line-height: 3rem;
-    }
-
-.nav-item ::deep a.active {
-    background-color: rgba(255,255,255,0.25);
-    color: white;
-}
-
-.nav-item ::deep a:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-@media (min-width: 641px) {
-    .navbar-toggler {
-        display: none;
-    }
-
-    .collapse {
-        /* Never collapse the sidebar for wide screens */
-        display: block;
-    }
-}

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/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/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>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-tools" viewBox="0 0 16 16">
-  <path d="M1 0 0 1l2.2 3.081a1 1 0 0 0 .815.419h.07a1 1 0 0 1 .708.293l2.675 2.675-2.617 2.654A3.003 3.003 0 0 0 0 13a3 3 0 1 0 5.878-.851l2.654-2.617.968.968-.305.914a1 1 0 0 0 .242 1.023l3.356 3.356a1 1 0 0 0 1.414 0l1.586-1.586a1 1 0 0 0 0-1.414l-3.356-3.356a1 1 0 0 0-1.023-.242L10.5 9.5l-.96-.96 2.68-2.643A3.005 3.005 0 0 0 16 3c0-.269-.035-.53-.102-.777l-2.14 2.141L12 4l-.364-1.757L13.777.102a3 3 0 0 0-3.675 3.68L7.462 6.46 4.793 3.793a1 1 0 0 1-.293-.707v-.071a1 1 0 0 0-.419-.814L1 0zm9.646 10.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708zM3 11l.471.242.529.026.287.445.445.287.026.529L5 13l-.242.471-.026.529-.445.287-.287.445-.529.026L3 15l-.471-.242L2 14.732l-.287-.445L1.268 14l-.026-.529L1 13l.242-.471.026-.529.445-.287.287-.445.529-.026L3 11z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/x-lg.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-lg" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M13.854 2.146a.5.5 0 0 1 0 .708l-11 11a.5.5 0 0 1-.708-.708l11-11a.5.5 0 0 1 .708 0Z"/>
-  <path fill-rule="evenodd" d="M2.146 2.146a.5.5 0 0 0 0 .708l11 11a.5.5 0 0 0 .708-.708l-11-11a.5.5 0 0 0-.708 0Z"/>
-</svg>

MP.Mon/wwwroot/lib/chartBoot.js

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

MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.esm.js

@@ -1,91 +0,0 @@
-/*!
- * chartjs-adapter-luxon v1.1.0
- * https://www.chartjs.org
- * (c) 2021 chartjs-adapter-luxon Contributors
- * Released under the MIT license
- */
-import { _adapters } from 'chart.js';
-import { DateTime } from 'luxon';
-
-const FORMATS = {
-  datetime: DateTime.DATETIME_MED_WITH_SECONDS,
-  millisecond: 'h:mm:ss.SSS a',
-  second: DateTime.TIME_WITH_SECONDS,
-  minute: DateTime.TIME_SIMPLE,
-  hour: {hour: 'numeric'},
-  day: {day: 'numeric', month: 'short'},
-  week: 'DD',
-  month: {month: 'short', year: 'numeric'},
-  quarter: "'Q'q - yyyy",
-  year: {year: 'numeric'}
-};
-
-_adapters._date.override({
-  _id: 'luxon', // DEBUG
-
-  /**
-   * @private
-   */
-  _create: function(time) {
-    return DateTime.fromMillis(time, this.options);
-  },
-
-  formats: function() {
-    return FORMATS;
-  },
-
-  parse: function(value, format) {
-    const options = this.options;
-
-    if (value === null || typeof value === 'undefined') {
-      return null;
-    }
-
-    const type = typeof value;
-    if (type === 'number') {
-      value = this._create(value);
-    } else if (type === 'string') {
-      if (typeof format === 'string') {
-        value = DateTime.fromFormat(value, format, options);
-      } else {
-        value = DateTime.fromISO(value, options);
-      }
-    } else if (value instanceof Date) {
-      value = DateTime.fromJSDate(value, options);
-    } else if (type === 'object' && !(value instanceof DateTime)) {
-      value = DateTime.fromObject(value);
-    }
-
-    return value.isValid ? value.valueOf() : null;
-  },
-
-  format: function(time, format) {
-    const datetime = this._create(time);
-    return typeof format === 'string'
-      ? datetime.toFormat(format, this.options)
-      : datetime.toLocaleString(format);
-  },
-
-  add: function(time, amount, unit) {
-    const args = {};
-    args[unit] = amount;
-    return this._create(time).plus(args).valueOf();
-  },
-
-  diff: function(max, min, unit) {
-    return this._create(max).diff(this._create(min)).as(unit).valueOf();
-  },
-
-  startOf: function(time, unit, weekday) {
-    if (unit === 'isoWeek') {
-      weekday = Math.trunc(Math.min(Math.max(0, weekday), 6));
-      const dateTime = this._create(time);
-      return dateTime.minus({days: (dateTime.weekday - weekday + 7) % 7}).startOf('day').valueOf();
-    }
-    return unit ? this._create(time).startOf(unit).valueOf() : time;
-  },
-
-  endOf: function(time, unit) {
-    return this._create(time).endOf(unit).valueOf();
-  }
-});

MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.esm.min.js

@@ -1 +0,0 @@
-import{_adapters}from"chart.js";import{DateTime}from"luxon";const FORMATS={datetime:DateTime.DATETIME_MED_WITH_SECONDS,millisecond:"h:mm:ss.SSS a",second:DateTime.TIME_WITH_SECONDS,minute:DateTime.TIME_SIMPLE,hour:{hour:"numeric"},day:{day:"numeric",month:"short"},week:"DD",month:{month:"short",year:"numeric"},quarter:"'Q'q - yyyy",year:{year:"numeric"}};_adapters._date.override({_id:"luxon",_create:function(t){return DateTime.fromMillis(t,this.options)},formats:function(){return FORMATS},parse:function(t,e){var r=this.options;if(null==t)return null;var a=typeof t;return"number"==a?t=this._create(t):"string"==a?t="string"==typeof e?DateTime.fromFormat(t,e,r):DateTime.fromISO(t,r):t instanceof Date?t=DateTime.fromJSDate(t,r):"object"!=a||t instanceof DateTime||(t=DateTime.fromObject(t)),t.isValid?t.valueOf():null},format:function(t,e){const r=this._create(t);return"string"==typeof e?r.toFormat(e,this.options):r.toLocaleString(e)},add:function(t,e,r){const a={};return a[r]=e,this._create(t).plus(a).valueOf()},diff:function(t,e,r){return this._create(t).diff(this._create(e)).as(r).valueOf()},startOf:function(t,e,r){if("isoWeek"!==e)return e?this._create(t).startOf(e).valueOf():t;{r=Math.trunc(Math.min(Math.max(0,r),6));const a=this._create(t);return a.minus({days:(a.weekday-r+7)%7}).startOf("day").valueOf()}},endOf:function(t,e){return this._create(t).endOf(e).valueOf()}});

MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.js

@@ -1,96 +0,0 @@
-/*!
- * chartjs-adapter-luxon v1.1.0
- * https://www.chartjs.org
- * (c) 2021 chartjs-adapter-luxon Contributors
- * Released under the MIT license
- */
-(function (global, factory) {
-typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('chart.js'), require('luxon')) :
-typeof define === 'function' && define.amd ? define(['chart.js', 'luxon'], factory) :
-(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Chart, global.luxon));
-}(this, (function (chart_js, luxon) { 'use strict';
-
-const FORMATS = {
-  datetime: luxon.DateTime.DATETIME_MED_WITH_SECONDS,
-  millisecond: 'h:mm:ss.SSS a',
-  second: luxon.DateTime.TIME_WITH_SECONDS,
-  minute: luxon.DateTime.TIME_SIMPLE,
-  hour: {hour: 'numeric'},
-  day: {day: 'numeric', month: 'short'},
-  week: 'DD',
-  month: {month: 'short', year: 'numeric'},
-  quarter: "'Q'q - yyyy",
-  year: {year: 'numeric'}
-};
-
-chart_js._adapters._date.override({
-  _id: 'luxon', // DEBUG
-
-  /**
-   * @private
-   */
-  _create: function(time) {
-    return luxon.DateTime.fromMillis(time, this.options);
-  },
-
-  formats: function() {
-    return FORMATS;
-  },
-
-  parse: function(value, format) {
-    const options = this.options;
-
-    if (value === null || typeof value === 'undefined') {
-      return null;
-    }
-
-    const type = typeof value;
-    if (type === 'number') {
-      value = this._create(value);
-    } else if (type === 'string') {
-      if (typeof format === 'string') {
-        value = luxon.DateTime.fromFormat(value, format, options);
-      } else {
-        value = luxon.DateTime.fromISO(value, options);
-      }
-    } else if (value instanceof Date) {
-      value = luxon.DateTime.fromJSDate(value, options);
-    } else if (type === 'object' && !(value instanceof luxon.DateTime)) {
-      value = luxon.DateTime.fromObject(value);
-    }
-
-    return value.isValid ? value.valueOf() : null;
-  },
-
-  format: function(time, format) {
-    const datetime = this._create(time);
-    return typeof format === 'string'
-      ? datetime.toFormat(format, this.options)
-      : datetime.toLocaleString(format);
-  },
-
-  add: function(time, amount, unit) {
-    const args = {};
-    args[unit] = amount;
-    return this._create(time).plus(args).valueOf();
-  },
-
-  diff: function(max, min, unit) {
-    return this._create(max).diff(this._create(min)).as(unit).valueOf();
-  },
-
-  startOf: function(time, unit, weekday) {
-    if (unit === 'isoWeek') {
-      weekday = Math.trunc(Math.min(Math.max(0, weekday), 6));
-      const dateTime = this._create(time);
-      return dateTime.minus({days: (dateTime.weekday - weekday + 7) % 7}).startOf('day').valueOf();
-    }
-    return unit ? this._create(time).startOf(unit).valueOf() : time;
-  },
-
-  endOf: function(time, unit) {
-    return this._create(time).endOf(unit).valueOf();
-  }
-});
-
-})));

MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.min.js

@@ -1,7 +0,0 @@
-/*!
- * chartjs-adapter-luxon v1.1.0
- * https://www.chartjs.org
- * (c) 2021 chartjs-adapter-luxon Contributors
- * Released under the MIT license
- */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(require("chart.js"),require("luxon")):"function"==typeof define&&define.amd?define(["chart.js","luxon"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).Chart,e.luxon)}(this,(function(e,t){"use strict";const n={datetime:t.DateTime.DATETIME_MED_WITH_SECONDS,millisecond:"h:mm:ss.SSS a",second:t.DateTime.TIME_WITH_SECONDS,minute:t.DateTime.TIME_SIMPLE,hour:{hour:"numeric"},day:{day:"numeric",month:"short"},week:"DD",month:{month:"short",year:"numeric"},quarter:"'Q'q - yyyy",year:{year:"numeric"}};e._adapters._date.override({_id:"luxon",_create:function(e){return t.DateTime.fromMillis(e,this.options)},formats:function(){return n},parse:function(e,n){const r=this.options;if(null==e)return null;const i=typeof e;return"number"===i?e=this._create(e):"string"===i?e="string"==typeof n?t.DateTime.fromFormat(e,n,r):t.DateTime.fromISO(e,r):e instanceof Date?e=t.DateTime.fromJSDate(e,r):"object"!==i||e instanceof t.DateTime||(e=t.DateTime.fromObject(e)),e.isValid?e.valueOf():null},format:function(e,t){const n=this._create(e);return"string"==typeof t?n.toFormat(t,this.options):n.toLocaleString(t)},add:function(e,t,n){const r={};return r[n]=t,this._create(e).plus(r).valueOf()},diff:function(e,t,n){return this._create(e).diff(this._create(t)).as(n).valueOf()},startOf:function(e,t,n){if("isoWeek"===t){n=Math.trunc(Math.min(Math.max(0,n),6));const t=this._create(e);return t.minus({days:(t.weekday-n+7)%7}).startOf("day").valueOf()}return t?this._create(e).startOf(t).valueOf():e},endOf:function(e,t){return this._create(e).endOf(t).valueOf()}})}));

MP.Stats/MP.Stats.csproj

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

MP.Stats/Pages/_Host.cshtml

@@ -33,11 +33,30 @@
         <a class="dismiss">🗙</a>
     </div>
     
-    @* Riconnessione server app: https://www.syncfusion.com/faq/how-do-i-reconnect-blazor-server-side-automatically *@
+    @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
     <script>
-        Blazor.defaultReconnectionHandler._reconnectCallback = function (d) {
-            document.location.reload();
-        }
+        //Blazor.start().then(() => {
+        //    Blazor.defaultReconnectionHandler._reconnectionDisplay = {
+        //        show: () => { },
+        //        update: (d) => { },
+        //        rejected: (d) => document.location.reload()
+        //    };
+        //});
+
+        Blazor.start().then(() => {
+            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
+                get() {
+                    return this.__reconnectionDisplay;
+                },
+                set(value) {
+                    this.__reconnectionDisplay = {
+                        show: () => value.show(),
+                        update: (d) => value.update(d),
+                        rejected: (d) => document.location.reload()
+                    }
+                }
+            });
+        });
     </script>
 
     <script src="_framework/blazor.server.js"></script>

MP.Stats/Resources/ChangeLog.html

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

MP.Stats/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2207.0510
+6.15.2207.0718

MP.Stats/Resources/manifest.xml

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

MP.WASM.Mon/Client/App.razor

@@ -0,0 +1,12 @@
+<Router AppAssembly="@typeof(App).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+    </Found>
+    <NotFound>
+        <PageTitle>Not found</PageTitle>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p role="alert">Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
+</Router>

MP.WASM.Mon/Client/Components/CmpFooter.razor

@@ -0,0 +1,9 @@
+<div class="row text-light">
+    <div class="col-5 pe-0 text-left">
+        <b>Mapo MON @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
+    </div>
+    <div class="col-7 ps-0 text-end">
+        <span class="small">@($"{DateTime.Now:HH:mm:ss}")</span> | <a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
+    </div>
+</div>
+

MP.WASM.Mon/Client/Components/CmpFooter.razor.cs

@@ -0,0 +1,58 @@
+using NLog;
+
+namespace MP.WASM.Mon.Client.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.WASM.Mon/Client/Components/CmpHeader.razor

@@ -0,0 +1,49 @@
+<div class="px-2">
+    <img class="logoImg img-fluid" src="images/LogoMapo.png" height="24" />
+    <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}")
+    </span>
+    <img class="logoImg img-fluid" src="images/logoCliente.png" height="24" />
+    EgalWare
+</div>
+
+@code {
+
+    //protected override async Task OnInitializedAsync()
+    //{
+    //    StartTimer();
+    //}
+
+    //public void Dispose()
+    //{
+    //    aTimer.Stop();
+    //    aTimer.Dispose();
+    //}
+
+    //private static System.Timers.Timer aTimer;
+
+    //public void StartTimer()
+    //{
+    //    int tOutPeriod = 60000;
+    //    //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.WASM.Mon/Client/Components/DetailMSE.razor

@@ -0,0 +1,134 @@
+<div class="col machBlock">
+    @if (CurrRecord == null || !dataLoaded)
+    {
+        <LoadingDataSmall></LoadingDataSmall>
+    }
+    else
+    {
+        <div class="@cssStatus(CurrRecord.Semaforo) p-1">
+            <div class="d-flex mb-1 ui-title justify-content-center align-items-center text-uppercase">
+                @CurrRecord.Nome
+            </div>
+            @if (hasRow(1))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(1))
+                    {
+                        <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="px-1 pe-0">Art</div>
+                    <div class="px-1 ps-0 ui-art">
+                        @if (showArt == "CodArticolo")
+                        {
+                            <span>@CurrRecord.CodArticolo</span>
+                        }
+                        else
+                        {
+                            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>
+            }
+            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">
+                <div class="col-12">
+                    <div class="text-right ui-footer px-2">
+                        <div class="row">
+                            @if (showComErr(CurrRecord.LastUpdate))
+                            {
+                                <div class="col text-warning">
+                                    <b>C.101</b>
+                                </div>
+                            }
+                            <div class="col text-end">
+                                @CurrRecord.LastUpdate
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+</div>

MP.WASM.Mon/Client/Components/DetailMSE.razor.cs

@@ -0,0 +1,300 @@
+using Microsoft.AspNetCore.Components;
+using MP.Data.Conf;
+using MP.Data.DatabaseModels;
+using NLog;
+
+namespace MP.WASM.Mon.Client.Components
+{
+    public partial class DetailMSE
+    {
+        #region Public Properties
+
+        [Parameter]
+        public MappaStatoExpl? CurrRecord { get; set; } = null;
+
+        /// <summary>
+        /// Valore precedente x calcolo variazione
+        /// </summary>
+        private MappaStatoExpl? OldRecord { get; set; } = null;
+
+        [Parameter]
+        public List<TagData>? currTagConf { get; set; } = null;
+
+        [Parameter]
+        public Dictionary<string, string> currTagVal { get; set; } = new Dictionary<string, string>();
+
+        [Parameter]
+        public bool doAnimate { get; set; } = true;
+
+        [Parameter]
+        public int keepAliveMin { get; set; } = 5;
+
+        [Parameter]
+        public string showArt { get; set; } = "";
+
+
+        [Parameter]
+        public bool doBlink { get; set; } = false;
+        //{
+        //    set
+        //    {
+        //        // se true --> ricarica
+        //        if (value)
+        //        {
+        //            var pUpd = Task.Run(async () =>
+        //            {
+        //                await InvokeAsync(() => StateHasChanged());
+        //            });
+        //            pUpd.Wait();
+        //        }
+        //    }
+        //}
+
+        #endregion Public Properties
+
+        #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);
+                // verifica variazione x blink...
+                bool needUpdate = false;
+                if (CurrRecord == null)
+                {
+                    needUpdate = true;
+                }
+                else
+                {
+                    if (OldRecord == null)
+                    {
+                        needUpdate = true;
+                    }
+                    else
+                    {
+                        if (!CurrRecord.Semaforo.Equals(OldRecord.Semaforo) || CurrRecord.Semaforo != "sVe")
+                        {
+                            needUpdate = true;
+                        }
+                    }
+                }
+                if (needUpdate)
+                {
+                    if (false)
+                    {
+                        Log.Trace($"Elapsed Timer {CurrRecord?.CodMacchina}");
+                    }
+                    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 System.Timers.Timer aTimer { get; set; } = null!;
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+
+        #region Private Methods
+
+        private string cssComStatus(string semaforo, DateTime? lastUpdateN)
+        {
+            DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
+            string answ = cssStatus(semaforo);
+            if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor))
+            {
+                answ = $"{baseCss}Ro";
+                // blink se secondo pari...
+                DateTime adesso = DateTime.Now;
+                int resto = 0;
+                Math.DivRem(adesso.Second, 2, out resto);
+                if (resto == 0)
+                {
+                    answ += "_b";
+                }
+            }
+            return answ;
+        }
+
+        private string cssStatus(string codSemaforo)
+        {
+            // 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);
+                answ = $"{tSpan:mm}:{tSpan:ss}";
+            }
+            catch
+            { }
+            return answ;
+        }
+
+        private void setupConf()
+        {
+            //baseCss = doAnimate ? "semBlink" : "sem";
+        }
+
+        private bool showComErr(DateTime? lastUpdateN)
+        {
+            DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
+            bool answ = false;
+            if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor))
+            {
+                answ = true;
+            }
+            return answ;
+        }
+
+        #endregion Private Methods
+    }
+}

MP.WASM.Mon/Client/Components/LoadingData.razor

@@ -0,0 +1,6 @@
+<div class="row p-5 m-5 bg-light">
+    <div class="col-12 text-center mt-5 py-5 alert alert-primary">
+        <h3>loading data</h3>
+        <i class="fas fa-spinner fa-spin fa-5x"></i>
+    </div>
+</div>

MP.WASM.Mon/Client/Components/LoadingDataSmall.razor

@@ -0,0 +1,6 @@
+<div class="row p-2 m-2">
+    <div class="col-12 text-center mt-2 py-2 alert alert-primary">
+        <b>loading data</b>
+        <i class="fas fa-spinner fa-spin"></i>
+    </div>
+</div>

MP.WASM.Mon/Client/MP.WASM.Mon.Client.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Remove="compilerconfig.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="compilerconfig.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.6" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\MP.Data\MP.Data.csproj" />
+  </ItemGroup>
+
+</Project>

MP.WASM.Mon/Client/Pages/Index.razor

@@ -0,0 +1,48 @@
+@page "/"
+
+@using MP.Data
+@using MP.Data.DatabaseModels
+@inject HttpClient Http
+@inject NavigationManager NavManager
+
+<PageTitle>MP MON</PageTitle>
+
+<div class="row statusMap mx-1 my-1">
+
+    @if (listMSE == null)
+    {
+        <div class="col-12">
+            <LoadingData></LoadingData>
+        </div>
+    }
+    else if (listMSE.Count == 0)
+    {
+        <div class="col-12">
+            <div class="alert alert-warning">
+                No data found
+            </div>
+        </div>
+    }
+    else
+    {
+        int currIdx = 0;
+        foreach (var recordIob in listMSE)
+        {
+            <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\">");
+            }
+        }
+        // controllo se devo "chiudere riga...
+        int currNum = (currIdx % maxCol);
+        while (currNum < (maxCol))
+        {
+            @((MarkupString)"<div class=\"col machBlock\">&nbsp;</div>");
+            currNum++;
+
+        }
+    }
+</div>

MP.WASM.Mon/Client/Pages/Index.razor.cs

@@ -0,0 +1,268 @@
+using MP.Data.Conf;
+using MP.Data.DatabaseModels;
+using NLog;
+using System.Net.Http.Json;
+
+namespace MP.WASM.Mon.Client.Pages
+{
+    public partial class Index : IDisposable
+    {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            disposeTimers();
+        }
+
+        public 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)
+                {
+                    doBlink = true;
+                    Log.Trace("Elapsed Fast Timer Blink");
+                }
+                else
+                {
+                    doBlink = false;
+                    await ReloadData();
+                    Log.Trace("Elapsed Fast Timer reload");
+                }
+                await Task.Delay(1);
+                await InvokeAsync(StateHasChanged);
+            });
+            pUpd.Wait();
+        }
+
+        public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
+        {
+            listMSE = null;
+            await Task.Delay(1);
+            Log.Info("Elapsed Slow Timer --> full page reload");
+            // dispongo i vari timers...
+            disposeTimers();
+            // reload pagina
+            NavManager.NavigateTo(NavManager.Uri);
+        }
+
+        public void StartTimer()
+        {
+            // timer veloce
+            fastTimer = new System.Timers.Timer(fastRefreshMs);
+            fastTimer.Elapsed += ElapsedFastTimer;
+            fastTimer.Enabled = true;
+            fastTimer.Start();
+            // timer lento
+            slowTimer = new System.Timers.Timer(slowRefreshMs);
+            slowTimer.Elapsed += ElapsedSlowTimer;
+            slowTimer.Enabled = true;
+            slowTimer.Start();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Fields
+
+        protected bool doAnimate = true;
+        protected int fastRefreshMs = 1000;
+        protected int keepAliveMin = 1;
+        protected int maxCol = 6;
+        protected string showArt = "";
+        protected int slowRefreshSec = 300;
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
+        protected int slowRefreshMs
+        {
+            get => 1000 * slowRefreshSec;
+        }
+
+        #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 false
+            if (CurrConfig != null && CurrConfig.Count > 0)
+            {
+                // sistemo i parametri opzionali...
+                ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
+                if (risultato != null)
+                {
+                    varObj = risultato.Valore;
+                    answ = !string.IsNullOrEmpty(risultato.Valore);
+                }
+            }
+#endif
+
+            return answ;
+        }
+
+        /// <summary>
+        /// Recupera il valore e se trovato aggiorna
+        /// </summary>
+        /// <param name="chiave">Valore da cercare</param>
+        /// <param name="varObj">Int in cui salvare il valore se trovato</param>
+        /// <returns></returns>
+        protected bool getConfValInt(string chiave, ref int varObj)
+        {
+            bool answ = false;
+#if false
+            if (CurrConfig != null && CurrConfig.Count > 0)
+            {
+                // sistemo i parametri opzionali...
+                ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
+                if (risultato != null)
+                {
+                    answ = int.TryParse(risultato.Valore, out varObj);
+                }
+            }
+#endif
+
+            return answ;
+        }
+
+        /// <summary>
+        /// Recupera da conf eventuale setup tag dell'IOB indicato
+        /// </summary>
+        /// <param name="codIob"></param>
+        /// <returns></returns>
+        protected List<TagData>? getIobTag(string codIob)
+        {
+            List<TagData>? answ = null;
+#if false
+            if (MMDataService.currTagConf != null)
+            {
+                // cerco x chiave IOB...
+                if (MMDataService.currTagConf.ContainsKey(codIob))
+                {
+                    answ = MMDataService.currTagConf[codIob];
+                }
+            }
+#endif
+
+            return answ;
+        }
+
+        /// <summary>
+        /// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un
+        /// dizionario x ottimizzare visualizzazione
+        /// </summary>
+        /// <param name="codIob"></param>
+        /// <returns></returns>
+        protected Dictionary<string, string> getTagVal(string codIob)
+        {
+            Dictionary<string, string> answ = new Dictionary<string, string>();
+#if false
+            // 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));
+            }
+#endif
+
+            return answ;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await setupConf();
+            await ReloadData();
+            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 bool doBlink = false;
+        private List<MappaStatoExpl>? listMSE = null;
+
+        #endregion Private Fields
+
+        #region Private Methods
+
+        private void disposeTimers()
+        {
+            fastTimer.Elapsed -= ElapsedFastTimer;
+            fastTimer.Stop();
+            fastTimer.Dispose();
+            slowTimer.Elapsed -= ElapsedSlowTimer;
+            slowTimer.Stop();
+            slowTimer.Dispose();
+        }
+
+        private async Task ReloadData()
+        {
+            // leggo stato server...
+            fastTimer.Interval = fastRefreshMs * 3;
+            var res = await Http.GetAsync("api/MSE/checkAlive");
+            Console.WriteLine("GetAsync end");
+            if (res.IsSuccessStatusCode)
+            {
+#if DEBUG
+                // hack: legge 4 volte i dati x stressare sistema
+                var singleData = await Http.GetFromJsonAsync<List<MappaStatoExpl>>("api/MSE");
+                listMSE = new List<MappaStatoExpl>();
+                for (int i = 0; i < 4; i++)
+                {
+                    listMSE.AddRange(singleData);
+                }
+#else
+            listMSE = await Http.GetFromJsonAsync<List<MappaStatoExpl>>("api/MSE");
+#endif
+                fastTimer.Interval = fastRefreshMs;
+            }
+            else
+            {
+                Console.WriteLine("Error in request");
+                listMSE = null;
+                await Task.Delay(100);
+                await InvokeAsync(() => StateHasChanged());
+            }
+            Console.WriteLine("ReloadData end");
+        }
+
+        private async Task setupConf()
+        {
+#if false
+            CurrConfig = await MMDataService.ConfigGetAll();
+            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);
+                getConfVal("sART", ref showArt);
+
+                Log.Info($"Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshMs: {fastRefreshMs}");
+            }
+#endif
+        }
+
+        #endregion Private Methods
+    }
+}

MP.WASM.Mon/Client/Program.cs

@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using MP.WASM.Mon.Client;
+
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
+
+builder.Services.AddScoped(sp => new HttpClient { 
+    BaseAddress = new Uri(builder.HostEnvironment.BaseAddress),
+    Timeout = TimeSpan.FromMilliseconds(900)
+});
+
+await builder.Build().RunAsync();

MP.WASM.Mon/Client/Properties/launchSettings.json

@@ -0,0 +1,30 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:36626",
+      "sslPort": 44354
+    }
+  },
+  "profiles": {
+    "MP.WASM.Mon": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "https://localhost:7165;http://localhost:5165",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

MP.WASM.Mon/Client/Shared/MainLayout.razor

@@ -0,0 +1,35 @@
+@inherits LayoutComponentBase
+
+@*<div class="page">
+    <div class="sidebar">
+        <NavMenu />
+    </div>
+
+    <main>
+        <div class="top-row px-4">
+            <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
+        </div>
+
+        <article class="content px-4">
+            @Body
+        </article>
+    </main>
+</div>*@
+
+
+<PageTitle>MP.Mon</PageTitle>
+
+<div class="page">
+    <main>
+        <div class="top-row px-4 justify-content-between">
+            <CmpHeader></CmpHeader>
+        </div>
+
+        <article class="content p-0">
+            @Body
+        </article>
+        <div class="fixed-bottom bottom-row px-2">
+            <CmpFooter></CmpFooter>
+        </div>
+    </main>
+</div>

MP.WASM.Mon/Client/Shared/MainLayout.razor.css

@@ -0,0 +1,101 @@
+.page {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+}
+
+main {
+    flex: 1;
+}
+
+.top-row {
+    background-color: #000000;
+    /*border-bottom: 1px solid #696969;*/
+    color: #696969;
+    font-size: 1.4em;
+    height: 3rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+}
+
+.mainHead {
+    font-size: 1.7rem;
+}
+
+.top-row ::deep a,
+.top-row .btn-link {
+    white-space: nowrap;
+    margin-left: 1.5rem;
+}
+
+.top-row a:first-child {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.bottom-row {
+    color: #dedede;
+    background-color: #000000;
+    height: 1.5rem;
+    align-items: center;
+}
+
+@media (max-width: 640.98px) {
+    .top-row:not(.auth) {
+        display: none;
+    }
+
+    .top-row.auth {
+        justify-content: space-between;
+    }
+
+    .top-row a,
+    .top-row .btn-link {
+        margin-left: 0;
+    }
+}
+
+@media (min-width: 641px) {
+    .page {
+        flex-direction: row;
+    }
+
+    .sidebar {
+        width: 15rem;
+        height: 100vh;
+        position: sticky;
+        top: 0;
+    }
+
+    .sidebarSmall {
+        width: 80px;
+        height: 100vh;
+        position: sticky;
+        top: 0;
+    }
+
+    .top-row {
+        position: sticky;
+        top: 0;
+        z-index: 1;
+    }
+
+    .top-row, article {
+        padding-left: 0.5rem !important;
+        padding-right: 0.5rem !important;
+    }
+
+    .bottom-row {
+        position: fixed;
+        bottom: 0;
+        z-index: 1;
+    }
+
+    .main > div {
+        padding-left: 0.5rem !important;
+        padding-right: 0.5rem !important;
+        /*padding-left: 2rem !important;
+        padding-right: 1.5rem !important;*/
+    }
+}

MP.WASM.Mon/Client/_Imports.razor

@@ -0,0 +1,12 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.AspNetCore.Components.WebAssembly.Http
+@using Microsoft.JSInterop
+@using MP.Data
+@using MP.WASM.Mon.Client
+@using MP.WASM.Mon.Client.Shared
+@using MP.WASM.Mon.Client.Components

MP.WASM.Mon/Client/compilerconfig.json

@@ -0,0 +1,10 @@
+[
+  {
+    "outputFile": "wwwroot/css/fonts.css",
+    "inputFile": "wwwroot/css/fonts.less"
+  },
+  {
+    "outputFile": "wwwroot/css/site.css",
+    "inputFile": "wwwroot/css/site.less"
+  }
+]

MP.WASM.Mon/Client/compilerconfig.json.defaults

@@ -0,0 +1,71 @@
+{
+  "compilers": {
+    "less": {
+      "autoPrefix": "",
+      "cssComb": "none",
+      "ieCompat": true,
+      "math": null,
+      "strictMath": false,
+      "strictUnits": false,
+      "relativeUrls": true,
+      "rootPath": "",
+      "sourceMapRoot": "",
+      "sourceMapBasePath": "",
+      "sourceMap": false
+    },
+    "sass": {
+      "autoPrefix": "",
+      "loadPaths": "",
+      "style": "expanded",
+      "relativeUrls": true,
+      "sourceMap": false
+    },
+    "nodesass": {
+      "autoPrefix": "",
+      "includePath": "",
+      "indentType": "space",
+      "indentWidth": 2,
+      "outputStyle": "nested",
+      "precision": 5,
+      "relativeUrls": true,
+      "sourceMapRoot": "",
+      "lineFeed": "",
+      "sourceMap": false
+    },
+    "stylus": {
+      "sourceMap": false
+    },
+    "babel": {
+      "sourceMap": false
+    },
+    "coffeescript": {
+      "bare": false,
+      "runtimeMode": "node",
+      "sourceMap": false
+    },
+    "handlebars": {
+      "root": "",
+      "noBOM": false,
+      "name": "",
+      "namespace": "",
+      "knownHelpersOnly": false,
+      "forcePartial": false,
+      "knownHelpers": [],
+      "commonjs": "",
+      "amd": false,
+      "sourceMap": false
+    }
+  },
+  "minifiers": {
+    "css": {
+      "enabled": true,
+      "termSemicolons": true,
+      "gzip": false
+    },
+    "javascript": {
+      "enabled": true,
+      "termSemicolons": true,
+      "gzip": false
+    }
+  }
+}

MP.WASM.Mon/Client/libman.json

@@ -0,0 +1,19 @@
+{
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": [
+    {
+      "library": "bootstrap@5.1.3",
+      "destination": "wwwroot/lib/bootstrap/"
+    },
+    {
+      "library": "bootstrap-icons@1.8.3",
+      "destination": "wwwroot/lib/bootstrap-icons/"
+    },
+    {
+      "provider": "cdnjs",
+      "library": "font-awesome@6.1.1",
+      "destination": "wwwroot/lib/font-awesome/"
+    }
+  ]
+}

MP.WASM.Mon/Client/wwwroot/css/app.css

@@ -0,0 +1,63 @@
+@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
+
+html, body {
+}
+
+h1:focus {
+    outline: none;
+}
+
+a, .btn-link {
+    color: #0071c1;
+}
+
+.btn-primary {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+}
+
+.content {
+    padding-top: 1.1rem;
+}
+
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+    #blazor-error-ui .dismiss {
+        cursor: pointer;
+        position: absolute;
+        right: 0.75rem;
+        top: 0.5rem;
+    }
+
+.blazor-error-boundary {
+    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
+    padding: 1rem 1rem 1rem 3.7rem;
+    color: white;
+}
+
+    .blazor-error-boundary::after {
+        content: "An error has occurred."
+    }

MP.WASM.Mon/Client/wwwroot/css/fonts.css

@@ -0,0 +1,30 @@
+/* lato-regular - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/lato-v17-latin-regular.eot');
+  /* IE9 Compat Modes */
+  src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');
+  /* Legacy iOS */
+}
+/* roboto-regular - latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/roboto-v27-latin-regular.eot');
+  /* IE9 Compat Modes */
+  src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');
+  /* Legacy iOS */
+}
+/* roboto-condensed-regular - latin */
+@font-face {
+  font-family: 'Roboto Condensed';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/roboto-condensed-v19-latin-regular.eot');
+  /* IE9 Compat Modes */
+  src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg');
+  /* Legacy iOS */
+}

MP.WASM.Mon/Client/wwwroot/css/fonts.less

@@ -0,0 +1,36 @@
+/* lato-regular - latin */
+@font-face {
+    font-family: 'Lato';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/lato-v17-latin-regular.eot'); /* IE9 Compat Modes */
+    src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */
+    url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */
+}
+/* roboto-regular - latin */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/roboto-v27-latin-regular.eot'); /* IE9 Compat Modes */
+    src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */
+    url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
+}
+/* roboto-condensed-regular - latin */
+@font-face {
+    font-family: 'Roboto Condensed';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/roboto-condensed-v19-latin-regular.eot'); /* IE9 Compat Modes */
+    src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */
+    url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg'); /* Legacy iOS */
+}

MP.WASM.Mon/Client/wwwroot/css/fonts.min.css

@@ -0,0 +1 @@
+@font-face{font-family:'Lato';font-style:normal;font-weight:400;src:url('../fonts/lato-v17-latin-regular.eot?');src:local(''),url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/lato-v17-latin-regular.woff2') format('woff2'),url('../fonts/lato-v17-latin-regular.woff') format('woff'),url('../fonts/lato-v17-latin-regular.ttf') format('truetype'),url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/roboto-v27-latin-regular.eot?');src:local(''),url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'),url('../fonts/roboto-v27-latin-regular.woff') format('woff'),url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'),url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('../fonts/roboto-condensed-v19-latin-regular.eot?');src:local(''),url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'),url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'),url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'),url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg');}

MP.WASM.Mon/Client/wwwroot/css/open-iconic/FONT-LICENSE

@@ -0,0 +1,86 @@
+SIL OPEN FONT LICENSE Version 1.1
+
+Copyright (c) 2014 Waybury
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

MP.WASM.Mon/Client/wwwroot/css/open-iconic/ICON-LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Waybury
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

MP.WASM.Mon/Client/wwwroot/css/open-iconic/README.md

@@ -0,0 +1,114 @@
+[Open Iconic v1.1.1](http://useiconic.com/open)
+===========
+
+### Open Iconic is the open source sibling of [Iconic](http://useiconic.com). It is a hyper-legible collection of 223 icons with a tiny footprint—ready to use with Bootstrap and Foundation. [View the collection](http://useiconic.com/open#icons)
+
+
+
+## What's in Open Iconic?
+
+* 223 icons designed to be legible down to 8 pixels
+* Super-light SVG files - 61.8 for the entire set 
+* SVG sprite—the modern replacement for icon fonts
+* Webfont (EOT, OTF, SVG, TTF, WOFF), PNG and WebP formats
+* Webfont stylesheets (including versions for Bootstrap and Foundation) in CSS, LESS, SCSS and Stylus formats
+* PNG and WebP raster images in 8px, 16px, 24px, 32px, 48px and 64px.
+
+
+## Getting Started
+
+#### For code samples and everything else you need to get started with Open Iconic, check out our [Icons](http://useiconic.com/open#icons) and [Reference](http://useiconic.com/open#reference) sections.
+
+### General Usage
+
+#### Using Open Iconic's SVGs
+
+We like SVGs and we think they're the way to display icons on the web. Since Open Iconic are just basic SVGs, we suggest you display them like you would any other image (don't forget the `alt` attribute).
+
+```
+<img src="/open-iconic/svg/icon-name.svg" alt="icon name">
+```
+
+#### Using Open Iconic's SVG Sprite
+
+Open Iconic also comes in a SVG sprite which allows you to display all the icons in the set with a single request. It's like an icon font, without being a hack.
+
+Adding an icon from an SVG sprite is a little different than what you're used to, but it's still a piece of cake. *Tip: To make your icons easily style able, we suggest adding a general class to the* `<svg>` *tag and a unique class name for each different icon in the* `<use>` *tag.*  
+
+```
+<svg class="icon">
+  <use xlink:href="open-iconic.svg#account-login" class="icon-account-login"></use>
+</svg>
+```
+
+Sizing icons only needs basic CSS. All the icons are in a square format, so just set the `<svg>` tag with equal width and height dimensions.
+
+```
+.icon {
+  width: 16px;
+  height: 16px;
+}
+```
+
+Coloring icons is even easier. All you need to do is set the `fill` rule on the `<use>` tag.
+
+```
+.icon-account-login {
+  fill: #f00;
+}
+```
+
+To learn more about SVG Sprites, read [Chris Coyier's guide](http://css-tricks.com/svg-sprites-use-better-icon-fonts/).
+
+#### Using Open Iconic's Icon Font...
+
+
+##### …with Bootstrap
+
+You can find our Bootstrap stylesheets in `font/css/open-iconic-bootstrap.{css, less, scss, styl}`
+
+
+```
+<link href="/open-iconic/font/css/open-iconic-bootstrap.css" rel="stylesheet">
+```
+
+
+```
+<span class="oi oi-icon-name" title="icon name" aria-hidden="true"></span>
+```
+
+##### …with Foundation
+
+You can find our Foundation stylesheets in `font/css/open-iconic-foundation.{css, less, scss, styl}`
+
+```
+<link href="/open-iconic/font/css/open-iconic-foundation.css" rel="stylesheet">
+```
+
+
+```
+<span class="fi-icon-name" title="icon name" aria-hidden="true"></span>
+```
+
+##### …on its own
+
+You can find our default stylesheets in `font/css/open-iconic.{css, less, scss, styl}`
+
+```
+<link href="/open-iconic/font/css/open-iconic.css" rel="stylesheet">
+```
+
+```
+<span class="oi" data-glyph="icon-name" title="icon name" aria-hidden="true"></span>
+```
+
+
+## License
+
+### Icons
+
+All code (including SVG markup) is under the [MIT License](http://opensource.org/licenses/MIT).
+
+### Fonts
+
+All fonts are under the [SIL Licensed](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web).