diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor index ca4a3e08..d98992c6 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor +++ b/MP-TAB-SERV/Components/ProdConfirm.razor @@ -14,7 +14,7 @@ } @if (odlOk) { -
+
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs index f4a7e4b4..50763870 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs +++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs @@ -53,6 +53,10 @@ namespace MP_TAB_SERV.Components { get => showInnov ? "Nascondi conferma" : "Mostra conferma"; } + protected string ConfCssWidth + { + get => enableMagPrint ? "col-6" : "col-12"; + } /// /// Dati produzioen rilevati diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor index 27cf2b72..d7eed171 100644 --- a/MP-TAB-SERV/Components/ScrapMan.razor +++ b/MP-TAB-SERV/Components/ScrapMan.razor @@ -7,16 +7,9 @@
@if (enableScarti) { - @if (RecMSE.IdxOdl > 0) - { -
- -
- } - else - { -
ODL non presente!
- } +
+ +
} else { diff --git a/MP-TAB-SERV/Components/SlideMenu.razor.cs b/MP-TAB-SERV/Components/SlideMenu.razor.cs index b6b3766f..2e552f77 100644 --- a/MP-TAB-SERV/Components/SlideMenu.razor.cs +++ b/MP-TAB-SERV/Components/SlideMenu.razor.cs @@ -1,5 +1,6 @@ using global::Microsoft.AspNetCore.Components; using MP.Data.DatabaseModels; +using MP.Data.Services; namespace MP_TAB_SERV.Components { @@ -16,6 +17,8 @@ namespace MP_TAB_SERV.Components [Inject] protected NavigationManager navManager { get; set; } = null!; + [Inject] + protected MessageService MsgServ { get; set; } = null!; #endregion Protected Properties @@ -29,6 +32,10 @@ namespace MP_TAB_SERV.Components protected async Task SetPage(string tgtUrl) { await Task.Delay(1); + if (tgtUrl.Contains("status-map")) + { + await MsgServ.IdxMaccSet(""); + } navManager.NavigateTo(tgtUrl); } diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index a843e49e..60c1fdae 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.515 + 6.16.2312.608 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 232c2b71..c6762d73 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.515

+

Versione: 6.16.2312.608


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index c3327b6f..6f86a27a 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.515 +6.16.2312.608 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 176055ed..beff3540 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.515 + 6.16.2312.608 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 diff --git a/MP-TAB-SERV/Shared/NavMenu.razor b/MP-TAB-SERV/Shared/NavMenu.razor index 9e64402e..6d0af2c9 100644 --- a/MP-TAB-SERV/Shared/NavMenu.razor +++ b/MP-TAB-SERV/Shared/NavMenu.razor @@ -14,7 +14,7 @@ foreach (var item in MenuItems) {
    - + @item.Testo
    @@ -28,4 +28,19 @@ [Parameter] public List MenuItems { get; set; } = new List(); + + [Inject] + protected MessageService MsgServ { get; set; } = null!; + [Inject] + protected NavigationManager navManager { get; set; } = null!; + + protected async Task SetPage(string tgtUrl) + { + await Task.Delay(1); + if (tgtUrl.Contains("status-map")) + { + await MsgServ.IdxMaccSet(""); + } + navManager.NavigateTo(tgtUrl); + } }