- Update link reload (da testare)
- update colore in reload
This commit is contained in:
Samuele Locatelli
2023-01-14 10:07:25 +01:00
parent a9ac7f284f
commit f5c764eafb
8 changed files with 24 additions and 14 deletions
+1 -2
View File
@@ -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;
}
}
+2 -2
View File
@@ -1,6 +1,6 @@
<DtCard NextIsExtrata="@nextIsEntrata" ShowAction="@showAction" LastAction="@lastAction"></DtCard>
@if (IdxDipCurr == 0)
<DtCard NextIsExtrata="@nextIsEntrata" ShowAction="@showAction" LastAction="@lastAction" IsLoading=@isLoading></DtCard>
@if (isLoading)
{
<LoadingData></LoadingData>
}
@@ -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;
+11 -4
View File
@@ -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;
}
+1 -1
View File
@@ -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
+2 -3
View File
@@ -1,5 +1,4 @@
@using GPW.CORE.Smart.Components
@page "/"
@page "/"
@page "/Home"
<CompTimbra IdxDipCurr="@idxDipendente"></CompTimbra>
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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