From ebd3e075a4cedf3f3a74cc4aa00d66f43c52dd95 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 26 Sep 2022 17:30:10 +0200 Subject: [PATCH 01/57] fix pagina duration chart --- MP.MONO.UI/Components/ListFreqAlarms.razor | 42 ++++++++++ MP.MONO.UI/Components/ListFreqAlarms.razor.cs | 79 +++++++++++++++++++ MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor | 26 +++--- MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 72 +++++++++++++++-- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 8 files changed, 202 insertions(+), 25 deletions(-) create mode 100644 MP.MONO.UI/Components/ListFreqAlarms.razor create mode 100644 MP.MONO.UI/Components/ListFreqAlarms.razor.cs diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor b/MP.MONO.UI/Components/ListFreqAlarms.razor new file mode 100644 index 0000000..09037c3 --- /dev/null +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor @@ -0,0 +1,42 @@ +@*
+
+ + + + + + + + + + + @foreach (var record in ListRecordsFreq) + { + + + + + + + + } + +
Alarm DescriptionAlarm Event CountEvent FrequenceEvent Frequence Chart
+
@record.AlarmDescription
+ 		+
@record.EventCount
+ 		+
+ @if (totalVar != 0) + { + @calcPerc((double)record.EventCount) + } +
+ 		+
+
@record.EventCount
+
+
+
+
+*@ \ No newline at end of file diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs new file mode 100644 index 0000000..1b63a93 --- /dev/null +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs @@ -0,0 +1,79 @@ +//using Microsoft.AspNetCore.Components; +//using MP.MONO.Data.DTO; +//using MP.MONO.UI.Data; + +//namespace MP.MONO.UI.Components +//{ +// public partial class ListFreqAlarms +// { +// [Parameter] +// public List? ListRecordsFreq { get; set; } = null; + +// [Parameter] +// public List? SearchRecordsFreq { get; set; } = null; + +// [Parameter] +// public int _currPage { get; set; } = 1; + +// [Parameter] +// public int _numRecord { get; set; } = 10; + +// [Parameter] +// public double totalVar { get; set; } = 0; + +// protected DateTime _dtStart = DateTime.Now.AddHours(-24); +// protected DateTime dtStart +// { +// get => _dtStart; +// set +// { +// _dtStart = value; +// var pUpd = Task.Run(async () => +// { +// await ReloadData(); +// }); +// pUpd.Wait(); +// } +// } +// protected DateTime _dtEnd = DateTime.Now; +// protected DateTime dtEnd +// { +// get => _dtEnd; +// set +// { +// _dtEnd = value; +// var pUpd = Task.Run(async () => +// { +// await ReloadData(); +// }); +// pUpd.Wait(); +// } +// } +// private bool isLoading { get; set; } = false; +// private async Task ReloadData() +// { +// isLoading = true; +// DateTime adesso = DateTime.Now; +// //SearchRecords = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, adesso.AddHours(-numHourPrev), adesso); +// if (setFreqDur) +// { +// SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); +// ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); +// totalCount = SearchRecordsFreq.Count; +// totalVar = 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(); +// totalCount = SearchRecordsDur.Count; +// totalVar = SearchRecordsDur.Sum(x => x.Duration); +// await Task.Delay(1); +// } +// await Task.Delay(1); +// isLoading = false; +// } +// } +//} diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 0499876..d48d1ae 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.2209.2615 + 1.2.2209.2617 diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index 5de1536..fc8c8cf 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -54,8 +54,8 @@ Alarm Description Alarm Event Count - Event Frequence - Event Frequence Chart + Event Frequency + Event Frequency Chart @@ -73,13 +73,13 @@
@if (totalVar != 0) { - @calcPerc((double)record.EventCount) + @calcPercFreq((double)record.EventCount) }
-
@record.EventCount
+
@record.EventCount
@@ -98,8 +98,8 @@ Alarm Description Alarm Duration - @*Event Frequence - Event Frequence Chart*@ + Event Duration + Event Duration Chart @@ -111,21 +111,21 @@
@item.AlarmDescription
-
@item.Duration
+
@Math.Round(item.Duration,2)
- @* +
- @if (totalEvents != 0) + @if (totalVar != 0) { - @calcPerc((double)record.EventCount) + @calcPercDur((double)item.Duration) }
-
@record.EventCount
-
- *@ +
@Math.Round(item.Duration,2)
+ + } diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index 95cafb6..df790c3 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -168,7 +168,7 @@ namespace MP.MONO.UI.Pages ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); totalCount = SearchRecordsFreq.Count; totalVar = SearchRecordsFreq.Sum(x => x.EventCount); - calcolaSoglie(); + calcolaSoglieFreq(); await Task.Delay(1); } else @@ -177,6 +177,7 @@ namespace MP.MONO.UI.Pages ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); totalCount = SearchRecordsDur.Count; totalVar = SearchRecordsDur.Sum(x => x.Duration); + //calcolaSoglieDur(); await Task.Delay(1); } await Task.Delay(1); @@ -209,15 +210,15 @@ namespace MP.MONO.UI.Pages { SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd); ListRecordsDur= SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - + //calcolaSoglieDur(); } await ReloadData(); } private double sogliaGreen = 0; private double sogliaRed = 1; - private void calcolaSoglie() + private void calcolaSoglieFreq() { - int numRecord = SearchRecordsFreq.Count; + int numRecord = totalCount; var firstRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.2)).FirstOrDefault(); var lastRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.8)).FirstOrDefault(); if (firstRecord != null) @@ -229,19 +230,39 @@ namespace MP.MONO.UI.Pages sogliaRed = (double)lastRecord.EventCount / totalVar; } } + private void calcolaSoglieDur() + { + int numRecord = totalCount; + var firstRecord = SearchRecordsDur.Skip((int)(numRecord * 0.2)).FirstOrDefault(); + var lastRecord = SearchRecordsDur.Skip((int)(numRecord * 0.8)).FirstOrDefault(); + if (firstRecord != null) + { + sogliaGreen = (double)firstRecord.Duration / totalVar; + } + if (lastRecord != null) + { + sogliaRed = (double)lastRecord.Duration / totalVar; + } + } protected void ResetData() { currRecord = null; } - protected string calcPerc(double numEvent) + protected string calcPercFreq(double numEvent) { string ans = $"{numEvent / totalVar:P2}"; return ans; } + protected string calcPercDur(double duration) + { + string ans = $"{duration / totalVar:P2}"; - protected string val(double eventCount) + return ans; + } + + protected string valFreq(double eventCount) { int max = SearchRecordsFreq.Max(a => a.EventCount); @@ -254,12 +275,25 @@ namespace MP.MONO.UI.Pages return ans; } - protected string styleColourPBar(double eventFreq) + protected string valDur(double duration) + { + double max = SearchRecordsDur.Max(a => a.Duration); + + double divisione = duration / max; + + int percentage = (int)(divisione * 100); + + string ans = $"width: {percentage}%"; + + return ans; + } + + protected string styleColourPBarFreq(double eventFreq) { string ans = ""; var source = ListRecordsFreq; - calcolaSoglie(); + //calcolaSoglieDur(); if (eventFreq >= sogliaGreen) { @@ -277,7 +311,29 @@ namespace MP.MONO.UI.Pages return ans; } + protected string styleColourPBarDur(double duration) + { + string ans = ""; + var source = ListRecordsFreq; + calcolaSoglieFreq(); + + if (duration >= sogliaGreen) + { + ans = "bg-danger"; + } + else if (duration <= sogliaRed) + { + ans = "bg-success"; + } + else + { + ans = "bg-warning"; + } + + + return ans; + } protected void Select(AlarmFreqDTO selRecord) { // applico filtro da selezione diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index ce23c9e..1b92696 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

Version: 1.2.2209.2615

+

Version: 1.2.2209.2617


Release Note:
  • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index dbc7e7d..01e9efe 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2615 +1.2.2209.2617 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 988bef9..192fb90 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2615 + 1.2.2209.2617 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 From c5b5b1148dc9a383263e272ed7f3956083e42e6b Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 27 Sep 2022 08:48:48 +0200 Subject: [PATCH 02/57] fix calcolo soglie chart duration --- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 8 ++++---- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index d48d1ae..2b2e4af 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.2209.2617 + 1.2.2209.2708 diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index df790c3..8ea5829 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -168,7 +168,7 @@ namespace MP.MONO.UI.Pages ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); totalCount = SearchRecordsFreq.Count; totalVar = SearchRecordsFreq.Sum(x => x.EventCount); - calcolaSoglieFreq(); + //calcolaSoglieFreq(); await Task.Delay(1); } else @@ -293,7 +293,7 @@ namespace MP.MONO.UI.Pages string ans = ""; var source = ListRecordsFreq; - //calcolaSoglieDur(); + calcolaSoglieFreq(); if (eventFreq >= sogliaGreen) { @@ -314,9 +314,9 @@ namespace MP.MONO.UI.Pages protected string styleColourPBarDur(double duration) { string ans = ""; - var source = ListRecordsFreq; + //var source = ListRecordsDur; - calcolaSoglieFreq(); + calcolaSoglieDur(); if (duration >= sogliaGreen) { diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 1b92696..86c497d 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

    Version: 1.2.2209.2617

    +

    Version: 1.2.2209.2708


    Release Note:
    • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 01e9efe..2039718 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2617 +1.2.2209.2708 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 192fb90..b060edf 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2617 + 1.2.2209.2708 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 From 613c4edba86dd7b015d495ab639ce52f50c6108a Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 27 Sep 2022 18:02:52 +0200 Subject: [PATCH 03/57] Continuo split grafici --- MP.MONO.UI/Components/ListFreqAlarms.razor | 7 +- MP.MONO.UI/Components/ListFreqAlarms.razor.cs | 231 ++++++++++++------ MP.MONO.UI/Data/MessageService.cs | 73 ++++++ MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor | 6 +- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 8 files changed, 241 insertions(+), 84 deletions(-) create mode 100644 MP.MONO.UI/Data/MessageService.cs diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor b/MP.MONO.UI/Components/ListFreqAlarms.razor index 09037c3..39fb3e2 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor @@ -1,4 +1,4 @@ -@*
      +
      @@ -24,13 +24,13 @@
      @if (totalVar != 0) { - @calcPerc((double)record.EventCount) + @calcPercFreq((double)record.EventCount) }
      @@ -39,4 +39,3 @@
      -
      @record.EventCount
      +
      @record.EventCount
      -*@ \ No newline at end of file diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs index 1b63a93..4e4566d 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs @@ -1,79 +1,164 @@ -//using Microsoft.AspNetCore.Components; -//using MP.MONO.Data.DTO; -//using MP.MONO.UI.Data; +using Microsoft.AspNetCore.Components; +using MP.MONO.Data.DTO; +using MP.MONO.UI.Data; -//namespace MP.MONO.UI.Components -//{ -// public partial class ListFreqAlarms -// { -// [Parameter] -// public List? ListRecordsFreq { get; set; } = null; +namespace MP.MONO.UI.Components +{ + public partial class ListFreqAlarms + { + protected List? ListRecordsFreq { get; set; } = null; -// [Parameter] -// public List? SearchRecordsFreq { get; set; } = null; + private int totalCount { get; set; } = 0; -// [Parameter] -// public int _currPage { get; set; } = 1; + protected List? SearchRecordsFreq { get; set; } = null; -// [Parameter] -// public int _numRecord { get; set; } = 10; + [Parameter] + public int _numRecord { get; set; } = 0; + [Parameter] + public int _currPage { get; set; } = 0; + public int totalVar { get; set; } = 0; -// [Parameter] -// public double totalVar { get; set; } = 0; + private int numRecord + { + get => _numRecord; + set + { + if (_numRecord != value) + { + _numRecord = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + } -// protected DateTime _dtStart = DateTime.Now.AddHours(-24); -// protected DateTime dtStart -// { -// get => _dtStart; -// set -// { -// _dtStart = value; -// var pUpd = Task.Run(async () => -// { -// await ReloadData(); -// }); -// pUpd.Wait(); -// } -// } -// protected DateTime _dtEnd = DateTime.Now; -// protected DateTime dtEnd -// { -// get => _dtEnd; -// set -// { -// _dtEnd = value; -// var pUpd = Task.Run(async () => -// { -// await ReloadData(); -// }); -// pUpd.Wait(); -// } -// } -// private bool isLoading { get; set; } = false; -// private async Task ReloadData() -// { -// isLoading = true; -// DateTime adesso = DateTime.Now; -// //SearchRecords = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, adesso.AddHours(-numHourPrev), adesso); -// if (setFreqDur) -// { -// SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); -// ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); -// totalCount = SearchRecordsFreq.Count; -// totalVar = 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(); -// totalCount = SearchRecordsDur.Count; -// totalVar = SearchRecordsDur.Sum(x => x.Duration); -// await Task.Delay(1); -// } -// await Task.Delay(1); -// isLoading = false; -// } -// } -//} + public int currPage + { + get => _currPage; + set + { + if (_currPage != value) + { + _currPage = value; + if (_currPage != value) + { + _currPage = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + } + } + + //[Inject] + //protected MessageService MessageService { get; set; } = null!; + + protected DateTime _dtStart = DateTime.Now.AddHours(-24); + protected DateTime dtStart + { + get => _dtStart; + set + { + _dtStart = value; + var pUpd = Task.Run(async () => + { + await ReloadData(); + }); + pUpd.Wait(); + } + } + protected DateTime _dtEnd = DateTime.Now; + protected DateTime dtEnd + { + get => _dtEnd; + set + { + _dtEnd = value; + var pUpd = Task.Run(async () => + { + await ReloadData(); + }); + pUpd.Wait(); + } + } + private bool isLoading { get; set; } = false; + private async Task ReloadData() + { + isLoading = true; + SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); + ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + totalCount = SearchRecordsFreq.Count; + totalVar = SearchRecordsFreq.Sum(x => x.EventCount); + calcolaSoglieFreq(); + await Task.Delay(1); + isLoading = false; + } + protected override async Task OnInitializedAsync() + { + + SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); + ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + + await ReloadData(); + } + private double sogliaGreen = 0; + private double sogliaRed = 1; + + private void calcolaSoglieFreq() + { + int numRecord = totalCount; + var firstRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.2)).FirstOrDefault(); + var lastRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.8)).FirstOrDefault(); + if (firstRecord != null) + { + sogliaGreen = (double)firstRecord.EventCount / totalVar; + } + if (lastRecord != null) + { + sogliaRed = (double)lastRecord.EventCount / totalVar; + } + } + protected string calcPercFreq(double numEvent) + { + string ans = $"{numEvent / totalVar:P2}"; + + return ans; + } + protected string valFreq(double eventCount) + { + int max = SearchRecordsFreq.Max(a => a.EventCount); + + double divisione = eventCount / max; + + int percentage = (int)(divisione * 100); + + string ans = $"width: {percentage}%"; + + return ans; + } + protected string styleColourPBarFreq(double eventFreq) + { + string ans = ""; + var source = ListRecordsFreq; + + calcolaSoglieFreq(); + + if (eventFreq >= sogliaGreen) + { + ans = "bg-danger"; + } + else if (eventFreq <= sogliaRed) + { + ans = "bg-success"; + } + else + { + ans = "bg-warning"; + } + + + return ans; + } + + } +} diff --git a/MP.MONO.UI/Data/MessageService.cs b/MP.MONO.UI/Data/MessageService.cs new file mode 100644 index 0000000..3b622c5 --- /dev/null +++ b/MP.MONO.UI/Data/MessageService.cs @@ -0,0 +1,73 @@ +namespace MP.MONO.UI.Data +{ + public class MessageService + { + #region Public Events + + public event Action EA_PageUpdated; + + #endregion Public Events + + #region Public Properties + + public int currPage + { + get => _currPage; + set + { + if (_currPage != value) + { + _currPage = value; + if (EA_PageUpdated != null) + { + EA_PageUpdated?.Invoke(); + } + } + } + } + + public int numRecord + { + get => _numRecord; + set + { + if (_numRecord != value) + { + _numRecord = value; + if (EA_PageUpdated != null) + { + EA_PageUpdated?.Invoke(); + } + } + } + } + + #endregion Public Properties + + #region Protected Methods + + protected void reportPaging() + { + if (EA_PageUpdated != null) + { + EA_PageUpdated?.Invoke(); + } + } + + #endregion Protected Methods + + #region Private Fields + + + #endregion Private Fields + + #region Private Properties + + private int _currPage { get; set; } = 1; + + private int _numRecord { get; set; } = 10; + private int _totalVar { get; set; } = 0; + + #endregion Private Properties + } +} \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 2b2e4af..3bac4ed 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.2209.2708 + 1.2.2209.2717 diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index fc8c8cf..6e4922b 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -45,9 +45,9 @@ { @if (setFreqDur) { - + -
      + @*
      @@ -87,7 +87,7 @@
      -
      +
      *@ } else { diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 86c497d..8e5e372 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

      Version: 1.2.2209.2708

      +

      Version: 1.2.2209.2717


      Release Note:
      • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 2039718..6e24454 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2708 +1.2.2209.2717 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index b060edf..dc9ec0d 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2708 + 1.2.2209.2717 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 From f6722af1cc2458c8bbbbf586996b82bac7c8bbf0 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 28 Sep 2022 17:29:45 +0200 Subject: [PATCH 04/57] Continuo split componenti chart --- MP.MONO.UI/Components/ChartFilter.razor | 18 ++ MP.MONO.UI/Components/ChartFilter.razor.cs | 111 ++++++++++ MP.MONO.UI/Components/ListFreqAlarms.razor.cs | 99 ++++----- MP.MONO.UI/Data/selectChartParams.cs | 48 +++++ MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Alarms.razor | 4 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor | 120 +++++------ MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 202 +++++++----------- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 11 files changed, 370 insertions(+), 240 deletions(-) create mode 100644 MP.MONO.UI/Components/ChartFilter.razor create mode 100644 MP.MONO.UI/Components/ChartFilter.razor.cs create mode 100644 MP.MONO.UI/Data/selectChartParams.cs diff --git a/MP.MONO.UI/Components/ChartFilter.razor b/MP.MONO.UI/Components/ChartFilter.razor new file mode 100644 index 0000000..8e5a1db --- /dev/null +++ b/MP.MONO.UI/Components/ChartFilter.razor @@ -0,0 +1,18 @@ +
        +
        + Choose mode: +
        + + +
        +
        +
        +
        + + + + +
        +
        +
        + diff --git a/MP.MONO.UI/Components/ChartFilter.razor.cs b/MP.MONO.UI/Components/ChartFilter.razor.cs new file mode 100644 index 0000000..7edfd96 --- /dev/null +++ b/MP.MONO.UI/Components/ChartFilter.razor.cs @@ -0,0 +1,111 @@ +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; +using MP.MONO.UI.Data; + +namespace MP.MONO.UI.Components +{ + public partial class ChartFilter + { + #region Public Properties + + [Parameter] + public EventCallback FilterChanged { get; set; } + + [Parameter] + public selectChartParams SelFilter { get; set; } = null!; + + #endregion Public Properties + + #region Public Methods + + /// + /// Inizializzazione con periodo e arrotondamento + /// + /// + /// + public static DateTime RoundDatetime(int minRound) + { + TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today); + int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound; + DateTime endRounded = DateTime.Today.AddMinutes(minDay); + return endRounded; + } + #endregion Public Methods + + #region Protected Properties + protected override async Task OnInitializedAsync() + { + SelFilter = new selectChartParams(); + await FilterChanged.InvokeAsync(SelFilter); + setDtMinMax(); + } + protected void setDtMinMax() + { + // copio il filtro + var currFilt = SelFilter; + currFilt.CurrPage = 0; + currFilt.dtMax = RoundDatetime(5); + currFilt.dtMin = RoundDatetime(5).AddHours(-2); + SelFilter = currFilt; + } + protected async Task toggleRec() + { + setFreqDur = !setFreqDur; + await Task.Delay(1); + } + protected bool setFreqDur + { + get => SelFilter.setFreqDur; + set => SelFilter.setFreqDur = value; + } + + private DateTime? dtStart + { + get => SelFilter.dtMin; + set + { + if (SelFilter.dtMax != value) + { + SelFilter.dtMin = value; + reportChange(); + } + } + } + protected DateTime _dtEnd = DateTime.Now; + private DateTime? dtEnd + { + get => SelFilter.dtMax; + set + { + if (SelFilter.dtMax != value) + { + SelFilter.dtMax = value; + reportChange(); + } + } + } + protected string currMode + { + get => setFreqDur ? "Alarm frequency" : "Alarm duration"; + } + private void reportChange() + { + FilterChanged.InvokeAsync(SelFilter); + } + #endregion Protected Properties + } +} \ No newline at end of file diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs index 4e4566d..c73fe40 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs @@ -8,24 +8,41 @@ namespace MP.MONO.UI.Components { protected List? ListRecordsFreq { get; set; } = null; - private int totalCount { get; set; } = 0; + private int _totalCount { get; set; } = 0; + private int totalCount + { + get => _totalCount; + set + { + if (_totalCount != value) + { + _totalCount = value; + TotRecordChanged.InvokeAsync(value); + } + } + } + [Parameter] + public EventCallback PagerResetReq { get; set; } + + [Parameter] + public selectChartParams selFilter { get; set; } = null!; + + [Parameter] + public EventCallback TotRecordChanged { get; set; } protected List? SearchRecordsFreq { get; set; } = null; - [Parameter] - public int _numRecord { get; set; } = 0; - [Parameter] - public int _currPage { get; set; } = 0; - public int totalVar { get; set; } = 0; + + public int totalVar { get; set; } = 0; private int numRecord { - get => _numRecord; + get => selFilter.MaxRecord; set { - if (_numRecord != value) + if (selFilter.MaxRecord != value) { - _numRecord = value; + selFilter.MaxRecord = value; var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); } @@ -34,58 +51,36 @@ namespace MP.MONO.UI.Components public int currPage { - get => _currPage; + get => selFilter.CurrPage; set { - if (_currPage != value) + if (selFilter.CurrPage != value) { - _currPage = value; - if (_currPage != value) - { - _currPage = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); - } + selFilter.CurrPage = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); } } } - //[Inject] - //protected MessageService MessageService { get; set; } = null!; - protected DateTime _dtStart = DateTime.Now.AddHours(-24); - protected DateTime dtStart + protected DateTime? dtStart { - get => _dtStart; - set - { - _dtStart = value; - var pUpd = Task.Run(async () => - { - await ReloadData(); - }); - pUpd.Wait(); - } + get => selFilter.dtMin; + set => selFilter.dtMin = value; } - protected DateTime _dtEnd = DateTime.Now; - protected DateTime dtEnd + protected DateTime? dtEnd { - get => _dtEnd; - set - { - _dtEnd = value; - var pUpd = Task.Run(async () => - { - await ReloadData(); - }); - pUpd.Wait(); - } + get => selFilter.dtMax; + set => selFilter.dtMax = value; } private bool isLoading { get; set; } = false; private async Task ReloadData() { + DateTime dtMax = dtStart == null ? DateTime.Now : (DateTime)dtStart; + DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; isLoading = true; - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); + SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtMin, dtMax); ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); totalCount = SearchRecordsFreq.Count; totalVar = SearchRecordsFreq.Sum(x => x.EventCount); @@ -93,10 +88,18 @@ namespace MP.MONO.UI.Components await Task.Delay(1); isLoading = false; } + public static DateTime RoundDatetime(int minRound) + { + TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today); + int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound; + DateTime endRounded = DateTime.Today.AddMinutes(minDay); + return endRounded; + } protected override async Task OnInitializedAsync() { - - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); + DateTime dtMax = dtStart == null ? DateTime.Now : (DateTime)dtStart; + DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; + SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtMin, dtMax); ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await ReloadData(); @@ -159,6 +162,6 @@ namespace MP.MONO.UI.Components return ans; } - + } } diff --git a/MP.MONO.UI/Data/selectChartParams.cs b/MP.MONO.UI/Data/selectChartParams.cs new file mode 100644 index 0000000..ceede38 --- /dev/null +++ b/MP.MONO.UI/Data/selectChartParams.cs @@ -0,0 +1,48 @@ +namespace MP.MONO.UI.Data +{ + public class selectChartParams + { + #region Public Constructors + + public selectChartParams() + { } + + #endregion Public Constructors + + #region Public Properties + + public int CurrPage { get; set; } = 1; + public DateTime? dtMax { get; set; } = null; + public DateTime? dtMin { get; set; } = null; + public int MaxRecord { get; set; } = 100; + public bool setFreqDur { get; set; } = true; + + #endregion Public Properties + + #region Public Methods + + public override bool Equals(object obj) + { + if (!(obj is selectChartParams item)) + return false; + + if (MaxRecord != item.MaxRecord) + return false; + + if (CurrPage != item.CurrPage) + return false; + + if (setFreqDur != item.setFreqDur) + return false; + + return true; + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 3bac4ed..4db067c 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.2209.2717 + 1.2.2209.2816 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index 676afe5..d4ea0f3 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -7,7 +7,7 @@ @inject CurrentDataService MMDataService -
        +
        @@ -83,7 +83,7 @@ @*
        *@
        - Choose modality: + Choose mode:
        diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index 6e4922b..925f5a4 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -3,36 +3,32 @@ @using MP.MONO.UI.Components -
        -
        -
        +
        +
        +
        Alarm analysis
        -
        - Choose modality: -
        - - -
        -
        +
        + +
        + @*
        + Choose mode: +
        + + +
        +
        - +
        -
        +
        *@
        - @if (ShowCharts == true) - { - @**@ - }@* - @if (currRecord != null) - { - - }*@ + @if ((ListRecordsFreq == null && setFreqDur) || (ListRecordsDur == null && !setFreqDur)) { @@ -45,49 +41,49 @@ { @if (setFreqDur) { - - - @*
        -
        - - - - - - - - - - - @foreach (var record in ListRecordsFreq) - { - + + + @*
        +
        +
        Alarm DescriptionAlarm Event CountEvent FrequencyEvent Frequency Chart
        + - - - - + + + + - } - -
        -
        @record.AlarmDescription
        -         		-
        @record.EventCount
        -         		-
        - @if (totalVar != 0) - { - @calcPercFreq((double)record.EventCount) - } -
        -         		-
        -
        @record.EventCount
        -
        -         		Alarm DescriptionAlarm Event CountEvent FrequencyEvent Frequency Chart
        -
        -
        *@ + + + @foreach (var record in ListRecordsFreq) + { + + + +
        @record.AlarmDescription
        + + +
        @record.EventCount
        + + +
        + @if (totalVar != 0) + { + @calcPercFreq((double)record.EventCount) + } +
        + + +
        +
        @record.EventCount
        +
        + + + } + + +
        +
        *@ } else { @@ -124,7 +120,7 @@
        @Math.Round(item.Duration,2)
        -
        +
        } diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index 8ea5829..da05e3f 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -1,26 +1,5 @@ -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; -using MP.MONO.Data.DbModels; -using MP.MONO.UI.Data; using MP.MONO.Data.DTO; -using System.Diagnostics.Tracing; -using System.Security.Cryptography.X509Certificates; -using System.DirectoryServices.Protocols; -using System.Security; +using MP.MONO.UI.Data; namespace MP.MONO.UI.Pages { @@ -35,6 +14,7 @@ namespace MP.MONO.UI.Pages private List? SearchRecordsFreq = null; private List? SearchRecordsDur = null; + private selectChartParams currFilter { get; set; } = new selectChartParams(); #endregion Private Fields @@ -43,8 +23,6 @@ namespace MP.MONO.UI.Pages private int _currPage { get; set; } = 1; private int _numRecord { get; set; } = 10; - protected double totalVar = 0; - protected string percEvents = ""; private int currPage { @@ -59,59 +37,12 @@ namespace MP.MONO.UI.Pages } } } - //protected int _numHourPrev = 24; - //protected int numHourPrev - //{ - // get => _numHourPrev; - // set - // { - // _numHourPrev = value; - // var pUpd = Task.Run(async () => - // { - // await ReloadData(); - // }); - // pUpd.Wait(); - // } - //} - protected string currMode - { - get => setFreqDur ? "Alarm frequency" : "Alarm duration"; - } + + + public bool setFreqDur { get; set; } = true; - protected async Task toggleRec() - { - setFreqDur = !setFreqDur; - await Task.Delay(1); - await ReloadData(); - } - protected DateTime _dtStart = DateTime.Now.AddHours(-24); - protected DateTime dtStart - { - get => _dtStart; - set - { - _dtStart = value; - var pUpd = Task.Run(async () => - { - await ReloadData(); - }); - pUpd.Wait(); - } - } - protected DateTime _dtEnd = DateTime.Now; - protected DateTime dtEnd - { - get => _dtEnd; - set - { - _dtEnd = value; - var pUpd = Task.Run(async () => - { - await ReloadData(); - }); - pUpd.Wait(); - } - } + + private bool isLoading { get; set; } = false; @@ -129,32 +60,60 @@ namespace MP.MONO.UI.Pages } } - private bool ShowCharts { get; set; } = true; - #endregion Private Properties #region Protected Properties + protected async Task toggleRec() + { + setFreqDur = !setFreqDur; + await Task.Delay(1); + await ReloadData(); + } + protected DateTime _dtStart = DateTime.Now.AddHours(-24); + + protected DateTime dtStart + { + get => _dtStart; + set + { + _dtStart = value; + var pUpd = Task.Run(async () => + { + await ReloadData(); + }); + pUpd.Wait(); + } + } + + protected DateTime _dtEnd = DateTime.Now; + + protected DateTime dtEnd + { + get => _dtEnd; + set + { + _dtEnd = value; + var pUpd = Task.Run(async () => + { + await ReloadData(); + }); + pUpd.Wait(); + } + } protected int totalCount { get; set; } = 0; - //{ - // get - // { - // int answ = 0; - // if (SearchRecordsFreq != null && setFreqDur) - // { - // answ = SearchRecordsFreq.Count; - // } - // else - // { - // //answ = SearchRecordsDur.Count; - // } - // return answ; - // } - //} + protected string currMode + { + get => setFreqDur ? "Alarm frequency" : "Alarm duration"; + } + + protected double totalVar = 0; + protected string percEvents = ""; #endregion Protected Properties #region Private Methods isLoading = false; + //} private async Task ReloadData() @@ -184,7 +143,7 @@ namespace MP.MONO.UI.Pages isLoading = false; } - #endregion Private Methods + #endregion Private Methods isLoading = false; #region Protected Methods @@ -209,13 +168,15 @@ namespace MP.MONO.UI.Pages else { SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd); - ListRecordsDur= SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); //calcolaSoglieDur(); } await ReloadData(); } + private double sogliaGreen = 0; private double sogliaRed = 1; + private void calcolaSoglieFreq() { int numRecord = totalCount; @@ -230,6 +191,7 @@ namespace MP.MONO.UI.Pages sogliaRed = (double)lastRecord.EventCount / totalVar; } } + private void calcolaSoglieDur() { int numRecord = totalCount; @@ -249,12 +211,14 @@ namespace MP.MONO.UI.Pages { currRecord = null; } + protected string calcPercFreq(double numEvent) { string ans = $"{numEvent / totalVar:P2}"; return ans; } + protected string calcPercDur(double duration) { string ans = $"{duration / totalVar:P2}"; @@ -308,9 +272,9 @@ namespace MP.MONO.UI.Pages ans = "bg-warning"; } - return ans; } + protected string styleColourPBarDur(double duration) { string ans = ""; @@ -331,29 +295,21 @@ namespace MP.MONO.UI.Pages ans = "bg-warning"; } - return ans; } + protected void Select(AlarmFreqDTO selRecord) { // applico filtro da selezione currRecord = selRecord; } - protected async Task ToggleChart(bool doShow) - { - ShowCharts = !ShowCharts; - if (ShowCharts) - { - await ReloadData(); - } - } - protected async Task UpdateData() { currRecord = null; await ReloadData(); } + protected override async Task OnParametersSetAsync() { isLoading = true; @@ -364,28 +320,26 @@ namespace MP.MONO.UI.Pages #endregion Protected Methods #region Public Methods - - public string checkSelect(DateTime DtStart, double EventCount, int IdxMacchina) + protected void updateTotal(int newTotCount) { - string answ = ""; - if (currRecord != null) - { - try - { - answ = (currRecord.MachineId == IdxMacchina && currRecord.EventCount == EventCount) ? "table-info" : ""; - } - catch - { } - } - return answ; + totalCount = newTotCount; } - public async void OnSeachUpdated() + + private async Task updateFilter(selectChartParams newParams) { - await InvokeAsync(() => + isLoading = true; + await Task.Delay(1); + currPage = 1; + if (newParams.CurrPage == 0) { - Task task = UpdateData(); - StateHasChanged(); - }); + newParams.CurrPage = 1; + } + await Task.Delay(1); + await InvokeAsync(() => StateHasChanged()); + newParams.dtMax = dtEnd; + newParams.dtMin = dtStart; + currFilter = newParams; + isLoading = false; } #endregion Public Methods diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 8e5e372..0fe269a 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

        Version: 1.2.2209.2717

        +

        Version: 1.2.2209.2816


        Release Note:
        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 6e24454..d8aca12 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2717 +1.2.2209.2816 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index dc9ec0d..a8a5f0f 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2717 + 1.2.2209.2816 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 From edb2cbaf62c33f9f7b66ee8bda06ed622e790b6f Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 29 Sep 2022 08:40:12 +0200 Subject: [PATCH 05/57] fix currFilter --- MP.MONO.UI/Components/ChartFilter.razor.cs | 4 +++- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 16 +++++++++++++--- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/MP.MONO.UI/Components/ChartFilter.razor.cs b/MP.MONO.UI/Components/ChartFilter.razor.cs index 7edfd96..8781b9c 100644 --- a/MP.MONO.UI/Components/ChartFilter.razor.cs +++ b/MP.MONO.UI/Components/ChartFilter.razor.cs @@ -64,7 +64,9 @@ namespace MP.MONO.UI.Components } protected async Task toggleRec() { - setFreqDur = !setFreqDur; + var currFilt = SelFilter; + currFilt.setFreqDur = !currFilt.setFreqDur; + await Task.Delay(1); } protected bool setFreqDur diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 4db067c..724ee8e 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.2209.2816 + 1.2.2209.2908 diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index da05e3f..46c4b60 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -40,9 +40,19 @@ namespace MP.MONO.UI.Pages - public bool setFreqDur { get; set; } = true; - - + public bool setFreqDur + { + get => currFilter.setFreqDur; + set + { + if (currFilter.setFreqDur != value) + { + currFilter.setFreqDur = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + } private bool isLoading { get; set; } = false; diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 0fe269a..cf786e6 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

          Version: 1.2.2209.2816

          +

          Version: 1.2.2209.2908


          Release Note:
          • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index d8aca12..682ec37 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2816 +1.2.2209.2908 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index a8a5f0f..806cc30 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2816 + 1.2.2209.2908 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 From 7b0e29e0d45b9e76c471ce136862272b6081d699 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 29 Sep 2022 09:16:18 +0200 Subject: [PATCH 06/57] Tentativo fix --- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 3 ++- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 724ee8e..e99cc7b 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.2209.2908 + 1.2.2209.2909 diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index 46c4b60..68f70cc 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -345,9 +345,10 @@ namespace MP.MONO.UI.Pages newParams.CurrPage = 1; } await Task.Delay(1); - await InvokeAsync(() => StateHasChanged()); + newParams.dtMax = dtEnd; newParams.dtMin = dtStart; + await InvokeAsync(() => StateHasChanged()); currFilter = newParams; isLoading = false; } diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index cf786e6..ca28121 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

            Version: 1.2.2209.2908

            +

            Version: 1.2.2209.2909


            Release Note:
            • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 682ec37..45cf11e 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2908 +1.2.2209.2909 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 806cc30..48c03a9 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2908 + 1.2.2209.2909 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 From 4f0a39ca110af6a590e299f143660721157a84a3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Sep 2022 09:54:19 +0200 Subject: [PATCH 07/57] Inizio sistemazione blocchi analisi allarmi - verifica filtro - fix pagina master --- 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 +- .../{ChartFilter.razor => AlAnFilter.razor} | 8 +- ...artFilter.razor.cs => AlAnFilter.razor.cs} | 129 +++-- MP.MONO.UI/Components/ListFreqAlarms.razor | 81 +-- MP.MONO.UI/Components/ListFreqAlarms.razor.cs | 21 +- MP.MONO.UI/Conf/lic.file | 2 +- MP.MONO.UI/Data/selectChartParams.cs | 4 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor | 4 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 497 +++++++++--------- MP.MONO.UI/temp/InfoData.json | 66 +-- 21 files changed, 434 insertions(+), 402 deletions(-) rename MP.MONO.UI/Components/{ChartFilter.razor => AlAnFilter.razor} (54%) rename MP.MONO.UI/Components/{ChartFilter.razor.cs => AlAnFilter.razor.cs} (54%) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index a95a8a4..764e2d3 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.2209.2318 + 1.2.2209.2909 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 39c315b..ca28121 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

              Version: 1.2.2209.2318

              +

              Version: 1.2.2209.2909


              Release Note:
              • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index f67a0bd..45cf11e 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2318 +1.2.2209.2909 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index a460ba7..0b8705a 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2318 + 1.2.2209.2909 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 f4d9ecc..9043823 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.2209.2318 + 1.2.2209.2909 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 39c315b..ca28121 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                Version: 1.2.2209.2318

                +

                Version: 1.2.2209.2909


                Release Note:
                • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index f67a0bd..45cf11e 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2318 +1.2.2209.2909 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 6329a57..6e97c31 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2318 + 1.2.2209.2909 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 e9ac43b..e2cae68 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.2209.2318 + 1.2.2209.2909 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 39c315b..ca28121 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                  Version: 1.2.2209.2318

                  +

                  Version: 1.2.2209.2909


                  Release Note:
                  • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index f67a0bd..45cf11e 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2318 +1.2.2209.2909 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 821d25a..a73ee55 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2318 + 1.2.2209.2909 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/ChartFilter.razor b/MP.MONO.UI/Components/AlAnFilter.razor similarity index 54% rename from MP.MONO.UI/Components/ChartFilter.razor rename to MP.MONO.UI/Components/AlAnFilter.razor index 8e5a1db..fd30e18 100644 --- a/MP.MONO.UI/Components/ChartFilter.razor +++ b/MP.MONO.UI/Components/AlAnFilter.razor @@ -8,10 +8,10 @@
        - - - - + + + +
        diff --git a/MP.MONO.UI/Components/ChartFilter.razor.cs b/MP.MONO.UI/Components/AlAnFilter.razor.cs similarity index 54% rename from MP.MONO.UI/Components/ChartFilter.razor.cs rename to MP.MONO.UI/Components/AlAnFilter.razor.cs index 8781b9c..a184a21 100644 --- a/MP.MONO.UI/Components/ChartFilter.razor.cs +++ b/MP.MONO.UI/Components/AlAnFilter.razor.cs @@ -1,24 +1,9 @@ -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; using MP.MONO.UI.Data; namespace MP.MONO.UI.Components { - public partial class ChartFilter + public partial class AlAnFilter { #region Public Properties @@ -26,7 +11,7 @@ namespace MP.MONO.UI.Components public EventCallback FilterChanged { get; set; } [Parameter] - public selectChartParams SelFilter { get; set; } = null!; + public selectChartParams SelFilter { get; set; } = new selectChartParams(); #endregion Public Properties @@ -35,60 +20,89 @@ namespace MP.MONO.UI.Components /// /// Inizializzazione con periodo e arrotondamento /// - /// + /// DataORa di riferimento + /// Arrotondamento desiderato + /// Parametro arrotondamento: se > 0 per eccesso, se <= 0 per difetto /// - public static DateTime RoundDatetime(int minRound) + public static DateTime RoundDatetime(DateTime dtRef, int minRound, int roundMode) { - TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today); - int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound; - DateTime endRounded = DateTime.Today.AddMinutes(minDay); + TimeSpan DayElapsed = dtRef.Subtract(dtRef.Date); + int minDay = 0; + if (roundMode > 0) + { + minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound; + } + else + { + minDay = (int)Math.Floor((double)(DayElapsed.TotalMinutes / minRound)) * minRound; + } + DateTime endRounded = dtRef.Date.AddMinutes(minDay); return endRounded; } + #endregion Public Methods + #region Protected Fields + + protected DateTime _dtEnd = DateTime.Now; + + #endregion Protected Fields + #region Protected Properties + + protected string currMode + { + get => setFreqDur ? "Alarm frequency" : "Alarm duration"; + } + + protected bool setFreqDur + { + get => SelFilter.setFreqDur; + set + { + if (SelFilter.setFreqDur != value) + { + SelFilter.setFreqDur = value; + reportChange(); + } + } + } + + #endregion Protected Properties + + #region Protected Methods + protected override async Task OnInitializedAsync() { - SelFilter = new selectChartParams(); - await FilterChanged.InvokeAsync(SelFilter); setDtMinMax(); + await FilterChanged.InvokeAsync(SelFilter); } + protected void setDtMinMax() { // copio il filtro var currFilt = SelFilter; currFilt.CurrPage = 0; - currFilt.dtMax = RoundDatetime(5); - currFilt.dtMin = RoundDatetime(5).AddHours(-2); + DateTime adesso = DateTime.Now; + currFilt.dtMax = RoundDatetime(adesso,5, 1); + currFilt.dtMin = RoundDatetime(adesso.AddHours(-4), 5, 0); SelFilter = currFilt; } + protected async Task toggleRec() { var currFilt = SelFilter; currFilt.setFreqDur = !currFilt.setFreqDur; - + SelFilter = currFilt; await Task.Delay(1); + reportChange(); } - protected bool setFreqDur - { - get => SelFilter.setFreqDur; - set => SelFilter.setFreqDur = value; - } - - private DateTime? dtStart - { - get => SelFilter.dtMin; - set - { - if (SelFilter.dtMax != value) - { - SelFilter.dtMin = value; - reportChange(); - } - } - } - protected DateTime _dtEnd = DateTime.Now; - private DateTime? dtEnd + + #endregion Protected Methods + + #region Private Properties + + private DateTime dtEnd { get => SelFilter.dtMax; set @@ -100,14 +114,29 @@ namespace MP.MONO.UI.Components } } } - protected string currMode + + private DateTime dtStart { - get => setFreqDur ? "Alarm frequency" : "Alarm duration"; + get => SelFilter.dtMin; + set + { + if (SelFilter.dtMin != value) + { + SelFilter.dtMin = value; + reportChange(); + } + } } + + #endregion Private Properties + + #region Private Methods + private void reportChange() { FilterChanged.InvokeAsync(SelFilter); } - #endregion Protected Properties + + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor b/MP.MONO.UI/Components/ListFreqAlarms.razor index 39fb3e2..add001d 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor @@ -1,41 +1,52 @@ 
        - - - - - - - - - - - @foreach (var record in ListRecordsFreq) - { - + @if (ListRecordsFreq == null) + { + + } + else if (totalCount == 0) + { +
        Nessun record trovato
        + } + else + { +
        Alarm DescriptionAlarm Event CountEvent FrequenceEvent Frequence Chart
        + - - - - + + + + - } - -
        -
        @record.AlarmDescription
        -         		-
        @record.EventCount
        -         		-
        - @if (totalVar != 0) - { - @calcPercFreq((double)record.EventCount) - } -
        -         		-
        -
        @record.EventCount
        -
        -         		Alarm DescriptionAlarm Event CountEvent FrequenceEvent Frequence Chart
        + + + @foreach (var record in ListRecordsFreq) + { + + + +
        @record.AlarmDescription
        + + +
        @record.EventCount
        + + +
        + @if (totalVar != 0) + { + @calcPercFreq((double)record.EventCount) + } +
        + + +
        +
        @record.EventCount
        +
        + + + } + + + }
        diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs index c73fe40..6d7dcab 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs @@ -64,12 +64,12 @@ namespace MP.MONO.UI.Components } protected DateTime _dtStart = DateTime.Now.AddHours(-24); - protected DateTime? dtStart + protected DateTime dtStart { get => selFilter.dtMin; set => selFilter.dtMin = value; } - protected DateTime? dtEnd + protected DateTime dtEnd { get => selFilter.dtMax; set => selFilter.dtMax = value; @@ -77,10 +77,12 @@ namespace MP.MONO.UI.Components private bool isLoading { get; set; } = false; private async Task ReloadData() { +#if false DateTime dtMax = dtStart == null ? DateTime.Now : (DateTime)dtStart; - DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; + DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; +#endif isLoading = true; - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtMin, dtMax); + SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); totalCount = SearchRecordsFreq.Count; totalVar = SearchRecordsFreq.Sum(x => x.EventCount); @@ -97,13 +99,20 @@ namespace MP.MONO.UI.Components } protected override async Task OnInitializedAsync() { +#if false DateTime dtMax = dtStart == null ? DateTime.Now : (DateTime)dtStart; - DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtMin, dtMax); + DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; + SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtStart); ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); +#endif + await Task.Delay(1); + } + protected override async Task OnParametersSetAsync() + { await ReloadData(); } + private double sogliaGreen = 0; private double sogliaRed = 1; diff --git a/MP.MONO.UI/Conf/lic.file b/MP.MONO.UI/Conf/lic.file index 69f59a3..9540e9d 100644 --- a/MP.MONO.UI/Conf/lic.file +++ b/MP.MONO.UI/Conf/lic.file @@ -1 +1 @@ -467e4b24bc3fe9d237169aa274ae589b64f072fb1cd91f4d79aaee76c64afbfced7fb51536b62cf612dedfb304202a1e653778b7cc8c758f83bb058984460301 \ No newline at end of file +31e9cc1c2e8f30a1b4098cb157d712f11f3f2e60fb74169a354c3fa646d6d0e28518b4e3139f844b25824fbcc4340051fc507d22c1c2d2786d3786c777c31cc3 \ No newline at end of file diff --git a/MP.MONO.UI/Data/selectChartParams.cs b/MP.MONO.UI/Data/selectChartParams.cs index ceede38..4017ec9 100644 --- a/MP.MONO.UI/Data/selectChartParams.cs +++ b/MP.MONO.UI/Data/selectChartParams.cs @@ -12,8 +12,8 @@ #region Public Properties public int CurrPage { get; set; } = 1; - public DateTime? dtMax { get; set; } = null; - public DateTime? dtMin { get; set; } = null; + public DateTime dtMax { get; set; } = DateTime.Now; + public DateTime dtMin { get; set; } = DateTime.Now.AddHours(-8); public int MaxRecord { get; set; } = 100; public bool setFreqDur { get; set; } = true; diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index 925f5a4..be9f595 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -4,12 +4,12 @@ @using MP.MONO.UI.Components
        -
        +
        Alarm analysis
        - +
        @*
        Choose mode: diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index 68f70cc..b160f6e 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -5,24 +5,225 @@ namespace MP.MONO.UI.Pages { public partial class AlarmsAnalysis { + #region Public Properties + + public bool setFreqDur + { + get => currFilter.setFreqDur; + set + { + if (currFilter.setFreqDur != value) + { + currFilter.setFreqDur = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + } + + #endregion Public Properties + + #region Protected Fields + protected string percEvents = ""; + protected double totalVar = 0; + + #endregion Protected Fields + + #region Protected Properties + + protected string currMode + { + get => setFreqDur ? "Alarm frequency" : "Alarm duration"; + } + + protected DateTime dtEnd + { + get => currFilter.dtMax; + } + + protected DateTime dtStart + { + get => currFilter.dtMin; + } + + protected int totalCount { get; set; } = 0; + + #endregion Protected Properties + + #region Protected Methods + + protected string calcPercDur(double duration) + { + string ans = $"{duration / totalVar:P2}"; + + return ans; + } + + protected string calcPercFreq(double numEvent) + { + string ans = $"{numEvent / totalVar:P2}"; + + return ans; + } + + protected void ForceReload(int newNum) + { + numRecord = newNum; + } + + protected void ForceReloadPage(int newNum) + { + currPage = newNum; + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; +#if false + if (setFreqDur) + { + SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); + ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + } + else + { + SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd); + ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + //calcolaSoglieDur(); + } + await ReloadData(); +#endif + await Task.Delay(1); + } + + protected override async Task OnParametersSetAsync() + { + isLoading = true; + await ReloadData(); + await Task.Delay(1); + } + + protected void ResetData() + { + currRecord = null; + } + + protected void Select(AlarmFreqDTO selRecord) + { + // applico filtro da selezione + currRecord = selRecord; + } + + protected string styleColourPBarDur(double duration) + { + string ans = ""; + //var source = ListRecordsDur; + + calcolaSoglieDur(); + + if (duration >= sogliaGreen) + { + ans = "bg-danger"; + } + else if (duration <= sogliaRed) + { + ans = "bg-success"; + } + else + { + ans = "bg-warning"; + } + + return ans; + } + + protected string styleColourPBarFreq(double eventFreq) + { + string ans = ""; + var source = ListRecordsFreq; + + calcolaSoglieFreq(); + + if (eventFreq >= sogliaGreen) + { + ans = "bg-danger"; + } + else if (eventFreq <= sogliaRed) + { + ans = "bg-success"; + } + else + { + ans = "bg-warning"; + } + + return ans; + } + + protected async Task toggleRec() + { + setFreqDur = !setFreqDur; + await Task.Delay(1); + await ReloadData(); + } + + protected async Task UpdateData() + { + currRecord = null; + await ReloadData(); + } + + protected void updateTotal(int newTotCount) + { + totalCount = newTotCount; + } + + protected string valDur(double duration) + { + double max = SearchRecordsDur.Max(a => a.Duration); + + double divisione = duration / max; + + int percentage = (int)(divisione * 100); + + string ans = $"width: {percentage}%"; + + return ans; + } + + protected string valFreq(double eventCount) + { + int max = SearchRecordsFreq.Max(a => a.EventCount); + + double divisione = eventCount / max; + + int percentage = (int)(divisione * 100); + + string ans = $"width: {percentage}%"; + + return ans; + } + + #endregion Protected Methods + #region Private Fields private AlarmFreqDTO? currRecord = null; - private List? ListRecordsFreq = null; private List? ListRecordsDur = null; - - private List? SearchRecordsFreq = null; + private List? ListRecordsFreq = null; private List? SearchRecordsDur = null; - private selectChartParams currFilter { get; set; } = new selectChartParams(); + private List? SearchRecordsFreq = null; + private double sogliaGreen = 0; + private double sogliaRed = 1; #endregion Private Fields #region Private Properties private int _currPage { get; set; } = 1; - private int _numRecord { get; set; } = 10; + private selectChartParams currFilter { get; set; } = new selectChartParams(); private int currPage { @@ -38,22 +239,6 @@ namespace MP.MONO.UI.Pages } } - - - public bool setFreqDur - { - get => currFilter.setFreqDur; - set - { - if (currFilter.setFreqDur != value) - { - currFilter.setFreqDur = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); - } - } - } - private bool isLoading { get; set; } = false; private int numRecord @@ -72,60 +257,40 @@ namespace MP.MONO.UI.Pages #endregion Private Properties - #region Protected Properties - protected async Task toggleRec() - { - setFreqDur = !setFreqDur; - await Task.Delay(1); - await ReloadData(); - } - - protected DateTime _dtStart = DateTime.Now.AddHours(-24); - - protected DateTime dtStart - { - get => _dtStart; - set - { - _dtStart = value; - var pUpd = Task.Run(async () => - { - await ReloadData(); - }); - pUpd.Wait(); - } - } - - protected DateTime _dtEnd = DateTime.Now; - - protected DateTime dtEnd - { - get => _dtEnd; - set - { - _dtEnd = value; - var pUpd = Task.Run(async () => - { - await ReloadData(); - }); - pUpd.Wait(); - } - } - protected int totalCount { get; set; } = 0; - protected string currMode - { - get => setFreqDur ? "Alarm frequency" : "Alarm duration"; - } - - protected double totalVar = 0; - protected string percEvents = ""; - - #endregion Protected Properties - - #region Private Methods isLoading = false; - //} + #region Private Methods + + private void calcolaSoglieDur() + { + int numRecord = totalCount; + var firstRecord = SearchRecordsDur.Skip((int)(numRecord * 0.2)).FirstOrDefault(); + var lastRecord = SearchRecordsDur.Skip((int)(numRecord * 0.8)).FirstOrDefault(); + if (firstRecord != null) + { + sogliaGreen = (double)firstRecord.Duration / totalVar; + } + if (lastRecord != null) + { + sogliaRed = (double)lastRecord.Duration / totalVar; + } + } + + private void calcolaSoglieFreq() + { + int numRecord = totalCount; + var firstRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.2)).FirstOrDefault(); + var lastRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.8)).FirstOrDefault(); + if (firstRecord != null) + { + sogliaGreen = (double)firstRecord.EventCount / totalVar; + } + if (lastRecord != null) + { + sogliaRed = (double)lastRecord.EventCount / totalVar; + } + } + private async Task ReloadData() { isLoading = true; @@ -153,188 +318,6 @@ namespace MP.MONO.UI.Pages isLoading = false; } - #endregion Private Methods isLoading = false; - - #region Protected Methods - - protected void ForceReload(int newNum) - { - numRecord = newNum; - } - - protected void ForceReloadPage(int newNum) - { - currPage = newNum; - } - - protected override async Task OnInitializedAsync() - { - numRecord = 10; - if (setFreqDur) - { - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); - ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - } - else - { - SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd); - ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - //calcolaSoglieDur(); - } - await ReloadData(); - } - - private double sogliaGreen = 0; - private double sogliaRed = 1; - - private void calcolaSoglieFreq() - { - int numRecord = totalCount; - var firstRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.2)).FirstOrDefault(); - var lastRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.8)).FirstOrDefault(); - if (firstRecord != null) - { - sogliaGreen = (double)firstRecord.EventCount / totalVar; - } - if (lastRecord != null) - { - sogliaRed = (double)lastRecord.EventCount / totalVar; - } - } - - private void calcolaSoglieDur() - { - int numRecord = totalCount; - var firstRecord = SearchRecordsDur.Skip((int)(numRecord * 0.2)).FirstOrDefault(); - var lastRecord = SearchRecordsDur.Skip((int)(numRecord * 0.8)).FirstOrDefault(); - if (firstRecord != null) - { - sogliaGreen = (double)firstRecord.Duration / totalVar; - } - if (lastRecord != null) - { - sogliaRed = (double)lastRecord.Duration / totalVar; - } - } - - protected void ResetData() - { - currRecord = null; - } - - protected string calcPercFreq(double numEvent) - { - string ans = $"{numEvent / totalVar:P2}"; - - return ans; - } - - protected string calcPercDur(double duration) - { - string ans = $"{duration / totalVar:P2}"; - - return ans; - } - - protected string valFreq(double eventCount) - { - int max = SearchRecordsFreq.Max(a => a.EventCount); - - double divisione = eventCount / max; - - int percentage = (int)(divisione * 100); - - string ans = $"width: {percentage}%"; - - return ans; - } - - protected string valDur(double duration) - { - double max = SearchRecordsDur.Max(a => a.Duration); - - double divisione = duration / max; - - int percentage = (int)(divisione * 100); - - string ans = $"width: {percentage}%"; - - return ans; - } - - protected string styleColourPBarFreq(double eventFreq) - { - string ans = ""; - var source = ListRecordsFreq; - - calcolaSoglieFreq(); - - if (eventFreq >= sogliaGreen) - { - ans = "bg-danger"; - } - else if (eventFreq <= sogliaRed) - { - ans = "bg-success"; - } - else - { - ans = "bg-warning"; - } - - return ans; - } - - protected string styleColourPBarDur(double duration) - { - string ans = ""; - //var source = ListRecordsDur; - - calcolaSoglieDur(); - - if (duration >= sogliaGreen) - { - ans = "bg-danger"; - } - else if (duration <= sogliaRed) - { - ans = "bg-success"; - } - else - { - ans = "bg-warning"; - } - - return ans; - } - - protected void Select(AlarmFreqDTO selRecord) - { - // applico filtro da selezione - currRecord = selRecord; - } - - protected async Task UpdateData() - { - currRecord = null; - await ReloadData(); - } - - protected override async Task OnParametersSetAsync() - { - isLoading = true; - await ReloadData(); - await Task.Delay(1); - } - - #endregion Protected Methods - - #region Public Methods - protected void updateTotal(int newTotCount) - { - totalCount = newTotCount; - } - private async Task updateFilter(selectChartParams newParams) { isLoading = true; @@ -345,7 +328,7 @@ namespace MP.MONO.UI.Pages newParams.CurrPage = 1; } await Task.Delay(1); - + newParams.dtMax = dtEnd; newParams.dtMin = dtStart; await InvokeAsync(() => StateHasChanged()); @@ -353,6 +336,6 @@ namespace MP.MONO.UI.Pages isLoading = false; } - #endregion Public Methods + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.MONO.UI/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json index af545a4..efd270d 100644 --- a/MP.MONO.UI/temp/InfoData.json +++ b/MP.MONO.UI/temp/InfoData.json @@ -2,55 +2,55 @@ "AdapterType": "Ethernet 802.3", "AddressWidth": "64", "Architecture": "9", - "BiosVersion": "_ASUS_ - 1072009", - "BuildNumber": "19043", - "Caption": "Microsoft Windows 10 Pro", - "ConfiguredClockSpeed": "2400", + "BiosVersion": "ALASKA - 1072009", + "BuildNumber": "19044", + "Caption": "Microsoft Windows 10 Pro N", + "ConfiguredClockSpeed": "3600", "ConfiguredVoltage": "1200", "CpuVersion": "Modello 1, Stepping 0", - "CurrentClockSpeed": "2200", - "CurrentVoltage": "12", + "CurrentClockSpeed": "3501", + "CurrentVoltage": "11", "DataWidth": "64", - "Description": "AMD64 Family 23 Model 17 Stepping 0", - "DeviceLocator": "ChannelA-DIMM0", + "Description": "AMD64 Family 23 Model 113 Stepping 0", + "DeviceLocator": "DIMM 1", "ExtClock": "100", "Family": "107", - "FormFactor": "12", - "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}", - "L2CacheSize": "2048", - "L3CacheSize": "4096", + "FormFactor": "8", + "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}", + "L2CacheSize": "8192", + "L3CacheSize": "65536", "Level": "23", - "LoadPercentage": "32", - "MACAddress": "4C:ED:FB:D9:78:83", - "Manufacturer": "American Megatrends Inc.", + "LoadPercentage": "62", + "MACAddress": "0C:9D:92:B8:FD:E8", + "Manufacturer": "American Megatrends International, LLC.", "MaxNumberOfProcesses": "4294967295", "MaxProcessMemorySize": "137438953344", "MaxVoltage": "1200", "MinVoltage": "1200", - "Name": "Realtek PCIe GbE Family Controller", - "NumberOfCores": "4", - "NumberOfLogicalProcessors": "8", + "Name": "ASUS XG-C100C 10G PCI-E Network Adapter", + "NumberOfCores": "16", + "NumberOfLogicalProcessors": "32", "OSArchitecture": "64 bit", - "PartNumber": "8ATF1G64HZ-2G3E1 ", + "PartNumber": "CMK64GX4M2D3600C18", "PhysicalAdapter": "True", - "ProcessorId": "178BFBFF00810F10", + "ProcessorId": "178BFBFF00870F10", "ProcessorType": "3", - "ProductName": "Realtek PCIe GbE Family Controller", - "ReleaseDate": "20190521000000.000000+000", - "Revision": "4352", + "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter", + "ReleaseDate": "20210521000000.000000+000", + "Revision": "28928", "Role": "CPU", - "SerialNumber": "00330-80951-85780-AA242", - "ServiceName": "rt640x64", - "SMBIOSBIOSVersion": "X505ZA.311", + "SerialNumber": "00332-00332-17209-AA940", + "ServiceName": "aqnic650", + "SMBIOSBIOSVersion": "F33", "SMBIOSMajorVersion": "3", "SMBIOSMemoryType": "26", - "SMBIOSMinorVersion": "1", - "SocketDesignation": "FP5", - "SoftwareElementID": "X505ZA.311", + "SMBIOSMinorVersion": "3", + "SocketDesignation": "AM4", + "SoftwareElementID": "F33", "SoftwareElementState": "3", - "Speed": "2400", + "Speed": "3600", "SystemBiosMajorVersion": "5", - "SystemBiosMinorVersion": "13", - "SystemName": "EGALW-NB-004", - "Version": "10.0.19043" + "SystemBiosMinorVersion": "17", + "SystemName": "WRKST-R9-SAM", + "Version": "10.0.19044" } \ No newline at end of file From 49002a460469f6344b8f297a60609e1c522e0b69 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Sep 2022 10:16:56 +0200 Subject: [PATCH 08/57] Completato fix componente alarmFreq --- 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.UI/Components/AlAnFilter.razor.cs | 45 +--- MP.MONO.UI/Components/ListFreqAlarms.razor.cs | 201 ++++++++---------- MP.MONO.UI/Data/Utils.cs | 29 +++ MP.MONO.UI/Data/selectChartParams.cs | 33 ++- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor | 61 +----- MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 17 +- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 22 files changed, 186 insertions(+), 232 deletions(-) create mode 100644 MP.MONO.UI/Data/Utils.cs diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index 764e2d3..df3f193 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.2209.2909 + 1.2.2209.2910 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index ca28121..25d5984 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

        Version: 1.2.2209.2909

        +

        Version: 1.2.2209.2910


        Release Note:
        • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index 45cf11e..7a97854 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2909 +1.2.2209.2910 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 0b8705a..4f14dc9 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2909 + 1.2.2209.2910 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 9043823..7cbfebf 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.2209.2909 + 1.2.2209.2910 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index ca28121..25d5984 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

          Version: 1.2.2209.2909

          +

          Version: 1.2.2209.2910


          Release Note:
          • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index 45cf11e..7a97854 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2909 +1.2.2209.2910 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 6e97c31..3bae80a 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2909 + 1.2.2209.2910 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 e2cae68..8acc5b5 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.2209.2909 + 1.2.2209.2910 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index ca28121..25d5984 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

            Version: 1.2.2209.2909

            +

            Version: 1.2.2209.2910


            Release Note:
            • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 45cf11e..7a97854 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2909 +1.2.2209.2910 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index a73ee55..4376d9f 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2909 + 1.2.2209.2910 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.cs b/MP.MONO.UI/Components/AlAnFilter.razor.cs index a184a21..49b7c60 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor.cs +++ b/MP.MONO.UI/Components/AlAnFilter.razor.cs @@ -17,29 +17,6 @@ namespace MP.MONO.UI.Components #region Public Methods - /// - /// Inizializzazione con periodo e arrotondamento - /// - /// DataORa di riferimento - /// Arrotondamento desiderato - /// Parametro arrotondamento: se > 0 per eccesso, se <= 0 per difetto - /// - public static DateTime RoundDatetime(DateTime dtRef, int minRound, int roundMode) - { - TimeSpan DayElapsed = dtRef.Subtract(dtRef.Date); - int minDay = 0; - if (roundMode > 0) - { - minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound; - } - else - { - minDay = (int)Math.Floor((double)(DayElapsed.TotalMinutes / minRound)) * minRound; - } - DateTime endRounded = dtRef.Date.AddMinutes(minDay); - return endRounded; - } - #endregion Public Methods #region Protected Fields @@ -74,21 +51,9 @@ namespace MP.MONO.UI.Components protected override async Task OnInitializedAsync() { - setDtMinMax(); await FilterChanged.InvokeAsync(SelFilter); } - protected void setDtMinMax() - { - // copio il filtro - var currFilt = SelFilter; - currFilt.CurrPage = 0; - DateTime adesso = DateTime.Now; - currFilt.dtMax = RoundDatetime(adesso,5, 1); - currFilt.dtMin = RoundDatetime(adesso.AddHours(-4), 5, 0); - SelFilter = currFilt; - } - protected async Task toggleRec() { var currFilt = SelFilter; @@ -109,6 +74,11 @@ namespace MP.MONO.UI.Components { if (SelFilter.dtMax != value) { + // verifico coerenza + if (value <= dtStart) + { + value = dtStart.AddHours(1); + } SelFilter.dtMax = value; reportChange(); } @@ -122,6 +92,11 @@ namespace MP.MONO.UI.Components { if (SelFilter.dtMin != value) { + // verifico coerenza + if (value >= dtEnd) + { + value = dtEnd.AddHours(-1); + } SelFilter.dtMin = value; reportChange(); } diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs index 6d7dcab..0eb7adc 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor.cs +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor.cs @@ -6,9 +6,70 @@ namespace MP.MONO.UI.Components { public partial class ListFreqAlarms { + #region Public Properties + + [Parameter] + public selectChartParams selFilter { get; set; } = null!; + + [Parameter] + public EventCallback TotRecordChanged { get; set; } + + #endregion Public Properties + + #region Protected Properties + + protected int currPage + { + get => selFilter.CurrPage; + } + + protected DateTime dtEnd + { + get => selFilter.dtMax; + } + + protected DateTime dtStart + { + get => selFilter.dtMin; + } + protected List? ListRecordsFreq { get; set; } = null; + protected List? SearchRecordsFreq { get; set; } = null; + protected int totalVar { get; set; } = 0; + + #endregion Protected Properties + + #region Protected Methods + + protected override async Task OnInitializedAsync() + { + await Task.Delay(1); + } + + protected override async Task OnParametersSetAsync() + { + await ReloadData(); + } + + #endregion Protected Methods + + #region Private Fields + + private double sogliaGreen = 0; + + private double sogliaRed = 1; + + #endregion Private Fields + + #region Private Properties private int _totalCount { get; set; } = 0; + + private int numRecord + { + get => selFilter.NumRecord; + } + private int totalCount { get => _totalCount; @@ -21,134 +82,47 @@ namespace MP.MONO.UI.Components } } } - [Parameter] - public EventCallback PagerResetReq { get; set; } - [Parameter] - public selectChartParams selFilter { get; set; } = null!; + #endregion Private Properties - [Parameter] - public EventCallback TotRecordChanged { get; set; } + #region Private Methods - protected List? SearchRecordsFreq { get; set; } = null; - - - - public int totalVar { get; set; } = 0; - private int numRecord + private void calcolaSoglieFreq() { - get => selFilter.MaxRecord; - set + int numRecord = totalCount; + if (SearchRecordsFreq != null) { - if (selFilter.MaxRecord != value) + var firstRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.2)).FirstOrDefault(); + var lastRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.8)).FirstOrDefault(); + if (firstRecord != null) { - selFilter.MaxRecord = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); + sogliaGreen = (double)firstRecord.EventCount / totalVar; + } + if (lastRecord != null) + { + sogliaRed = (double)lastRecord.EventCount / totalVar; } } } - public int currPage + private string calcPercFreq(double numEvent) { - get => selFilter.CurrPage; - set - { - if (selFilter.CurrPage != value) - { - selFilter.CurrPage = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); - } - } + string ans = $"{numEvent / totalVar:P2}"; + + return ans; } - protected DateTime _dtStart = DateTime.Now.AddHours(-24); - protected DateTime dtStart - { - get => selFilter.dtMin; - set => selFilter.dtMin = value; - } - protected DateTime dtEnd - { - get => selFilter.dtMax; - set => selFilter.dtMax = value; - } - private bool isLoading { get; set; } = false; private async Task ReloadData() { -#if false - DateTime dtMax = dtStart == null ? DateTime.Now : (DateTime)dtStart; - DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; -#endif - isLoading = true; SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); totalCount = SearchRecordsFreq.Count; totalVar = SearchRecordsFreq.Sum(x => x.EventCount); calcolaSoglieFreq(); await Task.Delay(1); - isLoading = false; - } - public static DateTime RoundDatetime(int minRound) - { - TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today); - int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound; - DateTime endRounded = DateTime.Today.AddMinutes(minDay); - return endRounded; - } - protected override async Task OnInitializedAsync() - { -#if false - DateTime dtMax = dtStart == null ? DateTime.Now : (DateTime)dtStart; - DateTime dtMin = dtEnd == null ? DateTime.Now.AddDays(-2) : (DateTime)dtEnd; - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtStart); - ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); -#endif - await Task.Delay(1); } - protected override async Task OnParametersSetAsync() - { - await ReloadData(); - } - - private double sogliaGreen = 0; - private double sogliaRed = 1; - - private void calcolaSoglieFreq() - { - int numRecord = totalCount; - var firstRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.2)).FirstOrDefault(); - var lastRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.8)).FirstOrDefault(); - if (firstRecord != null) - { - sogliaGreen = (double)firstRecord.EventCount / totalVar; - } - if (lastRecord != null) - { - sogliaRed = (double)lastRecord.EventCount / totalVar; - } - } - protected string calcPercFreq(double numEvent) - { - string ans = $"{numEvent / totalVar:P2}"; - - return ans; - } - protected string valFreq(double eventCount) - { - int max = SearchRecordsFreq.Max(a => a.EventCount); - - double divisione = eventCount / max; - - int percentage = (int)(divisione * 100); - - string ans = $"width: {percentage}%"; - - return ans; - } - protected string styleColourPBarFreq(double eventFreq) + private string styleColourPBarFreq(double eventFreq) { string ans = ""; var source = ListRecordsFreq; @@ -168,9 +142,22 @@ namespace MP.MONO.UI.Components ans = "bg-warning"; } - return ans; } + private string valFreq(double eventCount) + { + string ans = ""; + if (SearchRecordsFreq != null) + { + int max = SearchRecordsFreq.Max(a => a.EventCount); + double divisione = eventCount / max; + int percentage = (int)(divisione * 100); + ans = $"width: {percentage}%"; + } + return ans; + } + + #endregion Private Methods } -} +} \ No newline at end of file diff --git a/MP.MONO.UI/Data/Utils.cs b/MP.MONO.UI/Data/Utils.cs new file mode 100644 index 0000000..ebf18b8 --- /dev/null +++ b/MP.MONO.UI/Data/Utils.cs @@ -0,0 +1,29 @@ +namespace MP.MONO.UI.Data +{ + public class Utils + { + #region Public Methods + + /// Inizializzazione con periodo e arrotondamento DataORa di riferimento Arrotondamento + /// desiderato Parametro arrotondamento: se > 0 per eccesso, + /// se <= 0 per difetto + public static DateTime RoundDatetime(DateTime dtRef, int minRound, int roundMode) + { + TimeSpan DayElapsed = dtRef.Subtract(dtRef.Date); + int minDay = 0; + if (roundMode > 0) + { + minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound; + } + else + { + minDay = (int)Math.Floor((double)(DayElapsed.TotalMinutes / minRound)) * minRound; + } + DateTime endRounded = dtRef.Date.AddMinutes(minDay); + return endRounded; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.MONO.UI/Data/selectChartParams.cs b/MP.MONO.UI/Data/selectChartParams.cs index 4017ec9..4161520 100644 --- a/MP.MONO.UI/Data/selectChartParams.cs +++ b/MP.MONO.UI/Data/selectChartParams.cs @@ -11,10 +11,29 @@ #region Public Properties + /// + /// Pagina corrente selezionata + /// public int CurrPage { get; set; } = 1; - public DateTime dtMax { get; set; } = DateTime.Now; - public DateTime dtMin { get; set; } = DateTime.Now.AddHours(-8); - public int MaxRecord { get; set; } = 100; + + /// + /// Data fine periodo + /// + public DateTime dtMax { get; set; } = Utils.RoundDatetime(DateTime.Now, 5, 1); + + /// + /// Data inizio periodo + /// + public DateTime dtMin { get; set; } = Utils.RoundDatetime(DateTime.Now.AddDays(-1), 5, 0); + + /// + /// Numero di record per pagina + /// + public int NumRecord { get; set; } = 10; + + /// + /// Bool: indica se sia richeista analisi per frequenza (vs durata) + /// public bool setFreqDur { get; set; } = true; #endregion Public Properties @@ -26,7 +45,7 @@ if (!(obj is selectChartParams item)) return false; - if (MaxRecord != item.MaxRecord) + if (NumRecord != item.NumRecord) return false; if (CurrPage != item.CurrPage) @@ -35,6 +54,12 @@ if (setFreqDur != item.setFreqDur) return false; + if (dtMax != item.dtMax) + return false; + + if (dtMin != item.dtMin) + return false; + return true; } diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index e99cc7b..daf2497 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.2209.2909 + 1.2.2209.2910 diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index be9f595..6ffba6a 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -8,24 +8,9 @@
              Alarm analysis
              -
              - +
              +
              - @*
              - Choose mode: -
              - - -
              -
              -
              -
              - - - - -
              -
              *@
              @@ -42,48 +27,6 @@ @if (setFreqDur) { - - @*
              -
              - - - - - - - - - - - @foreach (var record in ListRecordsFreq) - { - - - - - - - - } - -
              Alarm DescriptionAlarm Event CountEvent FrequencyEvent Frequency Chart
              -
              @record.AlarmDescription
              -               		-
              @record.EventCount
              -               		-
              - @if (totalVar != 0) - { - @calcPercFreq((double)record.EventCount) - } -
              -               		-
              -
              @record.EventCount
              -
              -
              -
              -
              *@ } else { diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index b160f6e..8a26984 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -221,20 +221,17 @@ namespace MP.MONO.UI.Pages #region Private Properties - private int _currPage { get; set; } = 1; private int _numRecord { get; set; } = 10; private selectChartParams currFilter { get; set; } = new selectChartParams(); private int currPage { - get => _currPage; + get => currFilter.CurrPage; set { - if (_currPage != value) + if (currFilter.CurrPage != value) { - _currPage = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); + currFilter.CurrPage = value; } } } @@ -243,14 +240,12 @@ namespace MP.MONO.UI.Pages private int numRecord { - get => _numRecord; + get => currFilter.NumRecord; set { - if (_numRecord != value) + if (currFilter.NumRecord != value) { - _numRecord = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); + currFilter.NumRecord = value; } } } diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index ca28121..25d5984 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

              Version: 1.2.2209.2909

              +

              Version: 1.2.2209.2910


              Release Note:
              • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 45cf11e..7a97854 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2909 +1.2.2209.2910 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 48c03a9..a2db065 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2909 + 1.2.2209.2910 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 From 5f7d2ab1aeffe61e4bbf4640e53b4e58f0042173 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 29 Sep 2022 11:06:01 +0200 Subject: [PATCH 09/57] aggiunta componente alarmDur + cleanUp --- MP.MONO.UI/Components/ListDurAlarms.razor | 56 ++++++ MP.MONO.UI/Components/ListDurAlarms.razor.cs | 169 +++++++++++++++++++ MP.MONO.UI/Components/ListFreqAlarms.razor | 2 +- MP.MONO.UI/Conf/lic.file | 2 +- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/AlarmsAnalysis.razor | 58 +------ MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 157 +---------------- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- MP.MONO.UI/temp/InfoData.json | 66 ++++---- 11 files changed, 268 insertions(+), 250 deletions(-) create mode 100644 MP.MONO.UI/Components/ListDurAlarms.razor create mode 100644 MP.MONO.UI/Components/ListDurAlarms.razor.cs diff --git a/MP.MONO.UI/Components/ListDurAlarms.razor b/MP.MONO.UI/Components/ListDurAlarms.razor new file mode 100644 index 0000000..7a4edaa --- /dev/null +++ b/MP.MONO.UI/Components/ListDurAlarms.razor @@ -0,0 +1,56 @@ +
                +
                + @if (ListRecordsDur == null) + { + + } + else if (totalCount == 0) + { +
                Nessun record trovato
                + } + else + { +
                +
                + + + + + + + + + + + @foreach (var item in ListRecordsDur) + { + + + + + + + + } + +
                Alarm DescriptionAlarm DurationEvent DurationEvent Duration Chart
                +
                @item.AlarmDescription
                +                 		+
                @Math.Round(item.Duration,2)
                +                 		+
                + @if (totalVar != 0) + { + @calcPercDur((double)item.Duration) + } +
                +                 		+
                +
                @Math.Round(item.Duration,2)
                +
                +
                +
                +
                + } +
                +
                diff --git a/MP.MONO.UI/Components/ListDurAlarms.razor.cs b/MP.MONO.UI/Components/ListDurAlarms.razor.cs new file mode 100644 index 0000000..3a7084e --- /dev/null +++ b/MP.MONO.UI/Components/ListDurAlarms.razor.cs @@ -0,0 +1,169 @@ +using Microsoft.AspNetCore.Components; +using MP.MONO.Data.DTO; +using MP.MONO.UI.Data; + +namespace MP.MONO.UI.Components +{ + public partial class ListDurAlarms + { + #region Public Properties + + [Parameter] + public selectChartParams selFilter { get; set; } = null!; + + [Parameter] + public EventCallback TotRecordChanged { get; set; } + + #endregion Public Properties + + #region Protected Properties + + protected int currPage + { + get => selFilter.CurrPage; + } + + protected DateTime dtEnd + { + get => selFilter.dtMax; + } + + protected DateTime dtStart + { + get => selFilter.dtMin; + } + + protected List? ListRecordsDur { get; set; } = null; + protected List? SearchRecordsDur { get; set; } = null; + protected double totalVar { get; set; } = 0; + + #endregion Protected Properties + + #region Protected Methods + + protected override async Task OnInitializedAsync() + { + await Task.Delay(1); + } + + protected override async Task OnParametersSetAsync() + { + await ReloadData(); + } + + #endregion Protected Methods + + #region Private Fields + + private double sogliaGreen = 0; + + private double sogliaRed = 1; + + #endregion Private Fields + + #region Private Properties + + private int _totalCount { get; set; } = 0; + + private int numRecord + { + get => selFilter.NumRecord; + } + + private int totalCount + { + get => _totalCount; + set + { + if (_totalCount != value) + { + _totalCount = value; + TotRecordChanged.InvokeAsync(value); + } + } + } + + #endregion Private Properties + + #region Private Methods + + private void calcolaSoglieDur() + { + int numRecord = totalCount; + if (SearchRecordsDur != null) + { + + var firstRecord = SearchRecordsDur.Skip((int)(numRecord * 0.2)).FirstOrDefault(); + var lastRecord = SearchRecordsDur.Skip((int)(numRecord * 0.8)).FirstOrDefault(); + if (firstRecord != null) + { + sogliaGreen = (double)firstRecord.Duration / totalVar; + } + if (lastRecord != null) + { + sogliaRed = (double)lastRecord.Duration / totalVar; + } + } + } + + protected string calcPercDur(double duration) + { + string ans = $"{duration / totalVar:P2}"; + + return ans; + } + + private async Task ReloadData() + { + SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd); + ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + totalCount = SearchRecordsDur.Count; + totalVar = SearchRecordsDur.Sum(x => x.Duration); + //calcolaSoglieDur(); + await Task.Delay(1); + } + + protected string styleColourPBarDur(double duration) + { + string ans = ""; + //var source = ListRecordsDur; + + calcolaSoglieDur(); + + if (duration >= sogliaGreen) + { + ans = "bg-danger"; + } + else if (duration <= sogliaRed) + { + ans = "bg-success"; + } + else + { + ans = "bg-warning"; + } + + return ans; + } + + protected string valDur(double duration) + { + string ans = ""; + if (SearchRecordsDur != null) + { + + double max = SearchRecordsDur.Max(a => a.Duration); + + double divisione = duration / max; + + int percentage = (int)(divisione * 100); + + ans = $"width: {percentage}%"; + } + + return ans; + } + + #endregion Private Methods + } +} diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor b/MP.MONO.UI/Components/ListFreqAlarms.razor index add001d..41f2d3a 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor @@ -49,4 +49,4 @@ }
              -
        +
        \ No newline at end of file diff --git a/MP.MONO.UI/Conf/lic.file b/MP.MONO.UI/Conf/lic.file index 9540e9d..69f59a3 100644 --- a/MP.MONO.UI/Conf/lic.file +++ b/MP.MONO.UI/Conf/lic.file @@ -1 +1 @@ -31e9cc1c2e8f30a1b4098cb157d712f11f3f2e60fb74169a354c3fa646d6d0e28518b4e3139f844b25824fbcc4340051fc507d22c1c2d2786d3786c777c31cc3 \ No newline at end of file +467e4b24bc3fe9d237169aa274ae589b64f072fb1cd91f4d79aaee76c64afbfced7fb51536b62cf612dedfb304202a1e653778b7cc8c758f83bb058984460301 \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index daf2497..0c9560c 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.2209.2910 + 1.2.2209.2911 diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index 6ffba6a..bb68366 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -13,65 +13,13 @@
        - - @if ((ListRecordsFreq == null && setFreqDur) || (ListRecordsDur == null && !setFreqDur)) + @if (setFreqDur) { - - } - else if (totalCount == 0) - { -
        Nessun record trovato
        + } else { - @if (setFreqDur) - { - - } - else - { -
        -
        - - - - - - - - - - - @foreach (var item in ListRecordsDur) - { - - - - - - - - } - -
        Alarm DescriptionAlarm DurationEvent DurationEvent Duration Chart
        -
        @item.AlarmDescription
        -         		-
        @Math.Round(item.Duration,2)
        -         		-
        - @if (totalVar != 0) - { - @calcPercDur((double)item.Duration) - } -
        -         		-
        -
        @Math.Round(item.Duration,2)
        -
        -
        -
        -
        - } + }
        diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index 8a26984..03c1e58 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -52,20 +52,6 @@ namespace MP.MONO.UI.Pages #region Protected Methods - protected string calcPercDur(double duration) - { - string ans = $"{duration / totalVar:P2}"; - - return ans; - } - - protected string calcPercFreq(double numEvent) - { - string ans = $"{numEvent / totalVar:P2}"; - - return ans; - } - protected void ForceReload(int newNum) { numRecord = newNum; @@ -79,20 +65,6 @@ namespace MP.MONO.UI.Pages protected override async Task OnInitializedAsync() { numRecord = 10; -#if false - if (setFreqDur) - { - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); - ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - } - else - { - SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd); - ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - //calcolaSoglieDur(); - } - await ReloadData(); -#endif await Task.Delay(1); } @@ -114,52 +86,6 @@ namespace MP.MONO.UI.Pages currRecord = selRecord; } - protected string styleColourPBarDur(double duration) - { - string ans = ""; - //var source = ListRecordsDur; - - calcolaSoglieDur(); - - if (duration >= sogliaGreen) - { - ans = "bg-danger"; - } - else if (duration <= sogliaRed) - { - ans = "bg-success"; - } - else - { - ans = "bg-warning"; - } - - return ans; - } - - protected string styleColourPBarFreq(double eventFreq) - { - string ans = ""; - var source = ListRecordsFreq; - - calcolaSoglieFreq(); - - if (eventFreq >= sogliaGreen) - { - ans = "bg-danger"; - } - else if (eventFreq <= sogliaRed) - { - ans = "bg-success"; - } - else - { - ans = "bg-warning"; - } - - return ans; - } - protected async Task toggleRec() { setFreqDur = !setFreqDur; @@ -178,44 +104,12 @@ namespace MP.MONO.UI.Pages totalCount = newTotCount; } - protected string valDur(double duration) - { - double max = SearchRecordsDur.Max(a => a.Duration); - - double divisione = duration / max; - - int percentage = (int)(divisione * 100); - - string ans = $"width: {percentage}%"; - - return ans; - } - - protected string valFreq(double eventCount) - { - int max = SearchRecordsFreq.Max(a => a.EventCount); - - double divisione = eventCount / max; - - int percentage = (int)(divisione * 100); - - string ans = $"width: {percentage}%"; - - return ans; - } - #endregion Protected Methods #region Private Fields private AlarmFreqDTO? currRecord = null; - private List? ListRecordsDur = null; - private List? ListRecordsFreq = null; - private List? SearchRecordsDur = null; - private List? SearchRecordsFreq = null; - private double sogliaGreen = 0; - private double sogliaRed = 1; #endregion Private Fields @@ -252,63 +146,14 @@ namespace MP.MONO.UI.Pages #endregion Private Properties - //} - #region Private Methods - private void calcolaSoglieDur() - { - int numRecord = totalCount; - var firstRecord = SearchRecordsDur.Skip((int)(numRecord * 0.2)).FirstOrDefault(); - var lastRecord = SearchRecordsDur.Skip((int)(numRecord * 0.8)).FirstOrDefault(); - if (firstRecord != null) - { - sogliaGreen = (double)firstRecord.Duration / totalVar; - } - if (lastRecord != null) - { - sogliaRed = (double)lastRecord.Duration / totalVar; - } - } - private void calcolaSoglieFreq() - { - int numRecord = totalCount; - var firstRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.2)).FirstOrDefault(); - var lastRecord = SearchRecordsFreq.Skip((int)(numRecord * 0.8)).FirstOrDefault(); - if (firstRecord != null) - { - sogliaGreen = (double)firstRecord.EventCount / totalVar; - } - if (lastRecord != null) - { - sogliaRed = (double)lastRecord.EventCount / totalVar; - } - } private async Task ReloadData() { isLoading = true; - DateTime adesso = DateTime.Now; - //SearchRecords = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, adesso.AddHours(-numHourPrev), adesso); - if (setFreqDur) - { - SearchRecordsFreq = CurrentDataService.dbController.AlarmRecGetParetoFreq(1, dtStart, dtEnd); - ListRecordsFreq = SearchRecordsFreq.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - totalCount = SearchRecordsFreq.Count; - totalVar = SearchRecordsFreq.Sum(x => x.EventCount); - //calcolaSoglieFreq(); - await Task.Delay(1); - } - else - { - SearchRecordsDur = CurrentDataService.dbController.AlarmRecGetParetoDur(1, dtStart, dtEnd); - ListRecordsDur = SearchRecordsDur.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - totalCount = SearchRecordsDur.Count; - totalVar = SearchRecordsDur.Sum(x => x.Duration); - //calcolaSoglieDur(); - await Task.Delay(1); - } + await Task.Delay(1); isLoading = false; } diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 25d5984..8f1c8aa 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

        Version: 1.2.2209.2910

        +

        Version: 1.2.2209.2911


        Release Note:
        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 7a97854..9c94ee4 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2910 +1.2.2209.2911 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index a2db065..bf29c0e 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2910 + 1.2.2209.2911 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/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json index efd270d..69b8ff9 100644 --- a/MP.MONO.UI/temp/InfoData.json +++ b/MP.MONO.UI/temp/InfoData.json @@ -2,55 +2,55 @@ "AdapterType": "Ethernet 802.3", "AddressWidth": "64", "Architecture": "9", - "BiosVersion": "ALASKA - 1072009", - "BuildNumber": "19044", - "Caption": "Microsoft Windows 10 Pro N", - "ConfiguredClockSpeed": "3600", + "BiosVersion": "_ASUS_ - 1072009", + "BuildNumber": "19043", + "Caption": "Microsoft Windows 10 Pro", + "ConfiguredClockSpeed": "2400", "ConfiguredVoltage": "1200", "CpuVersion": "Modello 1, Stepping 0", - "CurrentClockSpeed": "3501", - "CurrentVoltage": "11", + "CurrentClockSpeed": "2200", + "CurrentVoltage": "12", "DataWidth": "64", - "Description": "AMD64 Family 23 Model 113 Stepping 0", - "DeviceLocator": "DIMM 1", + "Description": "AMD64 Family 23 Model 17 Stepping 0", + "DeviceLocator": "ChannelA-DIMM0", "ExtClock": "100", "Family": "107", - "FormFactor": "8", - "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}", - "L2CacheSize": "8192", - "L3CacheSize": "65536", + "FormFactor": "12", + "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}", + "L2CacheSize": "2048", + "L3CacheSize": "4096", "Level": "23", - "LoadPercentage": "62", - "MACAddress": "0C:9D:92:B8:FD:E8", - "Manufacturer": "American Megatrends International, LLC.", + "LoadPercentage": "2", + "MACAddress": "4C:ED:FB:D9:78:83", + "Manufacturer": "American Megatrends Inc.", "MaxNumberOfProcesses": "4294967295", "MaxProcessMemorySize": "137438953344", "MaxVoltage": "1200", "MinVoltage": "1200", - "Name": "ASUS XG-C100C 10G PCI-E Network Adapter", - "NumberOfCores": "16", - "NumberOfLogicalProcessors": "32", + "Name": "Realtek PCIe GbE Family Controller", + "NumberOfCores": "4", + "NumberOfLogicalProcessors": "8", "OSArchitecture": "64 bit", - "PartNumber": "CMK64GX4M2D3600C18", + "PartNumber": "8ATF1G64HZ-2G3E1 ", "PhysicalAdapter": "True", - "ProcessorId": "178BFBFF00870F10", + "ProcessorId": "178BFBFF00810F10", "ProcessorType": "3", - "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter", - "ReleaseDate": "20210521000000.000000+000", - "Revision": "28928", + "ProductName": "Realtek PCIe GbE Family Controller", + "ReleaseDate": "20190521000000.000000+000", + "Revision": "4352", "Role": "CPU", - "SerialNumber": "00332-00332-17209-AA940", - "ServiceName": "aqnic650", - "SMBIOSBIOSVersion": "F33", + "SerialNumber": "00330-80951-85780-AA242", + "ServiceName": "rt640x64", + "SMBIOSBIOSVersion": "X505ZA.311", "SMBIOSMajorVersion": "3", "SMBIOSMemoryType": "26", - "SMBIOSMinorVersion": "3", - "SocketDesignation": "AM4", - "SoftwareElementID": "F33", + "SMBIOSMinorVersion": "1", + "SocketDesignation": "FP5", + "SoftwareElementID": "X505ZA.311", "SoftwareElementState": "3", - "Speed": "3600", + "Speed": "2400", "SystemBiosMajorVersion": "5", - "SystemBiosMinorVersion": "17", - "SystemName": "WRKST-R9-SAM", - "Version": "10.0.19044" + "SystemBiosMinorVersion": "13", + "SystemName": "EGALW-NB-004", + "Version": "10.0.19043" } \ No newline at end of file From a988fd00eaec45224dca0949ebec4313263f1dae Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Sep 2022 11:29:39 +0200 Subject: [PATCH 10/57] minor update grafico : - standardizzare testate --- 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.UI/Pages/Alarms.razor | 33 ++++++++++++++--------- MP.MONO.UI/Pages/Alarms.razor.cs | 7 +++++ 14 files changed, 40 insertions(+), 24 deletions(-) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index df3f193..8840fe2 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.2209.2910 + 1.2.2209.2911 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 25d5984..8f1c8aa 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

          Version: 1.2.2209.2910

          +

          Version: 1.2.2209.2911


          Release Note:
          • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index 7a97854..9c94ee4 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2910 +1.2.2209.2911 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 4f14dc9..4366dea 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2910 + 1.2.2209.2911 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 7cbfebf..05e7727 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.2209.2910 + 1.2.2209.2911 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 25d5984..8f1c8aa 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

            Version: 1.2.2209.2910

            +

            Version: 1.2.2209.2911


            Release Note:
            • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index 7a97854..9c94ee4 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2910 +1.2.2209.2911 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 3bae80a..1532ddd 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2910 + 1.2.2209.2911 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 8acc5b5..12de151 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.2209.2910 + 1.2.2209.2911 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 25d5984..8f1c8aa 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

              Version: 1.2.2209.2910

              +

              Version: 1.2.2209.2911


              Release Note:
              • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 7a97854..9c94ee4 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2910 +1.2.2209.2911 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 4376d9f..c201862 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2910 + 1.2.2209.2911 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/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index d4ea0f3..cd46504 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -16,17 +16,26 @@
                -
                - -
                -
                -
                -
                -
                - Last Records: + @if (showParams) + { +
                +
                + Last Records: +
                + + + +
                - -
                + + + } + else + { +
                + +
                + }
                @@ -81,8 +90,8 @@
                Alarm History
                @*
                *@ -
                + height: 30px;">
        *@ +
        Choose mode:
        diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index d6f3ef5..00cf108 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -255,5 +255,12 @@ namespace MP.MONO.UI.Pages } #endregion Private Properties + + private bool showParams = false; + + private void toggleShowParams() + { + showParams = !showParams; + } } } \ No newline at end of file From ded55b95008be59d68bf62bbbdae7753af0ba4f1 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 29 Sep 2022 11:38:57 +0200 Subject: [PATCH 11/57] fix ShowParams padding --- MP.MONO.UI/Pages/Alarms.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index cd46504..be2edcd 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -15,7 +15,7 @@
        -
        +
        @if (showParams) {
        From 9721762a3ef362c793fe86e3ae0ae1ec327735ab Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 29 Sep 2022 13:03:28 +0200 Subject: [PATCH 12/57] modifiche grafiche varie --- MP.MONO.UI/Components/AlAnFilter.razor | 27 +++++++++++----- MP.MONO.UI/Components/AlAnFilter.razor.cs | 6 ++++ MP.MONO.UI/Components/MaintTaskPending.razor | 31 +++++++++++++------ .../Components/MaintTaskPending.razor.cs | 6 ++++ MP.MONO.UI/Components/MaintTaskSched.razor.cs | 1 + MP.MONO.UI/Pages/Alarms.razor | 8 ++--- MP.MONO.UI/Pages/AlarmsAnalysis.razor | 6 ++-- 7 files changed, 60 insertions(+), 25 deletions(-) diff --git a/MP.MONO.UI/Components/AlAnFilter.razor b/MP.MONO.UI/Components/AlAnFilter.razor index fd30e18..e0f92f4 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor +++ b/MP.MONO.UI/Components/AlAnFilter.razor @@ -1,18 +1,29 @@ 
        -
        +
        Choose mode:
        -
        -
        - - - - -
        +
        + @if (showParams) + { + +
        + + + + + +
        + } + else + { +
        + +
        + }
        diff --git a/MP.MONO.UI/Components/AlAnFilter.razor.cs b/MP.MONO.UI/Components/AlAnFilter.razor.cs index 49b7c60..e55b1b5 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor.cs +++ b/MP.MONO.UI/Components/AlAnFilter.razor.cs @@ -113,5 +113,11 @@ namespace MP.MONO.UI.Components } #endregion Private Methods + private bool showParams = false; + + private void toggleShowParams() + { + showParams = !showParams; + } } } \ No newline at end of file diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor b/MP.MONO.UI/Components/MaintTaskPending.razor index 011effd..03528e5 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor +++ b/MP.MONO.UI/Components/MaintTaskPending.razor @@ -23,16 +23,27 @@
        -
        - Limit Period - - -
        + @if (showParams) + { + +
        + Limit Period + + + +
        + } + else + { +
        + +
        + }
        diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor.cs b/MP.MONO.UI/Components/MaintTaskPending.razor.cs index 2a313bb..5663de7 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor.cs +++ b/MP.MONO.UI/Components/MaintTaskPending.razor.cs @@ -250,5 +250,11 @@ namespace MP.MONO.UI.Components } #endregion Private Methods + private bool showParams = false; + + private void toggleShowParams() + { + showParams = !showParams; + } } } \ No newline at end of file diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor.cs b/MP.MONO.UI/Components/MaintTaskSched.razor.cs index a01dad3..15edb8d 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor.cs +++ b/MP.MONO.UI/Components/MaintTaskSched.razor.cs @@ -278,5 +278,6 @@ namespace MP.MONO.UI.Components } #endregion Private Methods + } } \ No newline at end of file diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index be2edcd..bda0d89 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -18,22 +18,22 @@
        @if (showParams) { -
        +
        Last Records:
        - +
        } else { -
        - +
        +
        }
        diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor b/MP.MONO.UI/Pages/AlarmsAnalysis.razor index bb68366..6f74da3 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor @@ -4,9 +4,9 @@ @using MP.MONO.UI.Components
        -
        -
        -
        Alarm analysis
        +
        +
        +

        Alarm analysis

        From 289c2d51121892fe9095bb4b3771e1c700a32a0b Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 29 Sep 2022 16:19:04 +0200 Subject: [PATCH 13/57] modifiche grafiche --- MP.MONO.UI/Components/MaintTaskPending.razor | 23 ++++---- .../Components/MaintTaskPending.razor.cs | 6 +++ MP.MONO.UI/Components/MaintTaskSched.razor | 53 ++++++++++++------- MP.MONO.UI/Components/MaintTaskSched.razor.cs | 10 +++- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Maintenance.razor | 1 + MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 9 files changed, 67 insertions(+), 34 deletions(-) diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor b/MP.MONO.UI/Components/MaintTaskPending.razor index 03528e5..78c662d 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor +++ b/MP.MONO.UI/Components/MaintTaskPending.razor @@ -11,22 +11,25 @@ @if (!compMode) {
        -
        -
        -
        -
        - +
        +
        +
        +
        +
        Maintenance's Task
        -
        -
        Maintenance's Task: Pending
        +
        +
        + + +
        -
        +
        @if (showParams) { -
        +
        Limit Period - +
        } else diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor.cs b/MP.MONO.UI/Components/MaintTaskPending.razor.cs index 5663de7..c572ee6 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor.cs +++ b/MP.MONO.UI/Components/MaintTaskPending.razor.cs @@ -54,6 +54,12 @@ namespace MP.MONO.UI.Components [Parameter] public EventCallback reqChangeMode { get; set; } + private bool doSetup = true; + protected string currMode + { + get => doSetup ? "Pending" : "Scheduled"; + } + #endregion Public Properties #region Private Properties diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor b/MP.MONO.UI/Components/MaintTaskSched.razor index 186431d..0ede7e4 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor +++ b/MP.MONO.UI/Components/MaintTaskSched.razor @@ -9,28 +9,44 @@
        -
        -
        -
        -
        - +
        +
        +
        +
        +
        Maintenance's Task
        -
        -
        Maintenance's Task: Scheduled
        +
        +
        + + +
        - + @if (showParams) + { +
        + + +
        + } + else + { +
        + +
        + }
        @@ -112,7 +128,8 @@ } else - { + { + } } diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor.cs b/MP.MONO.UI/Components/MaintTaskSched.razor.cs index 15edb8d..95335dc 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor.cs +++ b/MP.MONO.UI/Components/MaintTaskSched.razor.cs @@ -61,7 +61,7 @@ namespace MP.MONO.UI.Components private string addNewMessage { - get => showAddNew ? "Hide Add New Task" : "Show Add new Task"; + get => showAddNew ? "Hide Add New Task " : "Show Add new Task "; } private int currPage @@ -278,6 +278,12 @@ namespace MP.MONO.UI.Components } #endregion Private Methods - + private bool showParams = false; + + private void toggleShowParams() + { + showParams = !showParams; + } + } } \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 0c9560c..805065c 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.2209.2911 + 1.2.2209.2914 diff --git a/MP.MONO.UI/Pages/Maintenance.razor b/MP.MONO.UI/Pages/Maintenance.razor index 6d5dc84..438ace4 100644 --- a/MP.MONO.UI/Pages/Maintenance.razor +++ b/MP.MONO.UI/Pages/Maintenance.razor @@ -11,6 +11,7 @@ }
        +
        @code { diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 8f1c8aa..5a40318 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

        Version: 1.2.2209.2911

        +

        Version: 1.2.2209.2914


        Release Note:
        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 9c94ee4..9290bb2 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2911 +1.2.2209.2914 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index bf29c0e..6a6c780 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2911 + 1.2.2209.2914 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 From 710f082b34228f6e32842b33b1f4f55f535b19e8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Sep 2022 17:12:51 +0200 Subject: [PATCH 14/57] Minor refresh --- 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.UI/Components/AlAnFilter.razor | 4 +- MP.MONO.UI/Components/AlAnFilter.razor.cs | 2 +- MP.MONO.UI/Components/ListDurAlarms.razor | 8 +-- MP.MONO.UI/Components/ListFreqAlarms.razor | 8 +-- MP.MONO.UI/Components/MaintTaskPending.razor | 4 +- MP.MONO.UI/Components/MaintTaskSched.razor | 6 +- MP.MONO.UI/Conf/lic.file | 2 +- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Alarms.razor | 8 +-- MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs | 2 + MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- MP.MONO.UI/temp/InfoData.json | 66 ++++++++++---------- 26 files changed, 72 insertions(+), 70 deletions(-) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index 8840fe2..3e8015f 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.2209.2911 + 1.2.2209.2916 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 8f1c8aa..0651efc 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

          Version: 1.2.2209.2911

          +

          Version: 1.2.2209.2916


          Release Note:
          • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index 9c94ee4..dad9750 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2911 +1.2.2209.2916 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 4366dea..623a33e 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2911 + 1.2.2209.2916 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 05e7727..9cbc532 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.2209.2911 + 1.2.2209.2916 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 8f1c8aa..0651efc 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

            Version: 1.2.2209.2911

            +

            Version: 1.2.2209.2916


            Release Note:
            • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index 9c94ee4..dad9750 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2911 +1.2.2209.2916 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 1532ddd..ab716d3 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2911 + 1.2.2209.2916 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 12de151..eb2dc78 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.2209.2911 + 1.2.2209.2916 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 8f1c8aa..0651efc 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

              Version: 1.2.2209.2911

              +

              Version: 1.2.2209.2916


              Release Note:
              • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 9c94ee4..dad9750 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2911 +1.2.2209.2916 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index c201862..36f8bd0 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2911 + 1.2.2209.2916 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 e0f92f4..2fd92a5 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor +++ b/MP.MONO.UI/Components/AlAnFilter.razor @@ -1,9 +1,9 @@ 
                - Choose mode: + Mode:
                - +
                diff --git a/MP.MONO.UI/Components/AlAnFilter.razor.cs b/MP.MONO.UI/Components/AlAnFilter.razor.cs index e55b1b5..1de95aa 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor.cs +++ b/MP.MONO.UI/Components/AlAnFilter.razor.cs @@ -29,7 +29,7 @@ namespace MP.MONO.UI.Components protected string currMode { - get => setFreqDur ? "Alarm frequency" : "Alarm duration"; + get => setFreqDur ? "Frequency" : "Duration"; } protected bool setFreqDur diff --git a/MP.MONO.UI/Components/ListDurAlarms.razor b/MP.MONO.UI/Components/ListDurAlarms.razor index 7a4edaa..954dcf1 100644 --- a/MP.MONO.UI/Components/ListDurAlarms.razor +++ b/MP.MONO.UI/Components/ListDurAlarms.razor @@ -15,10 +15,10 @@ - - - - + + + + diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor b/MP.MONO.UI/Components/ListFreqAlarms.razor index 41f2d3a..85e0dde 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor @@ -13,10 +13,10 @@
                Alarm DescriptionAlarm DurationEvent DurationEvent Duration ChartDescriptionTotal Duration (min)% DurationChart
                - - - - + + + + diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor b/MP.MONO.UI/Components/MaintTaskPending.razor index 78c662d..7a50954 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor +++ b/MP.MONO.UI/Components/MaintTaskPending.razor @@ -15,12 +15,12 @@
                -
                Maintenance's Task
                +
                Maintenance's Pending Task
                - +
                diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor b/MP.MONO.UI/Components/MaintTaskSched.razor index 0ede7e4..57ea911 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor +++ b/MP.MONO.UI/Components/MaintTaskSched.razor @@ -8,17 +8,17 @@
                -
                +
                -
                Maintenance's Task
                +
                Maintenance's Task Setup
                - +
                diff --git a/MP.MONO.UI/Conf/lic.file b/MP.MONO.UI/Conf/lic.file index 69f59a3..9540e9d 100644 --- a/MP.MONO.UI/Conf/lic.file +++ b/MP.MONO.UI/Conf/lic.file @@ -1 +1 @@ -467e4b24bc3fe9d237169aa274ae589b64f072fb1cd91f4d79aaee76c64afbfced7fb51536b62cf612dedfb304202a1e653778b7cc8c758f83bb058984460301 \ No newline at end of file +31e9cc1c2e8f30a1b4098cb157d712f11f3f2e60fb74169a354c3fa646d6d0e28518b4e3139f844b25824fbcc4340051fc507d22c1c2d2786d3786c777c31cc3 \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 805065c..acd6b67 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.2209.2914 + 1.2.2209.2916 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index bda0d89..d2ecd11 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -19,10 +19,10 @@ @if (showParams) {
                -
                - Last Records: +
                + Num Records:
                - + @@ -221,7 +221,7 @@
                @record.AlarmListNav.FullValue
                + } + +
                Alarm DescriptionAlarm Event CountEvent FrequenceEvent Frequence ChartDescriptionCountFrequenceChart
                -
                FINISHED
                +
                CLOSED
                @TimeSpan.FromMinutes(@record.Duration).ToString(@"hh\:mm\:ss")
                diff --git a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs index 03c1e58..f0a68fc 100644 --- a/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs +++ b/MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs @@ -31,10 +31,12 @@ namespace MP.MONO.UI.Pages #region Protected Properties +#if false protected string currMode { get => setFreqDur ? "Alarm frequency" : "Alarm duration"; } +#endif protected DateTime dtEnd { diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 5a40318..0651efc 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                Version: 1.2.2209.2914

                +

                Version: 1.2.2209.2916


                Release Note:
                • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 9290bb2..dad9750 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2914 +1.2.2209.2916 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 6a6c780..be61ec1 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2914 + 1.2.2209.2916 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/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json index 69b8ff9..692ed5b 100644 --- a/MP.MONO.UI/temp/InfoData.json +++ b/MP.MONO.UI/temp/InfoData.json @@ -2,55 +2,55 @@ "AdapterType": "Ethernet 802.3", "AddressWidth": "64", "Architecture": "9", - "BiosVersion": "_ASUS_ - 1072009", - "BuildNumber": "19043", - "Caption": "Microsoft Windows 10 Pro", - "ConfiguredClockSpeed": "2400", + "BiosVersion": "ALASKA - 1072009", + "BuildNumber": "19044", + "Caption": "Microsoft Windows 10 Pro N", + "ConfiguredClockSpeed": "3600", "ConfiguredVoltage": "1200", "CpuVersion": "Modello 1, Stepping 0", - "CurrentClockSpeed": "2200", - "CurrentVoltage": "12", + "CurrentClockSpeed": "3501", + "CurrentVoltage": "11", "DataWidth": "64", - "Description": "AMD64 Family 23 Model 17 Stepping 0", - "DeviceLocator": "ChannelA-DIMM0", + "Description": "AMD64 Family 23 Model 113 Stepping 0", + "DeviceLocator": "DIMM 1", "ExtClock": "100", "Family": "107", - "FormFactor": "12", - "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}", - "L2CacheSize": "2048", - "L3CacheSize": "4096", + "FormFactor": "8", + "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}", + "L2CacheSize": "8192", + "L3CacheSize": "65536", "Level": "23", - "LoadPercentage": "2", - "MACAddress": "4C:ED:FB:D9:78:83", - "Manufacturer": "American Megatrends Inc.", + "LoadPercentage": "33", + "MACAddress": "0C:9D:92:B8:FD:E8", + "Manufacturer": "American Megatrends International, LLC.", "MaxNumberOfProcesses": "4294967295", "MaxProcessMemorySize": "137438953344", "MaxVoltage": "1200", "MinVoltage": "1200", - "Name": "Realtek PCIe GbE Family Controller", - "NumberOfCores": "4", - "NumberOfLogicalProcessors": "8", + "Name": "ASUS XG-C100C 10G PCI-E Network Adapter", + "NumberOfCores": "16", + "NumberOfLogicalProcessors": "32", "OSArchitecture": "64 bit", - "PartNumber": "8ATF1G64HZ-2G3E1 ", + "PartNumber": "CMK64GX4M2D3600C18", "PhysicalAdapter": "True", - "ProcessorId": "178BFBFF00810F10", + "ProcessorId": "178BFBFF00870F10", "ProcessorType": "3", - "ProductName": "Realtek PCIe GbE Family Controller", - "ReleaseDate": "20190521000000.000000+000", - "Revision": "4352", + "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter", + "ReleaseDate": "20210521000000.000000+000", + "Revision": "28928", "Role": "CPU", - "SerialNumber": "00330-80951-85780-AA242", - "ServiceName": "rt640x64", - "SMBIOSBIOSVersion": "X505ZA.311", + "SerialNumber": "00332-00332-17209-AA940", + "ServiceName": "aqnic650", + "SMBIOSBIOSVersion": "F33", "SMBIOSMajorVersion": "3", "SMBIOSMemoryType": "26", - "SMBIOSMinorVersion": "1", - "SocketDesignation": "FP5", - "SoftwareElementID": "X505ZA.311", + "SMBIOSMinorVersion": "3", + "SocketDesignation": "AM4", + "SoftwareElementID": "F33", "SoftwareElementState": "3", - "Speed": "2400", + "Speed": "3600", "SystemBiosMajorVersion": "5", - "SystemBiosMinorVersion": "13", - "SystemName": "EGALW-NB-004", - "Version": "10.0.19043" + "SystemBiosMinorVersion": "17", + "SystemName": "WRKST-R9-SAM", + "Version": "10.0.19044" } \ No newline at end of file From 45a8526d5758b5c6aabb16d74e3f696ace721e4c Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 30 Sep 2022 10:14:19 +0200 Subject: [PATCH 15/57] aggiunta filtro per data allarmi --- MP.MONO.Data/Controllers/MpDbController.cs | 64 +++++++++++++++++++ MP.MONO.UI/Components/MaintTaskPending.razor | 48 +++++++------- MP.MONO.UI/Components/MaintTaskSched.razor | 6 +- MP.MONO.UI/Conf/lic.file | 2 +- MP.MONO.UI/Data/CurrentDataService.cs | 46 +++++++++++++- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Alarms.razor | 10 +-- MP.MONO.UI/Pages/Alarms.razor.cs | 56 ++++++++++++++++- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- MP.MONO.UI/temp/InfoData.json | 66 ++++++++++---------- 12 files changed, 234 insertions(+), 72 deletions(-) diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs index 2c1d464..510890c 100644 --- a/MP.MONO.Data/Controllers/MpDbController.cs +++ b/MP.MONO.Data/Controllers/MpDbController.cs @@ -139,6 +139,37 @@ namespace MP.MONO.Data.Controllers } return dbResult; } + /// + /// Recupero elenco allarmi con data <= alla data di riferimento (ultimi dato "skip") + /// + /// + /// + /// + /// + /// + public List AlarmLogGetFiltByDate(int MachineId,DateTime dtRif, int skipRec, int numRec) + { + List dbResult = new List(); + using (MapoMonoContext localDbCtx = new MapoMonoContext()) + { + try + { + dbResult = localDbCtx + .DbSetAlarmLog + .Where(x => (x.MachineId == MachineId) && (x.DtRif <= dtRif)) + .Include(m => m.MachineNav) + .OrderByDescending(x => x.AlarmLogId) + .Skip(skipRec) + .Take(numRec) + .ToList(); + } + catch (Exception exc) + { + Log.Error($"Eccezione durante AlarmLogGetFilt{Environment.NewLine}{exc}"); + } + } + return dbResult; + } /// /// Inserimento di un record AlarmLog @@ -261,6 +292,39 @@ namespace MP.MONO.Data.Controllers return dbResult; } + /// + /// Recupero elenco allarmi Rec con data <= a quella di riferimento(ultimi dato "skip") + /// + /// + /// + /// + /// + /// + public List AlarmRecGetFiltByDate(int MachineId, DateTime dtRif, int skipRec, int numRec) + { + List dbResult = new List(); + using (MapoMonoContext localDbCtx = new MapoMonoContext()) + { + try + { + dbResult = localDbCtx + .DbSetAlarmRec + .Where(x => (x.MachineId == MachineId) && (x.DtStart <= dtRif)) + .Include(m => m.MachineNav) + .Include(m => m.AlarmListNav) + .OrderByDescending(x => x.DtStart) + .Skip(skipRec) + .Take(numRec) + .ToList(); + } + catch (Exception exc) + { + Log.Error($"Eccezione durante AlarmRecGetFilt{Environment.NewLine}{exc}"); + } + } + return dbResult; + } + /// /// Recupero lista sommatoria durata eventi allarme per analisi, ordinati in logica di /// pareto (Max-min) diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor b/MP.MONO.UI/Components/MaintTaskPending.razor index 7a50954..0c108f8 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor +++ b/MP.MONO.UI/Components/MaintTaskPending.razor @@ -19,34 +19,36 @@
                  - - + +
                  -
                  - @if (showParams) - { +
                  +
                  + @if (showParams) + { -
                  - Limit Period - - - -
                  - } - else - { -
                  - -
                  - } +
                  + Limit Period + + + +
                  + } + else + { +
                  + +
                  + } +
                  diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor b/MP.MONO.UI/Components/MaintTaskSched.razor index 57ea911..b63385c 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor +++ b/MP.MONO.UI/Components/MaintTaskSched.razor @@ -17,8 +17,8 @@
                  - - + +
                  @@ -27,7 +27,7 @@ @if (showParams) {
                  -
                  + /// + /// + /// + /// public async Task> AlarmLogGetFilt(int machineId, int skipRec, int numRec) { Stopwatch stopWatch = new Stopwatch(); @@ -116,6 +123,24 @@ namespace MP.MONO.UI.Data Log.Trace($"Effettuata lettura da DB AlarmLogGetFilt: {ts.TotalMilliseconds} ms"); return await Task.FromResult(dbResult); } + /// + /// Recupero elenco allarmi con data <= alla data di riferimento (ultimi dati "skip") + /// + /// + /// + /// + /// + /// + public async Task> AlarmLogGetFiltByDate(int machineId, DateTime dtRif, int skipRec, int numRec) + { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + var dbResult = dbController.AlarmLogGetFiltByDate(machineId, dtRif, skipRec, numRec); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Trace($"Effettuata lettura da DB AlarmLogGetFilt: {ts.TotalMilliseconds} ms"); + return await Task.FromResult(dbResult); + } /// /// Chiude ultimo record dato Id (se fossero + di 1 chiude tutti...) @@ -151,6 +176,25 @@ namespace MP.MONO.UI.Data return await Task.FromResult(dbResult); } + /// + /// Recupero elenco allarmi Rec con data <= alla data di riferimento (ultimi dato "skip") + /// + /// + /// + /// + /// + /// + public async Task> AlarmRecGetFiltByDate(int MachineId, DateTime dtRif, int skipRec, int numRec) + { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + var dbResult = dbController.AlarmRecGetFiltByDate(MachineId, dtRif, skipRec, numRec); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Trace($"Effettuata lettura da DB AlarmRecGetFilt: {ts.TotalMilliseconds} ms"); + return await Task.FromResult(dbResult); + } + /// /// Recupero lista sommatoria durata eventi allarme per analisi, ordinati in logica di /// pareto (Max-min) diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index acd6b67..7cd5aaf 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.2209.2916 + 1.2.2209.3009 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index d2ecd11..6e45524 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -19,12 +19,12 @@ @if (showParams) {
                  -
                  - Num Records: -
                  - - + Num Records: + + @**@ + +
                  diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index 00cf108..f30d079 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -16,7 +16,7 @@ namespace MP.MONO.UI.Pages public bool liveUpdate { get; set; } = true; public bool setLogRec { get; set; } = true; - public string lastUpdate { get; set; } = "-"; + public string lastUpdate { get; set; } = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}"; protected string currMode { get => setLogRec ? "Status history" : "Single Rec"; @@ -76,6 +76,32 @@ namespace MP.MONO.UI.Pages } } } + private DateTime _dtRif = DateTime.Now; + private DateTime dtRif + { + get + { + return _dtRif; + } + set + { + if (_dtRif != value) + { + _dtRif = value; + DateTime adesso = DateTime.Now.AddSeconds(1); + if (!liveUpdate) + { + lastUpdate = $"Last Snapshot: {adesso:yyyy/MM/dd HH:mm:ss}"; + } + else + { + liveUpdate = false; + } + var pUpd = Task.Run(async () => await ReloadData(true)); + pUpd.Wait(); + } + } + } protected int RefreshPeriod { get; set; } = 2000; private int totalCount { @@ -102,6 +128,14 @@ namespace MP.MONO.UI.Pages protected void ForceReloadPage(int newNum) { currPage = newNum; + liveUpdate = !liveUpdate; + DateTime adesso = DateTime.Now.AddSeconds(1); + + liveUpdate = (currPage == 1); + lastUpdate = liveUpdate ? "-" : $"{adesso:yyyy/MM/dd HH:mm:ss}"; + + showParams = (currPage != 1); + StateHasChanged(); } protected override async Task OnInitializedAsync() @@ -118,7 +152,7 @@ namespace MP.MONO.UI.Pages SearchRecordsREC = await MMDataService.AlarmRecGetFilt(MachineId, 0, MaxRecord); ListRecordsREC = SearchRecordsREC.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); } - await ReloadData(true); + await ReloadData(true); } protected async Task ReloadData(bool setChanged) @@ -131,9 +165,11 @@ namespace MP.MONO.UI.Pages //ListRecordsREC = null; if (setLogRec) { + SearchRecords = await MMDataService.AlarmLogGetFilt(MachineId, 0, MaxRecord); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); + } else { @@ -143,6 +179,21 @@ namespace MP.MONO.UI.Pages } } + else + { + if (setLogRec) + { + SearchRecords = await MMDataService.AlarmLogGetFiltByDate(MachineId, dtRif, 0, MaxRecord); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await Task.Delay(1); + } + else + { + SearchRecordsREC = await MMDataService.AlarmRecGetFiltByDate(MachineId, dtRif, 0, MaxRecord); + ListRecordsREC = SearchRecordsREC.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await Task.Delay(1); + } + } await Task.Delay(1); isLoading = false; } @@ -192,6 +243,7 @@ namespace MP.MONO.UI.Pages { lastUpdate = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}"; } + dtRif = DateTime.Now; await ReloadData(true); } protected async Task toggleRec() diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 0651efc..57fcef2 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                  Version: 1.2.2209.2916

                  +

                  Version: 1.2.2209.3009


                  Release Note:
                  • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index dad9750..76b015a 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2916 +1.2.2209.3009 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index be61ec1..cde1fce 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2916 + 1.2.2209.3009 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/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json index 692ed5b..0c494e3 100644 --- a/MP.MONO.UI/temp/InfoData.json +++ b/MP.MONO.UI/temp/InfoData.json @@ -2,55 +2,55 @@ "AdapterType": "Ethernet 802.3", "AddressWidth": "64", "Architecture": "9", - "BiosVersion": "ALASKA - 1072009", - "BuildNumber": "19044", - "Caption": "Microsoft Windows 10 Pro N", - "ConfiguredClockSpeed": "3600", + "BiosVersion": "_ASUS_ - 1072009", + "BuildNumber": "19043", + "Caption": "Microsoft Windows 10 Pro", + "ConfiguredClockSpeed": "2400", "ConfiguredVoltage": "1200", "CpuVersion": "Modello 1, Stepping 0", - "CurrentClockSpeed": "3501", - "CurrentVoltage": "11", + "CurrentClockSpeed": "2200", + "CurrentVoltage": "12", "DataWidth": "64", - "Description": "AMD64 Family 23 Model 113 Stepping 0", - "DeviceLocator": "DIMM 1", + "Description": "AMD64 Family 23 Model 17 Stepping 0", + "DeviceLocator": "ChannelA-DIMM0", "ExtClock": "100", "Family": "107", - "FormFactor": "8", - "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}", - "L2CacheSize": "8192", - "L3CacheSize": "65536", + "FormFactor": "12", + "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}", + "L2CacheSize": "2048", + "L3CacheSize": "4096", "Level": "23", - "LoadPercentage": "33", - "MACAddress": "0C:9D:92:B8:FD:E8", - "Manufacturer": "American Megatrends International, LLC.", + "LoadPercentage": "30", + "MACAddress": "4C:ED:FB:D9:78:83", + "Manufacturer": "American Megatrends Inc.", "MaxNumberOfProcesses": "4294967295", "MaxProcessMemorySize": "137438953344", "MaxVoltage": "1200", "MinVoltage": "1200", - "Name": "ASUS XG-C100C 10G PCI-E Network Adapter", - "NumberOfCores": "16", - "NumberOfLogicalProcessors": "32", + "Name": "Realtek PCIe GbE Family Controller", + "NumberOfCores": "4", + "NumberOfLogicalProcessors": "8", "OSArchitecture": "64 bit", - "PartNumber": "CMK64GX4M2D3600C18", + "PartNumber": "8ATF1G64HZ-2G3E1 ", "PhysicalAdapter": "True", - "ProcessorId": "178BFBFF00870F10", + "ProcessorId": "178BFBFF00810F10", "ProcessorType": "3", - "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter", - "ReleaseDate": "20210521000000.000000+000", - "Revision": "28928", + "ProductName": "Realtek PCIe GbE Family Controller", + "ReleaseDate": "20190521000000.000000+000", + "Revision": "4352", "Role": "CPU", - "SerialNumber": "00332-00332-17209-AA940", - "ServiceName": "aqnic650", - "SMBIOSBIOSVersion": "F33", + "SerialNumber": "00330-80951-85780-AA242", + "ServiceName": "rt640x64", + "SMBIOSBIOSVersion": "X505ZA.311", "SMBIOSMajorVersion": "3", "SMBIOSMemoryType": "26", - "SMBIOSMinorVersion": "3", - "SocketDesignation": "AM4", - "SoftwareElementID": "F33", + "SMBIOSMinorVersion": "1", + "SocketDesignation": "FP5", + "SoftwareElementID": "X505ZA.311", "SoftwareElementState": "3", - "Speed": "3600", + "Speed": "2400", "SystemBiosMajorVersion": "5", - "SystemBiosMinorVersion": "17", - "SystemName": "WRKST-R9-SAM", - "Version": "10.0.19044" + "SystemBiosMinorVersion": "13", + "SystemName": "EGALW-NB-004", + "Version": "10.0.19043" } \ No newline at end of file From f89ce06f1b0e47fb498c29d197c0161ae7fbd7e0 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 30 Sep 2022 10:35:16 +0200 Subject: [PATCH 16/57] Modifiche grafiche --- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Alarms.razor | 13 ++++++++++--- MP.MONO.UI/Pages/Alarms.razor.cs | 8 +++++--- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 7cd5aaf..19e99df 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.2209.3009 + 1.2.2209.3010 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index 6e45524..469d6df 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -19,9 +19,16 @@ @if (showParams) {
                    - - Num Records: - + @if (!maxRecordStatus) + { + Num Records: + + } + else + { + Num Records: + + } @**@ diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index f30d079..74c8f01 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -17,6 +17,7 @@ namespace MP.MONO.UI.Pages public bool liveUpdate { get; set; } = true; public bool setLogRec { get; set; } = true; public string lastUpdate { get; set; } = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}"; + private bool maxRecordStatus { get; set; } = false; protected string currMode { get => setLogRec ? "Status history" : "Single Rec"; @@ -96,6 +97,7 @@ namespace MP.MONO.UI.Pages else { liveUpdate = false; + maxRecordStatus = true; } var pUpd = Task.Run(async () => await ReloadData(true)); pUpd.Wait(); @@ -125,6 +127,8 @@ namespace MP.MONO.UI.Pages numRecord = newNum; } + + protected void ForceReloadPage(int newNum) { currPage = newNum; @@ -133,8 +137,6 @@ namespace MP.MONO.UI.Pages liveUpdate = (currPage == 1); lastUpdate = liveUpdate ? "-" : $"{adesso:yyyy/MM/dd HH:mm:ss}"; - - showParams = (currPage != 1); StateHasChanged(); } @@ -238,12 +240,12 @@ namespace MP.MONO.UI.Pages protected async Task toggleUpdate() { liveUpdate = !liveUpdate; + maxRecordStatus = !maxRecordStatus; await Task.Delay(1); if (!liveUpdate) { lastUpdate = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}"; } - dtRif = DateTime.Now; await ReloadData(true); } protected async Task toggleRec() diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 57fcef2..916ac59 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                    Version: 1.2.2209.3009

                    +

                    Version: 1.2.2209.3010


                    Release Note:
                    • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 76b015a..01eee1a 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3009 +1.2.2209.3010 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index cde1fce..1bd064e 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3009 + 1.2.2209.3010 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 From 54bd85ca855b6d62c090a6571ed513865f91a599 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 30 Sep 2022 12:10:42 +0200 Subject: [PATCH 17/57] modifiche grafiche + fix reset filtro data allarmi --- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Alarms.razor | 4 +- MP.MONO.UI/Pages/Alarms.razor.cs | 24 +++++--- MP.MONO.UI/Pages/Parameters.razor | 85 +++++++++++++--------------- MP.MONO.UI/Pages/Parameters.razor.cs | 4 ++ MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 8 files changed, 65 insertions(+), 60 deletions(-) diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 19e99df..2603d25 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.2209.3010 + 1.2.2209.3012 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index 469d6df..16f8a80 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -30,8 +30,8 @@ } @**@ - - + +
                    diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index 74c8f01..6d54104 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -16,7 +16,7 @@ namespace MP.MONO.UI.Pages public bool liveUpdate { get; set; } = true; public bool setLogRec { get; set; } = true; - public string lastUpdate { get; set; } = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}"; + public string lastUpdate { get; set; } = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}"; private bool maxRecordStatus { get; set; } = false; protected string currMode { @@ -90,15 +90,19 @@ namespace MP.MONO.UI.Pages { _dtRif = value; DateTime adesso = DateTime.Now.AddSeconds(1); - if (!liveUpdate) - { - lastUpdate = $"Last Snapshot: {adesso:yyyy/MM/dd HH:mm:ss}"; - } - else + if(_dtRif.Date != adesso.Date) { liveUpdate = false; - maxRecordStatus = true; + if (!liveUpdate) + { + lastUpdate = $"{adesso:yyyy/MM/dd HH:mm:ss}"; + } + else + { + maxRecordStatus = true; + } } + var pUpd = Task.Run(async () => await ReloadData(true)); pUpd.Wait(); } @@ -244,7 +248,11 @@ namespace MP.MONO.UI.Pages await Task.Delay(1); if (!liveUpdate) { - lastUpdate = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}"; + lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}"; + } + else + { + dtRif = DateTime.Now; } await ReloadData(true); } diff --git a/MP.MONO.UI/Pages/Parameters.razor b/MP.MONO.UI/Pages/Parameters.razor index 92d09f5..3fe1854 100644 --- a/MP.MONO.UI/Pages/Parameters.razor +++ b/MP.MONO.UI/Pages/Parameters.razor @@ -2,60 +2,53 @@
                    -
                    - -
                    -
                    - Parameters - -
                    -
                    - - -
                    -
                    -
                    -
                    - +
                    +
                    +
                    +

                    Parameters

                    +
                    +
                    +
                    +
                    @if (showParam) { - @if (isRT) - { - Num Rec - - Sample Sec Time - - } - else - { -
                    +
                    + Reset charts + +
                    +
                    + + +
                    +
                    + @if (isRT) + { + Num Rec + + Sample Sec Time + + } + else + { Date From -
                    - -
                    + Date To -
                    - - } + + + } + +
                    + } + else + { +
                    + +
                    }
                    -
                    -
                    -
                    -
                    -
                    -
                    +
                    diff --git a/MP.MONO.UI/Pages/Parameters.razor.cs b/MP.MONO.UI/Pages/Parameters.razor.cs index 91fce93..d419fba 100644 --- a/MP.MONO.UI/Pages/Parameters.razor.cs +++ b/MP.MONO.UI/Pages/Parameters.razor.cs @@ -125,5 +125,9 @@ namespace MP.MONO.UI.Pages } #endregion Protected Methods + private void toggleShowParams() + { + showParam = !showParam; + } } } \ No newline at end of file diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 916ac59..6d16fad 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                    Version: 1.2.2209.3010

                    +

                    Version: 1.2.2209.3012


                    Release Note:
                    • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 01eee1a..c482ba4 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3010 +1.2.2209.3012 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 1bd064e..581c28e 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3010 + 1.2.2209.3012 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 From 27b4d3aa70d7df33643773b5b556fc85cbb21d92 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 30 Sep 2022 12:16:54 +0200 Subject: [PATCH 18/57] fix filtri enabled/disabled --- MP.MONO.UI/Pages/Alarms.razor.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index 6d54104..f3f178b 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -90,19 +90,20 @@ namespace MP.MONO.UI.Pages { _dtRif = value; DateTime adesso = DateTime.Now.AddSeconds(1); - if(_dtRif.Date != adesso.Date) + if (_dtRif.Date != adesso.Date) { liveUpdate = false; if (!liveUpdate) { lastUpdate = $"{adesso:yyyy/MM/dd HH:mm:ss}"; + maxRecordStatus = true; } else { - maxRecordStatus = true; + maxRecordStatus = false; } } - + var pUpd = Task.Run(async () => await ReloadData(true)); pUpd.Wait(); } @@ -131,7 +132,7 @@ namespace MP.MONO.UI.Pages numRecord = newNum; } - + protected void ForceReloadPage(int newNum) { @@ -244,7 +245,14 @@ namespace MP.MONO.UI.Pages protected async Task toggleUpdate() { liveUpdate = !liveUpdate; - maxRecordStatus = !maxRecordStatus; + if (liveUpdate) + { + maxRecordStatus = false; + } + else + { + maxRecordStatus = true; + } await Task.Delay(1); if (!liveUpdate) { From d5c49c48b16ee7b66238f784eed5d72f6359fc7a Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 30 Sep 2022 12:27:01 +0200 Subject: [PATCH 19/57] fix filtri parametri --- MP.MONO.UI/Pages/Alarms.razor.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index f3f178b..3f25f96 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -101,6 +101,7 @@ namespace MP.MONO.UI.Pages else { maxRecordStatus = false; + MaxRecord = 200; } } @@ -141,7 +142,17 @@ namespace MP.MONO.UI.Pages DateTime adesso = DateTime.Now.AddSeconds(1); liveUpdate = (currPage == 1); - lastUpdate = liveUpdate ? "-" : $"{adesso:yyyy/MM/dd HH:mm:ss}"; + //lastUpdate = liveUpdate ? "-" : $"{adesso:yyyy/MM/dd HH:mm:ss}"; + if (!liveUpdate) + { + lastUpdate = $"{adesso:yyyy/MM/dd HH:mm:ss}"; + maxRecordStatus = true; + } + else + { + maxRecordStatus = false; + MaxRecord = 200; + } StateHasChanged(); } @@ -247,19 +258,20 @@ namespace MP.MONO.UI.Pages liveUpdate = !liveUpdate; if (liveUpdate) { - maxRecordStatus = false; } else { - maxRecordStatus = true; } await Task.Delay(1); if (!liveUpdate) { lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}"; + maxRecordStatus = true; } else { + MaxRecord = 200; + maxRecordStatus = false; dtRif = DateTime.Now; } await ReloadData(true); From 944cdde2b17465fa7f608c12a0b6628dcf3eabd2 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 30 Sep 2022 12:57:50 +0200 Subject: [PATCH 20/57] minor fix --- MP.MONO.UI/Pages/Alarms.razor.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index 3f25f96..62650c7 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -256,12 +256,7 @@ namespace MP.MONO.UI.Pages protected async Task toggleUpdate() { liveUpdate = !liveUpdate; - if (liveUpdate) - { - } - else - { - } + currPage = 1; await Task.Delay(1); if (!liveUpdate) { From a635f46cffac3d15e6455f33fe05b1515235a958 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 30 Sep 2022 16:42:27 +0200 Subject: [PATCH 21/57] fix grafici --- MP.MONO.UI/Components/AlAnFilter.razor | 2 +- MP.MONO.UI/Components/AlAnFilter.razor.cs | 2 +- MP.MONO.UI/Components/MaintTaskPending.razor | 35 ++- MP.MONO.UI/Components/MaintTaskSched.razor | 230 +++++++++--------- MP.MONO.UI/Components/MaintTaskSched.razor.cs | 41 +++- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Alarms.razor | 8 +- MP.MONO.UI/Pages/Alarms.razor.cs | 2 +- MP.MONO.UI/Pages/Parameters.razor | 23 +- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 12 files changed, 204 insertions(+), 147 deletions(-) diff --git a/MP.MONO.UI/Components/AlAnFilter.razor b/MP.MONO.UI/Components/AlAnFilter.razor index 2fd92a5..82e520a 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor +++ b/MP.MONO.UI/Components/AlAnFilter.razor @@ -1,6 +1,6 @@ 
                      - Mode: + @*Mode:*@
                      diff --git a/MP.MONO.UI/Components/AlAnFilter.razor.cs b/MP.MONO.UI/Components/AlAnFilter.razor.cs index 1de95aa..ce6e04c 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor.cs +++ b/MP.MONO.UI/Components/AlAnFilter.razor.cs @@ -29,7 +29,7 @@ namespace MP.MONO.UI.Components protected string currMode { - get => setFreqDur ? "Frequency" : "Duration"; + get => setFreqDur ? "Frequency Mode" : "Duration Mode"; } protected bool setFreqDur diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor b/MP.MONO.UI/Components/MaintTaskPending.razor index 0c108f8..f96f847 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor +++ b/MP.MONO.UI/Components/MaintTaskPending.razor @@ -7,20 +7,22 @@ @inject IConfiguration Configuration; -
                      +
                      @if (!compMode) {
                      -
                      -
                      -
                      -
                      Maintenance's Pending Task
                      -
                      +
                      +
                      -
                      - - +
                      Maintenance's Pending Task
                      +
                      +
                      + + +
                      @@ -165,5 +167,20 @@ }
                      + + diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor b/MP.MONO.UI/Components/MaintTaskSched.razor index b63385c..af736b2 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor +++ b/MP.MONO.UI/Components/MaintTaskSched.razor @@ -7,46 +7,38 @@ @inject IJSRuntime JSRuntime -
                      +
                      -
                      -
                      Maintenance's Task Setup
                      -
                      -
                      -
                      - - +
                      +
                      Maintenance's Task Setup
                      +
                      +
                      + + +
                      - @if (showParams) - { -
                      - - -
                      - } - else - { -
                      - -
                      - } +
                      + +
                      @@ -61,100 +53,112 @@ } else { - @if (showAddNew) + @if (showAddNew || showEdit) { } - else - { -
                      -
                      - - - - - - @if (currPMTaskId == 0) - { - - - - - - } - - @if (currPMTaskId == 0) - { - - - - } - - - - @foreach (var record in ListRecords) +
                      +
                      +
                      IDTopicMachine GroupTeam in ChargeCounter VarExpyre (H)Job Description# Exec
                      + + + + + @if (currPMTaskId == 0) { - + + + + + + } + + @if (currPMTaskId == 0) + { + + + } + + + + + @foreach (var record in ListRecords) + { + + + + @if (currPMTaskId == 0) + { + + + + + + } + + + @if (currPMTaskId == 0) + { + + } + + @if (currPMTaskId == 0) + { - - @if (currPMTaskId == 0) - { - - - - - - } - - @if (currPMTaskId == 0) - { - - - - } - - } - -
                      ID
                      TopicMachine GroupTeam in ChargeCounter VarExpyre (H)Job Description# Exec
                      + @if (!record.IsDisabled) + { + + } + + @record.ExtIdx + @record.TopicNav.Description@record.MachGroupNav.Description@record.UserTeamNav.Description@record.CounterNav.Description@record.ExpiryVal@record.JobDescription@record.NumTaskDone + @if (record.NumTaskDone > 0) + { + + } + @if (!record.IsDisabled) { - + + } + else + { + } - @record.ExtIdx - @record.TopicNav.Description@record.MachGroupNav.Description@record.UserTeamNav.Description@record.CounterNav.Description@record.ExpiryVal@record.JobDescription@record.NumTaskDone - @if (record.NumTaskDone > 0) - { - - } - - @if (!record.IsDisabled) - { - - } - else - { - - } -
                      -
                      - @if (currPMTaskId > 0) - { -
                      - -
                      - } + } +
                - } + @if (currPMTaskId > 0) + { +
                + +
                + } +
                }
        - @if (!showAddNew) - { -
        - -
        - } +
        + +
        - + diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor.cs b/MP.MONO.UI/Components/MaintTaskSched.razor.cs index 95335dc..3d9d31d 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor.cs +++ b/MP.MONO.UI/Components/MaintTaskSched.razor.cs @@ -80,6 +80,7 @@ namespace MP.MONO.UI.Components } private int currPMTaskId { get; set; } = 0; + private int currPMTaskIdMod { get; set; } = 0; private bool isLoading { get; set; } = false; @@ -123,6 +124,7 @@ namespace MP.MONO.UI.Components private PrevMaintTaskModel? selRecord { get; set; } = null; private bool showAddNew { get; set; } = false; + private bool showEdit { get; set; } = false; private int totalCount { @@ -156,7 +158,22 @@ namespace MP.MONO.UI.Components private string cssCheckSel(int PMTaskId) { - return PMTaskId == currPMTaskId ? "table-primary" : ""; + string ans = ""; + + if((PMTaskId == currPMTaskId) || (PMTaskId == currPMTaskIdMod)) + { + ans = "table-primary"; + } + else + { + ans = ""; + } + + return ans; + } + private string cssCheckSelMod(int PMTaskId) + { + return PMTaskId == currPMTaskIdMod ? "table-primary" : ""; } /// @@ -203,8 +220,11 @@ namespace MP.MONO.UI.Components private async Task EditRecord(PrevMaintTaskModel cRec) { currRec = cRec; - showAddNew = true; + currPMTaskIdMod = cRec.PMTaskId; + currPMTaskId = 0; + //showAddNew = true; await Task.Delay(1); + showEdit = true; } /// @@ -255,6 +275,7 @@ namespace MP.MONO.UI.Components if (currRec != null) { currPMTaskId = currRec.PMTaskId; + currPMTaskIdMod = 0; } else { @@ -270,8 +291,22 @@ namespace MP.MONO.UI.Components private void toggleAddNew() { showAddNew = !showAddNew; + showEdit = !showEdit; // se mostro --> creo nuovo record... - if (showAddNew) + if (showEdit) + { + currRec = new PrevMaintTaskModel(); + } + } + + /// + /// Gestione aggiunta nuovo record intervento + /// + private void toggleEdit() + { + showEdit = !showEdit; + // se mostro --> creo nuovo record... + if (showEdit) { currRec = new PrevMaintTaskModel(); } diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 2603d25..3faf18b 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.2209.3012 + 1.2.2209.3015 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index 16f8a80..59dbb8c 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -18,15 +18,15 @@
        @if (showParams) { -
        +
        @if (!maxRecordStatus) { - Num Records: + Num Records: } else { - Num Records: + Num Records: } @**@ @@ -99,7 +99,7 @@ @*
        *@
        - Choose mode: + @*Choose mode:*@
        diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index 62650c7..0f468bf 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -20,7 +20,7 @@ namespace MP.MONO.UI.Pages private bool maxRecordStatus { get; set; } = false; protected string currMode { - get => setLogRec ? "Status history" : "Single Rec"; + get => setLogRec ? "Status History mode" : "Single Rec mode"; } public void Dispose() diff --git a/MP.MONO.UI/Pages/Parameters.razor b/MP.MONO.UI/Pages/Parameters.razor index 3fe1854..e3dc833 100644 --- a/MP.MONO.UI/Pages/Parameters.razor +++ b/MP.MONO.UI/Pages/Parameters.razor @@ -4,8 +4,18 @@
        -
        -

        Parameters

        +
        +

        Parameters

        +
        + Reset charts + +
        +
        + + +
        +
        +
        @@ -13,14 +23,6 @@ @if (showParam) {
        - Reset charts - -
        -
        - - -
        -
        @if (isRT) { Num Rec @@ -48,7 +50,6 @@
        -
        diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 6d16fad..371cffb 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

        Version: 1.2.2209.3012

        +

        Version: 1.2.2209.3015


        Release Note:
        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index c482ba4..32b7147 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3012 +1.2.2209.3015 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 581c28e..2147902 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3012 + 1.2.2209.3015 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 From 249fd9183455e53b09f8d2aeff8206f1d50c33c1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 30 Sep 2022 17:05:46 +0200 Subject: [PATCH 22/57] Update grafici vari --- 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.UI/Components/ParamOverview.razor | 29 ++++---- MP.MONO.UI/Conf/lic.file | 2 +- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Parameters.razor | 91 ++++++++++++----------- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- MP.MONO.UI/temp/InfoData.json | 66 ++++++++-------- 20 files changed, 114 insertions(+), 106 deletions(-) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index 3e8015f..e7dea64 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.2209.2916 + 1.2.2209.3016 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 0651efc..c36c0cf 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

          Version: 1.2.2209.2916

          +

          Version: 1.2.2209.3016


          Release Note:
          • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index dad9750..560a4dd 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2916 +1.2.2209.3016 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 623a33e..d087af5 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2916 + 1.2.2209.3016 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 9cbc532..954777b 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.2209.2916 + 1.2.2209.3016 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 0651efc..c36c0cf 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

            Version: 1.2.2209.2916

            +

            Version: 1.2.2209.3016


            Release Note:
            • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index dad9750..560a4dd 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2916 +1.2.2209.3016 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index ab716d3..0478527 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2916 + 1.2.2209.3016 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 eb2dc78..c7d55f7 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.2209.2916 + 1.2.2209.3016 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 0651efc..c36c0cf 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

              Version: 1.2.2209.2916

              +

              Version: 1.2.2209.3016


              Release Note:
              • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index dad9750..560a4dd 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.2916 +1.2.2209.3016 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 36f8bd0..d8f302d 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.2916 + 1.2.2209.3016 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/ParamOverview.razor b/MP.MONO.UI/Components/ParamOverview.razor index 393690f..4caf01c 100644 --- a/MP.MONO.UI/Components/ParamOverview.razor +++ b/MP.MONO.UI/Components/ParamOverview.razor @@ -10,13 +10,12 @@ @foreach (var item in ListRecords) {
              • -
                -
                +
                +
                @if (!string.IsNullOrEmpty(item.CssIcon)) {
                -
                @item.Title
                -
                +
                @item.Title
                } else @@ -24,19 +23,21 @@
                @item.Title
                }
                -
                +
                -
                @item.Value
                - @if (item.ShowBar) - { -
                -
                -
                -
                -
                - } +
                 @item.Value
                +
                + @if (item.ShowBar) + { +
                +
                +
                +
                +
                + } +
                • } diff --git a/MP.MONO.UI/Conf/lic.file b/MP.MONO.UI/Conf/lic.file index 69f59a3..9540e9d 100644 --- a/MP.MONO.UI/Conf/lic.file +++ b/MP.MONO.UI/Conf/lic.file @@ -1 +1 @@ -467e4b24bc3fe9d237169aa274ae589b64f072fb1cd91f4d79aaee76c64afbfced7fb51536b62cf612dedfb304202a1e653778b7cc8c758f83bb058984460301 \ No newline at end of file +31e9cc1c2e8f30a1b4098cb157d712f11f3f2e60fb74169a354c3fa646d6d0e28518b4e3139f844b25824fbcc4340051fc507d22c1c2d2786d3786c777c31cc3 \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 3faf18b..18dad4e 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.2209.3015 + 1.2.2209.3016 diff --git a/MP.MONO.UI/Pages/Parameters.razor b/MP.MONO.UI/Pages/Parameters.razor index e3dc833..339ddb9 100644 --- a/MP.MONO.UI/Pages/Parameters.razor +++ b/MP.MONO.UI/Pages/Parameters.razor @@ -3,50 +3,57 @@
                -
                -
                -

                Parameters

                -
                - Reset charts - -
                -
                - - +
                +
                +
                +

                Parameters

                +
                +
                + +
                +
                +
                +
                +
                +
                +
                + + +
                -
                -
                -
                -
                - @if (showParam) - { -
                - @if (isRT) - { - Num Rec - - Sample Sec Time - - } - else - { - Date From - - Date To - +
                +
                +
                + @if (showParam) + { +
                + @if (isRT) + { + Num Rec + + Sample Sec Time + + } + else + { + Date From + + Date To + - } - -
                - } - else - { -
                - -
                - } + } + +
                + } + else + { +
                + +
                + } +
                @@ -55,10 +62,10 @@
                -
                +
                -
                +
                @if (selParams == null || selParams.Count == 0) {

                ← please select an item to plot graph

                diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 371cffb..c36c0cf 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                Version: 1.2.2209.3015

                +

                Version: 1.2.2209.3016


                Release Note:
                • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 32b7147..560a4dd 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3015 +1.2.2209.3016 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 2147902..4910661 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3015 + 1.2.2209.3016 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/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json index 0c494e3..ee8a3fa 100644 --- a/MP.MONO.UI/temp/InfoData.json +++ b/MP.MONO.UI/temp/InfoData.json @@ -2,55 +2,55 @@ "AdapterType": "Ethernet 802.3", "AddressWidth": "64", "Architecture": "9", - "BiosVersion": "_ASUS_ - 1072009", - "BuildNumber": "19043", - "Caption": "Microsoft Windows 10 Pro", - "ConfiguredClockSpeed": "2400", + "BiosVersion": "ALASKA - 1072009", + "BuildNumber": "19044", + "Caption": "Microsoft Windows 10 Pro N", + "ConfiguredClockSpeed": "3600", "ConfiguredVoltage": "1200", "CpuVersion": "Modello 1, Stepping 0", - "CurrentClockSpeed": "2200", - "CurrentVoltage": "12", + "CurrentClockSpeed": "3501", + "CurrentVoltage": "11", "DataWidth": "64", - "Description": "AMD64 Family 23 Model 17 Stepping 0", - "DeviceLocator": "ChannelA-DIMM0", + "Description": "AMD64 Family 23 Model 113 Stepping 0", + "DeviceLocator": "DIMM 1", "ExtClock": "100", "Family": "107", - "FormFactor": "12", - "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}", - "L2CacheSize": "2048", - "L3CacheSize": "4096", + "FormFactor": "8", + "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}", + "L2CacheSize": "8192", + "L3CacheSize": "65536", "Level": "23", - "LoadPercentage": "30", - "MACAddress": "4C:ED:FB:D9:78:83", - "Manufacturer": "American Megatrends Inc.", + "LoadPercentage": "91", + "MACAddress": "0C:9D:92:B8:FD:E8", + "Manufacturer": "American Megatrends International, LLC.", "MaxNumberOfProcesses": "4294967295", "MaxProcessMemorySize": "137438953344", "MaxVoltage": "1200", "MinVoltage": "1200", - "Name": "Realtek PCIe GbE Family Controller", - "NumberOfCores": "4", - "NumberOfLogicalProcessors": "8", + "Name": "ASUS XG-C100C 10G PCI-E Network Adapter", + "NumberOfCores": "16", + "NumberOfLogicalProcessors": "32", "OSArchitecture": "64 bit", - "PartNumber": "8ATF1G64HZ-2G3E1 ", + "PartNumber": "CMK64GX4M2D3600C18", "PhysicalAdapter": "True", - "ProcessorId": "178BFBFF00810F10", + "ProcessorId": "178BFBFF00870F10", "ProcessorType": "3", - "ProductName": "Realtek PCIe GbE Family Controller", - "ReleaseDate": "20190521000000.000000+000", - "Revision": "4352", + "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter", + "ReleaseDate": "20210521000000.000000+000", + "Revision": "28928", "Role": "CPU", - "SerialNumber": "00330-80951-85780-AA242", - "ServiceName": "rt640x64", - "SMBIOSBIOSVersion": "X505ZA.311", + "SerialNumber": "00332-00332-17209-AA940", + "ServiceName": "aqnic650", + "SMBIOSBIOSVersion": "F33", "SMBIOSMajorVersion": "3", "SMBIOSMemoryType": "26", - "SMBIOSMinorVersion": "1", - "SocketDesignation": "FP5", - "SoftwareElementID": "X505ZA.311", + "SMBIOSMinorVersion": "3", + "SocketDesignation": "AM4", + "SoftwareElementID": "F33", "SoftwareElementState": "3", - "Speed": "2400", + "Speed": "3600", "SystemBiosMajorVersion": "5", - "SystemBiosMinorVersion": "13", - "SystemName": "EGALW-NB-004", - "Version": "10.0.19043" + "SystemBiosMinorVersion": "17", + "SystemName": "WRKST-R9-SAM", + "Version": "10.0.19044" } \ No newline at end of file From 377711be194e6d668643237014660372be66f719 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 30 Sep 2022 17:09:32 +0200 Subject: [PATCH 23/57] Fix errore pag setup maintenance --- 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.UI/Components/EditMaintTask.razor.cs | 6 ++--- MP.MONO.UI/Components/MaintTaskSched.razor.cs | 26 ++++--------------- 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 +- 18 files changed, 24 insertions(+), 40 deletions(-) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index e7dea64..e94d345 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.2209.3016 + 1.2.2209.3017 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index c36c0cf..60b1307 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                  Version: 1.2.2209.3016

                  +

                  Version: 1.2.2209.3017


                  Release Note:
                  • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index 560a4dd..4126403 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3016 +1.2.2209.3017 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index d087af5..868ce8e 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3016 + 1.2.2209.3017 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 954777b..71b7a6b 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.2209.3016 + 1.2.2209.3017 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index c36c0cf..60b1307 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                    Version: 1.2.2209.3016

                    +

                    Version: 1.2.2209.3017


                    Release Note:
                    • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index 560a4dd..4126403 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3016 +1.2.2209.3017 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 0478527..f67b161 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3016 + 1.2.2209.3017 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 c7d55f7..72de50e 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.2209.3016 + 1.2.2209.3017 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index c36c0cf..60b1307 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                      Version: 1.2.2209.3016

                      +

                      Version: 1.2.2209.3017


                      Release Note:
                      • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 560a4dd..4126403 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3016 +1.2.2209.3017 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index d8f302d..e94815c 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3016 + 1.2.2209.3017 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/EditMaintTask.razor.cs b/MP.MONO.UI/Components/EditMaintTask.razor.cs index ad13da6..6c6c191 100644 --- a/MP.MONO.UI/Components/EditMaintTask.razor.cs +++ b/MP.MONO.UI/Components/EditMaintTask.razor.cs @@ -25,17 +25,17 @@ namespace MP.MONO.UI.Components #region Private Properties [Inject] - private IJSRuntime JSRuntime { get; set; } + private IJSRuntime JSRuntime { get; set; } = null!; [Inject] - private NavigationManager NavManager { get; set; } + private NavigationManager NavManager { get; set; } = null!; #endregion Private Properties #region Protected Properties [Inject] - protected CurrentDataService DataService { get; set; } + protected CurrentDataService DataService { get; set; } = null!; protected bool editAll { diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor.cs b/MP.MONO.UI/Components/MaintTaskSched.razor.cs index 3d9d31d..97535bb 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor.cs +++ b/MP.MONO.UI/Components/MaintTaskSched.razor.cs @@ -23,6 +23,7 @@ namespace MP.MONO.UI.Components protected async Task ResetData() { showAddNew = false; + showEdit = false; currRec = null; await ReloadData(); } @@ -51,6 +52,8 @@ namespace MP.MONO.UI.Components private List? SearchRecords = null; + private bool showParams = false; + #endregion Private Fields #region Private Properties @@ -160,7 +163,7 @@ namespace MP.MONO.UI.Components { string ans = ""; - if((PMTaskId == currPMTaskId) || (PMTaskId == currPMTaskIdMod)) + if ((PMTaskId == currPMTaskId) || (PMTaskId == currPMTaskIdMod)) { ans = "table-primary"; } @@ -171,6 +174,7 @@ namespace MP.MONO.UI.Components return ans; } + private string cssCheckSelMod(int PMTaskId) { return PMTaskId == currPMTaskIdMod ? "table-primary" : ""; @@ -299,26 +303,6 @@ namespace MP.MONO.UI.Components } } - /// - /// Gestione aggiunta nuovo record intervento - /// - private void toggleEdit() - { - showEdit = !showEdit; - // se mostro --> creo nuovo record... - if (showEdit) - { - currRec = new PrevMaintTaskModel(); - } - } - #endregion Private Methods - private bool showParams = false; - - private void toggleShowParams() - { - showParams = !showParams; - } - } } \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 18dad4e..25b4786 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.2209.3016 + 1.2.2209.3017 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index c36c0cf..60b1307 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                        Version: 1.2.2209.3016

                        +

                        Version: 1.2.2209.3017


                        Release Note:
                        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 560a4dd..4126403 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3016 +1.2.2209.3017 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 4910661..8d8e492 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3016 + 1.2.2209.3017 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 From 41d5129637c38170058db538e2c540c44d8d7340 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 30 Sep 2022 17:15:15 +0200 Subject: [PATCH 24/57] Fix blocco colorato selezione maint sched --- MP.MONO.UI/Components/MaintTaskSched.razor | 2 +- MP.MONO.UI/Components/MaintTaskSched.razor.cs | 2 +- MP.MONO.UI/wwwroot/css/site.css | 3 +++ MP.MONO.UI/wwwroot/css/site.less | 4 ++++ MP.MONO.UI/wwwroot/css/site.min.css | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor b/MP.MONO.UI/Components/MaintTaskSched.razor index af736b2..a31a3c1 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor +++ b/MP.MONO.UI/Components/MaintTaskSched.razor @@ -134,7 +134,7 @@
                @if (currPMTaskId > 0) { -
                +
                } diff --git a/MP.MONO.UI/Components/MaintTaskSched.razor.cs b/MP.MONO.UI/Components/MaintTaskSched.razor.cs index 97535bb..80b07ef 100644 --- a/MP.MONO.UI/Components/MaintTaskSched.razor.cs +++ b/MP.MONO.UI/Components/MaintTaskSched.razor.cs @@ -89,7 +89,7 @@ namespace MP.MONO.UI.Components private string mainCssClass { - get => currPMTaskId == 0 ? "px-2 flex-fill" : "px-2 flex-grow-0"; + get => currPMTaskId == 0 ? "px-2 flex-fill" : "ps-2 flex-grow-0"; } private int MaxRecord diff --git a/MP.MONO.UI/wwwroot/css/site.css b/MP.MONO.UI/wwwroot/css/site.css index 2cd39a7..345a64f 100644 --- a/MP.MONO.UI/wwwroot/css/site.css +++ b/MP.MONO.UI/wwwroot/css/site.css @@ -52,6 +52,9 @@ a, left: 500px; opacity: 0.2; } +.selBlock { + background-color: #CFE2FF; +} .textTrim { white-space: nowrap; overflow: hidden; diff --git a/MP.MONO.UI/wwwroot/css/site.less b/MP.MONO.UI/wwwroot/css/site.less index c105f0c..3b758cc 100644 --- a/MP.MONO.UI/wwwroot/css/site.less +++ b/MP.MONO.UI/wwwroot/css/site.less @@ -52,6 +52,10 @@ a, .btn-link { opacity: 0.2; } +.selBlock { + background-color: #CFE2FF; +} + .textTrim { white-space: nowrap; overflow: hidden; diff --git a/MP.MONO.UI/wwwroot/css/site.min.css b/MP.MONO.UI/wwwroot/css/site.min.css index 21c1042..b94ff78 100644 --- a/MP.MONO.UI/wwwroot/css/site.min.css +++ b/MP.MONO.UI/wwwroot/css/site.min.css @@ -1 +1 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body{font-family:'Roboto',sans-serif;}.textConsensed{font-family:'Roboto Condensed',sans-serif;}h1:focus{outline:none;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.watermark{position:absolute;top:250px;left:500px;opacity:.2;}.textTrim{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.max5Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max10Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max20Char{white-space:nowrap;width:20rem;overflow:hidden;text-overflow:ellipsis;}.footer{line-height:1.8em;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:2rem/3 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:640px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}body{font-size:.8em;}} \ No newline at end of file +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body{font-family:'Roboto',sans-serif;}.textConsensed{font-family:'Roboto Condensed',sans-serif;}h1:focus{outline:none;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.watermark{position:absolute;top:250px;left:500px;opacity:.2;}.selBlock{background-color:#cfe2ff;}.textTrim{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.max5Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max10Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max20Char{white-space:nowrap;width:20rem;overflow:hidden;text-overflow:ellipsis;}.footer{line-height:1.8em;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:2rem/3 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:640px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}body{font-size:.8em;}} \ No newline at end of file From a86f1133475ecc06d31769194942c50e950c35a9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sun, 2 Oct 2022 12:14:21 +0200 Subject: [PATCH 25/57] FIx SIM: + lenta decrescita params tools --- 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/Simulator.cs | 4 ++-- MP.MONO.SIM/conf/SimTools.json | 12 ++++++------ 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 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index e94d345..5605809 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.2209.3017 + 1.2.2210.212 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 60b1307..698c5f3 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                Version: 1.2.2209.3017

                +

                Version: 1.2.2210.212


                Release Note:
                • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index 4126403..c9a8165 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3017 +1.2.2210.212 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 868ce8e..708066e 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3017 + 1.2.2210.212 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 71b7a6b..faf195f 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.2209.3017 + 1.2.2210.212 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 60b1307..698c5f3 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                  Version: 1.2.2209.3017

                  +

                  Version: 1.2.2210.212


                  Release Note:
                  • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index 4126403..c9a8165 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3017 +1.2.2210.212 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index f67b161..f3b72c2 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3017 + 1.2.2210.212 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 72de50e..929a91a 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.2209.3017 + 1.2.2210.212 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 60b1307..698c5f3 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                    Version: 1.2.2209.3017

                    +

                    Version: 1.2.2210.212


                    Release Note:
                    • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 4126403..c9a8165 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3017 +1.2.2210.212 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index e94815c..cff64ed 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3017 + 1.2.2210.212 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.SIM/Simulator.cs b/MP.MONO.SIM/Simulator.cs index 3581686..7725bac 100644 --- a/MP.MONO.SIM/Simulator.cs +++ b/MP.MONO.SIM/Simulator.cs @@ -389,12 +389,12 @@ namespace MachineSim /// /// /// - /// - /// Modalità simulazione + /// Modalità simulazione (1-3) /// 1 = std, RandomWalk + trend periodico con memoria /// 2 = boolean /// 3 = trend secondo valore mean (crescente se >0, decrescente se <0) /// + /// /// public double simNext(double CurrVal, double MinVal, double MaxVal, double sMean, double sStd, int simMode = 1, double trueRatio = 0.5) { diff --git a/MP.MONO.SIM/conf/SimTools.json b/MP.MONO.SIM/conf/SimTools.json index 9845efb..0b417ee 100644 --- a/MP.MONO.SIM/conf/SimTools.json +++ b/MP.MONO.SIM/conf/SimTools.json @@ -7,8 +7,8 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -1.5, - "SimStd": 0.5, + "SimMean": -0.05, + "SimStd": 0.125, "DisplFormat": "N1" }, { @@ -19,8 +19,8 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -1, - "SimStd": 1, + "SimMean": -0.01, + "SimStd": 0.05, "DisplFormat": "N1" }, { @@ -31,8 +31,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -2.5, - "SimStd": 2, + "SimMean": -0.025, + "SimStd": 0.12, "DisplFormat": "N1" } ] \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 25b4786..ec69c1a 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.2209.3017 + 1.2.2210.212 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 60b1307..698c5f3 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

                      Version: 1.2.2209.3017

                      +

                      Version: 1.2.2210.212


                      Release Note:
                      • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 4126403..c9a8165 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2209.3017 +1.2.2210.212 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 8d8e492..0e88a23 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2209.3017 + 1.2.2210.212 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 From 10c3e68b45bffa1b8b6f2a66926aded2739e6e9f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 07:48:14 +0200 Subject: [PATCH 26/57] update sim tools params --- 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/conf/SimTools.json | 216 +++++++++++++++++++++- MP.MONO.UI/Components/ToolsOverview.razor | 1 - 6 files changed, 214 insertions(+), 11 deletions(-) diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj index 929a91a..c37d888 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.212 + 1.2.2210.307 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 698c5f3..8927f9e 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.212

                        +

                        Version: 1.2.2210.307


                        Release Note:
                        • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index c9a8165..8990bc9 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.212 +1.2.2210.307 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index cff64ed..4c4d12e 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.212 + 1.2.2210.307 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.SIM/conf/SimTools.json b/MP.MONO.SIM/conf/SimTools.json index 0b417ee..7d0f5d4 100644 --- a/MP.MONO.SIM/conf/SimTools.json +++ b/MP.MONO.SIM/conf/SimTools.json @@ -2,37 +2,241 @@ { "Order": 0, "Type": "TOOL", - "Title": "Tool 01 life", + "Title": "Tool 01_A", "Value": "99", "ValueNum": 99, "MinVal": 0, "MaxVal": 100, "SimMean": -0.05, "SimStd": 0.125, - "DisplFormat": "N1" + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" }, { "Order": 1, "Type": "TOOL", - "Title": "Tool 02 life", + "Title": "Tool 01_B", "Value": "85", "ValueNum": 85, "MinVal": 0, "MaxVal": 100, "SimMean": -0.01, "SimStd": 0.05, - "DisplFormat": "N1" + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" }, { "Order": 2, "Type": "TOOL", - "Title": "Tool 03 life", + "Title": "Tool 01_C", "Value": "70", "ValueNum": 70, "MinVal": 0, "MaxVal": 100, "SimMean": -0.025, "SimStd": 0.12, - "DisplFormat": "N1" + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 3, + "Type": "TOOL", + "Title": "Tool 01_D", + "Value": "70", + "ValueNum": 70, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.025, + "SimStd": 0.12, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 10, + "Type": "TOOL", + "Title": "Tool 02_A", + "Value": "99", + "ValueNum": 99, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.05, + "SimStd": 0.125, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 11, + "Type": "TOOL", + "Title": "Tool 02_B", + "Value": "85", + "ValueNum": 85, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.01, + "SimStd": 0.05, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 12, + "Type": "TOOL", + "Title": "Tool 02_C", + "Value": "70", + "ValueNum": 70, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.025, + "SimStd": 0.12, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 13, + "Type": "TOOL", + "Title": "Tool 02_D", + "Value": "70", + "ValueNum": 70, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.025, + "SimStd": 0.12, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 20, + "Type": "TOOL", + "Title": "Tool 03_A", + "Value": "99", + "ValueNum": 99, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.05, + "SimStd": 0.125, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 21, + "Type": "TOOL", + "Title": "Tool 03_B", + "Value": "85", + "ValueNum": 85, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.01, + "SimStd": 0.05, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 22, + "Type": "TOOL", + "Title": "Tool 03_C", + "Value": "70", + "ValueNum": 70, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.025, + "SimStd": 0.12, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 23, + "Type": "TOOL", + "Title": "Tool 03_D", + "Value": "70", + "ValueNum": 70, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.025, + "SimStd": 0.12, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 30, + "Type": "TOOL", + "Title": "Tool 04_A", + "Value": "99", + "ValueNum": 99, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.05, + "SimStd": 0.125, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 31, + "Type": "TOOL", + "Title": "Tool 04_B", + "Value": "85", + "ValueNum": 85, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.01, + "SimStd": 0.05, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 32, + "Type": "TOOL", + "Title": "Tool 04_C", + "Value": "70", + "ValueNum": 70, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.025, + "SimStd": 0.12, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" + }, + { + "Order": 33, + "Type": "TOOL", + "Title": "Tool 04_D", + "Value": "70", + "ValueNum": 70, + "MinVal": 0, + "MaxVal": 100, + "SimMean": -0.025, + "SimStd": 0.12, + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "DisplFormat": "N2" } ] \ No newline at end of file diff --git a/MP.MONO.UI/Components/ToolsOverview.razor b/MP.MONO.UI/Components/ToolsOverview.razor index 327860e..14a5536 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor +++ b/MP.MONO.UI/Components/ToolsOverview.razor @@ -43,7 +43,6 @@
                          • }
                        - @**@ } else { From f61f206208c53f475787d0b8ac9ee3c2fd0fe544 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 08:34:41 +0200 Subject: [PATCH 27/57] Inizio fix simulatore x + dati in tools --- MP.MONO.SIM/Simulator.cs | 7 +++++- .../Components/DisplayRecordComponent.razor | 22 ++++++++++--------- 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 +- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/MP.MONO.SIM/Simulator.cs b/MP.MONO.SIM/Simulator.cs index 7725bac..2038db3 100644 --- a/MP.MONO.SIM/Simulator.cs +++ b/MP.MONO.SIM/Simulator.cs @@ -358,7 +358,12 @@ namespace MachineSim Title = i.Title, Type = i.Type, ValueNum = simNext(i.ValueNum, i.MinVal, i.MaxVal, i.SimMean, i.SimStd, 3), - DisplFormat = i.DisplFormat + DisplFormat = i.DisplFormat, + EnablePlot=i.EnablePlot, + ShowBar=i.ShowBar, + ShowGauge=i.ShowGauge, + CssIcon=i.CssIcon, + HLShow=i.HLShow }).ToList(); foreach (var item in answ) diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor b/MP.MONO.UI/Components/DisplayRecordComponent.razor index d8225f3..04ae8c8 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor @@ -6,7 +6,7 @@ @if (currRecord != null) { -
                        +
                        @if (!string.IsNullOrEmpty(currRecord.CssIcon)) {
                        @@ -19,19 +19,21 @@
                        @currRecord.Title
                        }
                        -
                        +
                        @currRecord.Value
                        - @if (currRecord.ShowBar) - { -
                        -
                        -
                        -
                        -
                        - }
                        +
                        + @if (currRecord.ShowBar) + { +
                        +
                        +
                        +
                        +
                        + } +
                        } else { diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index ec69c1a..f2c8b86 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.212 + 1.2.2210.307 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 698c5f3..8927f9e 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.212

                        +

                        Version: 1.2.2210.307


                        Release Note:
                        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index c9a8165..8990bc9 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.212 +1.2.2210.307 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 0e88a23..381ccb7 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.212 + 1.2.2210.307 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 From 7945ce17c5291d84475d660052667cfbd4482215 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 08:58:00 +0200 Subject: [PATCH 28/57] Update SIM x tutti i parametri dei TOOLS --- 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/Simulator.cs | 10 +++++----- 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 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index 5605809..77cdc4a 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.212 + 1.2.2210.308 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 698c5f3..f7c73bc 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.212

                          +

                          Version: 1.2.2210.308


                          Release Note:
                          • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index c9a8165..f2b2b7c 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.212 +1.2.2210.308 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 708066e..938d5f1 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.212 + 1.2.2210.308 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 faf195f..b29c86d 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.212 + 1.2.2210.308 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 698c5f3..f7c73bc 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.212

                            +

                            Version: 1.2.2210.308


                            Release Note:
                            • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index c9a8165..f2b2b7c 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.212 +1.2.2210.308 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index f3b72c2..0481607 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.212 + 1.2.2210.308 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 c37d888..cac66b3 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.307 + 1.2.2210.308 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 8927f9e..f7c73bc 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.307

                              +

                              Version: 1.2.2210.308


                              Release Note:
                              • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 8990bc9..f2b2b7c 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.307 +1.2.2210.308 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 4c4d12e..28530a8 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.307 + 1.2.2210.308 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.SIM/Simulator.cs b/MP.MONO.SIM/Simulator.cs index 2038db3..b86f5bd 100644 --- a/MP.MONO.SIM/Simulator.cs +++ b/MP.MONO.SIM/Simulator.cs @@ -359,11 +359,11 @@ namespace MachineSim Type = i.Type, ValueNum = simNext(i.ValueNum, i.MinVal, i.MaxVal, i.SimMean, i.SimStd, 3), DisplFormat = i.DisplFormat, - EnablePlot=i.EnablePlot, - ShowBar=i.ShowBar, - ShowGauge=i.ShowGauge, - CssIcon=i.CssIcon, - HLShow=i.HLShow + EnablePlot = i.EnablePlot, + ShowBar = i.ShowBar, + ShowGauge = i.ShowGauge, + CssIcon = i.CssIcon, + HLShow = i.HLShow }).ToList(); foreach (var item in answ) diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index f2c8b86..2f5b141 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.307 + 1.2.2210.308 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 8927f9e..f7c73bc 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.307

                                +

                                Version: 1.2.2210.308


                                Release Note:
                                • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 8990bc9..f2b2b7c 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.307 +1.2.2210.308 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 381ccb7..eb0b69f 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.307 + 1.2.2210.308 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 From d8071e3658737dfeb5a80e5aa8524d33df800e07 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 09:41:32 +0200 Subject: [PATCH 29/57] Update tools view x sel parametri home --- MP.MONO.UI/Components/ToolsOverview.razor.cs | 83 +++++++++++++------- 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 +- 5 files changed, 57 insertions(+), 34 deletions(-) diff --git a/MP.MONO.UI/Components/ToolsOverview.razor.cs b/MP.MONO.UI/Components/ToolsOverview.razor.cs index 83e39ab..50fa72b 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor.cs +++ b/MP.MONO.UI/Components/ToolsOverview.razor.cs @@ -1,35 +1,69 @@ -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; using MP.MONO.Core.DTO; -using MP.MONO.UI.Data; -using Newtonsoft.Json; using MP.MONO.Data; +using Newtonsoft.Json; namespace MP.MONO.UI.Components { public partial class ToolsOverview { - private List? ListRecords { get; set; } = null; + #region Public Properties + + [Parameter] + public bool ShowReduced { get; set; } = false; + + #endregion Public Properties + + #region Protected Methods + protected override async Task OnInitializedAsync() { await ReloadData(); MMDataService.toolsPipe.EA_NewMessage += ToolsPipe_EA_NewMessage; } + [Parameter] + public List SelVal { get; set; } = new List(); + + protected string percProgress(double num, double minVal, double maxVal) + { + string answ = "width: 0%;"; + double den = (maxVal - minVal) != 0 ? (maxVal - minVal) : 1; + double ratio = ((double)num) / den; + answ = $"width: {ratio:P0};"; + return answ; + } + + protected async Task ReloadData() + { + SelVal = new List(); + var allData = await MMDataService.getTools(); + // se modalità reduced --> mostro solo il subset dati filtrati... + if (ShowReduced) + { + ListRecords = allData + .Where(x => x.HLShow) + .OrderBy(x => x.Order) + .ToList(); + } + else + { + ListRecords = allData + .OrderBy(x => x.Order) + .ToList(); + } + } + + #endregion Protected Methods + + #region Private Properties + + private List? ListRecords { get; set; } = null; + + #endregion Private Properties + + #region Private Methods + private void ToolsPipe_EA_NewMessage(object? sender, EventArgs e) { PubSubEventArgs currArgs = (PubSubEventArgs)e; @@ -48,17 +82,6 @@ namespace MP.MONO.UI.Components }); } - protected string percProgress(double num, double minVal, double maxVal) - { - string answ = "width: 0%;"; - double den = (maxVal - minVal) != 0 ? (maxVal - minVal) : 1; - double ratio = ((double)num) / den; - answ = $"width: {ratio:P0};"; - return answ; - } - protected async Task ReloadData() - { - ListRecords = await MMDataService.getTools(); - } + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 2f5b141..86a0358 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.308 + 1.2.2210.309 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index f7c73bc..91a55e4 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.308

                                  +

                                  Version: 1.2.2210.309


                                  Release Note:
                                  • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index f2b2b7c..adf437f 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.308 +1.2.2210.309 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index eb0b69f..b90d397 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.308 + 1.2.2210.309 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 From fecc44fda19519b5bc0093fe62d1e074f9238e93 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 09:44:54 +0200 Subject: [PATCH 30/57] update sim tool conf --- MP.MONO.SIM/conf/SimTools.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/MP.MONO.SIM/conf/SimTools.json b/MP.MONO.SIM/conf/SimTools.json index 7d0f5d4..99e15a2 100644 --- a/MP.MONO.SIM/conf/SimTools.json +++ b/MP.MONO.SIM/conf/SimTools.json @@ -3,6 +3,7 @@ "Order": 0, "Type": "TOOL", "Title": "Tool 01_A", + "HLShow": true, "Value": "99", "ValueNum": 99, "MinVal": 0, @@ -18,6 +19,7 @@ "Order": 1, "Type": "TOOL", "Title": "Tool 01_B", + "HLShow": true, "Value": "85", "ValueNum": 85, "MinVal": 0, @@ -33,6 +35,7 @@ "Order": 2, "Type": "TOOL", "Title": "Tool 01_C", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, @@ -48,6 +51,7 @@ "Order": 3, "Type": "TOOL", "Title": "Tool 01_D", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, @@ -63,6 +67,7 @@ "Order": 10, "Type": "TOOL", "Title": "Tool 02_A", + "HLShow": true, "Value": "99", "ValueNum": 99, "MinVal": 0, @@ -78,6 +83,7 @@ "Order": 11, "Type": "TOOL", "Title": "Tool 02_B", + "HLShow": true, "Value": "85", "ValueNum": 85, "MinVal": 0, @@ -93,6 +99,7 @@ "Order": 12, "Type": "TOOL", "Title": "Tool 02_C", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, @@ -108,6 +115,7 @@ "Order": 13, "Type": "TOOL", "Title": "Tool 02_D", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, @@ -123,6 +131,7 @@ "Order": 20, "Type": "TOOL", "Title": "Tool 03_A", + "HLShow": true, "Value": "99", "ValueNum": 99, "MinVal": 0, @@ -138,6 +147,7 @@ "Order": 21, "Type": "TOOL", "Title": "Tool 03_B", + "HLShow": true, "Value": "85", "ValueNum": 85, "MinVal": 0, @@ -153,6 +163,7 @@ "Order": 22, "Type": "TOOL", "Title": "Tool 03_C", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, @@ -168,6 +179,7 @@ "Order": 23, "Type": "TOOL", "Title": "Tool 03_D", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, @@ -183,6 +195,7 @@ "Order": 30, "Type": "TOOL", "Title": "Tool 04_A", + "HLShow": true, "Value": "99", "ValueNum": 99, "MinVal": 0, @@ -198,6 +211,7 @@ "Order": 31, "Type": "TOOL", "Title": "Tool 04_B", + "HLShow": true, "Value": "85", "ValueNum": 85, "MinVal": 0, @@ -213,6 +227,7 @@ "Order": 32, "Type": "TOOL", "Title": "Tool 04_C", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, @@ -228,6 +243,7 @@ "Order": 33, "Type": "TOOL", "Title": "Tool 04_D", + "HLShow": false, "Value": "70", "ValueNum": 70, "MinVal": 0, From dd9680a8caf63e6d1d0af3ed0cda93ef76ca2820 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 10:11:00 +0200 Subject: [PATCH 31/57] Fix grafico tools list --- .../Components/DisplayRecordComponent.razor | 18 ++--- MP.MONO.UI/Conf/lic.file | 2 +- MP.MONO.UI/temp/InfoData.json | 66 +++++++++---------- 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor b/MP.MONO.UI/Components/DisplayRecordComponent.razor index 04ae8c8..a96732a 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor @@ -6,7 +6,7 @@ @if (currRecord != null) { -
                                    +
                                    @if (!string.IsNullOrEmpty(currRecord.CssIcon)) {
                                    @@ -16,19 +16,21 @@ } else { -
                                    @currRecord.Title
                                    +
                                    + @currRecord.Title +
                                    +
                                    +
                                    @currRecord.Value
                                    +
                                    +
                                    +
                                    }
                                    -
                                    -
                                    -
                                    @currRecord.Value
                                    -
                                    -
                                    @if (currRecord.ShowBar) {
                                    -
                                    +
                                    diff --git a/MP.MONO.UI/Conf/lic.file b/MP.MONO.UI/Conf/lic.file index 9540e9d..69f59a3 100644 --- a/MP.MONO.UI/Conf/lic.file +++ b/MP.MONO.UI/Conf/lic.file @@ -1 +1 @@ -31e9cc1c2e8f30a1b4098cb157d712f11f3f2e60fb74169a354c3fa646d6d0e28518b4e3139f844b25824fbcc4340051fc507d22c1c2d2786d3786c777c31cc3 \ No newline at end of file +467e4b24bc3fe9d237169aa274ae589b64f072fb1cd91f4d79aaee76c64afbfced7fb51536b62cf612dedfb304202a1e653778b7cc8c758f83bb058984460301 \ No newline at end of file diff --git a/MP.MONO.UI/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json index ee8a3fa..598db89 100644 --- a/MP.MONO.UI/temp/InfoData.json +++ b/MP.MONO.UI/temp/InfoData.json @@ -2,55 +2,55 @@ "AdapterType": "Ethernet 802.3", "AddressWidth": "64", "Architecture": "9", - "BiosVersion": "ALASKA - 1072009", - "BuildNumber": "19044", - "Caption": "Microsoft Windows 10 Pro N", - "ConfiguredClockSpeed": "3600", + "BiosVersion": "_ASUS_ - 1072009", + "BuildNumber": "19043", + "Caption": "Microsoft Windows 10 Pro", + "ConfiguredClockSpeed": "2400", "ConfiguredVoltage": "1200", "CpuVersion": "Modello 1, Stepping 0", - "CurrentClockSpeed": "3501", - "CurrentVoltage": "11", + "CurrentClockSpeed": "2200", + "CurrentVoltage": "12", "DataWidth": "64", - "Description": "AMD64 Family 23 Model 113 Stepping 0", - "DeviceLocator": "DIMM 1", + "Description": "AMD64 Family 23 Model 17 Stepping 0", + "DeviceLocator": "ChannelA-DIMM0", "ExtClock": "100", "Family": "107", - "FormFactor": "8", - "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}", - "L2CacheSize": "8192", - "L3CacheSize": "65536", + "FormFactor": "12", + "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}", + "L2CacheSize": "2048", + "L3CacheSize": "4096", "Level": "23", - "LoadPercentage": "91", - "MACAddress": "0C:9D:92:B8:FD:E8", - "Manufacturer": "American Megatrends International, LLC.", + "LoadPercentage": "0", + "MACAddress": "4C:ED:FB:D9:78:83", + "Manufacturer": "American Megatrends Inc.", "MaxNumberOfProcesses": "4294967295", "MaxProcessMemorySize": "137438953344", "MaxVoltage": "1200", "MinVoltage": "1200", - "Name": "ASUS XG-C100C 10G PCI-E Network Adapter", - "NumberOfCores": "16", - "NumberOfLogicalProcessors": "32", + "Name": "Realtek PCIe GbE Family Controller", + "NumberOfCores": "4", + "NumberOfLogicalProcessors": "8", "OSArchitecture": "64 bit", - "PartNumber": "CMK64GX4M2D3600C18", + "PartNumber": "8ATF1G64HZ-2G3E1 ", "PhysicalAdapter": "True", - "ProcessorId": "178BFBFF00870F10", + "ProcessorId": "178BFBFF00810F10", "ProcessorType": "3", - "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter", - "ReleaseDate": "20210521000000.000000+000", - "Revision": "28928", + "ProductName": "Realtek PCIe GbE Family Controller", + "ReleaseDate": "20190521000000.000000+000", + "Revision": "4352", "Role": "CPU", - "SerialNumber": "00332-00332-17209-AA940", - "ServiceName": "aqnic650", - "SMBIOSBIOSVersion": "F33", + "SerialNumber": "00330-80951-85780-AA242", + "ServiceName": "rt640x64", + "SMBIOSBIOSVersion": "X505ZA.311", "SMBIOSMajorVersion": "3", "SMBIOSMemoryType": "26", - "SMBIOSMinorVersion": "3", - "SocketDesignation": "AM4", - "SoftwareElementID": "F33", + "SMBIOSMinorVersion": "1", + "SocketDesignation": "FP5", + "SoftwareElementID": "X505ZA.311", "SoftwareElementState": "3", - "Speed": "3600", + "Speed": "2400", "SystemBiosMajorVersion": "5", - "SystemBiosMinorVersion": "17", - "SystemName": "WRKST-R9-SAM", - "Version": "10.0.19044" + "SystemBiosMinorVersion": "13", + "SystemName": "EGALW-NB-004", + "Version": "10.0.19043" } \ No newline at end of file From beabadd2fc36f19905a375745b9f03b931a96222 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 10:35:15 +0200 Subject: [PATCH 32/57] Fix shortList tools index + fix grafico params --- MP.MONO.UI/Components/ParamOverview.razor | 10 +++++++++- MP.MONO.UI/Components/ToolsOverview.razor.cs | 9 ++++++++- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Index.razor | 2 +- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/MP.MONO.UI/Components/ParamOverview.razor b/MP.MONO.UI/Components/ParamOverview.razor index 4caf01c..4d42cc5 100644 --- a/MP.MONO.UI/Components/ParamOverview.razor +++ b/MP.MONO.UI/Components/ParamOverview.razor @@ -25,7 +25,15 @@
                                    -
                                     @item.Value
                                    +
                                    +
                                    + +
                                    +   +
                                    + @item.Value +
                                    +
                                    diff --git a/MP.MONO.UI/Components/ToolsOverview.razor.cs b/MP.MONO.UI/Components/ToolsOverview.razor.cs index 50fa72b..362385e 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor.cs +++ b/MP.MONO.UI/Components/ToolsOverview.razor.cs @@ -39,6 +39,11 @@ namespace MP.MONO.UI.Components SelVal = new List(); var allData = await MMDataService.getTools(); // se modalità reduced --> mostro solo il subset dati filtrati... + FilterData(allData); + } + + private void FilterData(List allData) + { if (ShowReduced) { ListRecords = allData @@ -71,7 +76,9 @@ namespace MP.MONO.UI.Components { try { - ListRecords = JsonConvert.DeserializeObject>(currArgs.newMessage); + var rawData = JsonConvert.DeserializeObject>(currArgs.newMessage); + var allData = rawData == null ? new List() : rawData; + FilterData(allData); } catch { } diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 86a0358..75e9e03 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.309 + 1.2.2210.310 diff --git a/MP.MONO.UI/Pages/Index.razor b/MP.MONO.UI/Pages/Index.razor index b907f7e..ad0155e 100644 --- a/MP.MONO.UI/Pages/Index.razor +++ b/MP.MONO.UI/Pages/Index.razor @@ -41,7 +41,7 @@
                                    TOOLS
                                    - +
                                    diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 91a55e4..83a5687 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.309

                                    +

                                    Version: 1.2.2210.310


                                    Release Note:
                                    • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index adf437f..133c0f0 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.309 +1.2.2210.310 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index b90d397..9dbe94d 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.309 + 1.2.2210.310 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 From 801441fd1a5ce409757255373062eb463704eb04 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 12:30:09 +0200 Subject: [PATCH 33/57] Aggiunta Plot pagina tools --- .../DisplayRecordComponent.razor.cs | 3 + MP.MONO.UI/Components/ToolsOverview.razor | 2 +- MP.MONO.UI/Components/ToolsOverview.razor.cs | 44 +++- MP.MONO.UI/Components/ToolsPlot.razor | 29 +++ MP.MONO.UI/Components/ToolsPlot.razor.cs | 213 ++++++++++++++++++ MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Tools.razor | 18 +- MP.MONO.UI/Pages/Tools.razor.cs | 131 +++++++++++ MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 11 files changed, 431 insertions(+), 17 deletions(-) create mode 100644 MP.MONO.UI/Components/ToolsPlot.razor create mode 100644 MP.MONO.UI/Components/ToolsPlot.razor.cs create mode 100644 MP.MONO.UI/Pages/Tools.razor.cs diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs index d465f4b..81657db 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs @@ -10,6 +10,8 @@ namespace MP.MONO.UI.Components [Parameter] public DisplayDataDTO? currRecord { get; set; } = null; + + #endregion Public Properties #region Protected Methods @@ -22,6 +24,7 @@ namespace MP.MONO.UI.Components answ = $"width: {ratio:P0};"; return answ; } + #endregion Protected Methods } diff --git a/MP.MONO.UI/Components/ToolsOverview.razor b/MP.MONO.UI/Components/ToolsOverview.razor index 14a5536..7821ab9 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor +++ b/MP.MONO.UI/Components/ToolsOverview.razor @@ -38,7 +38,7 @@
                                    • *@ -
                                  • +
                                    • } diff --git a/MP.MONO.UI/Components/ToolsOverview.razor.cs b/MP.MONO.UI/Components/ToolsOverview.razor.cs index 362385e..c10ce03 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor.cs +++ b/MP.MONO.UI/Components/ToolsOverview.razor.cs @@ -11,6 +11,14 @@ namespace MP.MONO.UI.Components [Parameter] public bool ShowReduced { get; set; } = false; + [Parameter] + public EventCallback EC_AddValue { get; set; } + + [Parameter] + public EventCallback EC_RemValue { get; set; } + + [Parameter] + public List SelVal { get; set; } = new List(); #endregion Public Properties @@ -22,9 +30,6 @@ namespace MP.MONO.UI.Components MMDataService.toolsPipe.EA_NewMessage += ToolsPipe_EA_NewMessage; } - [Parameter] - public List SelVal { get; set; } = new List(); - protected string percProgress(double num, double minVal, double maxVal) { string answ = "width: 0%;"; @@ -58,6 +63,39 @@ namespace MP.MONO.UI.Components .ToList(); } } + protected string cssLast(string ParamName) + { + string answ = SelVal.Contains(ParamName) ? "bg-dark text-light" : ""; + // se è ultima testo giallo... + if (SelVal != null && SelVal.Count > 0) + { + if (SelVal.LastOrDefault().Equals(ParamName)) + { + answ = "bg-dark text-warning"; + } + } + return answ; + } + protected string cssActive(string ParamName) + { + string answ = SelVal.Contains(ParamName) ? "bg-dark text-light" : ""; + return answ; + } + protected void toggleSelect(string SelectedValue) + { + // se contiene rimuovo + if (SelVal.Contains(SelectedValue)) + { + //SelVal.Remove(SelectedValue); + EC_RemValue.InvokeAsync(SelectedValue); + } + // altrimenti aggiungo + else + { + //SelVal.Add(SelectedValue); + EC_AddValue.InvokeAsync(SelectedValue); + } + } #endregion Protected Methods diff --git a/MP.MONO.UI/Components/ToolsPlot.razor b/MP.MONO.UI/Components/ToolsPlot.razor new file mode 100644 index 0000000..5d446a5 --- /dev/null +++ b/MP.MONO.UI/Components/ToolsPlot.razor @@ -0,0 +1,29 @@ +@using MP.MONO.UI.Components +@using MP.MONO.Core.DTO +@using MP.MONO.UI.Data +@using Microsoft.Extensions.Configuration; + +@inject IConfiguration Configuration; + +@inject CurrentDataService MMDataService + +@if (!string.IsNullOrEmpty(@SelectedTool)) +{ +
                                    +
                                    + @SelectedTool +
                                    +
                                    +
                                    +
                                    + @if (LevelVal == null || LevelVal.Count == 0) + { + + } + else + { + + } +
                                    +
                                    +} \ No newline at end of file diff --git a/MP.MONO.UI/Components/ToolsPlot.razor.cs b/MP.MONO.UI/Components/ToolsPlot.razor.cs new file mode 100644 index 0000000..d89593b --- /dev/null +++ b/MP.MONO.UI/Components/ToolsPlot.razor.cs @@ -0,0 +1,213 @@ +using Microsoft.AspNetCore.Components; +using MP.MONO.Core.DTO; +using MP.MONO.Data; +using Newtonsoft.Json; + +namespace MP.MONO.UI.Components +{ + public partial class ToolsPlot + { + #region Protected Fields + + protected DateTime lastRec = DateTime.Now.AddMinutes(-1); + + protected Dictionary listMaxVal = new Dictionary(); + + protected Dictionary listMinVal = new Dictionary(); + + protected Dictionary> plotData = new Dictionary>(); + + #endregion Protected Fields + + #region Protected Properties + + protected string _selTool { get; set; } = ""; + + protected List LevelVal + { + get + { + List answ = new List(); + if (plotData.ContainsKey(SelectedTool)) + { + answ = plotData[SelectedTool]; + } + return answ; + } + } + + protected string? MaxVal + { + get + { + string answ = "0"; + if (listMaxVal != null && listMaxVal.Count > 0) + { + answ = listMaxVal[SelectedTool] ?? "0"; + } + + return answ; + } + } + + protected string? MinVal + { + get + { + string answ = "0"; + if (listMinVal != null && listMinVal.Count > 0) + { + answ = listMinVal[SelectedTool] ?? "0"; + } + + return answ; + } + } + + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public int maxRecord { get; set; } = 120; + + public string ToolId + { + get => _selTool.Replace(" ", "_"); + } + + [Parameter] + public double sampleSecMin { get; set; } = 1; + + [Parameter] + public string SelectedTool + { + get + { + return _selTool; + } + set + { + // controllo se è variato + if (_selTool != value) + { + // salvo + _selTool = value; + // cerco se ho in dictionary... + if (!plotData.ContainsKey(value)) + { + DateTime adesso = DateTime.Now; + // creo un oggetto della lunghezza desiderata... + var emptyData = new List(); + for (int i = -maxRecord; i < 0; i++) + { + emptyData.Add(new chartJsData.chartJsTSerie() { x = adesso.AddSeconds(i), y = 0 }); + } + plotData.Add(value, emptyData); + } + } + } + } + + #endregion Public Properties + + #region Private Methods + + //private int inputValue = 123; + private void ToolsPipe_EA_NewMessage(object? sender, EventArgs e) + { + DateTime adesso = DateTime.Now; + if (lastRec.AddSeconds(sampleSecMin) < adesso) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + var ListRecords = JsonConvert.DeserializeObject>(currArgs.newMessage); + // prendo SOLO il dato della TS richiesta + if (ListRecords != null) + { + // accodo in blocco tutti i valori... + foreach (var item in ListRecords) + { + // cerco se ci sono min/max del valore indicato... + if (!listMinVal.ContainsKey(item.Title)) + { + listMinVal.Add(item.Title, $"{item.MinVal:N0}"); + } + if (!listMaxVal.ContainsKey(item.Title)) + { + listMaxVal.Add(item.Title, $"{item.MaxVal:N0}"); + } + // verifico dictionary se mancasse... + if (!plotData.ContainsKey(item.Title)) + { + //plotData.Add(item.Title, new List()); + // creo un oggetto della lunghezza desiderata... + var emptyData = new List(); + for (int i = -maxRecord; i < 0; i++) + { + emptyData.Add(new chartJsData.chartJsTSerie() { x = adesso.AddSeconds(i), y = 0 }); + } + plotData.Add(item.Title, emptyData); + } + // ora accodo il valore + if (plotData.ContainsKey(item.Title)) + { + plotData[item.Title].Add(new chartJsData.chartJsTSerie() { x = adesso, y = item.ValueNum }); + // verifico limite visualizzazione + if (plotData[item.Title].Count > maxRecord) + { + plotData[item.Title].RemoveRange(0, plotData[item.Title].Count - maxRecord); + } + } + } + } + } + catch + { } + } + lastRec = adesso; + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + + #endregion Private Methods + + #region Protected Methods + + protected List getFillColors(string alpha) + { + List answ = new List(); + answ.Add($"rgba(108, 164, 254, {alpha})"); + return answ; + } + + protected List getLineColors(string alpha) + { + List answ = new List(); + answ.Add($"rgba(54, 82, 254, {alpha})"); + return answ; + } + + protected List getPointColors(string alpha) + { + List answ = new List(); + answ.Add($"rgba(108, 118, 158, {alpha})"); + return answ; + } + + protected override async Task OnInitializedAsync() + { + //await ReloadData(); + await Task.Delay(1); + MMDataService.toolsPipe.EA_NewMessage += ToolsPipe_EA_NewMessage; + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 75e9e03..5a717e5 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.310 + 1.2.2210.312 diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 1f69a87..0184e3e 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -7,16 +7,16 @@

                                    Tools

                        - +
                        -
                        +
                        + @foreach (var item in selParams) + { +
                        + +
                        + }
                        -
                        - - - -@code { - -} +
                \ No newline at end of file diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs new file mode 100644 index 0000000..743393b --- /dev/null +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -0,0 +1,131 @@ +namespace MP.MONO.UI.Pages +{ + public partial class Tools + { + //protected List selParams { get; set; } = new List(); + #region Private Fields + + private int maxRecord = 120; + private bool showParam = false; + + private DateTime DateFrom + { + get => SelFilter.DtStart; + set => SelFilter.DtStart = value; + } + private DateTime DateTo + { + get => SelFilter.DtEnd; + set => SelFilter.DtEnd = value; + } + + protected MP.MONO.UI.Data.DataLogFilter SelFilter { get; set; } = new MP.MONO.UI.Data.DataLogFilter(); + + #endregion Private Fields + + #region Protected Fields + + protected bool isRT = true; + protected double sampleSecMin = 1; + + #endregion Protected Fields + + #region Protected Properties + + protected string currMode + { + get => isRT ? "RealTime" : "Log View"; + } + + protected string btnResetCss + { + get => selParams != null && selParams.Count > 0 ? "" : "disabled"; + } + + protected List selParams { get; set; } = new List(); + + #endregion Protected Properties + + #region Public Properties + + public string pcss + { + get + { + string answ = "col-12"; + int numPar = selParams.Count; + if (numPar > 6) + { + answ = "col-4"; + } + else if (numPar > 3) + { + answ = "col-6"; + } + return answ; + } + } + + #endregion Public Properties + + #region Private Methods + + private void toggleParam() + { + showParam = !showParam; + } + + #endregion Private Methods + + #region Protected Methods + + protected void paramAdded(string toolName) + { + if (!selParams.Contains(toolName)) + { + selParams.Add(toolName); + } + } + + protected string lastTool + { + get + { + string answ = ""; + if (selParams.Count > 0) + { + answ = $"{selParams.LastOrDefault()}"; + } + return answ; + } + } + + protected void paramRemoved(string toolName) + { + if (selParams.Contains(toolName)) + { + // controllo se è ultimo rimuovo direttamente + if (toolName == lastTool) + { + selParams.Remove(toolName); + } + } + } + + protected void resetSel() + { + selParams = new List(); + } + + protected void toggleRT() + { + isRT = !isRT; + } + + #endregion Protected Methods + private void toggleShowParams() + { + showParam = !showParam; + } + } +} diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 83a5687..3734d4c 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.310

                +

                Version: 1.2.2210.312


                Release Note:
                • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 133c0f0..d16ccd8 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.310 +1.2.2210.312 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 9dbe94d..d50a008 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.310 + 1.2.2210.312 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 From 372318a290e9735ed5e892cb7e89abbcc4e41cfe Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 12:56:31 +0200 Subject: [PATCH 34/57] Fix grafici --- .../Components/DisplayRecordComponent.razor | 6 ++-- .../DisplayRecordComponent.razor.cs | 18 +++++++++-- MP.MONO.UI/Components/ToolsOverview.razor | 2 +- MP.MONO.UI/Components/ToolsOverview.razor.cs | 10 +++--- MP.MONO.UI/Pages/Tools.razor | 32 ++++++++++--------- MP.MONO.UI/Pages/Tools.razor.cs | 29 +++++++---------- 6 files changed, 53 insertions(+), 44 deletions(-) diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor b/MP.MONO.UI/Components/DisplayRecordComponent.razor index a96732a..719edef 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor @@ -10,17 +10,17 @@ @if (!string.IsNullOrEmpty(currRecord.CssIcon)) {
                  -
                  @currRecord.Title
                  +
                  @currRecord.Title
                  } else {
                  - @currRecord.Title + @currRecord.Title
                  -
                  @currRecord.Value
                  +
                  @currRecord.Value
                  diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs index 81657db..a2dde52 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs @@ -9,8 +9,8 @@ namespace MP.MONO.UI.Components [Parameter] public DisplayDataDTO? currRecord { get; set; } = null; - - + [Parameter] + public List SelVal { get; set; } = new List(); #endregion Public Properties @@ -24,7 +24,19 @@ namespace MP.MONO.UI.Components answ = $"width: {ratio:P0};"; return answ; } - + protected string cssLast(string toolName) + { + string answ = SelVal.Contains(toolName) ? "bg-dark text-light" : ""; + // se è ultima testo giallo... + if (SelVal != null && SelVal.Count > 0) + { + if (SelVal.LastOrDefault().Equals(toolName)) + { + answ = "bg-dark text-warning"; + } + } + return answ; + } #endregion Protected Methods } diff --git a/MP.MONO.UI/Components/ToolsOverview.razor b/MP.MONO.UI/Components/ToolsOverview.razor index 7821ab9..8f01479 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor +++ b/MP.MONO.UI/Components/ToolsOverview.razor @@ -39,7 +39,7 @@
                  • *@
                • - +
                  • }
                diff --git a/MP.MONO.UI/Components/ToolsOverview.razor.cs b/MP.MONO.UI/Components/ToolsOverview.razor.cs index c10ce03..7a347f9 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor.cs +++ b/MP.MONO.UI/Components/ToolsOverview.razor.cs @@ -63,22 +63,22 @@ namespace MP.MONO.UI.Components .ToList(); } } - protected string cssLast(string ParamName) + protected string cssLast(string toolName) { - string answ = SelVal.Contains(ParamName) ? "bg-dark text-light" : ""; + string answ = SelVal.Contains(toolName) ? "bg-dark text-light" : ""; // se è ultima testo giallo... if (SelVal != null && SelVal.Count > 0) { - if (SelVal.LastOrDefault().Equals(ParamName)) + if (SelVal.LastOrDefault().Equals(toolName)) { answ = "bg-dark text-warning"; } } return answ; } - protected string cssActive(string ParamName) + protected string cssActive(string toolName) { - string answ = SelVal.Contains(ParamName) ? "bg-dark text-light" : ""; + string answ = SelVal.Contains(toolName) ? "bg-dark text-light" : ""; return answ; } protected void toggleSelect(string SelectedValue) diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 0184e3e..68798cd 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -1,22 +1,24 @@ @page "/Tools"
                -
                -
                -
                -

                Tools

                -
                -
                - +
                +
                +

                Tools

                +
                +
                +
                +
                + +
                +
                + @foreach (var item in selTools) + { +
                + +
                + } +
                -
                - @foreach (var item in selParams) - { -
                - -
                - } -
                \ No newline at end of file diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index 743393b..6324a54 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -39,10 +39,10 @@ protected string btnResetCss { - get => selParams != null && selParams.Count > 0 ? "" : "disabled"; + get => selTools != null && selTools.Count > 0 ? "" : "disabled"; } - protected List selParams { get; set; } = new List(); + protected List selTools { get; set; } = new List(); #endregion Protected Properties @@ -53,7 +53,7 @@ get { string answ = "col-12"; - int numPar = selParams.Count; + int numPar = selTools.Count; if (numPar > 6) { answ = "col-4"; @@ -70,20 +70,15 @@ #region Private Methods - private void toggleParam() - { - showParam = !showParam; - } - #endregion Private Methods #region Protected Methods - protected void paramAdded(string toolName) + protected void toolAdded(string toolName) { - if (!selParams.Contains(toolName)) + if (!selTools.Contains(toolName)) { - selParams.Add(toolName); + selTools.Add(toolName); } } @@ -92,29 +87,29 @@ get { string answ = ""; - if (selParams.Count > 0) + if (selTools.Count > 0) { - answ = $"{selParams.LastOrDefault()}"; + answ = $"{selTools.LastOrDefault()}"; } return answ; } } - protected void paramRemoved(string toolName) + protected void toolRemoved(string toolName) { - if (selParams.Contains(toolName)) + if (selTools.Contains(toolName)) { // controllo se è ultimo rimuovo direttamente if (toolName == lastTool) { - selParams.Remove(toolName); + selTools.Remove(toolName); } } } protected void resetSel() { - selParams = new List(); + selTools = new List(); } protected void toggleRT() From d7c52768afbad3e79fc516b457684f3b08879aa8 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 13:02:48 +0200 Subject: [PATCH 35/57] minor fix --- MP.MONO.UI/Pages/Tools.razor | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 68798cd..b86a299 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -1,23 +1,23 @@ @page "/Tools" -
                -
                -
                +
                +
                +

                Tools

                -
                -
                -
                - -
                -
                - @foreach (var item in selTools) - { -
                - -
                - } -
                +
                +
                +
                +
                + +
                +
                + @foreach (var item in selTools) + { +
                + +
                + }
                From 6bf82f661525cefca14ebda9fe1c461b846fcfe6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 14:48:42 +0200 Subject: [PATCH 36/57] Update struttura dati x DataLog - modifica modello dati - aggiunto enum parametri/tools/all - aggiunte migrations --- MP.MONO.Core/Enums.cs | 14 ++++++++++++-- MP.MONO.Data/Controllers/MpDbController.cs | 12 +++++++----- MP.MONO.Data/DbModels/DataLogModel.cs | 18 +++++++++++++----- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/MP.MONO.Core/Enums.cs b/MP.MONO.Core/Enums.cs index 5b51e30..91b9b31 100644 --- a/MP.MONO.Core/Enums.cs +++ b/MP.MONO.Core/Enums.cs @@ -20,6 +20,16 @@ OR } + /// + /// Tipo di dati salvato in DataLog + /// + public enum DataLogType + { + ND = 0, + Parameter = 1, + Tools + } + /// /// Categoria dataItem /// @@ -35,8 +45,8 @@ ///
        public enum AlarmReportingMode { - ND=0, - + ND = 0, + /// /// MOdalità report per bank di memoria + bitmap degli allarmi attivi nel bank /// diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs index 510890c..9e1a151 100644 --- a/MP.MONO.Data/Controllers/MpDbController.cs +++ b/MP.MONO.Data/Controllers/MpDbController.cs @@ -4,6 +4,7 @@ using MP.MONO.Data.DbModels; using MP.MONO.Data.DTO; using NLog; using System.Diagnostics; +using static MP.MONO.Core.Enums; namespace MP.MONO.Data.Controllers { @@ -523,12 +524,13 @@ namespace MP.MONO.Data.Controllers /// /// Recupero DataLogDTO data condizione filtro /// - /// - /// - /// - /// + /// ID macchina + /// Tipologia di dato richiesto da enum + /// Tipo di Flusso + /// DT Inizio estrazione + /// DT Fine estrazione /// - public List DataLogDtoGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine) + public List DataLogDtoGetFilt(int machineId, DataLogType dataType, string fluxType, DateTime inizio, DateTime fine) { List dbResult = new List(); using (MapoMonoContext localDbCtx = new MapoMonoContext()) diff --git a/MP.MONO.Data/DbModels/DataLogModel.cs b/MP.MONO.Data/DbModels/DataLogModel.cs index 6a9291f..4520324 100644 --- a/MP.MONO.Data/DbModels/DataLogModel.cs +++ b/MP.MONO.Data/DbModels/DataLogModel.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using static MP.MONO.Core.Enums; // @@ -19,6 +20,18 @@ namespace MP.MONO.Data.DbModels [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int DataLogId { get; set; } + /// + /// Macchina cui è riferito il valore + /// + public int MachineId { get; set; } + + + /// + /// Tipologia del dato cui è riferito il valore + /// + public DataLogType DataType { get; set; } = DataLogType.Parameter; + + /// /// DataOra evento registrato /// @@ -30,11 +43,6 @@ namespace MP.MONO.Data.DbModels [MaxLength(250)] public string FluxType { get; set; } = "ND"; - /// - /// Macchina cui è riferito il valore - /// - public int MachineId { get; set; } - /// /// Valore formato numerico (0 se non numerico) /// From 661734d1df10b5bedadd204bbfe2fcc23b87aa69 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 14:48:49 +0200 Subject: [PATCH 37/57] refresh --- 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 +- ...21003124504_UpdateDatalogModel.Designer.cs | 1584 +++++++++++++++++ .../20221003124504_UpdateDatalogModel.cs | 26 + .../MapoMonoContextModelSnapshot.cs | 3 + 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/ParamPlot.razor.cs | 3 +- MP.MONO.UI/Data/CurrentDataService.cs | 17 +- 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 +- 21 files changed, 1644 insertions(+), 21 deletions(-) create mode 100644 MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs create mode 100644 MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index 77cdc4a..4d96a9a 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.308 + 1.2.2210.314 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index f7c73bc..961c3ac 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.308

        +

        Version: 1.2.2210.314


        Release Note:
        • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index f2b2b7c..a53de99 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.308 +1.2.2210.314 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 938d5f1..653d135 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.308 + 1.2.2210.314 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 b29c86d..b0de21d 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.308 + 1.2.2210.314 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index f7c73bc..961c3ac 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.308

          +

          Version: 1.2.2210.314


          Release Note:
          • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index f2b2b7c..a53de99 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.308 +1.2.2210.314 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 0481607..5217382 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.308 + 1.2.2210.314 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.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs new file mode 100644 index 0000000..b05638d --- /dev/null +++ b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs @@ -0,0 +1,1584 @@ +// +using System; +using MP.MONO.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace MP.MONO.Data.Migrations +{ + [DbContext(typeof(MapoMonoContext))] + [Migration("20221003124504_UpdateDatalogModel")] + partial class UpdateDatalogModel + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.2") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmListModel", b => + { + b.Property("AlarmId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("FullValue") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("AlarmId"); + + b.ToTable("AlarmList"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmLogModel", b => + { + b.Property("AlarmLogId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("Index") + .HasColumnType("int"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("MemAddress") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("Status") + .HasColumnType("int unsigned"); + + b.Property("ValDecoded") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("AlarmLogId"); + + b.HasIndex("MachineId"); + + b.ToTable("AlarmLog"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmRecModel", b => + { + b.Property("AlarmRecId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AlarmId") + .HasColumnType("int"); + + b.Property("DtEnd") + .HasColumnType("datetime(6)"); + + b.Property("DtStart") + .HasColumnType("datetime(6)"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.HasKey("AlarmRecId"); + + b.HasIndex("AlarmId"); + + b.HasIndex("MachineId"); + + b.ToTable("AlarmRec"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.AnKeyValModel", b => + { + b.Property("KeyName") + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("Descript") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("ValFloat") + .HasColumnType("int"); + + b.Property("ValInt") + .HasColumnType("int"); + + b.Property("ValString") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("KeyName"); + + b.ToTable("AnKeyVal"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.ConfigModel", b => + { + b.Property("KeyName") + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("Note") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("varchar(500)"); + + b.Property("Val") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("ValStd") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("KeyName"); + + b.ToTable("Config"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.CounterModel", b => + { + b.Property("CCode") + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("ActualVal") + .HasColumnType("double"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("varchar(500)"); + + b.Property("LastReset") + .HasColumnType("datetime(6)"); + + b.HasKey("CCode"); + + b.ToTable("Counter"); + + b.HasData( + new + { + CCode = "MacPowerOn", + ActualVal = 0.0, + Description = "Machine Power On", + LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified) + }, + new + { + CCode = "CycleProc01", + ActualVal = 0.0, + Description = "Process 1 on Cycle state", + LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified) + }, + new + { + CCode = "SpindleTorque01", + ActualVal = 0.0, + Description = "Spindle 01 Torque % > 0", + LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified) + }, + new + { + CCode = "SpindleTorque02", + ActualVal = 0.0, + Description = "Spindle 02 Torque % > 0", + LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified) + }, + new + { + CCode = "SpindleTorque03", + ActualVal = 0.0, + Description = "Spindle 03 Torque % > 0", + LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified) + }, + new + { + CCode = "SpindleTorque04", + ActualVal = 0.0, + Description = "Spindle 04 Torque % > 0", + LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified) + }, + new + { + CCode = "LMCheckElapsed", + ActualVal = 0.0, + Description = "Time Elapsed from last full Manufacturer Check", + LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified) + }); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.DataLogModel", b => + { + b.Property("DataLogId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DataType") + .HasColumnType("int"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("FluxType") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("ValNum") + .HasColumnType("double"); + + b.Property("ValStr") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("DataLogId"); + + b.HasIndex("MachineId"); + + b.ToTable("DataLog"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.DataStAgModel", b => + { + b.Property("DataStAgId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("FluxType") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("NumRec") + .HasColumnType("double"); + + b.Property("ValNumAvg") + .HasColumnType("double"); + + b.Property("ValNumMax") + .HasColumnType("double"); + + b.Property("ValNumMin") + .HasColumnType("double"); + + b.Property("ValStr") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("DataStAgId"); + + b.HasIndex("MachineId"); + + b.ToTable("DataStAg"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.EventLogModel", b => + { + b.Property("EventLogId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CodEvent") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("ValStr") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("EventLogId"); + + b.HasIndex("CodEvent"); + + b.HasIndex("MachineId"); + + b.ToTable("EventLog"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.EventModel", b => + { + b.Property("CodEvent") + .HasColumnType("varchar(255)"); + + b.Property("Active") + .HasColumnType("tinyint(1)"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("IsUser") + .HasColumnType("tinyint(1)"); + + b.HasKey("CodEvent"); + + b.ToTable("Event"); + + b.HasData( + new + { + CodEvent = "", + Active = true, + Description = "NA", + IsUser = false + }, + new + { + CodEvent = "Run", + Active = true, + Description = "Running", + IsUser = true + }, + new + { + CodEvent = "Setup", + Active = true, + Description = "Machine Setup", + IsUser = true + }, + new + { + CodEvent = "ProgEdit", + Active = true, + Description = "Program Editing", + IsUser = true + }, + new + { + CodEvent = "Fill", + Active = true, + Description = "Machine Fill", + IsUser = true + }, + new + { + CodEvent = "SetError", + Active = true, + Description = "Error", + IsUser = true + }, + new + { + CodEvent = "WuCd", + Active = true, + Description = "Warm Up / CoolDown Machine", + IsUser = false + }, + new + { + CodEvent = "ContrPwr", + Active = true, + Description = "Controlled PowerOn / ShutDown", + IsUser = false + }, + new + { + CodEvent = "ProgMiss", + Active = true, + Description = "Program Missing", + IsUser = true + }, + new + { + CodEvent = "HRMiss", + Active = true, + Description = "HR Missing", + IsUser = true + }, + new + { + CodEvent = "Maint", + Active = true, + Description = "Maintenance", + IsUser = true + }, + new + { + CodEvent = "Clean", + Active = true, + Description = "Machine CleanUp", + IsUser = true + }, + new + { + CodEvent = "SetPwrOff", + Active = true, + Description = "Power OFF Declaration", + IsUser = true + }, + new + { + CodEvent = "Init", + Active = true, + Description = "Init", + IsUser = false + }, + new + { + CodEvent = "PowerOff", + Active = true, + Description = "Power OFF", + IsUser = false + }, + new + { + CodEvent = "PowerOn", + Active = true, + Description = "Power ON", + IsUser = false + }, + new + { + CodEvent = "Cycle", + Active = true, + Description = "Machining", + IsUser = false + }, + new + { + CodEvent = "EndCycle", + Active = true, + Description = "End machining", + IsUser = false + }, + new + { + CodEvent = "Error", + Active = true, + Description = "Error", + IsUser = false + }, + new + { + CodEvent = "PzCount", + Active = true, + Description = "Item Count(+1)", + IsUser = false + }, + new + { + CodEvent = "StartPall", + Active = true, + Description = "Start pallet", + IsUser = false + }, + new + { + CodEvent = "EndPall", + Active = true, + Description = "End pallet", + IsUser = false + }, + new + { + CodEvent = "Manual", + Active = true, + Description = "Manual", + IsUser = false + }, + new + { + CodEvent = "LOutFull", + Active = true, + Description = "Line Out Full", + IsUser = false + }, + new + { + CodEvent = "LInEmpty", + Active = true, + Description = "Line In Empty", + IsUser = false + }, + new + { + CodEvent = "CycleTOut", + Active = true, + Description = "Timeout Std CycleTime", + IsUser = false + }, + new + { + CodEvent = "RMatMiss", + Active = true, + Description = "Raw Material Missing", + IsUser = true + }, + new + { + CodEvent = "Emergency", + Active = true, + Description = "Emergency", + IsUser = false + }, + new + { + CodEvent = "ToolRepl", + Active = true, + Description = "Tool Replacement", + IsUser = true + }, + new + { + CodEvent = "CncAlam", + Active = true, + Description = "CNC Alarm", + IsUser = false + }, + new + { + CodEvent = "PlcAlam", + Active = true, + Description = "PLC Alarm", + IsUser = false + }, + new + { + CodEvent = "Warning", + Active = true, + Description = "Warning State", + IsUser = false + }, + new + { + CodEvent = "Message", + Active = true, + Description = "Machine Message", + IsUser = false + }, + new + { + CodEvent = "PzIncr", + Active = true, + Description = "Item Count Increment", + IsUser = false + }, + new + { + CodEvent = "PzSet", + Active = true, + Description = "Item Count Set", + IsUser = false + }, + new + { + CodEvent = "UserComm", + Active = true, + Description = "User Comment", + IsUser = true + }); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.MachineModel", b => + { + b.Property("MachineId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BuildYear") + .HasColumnType("int"); + + b.Property("Code") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("Model") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("Serial") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("MachineId"); + + b.ToTable("Machine"); + + b.HasData( + new + { + MachineId = 1, + BuildYear = 2022, + Code = "", + Description = "Default SIM Machine", + Model = "Egalware SIM", + Name = "EGW-SIM-Machine", + Serial = "SN-0000-0000-0000" + }); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.PendingMaintModel", b => + { + b.Property("SMTaskId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CCode") + .IsRequired() + .HasColumnType("varchar(250)"); + + b.Property("CountStartVal") + .HasColumnType("double"); + + b.Property("DtCreation") + .HasColumnType("datetime(6)"); + + b.Property("DtExecution") + .HasColumnType("datetime(6)"); + + b.Property("ElapsedVal") + .HasColumnType("double"); + + b.Property("ExpiryVal") + .HasColumnType("double"); + + b.Property("PMTaskId") + .HasColumnType("int"); + + b.Property("UserCode") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("SMTaskId"); + + b.HasIndex("CCode"); + + b.HasIndex("PMTaskId"); + + b.ToTable("PendingMaintTask"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.PMMGroupModel", b => + { + b.Property("PMMGCode") + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("varchar(500)"); + + b.HasKey("PMMGCode"); + + b.ToTable("MachineGroup"); + + b.HasData( + new + { + PMMGCode = "Whole", + Description = "Whole Machine" + }, + new + { + PMMGCode = "Load", + Description = "Part loader/unloader" + }, + new + { + PMMGCode = "MovBelts", + Description = "Part moving belts" + }, + new + { + PMMGCode = "MovRoll", + Description = "Part moving rollers" + }, + new + { + PMMGCode = "Axis", + Description = "Machining axis" + }, + new + { + PMMGCode = "Spindles", + Description = "Tool spindles" + }, + new + { + PMMGCode = "ToolChange", + Description = "Automatic tool changer" + }, + new + { + PMMGCode = "Cabinet", + Description = "Electrical cabinet" + }, + new + { + PMMGCode = "ChipConv", + Description = "Chips conveyor" + }, + new + { + PMMGCode = "DustSuct", + Description = "Dust suction" + }, + new + { + PMMGCode = "OpPanel", + Description = "Operator pannel" + }, + new + { + PMMGCode = "Access", + Description = "Accessories" + }); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.PMTaskTopicModel", b => + { + b.Property("PMTCode") + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("varchar(500)"); + + b.HasKey("PMTCode"); + + b.ToTable("TaskTopic"); + + b.HasData( + new + { + PMTCode = "Mechanical", + Description = "Mechanical system" + }, + new + { + PMTCode = "Electro", + Description = "Electrical system" + }, + new + { + PMTCode = "Lubro", + Description = "Lubrication system" + }, + new + { + PMTCode = "Coolant", + Description = "Coolant system" + }, + new + { + PMTCode = "Preumo", + Description = "Pneumatic system" + }, + new + { + PMTCode = "Hydro", + Description = "Hydraulic system" + }, + new + { + PMTCode = "Safety", + Description = "Enclosure/Safety system" + }, + new + { + PMTCode = "Suction", + Description = "Suction system" + }, + new + { + PMTCode = "GeoAdj", + Description = "Geometrical system" + }); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.PMUTModel", b => + { + b.Property("PMUTCode") + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("varchar(500)"); + + b.HasKey("PMUTCode"); + + b.ToTable("UserTeam"); + + b.HasData( + new + { + PMUTCode = "TrainOp", + Description = "Trained Operator" + }, + new + { + PMUTCode = "MaintServ", + Description = "Maintenance Service" + }, + new + { + PMUTCode = "DevSupp", + Description = "Device Supplier" + }, + new + { + PMUTCode = "MultiaxServ", + Description = "Multiax Service" + }); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.PrevMaintTaskModel", b => + { + b.Property("PMTaskId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CCode") + .IsRequired() + .HasColumnType("varchar(250)"); + + b.Property("ExpiryVal") + .HasColumnType("double"); + + b.Property("ExtIdx") + .HasColumnType("int"); + + b.Property("IsDisabled") + .HasColumnType("tinyint(1)"); + + b.Property("JobDescription") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("NumTaskDone") + .HasColumnType("int"); + + b.Property("PMMGCode") + .IsRequired() + .HasColumnType("varchar(250)"); + + b.Property("PMTCode") + .IsRequired() + .HasColumnType("varchar(250)"); + + b.Property("PMUTCode") + .IsRequired() + .HasColumnType("varchar(250)"); + + b.Property("Protected") + .HasColumnType("tinyint(1)"); + + b.HasKey("PMTaskId"); + + b.HasIndex("CCode"); + + b.HasIndex("MachineId"); + + b.HasIndex("PMMGCode"); + + b.HasIndex("PMTCode"); + + b.HasIndex("PMUTCode"); + + b.ToTable("PrevMaintTask"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.ProdLogModel", b => + { + b.Property("ProdLogId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("EvType") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ExtRef") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("ValNum") + .HasColumnType("double"); + + b.Property("ValStr") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("ProdLogId"); + + b.HasIndex("MachineId"); + + b.ToTable("ProdLog"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.StatusLogModel", b => + { + b.Property("EventLogId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CodStatus") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("Duration") + .HasColumnType("float"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("ValStr") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("EventLogId"); + + b.HasIndex("CodStatus"); + + b.HasIndex("MachineId"); + + b.ToTable("StatusLog"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.StatusModel", b => + { + b.Property("CodStatus") + .HasColumnType("varchar(255)"); + + b.Property("CssClass") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("CssClassOvr") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.Property("Group") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("GroupOvr") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("varchar(50)"); + + b.Property("Prior") + .HasColumnType("int"); + + b.Property("ShowProdItem") + .HasColumnType("tinyint(1)"); + + b.HasKey("CodStatus"); + + b.ToTable("Status"); + + b.HasData( + new + { + CodStatus = "", + CssClass = "dark", + CssClassOvr = "", + Description = "NA", + Group = "NA", + GroupOvr = "", + Prior = 0, + ShowProdItem = true + }, + new + { + CodStatus = "Error", + CssClass = "danger", + CssClassOvr = "", + Description = "Error", + Group = "StopRed", + GroupOvr = "", + Prior = 5, + ShowProdItem = true + }, + new + { + CodStatus = "Emergency", + CssClass = "danger", + CssClassOvr = "", + Description = "Emergency", + Group = "StopRed", + GroupOvr = "", + Prior = 5, + ShowProdItem = true + }, + new + { + CodStatus = "Manual", + CssClass = "warning", + CssClassOvr = "", + Description = "Manual", + Group = "ManYellow", + GroupOvr = "", + Prior = 4, + ShowProdItem = true + }, + new + { + CodStatus = "PzProd", + CssClass = "warning", + CssClassOvr = "", + Description = "Item Produced", + Group = "MicroYellow", + GroupOvr = "", + Prior = 4, + ShowProdItem = true + }, + new + { + CodStatus = "Unkn", + CssClass = "warning", + CssClassOvr = "", + Description = "Unknown Stop", + Group = "MicroYellow", + GroupOvr = "", + Prior = 4, + ShowProdItem = true + }, + new + { + CodStatus = "ProgMissing", + CssClass = "danger", + CssClassOvr = "", + Description = "Program Missing", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "HRMissing", + CssClass = "danger", + CssClassOvr = "", + Description = "HR Missing", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Maint", + CssClass = "warning", + CssClassOvr = "", + Description = "Maintenance", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "LineOutFull", + CssClass = "danger", + CssClassOvr = "", + Description = "Line Out Full", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "LineInEmpty", + CssClass = "danger", + CssClassOvr = "", + Description = "Line In Empty", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "RawMatMiss", + CssClass = "danger", + CssClassOvr = "", + Description = "Raw Material Missing", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "CncAlam", + CssClass = "danger", + CssClassOvr = "", + Description = "CNC Alarm", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "PlcAlam", + CssClass = "danger", + CssClassOvr = "", + Description = "PLC Alarm", + Group = "StopRed", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "WUpCDown", + CssClass = "primary", + CssClassOvr = "", + Description = "Warm Up / CoolDown Machine", + Group = "WaitBlue", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "ContrPOnSDown", + CssClass = "primary", + CssClassOvr = "", + Description = "Controller PowerOn / ShutDown", + Group = "WaitBlue", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Init", + CssClass = "primary", + CssClassOvr = "", + Description = "Init", + Group = "WaitBlue", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "PowerOn", + CssClass = "primary", + CssClassOvr = "", + Description = "Power ON", + Group = "WaitBlue", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "TimeoutCycle", + CssClass = "primary", + CssClassOvr = "", + Description = "Timeout Std CycleTime", + Group = "WaitBlue", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Waiting", + CssClass = "primary", + CssClassOvr = "", + Description = "Waiting State", + Group = "WaitBlue", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "ProgEdit", + CssClass = "warning", + CssClassOvr = "", + Description = "Program Editing", + Group = "ManYellow", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Setup", + CssClass = "warning", + CssClassOvr = "", + Description = "Machine Setup", + Group = "ManYellow", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Clean", + CssClass = "warning", + CssClassOvr = "", + Description = "Machine CleanUp", + Group = "ManYellow", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Fill", + CssClass = "warning", + CssClassOvr = "", + Description = "Machine Fill", + Group = "MicroYellow", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "ToolReplace", + CssClass = "warning", + CssClassOvr = "", + Description = "Tool Replacement", + Group = "MicroYellow", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Warning", + CssClass = "warning", + CssClassOvr = "", + Description = "Warning State", + Group = "MicroYellow", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "PowerOff", + CssClass = "secondary", + CssClassOvr = "", + Description = "Power OFF", + Group = "Gray", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Run", + CssClass = "success", + CssClassOvr = "", + Description = "Running", + Group = "Green", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }, + new + { + CodStatus = "Cycle", + CssClass = "success", + CssClassOvr = "", + Description = "Machining", + Group = "Green", + GroupOvr = "", + Prior = 1, + ShowProdItem = true + }); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.StatusStAgModel", b => + { + b.Property("DataStAgId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CodStatus") + .IsRequired() + .HasColumnType("varchar(255)"); + + b.Property("DtRif") + .HasColumnType("datetime(6)"); + + b.Property("Duration") + .HasColumnType("float"); + + b.Property("MachineId") + .HasColumnType("int"); + + b.Property("ValStr") + .IsRequired() + .HasMaxLength(250) + .HasColumnType("varchar(250)"); + + b.HasKey("DataStAgId"); + + b.HasIndex("CodStatus"); + + b.HasIndex("MachineId"); + + b.ToTable("StatusStAg"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmLogModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("MachineNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmRecModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.AlarmListModel", "AlarmListNav") + .WithMany() + .HasForeignKey("AlarmId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("AlarmListNav"); + + b.Navigation("MachineNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.DataLogModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("MachineNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.DataStAgModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("MachineNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.EventLogModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.EventModel", "CodEventNav") + .WithMany() + .HasForeignKey("CodEvent") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("CodEventNav"); + + b.Navigation("MachineNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.PendingMaintModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.CounterModel", "CounterNav") + .WithMany() + .HasForeignKey("CCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.PrevMaintTaskModel", "PMTaskeNav") + .WithMany() + .HasForeignKey("PMTaskId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("CounterNav"); + + b.Navigation("PMTaskeNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.PrevMaintTaskModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.CounterModel", "CounterNav") + .WithMany() + .HasForeignKey("CCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.PMMGroupModel", "MachGroupNav") + .WithMany() + .HasForeignKey("PMMGCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.PMTaskTopicModel", "TopicNav") + .WithMany() + .HasForeignKey("PMTCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.PMUTModel", "UserTeamNav") + .WithMany() + .HasForeignKey("PMUTCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("CounterNav"); + + b.Navigation("MachGroupNav"); + + b.Navigation("MachineNav"); + + b.Navigation("TopicNav"); + + b.Navigation("UserTeamNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.ProdLogModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("MachineNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.StatusLogModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.StatusModel", "CodStatusNav") + .WithMany() + .HasForeignKey("CodStatus") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("CodStatusNav"); + + b.Navigation("MachineNav"); + }); + + modelBuilder.Entity("MP.MONO.Data.DbModels.StatusStAgModel", b => + { + b.HasOne("MP.MONO.Data.DbModels.StatusModel", "CodStatusNav") + .WithMany() + .HasForeignKey("CodStatus") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav") + .WithMany() + .HasForeignKey("MachineId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("CodStatusNav"); + + b.Navigation("MachineNav"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs new file mode 100644 index 0000000..52462d2 --- /dev/null +++ b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace MP.MONO.Data.Migrations +{ + public partial class UpdateDatalogModel : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DataType", + table: "DataLog", + type: "int", + nullable: false, + defaultValue: 1); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "DataType", + table: "DataLog"); + } + } +} diff --git a/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs b/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs index 73e23e2..a379dc3 100644 --- a/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs +++ b/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs @@ -227,6 +227,9 @@ namespace MP.MONO.Data.Migrations .ValueGeneratedOnAdd() .HasColumnType("int"); + b.Property("DataType") + .HasColumnType("int"); + b.Property("DtRif") .HasColumnType("datetime(6)"); diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj index cac66b3..018cc50 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.308 + 1.2.2210.314 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index f7c73bc..961c3ac 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.308

            +

            Version: 1.2.2210.314


            Release Note:
            • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index f2b2b7c..a53de99 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.308 +1.2.2210.314 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 28530a8..3afa2bd 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.308 + 1.2.2210.314 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/ParamPlot.razor.cs b/MP.MONO.UI/Components/ParamPlot.razor.cs index aa3a28f..5e9bbf4 100644 --- a/MP.MONO.UI/Components/ParamPlot.razor.cs +++ b/MP.MONO.UI/Components/ParamPlot.razor.cs @@ -2,6 +2,7 @@ using MP.MONO.Data; using MP.MONO.Data.DTO; using MP.MONO.UI.Data; +using static MP.MONO.Core.Enums; namespace MP.MONO.UI.Components { @@ -118,7 +119,7 @@ namespace MP.MONO.UI.Components isLoading = true; ListRecords = null; await Task.Delay(1); - ListRecords = await MMDataService.DataLogDtoGetFilt(MachineId, SelectedParam, StartDate, EndDate); + ListRecords = await MMDataService.DataLogDtoGetFilt(MachineId, DataLogType.Parameter, SelectedParam, StartDate, EndDate); await Task.Delay(1); // converto in plotdata LevelVal = ListRecords.Select(l => new chartJsData.chartJsTSerie() { x = l.DtRif, y = l.ValNum }).ToList(); diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs index 6a3edfa..4bf970c 100644 --- a/MP.MONO.UI/Data/CurrentDataService.cs +++ b/MP.MONO.UI/Data/CurrentDataService.cs @@ -268,11 +268,20 @@ namespace MP.MONO.UI.Data Log.Info($"DataLogGetFilt | {machineId} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb"); return dbResult; } - public async Task> DataLogDtoGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine) + /// + /// TimeSearie in formato DataLogDTO + /// + /// ID macchina + /// Tipologia di dato richiesto da enum + /// Tipo di Flusso + /// DT Inizio estrazione + /// DT Fine estrazione + /// + public async Task> DataLogDtoGetFilt(int machineId, DataLogType dataType, string fluxType, DateTime inizio, DateTime fine) { string source = "DB"; List dbResult = new List(); - string currKey = $"{Constants.DATA_LOG_DTO_KEY}:{machineId}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}"; + string currKey = $"{Constants.DATA_LOG_DTO_KEY}:{machineId}:{dataType}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}"; Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string rawData = await redisDb.StringGetAsync(currKey); @@ -291,14 +300,14 @@ namespace MP.MONO.UI.Data } else { - dbResult = dbController.DataLogDtoGetFilt(machineId, fluxType, inizio, fine); + dbResult = dbController.DataLogDtoGetFilt(machineId, dataType, fluxType, inizio, fine); // salvo per 2 min... rawData = JsonConvert.SerializeObject(dbResult); await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromSeconds(120)); } stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; - Log.Info($"DataLogDtoGetFilt | {machineId} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb"); + Log.Info($"DataLogDtoGetFilt | {machineId} | {dataType} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb"); return dbResult; } diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 5a717e5..b5c970d 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.312 + 1.2.2210.314 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 3734d4c..961c3ac 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.312

              +

              Version: 1.2.2210.314


              Release Note:
              • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index d16ccd8..a53de99 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.312 +1.2.2210.314 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index d50a008..130018f 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.312 + 1.2.2210.314 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 From 904cafa91b7414e4f56e596e1579855530bb5218 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 14:57:30 +0200 Subject: [PATCH 38/57] refresh controller --- MP.MONO.Data/Controllers/MpDbController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs index 9e1a151..eadd62a 100644 --- a/MP.MONO.Data/Controllers/MpDbController.cs +++ b/MP.MONO.Data/Controllers/MpDbController.cs @@ -539,7 +539,7 @@ namespace MP.MONO.Data.Controllers { dbResult = localDbCtx .DbSetDataLog - .Where(x => x.MachineId == machineId && x.FluxType == fluxType && x.DtRif >= inizio && x.DtRif <= fine) + .Where(x => (x.MachineId == machineId) && (x.FluxType == fluxType) && (x.DataType == dataType || dataType== DataLogType.ND) && (x.DtRif >= inizio && x.DtRif <= fine)) .Select(r => new DataLogDTO() { DataLogId=r.DataLogId, DtRif=r.DtRif, ValNum=r.ValNum }) .OrderByDescending(x => x.DataLogId) .ToList(); From bc68faea092bd2dff07dae7562bc8286c94ad47a Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 15:28:38 +0200 Subject: [PATCH 39/57] aggiunta history plot --- MP.MONO.UI/Components/ToolsPlot.razor.cs | 211 ++++++++------------ MP.MONO.UI/Components/ToolsPlotRT.razor | 29 +++ MP.MONO.UI/Components/ToolsPlotRT.razor.cs | 213 +++++++++++++++++++++ MP.MONO.UI/Data/DataFilter.cs | 4 +- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Tools.razor | 54 ++++-- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 9 files changed, 366 insertions(+), 153 deletions(-) create mode 100644 MP.MONO.UI/Components/ToolsPlotRT.razor create mode 100644 MP.MONO.UI/Components/ToolsPlotRT.razor.cs diff --git a/MP.MONO.UI/Components/ToolsPlot.razor.cs b/MP.MONO.UI/Components/ToolsPlot.razor.cs index d89593b..ab8aac0 100644 --- a/MP.MONO.UI/Components/ToolsPlot.razor.cs +++ b/MP.MONO.UI/Components/ToolsPlot.razor.cs @@ -1,41 +1,55 @@ using Microsoft.AspNetCore.Components; using MP.MONO.Core.DTO; using MP.MONO.Data; +using MP.MONO.Data.DTO; +using MP.MONO.UI.Data; using Newtonsoft.Json; +using static MP.MONO.Core.Enums; namespace MP.MONO.UI.Components { public partial class ToolsPlot { + #region Public Properties + + [Parameter] + public int MachineId { get; set; } = 1; + + public string ToolId + { + get => _selTool.Replace(" ", "_"); + } + + [Parameter] + public string SelectedTool + { + get => _selTool; + set => _selTool = value; + } + + [Parameter] + public DataLogFilter SelFilter + { + get => _SelFilter; + set { _SelFilter = value; } + } + + #endregion Public Properties + #region Protected Fields protected DateTime lastRec = DateTime.Now.AddMinutes(-1); - + protected List LevelVal = new List(); protected Dictionary listMaxVal = new Dictionary(); - protected Dictionary listMinVal = new Dictionary(); - protected Dictionary> plotData = new Dictionary>(); - #endregion Protected Fields #region Protected Properties + protected DataLogFilter _SelFilter { get; set; } = new DataLogFilter(); protected string _selTool { get; set; } = ""; - protected List LevelVal - { - get - { - List answ = new List(); - if (plotData.ContainsKey(SelectedTool)) - { - answ = plotData[SelectedTool]; - } - return answ; - } - } - protected string? MaxVal { get @@ -66,148 +80,77 @@ namespace MP.MONO.UI.Components #endregion Protected Properties - #region Public Properties - - [Parameter] - public int maxRecord { get; set; } = 120; - - public string ToolId - { - get => _selTool.Replace(" ", "_"); - } - - [Parameter] - public double sampleSecMin { get; set; } = 1; - - [Parameter] - public string SelectedTool - { - get - { - return _selTool; - } - set - { - // controllo se è variato - if (_selTool != value) - { - // salvo - _selTool = value; - // cerco se ho in dictionary... - if (!plotData.ContainsKey(value)) - { - DateTime adesso = DateTime.Now; - // creo un oggetto della lunghezza desiderata... - var emptyData = new List(); - for (int i = -maxRecord; i < 0; i++) - { - emptyData.Add(new chartJsData.chartJsTSerie() { x = adesso.AddSeconds(i), y = 0 }); - } - plotData.Add(value, emptyData); - } - } - } - } - - #endregion Public Properties - - #region Private Methods - - //private int inputValue = 123; - private void ToolsPipe_EA_NewMessage(object? sender, EventArgs e) - { - DateTime adesso = DateTime.Now; - if (lastRec.AddSeconds(sampleSecMin) < adesso) - { - PubSubEventArgs currArgs = (PubSubEventArgs)e; - if (!string.IsNullOrEmpty(currArgs.newMessage)) - { - try - { - var ListRecords = JsonConvert.DeserializeObject>(currArgs.newMessage); - // prendo SOLO il dato della TS richiesta - if (ListRecords != null) - { - // accodo in blocco tutti i valori... - foreach (var item in ListRecords) - { - // cerco se ci sono min/max del valore indicato... - if (!listMinVal.ContainsKey(item.Title)) - { - listMinVal.Add(item.Title, $"{item.MinVal:N0}"); - } - if (!listMaxVal.ContainsKey(item.Title)) - { - listMaxVal.Add(item.Title, $"{item.MaxVal:N0}"); - } - // verifico dictionary se mancasse... - if (!plotData.ContainsKey(item.Title)) - { - //plotData.Add(item.Title, new List()); - // creo un oggetto della lunghezza desiderata... - var emptyData = new List(); - for (int i = -maxRecord; i < 0; i++) - { - emptyData.Add(new chartJsData.chartJsTSerie() { x = adesso.AddSeconds(i), y = 0 }); - } - plotData.Add(item.Title, emptyData); - } - // ora accodo il valore - if (plotData.ContainsKey(item.Title)) - { - plotData[item.Title].Add(new chartJsData.chartJsTSerie() { x = adesso, y = item.ValueNum }); - // verifico limite visualizzazione - if (plotData[item.Title].Count > maxRecord) - { - plotData[item.Title].RemoveRange(0, plotData[item.Title].Count - maxRecord); - } - } - } - } - } - catch - { } - } - lastRec = adesso; - } - InvokeAsync(() => - { - StateHasChanged(); - }); - } - - #endregion Private Methods - #region Protected Methods protected List getFillColors(string alpha) { List answ = new List(); - answ.Add($"rgba(108, 164, 254, {alpha})"); + answ.Add($"rgba(108, 214, 164, {alpha})"); return answ; } protected List getLineColors(string alpha) { List answ = new List(); - answ.Add($"rgba(54, 82, 254, {alpha})"); + answ.Add($"rgba(54, 204, 82, {alpha})"); return answ; } protected List getPointColors(string alpha) { List answ = new List(); - answ.Add($"rgba(108, 118, 158, {alpha})"); + answ.Add($"rgba(108, 158, 118, {alpha})"); return answ; } protected override async Task OnInitializedAsync() { - //await ReloadData(); + await ReloadData(); await Task.Delay(1); - MMDataService.toolsPipe.EA_NewMessage += ToolsPipe_EA_NewMessage; + } + + protected override async Task OnParametersSetAsync() + { + isLoading = true; + await ReloadData(); + await Task.Delay(1); + } + + protected async Task ReloadData() + { + isLoading = true; + ListRecords = null; + await Task.Delay(1); + ListRecords = await MMDataService.DataLogDtoGetFilt(MachineId, DataLogType.Tools, SelectedTool, StartDate, EndDate); + await Task.Delay(1); + // converto in plotdata + LevelVal = ListRecords.Select(l => new chartJsData.chartJsTSerie() { x = l.DtRif, y = l.ValNum }).ToList(); + await Task.Delay(1); + isLoading = false; } #endregion Protected Methods + + #region Private Fields + + private List? ListRecords = null; + + #endregion Private Fields + + #region Private Properties + + private DateTime EndDate + { + get => _SelFilter.DtEnd; + } + + private bool isLoading { get; set; } = false; + + private DateTime StartDate + { + get => _SelFilter.DtStart; + } + + #endregion Private Properties } } \ No newline at end of file diff --git a/MP.MONO.UI/Components/ToolsPlotRT.razor b/MP.MONO.UI/Components/ToolsPlotRT.razor new file mode 100644 index 0000000..3fd9e64 --- /dev/null +++ b/MP.MONO.UI/Components/ToolsPlotRT.razor @@ -0,0 +1,29 @@ +@using MP.MONO.UI.Components +@using MP.MONO.Core.DTO +@using MP.MONO.UI.Data +@using Microsoft.Extensions.Configuration; + +@inject IConfiguration Configuration; + +@inject CurrentDataService MMDataService + +@if (!string.IsNullOrEmpty(@SelectedTool)) +{ +
                +
                + @SelectedTool +
                +
                +
                +
                + @if (LevelVal == null || LevelVal.Count == 0) + { + + } + else + { + + } +
                +
                +} diff --git a/MP.MONO.UI/Components/ToolsPlotRT.razor.cs b/MP.MONO.UI/Components/ToolsPlotRT.razor.cs new file mode 100644 index 0000000..2fee97a --- /dev/null +++ b/MP.MONO.UI/Components/ToolsPlotRT.razor.cs @@ -0,0 +1,213 @@ +using Microsoft.AspNetCore.Components; +using MP.MONO.Core.DTO; +using MP.MONO.Data; +using Newtonsoft.Json; + +namespace MP.MONO.UI.Components +{ + public partial class ToolsPlotRT + { + #region Protected Fields + + protected DateTime lastRec = DateTime.Now.AddMinutes(-1); + + protected Dictionary listMaxVal = new Dictionary(); + + protected Dictionary listMinVal = new Dictionary(); + + protected Dictionary> plotData = new Dictionary>(); + + #endregion Protected Fields + + #region Protected Properties + + protected string _selTool { get; set; } = ""; + + protected List LevelVal + { + get + { + List answ = new List(); + if (plotData.ContainsKey(SelectedTool)) + { + answ = plotData[SelectedTool]; + } + return answ; + } + } + + protected string? MaxVal + { + get + { + string answ = "0"; + if (listMaxVal != null && listMaxVal.Count > 0) + { + answ = listMaxVal[SelectedTool] ?? "0"; + } + + return answ; + } + } + + protected string? MinVal + { + get + { + string answ = "0"; + if (listMinVal != null && listMinVal.Count > 0) + { + answ = listMinVal[SelectedTool] ?? "0"; + } + + return answ; + } + } + + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public int maxRecord { get; set; } = 120; + + public string ToolId + { + get => _selTool.Replace(" ", "_"); + } + + [Parameter] + public double sampleSecMin { get; set; } = 1; + + [Parameter] + public string SelectedTool + { + get + { + return _selTool; + } + set + { + // controllo se è variato + if (_selTool != value) + { + // salvo + _selTool = value; + // cerco se ho in dictionary... + if (!plotData.ContainsKey(value)) + { + DateTime adesso = DateTime.Now; + // creo un oggetto della lunghezza desiderata... + var emptyData = new List(); + for (int i = -maxRecord; i < 0; i++) + { + emptyData.Add(new chartJsData.chartJsTSerie() { x = adesso.AddSeconds(i), y = 0 }); + } + plotData.Add(value, emptyData); + } + } + } + } + + #endregion Public Properties + + #region Private Methods + + //private int inputValue = 123; + private void ToolsPipe_EA_NewMessage(object? sender, EventArgs e) + { + DateTime adesso = DateTime.Now; + if (lastRec.AddSeconds(sampleSecMin) < adesso) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + var ListRecords = JsonConvert.DeserializeObject>(currArgs.newMessage); + // prendo SOLO il dato della TS richiesta + if (ListRecords != null) + { + // accodo in blocco tutti i valori... + foreach (var item in ListRecords) + { + // cerco se ci sono min/max del valore indicato... + if (!listMinVal.ContainsKey(item.Title)) + { + listMinVal.Add(item.Title, $"{item.MinVal:N0}"); + } + if (!listMaxVal.ContainsKey(item.Title)) + { + listMaxVal.Add(item.Title, $"{item.MaxVal:N0}"); + } + // verifico dictionary se mancasse... + if (!plotData.ContainsKey(item.Title)) + { + //plotData.Add(item.Title, new List()); + // creo un oggetto della lunghezza desiderata... + var emptyData = new List(); + for (int i = -maxRecord; i < 0; i++) + { + emptyData.Add(new chartJsData.chartJsTSerie() { x = adesso.AddSeconds(i), y = 0 }); + } + plotData.Add(item.Title, emptyData); + } + // ora accodo il valore + if (plotData.ContainsKey(item.Title)) + { + plotData[item.Title].Add(new chartJsData.chartJsTSerie() { x = adesso, y = item.ValueNum }); + // verifico limite visualizzazione + if (plotData[item.Title].Count > maxRecord) + { + plotData[item.Title].RemoveRange(0, plotData[item.Title].Count - maxRecord); + } + } + } + } + } + catch + { } + } + lastRec = adesso; + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + + #endregion Private Methods + + #region Protected Methods + + protected List getFillColors(string alpha) + { + List answ = new List(); + answ.Add($"rgba(108, 164, 254, {alpha})"); + return answ; + } + + protected List getLineColors(string alpha) + { + List answ = new List(); + answ.Add($"rgba(54, 82, 254, {alpha})"); + return answ; + } + + protected List getPointColors(string alpha) + { + List answ = new List(); + answ.Add($"rgba(108, 118, 158, {alpha})"); + return answ; + } + + protected override async Task OnInitializedAsync() + { + //await ReloadData(); + await Task.Delay(1); + MMDataService.toolsPipe.EA_NewMessage += ToolsPipe_EA_NewMessage; + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.MONO.UI/Data/DataFilter.cs b/MP.MONO.UI/Data/DataFilter.cs index d8039d2..c1e3a5e 100644 --- a/MP.MONO.UI/Data/DataFilter.cs +++ b/MP.MONO.UI/Data/DataFilter.cs @@ -3,8 +3,8 @@ public class DataLogFilter { - public DateTime DtStart { get; set; } = DateTime.Today.AddDays(-1); - public DateTime DtEnd { get; set; } = DateTime.Today.AddDays(1); + public DateTime DtStart { get; set; } = DateTime.Today.AddDays(-3); + public DateTime DtEnd { get; set; } = DateTime.Today.AddDays(3); public override bool Equals(object obj) { diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index b5c970d..d5f0ff0 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.314 + 1.2.2210.315 diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index b86a299..14955d9 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -2,23 +2,51 @@
                -
                -

                Tools

                -
                -
                -
                - +

                Tools

                +
                -
                - @foreach (var item in selTools) - { -
                - +
                +
                +
                +
                +
                +
                + + +
                - } +
                +
                +
                +
                +
                +
                + +
                +
                + @if (isRT) + { + + @foreach (var item in selTools) + { +
                + +
                + } + } + else + { + @foreach (var item in selTools) + { +
                + +
                + } + } +
                -
                \ No newline at end of file +
                diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 961c3ac..b0482f7 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.314

                +

                Version: 1.2.2210.315


                Release Note:
                • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index a53de99..06fee29 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.314 +1.2.2210.315 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 130018f..0aa4a57 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.314 + 1.2.2210.315 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 From b354763cc43231281d400796554c770c556acd6c Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 15:46:53 +0200 Subject: [PATCH 40/57] Aggiunta Filtri pagina tools --- MP.MONO.UI/Pages/Tools.razor | 108 ++++++++++++++++++++++---------- MP.MONO.UI/Pages/Tools.razor.cs | 6 +- 2 files changed, 78 insertions(+), 36 deletions(-) diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 14955d9..2ddee36 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -3,49 +3,89 @@
                  -
                  -

                  Tools

                  +
                  +
                  +
                  +

                  Tools

                  +
                  +
                  + +
                  +
                  +
                  +
                  +
                  +
                  +
                  + + +
                  +
                  +
                  +
                  +
                  +
                  +
                  + @if (showParam) + { +
                  + @if (isRT) + { + Num Rec + + Sample Sec Time + + } + else + { + Date From + + Date To + -
                  -
                  -
                  -
                  -
                  -
                  -
                  - - + } + +
                  + } + else + { +
                  + +
                  + } +
                  -
                  -
                  -
                  - -
                  -
                  - @if (isRT) - { +
                  - @foreach (var item in selTools) - { -
                  - -
                  - } - } - else +
                  +
                  +
                  + +
                  +
                  + @if (isRT) + { + + @foreach (var item in selTools) { - @foreach (var item in selTools) - { -
                  - -
                  - } +
                  + +
                  } -
                  + } + else + { + @foreach (var item in selTools) + { +
                  + +
                  + } + }
                  diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index 6324a54..305c2de 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -1,4 +1,6 @@ -namespace MP.MONO.UI.Pages +using MP.MONO.UI.Data; + +namespace MP.MONO.UI.Pages { public partial class Tools { @@ -19,7 +21,7 @@ set => SelFilter.DtEnd = value; } - protected MP.MONO.UI.Data.DataLogFilter SelFilter { get; set; } = new MP.MONO.UI.Data.DataLogFilter(); + protected DataLogFilter SelFilter { get; set; } = new DataLogFilter(); #endregion Private Fields From f7357aded9d166cbcaeeaf5a7b77c5911376f1ae Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 15:55:02 +0200 Subject: [PATCH 41/57] fix parametri --- MP.MONO.UI/Pages/Tools.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 2ddee36..9b23999 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -1,6 +1,6 @@ @page "/Tools" -
                  +
                  From cfaf57f34f5ad80d4b7292ce22d64521e397cb86 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 15:55:14 +0200 Subject: [PATCH 42/57] UPdate gestione SIM x nuovo val --- MP.MONO.Core/Constants.cs | 3 +- MP.MONO.DECODER/ParamsManager.cs | 1 + MP.MONO.DECODER/Program.cs | 95 +++++++++++++ MP.MONO.DECODER/ToolsManager.cs | 155 +++++++++++++++++++++ MP.MONO.DECODER/lua/CountersDecoder.lua | 4 +- MP.MONO.DECODER/lua/ParamsDecoder.lua | 2 +- MP.MONO.DECODER/lua/ToolsDecoder.lua | 105 ++++++++++++++ MP.MONO.Data/Controllers/MpDbController.cs | 5 +- MP.MONO.SIM/Program.cs | 3 +- MP.MONO.UI/Data/CurrentDataService.cs | 17 ++- 10 files changed, 379 insertions(+), 11 deletions(-) create mode 100644 MP.MONO.DECODER/ToolsManager.cs create mode 100644 MP.MONO.DECODER/lua/ToolsDecoder.lua diff --git a/MP.MONO.Core/Constants.cs b/MP.MONO.Core/Constants.cs index 0941556..4c2e9c6 100644 --- a/MP.MONO.Core/Constants.cs +++ b/MP.MONO.Core/Constants.cs @@ -74,9 +74,10 @@ namespace MP.MONO.Core // REDIS Channels messaggi (verso DECODER) public static readonly string ALARM_RAW_QUEUE = $"AlarmsRawVal"; + public static readonly string COUNT_RAW_QUEUE = $"CountRawVal"; public static readonly string PARAMS_RAW_QUEUE = $"ParamsRawVal"; public static readonly string STATUS_RAW_QUEUE = $"StatusRawVal"; - public static readonly string COUNT_RAW_QUEUE = $"CountRawVal"; + public static readonly string TOOLS_RAW_QUEUE = $"ToolsRawVal"; #endregion Public Fields } diff --git a/MP.MONO.DECODER/ParamsManager.cs b/MP.MONO.DECODER/ParamsManager.cs index cf6b60b..e131fa7 100644 --- a/MP.MONO.DECODER/ParamsManager.cs +++ b/MP.MONO.DECODER/ParamsManager.cs @@ -133,6 +133,7 @@ namespace MP.MONO.DECODER DtRif = adesso, FluxType = item.Key, MachineId = 1, + DataType = Enums.DataLogType.Parameter, ValNum = calcVal, ValStr = $"{calcVal:N3}" diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs index 75ad3aa..88e1832 100644 --- a/MP.MONO.DECODER/Program.cs +++ b/MP.MONO.DECODER/Program.cs @@ -100,6 +100,7 @@ setupConf(); DateTime lastExecParams = DateTime.Now.AddHours(-1); DateTime lastLogDetail = DateTime.Now.AddHours(-1); int numSendParam = 1; +int numSendTools = 1; int numSendMStatus = 1; /* -------------------------------- @@ -126,6 +127,19 @@ DateTime lastExecStatus = DateTime.Now.AddHours(-1); // registro gestione eventi mpStatusRecvPipe.EA_NewMessage += MpStatusRecvPipe_EA_NewMessage; + +/* -------------------------------- + * Setup Gestione Tools + * --------------------------------*/ +ToolsManager toolsMan = new ToolsManager(); +// inizializzo gestione messagePipe da Redis x allarmi +MessagePipe toolsSendPipe = new MessagePipe(redisConn, Constants.TOOLS_M_QUEUE); +MessagePipe toolsRecvPipe = new MessagePipe(redisConn, Constants.TOOLS_RAW_QUEUE); +// datetime dell'inizio esecuzione task... x usare un semaforo di veto doppia esecuzione entro 30 sec +DateTime lastExecTools = DateTime.Now.AddHours(-1); +// registro gestione eventi +toolsRecvPipe.EA_NewMessage += ToolsRecvPipe_EA_NewMessage; + /* -------------------------------- * Setup Gestione Parametri * --------------------------------*/ @@ -535,6 +549,87 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e) } } +/// +/// Gestione evento ricezione messaggi tools +/// +void ToolsRecvPipe_EA_NewMessage(object? sender, EventArgs e) +{ + PubSubEventArgs currArgs = (PubSubEventArgs)e; + // conversione on-the-fly Dictionary --> parametri valorizzati (tra quelli configurati) + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + DateTime adesso = DateTime.Now; + List? redisToolsConf = new List(); + try + { + // verifico codici ricevuti + var toolsList = JsonConvert.DeserializeObject>(currArgs.newMessage); + if (toolsList != null) + { + // recupero elenco parametri salvati in redis... + string rawData = redisDb.StringGet(Constants.TOOLS_CONF_KEY); + if (!string.IsNullOrEmpty(rawData)) + { + redisToolsConf = JsonConvert.DeserializeObject>(rawData); + // se ho i parametri... + if (redisToolsConf != null) + { + // ciclo x ogni valore ricevuto da message service... + foreach (var item in toolsList) + { + // cerco il parametro corrispondente... + var currToolVal = redisToolsConf.FirstOrDefault(x => x.Title == item.Key); + if (currToolVal != null) + { + currToolVal.ValueNum = item.Value; + currToolVal.Value = $"{item.Value.ToString(currToolVal.DisplFormat)}"; + } + } + // verifico NON ci sia veto di scrittura... DbSampleInt (60 sec...) + if (adesso.Subtract(lastExecTools).TotalSeconds > DbSampleInt) + { + lastExecTools = adesso; + if (dbController != null) + { + // verifico x ogni parametro se sia completato il periodo di campionamento... + var val2save = toolsMan.processData(toolsList, redisToolsConf); + if (val2save.Count > 0) + { + // salvo sul DB + _ = dbController.DataLogInsertMany(val2save).Result; + Log.Info($"Tools | DB | {val2save.Count} rec inserted"); + } + } + } + } + } + + // invio sulla message pipeline corretta TUTTI i parametri aggiornati serializzati + string updRawVal = JsonConvert.SerializeObject(redisToolsConf); + toolsSendPipe.saveAndSendMessage(Constants.TOOLS_CURR_KEY, updRawVal); + if (redisToolsConf != null) + { + if (adesso.Subtract(lastLogDetail).TotalSeconds > 5 || numSendTools > 10) + { + Log.Info($"TOOLS | {redisToolsConf.Count} data transmitted x {numSendTools}"); + lastLogDetail = adesso; + numSendTools = 0; + } + else + { + numSendTools++; + } + } + } + } + catch (Exception exc) + { + Log.Error($"Eccezione in ToolsRecvPipe_EA_NewMessage:{Environment.NewLine}{exc}{Environment.NewLine}{currArgs.newMessage}"); + } + } +} + + /// /// Gestione evento ricezione messaggi parametri /// diff --git a/MP.MONO.DECODER/ToolsManager.cs b/MP.MONO.DECODER/ToolsManager.cs new file mode 100644 index 0000000..9b360c6 --- /dev/null +++ b/MP.MONO.DECODER/ToolsManager.cs @@ -0,0 +1,155 @@ +using MP.MONO.Core; +using MP.MONO.Core.DTO; +using MP.MONO.Data.DbModels; +using NLog; +using NLua; + +namespace MP.MONO.DECODER +{ + public class ToolsManager + { + #region Private Fields + + /// + /// Dizionario dei valori accumulati sulle variabili + /// + private Dictionary VarAccumulator = new Dictionary(); + + #endregion Private Fields + + #region Protected Fields + + protected static Logger Log = LogManager.GetCurrentClassLogger(); + protected static string luaPath = ""; + protected static Lua state = new Lua(); + protected List AlarmList = new List(); + + #endregion Protected Fields + + #region Public Fields + + public static string alarmStatus = ""; + public static bool valueChanged = false; + + #endregion Public Fields + + #region Public Constructors + + public ToolsManager() + { + // preparo variabile x avvisare script che il modo è da NLua + state["callMode"] = "NLua"; + state["vcFunct"] = "AVG"; + + // carico il file (derivato da quello dei parametri) + luaPath = Path.Combine(Directory.GetCurrentDirectory(), "lua", "ToolsDecoder.lua"); + state.DoFile(luaPath); + + Log.Info("ToolsManager OK"); + Console.WriteLine("ToolsManager OK"); + } + + #endregion Public Constructors + + #region Public Methods + + /// + /// Funzione chiamata LUA x calcolo degli eventuali parametri con periodi "scaduti" + /// + /// + /// + /// + public List processData(Dictionary paramsList, List redisParamConf) + { + List answ = new List(); + DateTime adesso = DateTime.Now; + + // vado ad "accumulare i dati" a quelli presenti... + foreach (var item in paramsList) + { + var currParam = redisParamConf.FirstOrDefault(x => x.Title == item.Key); + // cerco nelle variabili accomulatori... + if (!VarAccumulator.ContainsKey(item.Key)) + { + if (currParam != null) + { + var dataList = new List(); + dataList.Add(item.Value); + VCData newSet = new VCData() + { + dataArray = dataList, + DTStart = adesso, + Funzione = currParam.VcFunc, + Period = currParam.SamplePeriod + }; + // se non ci fosse creo + VarAccumulator.Add(item.Key, newSet); + } + } + else + { + // altrimenti aggiorno + VarAccumulator[item.Key].dataArray.Add(item.Value); + } + + // effettuo verifiche scadenza + bool calcOk = false; + double calcVal = 0; + if (VarAccumulator.ContainsKey(item.Key)) + { + if (VarAccumulator[item.Key].isElapsed) + { + string funcMode = $"{VarAccumulator[item.Key].Funzione}"; + // se scaduto --> mando a LUA x calcolo + state["valList"] = VarAccumulator[item.Key].dataArray; + state["numRec"] = VarAccumulator[item.Key].dataArray.Count; + state["vcFunct"] = funcMode; + + // effettuo calcolo + state.DoString("doProcess()"); + + // recupero valore calcolato + bool.TryParse(state.GetString("calcOk"), out calcOk); + if (calcOk) + { + try + { + var stringVal = state.GetString("calcVal"); + if (!string.IsNullOrEmpty(stringVal)) + { + calcVal = state.GetNumber("calcVal"); + Log.Trace($"calcVal: {calcVal}"); + } + } + catch (Exception exc) + { + Log.Error($"exception during processData for {item.Key}{Environment.NewLine}{exc}"); + } + } + + // aggiungo alla lista finale... + var dbRecord = new DataLogModel() + { + DtRif = adesso, + FluxType = item.Key, + MachineId = 1, + DataType = Enums.DataLogType.Tools, + ValNum = calcVal, + ValStr = $"{calcVal:N3}" + + }; + answ.Add(dbRecord); + + // elimino dai valori accumulati... + VarAccumulator.Remove(item.Key); + } + } + } + + + return answ; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.MONO.DECODER/lua/CountersDecoder.lua b/MP.MONO.DECODER/lua/CountersDecoder.lua index b56e76c..8ce917a 100644 --- a/MP.MONO.DECODER/lua/CountersDecoder.lua +++ b/MP.MONO.DECODER/lua/CountersDecoder.lua @@ -1,10 +1,10 @@ --[[--------------------------------------------------- -Procedura calcolo statistiche parametri: +Procedura calcolo statistiche counters (derivato dai parametri): Variabili IN: - vcFunct(string): tipo di processing da effettuare tra [POINT/AVG/MEDIAN/MIN/MAX] - valList(): elenco VALORI double da processare -- numRec(int): conteggio numero recorda da processare +- numRec(int): conteggio numero record da processare Variabili OUT: - calcVal(double): valore calcolato finale diff --git a/MP.MONO.DECODER/lua/ParamsDecoder.lua b/MP.MONO.DECODER/lua/ParamsDecoder.lua index b56e76c..2b76d18 100644 --- a/MP.MONO.DECODER/lua/ParamsDecoder.lua +++ b/MP.MONO.DECODER/lua/ParamsDecoder.lua @@ -4,7 +4,7 @@ Procedura calcolo statistiche parametri: Variabili IN: - vcFunct(string): tipo di processing da effettuare tra [POINT/AVG/MEDIAN/MIN/MAX] - valList(): elenco VALORI double da processare -- numRec(int): conteggio numero recorda da processare +- numRec(int): conteggio numero record da processare Variabili OUT: - calcVal(double): valore calcolato finale diff --git a/MP.MONO.DECODER/lua/ToolsDecoder.lua b/MP.MONO.DECODER/lua/ToolsDecoder.lua new file mode 100644 index 0000000..0296c8d --- /dev/null +++ b/MP.MONO.DECODER/lua/ToolsDecoder.lua @@ -0,0 +1,105 @@ +--[[--------------------------------------------------- +Procedura calcolo statistiche TOOLS: + +Variabili IN: +- vcFunct(string): tipo di processing da effettuare tra [POINT/AVG/MEDIAN/MIN/MAX] +- valList(): elenco VALORI double da processare +- numRec(int): conteggio numero record da processare + +Variabili OUT: +- calcVal(double): valore calcolato finale +-----------------------------------------------------]] + + +-- Per eventuale debug +local ZBS = "c:/ZeroBraneStudio" +if not package.path:find(ZBS,1,true) then + package.path = ZBS .. "/lualibs/?/?.lua;" .. ZBS .. "/lualibs/?.lua;" .. package.path + package.cpath = ZBS .. "/bin/?.dll;" .. ZBS .. "/bin/clibs53/?.dll;" .. package.cpath +end + +-- se non è da NLua inizializzo variabili accessorie +local function checkInit() + if (callMode ~= 'NLua') then + -- imposto valori test + valList = { 4467, 4468, 4467, 4467, 4467, 4467 } + numRec = #valList + --valList = { 4.0, 5.0, 3.0, 6.0, 1.0, 2.0 } + vcFunct = 'AVG' + --POINT AVG MEDIAN MIN MAX + end +end + +local function setupTable() + if numRec > 0 and valList[0] ~= nil then + for i = numRec, 1, -1 do + valListTable[i] = valList[i-1] + end + else + valListTable = valList + end +end + + +local function doCalc() + if(numRec > 0) then + -- verifica il tipo di richiesta + if(vcFunct == 'AVG') then + s = 0 + for i,v in ipairs(valListTable) do + s = s + v + end + calcVal = s / numRec + elseif(vcFunct == 'POINT') then + calcVal = valListTable[numRec] + elseif(vcFunct == 'MEDIAN') then + table.sort(valListTable) + calcVal = valListTable[numRec/2] + elseif(vcFunct == 'MIN') then + table.sort(valListTable) + calcVal = valListTable[1] + elseif(vcFunct == 'MAX') then + table.sort(valListTable) + calcVal = valListTable[numRec] + end + calcOk = true + else + calcVal = -999999 + numRec = 1 + calcOk = false + end +end + +local function displayTestInfo() + if (callMode ~= 'NLua') then + print('------------------------------') + print('calcOk: ' .. tostring(calcOk) .. ' | vcFunct: ' .. vcFunct) + for i,val in pairs(valList) do + print("v_"..i.." | "..val) + end + print('calcVal: ' .. calcVal) + print('------------------------------') + end +end + + +-- MAIN +function doProcess() + -- variabile semaforo callMode (locali o remote da NLua) + callMode = callMode or '' + calcVal = -999 + vcFunct = vcFunct or '' + valList = valList or {} + numRec = numRec or 1 + calcOk = false + valListTable = {} + + checkInit() + setupTable() + doCalc() + displayTestInfo() +end + +if (callMode ~= 'NLua') then + doProcess() +end diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs index eadd62a..e06bc76 100644 --- a/MP.MONO.Data/Controllers/MpDbController.cs +++ b/MP.MONO.Data/Controllers/MpDbController.cs @@ -495,11 +495,12 @@ namespace MP.MONO.Data.Controllers /// Recupero record DataLog data condizione filtro ///
        /// + /// Tipologia di dato richiesto da enum /// /// /// /// - public List DataLogGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine) + public List DataLogGetFilt(int machineId, DataLogType dataType, string fluxType, DateTime inizio, DateTime fine) { List dbResult = new List(); using (MapoMonoContext localDbCtx = new MapoMonoContext()) @@ -508,7 +509,7 @@ namespace MP.MONO.Data.Controllers { dbResult = localDbCtx .DbSetDataLog - .Where(x => x.MachineId == machineId && x.FluxType == fluxType && x.DtRif >= inizio && x.DtRif <= fine) + .Where(x => (x.MachineId == machineId) && (x.FluxType == fluxType) && (x.DataType == dataType || dataType == DataLogType.ND) && (x.DtRif >= inizio && x.DtRif <= fine)) .Include(m => m.MachineNav) .OrderByDescending(x => x.DataLogId) .ToList(); diff --git a/MP.MONO.SIM/Program.cs b/MP.MONO.SIM/Program.cs index 97760ce..6fa510f 100644 --- a/MP.MONO.SIM/Program.cs +++ b/MP.MONO.SIM/Program.cs @@ -513,7 +513,8 @@ void simTools() // recupero uno stato simulato var newVal = currSimGen.getTools(); string rawData = JsonConvert.SerializeObject(newVal); - saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, rawData); + saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_RAW_QUEUE, rawData); + //saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, rawData); // attesa random Thread.Sleep(rand.Next(minPeriod, maxPeriod)); diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs index 4bf970c..42a20fe 100644 --- a/MP.MONO.UI/Data/CurrentDataService.cs +++ b/MP.MONO.UI/Data/CurrentDataService.cs @@ -235,11 +235,20 @@ namespace MP.MONO.UI.Data return await Task.FromResult(dbResult); } - public async Task> DataLogGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine) + /// + /// TimeSearie in formato DataLogModel + /// + /// ID macchina + /// Tipologia di dato richiesto da enum + /// Tipo di Flusso + /// DT Inizio estrazione + /// DT Fine estrazione + /// + public async Task> DataLogGetFilt(int machineId, DataLogType dataType, string fluxType, DateTime inizio, DateTime fine) { string source = "DB"; List dbResult = new List(); - string currKey = $"{Constants.DATA_LOG_KEY}:{machineId}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}"; + string currKey = $"{Constants.DATA_LOG_KEY}:{machineId}:{dataType}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}"; Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string rawData = await redisDb.StringGetAsync(currKey); @@ -258,14 +267,14 @@ namespace MP.MONO.UI.Data } else { - dbResult = dbController.DataLogGetFilt(machineId, fluxType, inizio, fine); + dbResult = dbController.DataLogGetFilt(machineId, dataType, fluxType, inizio, fine); // salvo per 2 min... rawData = JsonConvert.SerializeObject(dbResult); await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromSeconds(120)); } stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; - Log.Info($"DataLogGetFilt | {machineId} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb"); + Log.Info($"DataLogGetFilt | {machineId} | {dataType} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb"); return dbResult; } /// From c583d7785fb4791827ddc5437eb2eb22f1e74392 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 17:08:25 +0200 Subject: [PATCH 43/57] Fix gestione tools - nuova gest SIM/decoder con key/val - fix decoder valori tool life - ok salvataggio DB --- MP.MONO.ADAPTER.OPC/CONF/Tools.json | 14 +-- MP.MONO.ADAPTER.OPC/IobOpcUa.cs | 12 ++- 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/Constants.cs | 1 + MP.MONO.DECODER/MP.MONO.DECODER.csproj | 5 +- 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/Program.cs | 13 ++- MP.MONO.SIM/Resources/ChangeLog.html | 2 +- MP.MONO.SIM/Resources/VersNum.txt | 2 +- MP.MONO.SIM/Resources/manifest.xml | 2 +- MP.MONO.SIM/Simulator.cs | 18 +++- MP.MONO.SIM/conf/SimTools.json | 32 +++--- MP.MONO.SIM/conf/Tools.json | 126 +++++++++++++++------- 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 +- 23 files changed, 166 insertions(+), 85 deletions(-) diff --git a/MP.MONO.ADAPTER.OPC/CONF/Tools.json b/MP.MONO.ADAPTER.OPC/CONF/Tools.json index 04e9d12..ff17632 100644 --- a/MP.MONO.ADAPTER.OPC/CONF/Tools.json +++ b/MP.MONO.ADAPTER.OPC/CONF/Tools.json @@ -111,7 +111,7 @@ "Order": 9, "ExtCode": "ns=1;s=5_10_TOOL 22 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 2", + "Title": "SPINDLE 3 TOOL 02", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -123,7 +123,7 @@ "Order": 10, "ExtCode": "ns=1;s=5_11_TOOL 23 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 3", + "Title": "SPINDLE 3 TOOL 03", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -135,7 +135,7 @@ "Order": 11, "ExtCode": "ns=1;s=5_12_TOOL 24 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 4", + "Title": "SPINDLE 3 TOOL 04", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -147,7 +147,7 @@ "Order": 12, "ExtCode": "ns=1;s=5_13_TOOL 31 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 1", + "Title": "SPINDLE 4 TOOL 01", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -159,7 +159,7 @@ "Order": 13, "ExtCode": "ns=1;s=5_14_TOOL 32 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 2", + "Title": "SPINDLE 4 TOOL 02", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -171,7 +171,7 @@ "Order": 14, "ExtCode": "ns=1;s=5_15_TOOL 33 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 3", + "Title": "SPINDLE 4 TOOL 03", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -183,7 +183,7 @@ "Order": 15, "ExtCode": "ns=1;s=5_16_TOOL 34 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 4", + "Title": "SPINDLE 4 TOOL 04", "Value": "0", "ValueNum": 0, "MinVal": -9999, diff --git a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs index cb929b5..07508e5 100644 --- a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs +++ b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs @@ -764,10 +764,20 @@ namespace MP.MONO.ADAPTER.OPC currItem.Value = rawDataVal; } logTrace($"R&S | ToolKList | {uuid} | {currItem.Value}"); + +#if false // prendo tutti i valori del gruppo e li serializzo come DisplayDataDTO string payloadTools = JsonConvert.SerializeObject(ToolStatus); // invio - saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, payloadTools); + saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, payloadTools); +#endif + + // genero un dictionary di valori stringa / double e lo serializzo... + var dataDict = ToolStatus.ToDictionary(x => x.Title, x => x.Value); + string payloadTools = JsonConvert.SerializeObject(dataDict); + // invio + saveAndSendMessage(Constants.TOOLS_ACT_KEY, Constants.TOOLS_RAW_QUEUE, payloadTools); + } // Parameters diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index 4d96a9a..dee1098 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.314 + 1.2.2210.317 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 961c3ac..b5fd26b 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.314

        +

        Version: 1.2.2210.317


        Release Note:
        • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index a53de99..cd3c781 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.314 +1.2.2210.317 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 653d135..42c0445 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.314 + 1.2.2210.317 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.Core/Constants.cs b/MP.MONO.Core/Constants.cs index 4c2e9c6..48fbfbd 100644 --- a/MP.MONO.Core/Constants.cs +++ b/MP.MONO.Core/Constants.cs @@ -52,6 +52,7 @@ namespace MP.MONO.Core public static readonly string PROD_CURR_KEY = $"{BASE_HASH}:Current:Production"; public static readonly string STATUS_ACT_KEY = $"{BASE_HASH}:Current:StatusVal"; public static readonly string STATUS_CURR_KEY = $"{BASE_HASH}:Current:Status"; + public static readonly string TOOLS_ACT_KEY = $"{BASE_HASH}:Current:ToolsVal"; public static readonly string TOOLS_CURR_KEY = $"{BASE_HASH}:Current:Tools"; public static readonly string COUNT_CURR_KEY = $"{BASE_HASH}:Current:Counters"; diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj index b0de21d..e63a37c 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.314 + 1.2.2210.317 @@ -75,6 +75,9 @@ Always + + Always + Always diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 961c3ac..b5fd26b 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.314

          +

          Version: 1.2.2210.317


          Release Note:
          • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index a53de99..cd3c781 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.314 +1.2.2210.317 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 5217382..50869ad 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.314 + 1.2.2210.317 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 018cc50..e850540 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.314 + 1.2.2210.317 diff --git a/MP.MONO.SIM/Program.cs b/MP.MONO.SIM/Program.cs index 6fa510f..528943e 100644 --- a/MP.MONO.SIM/Program.cs +++ b/MP.MONO.SIM/Program.cs @@ -510,11 +510,16 @@ void simTools() { do { - // recupero uno stato simulato - var newVal = currSimGen.getTools(); +#if false + // versione con output DTO + var newVal = currSimGen.getToolsDTO(); string rawData = JsonConvert.SerializeObject(newVal); - saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_RAW_QUEUE, rawData); - //saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, rawData); + saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, rawData); +#endif + // recupero uno stato simulato + var newVal = currSimGen.getToolsKVP(); + string rawData = JsonConvert.SerializeObject(newVal); + saveAndSendMessage(Constants.TOOLS_ACT_KEY, Constants.TOOLS_RAW_QUEUE, rawData); // attesa random Thread.Sleep(rand.Next(minPeriod, maxPeriod)); diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 961c3ac..b5fd26b 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.314

            +

            Version: 1.2.2210.317


            Release Note:
            • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index a53de99..cd3c781 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.314 +1.2.2210.317 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 3afa2bd..ac0eea5 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.314 + 1.2.2210.317 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.SIM/Simulator.cs b/MP.MONO.SIM/Simulator.cs index b86f5bd..23a5629 100644 --- a/MP.MONO.SIM/Simulator.cs +++ b/MP.MONO.SIM/Simulator.cs @@ -343,8 +343,11 @@ namespace MachineSim answ.Add("RECIPE NAME", $"{DateTime.Now:yyMMdd-HHmm}.prg"); return answ; } - - public List getTools() + /// + /// Simulo dati in formato DTO (già finale) + /// + /// + public List getToolsDTO() { List answ = new List(); @@ -379,6 +382,17 @@ namespace MachineSim return answ; } + /// + /// Mostro un valore in formato chiave/valore (stringa/double) + /// + /// + public Dictionary getToolsKVP() + { + Dictionary answ = new Dictionary(); + // genero a partire dall'elenco configurato da simulare... + answ = currSimTools.ToDictionary(i => i.Title, i => simNext(i.ValueNum, i.MinVal, i.MaxVal, i.SimMean, i.SimStd, 3)); + return answ; + } /// /// Calcola prox valore simulato dati i parametri rand configurati, con innovazione diff --git a/MP.MONO.SIM/conf/SimTools.json b/MP.MONO.SIM/conf/SimTools.json index 99e15a2..f3edfd4 100644 --- a/MP.MONO.SIM/conf/SimTools.json +++ b/MP.MONO.SIM/conf/SimTools.json @@ -2,7 +2,7 @@ { "Order": 0, "Type": "TOOL", - "Title": "Tool 01_A", + "Title": "SPINDLE 1 TOOL 01", "HLShow": true, "Value": "99", "ValueNum": 99, @@ -18,7 +18,7 @@ { "Order": 1, "Type": "TOOL", - "Title": "Tool 01_B", + "Title": "SPINDLE 1 TOOL 02", "HLShow": true, "Value": "85", "ValueNum": 85, @@ -34,7 +34,7 @@ { "Order": 2, "Type": "TOOL", - "Title": "Tool 01_C", + "Title": "SPINDLE 1 TOOL 03", "HLShow": false, "Value": "70", "ValueNum": 70, @@ -50,7 +50,7 @@ { "Order": 3, "Type": "TOOL", - "Title": "Tool 01_D", + "Title": "SPINDLE 1 TOOL 04", "HLShow": false, "Value": "70", "ValueNum": 70, @@ -66,7 +66,7 @@ { "Order": 10, "Type": "TOOL", - "Title": "Tool 02_A", + "Title": "SPINDLE 2 TOOL 01", "HLShow": true, "Value": "99", "ValueNum": 99, @@ -82,7 +82,7 @@ { "Order": 11, "Type": "TOOL", - "Title": "Tool 02_B", + "Title": "SPINDLE 2 TOOL 02", "HLShow": true, "Value": "85", "ValueNum": 85, @@ -98,7 +98,7 @@ { "Order": 12, "Type": "TOOL", - "Title": "Tool 02_C", + "Title": "SPINDLE 2 TOOL 03", "HLShow": false, "Value": "70", "ValueNum": 70, @@ -114,7 +114,7 @@ { "Order": 13, "Type": "TOOL", - "Title": "Tool 02_D", + "Title": "SPINDLE 2 TOOL 04", "HLShow": false, "Value": "70", "ValueNum": 70, @@ -130,7 +130,7 @@ { "Order": 20, "Type": "TOOL", - "Title": "Tool 03_A", + "Title": "SPINDLE 3 TOOL 01", "HLShow": true, "Value": "99", "ValueNum": 99, @@ -146,7 +146,7 @@ { "Order": 21, "Type": "TOOL", - "Title": "Tool 03_B", + "Title": "SPINDLE 3 TOOL 02", "HLShow": true, "Value": "85", "ValueNum": 85, @@ -162,7 +162,7 @@ { "Order": 22, "Type": "TOOL", - "Title": "Tool 03_C", + "Title": "SPINDLE 3 TOOL 03", "HLShow": false, "Value": "70", "ValueNum": 70, @@ -178,7 +178,7 @@ { "Order": 23, "Type": "TOOL", - "Title": "Tool 03_D", + "Title": "SPINDLE 3 TOOL 04", "HLShow": false, "Value": "70", "ValueNum": 70, @@ -194,7 +194,7 @@ { "Order": 30, "Type": "TOOL", - "Title": "Tool 04_A", + "Title": "SPINDLE 4 TOOL 01", "HLShow": true, "Value": "99", "ValueNum": 99, @@ -210,7 +210,7 @@ { "Order": 31, "Type": "TOOL", - "Title": "Tool 04_B", + "Title": "SPINDLE 4 TOOL 02", "HLShow": true, "Value": "85", "ValueNum": 85, @@ -226,7 +226,7 @@ { "Order": 32, "Type": "TOOL", - "Title": "Tool 04_C", + "Title": "SPINDLE 4 TOOL 03", "HLShow": false, "Value": "70", "ValueNum": 70, @@ -242,7 +242,7 @@ { "Order": 33, "Type": "TOOL", - "Title": "Tool 04_D", + "Title": "SPINDLE 4 TOOL 04", "HLShow": false, "Value": "70", "ValueNum": 70, diff --git a/MP.MONO.SIM/conf/Tools.json b/MP.MONO.SIM/conf/Tools.json index 04e9d12..a253c21 100644 --- a/MP.MONO.SIM/conf/Tools.json +++ b/MP.MONO.SIM/conf/Tools.json @@ -8,8 +8,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 1, @@ -20,8 +23,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 2, @@ -32,8 +38,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false }, { "Order": 3, @@ -44,8 +53,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false }, { "Order": 4, @@ -56,8 +68,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 5, @@ -68,8 +83,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 6, @@ -80,8 +98,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false }, { "Order": 7, @@ -92,8 +113,11 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false }, { "Order": 8, @@ -104,91 +128,115 @@ "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 9, "ExtCode": "ns=1;s=5_10_TOOL 22 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 2", + "Title": "SPINDLE 3 TOOL 02", "Value": "0", "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 10, "ExtCode": "ns=1;s=5_11_TOOL 23 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 3", + "Title": "SPINDLE 3 TOOL 03", "Value": "0", "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false }, { "Order": 11, "ExtCode": "ns=1;s=5_12_TOOL 24 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 4", + "Title": "SPINDLE 3 TOOL 04", "Value": "0", "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false }, { "Order": 12, "ExtCode": "ns=1;s=5_13_TOOL 31 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 1", + "Title": "SPINDLE 4 TOOL 01", "Value": "0", "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 13, "ExtCode": "ns=1;s=5_14_TOOL 32 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 2", + "Title": "SPINDLE 4 TOOL 02", "Value": "0", "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": true }, { "Order": 14, "ExtCode": "ns=1;s=5_15_TOOL 33 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 3", + "Title": "SPINDLE 4 TOOL 03", "Value": "0", "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false }, { "Order": 15, "ExtCode": "ns=1;s=5_16_TOOL 34 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 4", + "Title": "SPINDLE 4 TOOL 04", "Value": "0", "ValueNum": 0, "MinVal": -9999, "MaxVal": 9999, - "DisplFormat": "N1", - "IsNumeric": true + "DisplFormat": "N2", + "IsNumeric": true, + "EnablePlot": true, + "ShowBar": true, + "HLShow": false } ] \ No newline at end of file diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index d5f0ff0..5885f36 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.315 + 1.2.2210.317 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index b0482f7..b5fd26b 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.315

              +

              Version: 1.2.2210.317


              Release Note:
              • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 06fee29..cd3c781 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.315 +1.2.2210.317 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 0aa4a57..26965b7 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.315 + 1.2.2210.317 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 From d6cc81a4a91fa07e22af356b5efae69c89866723 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 18:20:58 +0200 Subject: [PATCH 44/57] Cleanup SIM --- 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/Program.cs | 6 ------ MP.MONO.SIM/Resources/ChangeLog.html | 2 +- MP.MONO.SIM/Resources/VersNum.txt | 2 +- MP.MONO.SIM/Resources/manifest.xml | 2 +- MP.MONO.SIM/conf/SimTools.json | 6 +++--- 10 files changed, 11 insertions(+), 17 deletions(-) diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj index e63a37c..dacd06a 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.317 + 1.2.2210.318 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index b5fd26b..77564fa 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.317

                +

                Version: 1.2.2210.318


                Release Note:
                • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index cd3c781..2317054 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.317 +1.2.2210.318 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 50869ad..fc48cf1 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.317 + 1.2.2210.318 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 e850540..086c9ea 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.317 + 1.2.2210.318 diff --git a/MP.MONO.SIM/Program.cs b/MP.MONO.SIM/Program.cs index 528943e..4ce2fe7 100644 --- a/MP.MONO.SIM/Program.cs +++ b/MP.MONO.SIM/Program.cs @@ -510,12 +510,6 @@ void simTools() { do { -#if false - // versione con output DTO - var newVal = currSimGen.getToolsDTO(); - string rawData = JsonConvert.SerializeObject(newVal); - saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, rawData); -#endif // recupero uno stato simulato var newVal = currSimGen.getToolsKVP(); string rawData = JsonConvert.SerializeObject(newVal); diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index b5fd26b..77564fa 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.317

                  +

                  Version: 1.2.2210.318


                  Release Note:
                  • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index cd3c781..2317054 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.317 +1.2.2210.318 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index ac0eea5..2d4930b 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.317 + 1.2.2210.318 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.SIM/conf/SimTools.json b/MP.MONO.SIM/conf/SimTools.json index f3edfd4..6d408af 100644 --- a/MP.MONO.SIM/conf/SimTools.json +++ b/MP.MONO.SIM/conf/SimTools.json @@ -1,19 +1,19 @@ [ { "Order": 0, + "HLShow": true, "Type": "TOOL", "Title": "SPINDLE 1 TOOL 01", - "HLShow": true, "Value": "99", "ValueNum": 99, "MinVal": 0, "MaxVal": 100, "SimMean": -0.05, "SimStd": 0.125, + "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, - "ShowBar": true, - "DisplFormat": "N2" + "ShowBar": true }, { "Order": 1, From b66f4fb239ae7449a5189bd3b6c15fb896068b5e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Oct 2022 18:53:31 +0200 Subject: [PATCH 45/57] refresh vers --- 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.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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index dee1098..23ec982 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.317 + 1.2.2210.318 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index b5fd26b..77564fa 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.317

                    +

                    Version: 1.2.2210.318


                    Release Note:
                    • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index cd3c781..2317054 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.317 +1.2.2210.318 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 42c0445..843dbb8 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.317 + 1.2.2210.318 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.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 5885f36..b461e07 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.317 + 1.2.2210.318 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index b5fd26b..77564fa 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.317

                      +

                      Version: 1.2.2210.318


                      Release Note:
                      • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index cd3c781..2317054 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.317 +1.2.2210.318 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 26965b7..56afebc 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.317 + 1.2.2210.318 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 From 2d145a5e37bf0b6d4a3be1ca035b2431367460d6 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 4 Oct 2022 09:14:26 +0200 Subject: [PATCH 46/57] fix calcolo percentuali progress bar --- MP.MONO.UI/Components/DisplayRecordComponent.razor | 6 +++--- MP.MONO.UI/Components/DisplayRecordComponent.razor.cs | 9 +++++++-- 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 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor b/MP.MONO.UI/Components/DisplayRecordComponent.razor index 719edef..5bd44b9 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor @@ -16,9 +16,9 @@ } else { -
                        - @currRecord.Title -
                        +
                        + @currRecord.Title +
                        @currRecord.Value
                        diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs index a2dde52..ba782fc 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components; using MP.MONO.Core.DTO; +using System.Diagnostics.Tracing; namespace MP.MONO.UI.Components { @@ -19,9 +20,13 @@ namespace MP.MONO.UI.Components protected string percProgress(double num, double minVal, double maxVal) { string answ = "width: 0%;"; +#if false double den = (maxVal - minVal) != 0 ? (maxVal - minVal) : 1; - double ratio = ((double)num) / den; - answ = $"width: {ratio:P0};"; + double ratio = ((double)num) / den; +#endif + + int perc = (int)Math.Round(num,2); + answ = $"width: {perc}%;"; return answ; } protected string cssLast(string toolName) diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index b461e07..7c64a51 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.318 + 1.2.2210.408 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 77564fa..42871ae 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.318

                        +

                        Version: 1.2.2210.408


                        Release Note:
                        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 2317054..912ac9f 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.318 +1.2.2210.408 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 56afebc..88d0295 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.318 + 1.2.2210.408 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 From 46fe731931087b33069550948467119f8d838dd4 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 4 Oct 2022 11:23:19 +0200 Subject: [PATCH 47/57] Aggiunta selectAll --- MP.MONO.SIM/conf/Tools.json | 64 +++++++++---------- .../DisplayRecordComponent.razor.cs | 8 +-- MP.MONO.UI/Components/ToolsOverview.razor.cs | 15 ++++- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Tools.razor | 8 ++- MP.MONO.UI/Pages/Tools.razor.cs | 52 ++++++++++++++- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 9 files changed, 109 insertions(+), 46 deletions(-) diff --git a/MP.MONO.SIM/conf/Tools.json b/MP.MONO.SIM/conf/Tools.json index a253c21..e88c15e 100644 --- a/MP.MONO.SIM/conf/Tools.json +++ b/MP.MONO.SIM/conf/Tools.json @@ -6,8 +6,8 @@ "Title": "SPINDLE 1 TOOL 01", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -21,8 +21,8 @@ "Title": "SPINDLE 1 TOOL 02", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -36,8 +36,8 @@ "Title": "SPINDLE 1 TOOL 03", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -51,8 +51,8 @@ "Title": "SPINDLE 1 TOOL 04", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -66,8 +66,8 @@ "Title": "SPINDLE 2 TOOL 01", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -81,8 +81,8 @@ "Title": "SPINDLE 2 TOOL 02", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -96,8 +96,8 @@ "Title": "SPINDLE 2 TOOL 03", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -111,8 +111,8 @@ "Title": "SPINDLE 2 TOOL 04", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -126,8 +126,8 @@ "Title": "SPINDLE 3 TOOL 01", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -141,8 +141,8 @@ "Title": "SPINDLE 3 TOOL 02", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -156,8 +156,8 @@ "Title": "SPINDLE 3 TOOL 03", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -171,8 +171,8 @@ "Title": "SPINDLE 3 TOOL 04", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -186,8 +186,8 @@ "Title": "SPINDLE 4 TOOL 01", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -201,8 +201,8 @@ "Title": "SPINDLE 4 TOOL 02", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -216,8 +216,8 @@ "Title": "SPINDLE 4 TOOL 03", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -231,8 +231,8 @@ "Title": "SPINDLE 4 TOOL 04", "Value": "0", "ValueNum": 0, - "MinVal": -9999, - "MaxVal": 9999, + "MinVal": 0, + "MaxVal": 100, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs index ba782fc..5f8b8d3 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs @@ -20,13 +20,9 @@ namespace MP.MONO.UI.Components protected string percProgress(double num, double minVal, double maxVal) { string answ = "width: 0%;"; -#if false double den = (maxVal - minVal) != 0 ? (maxVal - minVal) : 1; - double ratio = ((double)num) / den; -#endif - - int perc = (int)Math.Round(num,2); - answ = $"width: {perc}%;"; + double ratio = ((double)num) / den; + answ = $"width: {ratio:P0};"; return answ; } protected string cssLast(string toolName) diff --git a/MP.MONO.UI/Components/ToolsOverview.razor.cs b/MP.MONO.UI/Components/ToolsOverview.razor.cs index 7a347f9..5ce0d95 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor.cs +++ b/MP.MONO.UI/Components/ToolsOverview.razor.cs @@ -17,6 +17,9 @@ namespace MP.MONO.UI.Components [Parameter] public EventCallback EC_RemValue { get; set; } + [Parameter] + public bool selectAll { get; set; } = false; + [Parameter] public List SelVal { get; set; } = new List(); @@ -42,7 +45,7 @@ namespace MP.MONO.UI.Components protected async Task ReloadData() { SelVal = new List(); - var allData = await MMDataService.getTools(); + var allData = await MMDataService.getTools(); // se modalità reduced --> mostro solo il subset dati filtrati... FilterData(allData); } @@ -96,6 +99,16 @@ namespace MP.MONO.UI.Components EC_AddValue.InvokeAsync(SelectedValue); } } + protected void toggleSelectAll() + { + if (selectAll == true && ListRecords != null) + { + foreach (var item in ListRecords) + { + EC_AddValue.InvokeAsync(item.Title); + } + } + } #endregion Protected Methods diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 7c64a51..f1b32c4 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.408 + 1.2.2210.411 diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 9b23999..a618d0c 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -1,5 +1,8 @@ @page "/Tools" +@inject MP.MONO.UI.Data.CurrentDataService MMDataService + +
                          @@ -11,6 +14,9 @@
                          +
                          + +
                          @@ -64,7 +70,7 @@
                          - +
                          @if (isRT) diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index 305c2de..81e07a2 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -1,9 +1,14 @@ -using MP.MONO.UI.Data; +using MP.MONO.Core.DTO; +using MP.MONO.Data; +using MP.MONO.UI.Data; +using Newtonsoft.Json; namespace MP.MONO.UI.Pages { public partial class Tools { + private List? ListRecords { get; set; } = null; + //protected List selParams { get; set; } = new List(); #region Private Fields @@ -44,6 +49,8 @@ namespace MP.MONO.UI.Pages get => selTools != null && selTools.Count > 0 ? "" : "disabled"; } + protected bool selectAll { get; set; } + protected List selTools { get; set; } = new List(); #endregion Protected Properties @@ -83,7 +90,10 @@ namespace MP.MONO.UI.Pages selTools.Add(toolName); } } - + protected override async Task OnInitializedAsync() + { + await MMDataService.getTools(); + } protected string lastTool { get @@ -113,6 +123,18 @@ namespace MP.MONO.UI.Pages { selTools = new List(); } + protected void selAll() + { + selTools = new List(); + selectAll = true; + if (ListRecords != null) + { + foreach (var item in ListRecords) + { + selTools.Add(item.Title); + } + } + } protected void toggleRT() { @@ -124,5 +146,31 @@ namespace MP.MONO.UI.Pages { showParam = !showParam; } + + private void FilterData(List allData) + { + ListRecords = allData + .OrderBy(x => x.Order) + .ToList(); + } + private void ToolsPipe_EA_NewMessage(object? sender, EventArgs e) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + var rawData = JsonConvert.DeserializeObject>(currArgs.newMessage); + var allData = rawData == null ? new List() : rawData; + FilterData(allData); + } + catch + { } + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } } } diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 42871ae..950d47b 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.408

                          +

                          Version: 1.2.2210.411


                          Release Note:
                          • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 912ac9f..1699fe2 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.408 +1.2.2210.411 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 88d0295..a6d3a43 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.408 + 1.2.2210.411 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 From c7876fe49384b5c834cdb6d1ee83179bd123ed2c Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 4 Oct 2022 11:53:17 +0200 Subject: [PATCH 48/57] fix grafico + fix addAll --- MP.MONO.UI/Pages/Tools.razor | 3 ++- MP.MONO.UI/Pages/Tools.razor.cs | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index a618d0c..ee5f6f0 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -22,10 +22,11 @@
                            + LOG VIEW
                            -
                            + REAL TIME
                            diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index 81e07a2..70fbb0f 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -34,14 +34,16 @@ namespace MP.MONO.UI.Pages protected bool isRT = true; protected double sampleSecMin = 1; + protected string RTCSSmode= "fw-bold text-decoration-underline"; + protected string LVCSSmode= ""; #endregion Protected Fields #region Protected Properties - protected string currMode + protected int currMode { - get => isRT ? "RealTime" : "Log View"; + get => isRT ? 0 : 1; } protected string btnResetCss @@ -92,7 +94,7 @@ namespace MP.MONO.UI.Pages } protected override async Task OnInitializedAsync() { - await MMDataService.getTools(); + ListRecords = await MMDataService.getTools(); } protected string lastTool { @@ -139,6 +141,16 @@ namespace MP.MONO.UI.Pages protected void toggleRT() { isRT = !isRT; + if (isRT) + { + RTCSSmode = "fw-bold text-decoration-underline"; + LVCSSmode = ""; + } + else + { + LVCSSmode = "fw-bold text-decoration-underline"; + RTCSSmode = ""; + } } #endregion Protected Methods From dd13d4e9f8aee495d900f78e23e12a7032e5f107 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 4 Oct 2022 12:19:17 +0200 Subject: [PATCH 49/57] Update SIM conf --- MP.MONO.DECODER/ToolsManager.cs | 8 +++---- 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/conf/SimTools.json | 32 ++++++++++++++-------------- MP.MONO.SIM/conf/Tools.json | 16 ++++++++++++++ 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 +- 11 files changed, 44 insertions(+), 28 deletions(-) diff --git a/MP.MONO.DECODER/ToolsManager.cs b/MP.MONO.DECODER/ToolsManager.cs index 9b360c6..39f6ef6 100644 --- a/MP.MONO.DECODER/ToolsManager.cs +++ b/MP.MONO.DECODER/ToolsManager.cs @@ -54,12 +54,12 @@ namespace MP.MONO.DECODER #region Public Methods /// - /// Funzione chiamata LUA x calcolo degli eventuali parametri con periodi "scaduti" + /// Funzione chiamata LUA x calcolo degli eventuali tools val con periodi "scaduti" /// /// - /// + /// /// - public List processData(Dictionary paramsList, List redisParamConf) + public List processData(Dictionary paramsList, List redisToolsConf) { List answ = new List(); DateTime adesso = DateTime.Now; @@ -67,7 +67,7 @@ namespace MP.MONO.DECODER // vado ad "accumulare i dati" a quelli presenti... foreach (var item in paramsList) { - var currParam = redisParamConf.FirstOrDefault(x => x.Title == item.Key); + var currParam = redisToolsConf.FirstOrDefault(x => x.Title == item.Key); // cerco nelle variabili accomulatori... if (!VarAccumulator.ContainsKey(item.Key)) { diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj index 086c9ea..2959f7a 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.318 + 1.2.2210.412 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 77564fa..20f2999 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.318

                            +

                            Version: 1.2.2210.412


                            Release Note:
                            • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 2317054..d7d71d8 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.318 +1.2.2210.412 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 2d4930b..e20a997 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.318 + 1.2.2210.412 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.SIM/conf/SimTools.json b/MP.MONO.SIM/conf/SimTools.json index 6d408af..c8425ee 100644 --- a/MP.MONO.SIM/conf/SimTools.json +++ b/MP.MONO.SIM/conf/SimTools.json @@ -8,7 +8,7 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.05, + "SimMean": -0.5, "SimStd": 0.125, "DisplFormat": "N2", "IsNumeric": true, @@ -24,7 +24,7 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.01, + "SimMean": -0.1, "SimStd": 0.05, "IsNumeric": true, "EnablePlot": true, @@ -40,7 +40,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.25, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, @@ -56,7 +56,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.25, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, @@ -72,7 +72,7 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.05, + "SimMean": -0.5, "SimStd": 0.125, "IsNumeric": true, "EnablePlot": true, @@ -88,7 +88,7 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.01, + "SimMean": -0.15, "SimStd": 0.05, "IsNumeric": true, "EnablePlot": true, @@ -104,7 +104,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.35, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, @@ -120,7 +120,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.35, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, @@ -136,7 +136,7 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.05, + "SimMean": -0.5, "SimStd": 0.125, "IsNumeric": true, "EnablePlot": true, @@ -152,7 +152,7 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.01, + "SimMean": -0.15, "SimStd": 0.05, "IsNumeric": true, "EnablePlot": true, @@ -168,7 +168,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.35, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, @@ -184,7 +184,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.35, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, @@ -200,7 +200,7 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.05, + "SimMean": -0.5, "SimStd": 0.125, "IsNumeric": true, "EnablePlot": true, @@ -216,7 +216,7 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.01, + "SimMean": -0.15, "SimStd": 0.05, "IsNumeric": true, "EnablePlot": true, @@ -232,7 +232,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.35, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, @@ -248,7 +248,7 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.025, + "SimMean": -0.35, "SimStd": 0.12, "IsNumeric": true, "EnablePlot": true, diff --git a/MP.MONO.SIM/conf/Tools.json b/MP.MONO.SIM/conf/Tools.json index e88c15e..92eeefd 100644 --- a/MP.MONO.SIM/conf/Tools.json +++ b/MP.MONO.SIM/conf/Tools.json @@ -9,6 +9,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -24,6 +25,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -39,6 +41,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -54,6 +57,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -69,6 +73,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -84,6 +89,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -99,6 +105,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -114,6 +121,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -129,6 +137,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -144,6 +153,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -159,6 +169,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -174,6 +185,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -189,6 +201,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -204,6 +217,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -219,6 +233,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -234,6 +249,7 @@ "MinVal": 0, "MaxVal": 100, "DisplFormat": "N2", + "VcFunc": "AVG", "IsNumeric": true, "EnablePlot": true, "ShowBar": true, diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index f1b32c4..b21e105 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.411 + 1.2.2210.412 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 950d47b..20f2999 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.411

                              +

                              Version: 1.2.2210.412


                              Release Note:
                              • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 1699fe2..d7d71d8 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.411 +1.2.2210.412 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index a6d3a43..983ca43 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.411 + 1.2.2210.412 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 From 61021e25b957c875181e17fca30ec586ef02e0c8 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 4 Oct 2022 14:32:09 +0200 Subject: [PATCH 50/57] fix grafici vari --- MP.MONO.UI/Components/AlAnFilter.razor | 16 +++++-- MP.MONO.UI/Components/AlAnFilter.razor.cs | 12 +++++ MP.MONO.UI/Components/ListFreqAlarms.razor | 2 +- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Alarms.razor | 54 ++++++++++++---------- MP.MONO.UI/Pages/Alarms.razor.cs | 12 +++++ MP.MONO.UI/Pages/Parameters.razor | 3 +- MP.MONO.UI/Pages/Parameters.razor.cs | 12 +++++ MP.MONO.UI/Pages/Tools.razor | 12 +++-- MP.MONO.UI/Pages/Tools.razor.cs | 12 ++--- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- 13 files changed, 98 insertions(+), 45 deletions(-) diff --git a/MP.MONO.UI/Components/AlAnFilter.razor b/MP.MONO.UI/Components/AlAnFilter.razor index 82e520a..498a969 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor +++ b/MP.MONO.UI/Components/AlAnFilter.razor @@ -1,9 +1,19 @@ 
                                @*Mode:*@ -
                                - - + @*
                                + + +
                                *@ + +
                                +
                                + DURATION +
                                + +
                                + FREQUENCY +
                                diff --git a/MP.MONO.UI/Components/AlAnFilter.razor.cs b/MP.MONO.UI/Components/AlAnFilter.razor.cs index ce6e04c..8b71254 100644 --- a/MP.MONO.UI/Components/AlAnFilter.razor.cs +++ b/MP.MONO.UI/Components/AlAnFilter.razor.cs @@ -22,6 +22,8 @@ namespace MP.MONO.UI.Components #region Protected Fields protected DateTime _dtEnd = DateTime.Now; + protected string FRCSSmode = "fw-bold"; + protected string DUCSSmode = "text-secondary"; #endregion Protected Fields @@ -59,6 +61,16 @@ namespace MP.MONO.UI.Components var currFilt = SelFilter; currFilt.setFreqDur = !currFilt.setFreqDur; SelFilter = currFilt; + if (setFreqDur) + { + FRCSSmode = "fw-bold"; + DUCSSmode = "text-secondary"; + } + else + { + DUCSSmode = "fw-bold"; + FRCSSmode = "text-secondary"; + } await Task.Delay(1); reportChange(); } diff --git a/MP.MONO.UI/Components/ListFreqAlarms.razor b/MP.MONO.UI/Components/ListFreqAlarms.razor index 85e0dde..eca3822 100644 --- a/MP.MONO.UI/Components/ListFreqAlarms.razor +++ b/MP.MONO.UI/Components/ListFreqAlarms.razor @@ -15,7 +15,7 @@ Description Count - Frequence + Frequency Chart diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index b21e105..a0200e0 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.412 + 1.2.2210.414 diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor index 59dbb8c..ec4b4d0 100644 --- a/MP.MONO.UI/Pages/Alarms.razor +++ b/MP.MONO.UI/Pages/Alarms.razor @@ -62,6 +62,7 @@
                                +
                          @@ -92,34 +93,37 @@
                          -
                          -
                          -
                          Alarm History
                          +
                          +
                          +
                          Alarm History
                          - @*
                          *@ -
                          - @*Choose mode:*@ -
                          - - +
                          +
                          +
                          + SINGLE REC +
                          + +
                          + STATUS HISTORY +
                          +
                          +
                          + @if (!liveUpdate) + { + + } + else + { + + } +
                          -
                          - @if (!liveUpdate) - { - - } - else - { - - } -
                          @if (setLogRec) diff --git a/MP.MONO.UI/Pages/Alarms.razor.cs b/MP.MONO.UI/Pages/Alarms.razor.cs index 0f468bf..9e8031b 100644 --- a/MP.MONO.UI/Pages/Alarms.razor.cs +++ b/MP.MONO.UI/Pages/Alarms.razor.cs @@ -9,6 +9,8 @@ namespace MP.MONO.UI.Pages protected bool doSetup = false; protected bool reqPassw = false; + protected string SHCSSmode = "fw-bold"; + protected string SRCSSmode = "text-secondary"; #endregion Protected Fields @@ -274,6 +276,16 @@ namespace MP.MONO.UI.Pages protected async Task toggleRec() { setLogRec = !setLogRec; + if (setLogRec) + { + SHCSSmode = "fw-bold"; + SRCSSmode = "text-secondary"; + } + else + { + SRCSSmode = "fw-bold"; + SHCSSmode = "text-secondary"; + } await Task.Delay(1); await ReloadData(true); } diff --git a/MP.MONO.UI/Pages/Parameters.razor b/MP.MONO.UI/Pages/Parameters.razor index 339ddb9..a897ced 100644 --- a/MP.MONO.UI/Pages/Parameters.razor +++ b/MP.MONO.UI/Pages/Parameters.razor @@ -16,10 +16,11 @@
                          + LOG VIEW
                          -
                          + REAL TIME
                          diff --git a/MP.MONO.UI/Pages/Parameters.razor.cs b/MP.MONO.UI/Pages/Parameters.razor.cs index d419fba..b2e8ea3 100644 --- a/MP.MONO.UI/Pages/Parameters.razor.cs +++ b/MP.MONO.UI/Pages/Parameters.razor.cs @@ -29,6 +29,8 @@ namespace MP.MONO.UI.Pages protected bool isRT = true; protected double sampleSecMin = 1; + protected string RTCSSmode = "fw-bold"; + protected string LVCSSmode = "text-secondary"; #endregion Protected Fields @@ -122,6 +124,16 @@ namespace MP.MONO.UI.Pages protected void toggleRT() { isRT = !isRT; + if (isRT) + { + RTCSSmode = "fw-bold"; + LVCSSmode = "text-secondary"; + } + else + { + LVCSSmode = "fw-bold"; + RTCSSmode = "text-secondary"; + } } #endregion Protected Methods diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index ee5f6f0..8aefb63 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -11,11 +11,13 @@

                          Tools

                          -
                          - -
                          -
                          - +
                          +
                          + +
                          +
                          + +
                          diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index 70fbb0f..a8b6e4d 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -34,8 +34,8 @@ namespace MP.MONO.UI.Pages protected bool isRT = true; protected double sampleSecMin = 1; - protected string RTCSSmode= "fw-bold text-decoration-underline"; - protected string LVCSSmode= ""; + protected string RTCSSmode= "fw-bold"; + protected string LVCSSmode= "text-secondary"; #endregion Protected Fields @@ -143,13 +143,13 @@ namespace MP.MONO.UI.Pages isRT = !isRT; if (isRT) { - RTCSSmode = "fw-bold text-decoration-underline"; - LVCSSmode = ""; + RTCSSmode = "fw-bold"; + LVCSSmode = "text-secondary"; } else { - LVCSSmode = "fw-bold text-decoration-underline"; - RTCSSmode = ""; + LVCSSmode = "fw-bold"; + RTCSSmode = "text-secondary"; } } diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 20f2999..eb8d093 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.412

                          +

                          Version: 1.2.2210.414


                          Release Note:
                          • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index d7d71d8..bd918c9 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.412 +1.2.2210.414 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 983ca43..2353f43 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.412 + 1.2.2210.414 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 From 135cb07f4920c159d4adb058c31232721e735e49 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 4 Oct 2022 14:45:40 +0200 Subject: [PATCH 51/57] cleanUP --- MP.MONO.UI/Pages/Tools.razor.cs | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index a8b6e4d..8a9dcea 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -159,30 +159,5 @@ namespace MP.MONO.UI.Pages showParam = !showParam; } - private void FilterData(List allData) - { - ListRecords = allData - .OrderBy(x => x.Order) - .ToList(); - } - private void ToolsPipe_EA_NewMessage(object? sender, EventArgs e) - { - PubSubEventArgs currArgs = (PubSubEventArgs)e; - if (!string.IsNullOrEmpty(currArgs.newMessage)) - { - try - { - var rawData = JsonConvert.DeserializeObject>(currArgs.newMessage); - var allData = rawData == null ? new List() : rawData; - FilterData(allData); - } - catch - { } - } - InvokeAsync(() => - { - StateHasChanged(); - }); - } } } From b0e8ec0dd4db81d1f97c79096a6b6a8cf9e2801f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 4 Oct 2022 14:54:49 +0200 Subject: [PATCH 52/57] Update home page display + nav --- MP.MONO.UI/Pages/Index.razor | 52 +++++++++++++++------------------ MP.MONO.UI/Shared/NavMenu.razor | 4 +-- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/MP.MONO.UI/Pages/Index.razor b/MP.MONO.UI/Pages/Index.razor index ad0155e..1399558 100644 --- a/MP.MONO.UI/Pages/Index.razor +++ b/MP.MONO.UI/Pages/Index.razor @@ -5,7 +5,7 @@

                            MAPO-MONO

                            -
                            +
                            @*
                            @@ -15,7 +15,7 @@
                            *@ -
                            +
                            PRODUCTION
                            @@ -25,28 +25,6 @@
                            -
                            -
                            - -
                            -
                            PARAMETERS
                            -
                            - -
                            -
                            -                             -
                            -
                            - -
                            -
                            TOOLS
                            -
                            - -
                            -
                            -                             -
                            -
                            ALARMS
                            @@ -56,9 +34,17 @@
                            +
                            + +
                            +
                            PARAMETERS
                            +
                            + +
                            +
                            +
                            -
                            -
                            +
                            MAINTENANCE
                            @@ -68,7 +54,17 @@
                            -
                            +
                            + +
                            +
                            TOOLS
                            +
                            + +
                            +
                            +                             +
                            + @*
                            EVENT HISTORY
                            @@ -77,7 +73,7 @@
                            -
                            +
                            *@ @*
                            diff --git a/MP.MONO.UI/Shared/NavMenu.razor b/MP.MONO.UI/Shared/NavMenu.razor index 2ca4d9d..a3ed9a0 100644 --- a/MP.MONO.UI/Shared/NavMenu.razor +++ b/MP.MONO.UI/Shared/NavMenu.razor @@ -44,11 +44,11 @@ TOOLS
                            -
                            + @*
                            EVENTS LIST -
                            +
                            *@ @*
                            ACTIVITY LOG From 09c9f37c62ab385714f165cd11131cafa81140be Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 4 Oct 2022 17:15:08 +0200 Subject: [PATCH 53/57] Aggiunta collapse sidebar --- MP.MONO.UI/Components/MaintTaskPending.razor | 4 +- MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Index.razor | 4 +- MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- MP.MONO.UI/Shared/MainLayout.razor | 16 +++++- MP.MONO.UI/Shared/NavMenu.razor | 56 +++++++++++++------- 8 files changed, 58 insertions(+), 30 deletions(-) diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor b/MP.MONO.UI/Components/MaintTaskPending.razor index f96f847..578478e 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor +++ b/MP.MONO.UI/Components/MaintTaskPending.razor @@ -112,9 +112,9 @@ - @if (!compMode) { + @@ -133,9 +133,9 @@ @foreach (var record in ListRecords) { - @if (!compMode) { + diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index a0200e0..f8b018a 100644 --- a/MP.MONO.UI/MP.MONO.UI.csproj +++ b/MP.MONO.UI/MP.MONO.UI.csproj @@ -5,7 +5,7 @@ enableenableAnyCPU;x86;x64 - 1.2.2210.414 + 1.2.2210.416 diff --git a/MP.MONO.UI/Pages/Index.razor b/MP.MONO.UI/Pages/Index.razor index 1399558..84f22dd 100644 --- a/MP.MONO.UI/Pages/Index.razor +++ b/MP.MONO.UI/Pages/Index.razor @@ -44,7 +44,7 @@ -
                            +
                            MAINTENANCE
                            @@ -54,7 +54,7 @@
                            -
                            +
                            TOOLS
                            diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index eb8d093..52b568e 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.414

                            +

                            Version: 1.2.2210.416


                            Release Note:
                            • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index bd918c9..47602d5 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.414 +1.2.2210.416 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 2353f43..5e84924 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.414 + 1.2.2210.416 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/MainLayout.razor b/MP.MONO.UI/Shared/MainLayout.razor index 5b3e4e8..e2afaa0 100644 --- a/MP.MONO.UI/Shared/MainLayout.razor +++ b/MP.MONO.UI/Shared/MainLayout.razor @@ -3,8 +3,8 @@ MP.MONO.UI
                              -
                              - +
                              +
                              @@ -19,3 +19,15 @@
                              + +@code { + protected bool navLarge { get; set; } = true; + + protected string sideClass { get; set; } = "sidebar"; + + protected void UpdateNavDisplay() + { + navLarge = !navLarge; + sideClass = navLarge ? "sidebar" : "sidebarSmall"; + } +} diff --git a/MP.MONO.UI/Shared/NavMenu.razor b/MP.MONO.UI/Shared/NavMenu.razor index a3ed9a0..f83ed6d 100644 --- a/MP.MONO.UI/Shared/NavMenu.razor +++ b/MP.MONO.UI/Shared/NavMenu.razor @@ -1,9 +1,13 @@ 
                              - MP.MONO.UI - + @if (!showText) + { + + } + else + { + MP.MONO.UI + }
                              @@ -11,52 +15,52 @@ @@ -71,4 +75,16 @@ { collapseNavMenu = !collapseNavMenu; } + protected bool showText { get; set; } = true; + protected string hideText + { + get => showText ? "" : "invisible"; + } + protected void ToggleCompress() + { + showText = !showText; + EC_compressUpdated.InvokeAsync(showText); + } + [Parameter] + public EventCallback EC_compressUpdated { get; set; } } From 286e3c1c12d91fdaf8eacf2fdfcaf5da17ed3f23 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 4 Oct 2022 19:04:56 +0200 Subject: [PATCH 54/57] Minor update collapse --- MP.MONO.UI/Shared/NavMenu.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.MONO.UI/Shared/NavMenu.razor b/MP.MONO.UI/Shared/NavMenu.razor index f83ed6d..93f46fa 100644 --- a/MP.MONO.UI/Shared/NavMenu.razor +++ b/MP.MONO.UI/Shared/NavMenu.razor @@ -2,7 +2,7 @@
                              @if (!showText) { - + M } else { From 911f83f1ea3def0a79326519586873022feba37f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 4 Oct 2022 19:05:11 +0200 Subject: [PATCH 55/57] Fix sim TOOLS (decrescente!) --- MP.MONO.SIM/Simulator.cs | 4 ++- MP.MONO.SIM/conf/SimTools.json | 62 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/MP.MONO.SIM/Simulator.cs b/MP.MONO.SIM/Simulator.cs index 23a5629..add75e4 100644 --- a/MP.MONO.SIM/Simulator.cs +++ b/MP.MONO.SIM/Simulator.cs @@ -389,8 +389,10 @@ namespace MachineSim public Dictionary getToolsKVP() { Dictionary answ = new Dictionary(); + // calcolo come DTO (e così si aggiorna trend) + var randDto = getToolsDTO(); // genero a partire dall'elenco configurato da simulare... - answ = currSimTools.ToDictionary(i => i.Title, i => simNext(i.ValueNum, i.MinVal, i.MaxVal, i.SimMean, i.SimStd, 3)); + answ = randDto.ToDictionary(i => i.Title, i => i.ValueNum); return answ; } diff --git a/MP.MONO.SIM/conf/SimTools.json b/MP.MONO.SIM/conf/SimTools.json index c8425ee..d841320 100644 --- a/MP.MONO.SIM/conf/SimTools.json +++ b/MP.MONO.SIM/conf/SimTools.json @@ -8,8 +8,8 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.5, - "SimStd": 0.125, + "SimMean": -0.015, + "SimStd": 0.0125, "DisplFormat": "N2", "IsNumeric": true, "EnablePlot": true, @@ -25,7 +25,7 @@ "MinVal": 0, "MaxVal": 100, "SimMean": -0.1, - "SimStd": 0.05, + "SimStd": 0.025, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -40,8 +40,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.25, - "SimStd": 0.12, + "SimMean": -0.012, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -56,8 +56,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.25, - "SimStd": 0.12, + "SimMean": -0.012, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -72,8 +72,8 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.5, - "SimStd": 0.125, + "SimMean": -0.015, + "SimStd": 0.0125, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -88,8 +88,8 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.15, - "SimStd": 0.05, + "SimMean": -0.015, + "SimStd": 0.025, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -104,8 +104,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.35, - "SimStd": 0.12, + "SimMean": -0.035, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -120,8 +120,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.35, - "SimStd": 0.12, + "SimMean": -0.035, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -136,8 +136,8 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.5, - "SimStd": 0.125, + "SimMean": -0.015, + "SimStd": 0.0125, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -152,8 +152,8 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.15, - "SimStd": 0.05, + "SimMean": -0.015, + "SimStd": 0.025, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -168,8 +168,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.35, - "SimStd": 0.12, + "SimMean": -0.035, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -184,8 +184,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.35, - "SimStd": 0.12, + "SimMean": -0.035, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -200,8 +200,8 @@ "ValueNum": 99, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.5, - "SimStd": 0.125, + "SimMean": -0.015, + "SimStd": 0.0125, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -216,8 +216,8 @@ "ValueNum": 85, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.15, - "SimStd": 0.05, + "SimMean": -0.015, + "SimStd": 0.025, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -232,8 +232,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.35, - "SimStd": 0.12, + "SimMean": -0.035, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, @@ -248,8 +248,8 @@ "ValueNum": 70, "MinVal": 0, "MaxVal": 100, - "SimMean": -0.35, - "SimStd": 0.12, + "SimMean": -0.035, + "SimStd": 0.04, "IsNumeric": true, "EnablePlot": true, "ShowBar": true, From 56919555e7541e46d686c86b642d04331659bfed Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 4 Oct 2022 19:24:42 +0200 Subject: [PATCH 56/57] Index Page: consensata --- MP.MONO.UI/Components/MaintTaskPending.razor | 19 ++++++++++++----- .../Components/MaintTaskPending.razor.cs | 6 ++++++ MP.MONO.UI/Components/MaintTaskSched.razor.cs | 2 +- MP.MONO.UI/Components/ProgBar.razor | 21 +++++++++++++------ MP.MONO.UI/Components/ProgBar.razor.cs | 4 ++++ MP.MONO.UI/Pages/Index.razor | 16 +++++++------- 6 files changed, 48 insertions(+), 20 deletions(-) diff --git a/MP.MONO.UI/Components/MaintTaskPending.razor b/MP.MONO.UI/Components/MaintTaskPending.razor index 578478e..5b147d9 100644 --- a/MP.MONO.UI/Components/MaintTaskPending.razor +++ b/MP.MONO.UI/Components/MaintTaskPending.razor @@ -55,7 +55,7 @@
                            } -
                            +
                            @if (ListRecords == null) { @@ -120,8 +120,8 @@
                            + } - @if (!compMode) { @@ -141,9 +141,17 @@ + + + } + else + { + @**@ + } - - @if (!compMode) {
                            IDID Created Topic Machine Group
                            @record.PMTaskeNav.ExtIdx@record.PMTaskeNav.ExtIdx @record.DtCreation.ToString("yyyy-MM-dd HH:mm:ss") @record.PMTaskeNav.TopicNav.Description @record.PMTaskeNav.MachGroupNav.Description Machine Group Team in Charge Counter VarRem. HoursRem. Hours Job Description@record.PMTaskeNav.MachGroupNav.Description @record.PMTaskeNav.UserTeamNav.Description @record.CounterNav.Description@record.PMTaskeNav.JobDescription@($"{record.CountRemainVal:N0}") +
                            @record.PMTaskeNav.JobDescription
                            + +                             		@record.PMTaskeNav.JobDescription @@ -169,7 +177,7 @@