Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

MP-TAB-SERV/Components/MachineBlock.razor

@@ -33,7 +33,7 @@ else
         {
             if (Width > 640)
             {
-                <div class="card shadow borderStd" @onclick="ShowDetail">
+                <div class="card shadow rounded rounded-4 border-secondary" @onclick="ShowDetail">
                     <img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
                     <div class="bg-black">
                         <div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">

MP-TAB-SERV/Components/MachineBlock.razor.cs

@@ -4,6 +4,7 @@ using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.Services;
 using NLog;
+using static Org.BouncyCastle.Math.EC.ECCurve;
 
 namespace MP_TAB_SERV.Components
 {
@@ -67,31 +68,12 @@ namespace MP_TAB_SERV.Components
         /// <returns></returns>
         public string ImgUrlMacc(string url)
         {
-            string answ = "";
             if (string.IsNullOrEmpty(url.ToString()))
             {
-                //url = "Steamware.png";
-                url = "SIMDP1.png";
+                url = "Steamware.png";
             }
-
-            // verifico esistenza macchina SMALL...
-            answ = $"images/macchine/small/{url}";
-            string fullPath = Path.Combine(imgBasePath, "wwwroot", answ);
-            if (!File.Exists(fullPath))
-            {
-                // se non ci fosse cerco immagine fullsize
-                answ = $"images/macchine/{url}";
-                fullPath = Path.Combine(imgBasePath, "wwwroot", answ);
-            }
-
-            // altrimenti metto default Steamware
-            if (!File.Exists(fullPath))
-            {
-                answ = "images/macchine/SIMDP1.png";
-                //answ = "images/macchine/Steamware.png";
-            }
-
-            return answ;
+            string fullPath = Path.Combine(imgBasePath, url);
+            return fullPath;
         }
 
         #endregion Public Methods
@@ -146,6 +128,9 @@ namespace MP_TAB_SERV.Components
         #region Protected Methods
 
 
+        [Inject]
+        protected IConfiguration config { get; set; } = null!;
+
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {//await Task.Delay(500);
             if (firstRender)
@@ -162,7 +147,15 @@ namespace MP_TAB_SERV.Components
         {
             isLoading = true;
             // se configurata uso cartella virtuale... altrimenti cartella processo
-            imgBasePath = Environment.CurrentDirectory; // @"C:\Steamware\macchine";
+            var sImgBasePath = config.GetValue<string>("OptConf:ImgBasePath");
+            if (!string.IsNullOrEmpty(sImgBasePath))
+            {
+                imgBasePath = sImgBasePath;
+            }
+            else
+            {
+                imgBasePath = $"{Environment.CurrentDirectory}/images/";
+            }
         }
 
         protected override async Task OnParametersSetAsync()

MP-TAB-SERV/Components/ProdConfirm.razor

@@ -89,7 +89,7 @@
                     }
                     else
                     {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzProdotti.ToString("N0")</span>
+                        <span class="fw-bold" style="font-size: 3vh">@($"{numPzProdotti2Rec:N0}")</span>
                     }
                 </div>
             </div>

MP-TAB-SERV/appsettings.json

@@ -19,7 +19,7 @@
     "msRefresh": "2000",
     "BaseAddr": "https://localhost:7295/MP/TAB3/",
     "BaseUrl": "/MP/TAB3",
-    "ImgBasePath": "C:\\Steamware\\images\\macchine",
+    "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/",
     "ImgStBasePath": "C:\\Steamware\\images\\ST",
     "CodModulo": "MoonPro"
   },