diff --git a/MP-TAB3/Components/CmpFooter.razor b/MP-TAB3/Components/CmpFooter.razor index f5d2eb11..7b4b69b8 100644 --- a/MP-TAB3/Components/CmpFooter.razor +++ b/MP-TAB3/Components/CmpFooter.razor @@ -1,23 +1,22 @@ 
- MP-TAB3 @(DateTime.Today.Year) v.@version + MP-TAB3 @(adesso.Year) v.@version
- @if (typeScadLogin > 0) + @if (TypeScadLogin > 0) { @if (CurrExpVal < 0) { -
TIMER SCADUTO!
+
TIMER SCADUTO!
} else { } } -
- @($"{DateTime.Now:HH:mm:ss}") | Egalware + @($"{adesso:HH:mm:ss}") | Egalware
diff --git a/MP-TAB3/Components/CmpFooter.razor.cs b/MP-TAB3/Components/CmpFooter.razor.cs index 2f30e01b..02abc270 100644 --- a/MP-TAB3/Components/CmpFooter.razor.cs +++ b/MP-TAB3/Components/CmpFooter.razor.cs @@ -6,6 +6,16 @@ namespace MP_TAB3.Components { public partial class CmpFooter : IDisposable { + #region Public Properties + + [Parameter] + public int DtScadLogin { get; set; } = 0; + + [Parameter] + public int TypeScadLogin { get; set; } = -1; + + #endregion Public Properties + #region Public Methods public void Dispose() @@ -18,12 +28,79 @@ namespace MP_TAB3.Components } } - public double CurrExpVal { get; set; } = 50; - public double MaxExpVal { get; set; } = 100; - public double yLimit { get; set; } = 30; - public double rLimit { get; set; } = 10; + #endregion Public Methods - public string timeUm + #region Protected Properties + + [Inject] + protected MessageService MsgServ { get; set; } = null!; + + [Inject] + protected NavigationManager NavMan { get; set; } = null!; + + [Inject] + protected SharedMemService SMServ { get; set; } = null!; + + #endregion Protected Properties + + #region Protected Methods + + protected void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e) + { + var pUpd = Task.Run(async () => + { + if (TypeScadLogin > 0) + { + var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction); + CurrExpVal = MaxExpVal - diffOfTime.TotalMinutes; + } + else + { + } + 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"); + DtScadLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin"); + MaxExpVal = DtScadLogin; + yLimit = MaxExpVal * 0.3; + rLimit = MaxExpVal * 0.1; + StartTimer(); + } + + protected void StartTimer() + { + int tOutPeriod = 1000; + aTimer = new System.Timers.Timer(tOutPeriod); + aTimer.Elapsed += ElapsedTimer; + aTimer.Enabled = true; + aTimer.Start(); + } + + #endregion Protected Methods + + #region Private Fields + + private DateTime adesso = DateTime.Now; + private System.Timers.Timer aTimer = null!; + private Version version = null!; + + #endregion Private Fields + + #region Private Properties + + private double CurrExpVal { get; set; } = 50; + private double MaxExpVal { get; set; } = 100; + + private double rLimit { get; set; } = 10; + + private string timeUm { get { @@ -40,77 +117,7 @@ namespace MP_TAB3.Components } } - public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e) - { - - var pUpd = Task.Run(async () => - { - if (typeScadLogin > 0) - { - var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction); - CurrExpVal = MaxExpVal - diffOfTime.TotalMinutes; - - } - await InvokeAsync(() => StateHasChanged()); - }); - pUpd.Wait(); - } - - public void StartTimer() - { - int tOutPeriod = 1000; - aTimer = new System.Timers.Timer(tOutPeriod); - aTimer.Elapsed += ElapsedTimer; - aTimer.Enabled = true; - aTimer.Start(); - } - - #endregion Public Methods - - #region Protected Properties - - protected int dtScadLogin { get; set; } = 0; - - [Inject] - protected MessageService MsgServ { get; set; } = null!; - - [Inject] - protected NavigationManager NavMan { get; set; } = null!; - - [Inject] - protected SharedMemService SMServ { get; set; } = null!; - - #endregion Protected Properties - - #region Protected Methods - - protected int typeScadLogin { get; set; } = 0; - protected override async Task OnInitializedAsync() - { - await Task.Delay(1); - var rawVers = typeof(Program).Assembly.GetName().Version; - version = rawVers != null ? rawVers : new Version("0.0.0.0"); - typeScadLogin = SMServ.GetConfInt("TAB_TypeScadLogin"); - dtScadLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin"); - MaxExpVal = dtScadLogin; - yLimit = MaxExpVal * 0.3; - rLimit = MaxExpVal * 0.1; - StartTimer(); - } - - #endregion Protected Methods - - #region Private Fields - - private static Logger Log = LogManager.GetCurrentClassLogger(); - private System.Timers.Timer aTimer = null!; - private Version version = null!; - - #endregion Private Fields - - #region Private Properties - - private int dtTimerScadenzaLogin { get; set; } = 0; + private double yLimit { get; set; } = 30; #endregion Private Properties } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index a6476079..d79abb29 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2401.419 + 6.16.2401.508 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 12c3af5d..175c3c29 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2401.419

+

Versione: 6.16.2401.508


Note di rilascio: