fix pagina alarmanalysis

2022-09-26 15:23:07 +02:00
parent 993f068399
commit bfe4f413d7
6 changed files with 16 additions and 15 deletions
@@ -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>
@@ -33,7 +33,7 @@
        {
        <DetailOee currRecord="@currRecord"></DetailOee>
        }*@
-        @if (ListRecordsFreq == null)
+        @if (ListRecordsFreq == null && setFreqDur || ListRecordsDur == null && !setFreqDur)
        {
            <LoadingData></LoadingData>
        }
@@ -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();
        }
@@ -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>
@@ -1 +1 @@
-1.2.2209.2614
+1.2.2209.2615
@@ -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>