diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 97483f5e..d21864c6 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2304.0419 + 6.16.2304.0609 diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index efe63704..97916616 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO - Versione: 6.16.2304.0419 + Versione: 6.16.2304.0609 Note di rilascio: diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index ea642194..a8b01d73 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2304.0419 +6.16.2304.0609 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 1ba239b2..78a95e3d 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2304.0419 + 6.16.2304.0609 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false 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) { - forceSyncDb()" class="btn btn-success btn-sm btn-">Forza sync dati ODL + forceSyncDb()" class="btn btn-success btn-sm">Forza sync → macchina - chiudiOdl()" class="btn btn-danger btn-sm btn-">Registra chiusura ODL + chiudiOdl()" class="btn btn-danger btn-sm">Registra chiusura ODL } 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)) { - cloneRecord(record)" class="btn btn-info btn-sm mx-1" title="Duplica Record"> + selRecord(record)" class="btn btn-primary btn-sm mx-0" title="Dettaglio Record"> + cloneRecord(record)" class="btn btn-info btn-sm mx-0" title="Duplica Record"> @if (record.IdxOdl == 0) { - selRecord(record)" class="btn btn-primary btn-sm mx-1" title="Modifica Record"> + editRecord(record)" class="btn btn-primary btn-sm mx-1" title="Modifica Record"> @*@if (canStartOdl(record.IdxMacchina)) { } @@ -70,13 +71,13 @@ else { @if (machineHasRecipeConf(record.IdxMacchina).Result) { - doShowRecipeConf(record)"> + doShowRecipeConf(record)"> } else if (machineHasRecipeArch(record.IdxMacchina).Result) { - doShowRecipeArch(record)"> + doShowRecipeArch(record)"> } 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 a9c730e8..df89cb15 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2304.509 + 6.16.2304.609 diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index b4f3c371..b68dfa30 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -19,6 +19,10 @@ { reqNewPODL()">Nuovo PODL } + else + { + Nuovo PODL @addMessage + } @@ -58,7 +62,7 @@ { - + @header @@ -73,16 +77,23 @@ Articolo - - --Selezionare un articolo-- - @if (ListArticoli != null) - { - foreach (var item in ListArticoli) + @if (canEdit) + { + + --Selezionare un articolo-- + @if (ListArticoli != null) { - @item.CodArticolo | @item.DescArticolo | @item.Disegno + foreach (var item in ListArticoli) + { + @item.CodArticolo | @item.DescArticolo | @item.Disegno + } } - } - + + } + else + { + + } @@ -90,38 +101,58 @@ # pz - + @if (canEdit) + { + + } + else + { + + } T.Ciclo - + @if (canEdit) + { + + } + else + { + + } - @if (useFasi4KeyRich == "FASE") + Fase/Richiesta + @if (canEdit) { - Fase - - @if (ListStati != null) - { - foreach (var item in ListStati) + @if (useFasi4KeyRich == "FASE") + { + + @if (ListStati != null) { - @if (item.value == currRecordControlli.KeyRichiesta) + foreach (var item in ListStati) { - @item.label - } - else - { - @item.label - } + @if (item.value == currRecordControlli.KeyRichiesta) + { + @item.label + } + else + { + @item.label + } + } } - } - + + } + else + { + + } } else { - Fase/Richiesta - + } @@ -143,19 +174,26 @@ Macchina - - --Selezionare una macchina-- - @if (ListMacchine != null) - { - foreach (var item in ListMacchine) + @if (canEdit) + { + + --Selezionare una macchina-- + @if (ListMacchine != null) { - @if (!item.Descrizione.Contains("NEW Descrizione")) + foreach (var item in ListMacchine) { - @item.IdxMacchina | @item.Descrizione + @if (!item.Descrizione.Contains("NEW Descrizione")) + { + @item.IdxMacchina | @item.Descrizione + } } } - } - + + } + else + { + + } @@ -163,7 +201,14 @@ Note + @if(canEdit) + { + } + else + { + + } @@ -175,26 +220,49 @@ Attivabile - + @if (canEdit) + { + + } + else + { + + } - - - cancel()">Annulla + @if (canEdit) + { + + + cancel()">Annulla + - - - - @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") - { - update(currRecord)">Salva - } + + + @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && selReparto != "*" && currRecord.IdxMacchina != "") + { + update(currRecord)">Salva + } + - + } + else + { + + + cancel()">Chiudi + + + + + forceSyncDb()" class="btn btn-success">Forza sync → macchina + + + } @@ -210,7 +278,7 @@ } else { - + }