From 56c3ba40649d035f7ddb24dcde254d407abc0db2 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 18 Oct 2022 15:56:14 +0200 Subject: [PATCH] Fix loop ram --- MP.SPEC/Components/DataPager.razor.cs | 2 +- MP.SPEC/Components/ListODL.razor.cs | 16 ++++++- MP.SPEC/Components/ListPODL.razor.cs | 60 +++++++++++++++++---------- MP.SPEC/Data/SelectPOdlParams.cs | 3 ++ MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/ODL.razor.cs | 12 +++--- MP.SPEC/Pages/PODL.razor.cs | 43 +++++++++++++------ MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 10 files changed, 95 insertions(+), 49 deletions(-) diff --git a/MP.SPEC/Components/DataPager.razor.cs b/MP.SPEC/Components/DataPager.razor.cs index dc625ff6..5fdb615f 100644 --- a/MP.SPEC/Components/DataPager.razor.cs +++ b/MP.SPEC/Components/DataPager.razor.cs @@ -98,7 +98,7 @@ namespace MP.SPEC.Components protected int _numRecord { get; set; } = 10; - protected int percLoading { get; set; } = 0; + protected int percLoading { get; set; } = 0; #endregion Protected Properties diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 324a21e0..de926587 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -261,7 +261,19 @@ namespace MP.SPEC.Components private bool showStats { get; set; } = false; - private int totalCount { get; set; } = 0; + private int _totalCount { get; set; } = 0; + private int totalCount + { + get => _totalCount; + set + { + if (_totalCount != value) + { + _totalCount = value; + updateRecordCount.InvokeAsync(value); + } + } + } #endregion Private Properties @@ -362,7 +374,7 @@ namespace MP.SPEC.Components ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); - await updateRecordCount.InvokeAsync(totalCount); + //await updateRecordCount.InvokeAsync(totalCount); isLoading = false; } diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index ce222f9f..62988fa8 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -38,6 +38,7 @@ namespace MP.SPEC.Components return answ; } + #endregion Public Methods #region Protected Properties @@ -51,7 +52,7 @@ namespace MP.SPEC.Components [Inject] protected IOApiService MpIoApiCall { get; set; } = null!; -#if true +#if false [Inject] protected MessageService MsgService { get; set; } = null!; #endif @@ -105,11 +106,12 @@ namespace MP.SPEC.Components protected override async Task OnInitializedAsync() { -#if true +#if false MsgService.EA_PageUpdated += MessageService_EA_PageUpdated; MsgService.EA_SearchUpdated += OnSeachUpdated; MsgService.EA_StatoSearch += MsgService_EA_StatoSearch; #endif + //await FilterChanged.InvokeAsync(currFilter); ListStati = await MDService.AnagStatiComm(); } @@ -209,37 +211,49 @@ namespace MP.SPEC.Components private List? ListStati; private List? SearchRecords; - + private SelectPOdlParams currFilter { get; set; } = new SelectPOdlParams(); #endregion Private Fields #region Private Properties private int currPage { - get => MsgService.currPage; - set => MsgService.currPage = value; + get => currFilter.CurrPage; + set => currFilter.CurrPage = value; } private bool isLoading { get; set; } = false; private int numRecord { - get => MsgService.numRecord; - set => MsgService.numRecord = value; + get => currFilter.NumRec; + set => currFilter.NumRec = value; } private string SearchVal { - get => string.IsNullOrEmpty(MsgService.SearchVal) ? "*" : MsgService.SearchVal; + get => string.IsNullOrEmpty(currFilter.SearchVal) ? "*" : currFilter.SearchVal; } private string StatoSel { - get => MsgService.StateSel; - set => MsgService.StateSel = value; + get => currFilter.CodStato; + set => currFilter.CodStato = value; } - private int totalCount { get; set; } = 0; + private int _totalCount { get; set; } = 0; + private int totalCount + { + get => _totalCount; + set + { + if (_totalCount != value) + { + _totalCount = value; + updateRecordCount.InvokeAsync(value); + } + } + } #endregion Private Properties @@ -318,16 +332,16 @@ namespace MP.SPEC.Components await reloadData(); } - private async void MsgService_EA_StatoSearch() - { - await InvokeAsync(() => - { - PagerResetReq.InvokeAsync(true); - //currPage = 1; - Task task = UpdateData(); - StateHasChanged(); - }); - } + //private async void MsgService_EA_StatoSearch() + //{ + // await InvokeAsync(() => + // { + // PagerResetReq.InvokeAsync(true); + // //currPage = 1; + // Task task = UpdateData(); + // StateHasChanged(); + // }); + //} /// /// processa evento richiesto @@ -371,7 +385,7 @@ namespace MP.SPEC.Components ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); - await updateRecordCount.InvokeAsync(totalCount); + //await updateRecordCount.InvokeAsync(totalCount); isLoading = false; } @@ -388,7 +402,7 @@ namespace MP.SPEC.Components } return answ; } - + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.SPEC/Data/SelectPOdlParams.cs b/MP.SPEC/Data/SelectPOdlParams.cs index b2e9b616..685381f5 100644 --- a/MP.SPEC/Data/SelectPOdlParams.cs +++ b/MP.SPEC/Data/SelectPOdlParams.cs @@ -17,6 +17,7 @@ namespace MP.SPEC.Data public string IdxMacchina { get; set; } = "*"; public int CurrPage { get; set; } = 1; public int NumRec { get; set; } = 10; + public int TotCount { get; set; } = 0; public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 5); public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-7); public int MaxRecord { get; set; } = 100; @@ -46,6 +47,8 @@ namespace MP.SPEC.Data if (NumRec != item.NumRec) return false; + if (TotCount != item.TotCount) + return false; if (DtStart != item.DtStart) return false; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index ff760eab..9e33fab6 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.1811 + 6.16.2210.1815 diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index 7ddd5330..dab3642f 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -44,8 +44,10 @@ namespace MP.SPEC.Pages [Inject] protected MpDataService MDService { get; set; } = null!; +#if false [Inject] - protected MessageService MsgService { get; set; } = null!; + protected MessageService MsgService { get; set; } = null!; +#endif protected DateTime selDtEnd { @@ -87,10 +89,6 @@ namespace MP.SPEC.Pages protected override async Task OnInitializedAsync() { - // abilito ricerca... - MsgService.ShowSearch = true; - // resetto search - MsgService.SearchVal = ""; ListStati = await MDService.AnagStatiComm(); ListMacchine = await MDService.MacchineWithFlux(); #if false @@ -136,8 +134,8 @@ namespace MP.SPEC.Pages private int currPage { - get => MsgService.currPage; - set => MsgService.currPage = value; + get => currFilter.CurrPage; + set => currFilter.CurrPage = value; } private bool isLoading { get; set; } = false; diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 10e1038d..4f34ca0f 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -14,6 +14,7 @@ namespace MP.SPEC.Pages protected DataPager pagerODL; protected bool reqNew = false; + private SelectPOdlParams currFilter { get; set; } = new SelectPOdlParams(); #endregion Protected Fields @@ -27,10 +28,12 @@ namespace MP.SPEC.Pages [Inject] protected IOApiService MpIoApiCall { get; set; } = null!; +#if false [Inject] protected MessageService MsgService { get; set; } = null!; +#endif [Inject] protected NavigationManager NavManager { get; set; } = null!; @@ -70,10 +73,6 @@ namespace MP.SPEC.Pages protected override async Task OnInitializedAsync() { - // abilito ricerca... - MsgService.ShowSearch = true; - // resetto search - MsgService.SearchVal = ""; ListAziende = await MDService.ElencoAziende(); ListGruppiFase = await MDService.ElencoGruppiFase(); ListMacchine = await MDService.MacchineGetAll(); @@ -239,8 +238,8 @@ namespace MP.SPEC.Pages private int currPage { - get => MsgService.currPage; - set => MsgService.currPage = value; + get => currFilter.CurrPage; + set => currFilter.CurrPage = value; } private PODLModel? currRecord @@ -257,20 +256,25 @@ namespace MP.SPEC.Pages private int numRecord { - get => MsgService.numRecord; - set => MsgService.numRecord = value; + get => currFilter.NumRec; + set => currFilter.NumRec = value; } private string selStato { - get => MsgService.StateSel; - set => MsgService.StateSel = value; + get => currFilter.CodStato; + set => currFilter.CodStato = value; } private int totalCount { - get => MsgService.totalCount; - set => MsgService.totalCount = value; + get => currFilter.TotCount; + set => currFilter.TotCount = value; + } + + protected void updateTotal(int newTotCount) + { + totalCount = newTotCount; } #endregion Private Properties @@ -305,6 +309,21 @@ namespace MP.SPEC.Pages isLoading = false; } + private async Task updateFilter(SelectPOdlParams newParams) + { + isLoading = true; + await Task.Delay(1); + currPage = 1; + if (newParams.CurrPage == 0) + { + newParams.CurrPage = 1; + } + await Task.Delay(1); + await InvokeAsync(() => StateHasChanged()); + currFilter = newParams; + isLoading = false; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 1781293c..54371c5b 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.1811

+

Versione: 6.16.2210.1815


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 214992df..84418db8 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.1811 +6.16.2210.1815 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index b444da8d..c6f23083 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.1811 + 6.16.2210.1815 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