From 574bd7c57cef9a888b35806e54e2c7be61bf0e3a Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 11 Mar 2025 18:58:02 +0100
Subject: [PATCH] STATS: - FluxType: aggiunto in modello - filtro x fluxType
 gestito - cablato x analysis il filtro a "Energy"

---
 MP.Data/Controllers/MpStatsController.cs | 8 ++++++--
 MP.Data/DbModels/FLModel.cs              | 3 +++
 MP.Stats/Data/MpStatsService.cs          | 7 ++++---
 MP.Stats/MP.Stats.csproj                 | 4 ++--
 MP.Stats/Pages/TrendAnalysis.razor.cs    | 2 +-
 MP.Stats/Resources/ChangeLog.html        | 2 +-
 MP.Stats/Resources/VersNum.txt           | 2 +-
 MP.Stats/Resources/manifest.xml          | 2 +-
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs
index 36f947c9..5f1e228a 100644
--- a/MP.Data/Controllers/MpStatsController.cs
+++ b/MP.Data/Controllers/MpStatsController.cs
@@ -284,8 +284,9 @@ namespace MP.Data.Controllers
         /// <param name="IdxMacchina">Macchina singola, se "" = tutte</param>
         /// <param name="DtStart">Data inizio selezione odl (inizio/fine)</param>
         /// <param name="DtEnd">Data fine selezione odl (inizio/fine)</param>
+        /// <param name="fluxType">Tipo Flusso, "" = tutti</param>
         /// <returns></returns>
-        public List<FLModel> FluxLogRawData(string IdxMacchina, DateTime DtStart, DateTime DtEnd)
+        public List<FLModel> FluxLogRawData(string IdxMacchina, DateTime DtStart, DateTime DtEnd, string fluxType)
         {
             List<FLModel> dbResult = new List<FLModel>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
@@ -293,7 +294,10 @@ namespace MP.Data.Controllers
 
                 dbResult = dbCtx
                             .DbSetFL
-                            .Where(x => (IdxMacchina=="*" || x.IdxMacchina == IdxMacchina) && (x.dtEvento >= DtStart && x.dtEvento <= DtEnd))
+                            .Where(x =>
+                                (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina)
+                                && (fluxType == "" || x.FluxType == fluxType)
+                                && (x.dtEvento >= DtStart && x.dtEvento <= DtEnd))
                             .ToList();
             }
             return dbResult;
diff --git a/MP.Data/DbModels/FLModel.cs b/MP.Data/DbModels/FLModel.cs
index 2a13bfea..4c28f73e 100644
--- a/MP.Data/DbModels/FLModel.cs
+++ b/MP.Data/DbModels/FLModel.cs
@@ -25,6 +25,9 @@ namespace MP.Data.DbModels
         [MaxLength(250)]
         public string Valore { get; set; }
 
+        [MaxLength(250)]
+        public string FluxType { get; set; }
+
         #endregion Public Properties
     }
 }
\ No newline at end of file
diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs
index 8133f8ea..b48aa24d 100644
--- a/MP.Stats/Data/MpStatsService.cs
+++ b/MP.Stats/Data/MpStatsService.cs
@@ -440,14 +440,15 @@ namespace MP.Stats.Data
             return numRec;
         }
 
-        
+
         /// <summary>
         /// Recupero dati FluxLog secondo filtro + richiesta raggruppamento
         /// </summary>
         /// <param name="CurrFilter"></param>
+        /// <param name="fluxType"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public async Task<List<FLModel>> FluxLogRawData(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<FLModel>> FluxLogRawData(SelectData CurrFilter, string fluxType, string searchVal = "")
         {
             // setup parametri costanti
             string source = "DB";
@@ -465,7 +466,7 @@ namespace MP.Stats.Data
             }
             else
             {
-                result = dbController.FluxLogRawData(CurrFilter.IdxMacchina, CurrFilter.DateStart, CurrFilter.DateEnd);
+                result = dbController.FluxLogRawData(CurrFilter.IdxMacchina, CurrFilter.DateStart, CurrFilter.DateEnd, fluxType);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
                 await redisDb.StringSetAsync(currKey, rawData, FastCache);
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index d64f6818..229f3d81 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.2503.1116</Version>
-        <Version>6.16.2503.1116</Version>
+        <Version>6.16.2503.1118</Version>
+        <Version>6.16.2503.1118</Version>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
diff --git a/MP.Stats/Pages/TrendAnalysis.razor.cs b/MP.Stats/Pages/TrendAnalysis.razor.cs
index 8d51b2f3..3e6d51a7 100644
--- a/MP.Stats/Pages/TrendAnalysis.razor.cs
+++ b/MP.Stats/Pages/TrendAnalysis.razor.cs
@@ -159,7 +159,7 @@ namespace MP.Stats.Pages
 
         private async Task ReloadData()
         {
-            SearchRecords = await StatService.FluxLogRawData(currFilter, MServ.SearchVal);
+            SearchRecords = await StatService.FluxLogRawData(currFilter, "Energy",  MServ.SearchVal);
         }
 
         #endregion Private Methods
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index c83e58b2..908f5c1d 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.2503.1116</h4>
+    <h4>Versione: 6.16.2503.1118</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index fc6ae71e..a198130d 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2503.1116
+6.16.2503.1118
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 00d77763..a309cc71 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.2503.1116</version>
+  <version>6.16.2503.1118</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>