diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor index 186efa26..f8e127e8 100644 --- a/MP.SPEC/Components/ListDossiers.razor +++ b/MP.SPEC/Components/ListDossiers.razor @@ -1,6 +1,9 @@ @using MP.SPEC.Components @using MP.SPEC.Data + + + @if (ListRecords == null) { @@ -11,6 +14,70 @@ else if (totalCount == 0) } else { + @if (currFluxLogDto != null) + { +
+
+
+
+
+ Modifica Parametro +
+
+ @if (isEditing) + { + PENDING CHANGES... + } +
+
+
+
+
+
+ MACCHINA + +
+
+
+
+ DATA + +
+
+
+
+ DATA TYPE + +
+
+
+
+ VALORE + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+ }
@@ -24,7 +91,6 @@ else - @**@ @@ -60,9 +126,6 @@ else - @**@
Macchina Data Snap ODL DATA TYPE
@record.IdxODL - @record.DataType - @if (isEditing == false) { diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 9f25dedb..2b7fdde7 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -4,6 +4,7 @@ using Microsoft.JSInterop; using MP.Data.DatabaseModels; using MP.Data.DTO; using MP.SPEC.Data; +using Newtonsoft.Json; namespace MP.SPEC.Components { @@ -37,7 +38,7 @@ namespace MP.SPEC.Components { try { - answ = (currFluxLogDto.CodFlux == recordSel.CodFlux && currFluxLogDto.dtEvento== recordSel.dtEvento) ? "table-info" : ""; + answ = (currFluxLogDto.CodFlux == recordSel.CodFlux && currFluxLogDto.dtEvento == recordSel.dtEvento) ? "table-info" : ""; } catch { } @@ -53,7 +54,7 @@ namespace MP.SPEC.Components try { answ = (currRecord.IdxMacchina == recordSel.IdxMacchina && currRecord.DtRif == recordSel.DtRif) ? "table-info" : ""; - + } catch { } @@ -113,6 +114,58 @@ namespace MP.SPEC.Components await RecordSelFlux.InvokeAsync(selRec); } + private void enableEditing() + { + isEditing = true; + } + + protected async Task cancel() + { + var alert = await JSRuntime.InvokeAsync("confirm", "Confermi di voler annullare TUTTE le modifiche? i dati saranno ricaricati."); + if (alert) + { + currFluxLogDto = null; + isEditing = false; + await Task.Delay(1); + listaFlux = MDService.getFluxLog(currRecord.Valore); + //await reloadData(true); + StateHasChanged(); + } + } + + protected async Task update(FluxLogDTO selRec) + { + var alert = await JSRuntime.InvokeAsync("confirm", "Confermi di voler salvare TUTTE le modifiche? queste saranno parte del dossier inviato all'impianto"); + + if (alert) + { + + await Task.Delay(1); + if (currRecord != null) + { + // serializzo valore x flux log... + DossierFluxLogDTO updatedResult = new DossierFluxLogDTO() { ODL = listaFlux }; + string newVal = JsonConvert.SerializeObject(updatedResult); + currRecord.Valore = newVal; + // METODO PER UPDATE FLUX + await MDService.DossiersUpdateValore(currRecord); + currFluxLogDto = null; + isEditing = false; + await Task.Delay(1); + StateHasChanged(); + } + return; + } + else + { + currFluxLogDto = null; + await Task.Delay(1); + await JSRuntime.InvokeAsync("location.reload"); + + } + + } + protected override async Task OnInitializedAsync() { ListStati = await MDService.AnagStatiComm(); @@ -144,7 +197,7 @@ namespace MP.SPEC.Components private string css() { string answ = ""; - if (isEditing == false) + if (isEditing) { answ = "visible"; } @@ -172,7 +225,7 @@ namespace MP.SPEC.Components #endregion Private Fields #region Private Properties - + private int currPage { get => SelFilter.CurrPage; diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 6a872982..f0b9eaf8 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -886,6 +886,15 @@ namespace MP.SPEC.Data return answ; } + + public async Task DossiersUpdateValore(Dossiers currDoss) + { + // aggiorno record sul DB + bool answ = await dbController.DossiersUpdateValore(currDoss); + + return answ; + } + #endregion Public Methods #region Protected Fields diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 321cee25..0d2b5f5f 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.2011 + 6.16.2210.2013 diff --git a/MP.SPEC/Pages/DOSS.razor b/MP.SPEC/Pages/DOSS.razor index 8c894e3b..c3f50308 100644 --- a/MP.SPEC/Pages/DOSS.razor +++ b/MP.SPEC/Pages/DOSS.razor @@ -21,12 +21,12 @@
- @if (currDetFluxLogRecord != null) + @*@if (currDetFluxLogRecord != null) {
-
+
Modifica Parametro
@@ -84,7 +84,7 @@
- } + }*@ @if (isLoading) { diff --git a/MP.SPEC/Pages/DOSS.razor.cs b/MP.SPEC/Pages/DOSS.razor.cs index 45d968be..53e24581 100644 --- a/MP.SPEC/Pages/DOSS.razor.cs +++ b/MP.SPEC/Pages/DOSS.razor.cs @@ -94,18 +94,10 @@ namespace MP.SPEC.Pages } else { - //isLoading = true; - //isFiltering = true; await selRecordFlux(null); currDetFluxLogRecord = null; await Task.Delay(1); await JSRuntime.InvokeAsync("location.reload"); - //var modFilter = currFilter; - //modFilter.CurrPage = 1; - //currFilter = modFilter; - //await Task.Delay(1); - //isLoading = false; - //isFiltering = false; } diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 72424c28..1c0217a3 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.2011

+

Versione: 6.16.2210.2013


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 2659b9cb..7b33f3e0 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.2011 +6.16.2210.2013 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 77e8e4e4..ccf4154e 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.2011 + 6.16.2210.2013 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