From 4f841a09ad0324decd399436e7ed1861c8530aab Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 4 Jul 2025 08:55:14 +0200
Subject: [PATCH] Fix controllo filtro (grafico)

---
 MP.Stats/Components/SelectionFilter.razor    | 58 +++++++++++---------
 MP.Stats/Components/SelectionFilter.razor.cs | 14 ++++-
 MP.Stats/MP.Stats.csproj                     |  4 +-
 MP.Stats/Pages/TrendAnalysis.razor           | 17 +++++-
 MP.Stats/Pages/TrendAnalysis.razor.cs        | 39 +++++++++++++
 MP.Stats/Resources/ChangeLog.html            |  2 +-
 MP.Stats/Resources/VersNum.txt               |  2 +-
 MP.Stats/Resources/manifest.xml              |  2 +-
 8 files changed, 105 insertions(+), 33 deletions(-)

diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor
index 6d7f846b..70f52143 100644
--- a/MP.Stats/Components/SelectionFilter.razor
+++ b/MP.Stats/Components/SelectionFilter.razor
@@ -31,9 +31,9 @@
                         <InputDateTime id="dtFine" class="form-control form-control-sm" @bind-Value="@DateEnd"></InputDateTime>
                     </div>
                 </div>
-                <div class="col">
-                    <label for="idxMacc" class="small">macchina:</label>
-                    <div class="input-group input-group-sm" style="min-width: 15rem;">
+                <div class="col" style="min-width: 10rem;">
+                    <label class="small">macchina:</label>
+                    <div class="input-group input-group-sm">
                         <select @bind="@IdxMacchina" class="form-select">
                             @foreach (var item in ddlMacchine)
                             {
@@ -46,7 +46,7 @@
                 {
                     <div class="col">
                         <div class="form-group mb-0">
-                            <label for="idxMacc" class="small">azione:</label>
+                            <label class="small">azione:</label>
                             <div class="input-group input-group-sm">
                                 <select @bind="@Azione" class="form-select" disabled="@(!CommessaEnabled)">
                                     @foreach (var item in ddlAzioni)
@@ -61,48 +61,56 @@
                 <div class="col" style="min-width: 10rem;">
                     @if (!OnlyEnergy)
                     {
+                        <label class="small">commessa:</label>
                         <div class="form-group mb-0">
                             <div class="input-group input-group-sm">
-                                <div class="input-group-prepend">
-                                    <label class="input-group-text">commessa:</label>
-                                </div>
+                                @if (string.IsNullOrEmpty(SearchCom))
+                                {
+                                    <button class="btn btn-sm btn-outline-secondary"><i class="fa-solid fa-rotate-right"></i></button>
+                                }
+                                else
+                                {
+                                    <button class="btn btn-sm btn-primary" @onclick="ResetCom"><i class="fa-solid fa-rotate-right"></i></button>
+                                }
                                 <input class="form-control form-control-sm" @bind="@SearchCom" placeholder="search (> @minChar char)" disabled="@(!CommessaEnabled)" />
-                            </div>
-                            @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar)
-                            {
-                                <div class="input-group input-group-sm">
-                                    <select @bind="@KeyRichiesta" class="form-select" disabled="@(!CommessaEnabled)">
+                                @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar)
+                                {
+                                    <select @bind="@KeyRichiesta" class="form-select" style="min-width: 9rem;" disabled="@(!CommessaEnabled)">
                                         @foreach (var item in ddlCommesse)
                                         {
                                             <option value="@item.ValueField">@item.LabelField</option>
                                         }
                                     </select>
-                                </div>
-                            }
+                                }
+                            </div>
                         </div>
                     }
                 </div>
                 <div class="col" style="min-width: 10rem;">
                     @if (!OnlyEnergy)
                     {
+                        <label class="small">articolo:</label>
                         <div class="form-group mb-0">
                             <div class="input-group input-group-sm">
-                                <div class="input-group-prepend">
-                                    <label class="input-group-text">articolo:</label>
-                                </div>
+                                @if (string.IsNullOrEmpty(SearchArt))
+                                {
+                                    <button class="btn btn-sm btn-outline-secondary"><i class="fa-solid fa-rotate-right"></i></button>
+                                }
+                                else
+                                {
+                                    <button class="btn btn-sm btn-primary" @onclick="ResetArt"><i class="fa-solid fa-rotate-right"></i></button>
+                                }
                                 <input class="form-control form-control-sm" @bind="@SearchArt" placeholder="search (> @minChar char)" />
-                            </div>
-                            @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar)
-                            {
-                                <div class="input-group input-group-sm">
-                                    <select @bind="@CodArticolo" class="form-select">
+                                @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar)
+                                {
+                                    <select @bind="@CodArticolo" class="form-select small" style="min-width: 9rem;">
                                         @foreach (var item in ddlArticoli)
                                         {
                                             <option value="@item.ValueField">@item.LabelField</option>
                                         }
                                     </select>
-                                </div>
-                            }
+                                }
+                            </div>
                         </div>
                     }
                 </div>
@@ -111,7 +119,7 @@
         <div class="p-2">
             <div class="form-group mb-0">
                 <label for="btnReset" class="small">reset</label><br />
-                <button id="btnReset" class="btn btn-info btn-sm btn-block" Clicked="resetFilter"><span class="oi oi-loop-circular"></span></button>
+                <button id="btnReset" class="btn btn-info btn-sm btn-block" @onclick="ResetFilter"><span class="oi oi-loop-circular"></span></button>
             </div>
         </div>
     </div>
diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs
index 9fc1ca50..ad4742fd 100644
--- a/MP.Stats/Components/SelectionFilter.razor.cs
+++ b/MP.Stats/Components/SelectionFilter.razor.cs
@@ -207,8 +207,20 @@ namespace MP.Stats.Components
             await reloadData();
         }
 
-        protected void resetFilter()
+        protected void ResetArt()
         {
+            SearchArt = "";
+        }
+
+        protected void ResetCom()
+        {
+            SearchCom = "";
+        }
+
+        protected void ResetFilter()
+        {
+            SearchArt = "";
+            SearchCom = "";
             filterReset.InvokeAsync(SelFilter);
         }
 
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 02488d62..ffefb60e 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2507.0318</Version>
-        <Version>6.16.2507.0318</Version>
+        <Version>6.16.2507.0408</Version>
+        <Version>6.16.2507.0408</Version>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
diff --git a/MP.Stats/Pages/TrendAnalysis.razor b/MP.Stats/Pages/TrendAnalysis.razor
index cb934cb1..f9ed5929 100644
--- a/MP.Stats/Pages/TrendAnalysis.razor
+++ b/MP.Stats/Pages/TrendAnalysis.razor
@@ -20,8 +20,21 @@
     <div class="card-footer d-flex justify-content-between">
         <div class="px-0">
             <div class="input-group flex-nowrap">
-                <span class="input-group-text" id="addon-wrapping">Max Points</span>
-                <input type="number" class="form-control" @bind="MaxPoints">
+                <span class="input-group-text" id="addon-wrapping">Res</span>
+                <select @bind="@ReqRes" class="form-select">
+                    @foreach (var item in Enum.GetValues(typeof(ResolutionLevel)))
+                    {
+                        <option value="@item">@item</option>
+                    }
+                </select>
+                @if (ReqRes == ResolutionLevel.Custom)
+                {
+                    <input type="number" class="form-control" @bind="MaxPoints">
+                }
+                else
+                {
+                    <span class="input-group-text small text-secondary">@MaxPoints</span>
+                }
             </div>
         </div>
         <div class="px-0">
diff --git a/MP.Stats/Pages/TrendAnalysis.razor.cs b/MP.Stats/Pages/TrendAnalysis.razor.cs
index 9e090851..43acabaf 100644
--- a/MP.Stats/Pages/TrendAnalysis.razor.cs
+++ b/MP.Stats/Pages/TrendAnalysis.razor.cs
@@ -141,6 +141,45 @@ namespace MP.Stats.Pages
         private List<FLModel> PlotRecords;
         private List<FLModel> SearchRecords;
 
+        protected ResolutionLevel ReqRes
+        {
+            get => _reqRes;
+            set
+            {
+                if (_reqRes != value)
+                {
+                    _reqRes = value;
+                    if (value < ResolutionLevel.Custom)
+                    {
+                        int scale = 256;
+                        switch (value)
+                        {
+                            case ResolutionLevel.Low:
+                                MaxPoints = (int)Math.Round(totalCount / 10 / (double)scale) * scale;
+                                break;
+                            case ResolutionLevel.Med:
+                                MaxPoints = (int)Math.Round(totalCount / 3 / (double)scale) * scale;
+                                break;
+                            case ResolutionLevel.High:
+                                MaxPoints = (int)Math.Round(totalCount / (double)scale) * scale;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+        private ResolutionLevel _reqRes = ResolutionLevel.Low;
+
+        protected enum ResolutionLevel
+        {
+            Low,
+            Med,
+            High,
+            Custom
+        }
+
         #endregion Private Fields
 
         #region Private Properties
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index d1dae0ff..cd76e83e 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2507.0318</h4>
+    <h4>Versione: 6.16.2507.0408</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 97418fc2..2e4bfad5 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2507.0318
+6.16.2507.0408
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 322add68..30a9a80e 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2507.0318</version>
+  <version>6.16.2507.0408</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>