Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/MpStat_02'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-11 18:58:23 +01:00
parent 4fac41e084 574bd7c57c
commit 5bbb674ac5
8 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/Controllers/MpStatsController.cs
+6 -2
View File
@@ -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;
MP.Data/DbModels/FLModel.cs
+3
View File
@@ -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
}
}
MP.Stats/Data/MpStatsService.cs
+4 -3
View File
@@ -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);
MP.Stats/MP.Stats.csproj
+2 -2
View File
@@ -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>
MP.Stats/Pages/TrendAnalysis.razor.cs
+1 -1
View File
@@ -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
MP.Stats/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
MP.Stats/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1116
6.16.2503.1118
MP.Stats/Resources/manifest.xml
+1 -1
View File
@@ -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>