From 6e3a74bd2c92d5b7d057870e7380abd66698f50f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 21 Feb 2024 17:10:16 +0100 Subject: [PATCH] Update x gestione disegni (parametrica) --- MP-TAB3/Components/MachineBlock.razor | 2 +- MP-TAB3/MP-TAB3.csproj | 4 ++-- MP-TAB3/Pages/_Layout.cshtml | 1 - MP-TAB3/Program.cs | 12 ++++++++++++ MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- MP-TAB3/appsettings.Development.json | 3 +++ MP-TAB3/appsettings.Production.json | 12 ++++++++++++ MP-TAB3/appsettings.json | 3 ++- MP.Prog/Pages/Archive.razor | 2 +- 11 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 MP-TAB3/appsettings.Production.json diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index e24b1eab..2435062b 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -236,7 +236,7 @@ else
- +
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 1e78bebc..836d3efe 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2402.2110 + 6.16.2402.2117 enable MP_TAB3 @@ -26,8 +26,8 @@ - + diff --git a/MP-TAB3/Pages/_Layout.cshtml b/MP-TAB3/Pages/_Layout.cshtml index 61c567fd..b94fbe6b 100644 --- a/MP-TAB3/Pages/_Layout.cshtml +++ b/MP-TAB3/Pages/_Layout.cshtml @@ -15,7 +15,6 @@ - diff --git a/MP-TAB3/Program.cs b/MP-TAB3/Program.cs index 31f145a1..ee5757b0 100644 --- a/MP-TAB3/Program.cs +++ b/MP-TAB3/Program.cs @@ -2,6 +2,8 @@ using Blazored.LocalStorage; using Blazored.SessionStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.StaticFiles; +using Microsoft.Extensions.FileProviders; using MP.Data; using MP.Data.Services; using StackExchange.Redis; @@ -57,6 +59,16 @@ app.UseHttpsRedirection(); app.UseStaticFiles(); + +string BasePathDisegni = configuration.GetValue("OptConf:BasePathDisegni"); + +// gestione cartella x PDF +app.UseStaticFiles(new StaticFileOptions +{ + FileProvider = new PhysicalFileProvider(BasePathDisegni), + RequestPath = "/disegni", +}); + app.UseRouting(); app.MapBlazorHub(); diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 5b032fe4..3cfc36eb 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2402.2110

+

Versione: 6.16.2402.2117


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 025c2af8..5fd8124c 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2402.2110 +6.16.2402.2117 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index bc31f879..781ee989 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2402.2110 + 6.16.2402.2117 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP-TAB3/appsettings.Development.json b/MP-TAB3/appsettings.Development.json index 770d3e93..0ed001b6 100644 --- a/MP-TAB3/appsettings.Development.json +++ b/MP-TAB3/appsettings.Development.json @@ -5,5 +5,8 @@ "Default": "Information", "Microsoft.AspNetCore": "Warning" } + }, + "OptConf": { + "BasePathDisegni": "\\\\iis01\\c$\\inetpub\\wwwroot\\MP" } } diff --git a/MP-TAB3/appsettings.Production.json b/MP-TAB3/appsettings.Production.json new file mode 100644 index 00000000..89d96edf --- /dev/null +++ b/MP-TAB3/appsettings.Production.json @@ -0,0 +1,12 @@ +{ + "DetailedErrors": true, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "OptConf": { + "BasePathDisegni": "c:\\inetpub\\wwwroot\\MP\\disegni" + } +} diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json index 9a9f5ffb..65fd4245 100644 --- a/MP-TAB3/appsettings.json +++ b/MP-TAB3/appsettings.json @@ -23,7 +23,8 @@ "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/", "ImgStBasePath": "C:\\Steamware\\images\\ST", "CodModulo": "MoonPro", - "samplerMaxCall": 15 + "samplerMaxCall": 15, + "BasePathDisegni": "\\\\iis01\\c$\\inetpub\\wwwroot\\MP" }, "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net", "MailKitMailSettings": { diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor index 1b0c7119..7936e9cc 100644 --- a/MP.Prog/Pages/Archive.razor +++ b/MP.Prog/Pages/Archive.razor @@ -172,7 +172,7 @@
    @((((double)record.Size)/1024).ToString("N2")) k
    - + @record.DiskStatus