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

Fix condizioni reload dati in rebuild

Browse Source
This commit is contained in:
Samuele Locatelli
2024-01-04 19:35:52 +01:00
parent 0e388df1cd
commit b6f112e114
8 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/CmpTop.razor.cs
+3 -2
View File
@@ -97,11 +97,13 @@ namespace MP_TAB3.Components
await InvokeAsync(StateHasChanged);
var currToken = await MsgServ.GetCurrOperDtoLSAsync();
var lastOpr = await MsgServ.GetLastMatrOprAsync();
var devGuid = await MsgServ.GetCurrDevGuidLSAsync();
// reset cache varie
await MsgServ.ClearLocalStor();
await MsgServ.ClearSessionStor();
await MDataService.FlushCache();
// salvo di nuovo opr
// salvo di nuovo opr + GUID
await MsgServ.SetCurrDevGuidLSAsync(devGuid);
await MsgServ.SetLastMatrOprAsync(lastOpr);
await MsgServ.SetCurrOperDtoLSAsync(currToken);
// reload MStor
@@ -135,7 +137,6 @@ namespace MP_TAB3.Components
expLoginType = SMServ.GetConfInt("TAB_TypeScadLogin");
var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
//if (string.IsNullOrEmpty(CurrDevGuid.ToString()))
if (CurrDevGuid == Guid.Empty)
{
CurrDevGuid = Guid.NewGuid();
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2401.417</Version>
<Version>6.16.2401.419</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/Logout.razor.cs
+3 -3
View File
@@ -39,9 +39,9 @@ namespace MP_TAB3.Pages
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
await localStorage.SetItemAsync("currTkn", "");
await localStorage.SetItemAsync("CurrMach", "");
await localStorage.SetItemAsync("LastPage", "");
await MsgServ.SetCurrOperDtoLSAsync("");
await MsgServ.IdxMaccSet("");
await MsgServ.LastOpenedPageSet("");
var CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
if (!string.IsNullOrEmpty(CurrOprTknLS))
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2401.417</h4>
<h4>Versione: 6.16.2401.419</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2401.417
6.16.2401.419
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2401.417</version>
<version>6.16.2401.419</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP-TAB3/Shared/MainLayout.razor.cs
+16 -8
View File
@@ -92,7 +92,10 @@ namespace MP_TAB3.Shared
{
get => MsgServ.MatrOpr;
}
protected int typeScadLogin { get; set; } = 0;
/// <summary>
/// Tipo scadenza login, a -1 di default così da NON avere problemi in caso di setuop errato...
/// </summary>
protected int typeScadLogin { get; set; } = -1;
protected int dtScadLogin { get; set; } = 0;
protected Guid currDevGuid { get; set; } = new Guid();
@@ -102,14 +105,8 @@ namespace MP_TAB3.Shared
TimeSpan tsDeltaSave = DateTime.Now.Subtract(MsgServ.dtLastSave);
switch (typeScadLogin)
{
case 0:
if (tsDeltaAct.Minutes >= dtScadLogin)
{
NavMan.NavigateTo("logout");
}
break;
case 1:
if (tsDeltaAct.Minutes >= dtScadLogin)
if (tsDeltaAct.TotalMinutes >= dtScadLogin)
{
var userTkn = await TDataService.OperatoreGetRedis(MatrOpr, currDevGuid);
if (!string.IsNullOrEmpty(userTkn))
@@ -138,6 +135,17 @@ namespace MP_TAB3.Shared
}
}
break;
case 2:
if (tsDeltaAct.TotalMinutes >= dtScadLogin)
{
NavMan.NavigateTo("logout");
}
break;
case 0:
case -1:
await ReloadMemStor();
typeScadLogin = MStor.GetConfInt("TAB_TypeScadLogin");
break;
}
}
MP.Data/Services/MessageService.cs
+8 -4
View File
@@ -262,6 +262,8 @@ namespace MP.Data.Services
var rigaOpr = await TDService.OperatoreSearch(opData.currOpr.MatrOpr, opData.currOpr.authKey);
if (rigaOpr != null)
{
await SetLastMatrOprAsync(rigaOpr.MatrOpr);
userTknDTO newUserTkn = new userTknDTO()
{
currOpr = rigaOpr,
@@ -271,8 +273,10 @@ namespace MP.Data.Services
var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
string hash = TDService.EncryptData(jsonTkn);
RigaOper = rigaOpr;
await SetLastMatrOprAsync(rigaOpr.MatrOpr);
await SetCurrOperDtoLSAsync(hash);
if (!hash.Equals(decodValue))
{
await SetCurrOperDtoLSAsync(hash);
}
if (saveOpr)
{
await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash, devGuid);
@@ -370,8 +374,8 @@ namespace MP.Data.Services
public async Task<MappaStatoExpl?> GetMachineMse(string idxMacchina)
{
MappaStatoExpl answ = null;
string rawData = await localStorage.GetItemAsync<string>(machineMse(idxMacchina));
if (rawData != "")
var rawData = await localStorage.GetItemAsync<string>(machineMse(idxMacchina));
if (!string.IsNullOrEmpty(rawData))
{
answ = JsonConvert.DeserializeObject<MappaStatoExpl>(rawData);
}