Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-12-12 14:45:05 +01:00
parent 2f765cf095 8856393c0b
commit abf0cc63b8
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Pages/Logout.razor.cs
+1 -1
View File
@@ -42,7 +42,7 @@ namespace MP_TAB_SERV.Pages
await localStorage.SetItemAsync("currTkn", "");
await TDService.OperatoreDeleteRedis(MsgServ.MatrOpr);
MsgServ.RigaOper = null;
NavMan.NavigateTo("reg-new-device");
NavMan.NavigateTo("reg-new-device", true);
}
}
}
MP-TAB-SERV/Shared/MainLayout.razor.cs
+5 -2
View File
@@ -72,7 +72,10 @@ namespace MP_TAB_SERV.Shared
protected async Task handleBodyClick()
{
await Task.Delay(1);
await checkDtDiff2Logout();
if (!NavMan.Uri.Contains("reg-new-device"))
{
await checkDtDiff2Logout();
}
}
private int MatrOpr
@@ -94,7 +97,7 @@ namespace MP_TAB_SERV.Shared
}
break;
case 1:
if ((diffOfTime.Minutes >= dtScadLogin) && (!NavMan.Uri.Contains("reg-new-device")))
if (diffOfTime.Minutes >= dtScadLogin)
{
var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
if (!string.IsNullOrEmpty(userTkn))
MP-TAB-SERV/Shared/NavMenu.razor
+22 -3
View File
@@ -14,9 +14,18 @@
foreach (var item in MenuItems)
{
<div class="nav-item px-2">
<NavLink class="nav-link px-2" @onclick="()=>SetPage(item.NavigateUrl)">
<i class="fa fa-lg @item.icona pe-2" aria-hidden="true"></i> @item.Testo
</NavLink>
@if (@linkActive(item.NavigateUrl))
{
<NavLink class="nav-link px-2 active" @onclick="()=>SetPage(item.NavigateUrl)">
<i class="fa fa-lg @item.icona pe-2" aria-hidden="true"></i> @item.Testo
</NavLink>
}
else
{
<NavLink class="nav-link px-2" @onclick="()=>SetPage(item.NavigateUrl)">
<i class="fa fa-lg @item.icona pe-2" aria-hidden="true"></i> @item.Testo
</NavLink>
}
</div>
}
}
@@ -34,6 +43,16 @@
[Inject]
protected NavigationManager navManager { get; set; } = null!;
protected bool linkActive(string objUrl)
{
bool answ = false;
if (navManager.Uri.Contains(objUrl))
{
answ = true;
}
return answ;
}
protected async Task SetPage(string tgtUrl)
{
await Task.Delay(1);