From 814de375ffa778425ca7deda3ecb81cc3df06d25 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 7 Jul 2025 09:58:52 +0200 Subject: [PATCH] Completata prima versione gestione impianti selezionati --- MP.Stats/Components/ModalSearchMacc.razor | 13 ++++----- MP.Stats/Components/ModalSearchMacc.razor.cs | 29 ++++++++++---------- MP.Stats/Components/SelectionFilter.razor | 18 ++---------- MP.Stats/Components/SelectionFilter.razor.cs | 12 ++++---- MP.Stats/Pages/TrendAnalysis.razor | 2 +- MP.Stats/Pages/TrendAnalysis.razor.cs | 18 ++++++++---- 6 files changed, 43 insertions(+), 49 deletions(-) diff --git a/MP.Stats/Components/ModalSearchMacc.razor b/MP.Stats/Components/ModalSearchMacc.razor index 57571cfe..2b09d2f3 100644 --- a/MP.Stats/Components/ModalSearchMacc.razor +++ b/MP.Stats/Components/ModalSearchMacc.razor @@ -4,18 +4,17 @@
-

Selezione Macchine

+

Imp Sel: @ListSelected

- +
-
- Selezione: + @*
+ Sel. Impianti: @ListSelected (@numSelected / @MaxSelection) - @* *@ -
+
*@
@@ -37,7 +36,7 @@ { - @if (currList.Contains(record.ValueField)) + @if (CurrList.Contains(record.ValueField)) { } diff --git a/MP.Stats/Components/ModalSearchMacc.razor.cs b/MP.Stats/Components/ModalSearchMacc.razor.cs index 3d19335e..25062bcf 100644 --- a/MP.Stats/Components/ModalSearchMacc.razor.cs +++ b/MP.Stats/Components/ModalSearchMacc.razor.cs @@ -14,6 +14,9 @@ namespace MP.Stats.Components [Parameter] public List AllRecords { get; set; } = null!; + [Parameter] + public List CurrList { get; set; } = new List(); + [Parameter] public EventCallback EC_CloseSearch { get; set; } @@ -29,7 +32,7 @@ namespace MP.Stats.Components protected string CssClear { - get => currList == null || currList.Count == 0 ? "btn-outline-secondary" : "btn-primary"; + get => CurrList == null || CurrList.Count == 0 ? "btn-outline-secondary" : "btn-primary"; } protected string CssReset @@ -38,18 +41,19 @@ namespace MP.Stats.Components } protected List ListRecords { get; set; } = null!; - protected List SearchRecords { get; set; } = null!; protected string ListSelected { - get => currList != null && currList.Count > 0 ? string.Join(", ", currList) : "-- nessuna selezione --"; + get => CurrList != null && CurrList.Count > 0 ? string.Join(", ", CurrList) : "-"; } protected int numSelected { - get => currList.Count; + get => CurrList.Count; } + protected List SearchRecords { get; set; } = null!; + protected string SearchVal { get => _searchVal; @@ -69,7 +73,7 @@ namespace MP.Stats.Components protected void ClearSel() { - currList.Clear(); + CurrList.Clear(); } protected override void OnParametersSet() @@ -112,20 +116,16 @@ namespace MP.Stats.Components protected async Task ToggleSel(string newVal) { - if (!currList.Contains(newVal)) + if (!CurrList.Contains(newVal)) { - currList.Add(newVal); + CurrList.Add(newVal); } else { - currList.Remove(newVal); + CurrList.Remove(newVal); } // riordino - currList = currList.OrderBy(x => x).ToList(); -#if false - // sollevo evento notifica - await EC_ListUpdated.InvokeAsync(currList); -#endif + CurrList = CurrList.OrderBy(x => x).ToList(); } #endregion Protected Methods @@ -133,7 +133,6 @@ namespace MP.Stats.Components #region Private Fields private string _searchVal = ""; - private List currList = new List(); private int currPage = 1; private int numRecord = 10; private int totalCount = 0; @@ -144,7 +143,7 @@ namespace MP.Stats.Components private async Task SearchMaccToggle() { - await EC_ListUpdated.InvokeAsync(currList); + await EC_ListUpdated.InvokeAsync(CurrList); await EC_CloseSearch.InvokeAsync(true); } diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 83e95be5..1486361b 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -2,7 +2,7 @@ @if (showAddMacc) { - + } @@ -41,20 +41,8 @@ {
- - @if (showAddMacc) - { - - } - else - { - @listSelected - } + + @listSelected
} diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs index 1af49437..f42b27e0 100644 --- a/MP.Stats/Components/SelectionFilter.razor.cs +++ b/MP.Stats/Components/SelectionFilter.razor.cs @@ -55,6 +55,9 @@ namespace MP.Stats.Components [Parameter] public SelectData SelFilter { get; set; } + [Parameter] + public int MaxNumMacc { get; set; } = 10; + #endregion Public Properties #region Protected Fields @@ -165,9 +168,6 @@ namespace MP.Stats.Components protected void ResetSelMacchine() { -#if false - ListIdxMaccSel.Clear(); -#endif ListIdxMaccSel = new List(); showAddMacc = false; } @@ -190,7 +190,8 @@ namespace MP.Stats.Components protected List ddlMacchineMult { - get + get => ddlMacchine.Where(x => x.ValueField != "*").ToList(); +#if false { List answ = new List(); foreach (var item in ddlMacchine) @@ -201,7 +202,8 @@ namespace MP.Stats.Components } } return answ; - } + } +#endif } protected List ListIdxMaccSel diff --git a/MP.Stats/Pages/TrendAnalysis.razor b/MP.Stats/Pages/TrendAnalysis.razor index 0cc786b2..53c4bc9d 100644 --- a/MP.Stats/Pages/TrendAnalysis.razor +++ b/MP.Stats/Pages/TrendAnalysis.razor @@ -5,7 +5,7 @@
- +
@if (isLoading) diff --git a/MP.Stats/Pages/TrendAnalysis.razor.cs b/MP.Stats/Pages/TrendAnalysis.razor.cs index 40815759..11584d01 100644 --- a/MP.Stats/Pages/TrendAnalysis.razor.cs +++ b/MP.Stats/Pages/TrendAnalysis.razor.cs @@ -202,7 +202,7 @@ namespace MP.Stats.Pages #endregion Private Properties - private int maxDisplay = 5; + private int MaxDisplay = 5; #region Private Methods @@ -230,14 +230,20 @@ namespace MP.Stats.Pages // per ogni valore recupero timeserie downsampled fino al num max di quelle ottenibili... int numAdd = 0; + var listSel = currFilter.ListIdxMaccSel; foreach (var item in grpDict) { - numAdd++; - // ora effettuo deduplica valori per tenere un subset minore ed evitare problemi visualizzazione... - PlotRecords.AddRange(TimeSeriesUtils.DownsampleFluxModels(item.Value, MaxPoints)); - if(numAdd >= maxDisplay) + // verifico se sia tra le macchine selezionate... + if (listSel.Contains(item.Key)) { - return; + numAdd++; + // ora effettuo deduplica valori per tenere un subset minore ed evitare problemi visualizzazione... + PlotRecords.AddRange(TimeSeriesUtils.DownsampleFluxModels(item.Value, MaxPoints)); + // verifico comunque superamento limite amcchine + if (numAdd >= MaxDisplay) + { + return; + } } } }