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

Fix salvataggio tav selezionata

Browse Source
This commit is contained in:
Samuele Locatelli
2023-12-12 14:44:33 +01:00
parent 0e604ab186
commit 2f765cf095
8 changed files with 84 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachSel.razor.cs
+28 -2
View File
@@ -1,6 +1,7 @@
using global::Microsoft.AspNetCore.Components;
using MP.Data.DatabaseModels;
using MP.Data.Services;
using MP_TAB_SERV.Shared;
using System;
using System.Reflection.Metadata;
@@ -28,12 +29,16 @@ namespace MP_TAB_SERV.Components
if (idxMaccSel != value)
{
idxMaccSel = value;
MsgServ.UserPrefSet(idxMaccCurr, value);
E_MachSel.InvokeAsync(value).ConfigureAwait(false);
}
}
}
private string idxMaccSel { get; set; } = "";
[Inject]
protected MessageService MsgServ { get; set; } = null!;
protected Dictionary<string, string>? ListMacchine { get; set; } = null;
[Inject]
@@ -43,6 +48,19 @@ namespace MP_TAB_SERV.Components
#region Protected Methods
protected string idxMaccCurr
{
get
{
string answ = "";
if (RecMSE != null)
{
answ = RecMSE?.IdxMacchina ?? "";
}
return answ;
}
}
protected override async Task OnParametersSetAsync()
{
// inizilamente riporto machcina corrente da MSE
@@ -63,8 +81,16 @@ namespace MP_TAB_SERV.Components
if (ListMacchine.Count > 0 && string.IsNullOrEmpty(idxMaccSel))
{
IdxMaccSel = ListMacchine.FirstOrDefault().Key;
//await E_MachSel.InvokeAsync(idxMaccSel);
// cerco se ho in storage la macchina selezionata...
var idxMSel = MsgServ.UserPrefGet(idxMaccCurr);
if (!string.IsNullOrEmpty(idxMSel))
{
idxMaccSel = idxMSel;
}
else
{
IdxMaccSel = ListMacchine.FirstOrDefault().Key;
}
}
}
}
MP-TAB-SERV/Components/MseSampler.razor.cs
-1
View File
@@ -72,7 +72,6 @@ namespace MP_TAB_SERV.Components
{
aTimer.Interval = fastRefreshMs;
await InvokeAsync(RefreshData);
//Log.Trace("MseSampler Timer elapsed");
});
pUpd.Wait();
}
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.1208</Version>
<Version>6.16.2312.1214</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/User.razor
+3 -3
View File
@@ -191,7 +191,7 @@
if (_tcModIns != value)
{
_tcModIns = value;
MsgServ.UserPrefSave("TcMode", value);
MsgServ.UserPrefSet("TcMode", value);
}
}
}
@@ -206,7 +206,7 @@
if (_langIns != value)
{
_langIns = value;
MsgServ.UserPrefSave("Lang", value);
MsgServ.UserPrefSet("Lang", value);
}
}
}
@@ -220,7 +220,7 @@
if (_defCardMode != value)
{
_defCardMode = value;
MsgServ.UserPrefSave("DefCardMode", value);
MsgServ.UserPrefSet("DefCardMode", value);
}
}
}
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2312.1208</h4>
<h4>Versione: 6.16.2312.1214</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2312.1208
6.16.2312.1214
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.1208</version>
<version>6.16.2312.1214</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.Data/Services/MessageService.cs
+49 -44
View File
@@ -53,8 +53,6 @@ namespace MP.Data.Services
#endregion Public Events
#region Public Properties
#if false
protected bool _tReset { get; set; } = false;
protected bool tReset
@@ -76,10 +74,10 @@ namespace MP.Data.Services
{
EA_ResetFooterTimer?.Invoke();
}
}
}
#endif
public DateTime dtLastAction { get; set; } = DateTime.Now;
#region Public Properties
public string CognomeNome
{
@@ -120,6 +118,8 @@ namespace MP.Data.Services
}
}
public DateTime dtLastAction { get; set; } = DateTime.Now;
public int MatrOpr
{
get
@@ -247,6 +247,37 @@ namespace MP.Data.Services
return SteamCrypto.DecryptString(encData, Constants.passPhrase);
}
public async Task<bool> DoLogIn(string decodValue)
{
bool answ = false;
expDays = SMService.GetConfInt("cookieDayExpire");
var expDT = DateTime.Now.AddDays(expDays);
// decifro i valori..
var decrVal = DecryptData(decodValue);
var opData = JsonConvert.DeserializeObject<userTknDTO>(decrVal);
if (opData != null)
{
var rigaOpr = await TDService.OperatoreSearch(opData.currOpr.MatrOpr, opData.currOpr.authKey);
if (rigaOpr != null)
{
userTknDTO newUserTkn = new userTknDTO()
{
currOpr = rigaOpr,
expTime = expDT
};
var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
string hash = TDService.EncryptData(jsonTkn);
RigaOper = rigaOpr;
await SetLastMatrOprAsync(rigaOpr.MatrOpr);
await SetCurrOperDtoAsync(hash);
await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
answ = true;
}
}
return answ;
}
public string EncryptData(string rawData)
{
return SteamCrypto.EncryptString(rawData, Constants.passPhrase);
@@ -344,6 +375,7 @@ namespace MP.Data.Services
{
await localStorage.SetItemAsync("CurrMach", machSel);
}
/// <summary>
/// Scrive sul local storage pagina corrente
/// </summary>
@@ -438,40 +470,6 @@ namespace MP.Data.Services
return answ;
}
protected int expDays { get; set; } = 0;
public async Task<bool> DoLogIn(string decodValue)
{
bool answ = false;
expDays = SMService.GetConfInt("cookieDayExpire");
var expDT = DateTime.Now.AddDays(expDays);
// decifro i valori..
var decrVal = DecryptData(decodValue);
var opData = JsonConvert.DeserializeObject<userTknDTO>(decrVal);
if (opData != null)
{
var rigaOpr = await TDService.OperatoreSearch(opData.currOpr.MatrOpr, opData.currOpr.authKey);
if (rigaOpr != null)
{
userTknDTO newUserTkn = new userTknDTO()
{
currOpr = rigaOpr,
expTime = expDT
};
var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
string hash = TDService.EncryptData(jsonTkn);
RigaOper = rigaOpr;
await SetLastMatrOprAsync(rigaOpr.MatrOpr);
await SetCurrOperDtoAsync(hash);
await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
answ = true;
}
}
return answ;
}
/// <summary>
/// Salva matrOpr nel localstorage
/// </summary>
@@ -484,6 +482,7 @@ namespace MP.Data.Services
return answ;
}
/// <summary>
/// Recupero singola preferenza utente
/// </summary>
@@ -501,12 +500,12 @@ namespace MP.Data.Services
}
/// <summary>
/// Salvo singola rpeferenza utente
/// Salvo singola preferenza utente
/// </summary>
/// <param name="chiave"></param>
/// <param name="valore"></param>
/// <returns></returns>
public bool UserPrefSave(string chiave, string valore)
public bool UserPrefSet(string chiave, string valore)
{
bool done = false;
var currDict = UsersPrefDict;
@@ -540,7 +539,7 @@ namespace MP.Data.Services
{
if (MatrOpr > 0)
{
UserPrefSave(chiave, defValue);
UserPrefSet(chiave, defValue);
}
}
return answ;
@@ -569,11 +568,11 @@ namespace MP.Data.Services
#region Protected Properties
protected int expDays { get; set; } = 0;
protected ILocalStorageService localStorage { get; set; } = null!;
protected TabDataService TDService { get; set; } = null!;
protected SharedMemService SMService { get; set; } = null!;
protected ISessionStorageService sessionStore { get; set; } = null!;
protected SharedMemService SMService { get; set; } = null!;
protected TabDataService TDService { get; set; } = null!;
#endregion Protected Properties
@@ -597,6 +596,12 @@ namespace MP.Data.Services
#endregion Private Fields
#region Private Properties
private Dictionary<string, string> UserPrefs { get; set; } = new Dictionary<string, string>();
#endregion Private Properties
#region Private Methods
private string machineMse(string idxMacc)