From 14b9232d659a76b7c9437276110bcb9dec7440bd Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 9 Apr 2025 08:41:19 +0200
Subject: [PATCH] Update x fix Scanner Barcode

---
 MP-TAB3/Components/MachineBlock.razor.cs      | 27 ++++++++--
 MP-TAB3/Components/PlaceholderStatusMap.razor |  4 +-
 .../Components/PlaceholderStatusMap.razor.css | 12 ++---
 .../PlaceholderStatusMap.razor.less           | 12 ++---
 .../PlaceholderStatusMap.razor.min.css        |  2 +-
 MP-TAB3/MP-TAB3.csproj                        |  6 +--
 MP-TAB3/Pages/RegNewDevice.razor              |  1 +
 MP-TAB3/Pages/RegNewDevice.razor.cs           |  2 +-
 MP-TAB3/Pages/_Layout.cshtml                  | 51 +------------------
 MP-TAB3/Resources/ChangeLog.html              |  2 +-
 MP-TAB3/Resources/VersNum.txt                 |  2 +-
 MP-TAB3/Resources/manifest.xml                |  2 +-
 MP-TAB3/appsettings.json                      |  2 +-
 MP.Data/MP.Data.csproj                        |  2 +-
 MP.TaskMan/MP.TaskMan.csproj                  |  4 +-
 15 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs
index 24463263..3b6e48d9 100644
--- a/MP-TAB3/Components/MachineBlock.razor.cs
+++ b/MP-TAB3/Components/MachineBlock.razor.cs
@@ -321,7 +321,14 @@ namespace MP_TAB3.Components
             {
                 // se configurata uso cartella virtuale... altrimenti cartella processo
                 string baseUrl = config.GetValue<string>("SpecialConf:AppUrl") ?? (config.GetValue<string>("OptConf:AppUrl") ?? "");
-                imgBasePath = $"{baseUrl}/macchine";
+                if (baseUrl.EndsWith("//"))
+                {
+                    imgBasePath = $"{baseUrl}macchine";
+                }
+                else
+                {
+                    imgBasePath = $"{baseUrl}/macchine";
+                } 
             }
             if (string.IsNullOrEmpty(url.ToString()))
             {
@@ -365,7 +372,14 @@ namespace MP_TAB3.Components
             await ReloadXDL(true);
             // se configurata uso cartella virtuale... altrimenti cartella processo
             string baseUrl = config.GetValue<string>("SpecialConf:AppUrl") ?? (config.GetValue<string>("OptConf:AppUrl") ?? "");
-            imgBasePath = $"{baseUrl}/macchine";
+            if (baseUrl.EndsWith(@"/"))
+            {
+                imgBasePath = $"{baseUrl}macchine";
+            }
+            else
+            {
+                imgBasePath = $"{baseUrl}/macchine";
+            }
             await loadDetails();
             detailLoaded = true;
         }
@@ -378,7 +392,14 @@ namespace MP_TAB3.Components
             {
                 // se configurata uso cartella virtuale... altrimenti cartella processo
                 string baseUrl = config.GetValue<string>("SpecialConf:AppUrl") ?? (config.GetValue<string>("OptConf:AppUrl") ?? "");
-                imgBasePath = $"{baseUrl}/macchine";
+                if (baseUrl.EndsWith(@"/"))
+                {
+                    imgBasePath = $"{baseUrl}macchine";
+                }
+                else
+                {
+                    imgBasePath = $"{baseUrl}/macchine";
+                }
             }
             if (paramsChanged())
             {
diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor b/MP-TAB3/Components/PlaceholderStatusMap.razor
index d77795db..4d611d65 100644
--- a/MP-TAB3/Components/PlaceholderStatusMap.razor
+++ b/MP-TAB3/Components/PlaceholderStatusMap.razor
@@ -15,10 +15,10 @@
                 <span class="placeholder placeholder-lg col-3 bg-danger"></span>
                 <span class="placeholder placeholder-lg col-4 bg-warning"></span>
             </div>
-            <div class="col-5 placeholder-glow text-center mb-1">
+            <div class="col-4 p-2 placeholder-glow text-center mb-1">
                 <span class="placeholder col-12 bg-success fs-1 h-100 rounded-circle my-1 mx-2"></span>
             </div>
-            <div class="col-7 placeholder-glow mb-1">
+            <div class="col-8 placeholder-glow mb-1">
                 <span class="placeholder small text-light col-9"></span>
                 <span class="placeholder small text-light col-2"></span>
                 <span class="placeholder small text-light col-9"></span>
diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.css
index 39f93b99..c877e7f9 100644
--- a/MP-TAB3/Components/PlaceholderStatusMap.razor.css
+++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.css
@@ -1,29 +1,29 @@
 .pholderHeight {
-  height: 5.5rem;
+  height: 5.1rem;
   object-fit: cover;
 }
 @media (min-width: 430px) {
   .pholderHeight {
-    height: 5.8rem;
+    height: 6rem;
   }
 }
 @media (min-width: 600px) {
   .pholderHeight {
-    height: 6.6rem;
+    height: 5.2rem;
   }
 }
 @media (min-width: 768px) {
   .pholderHeight {
-    height: 7.6rem;
+    height: 7.8rem;
   }
 }
 @media (min-width: 800px) {
   .pholderHeight {
-    height: 8.2rem;
+    height: 8.5rem;
   }
 }
 @media (min-width: 1025px) {
   .pholderHeight {
-    height: 7.2rem;
+    height: 7.3rem;
   }
 }
\ No newline at end of file
diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.less b/MP-TAB3/Components/PlaceholderStatusMap.razor.less
index c3abc26d..162caa6a 100644
--- a/MP-TAB3/Components/PlaceholderStatusMap.razor.less
+++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.less
@@ -1,35 +1,35 @@
 
 .pholderHeight {
-    height: 5.5rem;
+    height: 5.1rem;
     object-fit: cover;
 }
 
 @media (min-width: 430px) {
     .pholderHeight {
-        height: 5.8rem;
+        height: 6.0rem;
     }
 }
 
 @media (min-width: 600px) {
     .pholderHeight {
-        height: 6.6rem;
+        height: 5.2rem;
     }
 }
 
 @media (min-width: 768px) {
     .pholderHeight {
-        height: 7.6rem;
+        height: 7.8rem;
     }
 }
 
 @media (min-width: 800px) {
     .pholderHeight {
-        height: 8.2rem;
+        height: 8.5rem;
     }
 }
 
 @media (min-width: 1025px) {
     .pholderHeight {
-        height: 7.2rem;
+        height: 7.3rem;
     }
 }
\ No newline at end of file
diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css
index f2208fc7..5f86f9bf 100644
--- a/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css
+++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css
@@ -1 +1 @@
-.pholderHeight{height:5.5rem;object-fit:cover;}@media(min-width:430px){.pholderHeight{height:5.8rem;}}@media(min-width:600px){.pholderHeight{height:6.6rem;}}@media(min-width:768px){.pholderHeight{height:7.6rem;}}@media(min-width:800px){.pholderHeight{height:8.2rem;}}@media(min-width:1025px){.pholderHeight{height:7.2rem;}}
\ No newline at end of file
+.pholderHeight{height:5.1rem;object-fit:cover;}@media(min-width:430px){.pholderHeight{height:6rem;}}@media(min-width:600px){.pholderHeight{height:5.2rem;}}@media(min-width:768px){.pholderHeight{height:7.8rem;}}@media(min-width:800px){.pholderHeight{height:8.5rem;}}@media(min-width:1025px){.pholderHeight{height:7.3rem;}}
\ No newline at end of file
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 4c009b44..ce3697fe 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.2504.818</Version>
+      <Version>6.16.2504.908</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
@@ -36,8 +36,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2504.108" />
-    <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2504.108" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2504.907" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2504.907" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.36" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.36" />
     <PackageReference Include="NLog" Version="5.3.4" />
diff --git a/MP-TAB3/Pages/RegNewDevice.razor b/MP-TAB3/Pages/RegNewDevice.razor
index fe2a3c09..3b502db4 100644
--- a/MP-TAB3/Pages/RegNewDevice.razor
+++ b/MP-TAB3/Pages/RegNewDevice.razor
@@ -74,3 +74,4 @@
         @txtError
     </div>
 }
+
diff --git a/MP-TAB3/Pages/RegNewDevice.razor.cs b/MP-TAB3/Pages/RegNewDevice.razor.cs
index 34dc1c5b..55fe63f2 100644
--- a/MP-TAB3/Pages/RegNewDevice.razor.cs
+++ b/MP-TAB3/Pages/RegNewDevice.razor.cs
@@ -158,7 +158,7 @@ namespace MP_TAB3.Pages
             matrOpr = await MsgServ.GetLastMatrOprAsync();
             TDService.ConfigGetVal("cookieDayExpire", ref expDays);
             TDService.ConfigGetVal("TAB_UL_Record", ref recordLogin);
-            ShowScanBarcode = !SMServ.GetConfBool("TAB_WebCamHide");
+            ShowScanBarcode = !SMServ.GetConfBool("TAB_WebCamHide"); 
             oprList = await TDService.ElencoOperatori();
             // filtro solo abilitati + ordino x nome...
             oprList = oprList
diff --git a/MP-TAB3/Pages/_Layout.cshtml b/MP-TAB3/Pages/_Layout.cshtml
index 4eae137d..f118367d 100644
--- a/MP-TAB3/Pages/_Layout.cshtml
+++ b/MP-TAB3/Pages/_Layout.cshtml
@@ -15,6 +15,7 @@
     <link rel="shortcut icon" href="images/favicon.ico" />
     <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
     @* <base href="~/" /> *@
+    <base href="~/" />
     <link rel="stylesheet" href="lib/font-awesome/css/all.min.css" />
     <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
     <link rel="stylesheet" href="css/font.min.css" />
@@ -57,55 +58,5 @@
             }
         });
     </script>
-    @* <script>
-        Blazor.start({
-            reconnectionOptions: {
-                maxRetries: 600,
-                retryIntervalMilliseconds: 1000
-            },
-            reconnectionHandler: {
-                onConnectionDown: (options, error) => console.error(error),
-                onConnectionUp: () => console.log("Client reconnected!")
-            }
-        }).then(() => {
-            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
-                get() {
-                    return this.__reconnectionDisplay;
-                },
-                set(value) {
-                    this.__reconnectionDisplay = {
-                        show: () => value.show(),
-                        update: (d) => value.update(d),
-                        rejected: (d) => document.location.reload()
-                    }
-                }
-            });
-        });
-    </script> *@
-    @* <script>
-        Blazor.start({
-            reconnectionOptions: {
-                maxRetries: Infinity,
-                retryIntervalMilliseconds: 1000
-            },
-            reconnectionHandler: {
-                onConnectionDown: (options, error) => {
-                    Blazor.defaultReconnectionHandler.onConnectionDown(options, error);
-                    Blazor.defaultReconnectionHandler._reconnectionDisplay.rejected = function () {
-                        window.location.reload();
-                    }
-                },
-                onConnectionUp: () => {
-                    console.log("Client reconnected!");
-                    document.location.reload();
-                }
-            }
-        }).then(() => {
-            Blazor.defaultReconnectionHandler._reconnectCallback = function (d) {
-                document.location.reload();
-            }
-        });
-    </script> *@
-
 </body>
 </html>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 74311ea4..29c9cf05 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.2504.818</h4>
+    <h4>Versione: 6.16.2504.908</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index fa522a58..fbd9a2fd 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2504.818
+6.16.2504.908
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 3a057580..373a7c2d 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.2504.818</version>
+  <version>6.16.2504.908</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>
diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json
index 4537964a..d0a48e1c 100644
--- a/MP-TAB3/appsettings.json
+++ b/MP-TAB3/appsettings.json
@@ -82,7 +82,7 @@
     "maxChar4Scroll": 21
   },
   "SpecialConf": {
-    "AppUrl": "/MP/TAB3",
+    "AppUrl": "/MP/TAB3/",
     "CodApp": "MP-LAND",
     "CodModulo": "MP-TAB3",
     "CodModuloParam": "MoonPro"
diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj
index e162cf27..3ed60f6e 100644
--- a/MP.Data/MP.Data.csproj
+++ b/MP.Data/MP.Data.csproj
@@ -30,7 +30,7 @@
     <ItemGroup>
         <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
         <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
-        <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2503.1410" />
+        <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2504.907" />
         <PackageReference Include="MailKit" Version="4.7.1.1" />
         <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.36" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.36" />
diff --git a/MP.TaskMan/MP.TaskMan.csproj b/MP.TaskMan/MP.TaskMan.csproj
index fd2d2cd2..a2a730ed 100644
--- a/MP.TaskMan/MP.TaskMan.csproj
+++ b/MP.TaskMan/MP.TaskMan.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2503.1410" />
-    <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2503.1410" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2504.907" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2504.907" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.36" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.36" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.36">