diff --git a/GPW.CORE.SMART/Components/CmpTop.razor.cs b/GPW.CORE.SMART/Components/CmpTop.razor.cs index d7c2106..66b8857 100644 --- a/GPW.CORE.SMART/Components/CmpTop.razor.cs +++ b/GPW.CORE.SMART/Components/CmpTop.razor.cs @@ -49,7 +49,7 @@ namespace GPW.CORE.Smart.Components protected void ReturnHome() { - navManager.NavigateTo("", true); + navManager.NavigateTo("Home", true); } protected void ForceReset() { @@ -115,7 +115,6 @@ namespace GPW.CORE.Smart.Components // salvo in sessStorage idxDip... await MService.setIdxDipAsync(rigaDev.IdxDipendente); setupUserData(); - //navManager.NavigateTo("/", false); MService.RigaDip = rigaDip; } } diff --git a/GPW.CORE.SMART/Components/CompTimbra.razor b/GPW.CORE.SMART/Components/CompTimbra.razor index f412f7c..48ab03a 100644 --- a/GPW.CORE.SMART/Components/CompTimbra.razor +++ b/GPW.CORE.SMART/Components/CompTimbra.razor @@ -1,6 +1,6 @@  - -@if (IdxDipCurr == 0) + +@if (isLoading) { } diff --git a/GPW.CORE.SMART/Components/CompTimbra.razor.cs b/GPW.CORE.SMART/Components/CompTimbra.razor.cs index 08b9bb6..b5d3337 100644 --- a/GPW.CORE.SMART/Components/CompTimbra.razor.cs +++ b/GPW.CORE.SMART/Components/CompTimbra.razor.cs @@ -80,6 +80,11 @@ namespace GPW.CORE.Smart.Components #region Private Methods + private bool isLoading + { + get => IdxDipCurr == 0; + } + private async void MService_EA_DateChanged() { dtCurr = MService.targetDate; diff --git a/GPW.CORE.SMART/Components/DtCard.razor.cs b/GPW.CORE.SMART/Components/DtCard.razor.cs index 0ca4052..dd3dd2d 100644 --- a/GPW.CORE.SMART/Components/DtCard.razor.cs +++ b/GPW.CORE.SMART/Components/DtCard.razor.cs @@ -12,6 +12,9 @@ namespace GPW.CORE.Smart.Components [Parameter] public bool NextIsExtrata { get; set; } = true; + [Parameter] + public bool IsLoading { get; set; } = true; + [Parameter] public bool ShowAction { @@ -136,11 +139,15 @@ namespace GPW.CORE.Smart.Components { get { - string answ = NextIsExtrata ? "cardEntrata" : "cardUscita"; - // se showAction --> aggiungo pulse - if (showAction) + string answ = "defaultCard"; + if (!IsLoading) { - answ = NextIsExtrata ? "cardUscita pulse-warning" : "cardEntrata pulse-warning"; + answ = NextIsExtrata ? "cardEntrata" : "cardUscita"; + // se showAction --> aggiungo pulse + if (showAction) + { + answ = NextIsExtrata ? "cardUscita pulse-warning" : "cardEntrata pulse-warning"; + } } return answ; } diff --git a/GPW.CORE.SMART/Pages/ForceReset.razor.cs b/GPW.CORE.SMART/Pages/ForceReset.razor.cs index 473e302..e744ff9 100644 --- a/GPW.CORE.SMART/Pages/ForceReset.razor.cs +++ b/GPW.CORE.SMART/Pages/ForceReset.razor.cs @@ -35,7 +35,7 @@ namespace GPW.CORE.Smart.Pages // attendo 100 msec await Task.Delay(50); // passo a pagina home - NavManager.NavigateTo(""); + NavManager.NavigateTo("Home"); } #endregion Protected Methods diff --git a/GPW.CORE.SMART/Pages/Index.razor b/GPW.CORE.SMART/Pages/Index.razor index e397ca6..28f967c 100644 --- a/GPW.CORE.SMART/Pages/Index.razor +++ b/GPW.CORE.SMART/Pages/Index.razor @@ -1,5 +1,4 @@ -@using GPW.CORE.Smart.Components -@page "/" - +@page "/" +@page "/Home" diff --git a/GPW.CORE.SMART/Pages/Jumper.razor.cs b/GPW.CORE.SMART/Pages/Jumper.razor.cs index dbdbb57..0ada1a2 100644 --- a/GPW.CORE.SMART/Pages/Jumper.razor.cs +++ b/GPW.CORE.SMART/Pages/Jumper.razor.cs @@ -198,7 +198,7 @@ namespace GPW.CORE.Smart.Pages // infine salvo dati dipendente e rimando a login MService.RigaDip = currDip; - navManager.NavigateTo("/", true); + navManager.NavigateTo("Home", true); } } else diff --git a/GPW.CORE.SMART/Pages/LogOut.razor.cs b/GPW.CORE.SMART/Pages/LogOut.razor.cs index dab113f..ed80fb7 100644 --- a/GPW.CORE.SMART/Pages/LogOut.razor.cs +++ b/GPW.CORE.SMART/Pages/LogOut.razor.cs @@ -29,7 +29,7 @@ namespace GPW.CORE.Smart.Pages // aspetto await Task.Delay(200); // rimando a home - navManager.NavigateTo("/RegNewDevice"); + navManager.NavigateTo("RegNewDevice"); } #endregion Protected Methods