diff --git a/MagMan.UI/Components/CmpFooter.razor b/MagMan.UI/Components/CmpFooter.razor index 6f68ca4..fd5efb0 100644 --- a/MagMan.UI/Components/CmpFooter.razor +++ b/MagMan.UI/Components/CmpFooter.razor @@ -8,9 +8,3 @@ -@code { - protected DateTime adesso = DateTime.Now; - - Version version = typeof(Program).Assembly.GetName().Version; - -} \ No newline at end of file diff --git a/MagMan.UI/Components/CmpFooter.razor.cs b/MagMan.UI/Components/CmpFooter.razor.cs new file mode 100644 index 0000000..93b8b56 --- /dev/null +++ b/MagMan.UI/Components/CmpFooter.razor.cs @@ -0,0 +1,69 @@ +// Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this +// file to you under the MIT license. +namespace MagMan.UI.Components +{ + public partial class CmpFooter : IDisposable + { + #region Public Methods + + public void Dispose() + { + if (aTimer != null) + { + aTimer.Elapsed -= ElapsedTimer; + aTimer.Stop(); + aTimer.Dispose(); + } + } + + #endregion Public Methods + + #region Protected Fields + + protected DateTime adesso = DateTime.Now; + + #endregion Protected Fields + + #region Protected Methods + + protected void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e) + { + var pUpd = Task.Run(async () => + { + adesso = DateTime.Now; + await InvokeAsync(StateHasChanged); + }); + pUpd.Wait(); + } + + protected override void OnParametersSet() + { + var rawVers = typeof(Program).Assembly.GetName().Version; + version = rawVers != null ? rawVers : new Version("0.0.0.0"); + StartTimer(); + } + + protected void StartTimer() + { + if (aTimer != null) + { + aTimer.Stop(); + aTimer.Dispose(); + } + int tOutPeriod = 1000; + aTimer = new System.Timers.Timer(tOutPeriod); + aTimer.Elapsed += ElapsedTimer; + aTimer.Enabled = true; + aTimer.Start(); + } + + #endregion Protected Methods + + #region Private Fields + + private System.Timers.Timer aTimer = null!; + private Version version = null!; + + #endregion Private Fields + } +} \ No newline at end of file diff --git a/MagMan.UI/Components/ResourcesAct.razor b/MagMan.UI/Components/ResourcesAct.razor index 03a2800..08dae29 100644 --- a/MagMan.UI/Components/ResourcesAct.razor +++ b/MagMan.UI/Components/ResourcesAct.razor @@ -5,6 +5,7 @@
Risorse Consumate
+
diff --git a/MagMan.UI/Components/ResourcesAct.razor.cs b/MagMan.UI/Components/ResourcesAct.razor.cs index e7ffb34..825ca10 100644 --- a/MagMan.UI/Components/ResourcesAct.razor.cs +++ b/MagMan.UI/Components/ResourcesAct.razor.cs @@ -77,6 +77,8 @@ namespace MagMan.UI.Components protected async Task ForceReload(bool force) { + isLoading = true; + await Task.Delay(1); CurrItem = null; await ReloadData(); } diff --git a/MagMan.UI/Components/ResourcesEstim.razor b/MagMan.UI/Components/ResourcesEstim.razor index 7cffacd..0968e88 100644 --- a/MagMan.UI/Components/ResourcesEstim.razor +++ b/MagMan.UI/Components/ResourcesEstim.razor @@ -5,6 +5,7 @@
Previsione Consumi Risorse
+
diff --git a/MagMan.UI/Components/ResourcesEstim.razor.cs b/MagMan.UI/Components/ResourcesEstim.razor.cs index 74600e6..46aa9e9 100644 --- a/MagMan.UI/Components/ResourcesEstim.razor.cs +++ b/MagMan.UI/Components/ResourcesEstim.razor.cs @@ -76,6 +76,8 @@ namespace MagMan.UI.Components protected async Task ForceReload(bool force) { + isLoading = true; + await Task.Delay(1); CurrItem = null; await ReloadData(); } diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj index abde604..9f1ddb9 100644 --- a/MagMan.UI/MagMan.UI.csproj +++ b/MagMan.UI/MagMan.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 1.0.2406.2911 + 1.0.2406.2913 enable enable true diff --git a/MagMan.UI/Pages/ProjectsStatus.razor.cs b/MagMan.UI/Pages/ProjectsStatus.razor.cs index 257da23..9af6846 100644 --- a/MagMan.UI/Pages/ProjectsStatus.razor.cs +++ b/MagMan.UI/Pages/ProjectsStatus.razor.cs @@ -54,6 +54,7 @@ namespace MagMan.UI.Pages protected void SaveProj(ProjModel? newRec) { ProjSel = newRec; + ProjDbId = newRec != null ? newRec.ProjDbId : 0; } #endregion Protected Methods @@ -62,14 +63,14 @@ namespace MagMan.UI.Pages private int KeyNum = 0; - private ProjModel? ProjSel = null; - #endregion Private Fields #region Private Properties private int CustomerID { get; set; } = 0; private bool isLoading { get; set; } = false; + private int ProjDbId { get; set; } = 0; + private ProjModel? ProjSel { get; set; } = null; #endregion Private Properties diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index bd4e76a..f8515fa 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MagMan - Wood Warehouse Management System -

Versione: 1.0.2406.2911

+

Versione: 1.0.2406.2913


Note di rilascio: