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

prova fix refresh

Browse Source
This commit is contained in:
zaccaria.majid
2023-12-06 15:59:35 +01:00
parent b3ebd24405
commit d4529976ad
9 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/CmpTop.razor.cs
+11 -4
View File
@@ -27,6 +27,7 @@ namespace MP_TAB_SERV.Components
#region Protected Properties
protected string CurrOprTknLS { get; set; } = null!;
protected string LastOpenedPage { get; set; } = null!;
protected string CurrOprTknRedis { get; set; } = null!;
@@ -134,6 +135,7 @@ namespace MP_TAB_SERV.Components
expDT = DateTime.Now.AddDays(expDays);
CurrOprTknLS = await MsgServ.GetCurrOperDtoAsync();
LastOpenedPage = await MsgServ.LastOpenedPageGet();
var decodedUrl = Uri.UnescapeDataString(CurrOprTknLS);
// verifico se non avessi dati operatore
@@ -143,6 +145,8 @@ namespace MP_TAB_SERV.Components
}
CurrOprTknRedis = await TDService.OperatoreGetRedis(MatrOpr);
if (CurrOprTknRedis == "")
{
if (!NavMan.Uri.Contains("reg-new-device"))
@@ -152,10 +156,13 @@ namespace MP_TAB_SERV.Components
}
else if (CurrOprTknRedis != "")
{
if (!NavMan.Uri.Contains("status-map"))
{
NavMan.NavigateTo("status-map", true);
}
//if (!NavMan.Uri.Contains("status-map"))
//{
//}
//if (LastOpenedPage != "")
//{
// NavMan.NavigateTo(LastOpenedPage, true);
//}
}
}
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2312.608</Version>
<Version>6.16.2312.615</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/StatusMap.razor.cs
+6 -2
View File
@@ -102,12 +102,16 @@ namespace MP_TAB_SERV.Pages
setDefaults();
ListMSE = null;
SetupConf();
var LastOpenedPage = await MsgServ.LastOpenedPageGet();
var currMacc = await MsgServ.IdxMaccGet();
if (currMacc != "" && currMacc != null)
{
await MsgServ.IdxMaccSet(currMacc);
NavMan.NavigateTo($"machine-detail");
if (LastOpenedPage != "")
{
NavMan.NavigateTo(LastOpenedPage);
}
//NavMan.NavigateTo($"machine-detail");
}
}
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2312.608</h4>
<h4>Versione: 6.16.2312.615</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2312.608
6.16.2312.615
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2312.608</version>
<version>6.16.2312.615</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP-TAB-SERV/Shared/MainLayout.razor.cs
-1
View File
@@ -71,7 +71,6 @@ namespace MP_TAB_SERV.Shared
protected async Task handleBodyClick()
{
//await JSRuntime.InvokeVoidAsync("alert", "bodyClicked");
await Task.Delay(1);
MsgServ.dtLastAction = DateTime.Now;
}
MP-TAB-SERV/Shared/NavMenu.razor
+1
View File
@@ -41,6 +41,7 @@
{
await MsgServ.IdxMaccSet("");
}
await MsgServ.LastOpenedPageSet(tgtUrl);
navManager.NavigateTo(tgtUrl);
}
}
MP.Data/Services/MessageService.cs
+15
View File
@@ -342,6 +342,21 @@ namespace MP.Data.Services
{
await localStorage.SetItemAsync("CurrMach", machSel);
}
/// <summary>
/// Scrive sul local storage pagina corrente
/// </summary>
public async Task<string> LastOpenedPageGet()
{
return await localStorage.GetItemAsync<string>("LastPage");
}
/// <summary>
/// Ottiene sul local storage pagina corrente
/// </summary>
public async Task LastOpenedPageSet(string lastPage)
{
await localStorage.SetItemAsync("LastPage", lastPage);
}
/// <summary>
/// Effettua salvataggio in localstorage dei dati MSE correnti