From 605c68d3d5ec79bbf8f2cab74d485aa81f8ce436 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 17 Jan 2023 14:20:13 +0100 Subject: [PATCH] Update conf x reload contenuto lista timbrature --- GPW.CORE.SMART/Components/TimbAdmin.razor.cs | 12 ++---------- GPW.CORE.SMART/Components/TimbList.razor | 4 ++-- GPW.CORE.SMART/Components/TimbList.razor.cs | 3 ++- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/GPW.CORE.SMART/Components/TimbAdmin.razor.cs b/GPW.CORE.SMART/Components/TimbAdmin.razor.cs index d0dfec9..98a0e20 100644 --- a/GPW.CORE.SMART/Components/TimbAdmin.razor.cs +++ b/GPW.CORE.SMART/Components/TimbAdmin.razor.cs @@ -23,6 +23,7 @@ namespace GPW.CORE.Smart.Components { if (forceReload) { + await Task.Delay(1); await ReloadData(); await Task.Delay(1); await InvokeAsync(StateHasChanged); @@ -68,22 +69,13 @@ namespace GPW.CORE.Smart.Components private async Task ReloadData() { isLoading = true; + ListTimbRich = null; await Task.Delay(1); - //// verifico se il dip sia admin... - //var listaRuoli = await CDService.Dip2RuoliGetAll(); - //var rigaDip = listaRuoli.FirstOrDefault(x => x.IdxDipendente == IdxDipAdmin && x.CodRuolo == "AppMancTimb"); - //userIsAdmin = rigaDip != null; - if (userIsAdmin) { - ListTimbRich = null; await Task.Delay(50); ListTimbRich = await CDService.TimbratureRichieste(); } - else - { - ListTimbRich = null; - } await Task.Delay(1); isLoading = true; } diff --git a/GPW.CORE.SMART/Components/TimbList.razor b/GPW.CORE.SMART/Components/TimbList.razor index ee2a729..6e8058a 100644 --- a/GPW.CORE.SMART/Components/TimbList.razor +++ b/GPW.CORE.SMART/Components/TimbList.razor @@ -19,7 +19,7 @@ - @if (@isLoading) + @if (@isLoading || ListTimb.Count == 0) { @if (EnableAdmin) @@ -59,7 +59,7 @@ } else { - @item.DataOra.ToString("HH:mm") + @item.DataOra.ToString("HH:mm") } diff --git a/GPW.CORE.SMART/Components/TimbList.razor.cs b/GPW.CORE.SMART/Components/TimbList.razor.cs index 5f65632..36f9ca5 100644 --- a/GPW.CORE.SMART/Components/TimbList.razor.cs +++ b/GPW.CORE.SMART/Components/TimbList.razor.cs @@ -64,6 +64,7 @@ namespace GPW.CORE.Smart.Components currRecord.Approv = true; // aggiorno await CDService.TimbratureUpdate(currRecord); + ListTimb = new List(); await Task.Delay(1); isLoading = false; await ReqUpdate.InvokeAsync(true); @@ -77,7 +78,7 @@ namespace GPW.CORE.Smart.Components isLoading = true; await Task.Delay(1); - await InvokeAsync(StateHasChanged); + //await InvokeAsync(StateHasChanged); // elimino await CDService.TimbratureDelete(currRecord); await Task.Delay(1);