diff --git a/MP.Data/DTO/OperatoreDTO.cs b/MP.Data/DTO/OperatoreDTO.cs index eb421c5b..da56411d 100644 --- a/MP.Data/DTO/OperatoreDTO.cs +++ b/MP.Data/DTO/OperatoreDTO.cs @@ -12,5 +12,6 @@ namespace MP.Data.DTO public string Cognome { get; set; } = ""; public string Nome { get; set; } = ""; public string hashAuthKey { get; set; } = ""; + public DateTime dtExp { get; set; } } } diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs index 262b05f0..647a3a61 100644 --- a/MP.INVE/Components/CmpTop.razor.cs +++ b/MP.INVE/Components/CmpTop.razor.cs @@ -46,7 +46,7 @@ namespace MP.INVE.Components answ = await localStorage.GetItemAsync("MatrOpr"); if (!NavManager.Uri.Contains("Jumper?")) { - if (answ != null) + if (answ != null && !(answ.dtExp < DateTime.Now)) { userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})"; if (NavManager.Uri.Contains("OperatoreLogin")) diff --git a/MP.INVE/Pages/Jumper.razor.cs b/MP.INVE/Pages/Jumper.razor.cs index e5ec42ee..7969d480 100644 --- a/MP.INVE/Pages/Jumper.razor.cs +++ b/MP.INVE/Pages/Jumper.razor.cs @@ -62,7 +62,8 @@ namespace MP.INVE.Pages MatrOpr = currOpr.MatrOpr, Nome = currOpr.Nome, Cognome = currOpr.Cognome, - hashAuthKey = hash + hashAuthKey = hash, + dtExp = DateTime.Now.AddMinutes(1) }; await localStorage.SetItemAsync("MatrOpr", currOpr); diff --git a/MP.INVE/Pages/OperatoreLogin.razor b/MP.INVE/Pages/OperatoreLogin.razor index 9d0e9867..15e1aa06 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor +++ b/MP.INVE/Pages/OperatoreLogin.razor @@ -5,50 +5,58 @@
-
-
-

login Operatore

-
-
-
-
-
- -
+ @if (isLoading) + { + + } + else + { -
- + @if (elencoOperatori != null) { - + @foreach (var item in elencoOperatori) + { + + } } - } - + +
+
-
-
-
-
-
- - +
+
+
+ + +
+
-
-
-
-
-
- -
-
+
+
+
+ +
+
+
-
+ }
diff --git a/MP.INVE/Pages/OperatoreLogin.razor.cs b/MP.INVE/Pages/OperatoreLogin.razor.cs index bdc5f655..9af22264 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor.cs +++ b/MP.INVE/Pages/OperatoreLogin.razor.cs @@ -48,14 +48,17 @@ namespace MP.INVE.Pages private string _authKey { get; set; } = ""; private bool logged { get; set; } = false; + private bool isLoading { get; set; } = false; private List? elencoOperatori; protected override async Task OnInitializedAsync() { + isLoading = true; //await FilterChanged.InvokeAsync(actFilter); await Task.Delay(1); elencoOperatori = MIDataservice.ElencoOperatori(); + isLoading = false; } private void login() @@ -74,7 +77,8 @@ namespace MP.INVE.Pages MatrOpr = currOpr.MatrOpr, Nome = currOpr.Nome, Cognome = currOpr.Cognome, - hashAuthKey = hash + hashAuthKey = hash, + dtExp = DateTime.Now.AddMinutes(1) }; localStorage.SetItemAsync("MatrOpr", sessionOpr); NavManager.NavigateTo("InveSession", true);