diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index 89ea2480..e90e41e6 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -1,9 +1,18 @@
+using Microsoft.AspNetCore.Components;
+using MP.Data.Services;
using NLog;
namespace MP_TAB_SERV.Components
{
public partial class CmpFooter : IDisposable
{
+ [Inject]
+ protected SharedMemService SMServ { get; set; } = null!;
+ [Inject]
+ protected MessageService MsgServ { get; set; } = null!;
+ [Inject]
+ protected NavigationManager NavMan { get; set; } = null!;
+
#region Public Methods
public void Dispose()
@@ -18,10 +27,16 @@ namespace MP_TAB_SERV.Components
public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
{
+ var diffOfTime = DateTime.Now - MsgServ.dtLastAction;
+
var pUpd = Task.Run(async () =>
{
await Task.Delay(1);
await InvokeAsync(() => StateHasChanged());
+ if(diffOfTime.Minutes > dtTimerScadenzaLogin)
+ {
+ NavMan.NavigateTo("logout");
+ }
//Log.Trace("CmpFooter Timer elapsed");
});
pUpd.Wait();
@@ -29,7 +44,7 @@ namespace MP_TAB_SERV.Components
public void StartTimer()
{
- int tOutPeriod = 5000;
+ int tOutPeriod = dtTimerScadenzaLogin * 60000;
aTimer = new System.Timers.Timer(tOutPeriod);
aTimer.Elapsed += ElapsedTimer;
aTimer.Enabled = true;
@@ -40,12 +55,24 @@ namespace MP_TAB_SERV.Components
#region Protected Methods
- protected override void OnInitialized()
+ int dtTimerScadenzaLogin { get; set; } = 0;
+
+ protected override async Task OnInitializedAsync()
{
- var rawVers = typeof(Program).Assembly.GetName().Version; ;
+ await Task.Delay(1);
+ var rawVers = typeof(Program).Assembly.GetName().Version;
version = rawVers != null ? rawVers : new Version("0.0.0.0");
- StartTimer();
+ dtTimerScadenzaLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin");
+ if (dtTimerScadenzaLogin > 0)
+ {
+ StartTimer();
+ }
+
}
+ //protected override void OnInitialized()
+ //{
+
+ //}
#endregion Protected Methods
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 0637c48d..3c827081 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2311.2916
+ 6.16.2311.3010
enable
MP_TAB_SERV
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 73b25e01..7db84c67 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2311.2916
+ Versione: 6.16.2311.3010
Note di rilascio:
-
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index b1553713..220ed05b 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2311.2916
+6.16.2311.3010
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 151379be..e9074d8a 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2311.2916
+ 6.16.2311.3010
https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip
https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html
false
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor
index cb0b5b31..811396de 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor
+++ b/MP-TAB-SERV/Shared/MainLayout.razor
@@ -4,8 +4,7 @@
MP-TAB-SERV
-
-
+
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index c102a904..6457138d 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -1,5 +1,6 @@
using global::Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.JSInterop;
using MP.Data.DatabaseModels;
using MP.Data.Services;
using NLog;
@@ -55,6 +56,9 @@ namespace MP_TAB_SERV.Shared
[Inject]
protected TabDataService TDataService { get; set; } = null!;
+ [Inject]
+ protected IJSRuntime JSRuntime { get; set; } = null!;
+
#endregion Protected Properties
#region Protected Methods
@@ -65,6 +69,12 @@ namespace MP_TAB_SERV.Shared
}
+ protected async Task handleBodyClick()
+ {
+ await JSRuntime.InvokeVoidAsync("alert", "bodyClicked");
+ MsgServ.dtLastAction = DateTime.Now;
+ }
+
///
/// Init struttura dati
///
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index d9ddde30..9dc82e94 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -47,10 +47,38 @@ namespace MP.Data.Services
public event Action EA_PageUpdated = null!;
+ public event Action EA_ResetFooterTimer = null!;
+
#endregion Public Events
#region Public Properties
+#if false
+ protected bool _tReset { get; set; } = false;
+ protected bool tReset
+ {
+ get => _tReset;
+ set
+ {
+ if (_tReset != value)
+ {
+ _tReset = value;
+ resetTimer();
+ }
+ }
+ }
+
+ protected void resetTimer()
+ {
+ if (EA_ResetFooterTimer != null)
+ {
+ EA_ResetFooterTimer?.Invoke();
+ }
+ }
+#endif
+
+ public DateTime dtLastAction { get; set; } = DateTime.Now;
+
public string CognomeNome
{
get