diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 0902e0c1..7c7a72a2 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -327,7 +327,7 @@ namespace MP.Data.Controllers { dbResult = dbCtx .DbSetPODL - .Where(x => (x.IdxOdl == 0) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (x.CodArticolo == codArt || codArt == "*")) + .Where(x => (x.IdxOdl == 0) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt))) .AsNoTracking() .OrderBy(x => x.InsertDate) .ToList(); diff --git a/MP.SPEC/Components/DataPager.razor.cs b/MP.SPEC/Components/DataPager.razor.cs index af42ed54..1b6816c5 100644 --- a/MP.SPEC/Components/DataPager.razor.cs +++ b/MP.SPEC/Components/DataPager.razor.cs @@ -23,6 +23,11 @@ namespace MP.SPEC.Components } } } + + public async Task resetCurrPage() + { + currPage = 1; + } [Parameter] public EventCallback numPageChanged { get; set; } diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 34926d65..7aef6ace 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -71,7 +71,8 @@ namespace MP.SPEC.Components { await InvokeAsync(() => { - currPage = 1; + PagerResetReq.InvokeAsync(true); + //currPage = 1; Task task = UpdateData(); StateHasChanged(); }); @@ -87,6 +88,9 @@ namespace MP.SPEC.Components #region Private Fields + [Parameter] + public EventCallback PagerResetReq { get; set; } + private string _statoSel = "*"; private ODLModel? currRecord = null; diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 94feed24..c72bfd60 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -71,7 +71,8 @@ namespace MP.SPEC.Components { await InvokeAsync(() => { - currPage = 1; + PagerResetReq.InvokeAsync(true); + //currPage = 1; Task task = UpdateData(); StateHasChanged(); }); @@ -87,6 +88,9 @@ namespace MP.SPEC.Components #region Private Fields + [Parameter] + public EventCallback PagerResetReq { get; set; } + private string _statoSel = "*"; private PODLModel? currRecord = null; diff --git a/MP.SPEC/Data/MessageService.cs b/MP.SPEC/Data/MessageService.cs index e20955d4..02f36b26 100644 --- a/MP.SPEC/Data/MessageService.cs +++ b/MP.SPEC/Data/MessageService.cs @@ -104,7 +104,7 @@ { if (_totalCount != value) { - _totalCount = value + _totalCount = value; } } } diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor index ec409e1d..196dd078 100644 --- a/MP.SPEC/Pages/ODL.razor +++ b/MP.SPEC/Pages/ODL.razor @@ -34,15 +34,15 @@
@if (showCurrent) { - + } else { - + }
diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index c47b92eb..8c94f98f 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; +using MP.SPEC.Components; using MP.SPEC.Data; namespace MP.SPEC.Pages @@ -34,6 +35,16 @@ namespace MP.SPEC.Pages currPage = newNum; } + protected async Task pgResetReq(bool doReset) + { + if (doReset) + { + await pagerODL.resetCurrPage(); + } + } + + protected DataPager pagerODL; + protected override async Task OnInitializedAsync() { // abilito ricerca...