From 078101ccb4664ecc72f9a158d54936d0d2aceba9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 14 Apr 2025 11:53:06 +0200 Subject: [PATCH] INserito filtro parametri xDL x creazione PODL/KIT --- MP.Data/Controllers/MpSpecController.cs | 12 +- .../{AnagGruppi.cs => AnagGruppiModel.cs} | 2 +- MP.Data/DbModels/Gruppi2MaccModel.cs | 2 +- MP.Data/DbModels/Gruppi2OperModel.cs | 2 +- MP.Data/MoonProContext.cs | 4 +- MP.Data/Services/TabDataService.cs | 2 +- MP.SPEC/Components/AskCloseOdl.razor.cs | 2 +- MP.SPEC/Components/ListDossiers.razor.cs | 6 +- MP.SPEC/Components/ListPODL.razor | 4 +- MP.SPEC/Components/ListPODL.razor.cs | 22 ++-- MP.SPEC/Components/SelFilterXDL.razor | 69 +++++----- MP.SPEC/Components/SelFilterXDL.razor.cs | 2 +- .../Controllers/RecipeArchiveController.cs | 6 +- MP.SPEC/Data/MpDataService.cs | 84 ++++++------- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/Articoli.razor.cs | 2 +- MP.SPEC/Pages/FluxLogStatus.razor.cs | 12 +- MP.SPEC/Pages/ODL.razor.cs | 6 +- MP.SPEC/Pages/PODL.razor.cs | 10 +- MP.SPEC/Pages/Podl2Kit.razor | 31 +++-- MP.SPEC/Pages/Podl2Kit.razor.cs | 118 +++++++++++++----- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 24 files changed, 239 insertions(+), 167 deletions(-) rename MP.Data/DbModels/{AnagGruppi.cs => AnagGruppiModel.cs} (94%) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 958a45ff..613a5fd7 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -78,7 +78,7 @@ namespace MP.Data.Controllers /// Elenco Gruppi tipo Azienda /// /// - public List AnagGruppiAziende() + public List AnagGruppiAziende() { return AnagGruppiGetTipo("AZIENDA"); } @@ -87,7 +87,7 @@ namespace MP.Data.Controllers /// Elenco Gruppi tipo Fasi /// /// - public List AnagGruppiFase() + public List AnagGruppiFase() { return AnagGruppiGetTipo("FASE"); } @@ -96,9 +96,9 @@ namespace MP.Data.Controllers /// Elenco Gruppi /// /// - public List AnagGruppiGetAll() + public List AnagGruppiGetAll() { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { dbResult = dbCtx @@ -115,9 +115,9 @@ namespace MP.Data.Controllers /// /// /// - public List AnagGruppiGetTipo(string tipoGruppo) + public List AnagGruppiGetTipo(string tipoGruppo) { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { dbResult = dbCtx diff --git a/MP.Data/DbModels/AnagGruppi.cs b/MP.Data/DbModels/AnagGruppiModel.cs similarity index 94% rename from MP.Data/DbModels/AnagGruppi.cs rename to MP.Data/DbModels/AnagGruppiModel.cs index 0502c46d..bdbc9aa8 100644 --- a/MP.Data/DbModels/AnagGruppi.cs +++ b/MP.Data/DbModels/AnagGruppiModel.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace MP.Data.DbModels { [Table("AnagraficaGruppi")] - public partial class AnagGruppi + public partial class AnagGruppiModel { #region Public Properties diff --git a/MP.Data/DbModels/Gruppi2MaccModel.cs b/MP.Data/DbModels/Gruppi2MaccModel.cs index 0dcb43bc..01daae65 100644 --- a/MP.Data/DbModels/Gruppi2MaccModel.cs +++ b/MP.Data/DbModels/Gruppi2MaccModel.cs @@ -27,7 +27,7 @@ namespace MP.Data.DbModels /// Navigazione oggetto Machine /// [ForeignKey("CodGruppo")] - public virtual AnagGruppi GruppiNav { get; set; } = null!; + public virtual AnagGruppiModel GruppiNav { get; set; } = null!; #endregion Public Properties } diff --git a/MP.Data/DbModels/Gruppi2OperModel.cs b/MP.Data/DbModels/Gruppi2OperModel.cs index 68828472..34dc2a4e 100644 --- a/MP.Data/DbModels/Gruppi2OperModel.cs +++ b/MP.Data/DbModels/Gruppi2OperModel.cs @@ -27,7 +27,7 @@ namespace MP.Data.DbModels /// Navigazione oggetto Machine /// [ForeignKey("CodGruppo")] - public virtual AnagGruppi GruppiNav { get; set; } = null!; + public virtual AnagGruppiModel GruppiNav { get; set; } = null!; #endregion Public Properties } diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs index 03f34685..8c099fe1 100644 --- a/MP.Data/MoonProContext.cs +++ b/MP.Data/MoonProContext.cs @@ -43,7 +43,7 @@ namespace MP.Data public virtual DbSet DbSetAnagEventi { get; set; } public virtual DbSet DbSetAnagFlussi { get; set; } public virtual DbSet DbSetAnagFluxType { get; set; } - public virtual DbSet DbSetAnagGruppi { get; set; } + public virtual DbSet DbSetAnagGruppi { get; set; } public virtual DbSet DbSetAnagStati { get; set; } public virtual DbSet DbSetAnagTags { get; set; } public virtual DbSet DbSetArticoli { get; set; } @@ -326,7 +326,7 @@ namespace MP.Data .HasColumnName("valoreStd") .HasComment("Valore di default/riferimento per la variabile"); }); - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasKey(e => e.CodGruppo); diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index d5193f93..5eeff5bd 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -3142,7 +3142,7 @@ namespace MP.Data.Services sw.Start(); List? result = new List(); // cerco in redis... - string currKey = $"{redisBaseKey}:ST:AnagGruppi"; + string currKey = $"{redisBaseKey}:ST:AnagGruppiModel"; RedisValue rawData = await redisDb.StringGetAsync(currKey); if (rawData.HasValue) { diff --git a/MP.SPEC/Components/AskCloseOdl.razor.cs b/MP.SPEC/Components/AskCloseOdl.razor.cs index 7c96b5d6..98fe22f4 100644 --- a/MP.SPEC/Components/AskCloseOdl.razor.cs +++ b/MP.SPEC/Components/AskCloseOdl.razor.cs @@ -75,7 +75,7 @@ namespace MP.SPEC.Components if (idxOdl > 0) { DateTime oggi = DateTime.Today; - // recupero macchina x ODL... + // recupero idxMaccSel x ODL... var elencoOdl = await MDService.OdlListGetFilt(true, "*", "*", "*", "*", DateTime.Today.AddMonths(-1), DateTime.Today.AddDays(1)); var currOdl = elencoOdl.FirstOrDefault(x => x.IdxOdl == idxOdl); if (currOdl != null && currOdl.IdxOdl == idxOdl) diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 1de16082..91065bbf 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -230,12 +230,12 @@ namespace MP.SPEC.Components protected override async Task OnInitializedAsync() { await MDService.ConfigResetCache(); - ListGruppiFase = await MDService.ElencoGruppiFase(); + ListGruppiFase = MDService.ElencoGruppiFase(); ListStati = await MDService.AnagStatiComm(); selAzienda = await MDService.ConfigTryGetAsync("AZIENDA"); giacenzeConf = await MDService.ConfigTryGetAsync("SPEC_ShowGiacenze"); ListArticoli = await MDService.ArticoliGetSearch(100000, selAzienda, ""); - ListMacchine = await MDService.MacchineGetFilt("*"); + ListMacchine = MDService.MacchineGetFilt("*"); await ReloadData(true); } @@ -315,7 +315,7 @@ namespace MP.SPEC.Components private DossierModel? currRecordClone = null; private List? ListArticoli; - private List? ListGruppiFase; + private List? ListGruppiFase; private List? ListMacchine; private List? ListRecords; diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor index 67e21616..b3b579cc 100644 --- a/MP.SPEC/Components/ListPODL.razor +++ b/MP.SPEC/Components/ListPODL.razor @@ -71,13 +71,13 @@ else } @if (MachineWithRecipe) { - @if (machineHasRecipeConf(record.IdxMacchina).Result) + @if (machineHasRecipeConf(record.IdxMacchina)) { } - else if (machineHasRecipeArch(record.IdxMacchina).Result) + else if (machineHasRecipeArch(record.IdxMacchina)) { + @if (filtActive) + { +
+ @if (repartoSel != "*") + { + + } + @if (idxMaccSel != "*") + { + + } +
+ } + +
+
- @*
- - - -
*@ +
+ + + +
+ +
- @* *@
diff --git a/MP.SPEC/Pages/Podl2Kit.razor.cs b/MP.SPEC/Pages/Podl2Kit.razor.cs index ab086616..e6a77182 100644 --- a/MP.SPEC/Pages/Podl2Kit.razor.cs +++ b/MP.SPEC/Pages/Podl2Kit.razor.cs @@ -1,9 +1,12 @@ +using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.JSInterop; using MP.Data.DbModels; +using MP.SPEC.Components; using MP.SPEC.Data; using NLog.Layouts; +using System.Reflection.PortableExecutable; namespace MP.SPEC.Pages { @@ -161,8 +164,6 @@ namespace MP.SPEC.Pages await Task.Delay(1); } - private bool OptAdmKitEnabled = false; - protected override void OnInitialized() { numRecord = 10; @@ -185,22 +186,6 @@ namespace MP.SPEC.Pages } } -#if false - protected override void OnAfterRender(bool firstRender) - { - if (firstRender) - { - if (OptAdmKitEnabled) - { - doReset(); - } - } - //base.OnAfterRender(firstRender); - } -#endif - - - protected override void OnParametersSet() { ReloadData(); @@ -256,10 +241,22 @@ namespace MP.SPEC.Pages private bool doSearchArt = false; private IstanzeKitModel? EditRecord = null; - private List? ListRecords; - private int minChar = 2; + private bool OptAdmKitEnabled = false; +#if false + protected override void OnAfterRender(bool firstRender) + { + if (firstRender) + { + if (OptAdmKitEnabled) + { + doReset(); + } + } + //base.OnAfterRender(firstRender); + } +#endif /// /// RegExp x SAVE KIT @@ -291,6 +288,21 @@ namespace MP.SPEC.Pages private int _numRecord { get; set; } = 10; + private string addNewBtnCss + { + get => doAddNew ? "btn-secondary" : "btn-primary"; + } + + private string addNewBtnText + { + get => doAddNew ? "Chiudi Composizione KIT" : "Composizione Nuovo KIT"; + } + + private string iconDetail + { + get => doAddNew ? "fa-chevron-up" : "fa-chevron-down"; + } + private int currPage { get => _currPage; @@ -321,15 +333,68 @@ namespace MP.SPEC.Pages private string sCodComm { get; set; } = ""; - private bool ShowCharts { get; set; } = false; + private SelectXdlParams currFilter { get; set; } = new SelectXdlParams(); + private bool filtActive + { + get => idxMaccSel != "*" || repartoSel != "*"; + } + private string idxMaccSel + { + get => currFilter.IdxMacchina; + set => currFilter.IdxMacchina = value; + } + private string repartoSel + { + get => currFilter.CodReparto; + set => currFilter.CodReparto = value; + } + + + + [Inject] + protected ILocalStorageService localStorage { get; set; } = null!; + + private List? ListStati; + private async Task UpdateFilter(SelectXdlParams newParams) + { + isLoading = true; + currPage = 1; + // salvo comunque filtro reparto x utente + await localStorage.SetItemAsync("reparto", repartoSel); + ReloadData(); + //await InvokeAsync(() => StateHasChanged()); + currFilter = newParams; + isLoading = false; + } + + + protected void resetMacchina() + { + idxMaccSel = "*"; + } + + protected void resetReparto() + { + repartoSel = "*"; + } #endregion Private Properties #region Private Methods + private List ListGruppiFase = new List(); + private List ListMacchine = new List(); + private void ReloadData() { isLoading = true; + // leggo dati x filtro + var allGruppiData = MDService.ElencoGruppiFase(); + if (allGruppiData != null) + { + ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList(); + } + ListMacchine = MDService.MacchineGetFilt(repartoSel); SearchRecords = MDService.IstKitFilt("", ""); totalCount = SearchRecords.Count; // conto i kit = distinct... @@ -363,16 +428,5 @@ namespace MP.SPEC.Pages } #endregion Private Methods - - - private string addNewBtnText - { - get => doAddNew ? "Annulla creazione Istanza KIT" : "Composizione Nuovo KIT"; - } - private string addNewBtnCss - { - get => doAddNew ? "btn-secondary" : "btn-primary"; - } - } } \ No newline at end of file diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 65094621..677a7472 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2504.1407

+

Versione: 6.16.2504.1411


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