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

Merge branch 'Release/FixSpecPodlEdit'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-04-29 10:08:09 +02:00
parent 9a58a49cba 4dd5b8f2de
commit cfed001b9c
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.SPEC/Components/ListPODL.razor.cs
+2 -1
View File
@@ -41,7 +41,8 @@ namespace MP.SPEC.Components
{
try
{
answ = ((currRecord.IdxMacchina == record.IdxMacchina) && (currRecord.CodArticolo == record.CodArticolo) && (currRecord.CodFase == record.CodFase)) ? "table-info" : "";
answ = (currRecord.IdxPromessa == record.IdxPromessa) ? "table-info" : "";
//answ = ((currRecord.IdxMacchina == record.IdxMacchina) && (currRecord.CodArticolo == record.CodArticolo) && (currRecord.CodFase == record.CodFase)) ? "table-info" : "";
}
catch
{ }
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.2404.2415</Version>
<Version>6.16.2404.2910</Version>
<UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
</PropertyGroup>
MP.SPEC/Pages/PODL.razor
+2 -1
View File
@@ -245,7 +245,8 @@
</div>
<div class="col-3">
<div class="d-grid gap-2">
@if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "")
@* @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") *@
@if (canSaveEdit)
{
<button class="btn btn-success" @onclick="() => update(currRecord)">Salva <i class="bi bi-save"></i></button>
}
MP.SPEC/Pages/PODL.razor.cs
+6 -2
View File
@@ -226,7 +226,11 @@ namespace MP.SPEC.Pages
return;
await Task.Delay(1);
var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(selRec);
clonedRec.CodGruppo = currGruppoSel.CodGruppo;
// se selezionato sovrascrivo...
if (useFasi4KeyRich == "FASE")
{
clonedRec.CodGruppo = currGruppoSel.CodGruppo;
}
var done = await MDService.POdlUpdateRecord(clonedRec);
// se attivabile chiamo sync
if (clonedRec.Attivabile)
@@ -488,7 +492,7 @@ namespace MP.SPEC.Pages
if (currRecord != null)
{
// controllo le condizioni di selezione fase
bool okSelReparto = useFasi4KeyRich == "FASE" && selReparto != "*";
bool okSelReparto = (useFasi4KeyRich == "FASE" && selReparto != "*") || useFasi4KeyRich != "FASE";
// controllo condizione record valido
bool okCurrRecord = currRecord.CodArticolo != "" && currRecord.CodFase != "" && currRecord.IdxMacchina != "";
answ = okCurrRecord && okSelReparto;
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2404.2415</h4>
<h4>Versione: 6.16.2404.2910</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2404.2415
6.16.2404.2910
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2404.2415</version>
<version>6.16.2404.2910</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>