From bfee15d1afef0fdaa0917696f2c7dc6432bc6414 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sun, 19 Jun 2022 20:22:30 +0200
Subject: [PATCH] Setup allarmi: - abbozzata selezione modulo setup da
 alarmMode

---
 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.DECODER/MP.MONO.DECODER.csproj        |  2 +-
 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.SIM/appsettings.json                  |  4 +-
 MP.MONO.UI/Components/AlarmsSetup.razor       | 81 ++-------------
 MP.MONO.UI/Components/AlarmsSetup.razor.cs    | 76 +-------------
 .../Components/AlarmsSetupBankBit.razor       | 82 +++++++++++++++
 .../Components/AlarmsSetupBankBit.razor.cs    | 99 +++++++++++++++++++
 .../Components/AlarmsSetupRawList.razor       |  3 +
 .../Components/AlarmsSetupRawList.razor.cs    | 23 +++++
 MP.MONO.UI/Data/CurrentDataService.cs         | 27 ++++-
 MP.MONO.UI/MP.MONO.UI.csproj                  |  2 +-
 MP.MONO.UI/Resources/ChangeLog.html           |  2 +-
 MP.MONO.UI/Resources/VersNum.txt              |  2 +-
 MP.MONO.UI/Resources/manifest.xml             |  2 +-
 24 files changed, 259 insertions(+), 168 deletions(-)
 create mode 100644 MP.MONO.UI/Components/AlarmsSetupBankBit.razor
 create mode 100644 MP.MONO.UI/Components/AlarmsSetupBankBit.razor.cs
 create mode 100644 MP.MONO.UI/Components/AlarmsSetupRawList.razor
 create mode 100644 MP.MONO.UI/Components/AlarmsSetupRawList.razor.cs
diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 8dd4e5f..e92956b 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.1919</Version>
+    <Version>1.12206.1920</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index def8c6f..612f023 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.1919</h4>
+    <h4>Version: 1.12206.1920</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 53ad82b..d22000f 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.1919
+1.12206.1920
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index 49e74fc..a4c904f 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.1919</version>
+  <version>1.12206.1920</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.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index 798f066..2e81fb6 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.1919</Version>
+    <Version>1.12206.1920</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index def8c6f..612f023 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.1919</h4>
+    <h4>Version: 1.12206.1920</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 53ad82b..d22000f 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.1919
+1.12206.1920
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index 273a228..a0175fe 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.1919</version>
+  <version>1.12206.1920</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 f6f3af0..e67c40f 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.1919</Version>
+    <Version>1.12206.1920</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index def8c6f..612f023 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.1919</h4>
+    <h4>Version: 1.12206.1920</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 53ad82b..d22000f 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.1919
+1.12206.1920
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index 52052c8..82b53d8 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.1919</version>
+  <version>1.12206.1920</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.SIM/appsettings.json b/MP.MONO.SIM/appsettings.json
index 5f1c1ae..399250c 100644
--- a/MP.MONO.SIM/appsettings.json
+++ b/MP.MONO.SIM/appsettings.json
@@ -33,8 +33,8 @@
   },
   "SimPar": {
     "AlarmMode": "RawList",
-    "PercAllarmi": 20,
+    "PercAllarmi": 10,
     "MaxAddAllarmi": 3,
-    "MaxDurationAllarmi": 15
+    "MaxDurationAllarmi": 10
   }
 }
diff --git a/MP.MONO.UI/Components/AlarmsSetup.razor b/MP.MONO.UI/Components/AlarmsSetup.razor
index 1e189fb..ff119d9 100644
--- a/MP.MONO.UI/Components/AlarmsSetup.razor
+++ b/MP.MONO.UI/Components/AlarmsSetup.razor
@@ -3,79 +3,14 @@
 @using MP.MONO.Core.DTO
 @using MP.MONO.UI.Data
 
-@inject IJSRuntime JSRuntime
 @inject CurrentDataService MMDataService
 
-<div class="card">
-    <div class="card-header bg-secondary text-light">
-        <div class="d-flex justify-content-between">
-            <div class="p-2">
-                <h5>Alarm Messages Setup</h5>
-            </div>
-            <div class="p-2">
-                <button class="btn btn-sm btn-primary" @onclick="() => resetAlarmSetup()" title="Reset Alarm Config"><i class="fa-solid fa-gear"></i></button>
-            </div>
-        </div>
-    </div>
-    <div class="card-body">
-        <div class="row">
-            <div class="col-3">
-                @if (ListRecords == null)
-                {
-                    <LoadingData></LoadingData>
-                }
-                else if (ListRecords.Count == 0)
-                {
-                    <div class="alert alert-warning text-center h3">No record found</div>
-                }
-                else
-                {
-                    <b>Alarm Bank</b>
-                    <ul class="list-group">
-                        @foreach (var item in ListRecords)
-                        {
-                            <li class="list-group-item list-group-item-action @cssActive(item.memAddr)" @onclick="() => raiseSelect(item)">
-                                @item.description
-                            </li>
-                        }
-                    </ul>
-                }
-            </div>
-            <div class="col-9">
-                @if (AlarmMap == null)
-                {
-                    <div class="alert alert-warning text-center h3">Select Bank First</div>
-                }
-                else
-                {
-                    <div class="row">
-                        <div class="col-12 mb-2">
-                            <ul class="list-group">
-                                @foreach (var item in AlarmMap.messagesMap)
-                                {
-                                    <li class="list-group-item list-group-item-action @cssSilenced(item.Key)" @onclick="() => toggleMute(item.Key)">
-                                        <div>@item.Value</div>
-                                    </li>
-                                }
-                            </ul>
-                        </div>
-                        <div class="col-6">
-                            <i>click to mute/unmute alarms</i>
-                        </div>
-                        <div class="col-6">
-                            <div class="btn-group btn-group-sm">
-                                <button type="button" class="btn btn-primary">Alarm Enabled</button>
-                                <button type="button" class="btn btn-secondary">Alarm Disabled</button>
-                            </div>
-                        </div>
-                    </div>
-                }
-            </div>
-        </div>
-
-    </div>
-</div>
-
-
-
 
+@if (AlarmMode == Core.Enums.AlarmReportingMode.BankBit)
+{
+    <AlarmsSetupBankBit></AlarmsSetupBankBit>
+}
+else
+{
+    <AlarmsSetupRawList></AlarmsSetupRawList>
+}
diff --git a/MP.MONO.UI/Components/AlarmsSetup.razor.cs b/MP.MONO.UI/Components/AlarmsSetup.razor.cs
index 69f4018..94e539a 100644
--- a/MP.MONO.UI/Components/AlarmsSetup.razor.cs
+++ b/MP.MONO.UI/Components/AlarmsSetup.razor.cs
@@ -1,98 +1,30 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using MP.MONO.Core;
 using MP.MONO.Core.CONF;
+using static MP.MONO.Core.Enums;
 
 namespace MP.MONO.UI.Components
 {
     public partial class AlarmsSetup
     {
-        #region Protected Fields
-
-
-        protected List<BaseAlarmBankConf>? ListRecords = null;
-
-        #endregion Protected Fields
-
-        #region Protected Properties
-
-        protected BaseAlarmBankConf? AlarmMap { get; set; } = null;
-
-        #endregion Protected Properties
 
         #region Protected Methods
 
-        protected string cssActive(string memAddr)
-        {
-            string answ = "";
-            if (AlarmMap != null)
-            {
-                answ = AlarmMap.memAddr.Equals(memAddr) ? "bg-dark text-light" : "";
-            }
-            return answ;
-        }
-        protected string cssSilenced(int messIndex)
-        {
-            string answ = "";
-            if (AlarmMap != null)
-            {
-                answ = AlarmMap.isSilenced(messIndex) ? "bg-secondary text-light" : "bg-primary text-light";
-            }
-            return answ;
-        }
-
         protected override async Task OnInitializedAsync()
         {
             await ReloadData();
         }
 
-        protected async Task raiseSelect(BaseAlarmBankConf selBank)
-        {
-            AlarmMap = selBank;
-            await Task.Delay(1);
-        }
+        protected AlarmReportingMode AlarmMode { get; set; } = AlarmReportingMode.RawList;
 
         protected async Task ReloadData()
         {
-            ListRecords = null;
             await Task.Delay(1);
-            ListRecords = await MMDataService.getAlarmSetup();
+            AlarmMode = await MMDataService.getAlarmMode();
             await Task.Delay(1);
         }
 
-        protected async Task resetAlarmSetup()                                                                                                                                              
-
-        {
-            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Reset Alarm Config: you are going to reset actual alarm configuration. Are you sure to proceed?"))
-                return;
-            await Task.Delay(1);
-            var baseConf = await MMDataService.getAlarmConfig();
-            await MMDataService.setAlarmSetup(baseConf);
-            AlarmMap = null;
-            await ReloadData();
-        }
-
-        protected async Task toggleMute(int alarmIndex)
-        {
-            // base 1 --> base 0
-            alarmIndex--;
-            int bank = alarmIndex / 16;
-            // calcolo inverso del valore richiesto
-            if (ListRecords != null && AlarmMap != null)
-            {
-                AlarmMap.silenceMask[bank] = AlarmMap.silenceMask[bank] ^ (uint)(1 << alarmIndex);
-                // sostituisco...
-                var currObj = ListRecords.FirstOrDefault(x => x.memAddr == AlarmMap.memAddr);
-                if (currObj != null)
-                {
-                    currObj.silenceMask = AlarmMap.silenceMask;
-                    // salvo su redis...
-                    await MMDataService.setAlarmSetup(ListRecords);
-                }
-            }
-            await Task.Delay(1);
-            await ReloadData();
-            await Task.Delay(1);
-        }
 
         #endregion Protected Methods
     }
diff --git a/MP.MONO.UI/Components/AlarmsSetupBankBit.razor b/MP.MONO.UI/Components/AlarmsSetupBankBit.razor
new file mode 100644
index 0000000..38c402d
--- /dev/null
+++ b/MP.MONO.UI/Components/AlarmsSetupBankBit.razor
@@ -0,0 +1,82 @@
+﻿@using MP.MONO.Data
+@using MP.MONO.UI.Components
+@using MP.MONO.Core.DTO
+@using MP.MONO.UI.Data
+
+@inject IJSRuntime JSRuntime
+@inject CurrentDataService MMDataService
+
+<div class="card">
+    <div class="card-header bg-secondary text-light">
+        <div class="d-flex justify-content-between">
+            <div class="p-2">
+                <h5>Alarm Messages Setup </h5>
+                (BB)
+            </div>
+            <div class="p-2">
+                <button class="btn btn-sm btn-primary" @onclick="() => resetAlarmSetup()" title="Reset Alarm Config"><i class="fa-solid fa-gear"></i></button>
+            </div>
+        </div>
+    </div>
+    <div class="card-body">
+        <div class="row">
+            <div class="col-3">
+                @if (ListRecords == null)
+                {
+                    <LoadingData></LoadingData>
+                }
+                else if (ListRecords.Count == 0)
+                {
+                    <div class="alert alert-warning text-center h3">No record found</div>
+                }
+                else
+                {
+                    <b>Alarm Bank</b>
+                    <ul class="list-group">
+                        @foreach (var item in ListRecords)
+                        {
+                            <li class="list-group-item list-group-item-action @cssActive(item.memAddr)" @onclick="() => raiseSelect(item)">
+                                @item.description
+                            </li>
+                        }
+                    </ul>
+                }
+            </div>
+            <div class="col-9">
+                @if (AlarmMap == null)
+                {
+                    <div class="alert alert-warning text-center h3">Select Bank First</div>
+                }
+                else
+                {
+                    <div class="row">
+                        <div class="col-12 mb-2">
+                            <ul class="list-group">
+                                @foreach (var item in AlarmMap.messagesMap)
+                                {
+                                    <li class="list-group-item list-group-item-action @cssSilenced(item.Key)" @onclick="() => toggleMute(item.Key)">
+                                        <div>@item.Value</div>
+                                    </li>
+                                }
+                            </ul>
+                        </div>
+                        <div class="col-6">
+                            <i>click to mute/unmute alarms</i>
+                        </div>
+                        <div class="col-6">
+                            <div class="btn-group btn-group-sm">
+                                <button type="button" class="btn btn-primary">Alarm Enabled</button>
+                                <button type="button" class="btn btn-secondary">Alarm Disabled</button>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
+
+    </div>
+</div>
+
+
+
+
diff --git a/MP.MONO.UI/Components/AlarmsSetupBankBit.razor.cs b/MP.MONO.UI/Components/AlarmsSetupBankBit.razor.cs
new file mode 100644
index 0000000..112bfa6
--- /dev/null
+++ b/MP.MONO.UI/Components/AlarmsSetupBankBit.razor.cs
@@ -0,0 +1,99 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using MP.MONO.Core.CONF;
+
+namespace MP.MONO.UI.Components
+{
+    public partial class AlarmsSetupBankBit
+    {
+        #region Protected Fields
+
+
+        protected List<BaseAlarmBankConf>? ListRecords = null;
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
+        protected BaseAlarmBankConf? AlarmMap { get; set; } = null;
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected string cssActive(string memAddr)
+        {
+            string answ = "";
+            if (AlarmMap != null)
+            {
+                answ = AlarmMap.memAddr.Equals(memAddr) ? "bg-dark text-light" : "";
+            }
+            return answ;
+        }
+        protected string cssSilenced(int messIndex)
+        {
+            string answ = "";
+            if (AlarmMap != null)
+            {
+                answ = AlarmMap.isSilenced(messIndex) ? "bg-secondary text-light" : "bg-primary text-light";
+            }
+            return answ;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await ReloadData();
+        }
+
+        protected async Task raiseSelect(BaseAlarmBankConf selBank)
+        {
+            AlarmMap = selBank;
+            await Task.Delay(1);
+        }
+
+        protected async Task ReloadData()
+        {
+            ListRecords = null;
+            await Task.Delay(1);
+            ListRecords = await MMDataService.getAlarmSetup();
+            await Task.Delay(1);
+        }
+
+        protected async Task resetAlarmSetup()
+
+        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Reset Alarm Config: you are going to reset actual alarm configuration. Are you sure to proceed?"))
+                return;
+            await Task.Delay(1);
+            var baseConf = await MMDataService.getAlarmConfig();
+            await MMDataService.setAlarmSetup(baseConf);
+            AlarmMap = null;
+            await ReloadData();
+        }
+
+        protected async Task toggleMute(int alarmIndex)
+        {
+            // base 1 --> base 0
+            alarmIndex--;
+            int bank = alarmIndex / 16;
+            // calcolo inverso del valore richiesto
+            if (ListRecords != null && AlarmMap != null)
+            {
+                AlarmMap.silenceMask[bank] = AlarmMap.silenceMask[bank] ^ (uint)(1 << alarmIndex);
+                // sostituisco...
+                var currObj = ListRecords.FirstOrDefault(x => x.memAddr == AlarmMap.memAddr);
+                if (currObj != null)
+                {
+                    currObj.silenceMask = AlarmMap.silenceMask;
+                    // salvo su redis...
+                    await MMDataService.setAlarmSetup(ListRecords);
+                }
+            }
+            await Task.Delay(1);
+            await ReloadData();
+            await Task.Delay(1);
+        }
+
+        #endregion Protected Methods
+    }
+}
\ No newline at end of file
diff --git a/MP.MONO.UI/Components/AlarmsSetupRawList.razor b/MP.MONO.UI/Components/AlarmsSetupRawList.razor
new file mode 100644
index 0000000..14ee807
--- /dev/null
+++ b/MP.MONO.UI/Components/AlarmsSetupRawList.razor
@@ -0,0 +1,3 @@
+﻿<h3>AlarmsSetupRawList</h3>
+
+
diff --git a/MP.MONO.UI/Components/AlarmsSetupRawList.razor.cs b/MP.MONO.UI/Components/AlarmsSetupRawList.razor.cs
new file mode 100644
index 0000000..f7faa88
--- /dev/null
+++ b/MP.MONO.UI/Components/AlarmsSetupRawList.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.Components
+{
+    public partial class AlarmsSetupRawList
+    {
+    }
+}
\ No newline at end of file
diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs
index 44f9f23..712ce09 100644
--- a/MP.MONO.UI/Data/CurrentDataService.cs
+++ b/MP.MONO.UI/Data/CurrentDataService.cs
@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using NLog;
 using StackExchange.Redis;
 using System.Diagnostics;
+using static MP.MONO.Core.Enums;
 
 namespace MP.MONO.UI.Data
 {
@@ -173,17 +174,33 @@ namespace MP.MONO.UI.Data
 
         public async Task<List<DisplayDataDTO>> getActLog()
         {
-            List<DisplayDataDTO>? dbResult = new List<DisplayDataDTO>();
+            List<DisplayDataDTO>? answ = new List<DisplayDataDTO>();
             string rawData = await redisDb.StringGetAsync(Constants.ACT_LOG_CURR_KEY);
             if (!string.IsNullOrEmpty(rawData))
             {
-                dbResult = JsonConvert.DeserializeObject<List<DisplayDataDTO>>(rawData);
+                answ = JsonConvert.DeserializeObject<List<DisplayDataDTO>>(rawData);
             }
-            if (dbResult == null)
+            if (answ == null)
             {
-                dbResult = new List<DisplayDataDTO>();
+                answ = new List<DisplayDataDTO>();
             }
-            return await Task.FromResult(dbResult);
+            return await Task.FromResult(answ);
+        }
+
+
+        public async Task<AlarmReportingMode> getAlarmMode()
+        {
+            AlarmReportingMode answ = AlarmReportingMode.ND;
+            string rawData = await redisDb.StringGetAsync(Constants.ALARMS_MODE_KEY);
+            if (!string.IsNullOrEmpty(rawData))
+            {
+                answ = JsonConvert.DeserializeObject<AlarmReportingMode>(rawData);
+            }
+            if (answ == AlarmReportingMode.ND)
+            {
+                answ = AlarmReportingMode.RawList;
+            }
+            return await Task.FromResult(answ);
         }
 
         /// <summary>
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index e6b23b5..f57a231 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.1919</Version>
+    <Version>1.12206.1920</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index def8c6f..612f023 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.1919</h4>
+    <h4>Version: 1.12206.1920</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 53ad82b..d22000f 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.1919
+1.12206.1920
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 833f528..0e9fe93 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.1919</version>
+  <version>1.12206.1920</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>

No record found