From c24935afce99107d9639c77868535b09fc67176f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 8 Jul 2022 17:05:53 +0200 Subject: [PATCH 01/19] WASM - aggiunta preliminare progetto Web Assembly --- MP-MON.sln | 18 + MP.Mon/Components/CmpFooter.razor.cs | 17 +- MP.Mon/Components/DetailMSE.razor.cs | 37 +- MP.Mon/MP.Mon.csproj | 2 +- MP.Mon/Pages/Index.razor.cs | 21 +- MP.Mon/Pages/_Layout.cshtml | 4 - MP.Mon/Resources/ChangeLog.html | 2 +- MP.Mon/Resources/VersNum.txt | 2 +- MP.Mon/Resources/manifest.xml | 2 +- MP.Mon/libman.json | 15 - MP.Mon/wwwroot/lib/Chart.js/chart.esm.js | 10627 ------------- MP.Mon/wwwroot/lib/Chart.js/chart.esm.min.js | 1 - MP.Mon/wwwroot/lib/Chart.js/chart.js | 13269 ---------------- MP.Mon/wwwroot/lib/Chart.js/chart.min.js | 13 - MP.Mon/wwwroot/lib/Chart.js/helpers.esm.js | 7 - .../wwwroot/lib/Chart.js/helpers.esm.min.js | 1 - MP.Mon/wwwroot/lib/chartBoot.js | 16 - .../chartjs-adapter-luxon.esm.js | 91 - .../chartjs-adapter-luxon.esm.min.js | 1 - .../chartjs-adapter-luxon.js | 96 - .../chartjs-adapter-luxon.min.js | 7 - MP.Mon/wwwroot/lib/luxon/cjs-browser/luxon.js | 8488 ---------- .../lib/luxon/cjs-browser/luxon.js.map | 1 - .../lib/luxon/cjs-browser/luxon.min.js | 1 - MP.Mon/wwwroot/lib/luxon/luxon.js | 8493 ---------- MP.Mon/wwwroot/lib/luxon/luxon.js.map | 1 - MP.Mon/wwwroot/lib/luxon/luxon.min.js | 1 - MP.Mon/wwwroot/lib/luxon/luxon.min.js.map | 1 - MP.WASM.Mon/Client/App.razor | 12 + MP.WASM.Mon/Client/MP.WASM.Mon.Client.csproj | 18 + MP.WASM.Mon/Client/Pages/Counter.razor | 18 + MP.WASM.Mon/Client/Pages/FetchData.razor | 47 + MP.WASM.Mon/Client/Pages/Index.razor | 9 + MP.WASM.Mon/Client/Program.cs | 11 + .../Client/Properties/launchSettings.json | 30 + MP.WASM.Mon/Client/Shared/MainLayout.razor | 17 + .../Client/Shared/MainLayout.razor.css | 81 + MP.WASM.Mon/Client/Shared/NavMenu.razor | 39 + MP.WASM.Mon/Client/Shared/NavMenu.razor.css | 62 + MP.WASM.Mon/Client/Shared/SurveyPrompt.razor | 16 + MP.WASM.Mon/Client/_Imports.razor | 10 + MP.WASM.Mon/Client/wwwroot/css/app.css | 64 + .../wwwroot/css/bootstrap/bootstrap.min.css | 7 + .../css/bootstrap/bootstrap.min.css.map | 1 + .../wwwroot/css/open-iconic/FONT-LICENSE | 86 + .../wwwroot/css/open-iconic/ICON-LICENSE | 21 + .../Client/wwwroot/css/open-iconic/README.md | 114 + .../font/css/open-iconic-bootstrap.min.css | 1 + .../open-iconic/font/fonts/open-iconic.eot | Bin 0 -> 28196 bytes .../open-iconic/font/fonts/open-iconic.otf | Bin 0 -> 20996 bytes .../open-iconic/font/fonts/open-iconic.svg | 543 + .../open-iconic/font/fonts/open-iconic.ttf | Bin 0 -> 28028 bytes .../open-iconic/font/fonts/open-iconic.woff | Bin 0 -> 14984 bytes MP.WASM.Mon/Client/wwwroot/favicon.ico | Bin 0 -> 5430 bytes MP.WASM.Mon/Client/wwwroot/icon-192.png | Bin 0 -> 2626 bytes MP.WASM.Mon/Client/wwwroot/index.html | 25 + .../Server/Controllers/MSEController.cs | 222 + .../Controllers/WeatherForecastController.cs | 34 + MP.WASM.Mon/Server/MP.WASM.Mon.Server.csproj | 23 + MP.WASM.Mon/Server/Pages/Error.cshtml | 42 + MP.WASM.Mon/Server/Pages/Error.cshtml.cs | 27 + MP.WASM.Mon/Server/Program.cs | 36 + .../Server/Properties/launchSettings.json | 30 + .../Server/appsettings.Development.json | 8 + MP.WASM.Mon/Server/appsettings.json | 15 + MP.WASM.Mon/Shared/MP.WASM.Mon.Shared.csproj | 16 + MP.WASM.Mon/Shared/WeatherForecast.cs | 13 + 67 files changed, 1775 insertions(+), 41158 deletions(-) delete mode 100644 MP.Mon/wwwroot/lib/Chart.js/chart.esm.js delete mode 100644 MP.Mon/wwwroot/lib/Chart.js/chart.esm.min.js delete mode 100644 MP.Mon/wwwroot/lib/Chart.js/chart.js delete mode 100644 MP.Mon/wwwroot/lib/Chart.js/chart.min.js delete mode 100644 MP.Mon/wwwroot/lib/Chart.js/helpers.esm.js delete mode 100644 MP.Mon/wwwroot/lib/Chart.js/helpers.esm.min.js delete mode 100644 MP.Mon/wwwroot/lib/chartBoot.js delete mode 100644 MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.esm.js delete mode 100644 MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.esm.min.js delete mode 100644 MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.js delete mode 100644 MP.Mon/wwwroot/lib/chartjs-adapter-luxon/chartjs-adapter-luxon.min.js delete mode 100644 MP.Mon/wwwroot/lib/luxon/cjs-browser/luxon.js delete mode 100644 MP.Mon/wwwroot/lib/luxon/cjs-browser/luxon.js.map delete mode 100644 MP.Mon/wwwroot/lib/luxon/cjs-browser/luxon.min.js delete mode 100644 MP.Mon/wwwroot/lib/luxon/luxon.js delete mode 100644 MP.Mon/wwwroot/lib/luxon/luxon.js.map delete mode 100644 MP.Mon/wwwroot/lib/luxon/luxon.min.js delete mode 100644 MP.Mon/wwwroot/lib/luxon/luxon.min.js.map create mode 100644 MP.WASM.Mon/Client/App.razor create mode 100644 MP.WASM.Mon/Client/MP.WASM.Mon.Client.csproj create mode 100644 MP.WASM.Mon/Client/Pages/Counter.razor create mode 100644 MP.WASM.Mon/Client/Pages/FetchData.razor create mode 100644 MP.WASM.Mon/Client/Pages/Index.razor create mode 100644 MP.WASM.Mon/Client/Program.cs create mode 100644 MP.WASM.Mon/Client/Properties/launchSettings.json create mode 100644 MP.WASM.Mon/Client/Shared/MainLayout.razor create mode 100644 MP.WASM.Mon/Client/Shared/MainLayout.razor.css create mode 100644 MP.WASM.Mon/Client/Shared/NavMenu.razor create mode 100644 MP.WASM.Mon/Client/Shared/NavMenu.razor.css create mode 100644 MP.WASM.Mon/Client/Shared/SurveyPrompt.razor create mode 100644 MP.WASM.Mon/Client/_Imports.razor create mode 100644 MP.WASM.Mon/Client/wwwroot/css/app.css create mode 100644 MP.WASM.Mon/Client/wwwroot/css/bootstrap/bootstrap.min.css create mode 100644 MP.WASM.Mon/Client/wwwroot/css/bootstrap/bootstrap.min.css.map create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/FONT-LICENSE create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/ICON-LICENSE create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/README.md create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf create mode 100644 MP.WASM.Mon/Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff create mode 100644 MP.WASM.Mon/Client/wwwroot/favicon.ico create mode 100644 MP.WASM.Mon/Client/wwwroot/icon-192.png create mode 100644 MP.WASM.Mon/Client/wwwroot/index.html create mode 100644 MP.WASM.Mon/Server/Controllers/MSEController.cs create mode 100644 MP.WASM.Mon/Server/Controllers/WeatherForecastController.cs create mode 100644 MP.WASM.Mon/Server/MP.WASM.Mon.Server.csproj create mode 100644 MP.WASM.Mon/Server/Pages/Error.cshtml create mode 100644 MP.WASM.Mon/Server/Pages/Error.cshtml.cs create mode 100644 MP.WASM.Mon/Server/Program.cs create mode 100644 MP.WASM.Mon/Server/Properties/launchSettings.json create mode 100644 MP.WASM.Mon/Server/appsettings.Development.json create mode 100644 MP.WASM.Mon/Server/appsettings.json create mode 100644 MP.WASM.Mon/Shared/MP.WASM.Mon.Shared.csproj create mode 100644 MP.WASM.Mon/Shared/WeatherForecast.cs diff --git a/MP-MON.sln b/MP-MON.sln index 4e8c2f87..35405781 100644 --- a/MP-MON.sln +++ b/MP-MON.sln @@ -7,6 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Mon", "MP.Mon\MP.Mon.csproj", "{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.WASM.Mon.Server", "MP.WASM.Mon\Server\MP.WASM.Mon.Server.csproj", "{4A98B7F4-4EC6-4284-9D6C-63203DB981B1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.WASM.Mon.Client", "MP.WASM.Mon\Client\MP.WASM.Mon.Client.csproj", "{9BF7BDE7-016A-458C-8791-494FD4204301}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.WASM.Mon.Shared", "MP.WASM.Mon\Shared\MP.WASM.Mon.Shared.csproj", "{A3B1190C-6F98-434B-8B31-27522C78918A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +27,18 @@ Global {7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Debug|Any CPU.Build.0 = Debug|Any CPU {7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Release|Any CPU.ActiveCfg = Release|Any CPU {7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Release|Any CPU.Build.0 = Release|Any CPU + {4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A98B7F4-4EC6-4284-9D6C-63203DB981B1}.Release|Any CPU.Build.0 = Release|Any CPU + {9BF7BDE7-016A-458C-8791-494FD4204301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BF7BDE7-016A-458C-8791-494FD4204301}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BF7BDE7-016A-458C-8791-494FD4204301}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BF7BDE7-016A-458C-8791-494FD4204301}.Release|Any CPU.Build.0 = Release|Any CPU + {A3B1190C-6F98-434B-8B31-27522C78918A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3B1190C-6F98-434B-8B31-27522C78918A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3B1190C-6F98-434B-8B31-27522C78918A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3B1190C-6F98-434B-8B31-27522C78918A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP.Mon/Components/CmpFooter.razor.cs b/MP.Mon/Components/CmpFooter.razor.cs index 71252e09..cd49cc68 100644 --- a/MP.Mon/Components/CmpFooter.razor.cs +++ b/MP.Mon/Components/CmpFooter.razor.cs @@ -1,3 +1,5 @@ +using NLog; + namespace MP.Mon.Components { public partial class CmpFooter @@ -6,6 +8,7 @@ namespace MP.Mon.Components public void Dispose() { + //aTimer.Elapsed -= ElapsedTimer; aTimer.Stop(); aTimer.Dispose(); } @@ -13,12 +16,12 @@ namespace MP.Mon.Components public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e) { var pUpd = Task.Run(async () => - { - //await ReloadData(); - await Task.Delay(1); - await InvokeAsync(StateHasChanged); - }); + { + await Task.Delay(1); + await InvokeAsync(StateHasChanged); + }); pUpd.Wait(); + Log.Trace($"Elapsed Timer Footer"); } public void StartTimer() @@ -35,12 +38,11 @@ namespace MP.Mon.Components #region Protected Methods - protected override async Task OnInitializedAsync() + protected override void OnInitialized() { var currAssembly = typeof(Program).Assembly.GetName(); version = currAssembly.Version != null ? currAssembly.Version : new Version(); StartTimer(); - await Task.Delay(1); } #endregion Protected Methods @@ -48,6 +50,7 @@ namespace MP.Mon.Components #region Private Fields private static System.Timers.Timer aTimer = null!; + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); private Version version = null!; #endregion Private Fields diff --git a/MP.Mon/Components/DetailMSE.razor.cs b/MP.Mon/Components/DetailMSE.razor.cs index b67e53cb..628920ea 100644 --- a/MP.Mon/Components/DetailMSE.razor.cs +++ b/MP.Mon/Components/DetailMSE.razor.cs @@ -12,6 +12,11 @@ namespace MP.Mon.Components [Parameter] public MappaStatoExpl? CurrRecord { get; set; } = null; + /// + /// Valore precedente x calcolo variazione + /// + private MappaStatoExpl? OldRecord { get; set; } = null; + [Parameter] public List? currTagConf { get; set; } = null; @@ -33,6 +38,7 @@ namespace MP.Mon.Components public void Dispose() { + //aTimer.Elapsed -= ElapsedTimer; aTimer.Stop(); aTimer.Dispose(); } @@ -41,9 +47,36 @@ namespace MP.Mon.Components { var pUpd = Task.Run(async () => { - Log.Trace($"Elapsed Timer {CurrRecord?.CodMacchina}"); await Task.Delay(1); - await InvokeAsync(StateHasChanged); + // verifica variazione x blink... + bool needUpdate = false; + if (CurrRecord == null) + { + needUpdate = true; + } + else + { + if (OldRecord == null) + { + needUpdate = true; + } + else + { + if (!CurrRecord.Semaforo.Equals(OldRecord.Semaforo) || CurrRecord.Semaforo != "sVe") + { + needUpdate = true; + } + } + } + if (needUpdate) + { + if (false) + { + Log.Trace($"Elapsed Timer {CurrRecord?.CodMacchina}"); + } + await InvokeAsync(StateHasChanged); + } + OldRecord = CurrRecord; }); pUpd.Wait(); } diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index a97f1c6d..9ad08423 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.15.2207.810 + 6.15.2207.817 diff --git a/MP.Mon/Pages/Index.razor.cs b/MP.Mon/Pages/Index.razor.cs index d028d1b9..e504cf38 100644 --- a/MP.Mon/Pages/Index.razor.cs +++ b/MP.Mon/Pages/Index.razor.cs @@ -53,8 +53,10 @@ namespace MP.Mon.Pages public void Dispose() { + //fastTimer.Elapsed -= ElapsedFastTimer; fastTimer.Stop(); fastTimer.Dispose(); + //slowTimer.Elapsed -= ElapsedSlowTimer; slowTimer.Stop(); slowTimer.Dispose(); } @@ -190,21 +192,18 @@ namespace MP.Mon.Pages private async Task ReloadData() { +#if DEBUG // hack: legge 4 volte i dati x stressare sistema - bool stressTest = false; - if (stressTest) + var singleData = await MMDataService.MseGetAll(); + ListMSE = new List(); + for (int i = 0; i < 4; i++) { - var singleData = await MMDataService.MseGetAll(); - ListMSE = singleData.ToList(); - for (int i = 0; i < 3; i++) - { - ListMSE.AddRange(singleData); - } + ListMSE.AddRange(singleData); } - else - { +#else ListMSE = await MMDataService.MseGetAll(); - } +#endif + } private async Task setupConf() diff --git a/MP.Mon/Pages/_Layout.cshtml b/MP.Mon/Pages/_Layout.cshtml index 49d12f15..7756fe1f 100644 --- a/MP.Mon/Pages/_Layout.cshtml +++ b/MP.Mon/Pages/_Layout.cshtml @@ -55,9 +55,5 @@ - - - - diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html index 7d69493d..e24a7c19 100644 --- a/MP.Mon/Resources/ChangeLog.html +++ b/MP.Mon/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.15.2207.810

+

Versione: 6.15.2207.817


Note di rilascio: