diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor index c51ebb46..ef06e110 100644 --- a/MP.SPEC/Components/ListODL.razor +++ b/MP.SPEC/Components/ListODL.razor @@ -1,8 +1,6 @@ @using MP.SPEC.Components @using MP.SPEC.Data -

ODL

- @if (ListRecords == null) { diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 8c235c41..826427c6 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -9,9 +9,6 @@ namespace MP.SPEC.Components { #region Public Properties - [Parameter] - public bool isActive { get; set; } = false; - [Parameter] public EventCallback PagerResetReq { get; set; } @@ -24,11 +21,8 @@ namespace MP.SPEC.Components if (_statoSel != value) { _statoSel = value; - if (isActive) - { - var pUpd = Task.Run(async () => await reloadData()); - pUpd.Wait(); - } + var pUpd = Task.Run(async () => await reloadData()); + pUpd.Wait(); } } } @@ -146,18 +140,11 @@ namespace MP.SPEC.Components private async Task reloadData() { isLoading = true; - if (isActive) - { - SearchRecords = await MDService.ListODLFilt(true, SearchVal, StatoSel); - totalCount = SearchRecords.Count; - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - await Task.Delay(1); - await InvokeAsync(() => StateHasChanged()); - } - else - { - await Task.Delay(1); - } + SearchRecords = await MDService.ListODLFilt(true, SearchVal, StatoSel); + totalCount = SearchRecords.Count; + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await Task.Delay(1); + await InvokeAsync(() => StateHasChanged()); isLoading = false; } diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor index 41a7998e..a62071a1 100644 --- a/MP.SPEC/Components/ListPODL.razor +++ b/MP.SPEC/Components/ListPODL.razor @@ -1,8 +1,6 @@ @using MP.SPEC.Components @using MP.SPEC.Data -

PODL

- @if (ListRecords == null) { diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 30914afe..fa2e9c93 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -9,28 +9,23 @@ namespace MP.SPEC.Components { #region Public Properties - [Parameter] - public bool isActive { get; set; } = false; - [Parameter] public EventCallback PagerResetReq { get; set; } - [Parameter] - public string StatoSel + private string StatoSel { - get => _statoSel; - set - { - if (_statoSel != value) - { - _statoSel = value; - if (isActive) - { - var pUpd = Task.Run(async () => await reloadData()); - pUpd.Wait(); - } - } - } + get => MsgService.StateSel; + set => MsgService.StateSel = value; + //get => _statoSel; + //set + //{ + // if (_statoSel != value) + // { + // _statoSel = value; + // var pUpd = Task.Run(async () => await reloadData()); + // pUpd.Wait(); + // } + //} } #endregion Public Properties @@ -63,7 +58,7 @@ namespace MP.SPEC.Components protected MpDataService MDService { get; set; } = null!; [Inject] - protected MessageService MessageService { get; set; } = null!; + protected MessageService MsgService { get; set; } = null!; #endregion Protected Properties @@ -71,11 +66,23 @@ namespace MP.SPEC.Components protected override async Task OnInitializedAsync() { - MessageService.EA_PageUpdated += MessageService_EA_PageUpdated; - MessageService.EA_SearchUpdated += OnSeachUpdated; + MsgService.EA_PageUpdated += MessageService_EA_PageUpdated; + MsgService.EA_SearchUpdated += OnSeachUpdated; + MsgService.EA_StatoSearch += MsgService_EA_StatoSearch; await reloadData(); } + private async void MsgService_EA_StatoSearch() + { + await InvokeAsync(() => + { + PagerResetReq.InvokeAsync(true); + //currPage = 1; + Task task = UpdateData(); + StateHasChanged(); + }); + } + protected async void OnSeachUpdated() { await InvokeAsync(() => @@ -97,7 +104,9 @@ namespace MP.SPEC.Components #region Private Fields - private string _statoSel = "*"; +#if false + private string _statoSel = "*"; +#endif private PODLModel? currRecord = null; @@ -111,27 +120,27 @@ namespace MP.SPEC.Components private int currPage { - get => MessageService.currPage; - set => MessageService.currPage = value; + get => MsgService.currPage; + set => MsgService.currPage = value; } private bool isLoading { get; set; } = false; private int numRecord { - get => MessageService.numRecord; - set => MessageService.numRecord = value; + get => MsgService.numRecord; + set => MsgService.numRecord = value; } private string SearchVal { - get => string.IsNullOrEmpty(MessageService.SearchVal) ? "*" : MessageService.SearchVal; + get => string.IsNullOrEmpty(MsgService.SearchVal) ? "*" : MsgService.SearchVal; } private int totalCount { - get => MessageService.totalCount; - set => MessageService.totalCount = value; + get => MsgService.totalCount; + set => MsgService.totalCount = value; } #endregion Private Properties @@ -146,18 +155,11 @@ namespace MP.SPEC.Components private async Task reloadData() { isLoading = true; - if (isActive) - { - SearchRecords = await MDService.ListPODLFilt(SearchVal, StatoSel); - totalCount = SearchRecords.Count; - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - await Task.Delay(1); - await InvokeAsync(() => StateHasChanged()); - } - else - { - await Task.Delay(1); - } + SearchRecords = await MDService.ListPODLFilt(SearchVal, StatoSel); + totalCount = SearchRecords.Count; + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await Task.Delay(1); + await InvokeAsync(() => StateHasChanged()); isLoading = false; } diff --git a/MP.SPEC/Data/MessageService.cs b/MP.SPEC/Data/MessageService.cs index 02f36b26..79ca19ff 100644 --- a/MP.SPEC/Data/MessageService.cs +++ b/MP.SPEC/Data/MessageService.cs @@ -4,14 +4,14 @@ { #region Public Events - public event Action EA_HideSearch; - public event Action EA_PageUpdated; public event Action EA_SearchUpdated; public event Action EA_ShowSearch; + public event Action EA_StatoSearch; + #endregion Public Events #region Public Properties @@ -81,6 +81,20 @@ } } + public string StateSel + { + get => stateSel; + set + { + stateSel = value; + + if (EA_StatoSearch != null) + { + EA_StatoSearch?.Invoke(); + } + } + } + public string TipoSearch { get => tipoSearch; @@ -135,6 +149,7 @@ private string searchVal = ""; private bool showSearch; + private string stateSel = "*"; private string tipoSearch = "*"; #endregion Private Fields diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor index 7d35a4e2..55146fa2 100644 --- a/MP.SPEC/Pages/ODL.razor +++ b/MP.SPEC/Pages/ODL.razor @@ -6,7 +6,7 @@
-

Ordini Di Lavoro

+

ODL

@@ -218,7 +218,7 @@ }
- +
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 36ce935b..ce4198b6 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -7,7 +7,7 @@
-

Ordini Di Lavoro

+

Promesse ODL

@@ -80,75 +80,7 @@
} - else if (currRecordOdl != null) - { -
-
-
-
Modifica ODL
-
- @*
-
-
- Codice - -
-
-
-
- Disegno - -
-
-
-
- -
-
-
-
- - -
-
-
-
-
- -
-
-
- -
-
-
-
- -
-
-
*@ -
-
-
-
- } - else if (currRecordPOdl != null) + else if (currRecord != null) {
@@ -219,7 +151,7 @@ }
- +
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 9c629056..1c1e7b10 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -44,8 +44,7 @@ namespace MP.SPEC.Pages } - private MP.Data.DatabaseModels.ODLModel? currRecordOdl = null; - private MP.Data.DatabaseModels.PODLModel? currRecordPOdl = null; + private MP.Data.DatabaseModels.PODLModel? currRecord = null; /// /// Crea nuovo record e va in editing... @@ -53,7 +52,7 @@ namespace MP.SPEC.Pages /// protected async Task addNew() { - currRecordPOdl = new MP.Data.DatabaseModels.PODLModel() + currRecord = new MP.Data.DatabaseModels.PODLModel() { CodArticolo = $"_NEW_{DateTime.Now:yyyyMMdd.HHmmss}" }; @@ -62,8 +61,7 @@ namespace MP.SPEC.Pages protected async Task cancel() { - currRecordOdl = null; - currRecordPOdl = null; + currRecord = null; await reloadData(); await Task.Delay(1); } @@ -123,38 +121,14 @@ namespace MP.SPEC.Pages set => MsgService.numRecord = value; } - private string selStato { get; set; } = "*"; -#if false private string selStato { - get => _selStato; - set - { - if (!_selStato.Equals(value)) - { - _selStato = value; - addEnabled = selStato != "*"; - ////StateHasChanged(); - //var pUpd = Task.Run(async () => - //{ - // //await reloadData(); - // await Task.Delay(1); - // await InvokeAsync(() => StateHasChanged()); - //}); - //pUpd.Wait(); - } - } - } -#endif - - //private bool showPODL { get; set; } = false; + get => MsgService.StateSel; + set => MsgService.StateSel = value; + } private bool addEnabled = false; - //private string textToggle - //{ - // get => showPODL ? "In Corso" : "Programmati"; - //} private int totalCount { @@ -173,12 +147,10 @@ namespace MP.SPEC.Pages isLoading = false; } - //private async Task toggleCurrent() - //{ - // NavManager.NavigateTo("/ODL"); - //} + private async Task navToODL() { + await Task.Delay(1); NavManager.NavigateTo("/ODL"); }