diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor index ed56e69f..d2b97d30 100644 --- a/MP.SPEC/Components/ListODL.razor +++ b/MP.SPEC/Components/ListODL.razor @@ -15,10 +15,10 @@ else @if (currRecord != null && !showStats && isCurrOdl) {
- +
- +
}
diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 837355f3..6fbc41f1 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -112,7 +112,7 @@ namespace MP.SPEC.Components /// protected async Task forceSyncDb() { - if (!await JSRuntime.InvokeAsync("confirm", "Sei sicuro di voler reinviare i dati (Articoli, PODL) all'impianto?")) + if (!await JSRuntime.InvokeAsync("confirm", "Sei sicuro di voler (re)inviare i dati (Articoli, PODL) all'impianto?")) return; if (currRecord != null) diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor index 20839fb0..7466373d 100644 --- a/MP.SPEC/Components/ListPODL.razor +++ b/MP.SPEC/Components/ListPODL.razor @@ -41,10 +41,11 @@ else @if (!(showRecipeConf || showRecipeArch)) { - + + @if (record.IdxOdl == 0) { - + @*@if (canStartOdl(record.IdxMacchina)) { } @@ -70,13 +71,13 @@ else { @if (machineHasRecipeConf(record.IdxMacchina).Result) { - } else if (machineHasRecipeArch(record.IdxMacchina).Result) { - } diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 7bcd14bf..28e8626e 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -21,6 +21,9 @@ namespace MP.SPEC.Components [Parameter] public EventCallback PagerResetReq { get; set; } + [Parameter] + public EventCallback RecordEdit { get; set; } + [Parameter] public EventCallback RecordSel { get; set; } @@ -87,7 +90,7 @@ namespace MP.SPEC.Components // clono resettando ODL var clonedRec = Utils.POdlExt.clone(selRec, true); currRecord = clonedRec; - await RecordSel.InvokeAsync(clonedRec); + await RecordEdit.InvokeAsync(clonedRec); header = "Duplica PODL"; } @@ -179,14 +182,21 @@ namespace MP.SPEC.Components { await ReloadData(); } - await RecordSel.InvokeAsync(null); + await RecordEdit.InvokeAsync(null); + } + + + protected async Task editRecord(PODLExpModel? selRec) + { + currRecord = selRec; + header = "Modifica PODL"; + await RecordEdit.InvokeAsync(selRec); } - protected async Task selRecord(PODLExpModel? selRec) { currRecord = selRec; - header = "Modifica PODL"; + header = "Dettaglio PODL"; await RecordSel.InvokeAsync(selRec); } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index f6286ec1..8ea85cc7 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2304.515 + 6.16.2304.516 diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 4eeffbb8..b68dfa30 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -62,7 +62,7 @@ {
-
+
@header
@@ -77,16 +77,23 @@
Articolo - + + @if (ListArticoli != null) { - + foreach (var item in ListArticoli) + { + + } } - } - + + } + else + { + + }
@@ -94,38 +101,58 @@
# pz - + @if (canEdit) + { + + } + else + { + + } T.Ciclo - + @if (canEdit) + { + + } + else + { + + }
- @if (useFasi4KeyRich == "FASE") + Fase/Richiesta + @if (canEdit) { - Fase - + @if (ListStati != null) { - @if (item.value == currRecordControlli.KeyRichiesta) + foreach (var item in ListStati) { - - } - else - { - - } + @if (item.value == currRecordControlli.KeyRichiesta) + { + + } + else + { + + } + } } - } - + + } + else + { + + } } else { - Fase/Richiesta - + }
@@ -147,19 +174,26 @@
Macchina - + + @if (ListMacchine != null) { - @if (!item.Descrizione.Contains("NEW Descrizione")) + foreach (var item in ListMacchine) { - + @if (!item.Descrizione.Contains("NEW Descrizione")) + { + + } } } - } - + + } + else + { + + }
@@ -167,7 +201,14 @@
Note + @if(canEdit) + { + } + else + { + + }
@@ -179,26 +220,49 @@ Attivabile
- + @if (canEdit) + { + + } + else + { + + }
-
-
- + @if (canEdit) + { +
+
+ +
-
-
-
- @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") - { - - } +
+
+ @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") + { + + } +
-
+ } + else + { +
+
+ +
+
+
+
+ +
+
+ }
@@ -214,7 +278,7 @@ } else { - + }
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 24257e6f..47c0a2ef 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -8,6 +8,7 @@ using MP.SPEC.Services; using NLog; using System.Reflection.PortableExecutable; using EgwCoreLib.Razor; +using Microsoft.AspNetCore.DataProtection; namespace MP.SPEC.Pages { @@ -181,9 +182,15 @@ namespace MP.SPEC.Pages await Task.Delay(1); } + protected async Task editRecord(PODLExpModel selRec) + { + canEdit = true; + currRecord = selRec; + await Task.Delay(1); + } protected async Task selRecord(PODLExpModel selRec) { - + canEdit = false; currRecord = selRec; await Task.Delay(1); } @@ -202,12 +209,25 @@ namespace MP.SPEC.Pages var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(selRec); clonedRec.CodGruppo = currGruppoSel.CodGruppo; var done = await MDService.POdlUpdateRecord(clonedRec); - await callSyncDb(clonedRec); + // se attivabile chiamo sync + if (clonedRec.Attivabile) + { + await callSyncDb(clonedRec); + } currRecord = null; NavManager.NavigateTo(NavManager.Uri, true); } + protected async Task forceSyncDb() + { + if (!await JSRuntime.InvokeAsync("confirm", "Sei sicuro di voler (re)inviare i dati (Articoli, PODL) all'impianto?")) + return; + var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(currRecord); + await callSyncDb(clonedRec); + currRecord = null; + NavManager.NavigateTo(NavManager.Uri, true); + } protected void UpdateTotCount(int newTotCount) { @@ -335,6 +355,8 @@ namespace MP.SPEC.Pages set => currFilter.CurrPage = value; } + private bool canEdit { get; set; } = false; + private PODLExpModel? currRecord { get => _currRecord; diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index d9bf726a..5e3fc385 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2304.515

+

Versione: 6.16.2304.516


Note di rilascio: