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
/// Macchina singola, se "" = tutte
/// Data inizio selezione odl (inizio/fine)
/// Data fine selezione odl (inizio/fine)
+ /// Tipo Flusso, "" = tutti
///
- public List FluxLogRawData(string IdxMacchina, DateTime DtStart, DateTime DtEnd)
+ public List FluxLogRawData(string IdxMacchina, DateTime DtStart, DateTime DtEnd, string fluxType)
{
List dbResult = new List();
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;
}
-
+
///
/// Recupero dati FluxLog secondo filtro + richiesta raggruppamento
///
///
+ ///
///
///
- public async Task> FluxLogRawData(SelectData CurrFilter, string searchVal = "")
+ public async Task> 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 @@
net6.0
MP.Stats
826e877c-ba70-4253-84cb-d0b1cafd4440
- 6.16.2503.1116
- 6.16.2503.1116
+ 6.16.2503.1118
+ 6.16.2503.1118
true
$(NoWarn);1591
en
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 @@
Modulo statistiche MAPO
- Versione: 6.16.2503.1116
+ Versione: 6.16.2503.1118
Note di rilascio:
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 @@
-
- 6.16.2503.1116
+ 6.16.2503.1118
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html
false