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

Merge branch 'Release/Spec_KitMan_12'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-06-10 12:43:24 +02:00
parent 5b79a15a3f 790ea09c2e
commit 9f36bfbbb5
7 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/DbModels/PODLExpModel.cs
+6
View File
@@ -64,6 +64,12 @@ namespace MP.Data.DbModels
}
}
[NotMapped]
public bool IsKit
{
get => KeyRichiesta.StartsWith("KIT");
}
/// <summary>
/// Navigazione oggetto Machine
/// </summary>
MP.SPEC/Components/ListPODL.razor
+21 -3
View File
@@ -47,10 +47,24 @@ else
@if (!(showRecipeConf || showRecipeArch))
{
<button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm mx-0" title="Dettaglio Record"><i class="bi bi-check2"></i></button>
<button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm mx-0" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
@if (!record.IsKit)
{
<button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm mx-0" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
}
else
{
<button class="btn btn-secondary opacity-50 btn-sm mx-0 disabled" title="Duplica KIT disabilitata" disabled><i class="bi bi-clipboard-check"></i></button>
}
@if (record.IdxOdl == 0)
{
<button @onclick="() => editRecord(record)" class="btn btn-primary btn-sm mx-1" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
@if (!record.IsKit)
{
<button @onclick="() => editRecord(record)" class="btn btn-primary btn-sm mx-1" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
}
else
{
<button class="btn btn-secondary opacity-50 btn-sm mx-1 disabled" title="Modifica KIT disabilitata"><i class="bi bi-pencil-square"></i></button>
}
@if (enableStartPODL)
{
@if (canStartOdl(record.IdxMacchina))
@@ -163,10 +177,14 @@ else
}
</td>
<td>
@if (POdlDelEnabled(record.IdxOdl))
@if (POdlDelEnabled(record.IdxOdl) && !record.IsKit)
{
<button @onclick="() => deleteRecord(record)" class="btn btn-danger btn-sm"><i class="bi bi-trash-fill"></i></button>
}
else
{
<button class="btn btn-secondary btn-sm disabled opacity-50"><i class="bi bi-trash-fill"></i></button>
}
</td>
}
</tr>
MP.SPEC/MP.SPEC.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2506.917</Version>
<Version>6.16.2506.1012</Version>
<UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
MP.SPEC/Pages/PODL.razor
+5 -1
View File
@@ -164,10 +164,14 @@
<div class="input-group input-group-sm">
<div class="input-group input-group-sm">
<span class="input-group-text" id="inputGroup-sizing-sm">Gruppo</span>
@if (currGruppoSel != null)
@if (currGruppoSel != null && currGruppoSel.CodGruppo!=null)
{
<input @bind-value="@currGruppoSel.DescrGruppo" class="form-control" disabled />
}
else
{
<input @bind-value="@currRecord.CodGruppo" class="form-control" disabled />
}
</div>
</div>
</div>
MP.SPEC/Resources/ChangeLog.html
-25
View File
@@ -1,25 +0,0 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2506.917</h4>
<br /> Note di rilascio:
<ul>
<li>
<b>Ultime modifiche:</b>
<ul>{{LAST-CHANGES}}</ul>
</li>
<li>
<b>v.6.15.* &rarr;</b>
<ul>
<li>Prima release dotnet6</li>
</ul>
</li>
</ul>
<div>
<div style="float: left;">
<img src="logoSteamware.png" />
</div>
<div style="float: right;">
<a href="https://www.steamware.net/IOT" target="_blank">&copy; Steamware 2006-2023</a>
</div>
</div>
</body>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2506.917
6.16.2506.1012
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2506.917</version>
<version>6.16.2506.1012</version>
<url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>