From bfe4f413d737dec55beb12aec0230447cbba948c Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 26 Sep 2022 15:23:07 +0200
Subject: [PATCH] fix pagina alarmanalysis

---
 MP.MONO.UI/MP.MONO.UI.csproj             |  2 +-
 MP.MONO.UI/Pages/AlarmsAnalysis.razor    |  2 +-
 MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 21 +++++++++++----------
 MP.MONO.UI/Resources/ChangeLog.html      |  2 +-
 MP.MONO.UI/Resources/VersNum.txt         |  2 +-
 MP.MONO.UI/Resources/manifest.xml        |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index a3a1d4f..0499876 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.2.2209.2614</Version>
+    <Version>1.2.2209.2615</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor
index baf3042..7391138 100644
--- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor
+++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor
@@ -33,7 +33,7 @@
         {
         <DetailOee currRecord="@currRecord"></DetailOee>
         }*@
-        @if (ListRecordsFreq == null)
+        @if (ListRecordsFreq == null && setFreqDur || ListRecordsDur == null && !setFreqDur)
         {
             <LoadingData></LoadingData>
         }
diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs
index ffadeed..10699cc 100644
--- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs
+++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs
@@ -77,12 +77,12 @@ namespace MP.MONO.UI.Pages
         {
             get => setFreqDur ? "Alarm frequency" : "Alarm duration";
         }
-        public bool setFreqDur = true;
+        public bool setFreqDur { get; set; } = true;
         protected async Task toggleRec()
         {
             setFreqDur = !setFreqDur;
             await Task.Delay(1);
-            ReloadData();
+            await ReloadData();
         }
         protected DateTime _dtStart = DateTime.Now.AddHours(-24);
         protected DateTime dtStart
@@ -135,21 +135,19 @@ namespace MP.MONO.UI.Pages
 
         #region Protected Properties
 
-        [Inject]
-        protected IJSRuntime JSRuntime { get; set; }
-
-        [Inject]
-        protected NavigationManager NavManager { get; set; }
-
         protected int totalCount
         {
             get
             {
                 int answ = 0;
-                if (SearchRecordsFreq != null)
+                if (SearchRecordsFreq != null && setFreqDur)
                 {
                     answ = SearchRecordsFreq.Count;
                 }
+                else
+                {
+                    //answ = SearchRecordsDur.Count;
+                }
                 return answ;
             }
         }
@@ -170,13 +168,15 @@ namespace MP.MONO.UI.Pages
                 ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
                 totalEvents = SearchRecordsFreq.Sum(x => x.EventCount);
                 calcolaSoglie();
+                await Task.Delay(1);
             }
             else
             {
                 SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd);
                 ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-                
+                await Task.Delay(1);
             }
+            await Task.Delay(1);
             isLoading = false;
         }
 
@@ -206,6 +206,7 @@ namespace MP.MONO.UI.Pages
             {
                 SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd);
                 ListRecordsDur= SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
+
             }
             await ReloadData();
         }
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 59b0d4d..ce23c9e 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.2.2209.2614</h4>
+    <h4>Version: 1.2.2209.2615</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 45a622b..dbc7e7d 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2209.2614
+1.2.2209.2615
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index f0cd5e7..988bef9 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.2.2209.2614</version>
+  <version>1.2.2209.2615</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>