diff --git a/MP.MON.Client/Components/CmpFooter.razor b/MP.MON.Client/Components/CmpFooter.razor index 3db6d023..a785d642 100644 --- a/MP.MON.Client/Components/CmpFooter.razor +++ b/MP.MON.Client/Components/CmpFooter.razor @@ -1,14 +1,17 @@ -
+
- Mapo MON .net 8 @(DateTime.Today.Year) | v.@version + Mapo MON @(DateTime.Today.Year) | v.@version +
+
@if (Width > 0) { - | @Width x @Height | + @Width x @Height | } @(OperatingSystem.IsBrowser() ? "WASM" : "Server") -
-
- @($"{DateTime.Now:HH:mm:ss}") | Egalware + @* + @($"{DateTime.Now:HH:mm:ss}") + *@ + | Egalware
\ No newline at end of file diff --git a/MP.MON.Client/Components/CmpFooter.razor.cs b/MP.MON.Client/Components/CmpFooter.razor.cs index 265ecce3..55ef358e 100644 --- a/MP.MON.Client/Components/CmpFooter.razor.cs +++ b/MP.MON.Client/Components/CmpFooter.razor.cs @@ -17,7 +17,6 @@ namespace MP.MON.Client.Components public void Dispose() { - //aTimer.Elapsed -= ElapsedTimer; aTimer.Stop(); aTimer.Dispose(); } @@ -88,7 +87,7 @@ namespace MP.MON.Client.Components protected override void OnInitialized() { StartTimer(); - Console.WriteLine($"OnInitialized completato"); + Console.WriteLine($"OnInitialized Footer completato"); } #endregion Protected Methods diff --git a/MP.MON.Client/Components/CmpHeader.razor b/MP.MON.Client/Components/CmpHeader.razor index b2009d3d..4b5113e0 100644 --- a/MP.MON.Client/Components/CmpHeader.razor +++ b/MP.MON.Client/Components/CmpHeader.razor @@ -1,51 +1,20 @@ 
- + +   +
+
- MP MONitor + Mapo MONitor
- @($"{DateTime.Now:dddd dd MMMM yyyy}") + @($"{DateTime.Now:dddd yyyy.MM.dd}") - - EgalWare + + @($"{DateTime.Now:HH:mm:ss}") + + @* + EgalWare *@
-@code { - - //protected override async Task OnInitializedAsync() - //{ - // StartTimer(); - //} - - //public void Dispose() - //{ - // aTimer.Stop(); - // aTimer.Dispose(); - //} - - //private static System.Timers.Timer aTimer; - - //public void StartTimer() - //{ - // int tOutPeriod = 60000; - // //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod); - // aTimer = new System.Timers.Timer(tOutPeriod); - // aTimer.Elapsed += ElapsedTimer; - // aTimer.Enabled = true; - // aTimer.Start(); - //} - - //public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e) - //{ - // var pUpd = Task.Run(async () => - // { - // //await ReloadData(); - // await Task.Delay(1); - // await InvokeAsync(StateHasChanged); - // }); - // pUpd.Wait(); - //} - -} \ No newline at end of file diff --git a/MP.MON.Client/Components/CmpHeader.razor.cs b/MP.MON.Client/Components/CmpHeader.razor.cs new file mode 100644 index 00000000..f37f4852 --- /dev/null +++ b/MP.MON.Client/Components/CmpHeader.razor.cs @@ -0,0 +1,44 @@ +using Microsoft.AspNetCore.Components; + +namespace MP.MON.Client.Components +{ + public partial class CmpHeader: ComponentBase, IDisposable + { + + protected override void OnInitialized() + { + StartTimer(); + Console.WriteLine($"OnInitialized Header completato"); + } + + + public void Dispose() + { + aTimer.Stop(); + aTimer.Dispose(); + } + + private static System.Timers.Timer aTimer; + + public void StartTimer() + { + int tOutPeriod = 1000; + aTimer = new System.Timers.Timer(tOutPeriod); + aTimer.Elapsed += ElapsedTimer; + aTimer.Enabled = true; + aTimer.Start(); + } + + public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e) + { + var pUpd = Task.Run(async () => + { + await Task.Delay(1); + //Console.WriteLine($"{DateTime.Now} | Elapsed Timer Footer"); + await InvokeAsync(() => StateHasChanged()); + }); + pUpd.Wait(); + } + + } +} \ No newline at end of file diff --git a/MP.MON.Client/Components/DetailViewMSE.razor b/MP.MON.Client/Components/DetailViewMSE.razor index fa2bdd6f..10418d18 100644 --- a/MP.MON.Client/Components/DetailViewMSE.razor +++ b/MP.MON.Client/Components/DetailViewMSE.razor @@ -61,7 +61,7 @@ else PODL:
- @(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:00000000}" : "-") + @(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:000000}" : "-")
@@ -69,7 +69,7 @@ else ODL:
- @(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:00000000}" : "-") + @(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:000000}" : "-")
} diff --git a/MP.MON.Client/Program.cs b/MP.MON.Client/Program.cs index 519269f2..e32d5ab1 100644 --- a/MP.MON.Client/Program.cs +++ b/MP.MON.Client/Program.cs @@ -1,5 +1,9 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using System.Globalization; var builder = WebAssemblyHostBuilder.CreateDefault(args); +CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("it-IT"); +CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo("it-IT"); + await builder.Build().RunAsync(); diff --git a/MP.MON/Components/Layout/MainLayout.razor b/MP.MON/Components/Layout/MainLayout.razor index fd43cc55..37d9434d 100644 --- a/MP.MON/Components/Layout/MainLayout.razor +++ b/MP.MON/Components/Layout/MainLayout.razor @@ -5,7 +5,7 @@
- +
diff --git a/MP.MON/Components/Layout/MainLayout.razor.css b/MP.MON/Components/Layout/MainLayout.razor.css index a1f0bb7b..889f36e7 100644 --- a/MP.MON/Components/Layout/MainLayout.razor.css +++ b/MP.MON/Components/Layout/MainLayout.razor.css @@ -31,7 +31,7 @@ main { .bottom-row { color: #dedede; background-color: #000000; - height: 1.5rem; + height: 2rem; align-items: center; } @media (max-width: 640.98px) { diff --git a/MP.MON/Components/Layout/MainLayout.razor.less b/MP.MON/Components/Layout/MainLayout.razor.less index 0899d892..a574f504 100644 --- a/MP.MON/Components/Layout/MainLayout.razor.less +++ b/MP.MON/Components/Layout/MainLayout.razor.less @@ -37,7 +37,7 @@ main { .bottom-row { color: #dedede; background-color: #000000; - height: 1.5rem; + height: 2.0rem; align-items: center; } diff --git a/MP.MON/Components/Layout/MainLayout.razor.min.css b/MP.MON/Components/Layout/MainLayout.razor.min.css index 19dc5f91..5fbd3602 100644 --- a/MP.MON/Components/Layout/MainLayout.razor.min.css +++ b/MP.MON/Components/Layout/MainLayout.razor.min.css @@ -1 +1 @@ -.page{position:relative;display:flex;flex-direction:column;}main{flex:1;}.top-row{background-color:#000;color:#696969;font-size:1.4em;height:2.6rem;display:flex;align-items:center;justify-content:space-evenly;}.mainHead{font-size:1.6rem;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:1.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}.bottom-row{color:#dedede;background-color:#000;height:1.5rem;align-items:center;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:15rem;height:100vh;position:sticky;top:0;}.sidebarSmall{width:80px;height:100vh;position:sticky;top:0;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:.5rem!important;padding-right:.5rem!important;}.bottom-row{position:fixed;bottom:0;z-index:1;}.main>div{padding-left:.5rem!important;padding-right:.5rem!important;}} \ No newline at end of file +.page{position:relative;display:flex;flex-direction:column;}main{flex:1;}.top-row{background-color:#000;color:#696969;font-size:1.4em;height:2.6rem;display:flex;align-items:center;justify-content:space-evenly;}.mainHead{font-size:1.6rem;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:1.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}.bottom-row{color:#dedede;background-color:#000;height:2rem;align-items:center;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:15rem;height:100vh;position:sticky;top:0;}.sidebarSmall{width:80px;height:100vh;position:sticky;top:0;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:.5rem!important;padding-right:.5rem!important;}.bottom-row{position:fixed;bottom:0;z-index:1;}.main>div{padding-left:.5rem!important;padding-right:.5rem!important;}} \ No newline at end of file diff --git a/MP.MON/MP.MON.csproj b/MP.MON/MP.MON.csproj index 334a40f6..8b060159 100644 --- a/MP.MON/MP.MON.csproj +++ b/MP.MON/MP.MON.csproj @@ -6,7 +6,7 @@ enable MP.MON $(AssemblyName.Replace(' ', '_')) - 6.16.2503.1707 + 6.16.2503.1710 diff --git a/MP.MON/Resources/ChangeLog.html b/MP.MON/Resources/ChangeLog.html index e3d9bd44..29716892 100644 --- a/MP.MON/Resources/ChangeLog.html +++ b/MP.MON/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2503.1707

+

Versione: 6.16.2503.1710


Note di rilascio:
  • diff --git a/MP.MON/Resources/VersNum.txt b/MP.MON/Resources/VersNum.txt index b7dd2621..19b18699 100644 --- a/MP.MON/Resources/VersNum.txt +++ b/MP.MON/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1707 +6.16.2503.1710 diff --git a/MP.MON/Resources/manifest.xml b/MP.MON/Resources/manifest.xml index c4fdc0a3..d44cb851 100644 --- a/MP.MON/Resources/manifest.xml +++ b/MP.MON/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1707 + 6.16.2503.1710 https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP-MON.zip https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html false