From beb7ebd509481e060e6e12237bda34a8e4d0798a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 14 Apr 2025 07:57:33 +0200 Subject: [PATCH] SPEC: - Test eliminazione kit + test dettaglio kit - fix display show/hide dettaglio KIT --- MP.Data/Controllers/MpSpecController.cs | 2 +- MP.SPEC/Components/ProdKit/GestKitPodl.razor | 3 +- .../Components/ProdKit/GestKitPodl.razor.cs | 113 ++++++++++-------- MP.SPEC/Components/ProdKit/Manager.razor | 2 +- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 8 files changed, 68 insertions(+), 60 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index a0d843ec..958a45ff 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -1700,7 +1700,7 @@ namespace MP.Data.Controllers var dbResult = dbCtx .Database .ExecuteSqlRaw("EXEC dbo.stp_PodlIstKit_delete @IdxPODL", pIdxPODL); - answ = true; + answ = dbResult != 0; } return answ; } diff --git a/MP.SPEC/Components/ProdKit/GestKitPodl.razor b/MP.SPEC/Components/ProdKit/GestKitPodl.razor index 1bb31899..86003c3a 100644 --- a/MP.SPEC/Components/ProdKit/GestKitPodl.razor +++ b/MP.SPEC/Components/ProdKit/GestKitPodl.razor @@ -62,7 +62,7 @@
@record.NumPezzi
- @if (ShowAllDet) + @if (ShowAllDet || ListPodlExpl2Show.Contains(record.IdxPromessa)) { @@ -92,6 +92,7 @@ } else { +@ListDetIKCount(record.IdxPromessa) ordini } diff --git a/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs b/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs index ebb38f9f..fb02740e 100644 --- a/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs +++ b/MP.SPEC/Components/ProdKit/GestKitPodl.razor.cs @@ -10,11 +10,14 @@ namespace MP.SPEC.Components.ProdKit #region Public Properties [Parameter] - public List PodlRecords { get; set; } = new List(); + public EventCallback EC_ListUpdated { get; set; } [Parameter] public List IstKitRecords { get; set; } = new List(); + [Parameter] + public List PodlRecords { get; set; } = new List(); + #endregion Public Properties #region Public Methods @@ -30,10 +33,6 @@ namespace MP.SPEC.Components.ProdKit #region Protected Fields -#if false - protected int kitCount = 0; -#endif - protected int totalCount = 0; #endregion Protected Fields @@ -90,8 +89,7 @@ namespace MP.SPEC.Components.ProdKit protected bool DelEnabled(PODLExpModel reqRec) { - bool answ = false; - + bool answ = reqRec.IdxOdl == 0; return answ; } @@ -118,13 +116,12 @@ namespace MP.SPEC.Components.ProdKit return; // da provare... - var done = MDService.PodlIstKitDelete(selRec.IdxPromessa); + var done = MDService.PodlIstKitDelete(selRec.IdxPromessa); EditRecord = null; ReloadData(); + await EC_ListUpdated.InvokeAsync(true); } - private bool OptAdmKitEnabled = false; - protected override void OnInitialized() { numRecord = 5; @@ -184,6 +181,14 @@ namespace MP.SPEC.Components.ProdKit numRecord = newNum; } + protected void ShowDetail(PODLExpModel reqRec) + { + if (!ListPodlExpl2Show.Contains(reqRec.IdxPromessa)) + { + ListPodlExpl2Show.Add(reqRec.IdxPromessa); + } + } + protected void UpdateData() { EditRecord = null; @@ -200,9 +205,15 @@ namespace MP.SPEC.Components.ProdKit private bool doSearchArt = false; private PODLExpModel? EditRecord = null; - private List? ListRecordsPODL; + /// + /// Elenco singoli podl esplosi + /// + private List ListPodlExpl2Show = new List(); + + private List? ListRecordsPODL; private int minChar = 2; + private bool OptAdmKitEnabled = false; /// /// RegExp x SAVE KIT @@ -224,6 +235,10 @@ namespace MP.SPEC.Components.ProdKit /// private string regExp_OK = "#ROK"; + /// + /// mostra tutti i dettagli delle istanze x PODL + /// + private bool ShowAllDet = false; #endregion Private Fields @@ -233,6 +248,11 @@ namespace MP.SPEC.Components.ProdKit private int _numRecord { get; set; } = 10; + private string cssDetail + { + get => ShowAllDet ? "btn-secondary" : "btn-primary"; + } + private int currPage { get => _currPage; @@ -246,6 +266,11 @@ namespace MP.SPEC.Components.ProdKit } } + private string iconDetail + { + get => ShowAllDet ? "fa-chevron-up" : "fa-chevron-down"; + } + private bool isLoading { get; set; } = false; private int numRecord @@ -269,23 +294,6 @@ namespace MP.SPEC.Components.ProdKit #region Private Methods - private void ReloadData() - { - isLoading = true; - // reset preliminare... - ListRecordsPODL = new List(); - - ListRecordsPODL= PodlRecords - .Where(x => !string.IsNullOrEmpty(x.KeyRichiesta) && x.Attivabile && x.KeyRichiesta.StartsWith("KIT")) - .Skip(numRecord * (currPage - 1)) - .Take(numRecord) - .ToList(); - - // conto e filtro - totalCount = ListRecordsPODL.Count; - isLoading = false; - } - /// /// Elenco record dettaglio IK dato IdxPODL /// @@ -299,7 +307,6 @@ namespace MP.SPEC.Components.ProdKit return answ; } - /// /// Conteggio record dettaglio IK dato IdxPODL /// @@ -307,35 +314,28 @@ namespace MP.SPEC.Components.ProdKit /// private int ListDetIKCount(int idxPODL) { - int answ = IstKitRecords - .Where(x => x.IdxPodlParent == idxPODL) - .Count(); + int answ = IstKitRecords + .Where(x => x.IdxPodlParent == idxPODL) + .Count(); return answ; } - private void ToggleDetail() + private void ReloadData() { - ShowAllDet = !ShowAllDet; - } + isLoading = true; + // reset preliminare... + ListRecordsPODL = new List(); - private string cssDetail - { - get => ShowAllDet ? "btn-secondary" : "btn-primary"; - } - private string iconDetail - { - get => ShowAllDet ? "fa-chevron-up" : "fa-chevron-down"; - } + ListRecordsPODL = PodlRecords + .Where(x => !string.IsNullOrEmpty(x.KeyRichiesta) && x.Attivabile && x.KeyRichiesta.StartsWith("KIT")) + .Skip(numRecord * (currPage - 1)) + .Take(numRecord) + .ToList(); - /// - /// mostra tutti i dettagli delle istanze x PODL - /// - private bool ShowAllDet = false; - - /// - /// Elenco singoli podl esplosi - /// - private List ListPodlExpl = new List(); + // conto e filtro + totalCount = ListRecordsPODL.Count; + isLoading = false; + } /// /// Toggle modale ricerca articoli @@ -355,11 +355,18 @@ namespace MP.SPEC.Components.ProdKit { #if false EditRecord.CodArtChild = codArt; - doSearchArt = false; + doSearchArt = false; #endif } } + private void ToggleDetail() + { + ShowAllDet = !ShowAllDet; + // svuoto cmq lista sel singoli... + ListPodlExpl2Show = new List(); + } + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.SPEC/Components/ProdKit/Manager.razor b/MP.SPEC/Components/ProdKit/Manager.razor index 6190d6ee..ebdd943e 100644 --- a/MP.SPEC/Components/ProdKit/Manager.razor +++ b/MP.SPEC/Components/ProdKit/Manager.razor @@ -20,7 +20,7 @@ }
- +
} diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 9312dfe8..8a0343fb 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2504.1207 + 6.16.2504.1407 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index f710c9d1..65094621 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2504.1207

+

Versione: 6.16.2504.1407


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 2ead088c..e06e8bb6 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2504.1207 +6.16.2504.1407 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 473e651e..07d669e9 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2504.1207 + 6.16.2504.1407 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