From 1500b183f0b8bea1aa9bb070c7c056bf6f65a464 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 15 Dec 2023 16:11:37 +0100 Subject: [PATCH 1/5] Fix update cerca podl --- MP-TAB-SERV/Components/OdlMan.razor | 2 +- MP-TAB-SERV/Components/OdlMan.razor.cs | 34 ++++++++++++++++++++++++-- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor index b3ce4602..beba95da 100644 --- a/MP-TAB-SERV/Components/OdlMan.razor +++ b/MP-TAB-SERV/Components/OdlMan.razor @@ -225,7 +225,7 @@
- + + + - + + -
+
-
diff --git a/MP-TAB-SERV/Components/SlideMenu.razor b/MP-TAB-SERV/Components/SlideMenu.razor index 356d9208..2cadef9a 100644 --- a/MP-TAB-SERV/Components/SlideMenu.razor +++ b/MP-TAB-SERV/Components/SlideMenu.razor @@ -37,12 +37,13 @@
-
- +
+
-
+
MAPO MES +
v.@version
TAB Controller - MES Suite diff --git a/MP-TAB-SERV/Components/SlideMenu.razor.cs b/MP-TAB-SERV/Components/SlideMenu.razor.cs index 0e102d29..860e420b 100644 --- a/MP-TAB-SERV/Components/SlideMenu.razor.cs +++ b/MP-TAB-SERV/Components/SlideMenu.razor.cs @@ -15,11 +15,12 @@ namespace MP_TAB_SERV.Components #region Protected Properties - [Inject] - protected NavigationManager navManager { get; set; } = null!; [Inject] protected MessageService MsgServ { get; set; } = null!; + [Inject] + protected NavigationManager navManager { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -29,6 +30,12 @@ namespace MP_TAB_SERV.Components return navManager.Uri.Contains(currUri) ? "bg-dark text-light" : ""; } + protected override void OnInitialized() + { + var rawVers = typeof(Program).Assembly.GetName().Version; + version = rawVers != null ? rawVers : new Version("0.0.0.0"); + } + protected async Task SetPage(string tgtUrl) { await Task.Delay(1); @@ -41,5 +48,11 @@ namespace MP_TAB_SERV.Components } #endregion Protected Methods + + #region Private Fields + + private Version version = null!; + + #endregion Private Fields } } \ No newline at end of file diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 386870b1..7249a7c3 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1516 + 6.16.2312.1517 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 609d187c..9cec7c03 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2312.1516

+

Versione: 6.16.2312.1517


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index 47b1933a..d23b973d 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1516 +6.16.2312.1517 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 83f1220d..e0f5eac4 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1516 + 6.16.2312.1517 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false From 476c61cc571d64fecb3cd0306d696d9548de83bc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 15 Dec 2023 17:13:04 +0100 Subject: [PATCH 5/5] Fix card qta prod --- MP-TAB-SERV/Components/ProdConfirm.razor | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor index ee24ec5a..f342fc33 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor +++ b/MP-TAB-SERV/Components/ProdConfirm.razor @@ -98,8 +98,8 @@ Dati Globali ODL
-
-
+
+
[A] NUOVI Pz.Prod
@@ -109,14 +109,14 @@ } else { - @numPzProdotti2Rec + @numPzProdotti2Rec }
-
-
+
+
Pz Prodotti TOT [A+B+C]
@@ -126,14 +126,14 @@ } else { - @numPzProdotti + @numPzProdotti }
-
-
+
+
[B] Scarti VERS.
@@ -143,14 +143,14 @@ } else { - @numPzScaConf + @numPzScaConf }
-
-
+
+
[C] Pz Buoni VERS.
@@ -160,7 +160,7 @@ } else { - @numPzBuoniConf + @numPzBuoniConf }