Merge branch 'release/UpdateMonStandard'

- fine tuning cache
- test velocità recupero dati

.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,26 @@ 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

Egw.Core/licenseManGLS.cs

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

MP-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/Controllers/AppAuthController.cs

@@ -42,7 +42,7 @@ namespace MP.AppAuth.Controllers
             {
                 dbResult = localDbCtx
                             .DbSetAnagraficaGruppi
-                            .Where(x => x.TipoGruppo == codTipo || x.SelEnabled)
+                            .Where(x => x.TipoGruppo == codTipo)
                             .ToList();
             }
             return dbResult;

MP.AppAuth/MP.AppAuth.csproj

@@ -9,18 +9,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
-    <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.EntityFrameworkCore.Relational" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
+    <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/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" Version="6.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.4" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.4">
+        <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="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
-        <PackageReference Include="NLog" Version="4.7.15" />
+        <PackageReference Include="NLog" Version="5.0.1" />
     </ItemGroup>
 </Project>

MP.Land/MP.Land.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.15.2207.0419</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.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.6" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+        <PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
         <PackageReference Include="RestSharp" Version="107.1.2" />
     </ItemGroup>
 

MP.Land/Pages/About.razor

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

MP.Land/Pages/About.razor.cs

@@ -14,24 +14,27 @@ using Microsoft.JSInterop;
 using MP.Land;
 using MP.Land.Shared;
 using MP.Land.Data;
+using NLog;
 
 namespace MP.Land.Pages
 {
     public partial class About
     {
-        protected string Titolo = "";
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-        protected string Messaggio = "";
+        private string Titolo = "";
+        private string Messaggio = "";
 
-        protected string ServerStatus = "SrvState";
+        private string ServerStatus = "SrvState";
-        protected string Installazione = "Inst";
+        private string Installazione = "Inst";
-        protected string Applicazione = "App";
+        private string Applicazione = "App";
-        protected string Licenze = "#";
+        private string Licenze = "#";
-        protected DateTime Scadenza = DateTime.Today;
+        private DateTime Scadenza = DateTime.Today;
-        protected string MastKey = "########################";
+        private string MastKey = "########################";
 
-        protected string mainCss = "alert alert-info";
+        private string mainCss = "alert alert-info";
-        protected string remSrvCss = "bg-danger text-warning";
+        private string remSrvCss = "bg-warning text-secondary";
-        protected string expDateCss = "bg-danger text-warning";
+        private string expDateCss = "bg-warning text-secondary";
+        private string licenseCss = "bg-warning text-secondary";
 
         protected override async Task OnInitializedAsync()
         {
@@ -45,24 +48,33 @@ namespace MP.Land.Pages
             int cDelay = 5;
             // recupero dati
             await Task.Delay(cDelay);
-            LicServ.InitAkv();
+            try
-            Installazione = LicServ.Installazione;
+            {
-            Applicazione = LicServ.Applicazione;
+                LicServ.InitAkv();
-            MastKey = LicServ.MasterKey;
+                // verifico stati
-            await Task.Delay(cDelay);
+                ServerStatus = await LicServ.checkLimanServer();
-            var fatto = await LicServ.RefreshLicense();
+                Installazione = LicServ.Installazione;
-            await Task.Delay(cDelay);
+                Applicazione = LicServ.Applicazione;
-            Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
+                MastKey = LicServ.MasterKey;
-            // verifico stati
+                await Task.Delay(cDelay);
-            ServerStatus = await LicServ.checkLimanServer();
+                var fatto = await LicServ.RefreshLicense();
+                await Task.Delay(cDelay);
+                Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
+                licenseCss = "";
+            }
+            catch(Exception exc)
+            {
+                licenseCss = "bg-dark text-warning";
+                Log.Error($"Eccezione in reloadLicenseData:{Environment.NewLine}{exc}");
+            }
             bool okRemoteSrv = ServerStatus == "OK";
             bool okScadenza = LicServ.checkLicenseActive(LicServ.MasterKey);
             bool okNumLic = (LicServ.NumLicDb <= LicServ.NumLicRemote);
 
             // aggiornamento css secondo status colore da check
             mainCss = okNumLic ? "alert alert-success shadowBox" : "alert alert-warning shadowBox";
-            expDateCss = okScadenza ? "d-flex justify-content-between" : "d-flex justify-content-between bg-danger text-warning";
+            expDateCss = okScadenza ? "" : "bg-danger text-warning";
-            remSrvCss = okRemoteSrv ? "d-flex justify-content-between" : "d-flex justify-content-between bg-danger text-warning";
+            remSrvCss = okRemoteSrv ? "" : "bg-danger text-warning";
             await Task.Delay(cDelay);
         }
 

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) {
+        //Blazor.start().then(() => {
-            document.location.reload();
+        //    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.0419</h4>
+    <h4>Versione: 6.15.2207.0718</h4>
     <br />
     Note di rilascio:
     <ul>

MP.Land/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2207.0419
+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.0419</version>
+  <version>6.15.2207.0718</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

MP.Land/appsettings.json

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

MP.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,44 +1,22 @@
-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]
         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;
 
@@ -54,8 +32,128 @@ namespace MP.Mon.Components
         [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>
@@ -75,6 +173,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 +205,15 @@ 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 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)
@@ -207,11 +246,17 @@ namespace MP.Mon.Components
             string answ = $"{baseCss}{codColore}";
             if (doAnimate && codColore != "Ve")
             {
+#if false
                 // blink se secondo pari...
                 DateTime adesso = DateTime.Now;
                 int resto = 0;
                 Math.DivRem(adesso.Second, 2, out resto);
                 if (resto == 0)
+                {
+                    answ += "_b";
+                } 
+#endif
+                if (doBlink)
                 {
                     answ += "_b";
                 }
@@ -219,13 +264,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

@@ -3,38 +3,13 @@ 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)
@@ -71,6 +46,8 @@ namespace MP.Mon.Data
 
         #region Public Properties
 
+        public static MP.Data.Controllers.MpMonController dbController { get; set; } = null!;
+
         /// <summary>
         /// Dizionario dei tag configurati per IOB
         /// </summary>
@@ -91,6 +68,15 @@ namespace MP.Mon.Data
             dbController.Dispose();
         }
 
+        /// <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,31 +86,74 @@ 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();
+            Stopwatch stopWatch = new Stopwatch();
-            if (dbResult == null)
+            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.Trace($"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.Trace($"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 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!;
+
+        private string redisMseKey = "MP:MON:Cache:MSE";
+
+        #endregion Private Fields
+
         #region Private Methods
 
         /// <summary>
@@ -148,7 +177,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 +189,8 @@ namespace MP.Mon.Data
                                     {
                                         if (!string.IsNullOrEmpty(item.IdxMacchina))
                                         {
-                                            // converto i valori x la macchina corrente...
+                                            // converto i valori x la macchina corrente... clono in
-                                            // clono in nuovo oggetto
+                                            // nuovo oggetto
                                             var specVal = baseConf.Value.Select(i => i.Clone()).ToList();
                                             // sostituisco segnaposto
                                             foreach (var singleVal in specVal)
@@ -192,7 +222,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.1217</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="NLog" Version="5.0.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.5.61" />
+    <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>

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

@@ -8,71 +8,52 @@ namespace MP.Mon.Pages
 {
     public partial class Index : IDisposable
     {
-        #region Protected Fields
-
-        protected bool doAnimate = true;
-        protected int fastRefreshSec = 10;
-        protected int keepAliveMin = 1;
-        protected List<MappaStatoExpl>? ListMSE = null;
-        protected int maxCol = 4;
-        protected string showArt = "";
-        protected int slowRefreshSec = 300;
-
-        #endregion Protected Fields
-
-        #region Private Fields
-
-        private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-        private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
-        private List<ConfigModel>? CurrConfig = null;
-
-        #endregion Private Fields
-
-        #region Protected Properties
-
-        protected int fastRefreshMs
-        {
-            get => 1000 * fastRefreshSec;
-        }
-
-        [Inject]
-        protected MpDataService MMDataService { get; set; } = null!;
-
-        [Inject]
-        protected NavigationManager NavManager { get; set; } = null!;
-
-        protected int slowRefreshMs
-        {
-            get => 1000 * slowRefreshSec;
-        }
-
-        #endregion Protected Properties
-
         #region Public Methods
 
         public void Dispose()
         {
+#if false
             fastTimer.Stop();
             fastTimer.Dispose();
             slowTimer.Stop();
             slowTimer.Dispose();
+#endif
+            disposeTimers();
         }
 
-        public void ElapsedFastTimer(Object source, System.Timers.ElapsedEventArgs e)
+        public void ElapsedFastTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
             var pUpd = Task.Run(async () =>
             {
-                await ReloadData();
+                // secondi pari --> blink, secondi dispari --> ricarica
-                //await Task.Delay(1);
+                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)
+        public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
-            ListMSE = null;
+            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);
         }
 
@@ -92,6 +73,32 @@ namespace MP.Mon.Pages
 
         #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
+
+        [Inject]
+        protected MpDataService MMDataService { get; set; } = null!;
+
+        [Inject]
+        protected NavigationManager NavManager { get; set; } = null!;
+
+        protected int slowRefreshMs
+        {
+            get => 1000 * slowRefreshSec;
+        }
+
+        #endregion Protected Properties
+
         #region Protected Methods
 
         /// <summary>
@@ -157,7 +164,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>
@@ -183,11 +191,42 @@ namespace MP.Mon.Pages
 
         #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;
+
+        #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()
         {
-            ListMSE = await MMDataService.MseGetAll();
+#if DEBUG
+            // hack: legge 4 volte i dati x stressare sistema
+            var singleData = await MMDataService.MseGetAll();
+            listMSE = new List<MappaStatoExpl>();
+            for (int i = 0; i < 4; i++)
+            {
+                listMSE.AddRange(singleData);
+            }
+#else
+                listMSE = await MMDataService.MseGetAll();
+#endif
         }
 
         private async Task setupConf()
@@ -203,10 +242,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) {
+        Blazor.start().then(() => {
-            document.location.reload();
+            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
-        }
+                get() {
+                    return this.__reconnectionDisplay;
+                },
+                set(value) {
+                    this.__reconnectionDisplay = {
+                        show: () => value.show(),
+                        update: (d) => value.update(d),
+                        rejected: (d) => document.location.reload()
+                    }
+                }
+            });
+        });
     </script>
 
     <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.1217</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.Mon/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2206.616
+6.15.2207.1217

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.1217</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/123.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-123" viewBox="0 0 16 16">
-  <path d="M2.873 11.297V4.142H1.699L0 5.379v1.137l1.64-1.18h.06v5.961h1.174Zm3.213-5.09v-.063c0-.618.44-1.169 1.196-1.169.676 0 1.174.44 1.174 1.106 0 .624-.42 1.101-.807 1.526L4.99 10.553v.744h4.78v-.99H6.643v-.069L8.41 8.252c.65-.724 1.237-1.332 1.237-2.27C9.646 4.849 8.723 4 7.308 4c-1.573 0-2.36 1.064-2.36 2.15v.057h1.138Zm6.559 1.883h.786c.823 0 1.374.481 1.379 1.179.01.707-.55 1.216-1.421 1.21-.77-.005-1.326-.419-1.379-.953h-1.095c.042 1.053.938 1.918 2.464 1.918 1.478 0 2.642-.839 2.62-2.144-.02-1.143-.922-1.651-1.551-1.714v-.063c.535-.09 1.347-.66 1.326-1.678-.026-1.053-.933-1.855-2.359-1.845-1.5.005-2.317.88-2.348 1.898h1.116c.032-.498.498-.944 1.206-.944.703 0 1.206.435 1.206 1.07.005.64-.504 1.106-1.2 1.106h-.75v.96Z"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-activity" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M6 2a.5.5 0 0 1 .47.33L10 12.036l1.53-4.208A.5.5 0 0 1 12 7.5h3.5a.5.5 0 0 1 0 1h-3.15l-1.88 5.17a.5.5 0 0 1-.94 0L6 3.964 4.47 8.171A.5.5 0 0 1 4 8.5H.5a.5.5 0 0 1 0-1h3.15l1.88-5.17A.5.5 0 0 1 6 2Z"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-alarm-fill" viewBox="0 0 16 16">
-  <path d="M6 .5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1H9v1.07a7.001 7.001 0 0 1 3.274 12.474l.601.602a.5.5 0 0 1-.707.708l-.746-.746A6.97 6.97 0 0 1 8 16a6.97 6.97 0 0 1-3.422-.892l-.746.746a.5.5 0 0 1-.707-.708l.602-.602A7.001 7.001 0 0 1 7 2.07V1h-.5A.5.5 0 0 1 6 .5zm2.5 5a.5.5 0 0 0-1 0v3.362l-1.429 2.38a.5.5 0 1 0 .858.515l1.5-2.5A.5.5 0 0 0 8.5 9V5.5zM.86 5.387A2.5 2.5 0 1 1 4.387 1.86 8.035 8.035 0 0 0 .86 5.387zM11.613 1.86a2.5 2.5 0 1 1 3.527 3.527 8.035 8.035 0 0 0-3.527-3.527z"/>
-</svg>

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

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-alarm" viewBox="0 0 16 16">
-  <path d="M8.5 5.5a.5.5 0 0 0-1 0v3.362l-1.429 2.38a.5.5 0 1 0 .858.515l1.5-2.5A.5.5 0 0 0 8.5 9V5.5z"/>
-  <path d="M6.5 0a.5.5 0 0 0 0 1H7v1.07a7.001 7.001 0 0 0-3.273 12.474l-.602.602a.5.5 0 0 0 .707.708l.746-.746A6.97 6.97 0 0 0 8 16a6.97 6.97 0 0 0 3.422-.892l.746.746a.5.5 0 0 0 .707-.708l-.601-.602A7.001 7.001 0 0 0 9 2.07V1h.5a.5.5 0 0 0 0-1h-3zm1.038 3.018a6.093 6.093 0 0 1 .924 0 6 6 0 1 1-.924 0zM0 3.5c0 .753.333 1.429.86 1.887A8.035 8.035 0 0 1 4.387 1.86 2.5 2.5 0 0 0 0 3.5zM13.5 1c-.753 0-1.429.333-1.887.86a8.035 8.035 0 0 1 3.527 3.527A2.5 2.5 0 0 0 13.5 1z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/align-bottom.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-align-bottom" viewBox="0 0 16 16">
-  <rect width="4" height="12" x="6" y="1" rx="1"/>
-  <path d="M1.5 14a.5.5 0 0 0 0 1v-1zm13 1a.5.5 0 0 0 0-1v1zm-13 0h13v-1h-13v1z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/align-center.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-align-center" viewBox="0 0 16 16">
-  <path d="M8 1a.5.5 0 0 1 .5.5V6h-1V1.5A.5.5 0 0 1 8 1zm0 14a.5.5 0 0 1-.5-.5V10h1v4.5a.5.5 0 0 1-.5.5zM2 7a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V7z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/align-end.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-align-end" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M14.5 1a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 1 0v-13a.5.5 0 0 0-.5-.5z"/>
-  <path d="M13 7a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V7z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/align-middle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-align-middle" viewBox="0 0 16 16">
-  <path d="M6 13a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1v10zM1 8a.5.5 0 0 0 .5.5H6v-1H1.5A.5.5 0 0 0 1 8zm14 0a.5.5 0 0 1-.5.5H10v-1h4.5a.5.5 0 0 1 .5.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/align-start.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-align-start" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1.5 1a.5.5 0 0 1 .5.5v13a.5.5 0 0 1-1 0v-13a.5.5 0 0 1 .5-.5z"/>
-  <path d="M3 7a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/align-top.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-align-top" viewBox="0 0 16 16">
-  <rect width="4" height="12" rx="1" transform="matrix(1 0 0 -1 6 15)"/>
-  <path d="M1.5 2a.5.5 0 0 1 0-1v1zm13-1a.5.5 0 0 1 0 1V1zm-13 0h13v1h-13V1z"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-alt" viewBox="0 0 16 16">
-  <path d="M1 13.5a.5.5 0 0 0 .5.5h3.797a.5.5 0 0 0 .439-.26L11 3h3.5a.5.5 0 0 0 0-1h-3.797a.5.5 0 0 0-.439.26L5 13H1.5a.5.5 0 0 0-.5.5zm10 0a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 0-.5.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/app-indicator.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-app-indicator" viewBox="0 0 16 16">
-  <path d="M5.5 2A3.5 3.5 0 0 0 2 5.5v5A3.5 3.5 0 0 0 5.5 14h5a3.5 3.5 0 0 0 3.5-3.5V8a.5.5 0 0 1 1 0v2.5a4.5 4.5 0 0 1-4.5 4.5h-5A4.5 4.5 0 0 1 1 10.5v-5A4.5 4.5 0 0 1 5.5 1H8a.5.5 0 0 1 0 1H5.5z"/>
-  <path d="M16 3a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-app" viewBox="0 0 16 16">
-  <path d="M11 2a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3H5a3 3 0 0 1-3-3V5a3 3 0 0 1 3-3h6zM5 1a4 4 0 0 0-4 4v6a4 4 0 0 0 4 4h6a4 4 0 0 0 4-4V5a4 4 0 0 0-4-4H5z"/>
-</svg>

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

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-apple" viewBox="0 0 16 16">
-  <path d="M11.182.008C11.148-.03 9.923.023 8.857 1.18c-1.066 1.156-.902 2.482-.878 2.516.024.034 1.52.087 2.475-1.258.955-1.345.762-2.391.728-2.43zm3.314 11.733c-.048-.096-2.325-1.234-2.113-3.422.212-2.189 1.675-2.789 1.698-2.854.023-.065-.597-.79-1.254-1.157a3.692 3.692 0 0 0-1.563-.434c-.108-.003-.483-.095-1.254.116-.508.139-1.653.589-1.968.607-.316.018-1.256-.522-2.267-.665-.647-.125-1.333.131-1.824.328-.49.196-1.422.754-2.074 2.237-.652 1.482-.311 3.83-.067 4.56.244.729.625 1.924 1.273 2.796.576.984 1.34 1.667 1.659 1.899.319.232 1.219.386 1.843.067.502-.308 1.408-.485 1.766-.472.357.013 1.061.154 1.782.539.571.197 1.111.115 1.652-.105.541-.221 1.324-1.059 2.238-2.758.347-.79.505-1.217.473-1.282z"/>
-  <path d="M11.182.008C11.148-.03 9.923.023 8.857 1.18c-1.066 1.156-.902 2.482-.878 2.516.024.034 1.52.087 2.475-1.258.955-1.345.762-2.391.728-2.43zm3.314 11.733c-.048-.096-2.325-1.234-2.113-3.422.212-2.189 1.675-2.789 1.698-2.854.023-.065-.597-.79-1.254-1.157a3.692 3.692 0 0 0-1.563-.434c-.108-.003-.483-.095-1.254.116-.508.139-1.653.589-1.968.607-.316.018-1.256-.522-2.267-.665-.647-.125-1.333.131-1.824.328-.49.196-1.422.754-2.074 2.237-.652 1.482-.311 3.83-.067 4.56.244.729.625 1.924 1.273 2.796.576.984 1.34 1.667 1.659 1.899.319.232 1.219.386 1.843.067.502-.308 1.408-.485 1.766-.472.357.013 1.061.154 1.782.539.571.197 1.111.115 1.652-.105.541-.221 1.324-1.059 2.238-2.758.347-.79.505-1.217.473-1.282z"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-archive-fill" viewBox="0 0 16 16">
-  <path d="M12.643 15C13.979 15 15 13.845 15 12.5V5H1v7.5C1 13.845 2.021 15 3.357 15h9.286zM5.5 7h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1zM.8 1a.8.8 0 0 0-.8.8V3a.8.8 0 0 0 .8.8h14.4A.8.8 0 0 0 16 3V1.8a.8.8 0 0 0-.8-.8H.8z"/>
-</svg>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-archive" viewBox="0 0 16 16">
-  <path d="M0 2a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1v7.5a2.5 2.5 0 0 1-2.5 2.5h-9A2.5 2.5 0 0 1 1 12.5V5a1 1 0 0 1-1-1V2zm2 3v7.5A1.5 1.5 0 0 0 3.5 14h9a1.5 1.5 0 0 0 1.5-1.5V5H2zm13-3H1v2h14V2zM5 7.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-90deg-down.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-90deg-down" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M4.854 14.854a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L4 13.293V3.5A2.5 2.5 0 0 1 6.5 1h8a.5.5 0 0 1 0 1h-8A1.5 1.5 0 0 0 5 3.5v9.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-90deg-left.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-90deg-left" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1.146 4.854a.5.5 0 0 1 0-.708l4-4a.5.5 0 1 1 .708.708L2.707 4H12.5A2.5 2.5 0 0 1 15 6.5v8a.5.5 0 0 1-1 0v-8A1.5 1.5 0 0 0 12.5 5H2.707l3.147 3.146a.5.5 0 1 1-.708.708l-4-4z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-90deg-right.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-90deg-right" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M14.854 4.854a.5.5 0 0 0 0-.708l-4-4a.5.5 0 0 0-.708.708L13.293 4H3.5A2.5 2.5 0 0 0 1 6.5v8a.5.5 0 0 0 1 0v-8A1.5 1.5 0 0 1 3.5 5h9.793l-3.147 3.146a.5.5 0 0 0 .708.708l4-4z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-90deg-up.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-90deg-up" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M4.854 1.146a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L4 2.707V12.5A2.5 2.5 0 0 0 6.5 15h8a.5.5 0 0 0 0-1h-8A1.5 1.5 0 0 1 5 12.5V2.707l3.146 3.147a.5.5 0 1 0 .708-.708l-4-4z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-bar-down.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-bar-down" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1 3.5a.5.5 0 0 1 .5-.5h13a.5.5 0 0 1 0 1h-13a.5.5 0 0 1-.5-.5zM8 6a.5.5 0 0 1 .5.5v5.793l2.146-2.147a.5.5 0 0 1 .708.708l-3 3a.5.5 0 0 1-.708 0l-3-3a.5.5 0 0 1 .708-.708L7.5 12.293V6.5A.5.5 0 0 1 8 6z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-bar-left.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-bar-left" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M12.5 15a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5zM10 8a.5.5 0 0 1-.5.5H3.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L3.707 7.5H9.5a.5.5 0 0 1 .5.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-bar-right.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-bar-right" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M6 8a.5.5 0 0 0 .5.5h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L12.293 7.5H6.5A.5.5 0 0 0 6 8zm-2.5 7a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-bar-up.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-bar-up" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M8 10a.5.5 0 0 0 .5-.5V3.707l2.146 2.147a.5.5 0 0 0 .708-.708l-3-3a.5.5 0 0 0-.708 0l-3 3a.5.5 0 1 0 .708.708L7.5 3.707V9.5a.5.5 0 0 0 .5.5zm-7 2.5a.5.5 0 0 1 .5-.5h13a.5.5 0 0 1 0 1h-13a.5.5 0 0 1-.5-.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-clockwise.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
-  <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-counterclockwise.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-counterclockwise" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.417A6 6 0 1 0 8 2v1z"/>
-  <path d="M8 4.466V.534a.25.25 0 0 0-.41-.192L5.23 2.308a.25.25 0 0 0 0 .384l2.36 1.966A.25.25 0 0 0 8 4.466z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-circle-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-circle-fill" viewBox="0 0 16 16">
-  <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8.5 4.5a.5.5 0 0 0-1 0v5.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V4.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-circle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-circle" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1 8a7 7 0 1 0 14 0A7 7 0 0 0 1 8zm15 0A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8.5 4.5a.5.5 0 0 0-1 0v5.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V4.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-left-circle-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-left-circle-fill" viewBox="0 0 16 16">
-  <path d="M16 8A8 8 0 1 0 0 8a8 8 0 0 0 16 0zm-5.904-2.803a.5.5 0 1 1 .707.707L6.707 10h2.768a.5.5 0 0 1 0 1H5.5a.5.5 0 0 1-.5-.5V6.525a.5.5 0 0 1 1 0v2.768l4.096-4.096z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-left-circle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-left-circle" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1 8a7 7 0 1 0 14 0A7 7 0 0 0 1 8zm15 0A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-5.904-2.854a.5.5 0 1 1 .707.708L6.707 9.95h2.768a.5.5 0 1 1 0 1H5.5a.5.5 0 0 1-.5-.5V6.475a.5.5 0 1 1 1 0v2.768l4.096-4.097z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-left-square-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-left-square-fill" viewBox="0 0 16 16">
-  <path d="M2 16a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2zm8.096-10.803L6 9.293V6.525a.5.5 0 0 0-1 0V10.5a.5.5 0 0 0 .5.5h3.975a.5.5 0 0 0 0-1H6.707l4.096-4.096a.5.5 0 1 0-.707-.707z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-left-square.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-left-square" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M15 2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2zM0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm10.096 3.146a.5.5 0 1 1 .707.708L6.707 9.95h2.768a.5.5 0 1 1 0 1H5.5a.5.5 0 0 1-.5-.5V6.475a.5.5 0 1 1 1 0v2.768l4.096-4.097z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-left.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-left" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M2 13.5a.5.5 0 0 0 .5.5h6a.5.5 0 0 0 0-1H3.707L13.854 2.854a.5.5 0 0 0-.708-.708L3 12.293V7.5a.5.5 0 0 0-1 0v6z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-right-circle-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-right-circle-fill" viewBox="0 0 16 16">
-  <path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm5.904-2.803a.5.5 0 1 0-.707.707L9.293 10H6.525a.5.5 0 0 0 0 1H10.5a.5.5 0 0 0 .5-.5V6.525a.5.5 0 0 0-1 0v2.768L5.904 5.197z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-right-circle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-right-circle" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1 8a7 7 0 1 0 14 0A7 7 0 0 0 1 8zm15 0A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.854 5.146a.5.5 0 1 0-.708.708L9.243 9.95H6.475a.5.5 0 1 0 0 1h3.975a.5.5 0 0 0 .5-.5V6.475a.5.5 0 1 0-1 0v2.768L5.854 5.146z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-right-square-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-right-square-fill" viewBox="0 0 16 16">
-  <path d="M14 16a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12zM5.904 5.197 10 9.293V6.525a.5.5 0 0 1 1 0V10.5a.5.5 0 0 1-.5.5H6.525a.5.5 0 0 1 0-1h2.768L5.197 5.904a.5.5 0 0 1 .707-.707z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-right-square.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-right-square" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M15 2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2zM0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm5.854 3.146a.5.5 0 1 0-.708.708L9.243 9.95H6.475a.5.5 0 1 0 0 1h3.975a.5.5 0 0 0 .5-.5V6.475a.5.5 0 1 0-1 0v2.768L5.854 5.146z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-right.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-right" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M14 13.5a.5.5 0 0 1-.5.5h-6a.5.5 0 0 1 0-1h4.793L2.146 2.854a.5.5 0 1 1 .708-.708L13 12.293V7.5a.5.5 0 0 1 1 0v6z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-short.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-short" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M8 4a.5.5 0 0 1 .5.5v5.793l2.146-2.147a.5.5 0 0 1 .708.708l-3 3a.5.5 0 0 1-.708 0l-3-3a.5.5 0 1 1 .708-.708L7.5 10.293V4.5A.5.5 0 0 1 8 4z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-square-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-square-fill" viewBox="0 0 16 16">
-  <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v5.793l2.146-2.147a.5.5 0 0 1 .708.708l-3 3a.5.5 0 0 1-.708 0l-3-3a.5.5 0 1 1 .708-.708L7.5 10.293V4.5a.5.5 0 0 1 1 0z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-square.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-square" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M15 2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2zM0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm8.5 2.5a.5.5 0 0 0-1 0v5.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V4.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down-up.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down-up" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M11.5 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L11 2.707V14.5a.5.5 0 0 0 .5.5zm-7-14a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L4 13.293V1.5a.5.5 0 0 1 .5-.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-down.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-left-circle-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left-circle-fill" viewBox="0 0 16 16">
-  <path d="M8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0zm3.5 7.5a.5.5 0 0 1 0 1H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-left-circle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left-circle" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1 8a7 7 0 1 0 14 0A7 7 0 0 0 1 8zm15 0A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-4.5-.5a.5.5 0 0 1 0 1H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-left-right.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left-right" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M1 11.5a.5.5 0 0 0 .5.5h11.793l-3.147 3.146a.5.5 0 0 0 .708.708l4-4a.5.5 0 0 0 0-.708l-4-4a.5.5 0 0 0-.708.708L13.293 11H1.5a.5.5 0 0 0-.5.5zm14-7a.5.5 0 0 1-.5.5H2.707l3.147 3.146a.5.5 0 1 1-.708.708l-4-4a.5.5 0 0 1 0-.708l4-4a.5.5 0 1 1 .708.708L2.707 4H14.5a.5.5 0 0 1 .5.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-left-short.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left-short" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M12 8a.5.5 0 0 1-.5.5H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5a.5.5 0 0 1 .5.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-left-square-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left-square-fill" viewBox="0 0 16 16">
-  <path d="M16 14a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12zm-4.5-6.5H5.707l2.147-2.146a.5.5 0 1 0-.708-.708l-3 3a.5.5 0 0 0 0 .708l3 3a.5.5 0 0 0 .708-.708L5.707 8.5H11.5a.5.5 0 0 0 0-1z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-left-square.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left-square" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M15 2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2zM0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm11.5 5.5a.5.5 0 0 1 0 1H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5z"/>
-</svg>

MP.Mon/wwwroot/lib/bootstrap-icons/icons/arrow-left.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z"/>
-</svg>