diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.cs b/MP-TAB-SERV/Components/MachineBlock.razor.cs
index 14c65654..ce34dee6 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.cs
+++ b/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
///
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("OptConf:ImgBasePath");
+ if (!string.IsNullOrEmpty(sImgBasePath))
+ {
+ imgBasePath = sImgBasePath;
+ }
+ else
+ {
+ imgBasePath = $"{Environment.CurrentDirectory}/images/";
+ }
}
protected override async Task OnParametersSetAsync()
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index 08f95f69..6c67d11f 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -89,7 +89,7 @@
}
else
{
- @numPzProdotti.ToString("N0")
+ @($"{numPzProdotti2Rec:N0}")
}
diff --git a/MP-TAB-SERV/appsettings.json b/MP-TAB-SERV/appsettings.json
index 9b81e016..96741cde 100644
--- a/MP-TAB-SERV/appsettings.json
+++ b/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"
},
diff --git a/images/macchine/FOV001.png b/images/macchine/FOV001.png
new file mode 100644
index 00000000..4d2c5a3f
Binary files /dev/null and b/images/macchine/FOV001.png differ
diff --git a/images/macchine/FOV002.png b/images/macchine/FOV002.png
new file mode 100644
index 00000000..1faecb4d
Binary files /dev/null and b/images/macchine/FOV002.png differ
diff --git a/images/macchine/FOV003.png b/images/macchine/FOV003.png
new file mode 100644
index 00000000..3ca99784
Binary files /dev/null and b/images/macchine/FOV003.png differ
diff --git a/images/macchine/FOV004.png b/images/macchine/FOV004.png
new file mode 100644
index 00000000..0dd4dbd1
Binary files /dev/null and b/images/macchine/FOV004.png differ
diff --git a/images/macchine/FOV005.png b/images/macchine/FOV005.png
new file mode 100644
index 00000000..bfd8c5ab
Binary files /dev/null and b/images/macchine/FOV005.png differ
diff --git a/images/macchine/FOV006.png b/images/macchine/FOV006.png
new file mode 100644
index 00000000..8ff117c3
Binary files /dev/null and b/images/macchine/FOV006.png differ
diff --git a/images/macchine/FOV008.png b/images/macchine/FOV008.png
new file mode 100644
index 00000000..209c974a
Binary files /dev/null and b/images/macchine/FOV008.png differ
diff --git a/images/macchine/FOV009.png b/images/macchine/FOV009.png
new file mode 100644
index 00000000..65b9ba97
Binary files /dev/null and b/images/macchine/FOV009.png differ
diff --git a/images/macchine/FOV010.png b/images/macchine/FOV010.png
new file mode 100644
index 00000000..cd68c880
Binary files /dev/null and b/images/macchine/FOV010.png differ
diff --git a/images/macchine/FOV011.png b/images/macchine/FOV011.png
new file mode 100644
index 00000000..b4e9b24e
Binary files /dev/null and b/images/macchine/FOV011.png differ
diff --git a/images/macchine/FOV012.png b/images/macchine/FOV012.png
new file mode 100644
index 00000000..1ccd635e
Binary files /dev/null and b/images/macchine/FOV012.png differ
diff --git a/images/macchine/FOV013.png b/images/macchine/FOV013.png
new file mode 100644
index 00000000..acf63163
Binary files /dev/null and b/images/macchine/FOV013.png differ
diff --git a/images/macchine/FOV014.png b/images/macchine/FOV014.png
new file mode 100644
index 00000000..a88af15a
Binary files /dev/null and b/images/macchine/FOV014.png differ
diff --git a/images/macchine/FOV015.png b/images/macchine/FOV015.png
new file mode 100644
index 00000000..5bf2369c
Binary files /dev/null and b/images/macchine/FOV015.png differ
diff --git a/images/macchine/FOV062.png b/images/macchine/FOV062.png
new file mode 100644
index 00000000..850433f5
Binary files /dev/null and b/images/macchine/FOV062.png differ
diff --git a/images/macchine/FOV090.png b/images/macchine/FOV090.png
new file mode 100644
index 00000000..283367de
Binary files /dev/null and b/images/macchine/FOV090.png differ
diff --git a/images/macchine/Steamware.png b/images/macchine/Steamware.png
new file mode 100644
index 00000000..1326fad9
Binary files /dev/null and b/images/macchine/Steamware.png differ
diff --git a/images/macchine/small/FOV001.png b/images/macchine/small/FOV001.png
new file mode 100644
index 00000000..3a931f02
Binary files /dev/null and b/images/macchine/small/FOV001.png differ
diff --git a/images/macchine/small/FOV002.png b/images/macchine/small/FOV002.png
new file mode 100644
index 00000000..37d8fa4a
Binary files /dev/null and b/images/macchine/small/FOV002.png differ
diff --git a/images/macchine/small/FOV003.png b/images/macchine/small/FOV003.png
new file mode 100644
index 00000000..3e8246d3
Binary files /dev/null and b/images/macchine/small/FOV003.png differ
diff --git a/images/macchine/small/FOV004.png b/images/macchine/small/FOV004.png
new file mode 100644
index 00000000..b75da879
Binary files /dev/null and b/images/macchine/small/FOV004.png differ
diff --git a/images/macchine/small/FOV005.png b/images/macchine/small/FOV005.png
new file mode 100644
index 00000000..93a1e7be
Binary files /dev/null and b/images/macchine/small/FOV005.png differ
diff --git a/images/macchine/small/FOV006.png b/images/macchine/small/FOV006.png
new file mode 100644
index 00000000..cf49c884
Binary files /dev/null and b/images/macchine/small/FOV006.png differ
diff --git a/images/macchine/small/FOV008.png b/images/macchine/small/FOV008.png
new file mode 100644
index 00000000..87f86786
Binary files /dev/null and b/images/macchine/small/FOV008.png differ
diff --git a/images/macchine/small/FOV009.png b/images/macchine/small/FOV009.png
new file mode 100644
index 00000000..f2759003
Binary files /dev/null and b/images/macchine/small/FOV009.png differ
diff --git a/images/macchine/small/FOV010.png b/images/macchine/small/FOV010.png
new file mode 100644
index 00000000..6096c034
Binary files /dev/null and b/images/macchine/small/FOV010.png differ
diff --git a/images/macchine/small/FOV011.png b/images/macchine/small/FOV011.png
new file mode 100644
index 00000000..6b298e43
Binary files /dev/null and b/images/macchine/small/FOV011.png differ
diff --git a/images/macchine/small/FOV012.png b/images/macchine/small/FOV012.png
new file mode 100644
index 00000000..62d2085a
Binary files /dev/null and b/images/macchine/small/FOV012.png differ
diff --git a/images/macchine/small/FOV013.png b/images/macchine/small/FOV013.png
new file mode 100644
index 00000000..eb565d7e
Binary files /dev/null and b/images/macchine/small/FOV013.png differ
diff --git a/images/macchine/small/FOV014.png b/images/macchine/small/FOV014.png
new file mode 100644
index 00000000..0a83502d
Binary files /dev/null and b/images/macchine/small/FOV014.png differ
diff --git a/images/macchine/small/FOV015.png b/images/macchine/small/FOV015.png
new file mode 100644
index 00000000..593e29ae
Binary files /dev/null and b/images/macchine/small/FOV015.png differ
diff --git a/images/macchine/small/FOV062.png b/images/macchine/small/FOV062.png
new file mode 100644
index 00000000..02397935
Binary files /dev/null and b/images/macchine/small/FOV062.png differ
diff --git a/images/macchine/small/FOV090.png b/images/macchine/small/FOV090.png
new file mode 100644
index 00000000..2ff8b044
Binary files /dev/null and b/images/macchine/small/FOV090.png differ
diff --git a/images/macchine/small/Steamware.png b/images/macchine/small/Steamware.png
new file mode 100644
index 00000000..572efa5c
Binary files /dev/null and b/images/macchine/small/Steamware.png differ