From 186005656f422f0305f759c23258c192f58ba9ba Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 21 Feb 2024 17:54:15 +0100
Subject: [PATCH 01/10] update conf x path disegni

---
 MP-TAB3/Program.cs                  | 3 +--
 MP-TAB3/appsettings.Production.json | 2 +-
 MP-TAB3/appsettings.json            | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/MP-TAB3/Program.cs b/MP-TAB3/Program.cs
index ee5757b0..318e051f 100644
--- a/MP-TAB3/Program.cs
+++ b/MP-TAB3/Program.cs
@@ -59,9 +59,8 @@ app.UseHttpsRedirection();
 
 app.UseStaticFiles();
 
-
+// gestione static files: https://learn.microsoft.com/en-us/aspnet/core/fundamentals/static-files?view=aspnetcore-8.0
 string BasePathDisegni = configuration.GetValue<string>("OptConf:BasePathDisegni");
-
 // gestione cartella x PDF
 app.UseStaticFiles(new StaticFileOptions
 {
diff --git a/MP-TAB3/appsettings.Production.json b/MP-TAB3/appsettings.Production.json
index 89d96edf..f562d43f 100644
--- a/MP-TAB3/appsettings.Production.json
+++ b/MP-TAB3/appsettings.Production.json
@@ -7,6 +7,6 @@
     }
   },
   "OptConf": {
-    "BasePathDisegni": "c:\\inetpub\\wwwroot\\MP\\disegni"
+    "BasePathDisegni": "C:\\Steamware\\disegni"
   }
 }
diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json
index 65fd4245..684b54e4 100644
--- a/MP-TAB3/appsettings.json
+++ b/MP-TAB3/appsettings.json
@@ -24,7 +24,7 @@
     "ImgStBasePath": "C:\\Steamware\\images\\ST",
     "CodModulo": "MoonPro",
     "samplerMaxCall": 15,
-    "BasePathDisegni": "\\\\iis01\\c$\\inetpub\\wwwroot\\MP"
+    "BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni"
   },
   "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net",
   "MailKitMailSettings": {

From 7df41a840382a82aa19b148a60762bfde19e522b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 21 Feb 2024 18:31:16 +0100
Subject: [PATCH 02/10] Update cong estione embed dei PDF

---
 MP-TAB3/Components/MachineBlock.razor    |  8 +++++++-
 MP-TAB3/Components/MachineBlock.razor.cs | 10 ++++++++++
 MP-TAB3/MP-TAB3.csproj                   |  2 +-
 MP-TAB3/Resources/ChangeLog.html         |  2 +-
 MP-TAB3/Resources/VersNum.txt            |  2 +-
 MP-TAB3/Resources/manifest.xml           |  2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 2435062b..b9865128 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -236,7 +236,8 @@ else
                     </div>
                     <div class="col-2">
                         <div class="px-1 w-100">
-                            <a target="_blank" href="@($"disegni/{RecMSE.CodArticolo}.pdf")" class="btn btn-sm btn-secondary w-100"><i class="fa-regular fa-file-pdf"></i></a>
+                            @* <a target="_blank" href="@($"disegni/{RecMSE.CodArticolo}.pdf")" class="btn btn-sm btn-secondary w-100"><i class="fa-regular fa-file-pdf"></i></a> *@
+                            <button class="btn btn-sm btn-info w-100" @onclick="ToggleDraw"><i class="fa-regular fa-file-pdf"></i></button>
                         </div>
                     </div>
                 </div>
@@ -245,3 +246,8 @@ else
 
     }
 }
+
+@if (showDraw)
+{
+    <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="800px" />
+}
\ No newline at end of file
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs
index c129bc10..4de27c7b 100644
--- a/MP-TAB3/Components/MachineBlock.razor.cs
+++ b/MP-TAB3/Components/MachineBlock.razor.cs
@@ -37,6 +37,16 @@ namespace MP_TAB3.Components
 
         #endregion Public Properties
 
+        private bool showDraw { get; set; } = false;
+
+        /// <summary>
+        /// Toggle visibilità button
+        /// </summary>
+        protected void ToggleDraw()
+        {
+            showDraw = !showDraw;
+        }
+
         #region Public Methods
 
         /// <summary>
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 836d3efe..eae5e9b8 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2402.2117</Version>
+      <Version>6.16.2402.2118</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 3cfc36eb..f9b00273 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2402.2117</h4>
+    <h4>Versione: 6.16.2402.2118</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 5fd8124c..58918492 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.2117
+6.16.2402.2118
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 781ee989..8179e600 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.2117</version>
+  <version>6.16.2402.2118</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From ee17743d078d1c3fefc76a0410bd0b5e6ee082a6 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 21 Feb 2024 18:36:44 +0100
Subject: [PATCH 03/10] Altro test componente x tablet

---
 MP-TAB3/Components/MachineBlock.razor | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index b9865128..9b7be130 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -247,7 +247,9 @@ else
     }
 }
 
-@if (showDraw)
+@if (showDraw && RecMSE != null)
 {
-    <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="800px" />
+    <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="800px" />
+
+    @* <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="800px" /> *@
 }
\ No newline at end of file

From 68c66fec24d6f85fd83ede9e6f9b373d4b2ea9f8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 21 Feb 2024 18:42:14 +0100
Subject: [PATCH 04/10] test con iframe

---
 MP-TAB3/Components/MachineBlock.razor | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 9b7be130..98c6765a 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -249,7 +249,10 @@ else
 
 @if (showDraw && RecMSE != null)
 {
-    <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="800px" />
+    <iframe src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" />
+
+
+    @* <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" /> *@
 
     @* <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="800px" /> *@
 }
\ No newline at end of file

From e390874ef63bc7c7a4373a695f50a7c22a496ea7 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 21 Feb 2024 18:49:39 +0100
Subject: [PATCH 05/10] Aggiunto test mobile/desktop

---
 MP-TAB3/Components/MachineBlock.razor    | 17 +++++++----
 MP-TAB3/Components/MachineBlock.razor.cs | 38 ++++++++++++++----------
 MP-TAB3/Pages/_Layout.cshtml             |  1 +
 MP-TAB3/wwwroot/lib/Utils.js             |  3 ++
 4 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 MP-TAB3/wwwroot/lib/Utils.js

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 98c6765a..06879b3d 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -249,10 +249,15 @@ else
 
 @if (showDraw && RecMSE != null)
 {
-    <iframe src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" />
-
-
-    @* <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" /> *@
-
-    @* <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="800px" /> *@
+    if (isMobile)
+    {
+        <h3>Mobile</h3>
+        <iframe src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="50%" />
+    }
+    else
+    {
+        <h3>DESKTOP</h3>
+        <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" />
+    }
+    @* <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="50%" /> *@
 }
\ No newline at end of file
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs
index 4de27c7b..30c96bf3 100644
--- a/MP-TAB3/Components/MachineBlock.razor.cs
+++ b/MP-TAB3/Components/MachineBlock.razor.cs
@@ -5,6 +5,7 @@ using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.Services;
 using NLog;
+using System;
 
 namespace MP_TAB3.Components
 {
@@ -37,16 +38,6 @@ namespace MP_TAB3.Components
 
         #endregion Public Properties
 
-        private bool showDraw { get; set; } = false;
-
-        /// <summary>
-        /// Toggle visibilità button
-        /// </summary>
-        protected void ToggleDraw()
-        {
-            showDraw = !showDraw;
-        }
-
         #region Public Methods
 
         /// <summary>
@@ -93,15 +84,10 @@ namespace MP_TAB3.Components
         #region Protected Fields
 
         protected string baseCss = "sem";
-
         protected int currMaxVal = 1000;
-
         protected List<CircleGaugeMulti.CircSegm> innerCircleVals = new List<CircleGaugeMulti.CircSegm>();
-
         protected int kaFactor = 60 / 2;
-
         protected int maxVal = 1000;
-
         protected List<CircleGaugeMulti.CircSegm> outerCircleVals = new List<CircleGaugeMulti.CircSegm>();
 
         #endregion Protected Fields
@@ -158,9 +144,10 @@ namespace MP_TAB3.Components
             if (firstRender)
             {
                 //await getWDim();
-                StateHasChanged();
+                await InvokeAsync(StateHasChanged);
             }
             isLoading = RecMSE == null;
+            isMobile = await JSRuntime.InvokeAsync<bool>("isDevice");
             await Task.Delay(1);
             //return base.OnAfterRenderAsync(firstRender);
         }
@@ -244,6 +231,14 @@ namespace MP_TAB3.Components
             NavMan.NavigateTo($"machine-detail");
         }
 
+        /// <summary>
+        /// Toggle visibilità button
+        /// </summary>
+        protected void ToggleDraw()
+        {
+            showDraw = !showDraw;
+        }
+
         #endregion Protected Methods
 
         #region Private Fields
@@ -254,6 +249,17 @@ namespace MP_TAB3.Components
 
         #endregion Private Fields
 
+        #region Private Properties
+
+        /// <summary>
+        /// Boolean Mobile vs Desktop
+        /// </summary>
+        private bool isMobile { get; set; }
+
+        private bool showDraw { get; set; } = false;
+
+        #endregion Private Properties
+
         #region Private Methods
 
         private string cssComStatus(string semaforo, DateTime? lastUpdateN)
diff --git a/MP-TAB3/Pages/_Layout.cshtml b/MP-TAB3/Pages/_Layout.cshtml
index b94fbe6b..dda9ce01 100644
--- a/MP-TAB3/Pages/_Layout.cshtml
+++ b/MP-TAB3/Pages/_Layout.cshtml
@@ -36,6 +36,7 @@
         <a class="dismiss">🗙</a>
     </div>
 
+    <script src="lib/Utils.js"></script>
     <script src="lib/WindowSize.js"></script>
     <script src="lib/bootstrap/js/bootstrap.bundle.js"></script>
 
diff --git a/MP-TAB3/wwwroot/lib/Utils.js b/MP-TAB3/wwwroot/lib/Utils.js
new file mode 100644
index 00000000..951d5960
--- /dev/null
+++ b/MP-TAB3/wwwroot/lib/Utils.js
@@ -0,0 +1,3 @@
+function isDevice() {
+    return /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini|mobile/i.test(navigator.userAgent);
+}
\ No newline at end of file

From ca67fed604c98ae75d05aae5843c7c88630d3af2 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 21 Feb 2024 18:54:04 +0100
Subject: [PATCH 06/10] Modifica layout x reconnect handler

---
 MP-TAB3/Pages/_Layout.cshtml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/MP-TAB3/Pages/_Layout.cshtml b/MP-TAB3/Pages/_Layout.cshtml
index dda9ce01..cf2ede0c 100644
--- a/MP-TAB3/Pages/_Layout.cshtml
+++ b/MP-TAB3/Pages/_Layout.cshtml
@@ -43,7 +43,7 @@
     <script src="_framework/blazor.server.js" autostart="false"></script>
 
     @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
-    <script>
+    @* <script>
         Blazor.start({
             reconnectionOptions: {
                 maxRetries: 600,
@@ -67,6 +67,22 @@
                 }
             });
         });
+    </script> *@
+    <script>
+        Blazor.start({
+            reconnectionOptions: {
+                maxRetries: 600,
+                retryIntervalMilliseconds: 1000
+            },
+            reconnectionHandler: {
+                onConnectionDown: (options, error) => console.error(error),
+                onConnectionUp: () => console.log("Client reconnected!")
+            }
+        }).then(() => {
+            Blazor.defaultReconnectionHandler._reconnectCallback = function (d) {
+                document.location.reload();
+            }
+        });
     </script>
 
 </body>

From 086f9a07218b1c1c65c177bd160794e6ea5e7de4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 22 Feb 2024 11:03:47 +0100
Subject: [PATCH 07/10] Fix chiave deploy da locale a globale

---
 .gitlab-ci.yml | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35fab5b7..d203ba99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -267,7 +267,7 @@ LAND:IIS01:deploy:
   needs: ["LAND:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
     
 PROG:IIS01:deploy:
   stage: deploy
@@ -286,7 +286,7 @@ PROG:IIS01:deploy:
   needs: ["PROG:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 STAT:IIS01:deploy:
   stage: deploy
@@ -305,7 +305,7 @@ STAT:IIS01:deploy:
   needs: ["STAT:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 MON:IIS01:deploy:
   stage: deploy
@@ -324,7 +324,7 @@ MON:IIS01:deploy:
   needs: ["MON:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 SPEC:IIS01:deploy:
   stage: deploy
@@ -343,7 +343,7 @@ SPEC:IIS01:deploy:
   needs: ["SPEC:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 INVE:IIS01:deploy:
   stage: deploy
@@ -362,7 +362,7 @@ INVE:IIS01:deploy:
   needs: ["INVE:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 CONF:IIS01:deploy:
   stage: deploy
@@ -381,7 +381,7 @@ CONF:IIS01:deploy:
   needs: ["CONF:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 IOC:IIS01:deploy:
   stage: deploy
@@ -400,7 +400,7 @@ IOC:IIS01:deploy:
   needs: ["IOC:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 TAB3:IIS01:deploy:
   stage: deploy
@@ -419,7 +419,7 @@ TAB3:IIS01:deploy:
   needs: ["TAB3:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 # ----- Start DEPLOY master (IIS02/IIS04) -----
 LAND:IIS02:deploy:
@@ -437,8 +437,8 @@ LAND:IIS02:deploy:
   needs: ["LAND:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
     
 PROG:IIS02:deploy:
   stage: deploy
@@ -455,8 +455,8 @@ PROG:IIS02:deploy:
   needs: ["PROG:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
    
 STAT:IIS02:deploy:
   stage: deploy
@@ -473,8 +473,8 @@ STAT:IIS02:deploy:
   needs: ["STAT:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 MON:IIS02:deploy:
   stage: deploy
@@ -491,8 +491,8 @@ MON:IIS02:deploy:
   needs: ["MON:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 SPEC:IIS02:deploy:
   stage: deploy
@@ -509,8 +509,8 @@ SPEC:IIS02:deploy:
   needs: ["SPEC:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 INVE:IIS02:deploy:
   stage: deploy
@@ -527,8 +527,8 @@ INVE:IIS02:deploy:
   needs: ["INVE:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 CONF:IIS02:deploy:
   stage: deploy
@@ -545,8 +545,8 @@ CONF:IIS02:deploy:
   needs: ["CONF:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 IOC:IIS02:deploy:
   stage: deploy
@@ -563,8 +563,8 @@ IOC:IIS02:deploy:
   needs: ["IOC:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 TAB3:IIS02:deploy:
   stage: deploy
@@ -581,8 +581,8 @@ TAB3:IIS02:deploy:
   needs: ["IOC:build"]
   script: 
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
 
 # ----- Start INSTALLER (develop/master) -----
 LAND:installer:

From b7609d22ba8f77a37693d66ab1f1226d1a3435da Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 23 Feb 2024 12:21:05 +0100
Subject: [PATCH 08/10] Modifica MON x filtrare x gruppi

---
 MP.Data/Constants.cs                   |  1 +
 MP.Data/Controllers/MpMonController.cs | 44 ++++++++++++++
 MP.Data/Services/StatusData.cs         | 79 +++++++++++++++++++++++++-
 MP.Data/Services/TabDataService.cs     |  1 +
 MP.Mon/MP.Mon.csproj                   |  5 +-
 MP.Mon/Pages/Index.razor.cs            | 35 +++++++++++-
 MP.Mon/Resources/ChangeLog.html        |  2 +-
 MP.Mon/Resources/VersNum.txt           |  2 +-
 MP.Mon/Resources/manifest.xml          |  2 +-
 9 files changed, 161 insertions(+), 10 deletions(-)

diff --git a/MP.Data/Constants.cs b/MP.Data/Constants.cs
index 4c988efc..6f31223c 100644
--- a/MP.Data/Constants.cs
+++ b/MP.Data/Constants.cs
@@ -19,6 +19,7 @@
 
 
 
+        public static string redisMacchine = "MP:MON:Cache:Macchine";
         public static string redisMseKey = "MP:MON:Cache:MSE";
         public static string redisMseKeySingle = "MP:MON:Cache:MseSingle";
 
diff --git a/MP.Data/Controllers/MpMonController.cs b/MP.Data/Controllers/MpMonController.cs
index 4d13053b..512fb20e 100644
--- a/MP.Data/Controllers/MpMonController.cs
+++ b/MP.Data/Controllers/MpMonController.cs
@@ -1,6 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using MP.Data.DatabaseModels;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -84,6 +85,49 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Elenco da tabella Macchine
+        /// </summary>
+        /// <param name="codGruppo"></param>
+        /// <returns></returns>
+        public List<Macchine> MacchineGetFilt(string codGruppo)
+        {
+            List<Macchine> dbResult = new List<Macchine>();
+            try
+            {
+                using (var dbCtx = new MoonProContext(_configuration))
+                {
+                    if (codGruppo == "*")
+                    {
+                        dbResult = dbCtx
+                                    .DbSetMacchine
+                                    .AsNoTracking()
+                                    .OrderBy(x => x.IdxMacchina)
+                                    .ToList();
+                    }
+                    else
+                    {
+                        dbResult = dbCtx
+                                    .DbSetGrp2Macc
+                                    .Where(g => g.CodGruppo == codGruppo)
+                                    .Join(dbCtx.DbSetMacchine,
+                                        g => g.IdxMacchina,
+                                        m => m.IdxMacchina,
+                                        (g, m) => m
+                                    )
+                                    .AsNoTracking()
+                                    .OrderBy(x => x.IdxMacchina)
+                                    .ToList();
+                    }
+                }
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione in MacchineGetFilt{Environment.NewLine}{exc}");
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco da tabella MappaStatoExpl
         /// </summary>
diff --git a/MP.Data/Services/StatusData.cs b/MP.Data/Services/StatusData.cs
index 365c88f2..3f89c3d4 100644
--- a/MP.Data/Services/StatusData.cs
+++ b/MP.Data/Services/StatusData.cs
@@ -51,6 +51,10 @@ namespace MP.Data.Services
                 maxAge = _configuration.GetValue<int>("OptConf:msRefresh");
             }
 
+            // sistemo i timespan
+            LongCache = TimeSpan.FromSeconds(300);
+            FastCache = TimeSpan.FromMilliseconds(maxAge);
+
             // setup conf IOB da dizionario
             tryLoadIobTags();
         }
@@ -110,9 +114,66 @@ namespace MP.Data.Services
             return outVal;
         }
 
-        public Task<List<Macchine>> MacchineGetAll()
+        public async Task<List<Macchine>> MacchineGetAll()
         {
-            return Task.FromResult(dbController.MacchineGetAll());
+            Stopwatch sw = new Stopwatch();
+            string source = "DB";
+            sw.Start();
+            List<Macchine>? result = new List<Macchine>();
+            // cerco in redis...
+            string currKey = $"{Constants.redisMacchine}:ALL";
+            RedisValue rawData = redisDb.StringGet(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<Macchine>>($"{rawData}");
+                source = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.MacchineGetAll());
+                // serializzo e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(currKey, rawData, LongCache);
+            }
+            if (result == null)
+            {
+                result = new List<Macchine>();
+            }
+            sw.Stop();
+            Log.Debug($"MacchineGetAll | {source} | {sw.Elapsed.TotalMilliseconds}ms");
+            return result;
+            //return Task.FromResult(dbController.MacchineGetAll());
+        }
+
+        public async Task<List<Macchine>> MacchineGetByGruppo(string CodGruppo)
+        {
+            Stopwatch sw = new Stopwatch();
+            string source = "DB";
+            sw.Start();
+            List<Macchine>? result = new List<Macchine>();
+            // cerco in redis...
+            string currKey = $"{Constants.redisMacchine}:{CodGruppo}";
+            RedisValue rawData = redisDb.StringGet(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<Macchine>>($"{rawData}");
+                source = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.MacchineGetFilt(CodGruppo));
+                //result = dbController.MacchineGetFilt(CodGruppo);
+                // serializzo e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(currKey, rawData, LongCache);
+            }
+            if (result == null)
+            {
+                result = new List<Macchine>();
+            }
+            sw.Stop();
+            Log.Debug($"MacchineGetByGruppo | {source} | {sw.Elapsed.TotalMilliseconds}ms");
+            return result;
         }
 
         /// <summary>
@@ -205,7 +266,7 @@ namespace MP.Data.Services
                 result = await Task.FromResult(dbController.MseGetAll(maxAge));
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(Constants.redisMseKey, rawData, TimeSpan.FromMilliseconds(maxAge));
+                await redisDb.StringSetAsync(Constants.redisMseKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -236,7 +297,19 @@ namespace MP.Data.Services
         #region Private Fields
 
         private static IConfiguration _configuration = null!;
+
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Cache breve durata
+        /// </summary>
+        private TimeSpan FastCache = TimeSpan.FromSeconds(5);
+
+        /// <summary>
+        /// Cache lunga durata
+        /// </summary>
+        private TimeSpan LongCache = TimeSpan.FromSeconds(60);
+
         private int maxAge = 2000;
 
         #endregion Private Fields
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index e565156f..4e84afe1 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -2419,6 +2419,7 @@ namespace MP.Data.Services
             answ = dbTabController.RicalcMse(idxMacchina, maxAgeSec);
             await FlushOdlCache();
             await FlushCache(Constants.redisMseKey);
+            await FlushCache(Constants.redisMacchine);
             return answ;
         }
 
diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj
index 80b4093d..82a11624 100644
--- a/MP.Mon/MP.Mon.csproj
+++ b/MP.Mon/MP.Mon.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.16.2402.1919</Version>
+    <Version>6.16.2402.2312</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,8 +33,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2402.2311" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2402.2311" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="StackExchange.Redis" Version="2.6.90" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MP.Mon/Pages/Index.razor.cs b/MP.Mon/Pages/Index.razor.cs
index 57701ac4..5c6f56d2 100644
--- a/MP.Mon/Pages/Index.razor.cs
+++ b/MP.Mon/Pages/Index.razor.cs
@@ -5,6 +5,8 @@ using MP.Data.DatabaseModels;
 using MP.Data.Services;
 using Newtonsoft.Json;
 using NLog;
+using System;
+using EgwCoreLib.Razor;
 
 namespace MP.Mon.Pages
 {
@@ -25,8 +27,8 @@ namespace MP.Mon.Pages
             // dispongo i vari timers...
             disposeTimers();
             await Task.Delay(10);
-            // reload pagina
-            NavManager.NavigateTo(NavManager.Uri);
+            // reload pagina intera
+            NavManager.NavigateTo(NavManager.Uri, true);
         }
 
         public void StartTimer()
@@ -154,6 +156,8 @@ namespace MP.Mon.Pages
             return answ;
         }
 
+        private string CodGruppo = "";
+
         protected override async Task OnInitializedAsync()
         {
             await setupConf();
@@ -175,6 +179,7 @@ namespace MP.Mon.Pages
         private List<ConfigModel>? CurrConfig = null;
         private bool doBlink = false;
         private List<MappaStatoExpl>? listMSE = null;
+        private List<Macchine> listMacchine = new List<Macchine>();
         private Random rnd = new Random();
 
         #endregion Private Fields
@@ -218,9 +223,24 @@ namespace MP.Mon.Pages
             {
                 try
                 {
-                    var dataList = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(currArgs.newMessage);
+                    List<MappaStatoExpl>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(currArgs.newMessage);
                     if (dataList != null)
                     {
+                        // se ho filtro macchine --> tengo solo quelle che mi tornano...
+                        if (listMacchine != null && listMacchine.Count > 0)
+                        {
+                            List<MappaStatoExpl> listaFilt = new List<MappaStatoExpl>();
+                            foreach (var item in listMacchine)
+                            {
+                                var rigaFilt = dataList.FirstOrDefault(x => x.IdxMacchina == item.IdxMacchina);
+                                if (rigaFilt != null)
+                                {
+                                    listaFilt.Add(rigaFilt);
+                                }
+                            }
+                            dataList = listaFilt;
+                        } 
+
 #if DEBUG
                         // hack: legge 3 volte i dati x stressare sistema
                         var singleData = dataList;
@@ -272,8 +292,17 @@ namespace MP.Mon.Pages
 
                 Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshMs: {fastRefreshMs}");
             }
+            // verifico se ho richiesta filtro x codGruppo...
+            CodGruppo = NavMan.ExtractQueryStringByKey<string>("CodGruppo");
+            if (!string.IsNullOrEmpty(CodGruppo))
+            {
+                listMacchine = await MMDataService.MacchineGetByGruppo(CodGruppo);
+            }
         }
 
+        [Inject]
+        protected NavigationManager NavMan { get; set; } = null!;
+
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html
index 0cd6a0d4..ea073e0d 100644
--- a/MP.Mon/Resources/ChangeLog.html
+++ b/MP.Mon/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.16.2402.1919</h4>
+    <h4>Versione: 6.16.2402.2312</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt
index dad8f7b3..3d88ebaa 100644
--- a/MP.Mon/Resources/VersNum.txt
+++ b/MP.Mon/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.1919
+6.16.2402.2312
diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml
index f722befa..95c9183b 100644
--- a/MP.Mon/Resources/manifest.xml
+++ b/MP.Mon/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.1919</version>
+  <version>6.16.2402.2312</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>

From 3ce5ff08d504d4464345962a67e60c9ca5dd9a83 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 23 Feb 2024 12:21:24 +0100
Subject: [PATCH 09/10] Test x modifica viewer pdf.js

---
 MP-TAB3/Components/MachineBlock.razor | 2 +-
 MP-TAB3/MP-TAB3.csproj                | 2 +-
 MP-TAB3/Resources/ChangeLog.html      | 2 +-
 MP-TAB3/Resources/VersNum.txt         | 2 +-
 MP-TAB3/Resources/manifest.xml        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 06879b3d..b9a42168 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -256,7 +256,7 @@ else
     }
     else
     {
-        <h3>DESKTOP</h3>
+        <h3>Desktop</h3>
         <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" />
     }
     @* <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="50%" /> *@
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index eae5e9b8..e9354a47 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2402.2118</Version>
+      <Version>6.16.2402.2209</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index f9b00273..cb7e3886 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2402.2118</h4>
+    <h4>Versione: 6.16.2402.2209</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 58918492..8e723368 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.2118
+6.16.2402.2209
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 8179e600..2ebcfc97 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.2118</version>
+  <version>6.16.2402.2209</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 83f1ef88566e0b20168541142b0cd811202bd1c7 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 23 Feb 2024 12:24:58 +0100
Subject: [PATCH 10/10] Inclusione componente EgwCoreLib x pdf

---
 MP-TAB3/Components/MachineBlock.razor    | 6 +++---
 MP-TAB3/Components/MachineBlock.razor.cs | 4 +++-
 MP-TAB3/MP-TAB3.csproj                   | 6 +++---
 MP-TAB3/Resources/ChangeLog.html         | 2 +-
 MP-TAB3/Resources/VersNum.txt            | 2 +-
 MP-TAB3/Resources/manifest.xml           | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index b9a42168..59133270 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -249,7 +249,8 @@ else
 
 @if (showDraw && RecMSE != null)
 {
-    if (isMobile)
+    <PdfDisplay Width="100%" PdfUrl="@($"disegni/{RecMSE.CodArticolo}.pdf")" HeightList="@heightList"></PdfDisplay>
+    @*   if (isMobile)
     {
         <h3>Mobile</h3>
         <iframe src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="50%" />
@@ -258,6 +259,5 @@ else
     {
         <h3>Desktop</h3>
         <object type="application/pdf" data="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="60%" />
-    }
-    @* <embed src="@($"disegni/{RecMSE.CodArticolo}.pdf")" width="100%" height="50%" /> *@
+    } *@
 }
\ No newline at end of file
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs
index 30c96bf3..644f153c 100644
--- a/MP-TAB3/Components/MachineBlock.razor.cs
+++ b/MP-TAB3/Components/MachineBlock.razor.cs
@@ -140,7 +140,7 @@ namespace MP_TAB3.Components
         #region Protected Methods
 
         protected override async Task OnAfterRenderAsync(bool firstRender)
-        {//await Task.Delay(500);
+        {
             if (firstRender)
             {
                 //await getWDim();
@@ -251,6 +251,8 @@ namespace MP_TAB3.Components
 
         #region Private Properties
 
+        private Dictionary<string, string> heightList { get; set; } = new Dictionary<string, string>() { { "200", "200px" }, { "400", "400px" }, { "600", "600px" }, { "800", "800px" }, { "1000", "1000px" } };
+
         /// <summary>
         /// Boolean Mobile vs Desktop
         /// </summary>
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index e9354a47..95e35242 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2402.2209</Version>
+      <Version>6.16.2402.2312</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2312.1510" />
-    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2312.1510" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2402.2311" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2402.2311" />
     <PackageReference Include="StackExchange.Redis" Version="2.2.4" />
   </ItemGroup>
 
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index cb7e3886..3ed29d2e 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2402.2209</h4>
+    <h4>Versione: 6.16.2402.2312</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 8e723368..3d88ebaa 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.2209
+6.16.2402.2312
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 2ebcfc97..c167789d 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.2209</version>
+  <version>6.16.2402.2312</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>