diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 46cae42a..b9d5f829 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -124,7 +124,7 @@ namespace MP.SPEC.Components var done = await MDService.POdlDeleteRecord(selRec); await callSyncDb(selRec.IdxMacchina); currRecord = null; - await ReloadData(); + await ReloadDataAsync(); await Task.Delay(1); } @@ -187,7 +187,7 @@ namespace MP.SPEC.Components lastFilter = actFilter.clone(); _lastPadCodXdl = padCodXdl; - await ReloadData(); + await ReloadDataAsync(); } } @@ -254,7 +254,7 @@ namespace MP.SPEC.Components } } - protected async Task ReloadData() + protected async Task ReloadDataAsync() { isLoading = true; ListRecords = null; @@ -275,8 +275,24 @@ namespace MP.SPEC.Components // ✅ aspetta tutto insieme await Task.WhenAll(odlTask, searchTask); - - SearchRecords = searchTask.Result; + var rawList = searchTask.Result; + // se abilitata ricerca filtro ulteriormente.. + if (string.IsNullOrEmpty(actFilter.SearchVal)) + { + SearchRecords = rawList; + } + else + { + SearchRecords = rawList + .Where(x => + //EF.Functions.Like(x.CodArticolo, actFilter.SearchVal) || + //EF.Functions.Like(x.CodFase, actFilter.SearchVal) || + //EF.Functions.Like(x.DescArticolo, actFilter.SearchVal) + x.CodArticolo.Contains(actFilter.SearchVal, StringComparison.InvariantCulture) + || x.CodFase.Contains(actFilter.SearchVal, StringComparison.InvariantCulture) + || x.DescArticolo.Contains(actFilter.SearchVal, StringComparison.InvariantCulture) + ).ToList(); + } totalCount = SearchRecords.Count; @@ -320,7 +336,7 @@ namespace MP.SPEC.Components showRecipeConf = false; if (forceUpdate) { - await ReloadData(); + await ReloadDataAsync(); } await RecordEdit.InvokeAsync(null); } @@ -395,7 +411,7 @@ namespace MP.SPEC.Components protected async Task UpdateData() { currRecord = null; - await ReloadData(); + await ReloadDataAsync(); } #endregion Protected Methods diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index b82f95db..d406cb6a 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -2131,9 +2131,9 @@ namespace MP.SPEC.Data /// Elimina record + svuotamento cache /// /// - public async Task TemplateKitDelete(TemplateKitModel currRecord) + public async Task TemplateKitDeleteAsync(TemplateKitModel currRecord) { - using var activity = ActivitySource.StartActivity("TemplateKitDelete"); + using var activity = ActivitySource.StartActivity("TemplateKitDeleteAsync"); string source = "DB"; bool fatto = false; // salvo @@ -2141,7 +2141,7 @@ namespace MP.SPEC.Data await FlushCacheByTagAsync(Utils.redisKitTempl); activity?.SetTag("data.source", source); activity?.Stop(); - LogTrace($"TemplateKitDelete | {source} | {activity?.Duration.TotalMilliseconds}ms"); + LogTrace($"TemplateKitDeleteAsync | {source} | {activity?.Duration.TotalMilliseconds}ms"); return fatto; } @@ -2169,9 +2169,9 @@ namespace MP.SPEC.Data /// /// /// - public async Task TemplateKitUpsert(TemplateKitModel currRecord, string codAzienda) + public async Task TemplateKitUpsertAsync(TemplateKitModel currRecord, string codAzienda) { - using var activity = ActivitySource.StartActivity("TemplateKitUpsert"); + using var activity = ActivitySource.StartActivity("TemplateKitUpsertAsync"); string source = "DB"; bool fatto = false; // salvo @@ -2179,7 +2179,7 @@ namespace MP.SPEC.Data await FlushCacheByTagAsync(Utils.redisKitTempl); activity?.SetTag("data.source", source); activity?.Stop(); - LogTrace($"TemplateKitUpsert | {source} | {activity?.Duration.TotalMilliseconds}ms"); + LogTrace($"TemplateKitUpsertAsync | {source} | {activity?.Duration.TotalMilliseconds}ms"); return fatto; } diff --git a/MP.SPEC/Pages/KIT.razor.cs b/MP.SPEC/Pages/KIT.razor.cs index 340b5632..d45da043 100644 --- a/MP.SPEC/Pages/KIT.razor.cs +++ b/MP.SPEC/Pages/KIT.razor.cs @@ -162,7 +162,7 @@ namespace MP.SPEC.Pages if (!await JSRuntime.InvokeAsync("confirm", "Eliminazione riga KIT: sei sicuro di voler procedere?")) return; - var done = await MDService.TemplateKitDelete(selRec); + var done = await MDService.TemplateKitDeleteAsync(selRec); EditRecord = null; await ResetDataAsync(); } @@ -193,7 +193,7 @@ namespace MP.SPEC.Pages return; await Task.Delay(1); - var done = await MDService.TemplateKitUpsert(selRec, CodAzienda); + var done = await MDService.TemplateKitUpsertAsync(selRec, CodAzienda); EditRecord = null; await ResetDataAsync(); } diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index c6ad0b6b..61375d1c 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -12,7 +12,7 @@
Da Produrre
- +
Lanciati
@@ -29,20 +29,27 @@
+
+
+ + + +
+
@if (filtActive) {
@if (selReparto != "*") { - + } @if (macchina != "*") { - + } @if (StatoSel != "*") { - + }
} @@ -164,7 +171,7 @@
Gruppo - @if (currGruppoSel != null && currGruppoSel.CodGruppo!=null) + @if (currGruppoSel != null && currGruppoSel.CodGruppo != null) { } diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 8e866756..5e00967a 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -58,10 +58,6 @@ namespace MP.SPEC.Pages [Inject] protected IJSRuntime JSRuntime { get; set; } = null!; -#if false - [Inject] - protected ILocalStorageService localStorage { get; set; } = null!; -#endif [Inject] protected ILocalStorageService localStorage { get; set; } = null!; @@ -84,7 +80,7 @@ namespace MP.SPEC.Pages protected async Task cancel() { currRecord = null; - await ReloadData(); + await ReloadDataAsync(); await Task.Delay(1); } @@ -165,7 +161,7 @@ namespace MP.SPEC.Pages protected override async Task OnParametersSetAsync() { // carico dati - await ReloadData(); + await ReloadDataAsync(); } protected async Task pgResetReq(bool doReset) @@ -341,7 +337,7 @@ namespace MP.SPEC.Pages { currRecord.CodArticolo = ""; } - await ReloadData(); + await ReloadDataAsync(); }); pUpd.Wait(); } @@ -360,7 +356,7 @@ namespace MP.SPEC.Pages _currAzienda = value; var pUpd = Task.Run(async () => { - await ReloadData(); + await ReloadDataAsync(); }); pUpd.Wait(); } @@ -380,7 +376,7 @@ namespace MP.SPEC.Pages } } - private SelectXdlParams currFilter { get; set; } = new SelectXdlParams(); + private SelectXdlParams currFilter { get; set; } = new SelectXdlParams() { SearchVal = "" }; private int currPage { @@ -495,7 +491,7 @@ namespace MP.SPEC.Pages } } - private async Task ReloadData() + private async Task ReloadDataAsync() { isLoading = true; ListMacchine = await MDService.MacchineGetFiltAsync(selReparto); @@ -511,6 +507,14 @@ namespace MP.SPEC.Pages isLoading = false; } + private string sSearchCss => string.IsNullOrEmpty(currFilter.SearchVal) ? "btn-secondary" : "btn-primary"; + + private async Task ResetSearch() + { + currFilter.SearchVal = ""; + await ReloadDataAsync(); + } + private async Task UpdateFilter(SelectXdlParams newParams) { isLoading = true; @@ -518,7 +522,7 @@ namespace MP.SPEC.Pages currPage = 1; // salvo comunque filtro reparto x utente await localStorage.SetItemAsync("reparto", selReparto); - await ReloadData(); + await ReloadDataAsync(); await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); currFilter = newParams;