diff --git a/MP-TAB3/Components/AlarmsMan.razor b/MP-TAB3/Components/AlarmsMan.razor index 139176c8..71c0d8ef 100644 --- a/MP-TAB3/Components/AlarmsMan.razor +++ b/MP-TAB3/Components/AlarmsMan.razor @@ -49,7 +49,7 @@ else }
- @if (item.ReqNotify != 0) + @if (item.ReqNotify != 0 || item.Duration > alarmMinDuration) { } diff --git a/MP-TAB3/Components/AlarmsMan.razor.cs b/MP-TAB3/Components/AlarmsMan.razor.cs index feeb8ddb..dc36e6c3 100644 --- a/MP-TAB3/Components/AlarmsMan.razor.cs +++ b/MP-TAB3/Components/AlarmsMan.razor.cs @@ -102,7 +102,8 @@ namespace MP_TAB3.Components DateTime inizio = fine.AddDays(-8); CurrPeriodo = new Periodo(inizio, fine); } - var rawDest = config.GetValue("AlarmDest"); + // gestione conf allarmi + var rawDest = config.GetValue("OptConf:AlarmDest"); if (!string.IsNullOrEmpty(rawDest)) { AlarmsDest = rawDest.Split(",").ToList(); @@ -111,6 +112,7 @@ namespace MP_TAB3.Components { AlarmsDest = new List() { "samuele@steamware.net" }; } + alarmMinDuration = config.GetValue("OptConf:AlarmMinDuration"); } protected override async Task OnParametersSetAsync() @@ -210,6 +212,11 @@ namespace MP_TAB3.Components private static Logger Log = LogManager.GetCurrentClassLogger(); + /// + /// durata minima allarmi x abilitare invio email di notifica + /// + private decimal alarmMinDuration = 1; + #endregion Private Fields #region Private Properties diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 534b8f3c..c76c0737 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2411.2519 + 6.16.2412.510 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 60e11fdc..f8ab57ba 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2411.2519

+

Versione: 6.16.2412.510


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 8e9618d7..2dec4f35 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2411.2519 +6.16.2412.510 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index ac0c3d46..3c5654f7 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2411.2519 + 6.16.2412.510 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP-TAB3/appsettings.Production.json b/MP-TAB3/appsettings.Production.json index e523a10d..b257de82 100644 --- a/MP-TAB3/appsettings.Production.json +++ b/MP-TAB3/appsettings.Production.json @@ -17,7 +17,9 @@ }, "OptConf": { "msRefresh": "1500", - "CodModulo": "MP-TAB3" + "CodModulo": "MP-TAB3", + "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net", + "AlarmMinDuration": 2 }, "ServerConf": { "BaseAddr": "https://iis04.egalware.com/MP/TAB3/", diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json index 7635bd52..3d6347bd 100644 --- a/MP-TAB3/appsettings.json +++ b/MP-TAB3/appsettings.json @@ -58,7 +58,6 @@ } ] }, - "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net", "MailKitMailSettings": { "DisplayName": "MAPO EgalWare Email BOT", "From": "steamwarebot@outlook.it", @@ -70,7 +69,9 @@ "UseStartTls": true }, "OptConf": { - "msRefresh": "1001" + "msRefresh": "1001", + "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net", + "AlarmMinDuration": 0.45 }, "ServerConf": { "BaseAddr": "https://localhost:7295/MP/TAB3/", diff --git a/MP.SPEC/Pages/FluxLogStatus.razor b/MP.SPEC/Pages/FluxLogStatus.razor index 8a81ea96..d448e6d9 100644 --- a/MP.SPEC/Pages/FluxLogStatus.razor +++ b/MP.SPEC/Pages/FluxLogStatus.razor @@ -84,7 +84,7 @@
- +