From 246f9b35cd0638aa6f569574204ed26ba00c0f21 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 18 Dec 2023 12:17:57 +0100 Subject: [PATCH 01/13] Fix note vuote --- MP-TAB3/Components/LongStopList.razor | 2 +- MP-TAB3/Components/NotesEditor.razor.cs | 8 ++++++-- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/MP-TAB3/Components/LongStopList.razor b/MP-TAB3/Components/LongStopList.razor index f9981a6b..8e1f759e 100644 --- a/MP-TAB3/Components/LongStopList.razor +++ b/MP-TAB3/Components/LongStopList.razor @@ -3,7 +3,7 @@
-
+
@currFnq.Stato diff --git a/MP-TAB3/Components/NotesEditor.razor.cs b/MP-TAB3/Components/NotesEditor.razor.cs index f5fd8e15..6ade2864 100644 --- a/MP-TAB3/Components/NotesEditor.razor.cs +++ b/MP-TAB3/Components/NotesEditor.razor.cs @@ -137,8 +137,12 @@ namespace MP_TAB3.Components }; // elimino vecchio se c'è... await TabServ.EvListDelete(IdxMacc, DateSel, idxTipoCommento); - // inserisco - await TabServ.EvListInsert(newRec, MP.Data.Objects.Enums.tipoInputEvento.commento); + // se c'è un commento lo inserisco + if (!string.IsNullOrEmpty(UserComment)) + { + // inserisco + await TabServ.EvListInsert(newRec, MP.Data.Objects.Enums.tipoInputEvento.commento); + } // reset await E_relData.InvokeAsync(true); DoReset(); diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 6c8f14ed..da4d34aa 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1811 + 6.16.2312.1812 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 719471e3..266b92aa 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2312.1811

+

Versione: 6.16.2312.1812


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 645a2d12..22343106 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1811 +6.16.2312.1812 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 28e5f08d..e762721c 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1811 + 6.16.2312.1812 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false From d29bc0bf5eb1adb17a8910e67cc030141defe2f4 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 18 Dec 2023 16:53:37 +0100 Subject: [PATCH 02/13] aggiunti vari refresh (NON FIX DEFINITIVO) --- MP-TAB3/Components/FixOdl.razor.cs | 6 +++++- MP-TAB3/Components/OdlMan.razor | 2 +- MP-TAB3/Components/OdlMan.razor.cs | 9 +++++++++ MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/MP-TAB3/Components/FixOdl.razor.cs b/MP-TAB3/Components/FixOdl.razor.cs index 6cdc6bf3..c2c73da4 100644 --- a/MP-TAB3/Components/FixOdl.razor.cs +++ b/MP-TAB3/Components/FixOdl.razor.cs @@ -27,6 +27,9 @@ namespace MP_TAB3.Components protected List ListComplete { get; set; } = new List(); protected List ListPaged { get; set; } = new List(); + [Parameter] + public EventCallback E_RefreshData { get; set; } + [Inject] protected MessageService MServ { get; set; } = null!; @@ -100,10 +103,11 @@ namespace MP_TAB3.Components // registro ODL retroattivamente... await TabDServ.OdlSetupPostumo(IdxOdlSel, IdxMaccCurr); } + await E_RefreshData.InvokeAsync(true); } // redirect - NavMan.NavigateTo(NavMan.Uri, true); + //NavMan.NavigateTo(NavMan.Uri, true); } protected void toggleFixOdl() diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index 37d69700..aac711f2 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -56,7 +56,7 @@ @if (!odlOk) {
    - +
    } } diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index c886eb50..97313fc1 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -867,6 +867,15 @@ namespace MP_TAB3.Components await ReloadData(true); } + protected async Task refreshAfterFixOdl(bool has2Refr) + { + if (has2Refr) + { + await RefreshData(); + await InvokeAsync(StateHasChanged); + } + } + protected void SaveTCRich(decimal newTCRich) { tcRichAttr = newTCRich; diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index da4d34aa..e272814f 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1812 + 6.16.2312.1816 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 266b92aa..8d2bc932 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2312.1812

    +

    Versione: 6.16.2312.1816


    Note di rilascio:
    • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 22343106..f491114e 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1812 +6.16.2312.1816 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index e762721c..783715f0 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1812 + 6.16.2312.1816 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false From d4690c7a82fd30db264492bedd9074df1cd945e7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 18 Dec 2023 19:07:11 +0100 Subject: [PATCH 03/13] Fix dichiarazioni su tav 2 --- MP-TAB3/Components/DeclarEditor.razor.cs | 12 ++++++++++++ MP-TAB3/Components/DeclarMan.razor | 2 -- MP-TAB3/Components/DeclarMan.razor.cs | 13 +++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/MP-TAB3/Components/DeclarEditor.razor.cs b/MP-TAB3/Components/DeclarEditor.razor.cs index cf5201fc..7cdf20b1 100644 --- a/MP-TAB3/Components/DeclarEditor.razor.cs +++ b/MP-TAB3/Components/DeclarEditor.razor.cs @@ -97,6 +97,18 @@ namespace MP_TAB3.Components { if (IsNewRec) { + // sistemo IdxMacchina SE fosse multi... + string IdxMaccSel = IdxMacc; + bool isMulti = SMServ.DictMacchMulti[IdxMacc] == 1; + if (isMulti) + { + var idxMSel = MServ.UserPrefGet(IdxMacc); + if (!string.IsNullOrEmpty(idxMSel)) + { + IdxMaccSel = idxMSel; + } + currRec.IdxMacchina = IdxMaccSel; + } // inserisco await TabServ.RegDichiarInsert(currRec); } diff --git a/MP-TAB3/Components/DeclarMan.razor b/MP-TAB3/Components/DeclarMan.razor index 53ff08ca..753b9c9e 100644 --- a/MP-TAB3/Components/DeclarMan.razor +++ b/MP-TAB3/Components/DeclarMan.razor @@ -1,7 +1,5 @@  - -
      diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs index c660eb88..cf4cdf4a 100644 --- a/MP-TAB3/Components/DeclarMan.razor.cs +++ b/MP-TAB3/Components/DeclarMan.razor.cs @@ -49,6 +49,8 @@ namespace MP_TAB3.Components CurrRec = selRec; } + [Inject] + protected SharedMemService SMServ { get; set; } = null!; [Inject] protected MessageService MServ { get; set; } = null!; @@ -65,6 +67,17 @@ namespace MP_TAB3.Components if (RecMSE != null) { IdxMaccSel = RecMSE.IdxMacchina; + bool isMulti = SMServ.DictMacchMulti[IdxMaccSel] == 1; + if (isMulti) + { + var idxMSel = MServ.UserPrefGet(IdxMaccSel); + if (!string.IsNullOrEmpty(idxMSel)) + { + IdxMaccSel = idxMSel; + } + } + + DateTime fine = DateTime.Today.AddDays(1); DateTime inizio = fine.AddDays(-8); CurrPeriodo = new Periodo(inizio, fine); From 253abfcfe5b7cbe806c5b7d57514dfad2626015d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 18 Dec 2023 19:53:48 +0100 Subject: [PATCH 04/13] refresh gestione dichiarazioni filtrate --- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index e272814f..f350c533 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1816 + 6.16.2312.1819 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 8d2bc932..72500dc8 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2312.1816

      +

      Versione: 6.16.2312.1819


      Note di rilascio:
      • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index f491114e..4217e4ea 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1816 +6.16.2312.1819 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 783715f0..12beaf99 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1816 + 6.16.2312.1819 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false From ec3f609725347beb94806aba9236b3f00fff1bff Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 19 Dec 2023 08:12:33 +0100 Subject: [PATCH 05/13] refresh versioni --- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index e272814f..1ac9e97c 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1816 + 6.16.2312.1908 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 8d2bc932..1d695333 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

        Versione: 6.16.2312.1816

        +

        Versione: 6.16.2312.1908


        Note di rilascio:
        • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index f491114e..d393ad2f 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1816 +6.16.2312.1908 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 783715f0..f3cd9ff7 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1816 + 6.16.2312.1908 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false From af785b50a38e1d37086e0e82e297c93d06506161 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 19 Dec 2023 08:32:07 +0100 Subject: [PATCH 06/13] Fix display controlli su tavola --- MP-TAB3/Components/ControlsMan.razor.cs | 10 ++++++++++ MP-TAB3/Components/DeclarMan.razor.cs | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/MP-TAB3/Components/ControlsMan.razor.cs b/MP-TAB3/Components/ControlsMan.razor.cs index cefeb78c..86a2e55d 100644 --- a/MP-TAB3/Components/ControlsMan.razor.cs +++ b/MP-TAB3/Components/ControlsMan.razor.cs @@ -72,6 +72,16 @@ namespace MP_TAB3.Components { enableControlli = SMServ.GetConfBool("enableControlli"); IdxMaccSel = RecMSE.IdxMacchina; + bool isMulti = SMServ.DictMacchMulti[IdxMaccSel] == 1; + if (isMulti) + { + var idxMSel = MServ.UserPrefGet(IdxMaccSel); + if (!string.IsNullOrEmpty(idxMSel)) + { + IdxMaccSel = idxMSel; + } + } + DateTime fine = DateTime.Today.AddDays(1); DateTime inizio = fine.AddDays(-8); CurrPeriodo = new Periodo(inizio, fine); diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs index cf4cdf4a..89ab5bda 100644 --- a/MP-TAB3/Components/DeclarMan.razor.cs +++ b/MP-TAB3/Components/DeclarMan.razor.cs @@ -77,7 +77,6 @@ namespace MP_TAB3.Components } } - DateTime fine = DateTime.Today.AddDays(1); DateTime inizio = fine.AddDays(-8); CurrPeriodo = new Periodo(inizio, fine); From 16e1b58b41d4b05bbcd47b6b560f44460b948be0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 19 Dec 2023 08:33:53 +0100 Subject: [PATCH 07/13] Fix display scarti x tavola --- MP-TAB3/Components/ScrapMan.razor.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MP-TAB3/Components/ScrapMan.razor.cs b/MP-TAB3/Components/ScrapMan.razor.cs index 6c23ebc8..ede443d8 100644 --- a/MP-TAB3/Components/ScrapMan.razor.cs +++ b/MP-TAB3/Components/ScrapMan.razor.cs @@ -73,6 +73,16 @@ namespace MP_TAB3.Components { enableScarti = SMServ.GetConfBool("enableScarti"); IdxMaccSel = RecMSE.IdxMacchina; + bool isMulti = SMServ.DictMacchMulti[IdxMaccSel] == 1; + if (isMulti) + { + var idxMSel = MServ.UserPrefGet(IdxMaccSel); + if (!string.IsNullOrEmpty(idxMSel)) + { + IdxMaccSel = idxMSel; + } + } + DateTime fine = DateTime.Today.AddDays(1); DateTime inizio = fine.AddDays(-8); CurrPeriodo = new Periodo(inizio, fine); From cf7fa880ae8d5eb8a1afecae45ef5650a562c350 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 19 Dec 2023 15:27:29 +0100 Subject: [PATCH 08/13] Fix conferma produzione --- MP-TAB3/Components/CheckControls.razor.cs | 2 +- MP-TAB3/Components/ProdConfirm.razor | 155 +++++++++++----------- MP-TAB3/Components/ProdConfirm.razor.cs | 51 ++++--- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Pages/MachineDetail.razor | 1 - MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 8 files changed, 120 insertions(+), 97 deletions(-) diff --git a/MP-TAB3/Components/CheckControls.razor.cs b/MP-TAB3/Components/CheckControls.razor.cs index c3cd6cd1..5f5c1a8b 100644 --- a/MP-TAB3/Components/CheckControls.razor.cs +++ b/MP-TAB3/Components/CheckControls.razor.cs @@ -37,7 +37,7 @@ namespace MP_TAB3.Components { try { - // in questo caso controllo idxStato... e recupero priorit� se > 1 --> + // in questo caso controllo idxStato... e recupero priorita se > 1 --> // richiesta qualifica answ = SMServ.GetStateRow(idxStato).Priorita > 1; } diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index a3252d8b..5a3359ee 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -27,7 +27,7 @@
      -@if (showInnov) +@if (confProdActive) {
      @@ -92,89 +92,90 @@
      } -
      -
      - Dati Globali ODL -
      -
      -
      -
      - [A] NUOVI Pz.Prod +@if (!confProdActive) +{ +
      +
      + Dati Globali ODL +
      +
      +
      +
      + [A] NUOVI Pz.Prod +
      +
      + @if (isProcessing) + { + + } + else + { + @numPzProdotti2Rec + } +
      -
      - @if (isProcessing) - { - - } - else - { - @numPzProdotti2Rec - } +
      +
      +
      +
      + Pz Prodotti TOT [A+B+C] +
      +
      + @if (isProcessing) + { + + } + else + { + @numPzProdotti + } +
      +
      +
      +
      +
      +
      + [B] Scarti VERS. +
      +
      + @if (isProcessing) + { + + } + else + { + @numPzScaConf + } +
      +
      +
      +
      +
      +
      + [C] Pz Buoni VERS. +
      +
      + @if (isProcessing) + { + + } + else + { + @numPzBuoniConf + } +
      -
      -
      -
      - Pz Prodotti TOT [A+B+C] -
      -
      - @if (isProcessing) - { - - } - else - { - @numPzProdotti - } -
      -
      -
      -
      -
      -
      - [B] Scarti VERS. -
      -
      - @if (isProcessing) - { - - } - else - { - @numPzScaConf - } -
      -
      -
      -
      -
      -
      - [C] Pz Buoni VERS. -
      -
      - @if (isProcessing) - { - - } - else - { - @numPzBuoniConf - } -
      -
      -
      -
      -
      +
      Reg. SCARTI
      Reg. CONTROLLI
      - @*
      -
      *@ -
      +
      +} @if (!string.IsNullOrEmpty(lblOut)) {
      @@ -183,4 +184,8 @@
      } - \ No newline at end of file + +@if (!confProdActive) +{ + +} \ No newline at end of file diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs index e8369421..a8746515 100644 --- a/MP-TAB3/Components/ProdConfirm.razor.cs +++ b/MP-TAB3/Components/ProdConfirm.razor.cs @@ -38,7 +38,20 @@ namespace MP_TAB3.Components } [Parameter] - public MappaStatoExpl? RecMSE { get; set; } = null; + public MappaStatoExpl? RecMSE + { + get => currRecMSE; + set + { + // salvo SOLO SE non sono in conferma + if (!confProdActive) + { + currRecMSE = value; + } + } + } + + private MappaStatoExpl? currRecMSE { get; set; } = null; #endregion Public Properties @@ -46,16 +59,17 @@ namespace MP_TAB3.Components protected string ConfBg { - get => showInnov ? "bg-warning text-dark" : "bg-success text-light"; + get => confProdActive ? "bg-warning text-dark" : "bg-success text-light"; + } + + protected string ConfCssWidth + { + get => enableMagPrint ? "col-6" : "col-12"; } protected string ConfTitle { - get => showInnov ? "Nascondi conferma" : "Mostra conferma"; - } - protected string ConfCssWidth - { - get => enableMagPrint ? "col-6" : "col-12"; + get => confProdActive ? "Nascondi conferma" : "Mostra conferma"; } /// @@ -163,9 +177,12 @@ namespace MP_TAB3.Components protected override async Task OnParametersSetAsync() { lblOut = ""; - numPzLasciati = 0; if (RecMSE != null && string.IsNullOrEmpty(IdxMaccSel)) { + if (!confProdActive) + { + numPzLasciati = 0; + } // verifico SE fosse doppia... bool isMulti = false; // verifico se la macchina sia configurata tra le MSFD... @@ -206,8 +223,9 @@ namespace MP_TAB3.Components // mostro output lblOut = $"Confermata produzione {numPzConfermati - numPzLasciati} pezzi (+{numPzLasciati} pz lasciati, +{numPzScarto2Rec} pz scarto) |{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}"; // cambio button conferma... - showInnov = false; + confProdActive = false; numPzLasciati = 0; + dtReqUpdate = DateTime.Now; await DoUpdate(); await Task.Delay(1); await RefreshData(); @@ -235,7 +253,11 @@ namespace MP_TAB3.Components /// protected async Task ToggleConfProd() { - showInnov = !showInnov; + confProdActive = !confProdActive; + if (confProdActive) + { + numPzLasc = 0; + } dtReqUpdate = DateTime.Now; await DoUpdate(); StateHasChanged(); @@ -245,12 +267,11 @@ namespace MP_TAB3.Components #region Private Fields + private bool chkPzBuoniNeg = false; private bool confRett = false; - private bool enablePzProdLasciati = false; private bool enableMagPrint = false; - private bool chkPzBuoniNeg = false; - + private bool enablePzProdLasciati = false; private string lblOut = ""; private int modoConfProd = 0; @@ -274,7 +295,7 @@ namespace MP_TAB3.Components private bool showConfirm { get; set; } = true; - private bool showInnov { get; set; } = false; + private bool confProdActive { get; set; } = false; #endregion Private Properties @@ -307,7 +328,5 @@ namespace MP_TAB3.Components } #endregion Private Methods - - } } \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 1ac9e97c..72ec7ae5 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1908 + 6.16.2312.1915 enable MP_TAB3 diff --git a/MP-TAB3/Pages/MachineDetail.razor b/MP-TAB3/Pages/MachineDetail.razor index a068cce3..86ccbfec 100644 --- a/MP-TAB3/Pages/MachineDetail.razor +++ b/MP-TAB3/Pages/MachineDetail.razor @@ -11,5 +11,4 @@ else - } diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 1d695333..8412ba83 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2312.1908

      +

      Versione: 6.16.2312.1915


      Note di rilascio:
      • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index d393ad2f..83057c07 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1908 +6.16.2312.1915 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index f3cd9ff7..cc4429f6 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1908 + 6.16.2312.1915 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false From 6428c8bff6dd46cffe444a894efd8fdb27f917af Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 19 Dec 2023 15:39:00 +0100 Subject: [PATCH 09/13] Fix scarti doppia tavola --- MP-TAB3/Components/ScrapEditor.razor | 2 +- MP-TAB3/Components/ScrapEditor.razor.cs | 29 ++++++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/MP-TAB3/Components/ScrapEditor.razor b/MP-TAB3/Components/ScrapEditor.razor index c3cbe104..3a89797c 100644 --- a/MP-TAB3/Components/ScrapEditor.razor +++ b/MP-TAB3/Components/ScrapEditor.razor @@ -12,7 +12,7 @@
      @if(errMsg != "") { -
      +
      @errMsg
      } diff --git a/MP-TAB3/Components/ScrapEditor.razor.cs b/MP-TAB3/Components/ScrapEditor.razor.cs index 61384da0..e339a29d 100644 --- a/MP-TAB3/Components/ScrapEditor.razor.cs +++ b/MP-TAB3/Components/ScrapEditor.razor.cs @@ -31,11 +31,15 @@ namespace MP_TAB3.Components } } + protected string errMsg { get; set; } = ""; protected List ListComplete { get; set; } = new List(); [Inject] protected MessageService MServ { get; set; } = null!; + [Inject] + protected MessageService MsgServ { get; set; } = null!; + protected int NumPz { get => numPz; @@ -70,10 +74,25 @@ namespace MP_TAB3.Components protected async Task doSave(vSelCauScartoModel currCau) { + bool isMulti = false; + // verifico se la macchina sia configurata tra le MSFD... + if (SMServ.DictMacchMulti.ContainsKey(IdxMacc)) + { + isMulti = SMServ.DictMacchMulti[IdxMacc] == 1; + } + string IdxMaccSel = IdxMacc; + if (isMulti) + { + var idxMSel = MsgServ.UserPrefGet(IdxMacc); + if (!string.IsNullOrEmpty(idxMSel)) + { + IdxMaccSel = idxMSel; + } + } // registro scarto RegistroScartiModel newRec = new RegistroScartiModel() { - IdxMacchina = IdxMacc, + IdxMacchina = IdxMaccSel, DataOra = DateSel, Causale = currCau.value, Qta = NumPz, @@ -87,20 +106,17 @@ namespace MP_TAB3.Components // reset DoReset(); errMsg = ""; - //ToggleCtrl(); await E_Updated.InvokeAsync(true); await ReloadData(); - StateHasChanged(); + await InvokeAsync(StateHasChanged); } else { - errMsg = "ODL non attivo o data/ora errato"; + errMsg = "Insert non possibile: ODL non attivo o data/ora errato"; } ShowDetail = false; } - protected string errMsg { get; set; } = ""; - protected override async Task OnInitializedAsync() { await ReloadData(); @@ -127,6 +143,7 @@ namespace MP_TAB3.Components if (ShowDetail) { DateSel = DateTime.Now; + errMsg = ""; } } From b0ce0917651560f9ffbb1038892a35bc5d4d64f7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 19 Dec 2023 15:53:22 +0100 Subject: [PATCH 10/13] Fix update testata x cambio TAVOLA --- MP-TAB3/Components/ControlsMan.razor.cs | 4 + MP-TAB3/Components/DeclarMan.razor.cs | 21 ++-- MP-TAB3/Components/ProdConfirm.razor | 142 ++++++++++++------------ MP-TAB3/Components/ScrapMan.razor.cs | 66 +++++------ MP-TAB3/Pages/Controls.razor | 4 +- MP-TAB3/Pages/Controls.razor.cs | 21 +++- MP-TAB3/Pages/Declarations.razor | 4 +- MP-TAB3/Pages/Declarations.razor.cs | 11 ++ MP-TAB3/Pages/Scrap.razor | 4 +- MP-TAB3/Pages/Scrap.razor.cs | 6 + 10 files changed, 160 insertions(+), 123 deletions(-) diff --git a/MP-TAB3/Components/ControlsMan.razor.cs b/MP-TAB3/Components/ControlsMan.razor.cs index 86a2e55d..0dde48ce 100644 --- a/MP-TAB3/Components/ControlsMan.razor.cs +++ b/MP-TAB3/Components/ControlsMan.razor.cs @@ -10,6 +10,9 @@ namespace MP_TAB3.Components { #region Public Properties + [Parameter] + public EventCallback E_MachSel { get; set; } + [Parameter] public EventCallback E_Updated { get; set; } @@ -131,6 +134,7 @@ namespace MP_TAB3.Components await doUpdate(); isProcessing = false; await Task.Delay(1); + await E_MachSel.InvokeAsync(selIdxMacc); } protected async Task SetOdl(int selIdxOdl) diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs index 89ab5bda..05c8f7a1 100644 --- a/MP-TAB3/Components/DeclarMan.razor.cs +++ b/MP-TAB3/Components/DeclarMan.razor.cs @@ -11,6 +11,9 @@ namespace MP_TAB3.Components { #region Public Properties + [Parameter] + public EventCallback E_MachSel { get; set; } + [Parameter] public MappaStatoExpl? RecMSE { get; set; } = null; @@ -44,15 +47,11 @@ namespace MP_TAB3.Components protected List ListComplete { get; set; } = new List(); protected List ListPaged { get; set; } = new List(); - protected void SetEdit(RegistroDichiarazioniModel selRec) - { - CurrRec = selRec; - } + [Inject] + protected MessageService MServ { get; set; } = null!; [Inject] protected SharedMemService SMServ { get; set; } = null!; - [Inject] - protected MessageService MServ { get; set; } = null!; [Inject] protected TabDataService TabDServ { get; set; } = null!; @@ -96,6 +95,11 @@ namespace MP_TAB3.Components UpdateTable(); } + protected void SetEdit(RegistroDichiarazioniModel selRec) + { + CurrRec = selRec; + } + protected async Task SetMacc(string selIdxMacc) { isProcessing = true; @@ -104,6 +108,7 @@ namespace MP_TAB3.Components await doUpdate(); isProcessing = false; await Task.Delay(1); + await E_MachSel.InvokeAsync(selIdxMacc); } protected async Task SetOdl(int selIdxOdl) @@ -139,8 +144,6 @@ namespace MP_TAB3.Components #region Private Fields - private RegistroDichiarazioniModel? CurrRec { get; set; } = null; - private static Logger Log = LogManager.GetCurrentClassLogger(); private bool isProcessing = false; private int NumRecPage = 10; @@ -153,7 +156,7 @@ namespace MP_TAB3.Components #region Private Properties private Periodo CurrPeriodo { get; set; } = new Periodo(); - + private RegistroDichiarazioniModel? CurrRec { get; set; } = null; private string IdxMaccSel { get; set; } = ""; private int IdxOdl { get; set; } = 0; diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index 5a3359ee..7a1437d5 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -92,81 +92,81 @@
      } -@if (!confProdActive) -{ -
      -
      - Dati Globali ODL -
      -
      -
      -
      - [A] NUOVI Pz.Prod -
      -
      - @if (isProcessing) - { - - } - else - { - @numPzProdotti2Rec - } -
      +
      +
      + Dati Globali ODL +
      +
      +
      +
      + [A] NUOVI Pz.Prod
      -
      -
      -
      -
      - Pz Prodotti TOT [A+B+C] -
      -
      - @if (isProcessing) - { - - } - else - { - @numPzProdotti - } -
      -
      -
      -
      -
      -
      - [B] Scarti VERS. -
      -
      - @if (isProcessing) - { - - } - else - { - @numPzScaConf - } -
      -
      -
      -
      -
      -
      - [C] Pz Buoni VERS. -
      -
      - @if (isProcessing) - { - - } - else - { - @numPzBuoniConf - } -
      +
      + @if (isProcessing) + { + + } + else + { + @numPzProdotti2Rec + }
      +
      +
      +
      + Pz Prodotti TOT [A+B+C] +
      +
      + @if (isProcessing) + { + + } + else + { + @numPzProdotti + } +
      +
      +
      +
      +
      +
      + [B] Scarti VERS. +
      +
      + @if (isProcessing) + { + + } + else + { + @numPzScaConf + } +
      +
      +
      +
      +
      +
      + [C] Pz Buoni VERS. +
      +
      + @if (isProcessing) + { + + } + else + { + @numPzBuoniConf + } +
      +
      +
      +
      +@if (!confProdActive) +{
      Reg. SCARTI diff --git a/MP-TAB3/Components/ScrapMan.razor.cs b/MP-TAB3/Components/ScrapMan.razor.cs index ede443d8..de7c088a 100644 --- a/MP-TAB3/Components/ScrapMan.razor.cs +++ b/MP-TAB3/Components/ScrapMan.razor.cs @@ -10,47 +10,20 @@ namespace MP_TAB3.Components { #region Public Properties + [Parameter] + public EventCallback E_MachSel { get; set; } + [Parameter] public MappaStatoExpl? RecMSE { get; set; } = null; #endregion Public Properties - #region Public Methods - - /// - /// Aggiorno valori produzione alla data richiesta... - /// - /// - protected async Task ReloadData() - { - isProcessing = true; - await Task.Delay(1); - if (!string.IsNullOrEmpty(IdxMaccSel)) - { - ListComplete = await TabDServ.RegScartiGetFilt(IdxMaccSel, IdxOdl, CurrPeriodo.Inizio, CurrPeriodo.Fine, false); - TotalCount = ListComplete.Count; - // esegue paginazione - UpdateTable(); - } - isProcessing = false; - await Task.Delay(1); - } - - protected async Task ForceReload(bool DoClose) - { - if (DoClose) - { - selItem = null; - } - await ReloadData(); - } - - #endregion Public Methods - #region Protected Properties protected bool enableScarti { get; set; } = true; + protected List ListComplete { get; set; } = new List(); + protected List ListPaged { get; set; } = new List(); [Inject] @@ -66,6 +39,15 @@ namespace MP_TAB3.Components #region Protected Methods + protected async Task ForceReload(bool DoClose) + { + if (DoClose) + { + selItem = null; + } + await ReloadData(); + } + protected override async Task OnInitializedAsync() { await Task.Delay(1); @@ -90,6 +72,25 @@ namespace MP_TAB3.Components } } + /// + /// Aggiorno valori produzione alla data richiesta... + /// + /// + protected async Task ReloadData() + { + isProcessing = true; + await Task.Delay(1); + if (!string.IsNullOrEmpty(IdxMaccSel)) + { + ListComplete = await TabDServ.RegScartiGetFilt(IdxMaccSel, IdxOdl, CurrPeriodo.Inizio, CurrPeriodo.Fine, false); + TotalCount = ListComplete.Count; + // esegue paginazione + UpdateTable(); + } + isProcessing = false; + await Task.Delay(1); + } + protected void SaveNumRec(int newNum) { NumRecPage = newNum; @@ -115,6 +116,7 @@ namespace MP_TAB3.Components await ReloadData(); isProcessing = false; await Task.Delay(1); + await E_MachSel.InvokeAsync(selIdxMacc); } protected async Task SetOdl(int selIdxOdl) diff --git a/MP-TAB3/Pages/Controls.razor b/MP-TAB3/Pages/Controls.razor index 8f7e5fe9..8a35b6c9 100644 --- a/MP-TAB3/Pages/Controls.razor +++ b/MP-TAB3/Pages/Controls.razor @@ -8,6 +8,6 @@ else { - - + + } diff --git a/MP-TAB3/Pages/Controls.razor.cs b/MP-TAB3/Pages/Controls.razor.cs index 007c7f29..192b6cd9 100644 --- a/MP-TAB3/Pages/Controls.razor.cs +++ b/MP-TAB3/Pages/Controls.razor.cs @@ -18,6 +18,13 @@ namespace MP_TAB3.Pages #region Protected Methods + protected async Task ForceReload() + { + IsLoading = true; + await Task.Delay(50); + IsLoading = false; + } + protected override async Task OnInitializedAsync() { await ReloadData(); @@ -41,16 +48,20 @@ namespace MP_TAB3.Pages await InvokeAsync(StateHasChanged); } - protected async Task ForceReload() + protected void SetMacc(string selIdxMacc) { - IsLoading = true; - await Task.Delay(50); - IsLoading = false; + IdxMaccSubSel = selIdxMacc; } - private bool IsLoading = false; #endregion Protected Methods + #region Private Fields + + private string IdxMaccSubSel = ""; + private bool IsLoading = false; + + #endregion Private Fields + #region Private Methods private async Task ReloadData() diff --git a/MP-TAB3/Pages/Declarations.razor b/MP-TAB3/Pages/Declarations.razor index 5a45a974..bdb96323 100644 --- a/MP-TAB3/Pages/Declarations.razor +++ b/MP-TAB3/Pages/Declarations.razor @@ -8,6 +8,6 @@ else { - - + + } diff --git a/MP-TAB3/Pages/Declarations.razor.cs b/MP-TAB3/Pages/Declarations.razor.cs index dbb966f7..30e3a328 100644 --- a/MP-TAB3/Pages/Declarations.razor.cs +++ b/MP-TAB3/Pages/Declarations.razor.cs @@ -41,8 +41,19 @@ namespace MP_TAB3.Pages await InvokeAsync(StateHasChanged); } + protected void SetMacc(string selIdxMacc) + { + IdxMaccSubSel = selIdxMacc; + } + #endregion Protected Methods + #region Private Fields + + private string IdxMaccSubSel = ""; + + #endregion Private Fields + #region Private Methods private async Task ReloadData() diff --git a/MP-TAB3/Pages/Scrap.razor b/MP-TAB3/Pages/Scrap.razor index 65c20614..6ffaf1a3 100644 --- a/MP-TAB3/Pages/Scrap.razor +++ b/MP-TAB3/Pages/Scrap.razor @@ -8,6 +8,6 @@ else { - - + + } diff --git a/MP-TAB3/Pages/Scrap.razor.cs b/MP-TAB3/Pages/Scrap.razor.cs index 0b7e29fc..76d40e31 100644 --- a/MP-TAB3/Pages/Scrap.razor.cs +++ b/MP-TAB3/Pages/Scrap.razor.cs @@ -59,5 +59,11 @@ namespace MP_TAB3.Pages } #endregion Private Methods + + protected void SetMacc(string selIdxMacc) + { + IdxMaccSubSel = selIdxMacc; + } + private string IdxMaccSubSel = ""; } } \ No newline at end of file From ace4a7695048bb3e6db11eec2c04e52d9727b515 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 19 Dec 2023 15:54:57 +0100 Subject: [PATCH 11/13] =?UTF-8?q?aggiunti=20refresh=20vari=20+=20nascosto?= =?UTF-8?q?=20switch=20modalit=C3=A0=20di=20visualizzazione?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MP-TAB3/Components/OdlMan.razor.cs | 7 +++++++ MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Pages/StatusMap.razor | 11 ----------- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index 97313fc1..0b504405 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -871,7 +871,14 @@ namespace MP_TAB3.Components { if (has2Refr) { + // update buttons... + checkAll(); + // reset vari + IdxPOdlSel = 0; + inAttr = false; + IdxPOdlSel = 0; await RefreshData(); + await CheckAttr(); await InvokeAsync(StateHasChanged); } } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 1ac9e97c..72ec7ae5 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1908 + 6.16.2312.1915 enable MP_TAB3 diff --git a/MP-TAB3/Pages/StatusMap.razor b/MP-TAB3/Pages/StatusMap.razor index 37a4a0d2..83c2368c 100644 --- a/MP-TAB3/Pages/StatusMap.razor +++ b/MP-TAB3/Pages/StatusMap.razor @@ -8,17 +8,6 @@ } else { - @if (Width < 640) - { - -
      - -
      - - -
      -
      - } @foreach (var item in ListMSE) {
      diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 1d695333..8412ba83 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2312.1908

      +

      Versione: 6.16.2312.1915


      Note di rilascio:
      • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index d393ad2f..83057c07 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1908 +6.16.2312.1915 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index f3cd9ff7..cc4429f6 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1908 + 6.16.2312.1915 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false From 9ce6dcc6b4b2ae79d2432f3b9d1023cf6ec3c4e3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 19 Dec 2023 16:09:38 +0100 Subject: [PATCH 12/13] Fix sel ODL/periodo --- MP-TAB3/Components/ControlsMan.razor | 2 +- MP-TAB3/Components/ControlsMan.razor.cs | 23 +++++++++++++++++++++++ MP-TAB3/Components/DeclarMan.razor | 2 +- MP-TAB3/Components/DeclarMan.razor.cs | 15 +++++++++++++++ MP-TAB3/Components/ScrapMan.razor | 2 +- MP-TAB3/Components/ScrapMan.razor.cs | 13 +++++++++++++ MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 10 files changed, 58 insertions(+), 7 deletions(-) diff --git a/MP-TAB3/Components/ControlsMan.razor b/MP-TAB3/Components/ControlsMan.razor index 97f4ad5e..7709e613 100644 --- a/MP-TAB3/Components/ControlsMan.razor +++ b/MP-TAB3/Components/ControlsMan.razor @@ -28,7 +28,7 @@
      - +
      diff --git a/MP-TAB3/Components/ControlsMan.razor.cs b/MP-TAB3/Components/ControlsMan.razor.cs index 0dde48ce..5a78327a 100644 --- a/MP-TAB3/Components/ControlsMan.razor.cs +++ b/MP-TAB3/Components/ControlsMan.razor.cs @@ -52,7 +52,9 @@ namespace MP_TAB3.Components } protected bool enableControlli { get; set; } = true; + protected List ListComplete { get; set; } = new List(); + protected List ListPaged { get; set; } = new List(); [Inject] @@ -186,13 +188,21 @@ namespace MP_TAB3.Components #region Private Fields private static Logger Log = LogManager.GetCurrentClassLogger(); + private bool isProcessing = false; + private string noteKo = ""; + private int NumRecPage = 10; + private int PageNum = 1; + private bool showInsert = false; + private bool showNote = false; + private int TotalCount = 0; + private bool useOdl = false; #endregion Private Fields @@ -210,6 +220,19 @@ namespace MP_TAB3.Components get => useOdl ? "Periodo da ODL" : "Periodo Libero"; } + private bool UseOdl + { + get => useOdl; + set + { + useOdl = value; + if (!value) + { + IdxOdl = 0; + } + } + } + #endregion Private Properties } } \ No newline at end of file diff --git a/MP-TAB3/Components/DeclarMan.razor b/MP-TAB3/Components/DeclarMan.razor index 753b9c9e..cadac2f2 100644 --- a/MP-TAB3/Components/DeclarMan.razor +++ b/MP-TAB3/Components/DeclarMan.razor @@ -11,7 +11,7 @@
      - +
      diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs index 05c8f7a1..ca2d229c 100644 --- a/MP-TAB3/Components/DeclarMan.razor.cs +++ b/MP-TAB3/Components/DeclarMan.razor.cs @@ -156,7 +156,9 @@ namespace MP_TAB3.Components #region Private Properties private Periodo CurrPeriodo { get; set; } = new Periodo(); + private RegistroDichiarazioniModel? CurrRec { get; set; } = null; + private string IdxMaccSel { get; set; } = ""; private int IdxOdl { get; set; } = 0; @@ -166,6 +168,19 @@ namespace MP_TAB3.Components get => useOdl ? "Periodo da ODL" : "Periodo Libero"; } + private bool UseOdl + { + get => useOdl; + set + { + useOdl = value; + if (!value) + { + IdxOdl = 0; + } + } + } + #endregion Private Properties } } \ No newline at end of file diff --git a/MP-TAB3/Components/ScrapMan.razor b/MP-TAB3/Components/ScrapMan.razor index 8b27c012..34e19143 100644 --- a/MP-TAB3/Components/ScrapMan.razor +++ b/MP-TAB3/Components/ScrapMan.razor @@ -21,7 +21,7 @@
      - +
      diff --git a/MP-TAB3/Components/ScrapMan.razor.cs b/MP-TAB3/Components/ScrapMan.razor.cs index de7c088a..fc309996 100644 --- a/MP-TAB3/Components/ScrapMan.razor.cs +++ b/MP-TAB3/Components/ScrapMan.razor.cs @@ -200,6 +200,19 @@ namespace MP_TAB3.Components get => useOdl ? "Periodo da ODL" : "Periodo Libero"; } + private bool UseOdl + { + get => useOdl; + set + { + useOdl = value; + if (!value) + { + IdxOdl = 0; + } + } + } + #endregion Private Properties } } \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 72ec7ae5..7b85624a 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1915 + 6.16.2312.1916 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 8412ba83..0ef2868e 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2312.1915

      +

      Versione: 6.16.2312.1916


      Note di rilascio:
      • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 83057c07..4b41cbcd 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1915 +6.16.2312.1916 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index cc4429f6..dd26dfec 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1915 + 6.16.2312.1916 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false From e0206e8aefbad5020611e9425eb492bdc10f1c36 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 19 Dec 2023 19:47:47 +0100 Subject: [PATCH 13/13] Fix refresh post setup dati ODL --- MP-TAB3/Components/OdlMan.razor.cs | 2 +- MP-TAB3/Components/ShowProcessing.razor | 7 +------ MP-TAB3/Components/ShowProcessing.razor.cs | 17 +++++++++++++++++ MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 7 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 MP-TAB3/Components/ShowProcessing.razor.cs diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index 0b504405..e1781ce0 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -199,7 +199,7 @@ namespace MP_TAB3.Components // se in attr --> carico podlCurr... if (inAttr && RecMSE != null) { - await ReloadXDL(false); + await ReloadXDL(true); } } diff --git a/MP-TAB3/Components/ShowProcessing.razor b/MP-TAB3/Components/ShowProcessing.razor index 6f44bfa4..1ad41064 100644 --- a/MP-TAB3/Components/ShowProcessing.razor +++ b/MP-TAB3/Components/ShowProcessing.razor @@ -12,9 +12,4 @@
      } -@code { - [Parameter] - public bool IsProcessing { get; set; } = false; - [Parameter] - public string Message { get; set; } = "ELABORAZIONE IN CORSO"; -} + diff --git a/MP-TAB3/Components/ShowProcessing.razor.cs b/MP-TAB3/Components/ShowProcessing.razor.cs new file mode 100644 index 00000000..fae22eae --- /dev/null +++ b/MP-TAB3/Components/ShowProcessing.razor.cs @@ -0,0 +1,17 @@ +using Microsoft.AspNetCore.Components; + +namespace MP_TAB3.Components +{ + public partial class ShowProcessing + { + #region Public Properties + + [Parameter] + public bool IsProcessing { get; set; } = false; + + [Parameter] + public string Message { get; set; } = "ELABORAZIONE IN CORSO"; + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 7b85624a..4227df3a 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1916 + 6.16.2312.1919 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 0ef2868e..ad0c712a 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2312.1916

      +

      Versione: 6.16.2312.1919


      Note di rilascio:
      • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 4b41cbcd..030af30a 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1916 +6.16.2312.1919 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index dd26dfec..3abafee6 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1916 + 6.16.2312.1919 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false