TAB3:

- correzione modalità calcolo immagini con nuova conf
2025-03-25 12:24:01 +01:00
parent 7ceb6ecab3
commit 8a0fb121ae
9 changed files with 33 additions and 12 deletions
@@ -320,7 +320,10 @@ namespace MP_TAB3.Components
            {
                url = "Steamware.png";
            }
-            string fullPath = Path.Combine(imgBasePath, url);
+            string fullPath = $"{imgBasePath}/{url}";
+#if false
+            string fullPath = Path.Combine(imgBasePath, url); 
+#endif
            return fullPath;
        }

@@ -357,6 +360,7 @@ namespace MP_TAB3.Components
            TabDServ.ConfigGetVal("TAB_ShowQtaExtra", ref showQtaExtra);
            await ReloadXDL(true);
            // se configurata uso cartella virtuale... altrimenti cartella processo
+#if false
            var sImgBasePath = config.GetValue<string>("ServerConf:ImgBasePath") ?? (config.GetValue<string>("OptConf:ImgBasePath") ?? "");
            if (!string.IsNullOrEmpty(sImgBasePath))
            {
@@ -365,7 +369,10 @@ namespace MP_TAB3.Components
            else
            {
                imgBasePath = $"{Environment.CurrentDirectory}/images/";
-            }
+            } 
+#endif
+            string baseUrl = config.GetValue<string>("SpecialConf:AppUrl") ?? (config.GetValue<string>("OptConf:AppUrl") ?? "");
+            imgBasePath = $"{baseUrl}/macchine/small";
            await loadDetails();
            detailLoaded = true;
        }
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
-      <Version>6.16.2503.1714</Version>
+      <Version>6.16.2503.2512</Version>
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>MP_TAB3</RootNamespace>
  </PropertyGroup>
@@ -86,9 +86,25 @@ if (!string.IsNullOrEmpty(BasePathDisegni))
        });
    }
 }
-
 logger.Info("Add disegni path");

+// gestione immagini macchine
+string BasePathMacchine = configuration.GetValue<string>("ServerConf:BasePathMacchine") ?? configuration.GetValue<string>("OptConf:BasePathMacchine") ?? "";
+if (!string.IsNullOrEmpty(BasePathMacchine))
+{
+    // verifico esista folder disegni
+    if (Directory.Exists(BasePathMacchine))
+    {
+        // gestione cartella x PDF
+        app.UseStaticFiles(new StaticFileOptions
+        {
+            FileProvider = new PhysicalFileProvider(BasePathMacchine),
+            RequestPath = "/macchine",
+        });
+    }
+}
+logger.Info("Add macchine path");
+
 app.UseRouting();

 app.MapBlazorHub();
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2503.1714</h4>
+    <h4>Versione: 6.16.2503.2512</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2503.1714
+6.16.2503.2512
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2503.1714</version>
+  <version>6.16.2503.2512</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>
@@ -24,6 +24,7 @@
  "ServerConf": {
    "BaseAddr": "https://iis04.egalware.com/MP/TAB3/",
    "BasePathDisegni": "C:\\Steamware\\disegni",
+    "BasePathMacchine": "C:\\inetpub\\wwwroot\\MP\\macchine",
    "ImgBasePath": "https://iis04.egalware.com/MP/macchine/small/",
    "MpIoNS": "MoonPro:SQL2016DEV:MoonPro"
  },
@@ -76,7 +76,8 @@
  "ServerConf": {
    "BaseAddr": "https://localhost:7295/MP/TAB3/",
    "BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni",
-    "ImgBasePath": "https://iis01.egalware.com/MP/macchine/small/",
+    "BasePathMacchine": "\\\\iis01\\c$\\inetpub\\wwwroot\\MP\\macchine",
+    "ImgBasePath": "http://iis01.egalware.com/MP/macchine/small/",
    "MpIoNS": "MoonPro:SQL2016DEV:MoonPro",
    "maxChar4Scroll": 21
  },
@@ -3,14 +3,10 @@ using MP.Data;
 using MP.Core.Conf;
 using MP.Data.DbModels;
 using MP.Data.Services;
-using MP.MON;
 using Newtonsoft.Json;
 using NLog;
-using System;
-using static Org.BouncyCastle.Math.EC.ECCurve;
 using MP.Core.DTO;
 using MP.Data.Translate;
-using Microsoft.AspNetCore.Components.Forms;

 namespace MP.MON.Components.Pages
 {