From af5ccf545222a41aa3f166cfa69a2ac058375a96 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 8 Feb 2022 10:03:31 +0100 Subject: [PATCH] Fix update dettaglio elezione timbrature --- GPW.CORE.WRKLOG/Components/TimbrEditor.razor | 8 +++++++- GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs | 17 ++++++++++++++++- GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj | 2 +- GPW.CORE.WRKLOG/Pages/ListPlan.razor | 1 - GPW.CORE.WRKLOG/Pages/ListPlan.razor.cs | 8 ++++++-- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/GPW.CORE.WRKLOG/Components/TimbrEditor.razor b/GPW.CORE.WRKLOG/Components/TimbrEditor.razor index 8d27fcc..a1176e2 100644 --- a/GPW.CORE.WRKLOG/Components/TimbrEditor.razor +++ b/GPW.CORE.WRKLOG/Components/TimbrEditor.razor @@ -5,9 +5,15 @@
-
+

Timbrature

+
+ @if (ListTimb != null && ListTimb.Count > 0) + { + @ListTimb.FirstOrDefault().DataOra.ToString("ddd dd.MM.yyyy") + } +
diff --git a/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs b/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs index 21f5b3f..6858857 100644 --- a/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs +++ b/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs @@ -64,7 +64,22 @@ namespace GPW.CORE.WRKLOG.Components public EventCallback ItemUpdated { get; set; } [Parameter] - public List ListTimb { get; set; } = new List(); + public List ListTimb { get + { + return _listTimb; + } + set + { + if (_listTimb != value) + { + _listTimb = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + } + + protected List _listTimb { get; set; } = new List(); #endregion Public Properties diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index ea5e637..50c3b33 100644 --- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj +++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2202.0809 + 3.0.2202.0810 enable enable diff --git a/GPW.CORE.WRKLOG/Pages/ListPlan.razor b/GPW.CORE.WRKLOG/Pages/ListPlan.razor index 475e6df..a7c70a1 100644 --- a/GPW.CORE.WRKLOG/Pages/ListPlan.razor +++ b/GPW.CORE.WRKLOG/Pages/ListPlan.razor @@ -130,7 +130,6 @@ else if (currRecord != null)
- @*@if (ListTimbr != null && ListTimbr.Count() > 0)*@ @if (showTimb) { diff --git a/GPW.CORE.WRKLOG/Pages/ListPlan.razor.cs b/GPW.CORE.WRKLOG/Pages/ListPlan.razor.cs index c1fb111..0a23b28 100644 --- a/GPW.CORE.WRKLOG/Pages/ListPlan.razor.cs +++ b/GPW.CORE.WRKLOG/Pages/ListPlan.razor.cs @@ -389,8 +389,8 @@ namespace GPW.CORE.WRKLOG.Pages /// protected void PeriodoSelect(List newList) { - ListTimbr = null; - StateHasChanged(); + //ListTimbr = null; + //StateHasChanged(); // salvo periodo selezionato ListTimbr = newList; showDay = false; @@ -480,6 +480,10 @@ namespace GPW.CORE.WRKLOG.Pages protected async Task ResetTimbData() { + selPeriod = false; + showTemp = false; + showDay = false; + showTimb = false; currRecord = null; ListTimbr = null; SelDayDTO = null; diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 80076fa..9924fea 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2202.0809

+

Versione: 3.0.2202.0810


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 19db6ea..75171f1 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2202.0809 +3.0.2202.0810 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 80a56f1..1a9ae42 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 3.0.2202.0809 + 3.0.2202.0810 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false