From 4dd5b8f2ded58d68518398e15a5e9eda5d05c082 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 29 Apr 2024 10:07:27 +0200 Subject: [PATCH] Update x editing PODL --- MP.SPEC/Components/ListPODL.razor.cs | 3 ++- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/PODL.razor | 3 ++- MP.SPEC/Pages/PODL.razor.cs | 8 ++++++-- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 8aa61b6e..967d30cd 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -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 { } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index c1ebaf24..16a74feb 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2404.2415 + 6.16.2404.2910 1800a78a-6ff1-40f9-b490-87fb8bfc1394 diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 25ab86d7..4de7b9d6 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -245,7 +245,8 @@
- @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") + @* @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") *@ + @if (canSaveEdit) { } diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 90fc568f..64de9da2 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -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; diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 7b7f6fd7..cde1e426 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2404.2415

+

Versione: 6.16.2404.2910


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 7b047ae0..9c4b6fc3 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2404.2415 +6.16.2404.2910 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 41adb6f5..f760cc59 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2404.2415 + 6.16.2404.2910 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false