From d659afacc2a1c089a92feb5448e76d448f316dad Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 16:15:59 +0200 Subject: [PATCH] Fix PODL - paginazione - cambio num rec - sel fase --- MP.SPEC/Components/ListPODL.razor.cs | 47 ++++++++++------------- MP.SPEC/Data/MpDataService.cs | 8 +--- MP.SPEC/Data/SelectPOdlParams.cs | 4 +- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/PODL.razor | 12 +++--- MP.SPEC/Pages/PODL.razor.cs | 57 ++++++++++------------------ MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 9 files changed, 53 insertions(+), 83 deletions(-) diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 62988fa8..9875d2d1 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -10,6 +10,9 @@ namespace MP.SPEC.Components { #region Public Properties + [Parameter] + public SelectPOdlParams actFilter { get; set; } = new SelectPOdlParams(); + [Parameter] public EventCallback PagerResetReq { get; set; } @@ -38,7 +41,6 @@ namespace MP.SPEC.Components return answ; } - #endregion Public Methods #region Protected Properties @@ -52,13 +54,13 @@ namespace MP.SPEC.Components [Inject] protected IOApiService MpIoApiCall { get; set; } = null!; + #endregion Protected Properties + #if false [Inject] - protected MessageService MsgService { get; set; } = null!; + protected MessageService MsgService { get; set; } = null!; #endif - #endregion Protected Properties - #region Protected Methods protected async Task cloneRecord(PODLModel selRec) @@ -109,9 +111,9 @@ namespace MP.SPEC.Components #if false MsgService.EA_PageUpdated += MessageService_EA_PageUpdated; MsgService.EA_SearchUpdated += OnSeachUpdated; - MsgService.EA_StatoSearch += MsgService_EA_StatoSearch; + MsgService.EA_StatoSearch += MsgService_EA_StatoSearch; #endif - //await FilterChanged.InvokeAsync(currFilter); + //await FilterChanged.InvokeAsync(actFilter); ListStati = await MDService.AnagStatiComm(); } @@ -211,37 +213,38 @@ 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 _totalCount { get; set; } = 0; + private int currPage { - get => currFilter.CurrPage; - set => currFilter.CurrPage = value; + get => actFilter.CurrPage; + set => actFilter.CurrPage = value; } private bool isLoading { get; set; } = false; private int numRecord { - get => currFilter.NumRec; - set => currFilter.NumRec = value; + get => actFilter.NumRec; + set => actFilter.NumRec = value; } private string SearchVal { - get => string.IsNullOrEmpty(currFilter.SearchVal) ? "*" : currFilter.SearchVal; + get => string.IsNullOrEmpty(actFilter.SearchVal) ? "*" : actFilter.SearchVal; } private string StatoSel { - get => currFilter.CodStato; - set => currFilter.CodStato = value; + get => actFilter.CodFase; + set => actFilter.CodFase = value; } - private int _totalCount { get; set; } = 0; private int totalCount { get => _totalCount; @@ -327,22 +330,12 @@ namespace MP.SPEC.Components return answ; } + private async void MessageService_EA_PageUpdated() { await reloadData(); } - //private async void MsgService_EA_StatoSearch() - //{ - // await InvokeAsync(() => - // { - // PagerResetReq.InvokeAsync(true); - // //currPage = 1; - // Task task = UpdateData(); - // StateHasChanged(); - // }); - //} - /// /// processa evento richiesto /// @@ -402,7 +395,7 @@ namespace MP.SPEC.Components } return answ; } - + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 4ddf2dee..e7bbcdf4 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -686,12 +686,8 @@ namespace MP.SPEC.Data else { dbResult = dbController.OdlGetCurrentByMacc(idxMacchina); - //if (dbResult != null) - //{ - // serializzp e salvo... - rawData = JsonConvert.SerializeObject(dbResult); - redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(3)); - //} + rawData = JsonConvert.SerializeObject(dbResult); + redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(3)); } if (dbResult == null) { diff --git a/MP.SPEC/Data/SelectPOdlParams.cs b/MP.SPEC/Data/SelectPOdlParams.cs index 685381f5..d0579bf5 100644 --- a/MP.SPEC/Data/SelectPOdlParams.cs +++ b/MP.SPEC/Data/SelectPOdlParams.cs @@ -13,7 +13,7 @@ namespace MP.SPEC.Data #region Public Properties - public string CodStato { get; set; } = "*"; + public string CodFase { get; set; } = "*"; public string IdxMacchina { get; set; } = "*"; public int CurrPage { get; set; } = 1; public int NumRec { get; set; } = 10; @@ -36,7 +36,7 @@ namespace MP.SPEC.Data if (IsActive != item.IsActive) return false; - if (CodStato != item.CodStato) + if (CodFase != item.CodStato) return false; if (IdxMacchina != item.IdxMacchina) diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 9e33fab6..933e1de5 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.1815 + 6.16.2210.1816 diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 884921cd..f5c83e96 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -4,7 +4,7 @@
-
+

Promesse ODL

@@ -17,9 +17,9 @@
-
+
- + @* + *@ - @if (ListStati != null) { @@ -222,7 +222,7 @@ } else { - + }
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 4f34ca0f..268d2729 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -14,7 +14,6 @@ namespace MP.SPEC.Pages protected DataPager pagerODL; protected bool reqNew = false; - private SelectPOdlParams currFilter { get; set; } = new SelectPOdlParams(); #endregion Protected Fields @@ -28,12 +27,7 @@ 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!; @@ -109,7 +103,7 @@ namespace MP.SPEC.Pages var firstArt = ListArticoli.FirstOrDefault(); currArticolo = firstArt != null ? firstArt.CodArticolo : ""; } - string codExt = $"{selStato}"; + string codExt = $"{currFase}"; string codGruppo = ""; if (ListGruppiFase != null && ListGruppiFase.Count > 0) { @@ -159,6 +153,11 @@ namespace MP.SPEC.Pages await Task.Delay(1); } + protected void updateTotal(int newTotCount) + { + totalCount = newTotCount; + } + protected void UpdateTotCount(int newTotCount) { totalCount = newTotCount; @@ -169,15 +168,10 @@ namespace MP.SPEC.Pages #region Private Fields private PODLModel? _currRecord = null; - private List? ListArticoli; - private List? ListAziende; - private List? ListGruppiFase; - private List? ListMacchine; - private List? ListStati; #endregion Private Fields @@ -185,12 +179,11 @@ namespace MP.SPEC.Pages #region Private Properties private string _artSearch { get; set; } = ""; - private string _currAzienda { get; set; } = "*"; private bool addEnabled { - get => selStato != "*"; + get => currFase != "*"; } private string artSearch @@ -216,7 +209,6 @@ namespace MP.SPEC.Pages } private List? configData { get; set; } = null; - private string currArticolo { get; set; } = ""; private string currAzienda @@ -236,6 +228,8 @@ namespace MP.SPEC.Pages } } + private SelectPOdlParams currFilter { get; set; } = new SelectPOdlParams(); + private int currPage { get => currFilter.CurrPage; @@ -260,10 +254,17 @@ namespace MP.SPEC.Pages set => currFilter.NumRec = value; } - private string selStato + private string currFase { - get => currFilter.CodStato; - set => currFilter.CodStato = value; + get => currFilter.CodFase; + set + { + if (!currFilter.CodFase.Equals(value)) + { + currFilter.CodFase = value; + currPage = 1; + } + } } private int totalCount @@ -272,11 +273,6 @@ namespace MP.SPEC.Pages set => currFilter.TotCount = value; } - protected void updateTotal(int newTotCount) - { - totalCount = newTotCount; - } - #endregion Private Properties #region Private Methods @@ -309,21 +305,6 @@ 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 54371c5b..9801ef3d 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.1815

+

Versione: 6.16.2210.1816


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