Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/TestPdfDoc01' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2024-02-21 17:12:23 +01:00
parent 9d3a2761b8 6e3a74bd2c
commit 603da66f00
11 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/MachineBlock.razor
+1 -1
View File
@@ -236,7 +236,7 @@ else
</div>
<div class="col-2">
<div class="px-1 w-100">
<button class="btn btn-sm btn-secondary w-100"><i class="fa-regular fa-file-pdf"></i></button>
<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>
</div>
</div>
</div>
MP-TAB3/MP-TAB3.csproj
+2 -2
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2402.2110</Version>
<Version>6.16.2402.2117</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
@@ -26,8 +26,8 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Data\" />
<Folder Include="Controllers\" />
<Folder Include="Data\" />
</ItemGroup>
<ItemGroup>
MP-TAB3/Pages/_Layout.cshtml
-1
View File
@@ -15,7 +15,6 @@
<link rel="shortcut icon" href="images/favicon.ico" />
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
<base href="~/" />
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
<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" />
MP-TAB3/Program.cs
+12
View File
@@ -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<string>("OptConf:BasePathDisegni");
// gestione cartella x PDF
app.UseStaticFiles(new StaticFileOptions
{
FileProvider = new PhysicalFileProvider(BasePathDisegni),
RequestPath = "/disegni",
});
app.UseRouting();
app.MapBlazorHub();
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2402.2110</h4>
<h4>Versione: 6.16.2402.2117</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2402.2110
6.16.2402.2117
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2402.2110</version>
<version>6.16.2402.2117</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>
MP-TAB3/appsettings.Development.json
+3
View File
@@ -5,5 +5,8 @@
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"OptConf": {
"BasePathDisegni": "\\\\iis01\\c$\\inetpub\\wwwroot\\MP"
}
}
MP-TAB3/appsettings.Production.json
+12
View File
@@ -0,0 +1,12 @@
{
"DetailedErrors": true,
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"OptConf": {
"BasePathDisegni": "c:\\inetpub\\wwwroot\\MP\\disegni"
}
}
MP-TAB3/appsettings.json
+2 -1
View File
@@ -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": {
MP.Prog/Pages/Archive.razor
+1 -1
View File
@@ -172,7 +172,7 @@
<div>@((((double)record.Size)/1024).ToString("N2")) k</div>
</td>
<td class="text-center">
<span title="@record.DiskStatus | Ultimo controllo: @record.LastCheck.ToString(" yyyy.MM.dd HH:mm:ss")">
<span title="@record.DiskStatus | Ultimo controllo: @record.LastCheck.ToString("yyyy.MM.dd HH:mm:ss")">
<span class="@(cssStatusByCod(record.DiskStatus))">
@record.DiskStatus
</span>