diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index a272798..fb9be26 100644 --- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj +++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2210.2715 + 1.2.2210.2817 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 280c7ee..0b90174 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2210.2715 + Version: 1.2.2210.2817 Release Note: diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index ed8dd6b..e08c75f 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.2715 +1.2.2210.2817 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 0983234..b1f24d6 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.2715 + 1.2.2210.2817 http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj index 564cf69..12c701c 100644 --- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj +++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2210.2715 + 1.2.2210.2817 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 280c7ee..0b90174 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2210.2715 + Version: 1.2.2210.2817 Release Note: diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index ed8dd6b..e08c75f 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.2715 +1.2.2210.2817 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 90c6383..1a654f4 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.2715 + 1.2.2210.2817 http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj index dbafb4b..4b8e7b4 100644 --- a/MP.MONO.SIM/MP.MONO.SIM.csproj +++ b/MP.MONO.SIM/MP.MONO.SIM.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2210.2715 + 1.2.2210.2817 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 280c7ee..0b90174 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2210.2715 + Version: 1.2.2210.2817 Release Note: diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index ed8dd6b..e08c75f 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.2715 +1.2.2210.2817 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index c1e1e0f..10c0043 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.2715 + 1.2.2210.2817 http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.UI/Components/AlAnFilter.razor b/MP.MONO.UI/Components/AlAnFilter.razor index e58b755..01c9520 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor +++ b/MP.MONO.UI/Components/AlAnFilter.razor @@ -1,11 +1,5 @@ - @*Mode:*@ - @* - toggleRec()"> - @currMode - *@ - DURATION @@ -17,9 +11,9 @@ -   @dtStart -   @dtEnd - +   @dtStart +   @dtEnd + FILTERS diff --git a/MP.MONO.UI/Components/MachStatsOverview.razor b/MP.MONO.UI/Components/MachStatsOverview.razor index b0c7f6a..2e44d79 100644 --- a/MP.MONO.UI/Components/MachStatsOverview.razor +++ b/MP.MONO.UI/Components/MachStatsOverview.razor @@ -4,7 +4,7 @@ @inject CurrentDataService MMDataService -@if (ListRecords != null && ListRecords.Count>0) +@if (ListRecords != null && ListRecords.Count > 0) { @foreach (var item in ListRecords) @@ -23,11 +23,11 @@ } else { - - OEE% - Stats Details - Graph & Analytics - + @* + OEE% + Stats Details + Graph & Analytics + *@ } diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 84c1c55..3f2847c 100644 --- a/MP.MONO.UI/MP.MONO.UI.csproj +++ b/MP.MONO.UI/MP.MONO.UI.csproj @@ -5,7 +5,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2210.2815 + 1.2.2210.2817 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index cf9ed98..b375d93 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -28,7 +28,7 @@ resetMaxRecord()" title="Reset max record">   @MaxRecord resetDate()" title="Reset date">   @dtRif } - + FILTERS diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index 814dd49..5b47a2a 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -153,13 +153,13 @@ namespace MP.MONO.UI.Pages StateHasChanged(); } - protected bool wait { get; set; } = true; + protected bool isPageReady { get; set; } = false; protected override async Task OnInitializedAsync() { - wait = false; await ReloadData(true); StartTimer(); + isPageReady = true; } protected async Task ReloadData(bool setChanged) @@ -235,7 +235,7 @@ namespace MP.MONO.UI.Pages protected async Task reloadFromMessage() { - if (wait == true) + if (isPageReady == true) { try { diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index 8a46dae..f2a981b 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -6,7 +6,7 @@ - ALARM ANALYSIS + ALARM ANALYSIS diff --git a/MP.MONO.UI/Pages/Index.razor b/MP.MONO.UI/Pages/Index.razor index 73f1742..693f347 100644 --- a/MP.MONO.UI/Pages/Index.razor +++ b/MP.MONO.UI/Pages/Index.razor @@ -7,51 +7,21 @@ MAPO-MONO - - - - ALARMS PREVIEW - - @if (!compMode) - { - - - - - - - } - else - { - - - - - - - } + + + + + - @* - - - MACHINE STATS - - - - - *@ - - - PRODUCTION + + + PRODUCTION @@ -60,9 +30,9 @@ - - - PARAMETERS + + + PARAMETERS @@ -70,9 +40,9 @@ - - - MAINTENANCE + + + MAINTENANCE @@ -80,44 +50,15 @@ - - - TOOLS + + + TOOLS - @* - - - EVENT HISTORY - - - - - - *@ - @* - - - ACTIVITY LOG - - - - - - *@ - -@code { - private bool compMode { get; set; } = false; - - private void showAalarms() - { - compMode = !compMode; - } -} diff --git a/MP.MONO.UI/Pages/Parameters.razor b/MP.MONO.UI/Pages/Parameters.razor index 53667d6..9a1b7db 100644 --- a/MP.MONO.UI/Pages/Parameters.razor +++ b/MP.MONO.UI/Pages/Parameters.razor @@ -39,7 +39,7 @@   @DateFrom   @DateTo } - + FILTERS diff --git a/MP.MONO.UI/Pages/Parameters.razor.cs b/MP.MONO.UI/Pages/Parameters.razor.cs index b0aba79..1b08702 100644 --- a/MP.MONO.UI/Pages/Parameters.razor.cs +++ b/MP.MONO.UI/Pages/Parameters.razor.cs @@ -111,9 +111,10 @@ namespace MP.MONO.UI.Pages selParams = new List(); } - protected void selAll() + protected async Task selAll() { selParams = new List(); + await Task.Delay(50); selectAll = true; if (ListRecords != null) { @@ -122,6 +123,7 @@ namespace MP.MONO.UI.Pages if (selParams.Count < maxDisplay) { selParams.Add(item.Title); + await Task.Delay(1); } } } @@ -132,7 +134,6 @@ namespace MP.MONO.UI.Pages #region Private Fields private int maxRecord = 120; - private bool showParam = false; #endregion Private Fields diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 9e710f0..979a9b7 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -23,13 +23,6 @@ - @* - LOG VIEW - - toggleRT()"> - - REAL TIME - *@ @@ -49,7 +42,7 @@   @DateFrom   @DateTo } - + FILTERS diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index c1017e5..cf6bcc7 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -140,9 +140,10 @@ namespace MP.MONO.UI.Pages { selTools = new List(); } - protected void selAll() + protected async Task selAll() { selTools = new List(); + await Task.Delay(50); selectAll = true; if (ListRecords != null) { @@ -151,6 +152,7 @@ namespace MP.MONO.UI.Pages if (selTools.Count < maxDisplay) { selTools.Add(item.Title); + await Task.Delay(1); } } } diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 6fa1195..0b90174 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2210.2815 + Version: 1.2.2210.2817 Release Note: diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index eff0546..e08c75f 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.2815 +1.2.2210.2817 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index ba67947..6fcb562 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.2815 + 1.2.2210.2817 http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.UI/Shared/NavMenu.razor b/MP.MONO.UI/Shared/NavMenu.razor index 93f46fa..b4369e6 100644 --- a/MP.MONO.UI/Shared/NavMenu.razor +++ b/MP.MONO.UI/Shared/NavMenu.razor @@ -2,11 +2,11 @@ @if (!showText) { - ToggleCompress()">M + ToggleCompress()" title="Expand menu">M } else { - ToggleCompress()">MP.MONO.UI + ToggleCompress()" title="Collapse menu">MP.MONO.UI }