Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/MpTab3_06'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-04-07 17:54:51 +02:00
parent 75aa41d365 6f1049c667
commit 221df16a99
6 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/InsManual.razor
+16 -2
View File
@@ -114,7 +114,14 @@
</div>
<div class="col-4 col-lg-2 my-2 pe-0">
<div class="form-floating">
<input type="time" class="form-control" @bind="@EditRecord.InizioStato"></input>
@if (enableEditTime)
{
<input type="time" class="form-control" @bind="@EditRecord.InizioStato"></input>
}
else
{
<input type="time" class="form-control disabled text-secondary" @bind="@EditRecord.InizioStato" disabled></input>
}
<label for="floatingComm">Inizio</label>
</div>
</div>
@@ -153,7 +160,14 @@
</div>
<div class="col-6 my-2">
<div class="form-floating">
<input type="time" class="form-control" @bind="@EditRecord.InizioStato"></input>
@if (enableEditTime)
{
<input type="time" class="form-control" @bind="@EditRecord.InizioStato"></input>
}
else
{
<input type="time" class="form-control disabled" @bind="@EditRecord.InizioStato" disabled></input>
}
<label for="floatingComm">Inizio</label>
</div>
</div>
MP-TAB3/Components/InsManual.razor.cs
+26 -1
View File
@@ -49,6 +49,11 @@ namespace MP_TAB3.Components
/// </summary>
private bool doSearchArt = false;
/// <summary>
/// Abilitazione edit DataOra inizio (solo x primo record, poi devono essere consecutivi...
/// </summary>
private bool enableEditTime = false;
private void SearchArtToggle()
{
doSearchArt = !doSearchArt;
@@ -123,6 +128,26 @@ namespace MP_TAB3.Components
protected void DoEdit(InsManualiModel? selRec)
{
doSearchArt = false;
if (selRec == null)
{
enableEditTime = false;
}
else
{
if (ListDay != null && ListDay.Count > 0)
{
var firstRec = ListDay.FirstOrDefault();
if (firstRec != null)
{
enableEditTime = selRec.InizioStato <= firstRec.InizioStato;
}
}
// altrimenti è vuoto x cui è libero
else
{
enableEditTime = true;
}
}
EditRecord = selRec;
}
/// <summary>
@@ -426,7 +451,7 @@ namespace MP_TAB3.Components
{
string sKey = item.value.Replace(",", ".");
decimal chiave = 0;
if(decimal.TryParse(sKey, NumberStyles.Any, CultureInfo.InvariantCulture, out chiave))
if (decimal.TryParse(sKey, NumberStyles.Any, CultureInfo.InvariantCulture, out chiave))
{
ListTCiclo.Add(chiave, item.label);
}
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2504.716</Version>
<Version>6.16.2504.717</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2504.716</h4>
<h4>Versione: 6.16.2504.717</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2504.716
6.16.2504.717
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2504.716</version>
<version>6.16.2504.717</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>