From f84fca1bc9577ddd8bd2f0874900f08c1f4fc076 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 20 Jun 2022 20:50:25 +0200
Subject: [PATCH] Refresh generale

---
 MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj  |  2 +-
 MP.MONO.ANALYZER/Resources/ChangeLog.html |  2 +-
 MP.MONO.ANALYZER/Resources/VersNum.txt    |  2 +-
 MP.MONO.ANALYZER/Resources/manifest.xml   |  2 +-
 MP.MONO.Core/ConfigManager.cs             |  4 ++--
 MP.MONO.Core/Constants.cs                 |  7 +++++--
 MP.MONO.DECODER/MP.MONO.DECODER.csproj    |  2 +-
 MP.MONO.DECODER/Program.cs                |  6 +++---
 MP.MONO.DECODER/Resources/ChangeLog.html  |  2 +-
 MP.MONO.DECODER/Resources/VersNum.txt     |  2 +-
 MP.MONO.DECODER/Resources/manifest.xml    |  2 +-
 MP.MONO.SIM/MP.MONO.SIM.csproj            |  2 +-
 MP.MONO.SIM/Resources/ChangeLog.html      |  2 +-
 MP.MONO.SIM/Resources/VersNum.txt         |  2 +-
 MP.MONO.SIM/Resources/manifest.xml        |  2 +-
 MP.MONO.UI/Components/ParetoAlarms.razor  |  5 +++++
 MP.MONO.UI/Data/CurrentDataService.cs     |  6 +++---
 MP.MONO.UI/MP.MONO.UI.csproj              |  2 +-
 MP.MONO.UI/Pages/Alarms.razor             |  9 ++++++++-
 MP.MONO.UI/Pages/AlarmsAnalysis.razor     |  5 +++++
 MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs  | 23 +++++++++++++++++++++++
 MP.MONO.UI/Resources/ChangeLog.html       |  2 +-
 MP.MONO.UI/Resources/VersNum.txt          |  2 +-
 MP.MONO.UI/Resources/manifest.xml         |  2 +-
 24 files changed, 70 insertions(+), 27 deletions(-)
 create mode 100644 MP.MONO.UI/Components/ParetoAlarms.razor
 create mode 100644 MP.MONO.UI/Pages/AlarmsAnalysis.razor
 create mode 100644 MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs
diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 1eed6a2..d477edc 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.12206.2016</Version>
+    <Version>1.12206.2020</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index 9f6a39f..7132183 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.12206.2016</h4>
+    <h4>Version: 1.12206.2020</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 8571577..9424b77 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.2016
+1.12206.2020
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index e8e6f95..d0ebf8a 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.12206.2016</version>
+  <version>1.12206.2020</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.Core/ConfigManager.cs b/MP.MONO.Core/ConfigManager.cs
index 963f67a..84004f4 100644
--- a/MP.MONO.Core/ConfigManager.cs
+++ b/MP.MONO.Core/ConfigManager.cs
@@ -62,7 +62,7 @@ namespace MP.MONO.Core
                         }
                     }
                     // salvo in redis!
-                    redisDb.StringSetAsync(Constants.ALARMS_CONF_KEY, JsonConvert.SerializeObject(currConf));
+                    redisDb.StringSetAsync(Constants.ALARMS_CONF_BBIT_KEY, JsonConvert.SerializeObject(currConf));
                 }
             }
             if (currConf == null)
@@ -92,7 +92,7 @@ namespace MP.MONO.Core
                         }
                     }
                     // salvo in redis!
-                    redisDb.StringSetAsync(Constants.ALARMS_CONF_KEY, JsonConvert.SerializeObject(currConf));
+                    redisDb.StringSetAsync(Constants.ALARMS_CONF_RLIST_KEY, JsonConvert.SerializeObject(currConf));
                 }
             }
             if (currConf == null)
diff --git a/MP.MONO.Core/Constants.cs b/MP.MONO.Core/Constants.cs
index e3e9795..6b99347 100644
--- a/MP.MONO.Core/Constants.cs
+++ b/MP.MONO.Core/Constants.cs
@@ -22,7 +22,9 @@ namespace MP.MONO.Core
         // Configurazioni
         public static readonly string ACTLOG_CONF_KEY = $"{BASE_HASH}:Conf:ActLog";
         public static readonly string ALARMS_CONF_KEY = $"{BASE_HASH}:Conf:Alarms";
-        public static readonly string ALARMS_RLIST_KEY = $"{BASE_HASH}:Conf:AlarmsRawList";
+        public static readonly string ALARMS_ADAP_CONF_KEY = $"{BASE_HASH}:Conf:AdapterAlarms";
+        public static readonly string ALARMS_CONF_BBIT_KEY = $"{BASE_HASH}:Conf:AlarmsBankBit";
+        public static readonly string ALARMS_CONF_RLIST_KEY = $"{BASE_HASH}:Conf:AlarmsRawList";
         public static readonly string ALARMS_MODE_KEY = $"{BASE_HASH}:Conf:AlarmMode";
         public static readonly string MODE_CONF_KEY = $"{BASE_HASH}:Conf:Mode";
         public static readonly string PARAMS_CONF_KEY = $"{BASE_HASH}:Conf:Params";
@@ -30,11 +32,12 @@ namespace MP.MONO.Core
         public static readonly string TOOLS_CONF_KEY = $"{BASE_HASH}:Conf:Tools";
 
         // settings utente
-        public static readonly string ALARMS_SETT_BBIT_KEY = $"{BASE_HASH}:Settings:Alarms";
+        public static readonly string ALARMS_SETT_BBIT_KEY = $"{BASE_HASH}:Settings:AlarmsBankBit";
         public static readonly string ALARMS_SETT_RLIST_KEY = $"{BASE_HASH}:Settings:AlarmsRawList";
 
         // REDIS KEY Dati correnti
         public static readonly string ACT_LOG_CURR_KEY = $"{BASE_HASH}:Current:ActivityLog";
+        public static readonly string ALARM_ADAPTER_ACT_KEY = $"{BASE_HASH}:Current:AdapterAlarm";
         public static readonly string ALARM_ACT_KEY = $"{BASE_HASH}:Current:AlarmsVal";
         public static readonly string ALARM_CURR_KEY = $"{BASE_HASH}:Current:Alarms";
         public static readonly string EVENT_LOG_CURR_KEY = $"{BASE_HASH}:Current:EventsLog";
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index faa8cd4..7b9265d 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.12206.2016</Version>
+    <Version>1.12206.2020</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index d2cf3ea..32f0c0f 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -135,7 +135,7 @@ void setupConf()
     rawData = redisDb.StringGet(Constants.ALARMS_MODE_KEY);
     alarmMode = JsonConvert.DeserializeObject<AlarmReportingMode>(rawData);
     // elenco allarmi già registrati (cache DB)
-    rawData = redisDb.StringGet(Constants.ALARMS_RLIST_KEY);
+    rawData = redisDb.StringGet(Constants.ALARMS_CONF_RLIST_KEY);
     if (!string.IsNullOrEmpty(rawData))
     {
         alarmsRecorded = JsonConvert.DeserializeObject<List<AlarmListModel>>(rawData);
@@ -179,7 +179,7 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
                 string rawData = redisDb.StringGet(Constants.ALARMS_SETT_RLIST_KEY);
                 if (string.IsNullOrEmpty(rawData))
                 {
-                    rawData = redisDb.StringGet(Constants.ALARMS_RLIST_KEY);
+                    rawData = redisDb.StringGet(Constants.ALARMS_CONF_RLIST_KEY);
                 }
                 if (!string.IsNullOrEmpty(rawData))
                 {
@@ -227,7 +227,7 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
                             foundAlarm = dbController.AlarmListInsert(newAlarm);
                             // ora rileggo ed aggiorno redis e cerco di nuovo record...
                             alarmsRecorded = dbController.AlarmListGetAll();
-                            redisDb.StringSet(Constants.ALARMS_RLIST_KEY, JsonConvert.SerializeObject(alarmsRecorded));
+                            redisDb.StringSet(Constants.ALARMS_SETT_RLIST_KEY, JsonConvert.SerializeObject(alarmsRecorded));
                         }
                         if (!isMuted && lastAlarms != null)
                         {
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index 9f6a39f..7132183 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.12206.2016</h4>
+    <h4>Version: 1.12206.2020</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 8571577..9424b77 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.2016
+1.12206.2020
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index c3b9dc2..7521f73 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.12206.2016</version>
+  <version>1.12206.2020</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index 2834b45..c1b28a5 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.12206.2016</Version>
+    <Version>1.12206.2020</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index 9f6a39f..7132183 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.12206.2016</h4>
+    <h4>Version: 1.12206.2020</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 8571577..9424b77 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.2016
+1.12206.2020
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index b78c8ef..224e8a9 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.12206.2016</version>
+  <version>1.12206.2020</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.UI/Components/ParetoAlarms.razor b/MP.MONO.UI/Components/ParetoAlarms.razor
new file mode 100644
index 0000000..5f5d08d
--- /dev/null
+++ b/MP.MONO.UI/Components/ParetoAlarms.razor
@@ -0,0 +1,5 @@
+﻿<h3>ParetoAlarms</h3>
+
+@code {
+
+}
diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs
index 07c1724..0fd7e69 100644
--- a/MP.MONO.UI/Data/CurrentDataService.cs
+++ b/MP.MONO.UI/Data/CurrentDataService.cs
@@ -210,7 +210,7 @@ namespace MP.MONO.UI.Data
         public async Task<List<BaseAlarmBankConf>> getAlarmBBConfig()
         {
             List<BaseAlarmBankConf>? dbResult = new List<BaseAlarmBankConf>();
-            string rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_KEY);
+            string rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_BBIT_KEY);
             if (!string.IsNullOrEmpty(rawData))
             {
                 dbResult = JsonConvert.DeserializeObject<List<BaseAlarmBankConf>>(rawData);
@@ -229,7 +229,7 @@ namespace MP.MONO.UI.Data
         public async Task<List<AlarmListModel>> getAlarmRLConfig()
         {
             List<AlarmListModel>? redResult = new List<AlarmListModel>();
-            string rawData = await redisDb.StringGetAsync(Constants.ALARMS_RLIST_KEY);
+            string rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_RLIST_KEY);
             if (!string.IsNullOrEmpty(rawData))
             {
                 redResult = JsonConvert.DeserializeObject<List<AlarmListModel>>(rawData);
@@ -346,7 +346,7 @@ namespace MP.MONO.UI.Data
             //se non avessi trovato valori cerco quelli di setup...
             if (string.IsNullOrEmpty(rawData))
             {
-                rawData = await redisDb.StringGetAsync(Constants.ALARMS_RLIST_KEY);
+                rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_RLIST_KEY);
             }
             // ora provo a deserializzare
             if (!string.IsNullOrEmpty(rawData))
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index 353e6c6..c70c463 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.12206.2016</Version>
+    <Version>1.12206.2020</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor
index 32bf347..7c164f5 100644
--- a/MP.MONO.UI/Pages/Alarms.razor
+++ b/MP.MONO.UI/Pages/Alarms.razor
@@ -52,6 +52,13 @@
                     <div class="card-body">
                         <AlarmsOverview messageReceived="() => reloadFromMessage()"></AlarmsOverview>
                     </div>
+                    <div class="card-footer">
+                        <div class="d-grid">
+                            <NavLink class="btn btn-info btn-block" href="AlarmsAnalysis">
+                                <i class="bi bi-bar-chart pe-2" aria-hidden="true"></i> Alarm Analysis
+                            </NavLink>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="col-9">
@@ -127,7 +134,7 @@
         </div>
     </div>
     @*<div class="card-footer p-1">
-        </div>*@
+    </div>*@
 </div>
 
 
diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor
new file mode 100644
index 0000000..8ae9c17
--- /dev/null
+++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor
@@ -0,0 +1,5 @@
+﻿@page "/AlarmsAnalysis"
+
+<h3>AlarmsAnalysis</h3>
+
+
diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs
new file mode 100644
index 0000000..382712b
--- /dev/null
+++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.Web.Virtualization;
+using Microsoft.JSInterop;
+using MP.MONO.UI;
+using MP.MONO.UI.Shared;
+using MP.MONO.UI.Components;
+
+namespace MP.MONO.UI.Pages
+{
+    public partial class AlarmsAnalysis
+    {
+    }
+}
\ No newline at end of file
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 9f6a39f..7132183 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.12206.2016</h4>
+    <h4>Version: 1.12206.2020</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 8571577..9424b77 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.2016
+1.12206.2020
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index e8635e0..105358e 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.12206.2016</version>
+  <version>1.12206.2020</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
