diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 49810cd5..509f488a 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -4,12 +4,12 @@ using MP.Data.Conf; using MP.Data.DatabaseModels; using MP.Data.DTO; using MP.Data.MgModels; +using MP.Data.Objects; using Newtonsoft.Json; using NLog; using StackExchange.Redis; using System.Data; using System.Diagnostics; -using static MP.Data.Enum; namespace MP.SPEC.Data { @@ -722,7 +722,7 @@ namespace MP.SPEC.Data /// intervallo di analisi /// max num per intervallo /// - public async Task FluxLogDataRedux(string idxMaccSel, List fluxList, DtUtils.Periodo currPeriodo, ValSelection valMode, DataInterval intReq, int maxItem) + public async Task FluxLogDataRedux(string idxMaccSel, List fluxList, DtUtils.Periodo currPeriodo, Enums.ValSelection valMode, Enums.DataInterval intReq, int maxItem) { List procStats = await dbController.FluxLogDataRedux(idxMaccSel, fluxList, currPeriodo, valMode, intReq, maxItem); // effettuo merge statistiche... diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index e3fe8ad6..f3196714 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2310.2512 + 6.16.2310.2609 diff --git a/MP.SPEC/Pages/FluxLogStatus.razor b/MP.SPEC/Pages/FluxLogStatus.razor index caf43e25..8a81ea96 100644 --- a/MP.SPEC/Pages/FluxLogStatus.razor +++ b/MP.SPEC/Pages/FluxLogStatus.razor @@ -1,5 +1,4 @@ @page "/FluxLogStatus" -
@@ -65,7 +64,7 @@ Max - @foreach (var item in Enum.GetValues(typeof(MP.Data.Enum.ValSelection)).Cast()) + @foreach (var item in Enum.GetValues(typeof(Enums.ValSelection)).Cast()) { } diff --git a/MP.SPEC/Pages/FluxLogStatus.razor.cs b/MP.SPEC/Pages/FluxLogStatus.razor.cs index 0b670291..54fa4511 100644 --- a/MP.SPEC/Pages/FluxLogStatus.razor.cs +++ b/MP.SPEC/Pages/FluxLogStatus.razor.cs @@ -1,10 +1,10 @@ using global::Microsoft.AspNetCore.Components; using Microsoft.JSInterop; +using MP.Data.Objects; using MP.SPEC.Data; using NLog; using System.Diagnostics; using static EgwCoreLib.Utils.DtUtils; -using static MP.Data.Enum; namespace MP.SPEC.Pages { @@ -13,14 +13,14 @@ namespace MP.SPEC.Pages #region Protected Fields protected double currVal = 0; - protected DataInterval IntReq = DataInterval.hour; + protected Enums.DataInterval IntReq = Enums.DataInterval.hour; protected double nextVal = 0; protected int numRecPage = 10; protected int pageNum = 1; protected int totalCount = 0; protected int totRecords = 0; - protected ValSelection ValMode = ValSelection.First; + protected Enums.ValSelection ValMode = Enums.ValSelection.First; #endregion Protected Fields diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 0a78c87b..4dc4e658 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.2512

+

Versione: 6.16.2310.2609


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 292a8493..2468fb4d 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.2512 +6.16.2310.2609 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index a411913f..78903994 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.2512 + 6.16.2310.2609 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/_Imports.razor b/MP.SPEC/_Imports.razor index 944f4f17..fe303e7b 100644 --- a/MP.SPEC/_Imports.razor +++ b/MP.SPEC/_Imports.razor @@ -6,7 +6,8 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop +@using MP.Data.Objects @using MP.SPEC @using MP.SPEC.Shared @using MP.SPEC.Components -@using EgwCoreLib.Razor +@using EgwCoreLib.Razor \ No newline at end of file