Fix merge + codemaid

This commit is contained in:
Samuele Locatelli
2022-11-16 11:49:25 +01:00
parent 6bcb239488
commit b1eef670bd
+17 -51
View File
@@ -1,14 +1,11 @@
using Blazored.SessionStorage;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.Extensions.Configuration;
using Microsoft.JSInterop;
using MP.Data.DTO;
using MP.INVE.Data;
namespace MP.INVE.Components
{
public partial class CmpTop:IDisposable
public partial class CmpTop : IDisposable
{
#region Public Methods
@@ -34,19 +31,10 @@ namespace MP.INVE.Components
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
[Inject]
private ISessionStorageService sessionStorage { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
protected override async Task OnInitializedAsync()
{
LServ.EA_LogIn += LServ_EA_LogIn;
LServ.EA_LogOut += LServ_EA_LogOut;
await forceReload();
}
protected async Task getId()
{
OperatoreDTO answ = new OperatoreDTO();
@@ -61,29 +49,22 @@ namespace MP.INVE.Components
}
}
private void LServ_EA_LogOut()
protected override async Task OnInitializedAsync()
{
NavManager.NavigateTo("OperatoreLogin", true);
}
private void LServ_EA_LogIn()
{
NavManager.NavigateTo("Starter", true);
LServ.EA_LogIn += LServ_EA_LogIn;
LServ.EA_LogOut += LServ_EA_LogOut;
await forceReload();
}
#endregion Protected Methods
#region Private Fields
#endregion Private Fields
#region Private Properties
[Inject]
private NavigationManager NavManager { get; set; } = null!;
[Inject]
private ISessionStorageService sessionStorage { get; set; } = null!;
#endregion Private Properties
@@ -91,32 +72,17 @@ namespace MP.INVE.Components
private async Task forceReload()
{
<<<<<<< HEAD
await Task.Delay(1);
// controllo per login
if (LServ.matrOpr <= 0 && !NavManager.Uri.Contains("OperatoreLogin"))
{
NavManager.NavigateTo("OperatoreLogin", true);
}
}
private async Task logOut()
{
await Task.Delay(1);
LServ.LogOut();
}
private string userName
{
get
{
string answ = "ND";
answ = $"{LServ.Cognome} {LServ.Cognome} ({LServ.matrOpr})";
return answ;
}
=======
await getId();
>>>>>>> develop
}
private void LServ_EA_LogIn()
{
NavManager.NavigateTo("Starter", true);
}
private void LServ_EA_LogOut()
{
NavManager.NavigateTo("OperatoreLogin", true);
}
private async void MService_EA_ShowSearch()