From f62c404d97e1e268b50c397482ffe72732cf5d4a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 9 Oct 2023 17:11:40 +0200 Subject: [PATCH] fix merge --- MP-TAB-SERV/Components/LongStopList.razor.cs | 14 +++++++++++--- 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 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/MP-TAB-SERV/Components/LongStopList.razor.cs b/MP-TAB-SERV/Components/LongStopList.razor.cs index de082d26..67399120 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor.cs +++ b/MP-TAB-SERV/Components/LongStopList.razor.cs @@ -1,4 +1,5 @@ using global::Microsoft.AspNetCore.Components; +using MP.Data.DatabaseModels; using MP.Data.Services; using System.Reflection.Metadata; @@ -6,10 +7,14 @@ namespace MP_TAB_SERV.Components { public partial class LongStopList { + #region Public Properties + [Parameter] public FermiNonQualModel currFnq { get; set; } = new FermiNonQualModel(); - //public string fnqSemaforo { get; set; } = ""; + #endregion Public Properties + + #region Protected Properties [Inject] protected MessageService MsgServ { get; set; } = null!; @@ -32,9 +37,10 @@ namespace MP_TAB_SERV.Components await MsgServ.CommentoDtRifSet(currFnq.InizioStato); NavMan.NavigateTo("prod-stop"); } - [Inject] - protected NavigationManager NavMan { get; set; } = null!; + #endregion Protected Methods + + #region Private Methods private string setSemaforo(string sem) { @@ -53,5 +59,7 @@ namespace MP_TAB_SERV.Components } return answ; } + + #endregion Private Methods } } \ 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 771be58c..d8a2130c 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.2310.916 + 6.16.2310.917 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 5d0b81a8..7c685b01 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.916

+

Versione: 6.16.2310.917


Note di rilascio: