fix merge

This commit is contained in:
Samuele Locatelli
2023-10-09 17:11:40 +02:00
parent bd26d0a4bd
commit f62c404d97
5 changed files with 15 additions and 7 deletions
+11 -3
View File
@@ -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
}
}
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2310.916</Version>
<Version>6.16.2310.917</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.916</h4>
<h4>Versione: 6.16.2310.917</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
6.16.2310.916
6.16.2310.917
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2310.916</version>
<version>6.16.2310.917</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>