From 6644d0dd20c69ea8be9f5a60ba1f6d95d73ed666 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Jan 2022 10:57:08 +0100 Subject: [PATCH 1/3] Minor fix x andata a capo dropcontent --- GPW.CORE.UI/Components/RegAtt.razor | 4 ++-- GPW.CORE.UI/GPW.CORE.UI.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GPW.CORE.UI/Components/RegAtt.razor b/GPW.CORE.UI/Components/RegAtt.razor index 067a8ad..1e35835 100644 --- a/GPW.CORE.UI/Components/RegAtt.razor +++ b/GPW.CORE.UI/Components/RegAtt.razor @@ -28,8 +28,8 @@
-
@($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}") - @($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}") | @($"{CurrData.FasiNav?.DescrizioneFase}")
-
@($"{CurrData.Descrizione}")
+
@($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}") - @($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}") | @($"{CurrData.FasiNav?.DescrizioneFase}")
+
@($"{CurrData.Descrizione}")
@if (AppMServ.PayloadOk) diff --git a/GPW.CORE.UI/GPW.CORE.UI.csproj b/GPW.CORE.UI/GPW.CORE.UI.csproj index 74bdcc8..4fe34c4 100644 --- a/GPW.CORE.UI/GPW.CORE.UI.csproj +++ b/GPW.CORE.UI/GPW.CORE.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2201.1808 + 3.0.2201.1810 enable enable diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 4af7d9e..a04027f 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2201.1808

+

Versione: 3.0.2201.1810


Note di rilascio:
+
+ @lastRefresh.ToString("dddd dd.MM.yyyy HH:mm:ss") +
@if (clonedRA != null) { diff --git a/GPW.CORE.UI/Pages/Planner.razor.cs b/GPW.CORE.UI/Pages/Planner.razor.cs index fc16ded..898c429 100644 --- a/GPW.CORE.UI/Pages/Planner.razor.cs +++ b/GPW.CORE.UI/Pages/Planner.razor.cs @@ -13,7 +13,7 @@ namespace GPW.CORE.UI.Pages /// modale: vedere qui: https://gist.github.com/conficient/ba98d1662c659e170ec16650acea05c8 /// //[Authorize(Roles = "SuperAdmin, Admin")] - public partial class Planner + public partial class Planner : IDisposable { #region Private Fields @@ -298,6 +298,7 @@ namespace GPW.CORE.UI.Pages await Task.Delay(100); checkHourRange(); await Task.Delay(100); + lastRefresh = DateTime.Now; isLoading = false; } @@ -339,10 +340,51 @@ namespace GPW.CORE.UI.Pages DtRifTempRil = dataRif; showTemp = true; } + + /// + /// TImer per refresh dati + /// + protected System.Timers.Timer timer; + + protected DateTime lastRefresh = DateTime.Now; + + protected override void OnInitialized() + { + // avvio un timer infinito x refresh pagina COMUNQUE ogni 60 sec anche non succedesse nulla... + timer = new System.Timers.Timer + { + Interval = 1000 * 60, + AutoReset = true, + Enabled = true + }; + timer.Elapsed += async (s, ea) => await TryReload(); + } + public void Dispose() + { + timer?.Dispose(); + } + + protected async Task TryReload() + { + await Task.Delay(1); + // effettuo reload SOLO SE no ho editing in corso... + if (!modeEdit) + { + await ReloadData(); + await InvokeAsync(StateHasChanged); + } + } + + protected bool modeEdit + { + get => (currRecord != null || ListTimbr != null || showTemp); + //get => (selPeriod || showTemp || currRecord != null || weekStatList != null || ListTimbr != null); + } + protected async Task ReloadPeriodo() { selPeriod = false; - showTemp=false; + showTemp = false; weekStatList = null; currRecord = null; ListTimbr = null; diff --git a/GPW.CORE.UI/Pages/_Layout.cshtml b/GPW.CORE.UI/Pages/_Layout.cshtml index e5a4a10..7d72848 100644 --- a/GPW.CORE.UI/Pages/_Layout.cshtml +++ b/GPW.CORE.UI/Pages/_Layout.cshtml @@ -8,11 +8,10 @@ - @**@ - - - + + + From 5c7c1955ce58f8414e0cf16e3501bebf04affc13 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 Jan 2022 11:07:28 +0100 Subject: [PATCH 3/3] refresh vari --- GPW.CORE.UI/GPW.CORE.UI.csproj | 2 +- GPW.CORE.UI/Shared/MainLayout.razor | 3 +-- GPW.CORE.UI/wwwroot/lib/chartBoot.js | 3 +-- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/GPW.CORE.UI/GPW.CORE.UI.csproj b/GPW.CORE.UI/GPW.CORE.UI.csproj index 4fe34c4..1d088c4 100644 --- a/GPW.CORE.UI/GPW.CORE.UI.csproj +++ b/GPW.CORE.UI/GPW.CORE.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2201.1810 + 3.0.2201.2111 enable enable diff --git a/GPW.CORE.UI/Shared/MainLayout.razor b/GPW.CORE.UI/Shared/MainLayout.razor index 7c8f0e0..07798cf 100644 --- a/GPW.CORE.UI/Shared/MainLayout.razor +++ b/GPW.CORE.UI/Shared/MainLayout.razor @@ -11,12 +11,11 @@
-
@Body
- +
diff --git a/GPW.CORE.UI/wwwroot/lib/chartBoot.js b/GPW.CORE.UI/wwwroot/lib/chartBoot.js index f84fc36..57f0107 100644 --- a/GPW.CORE.UI/wwwroot/lib/chartBoot.js +++ b/GPW.CORE.UI/wwwroot/lib/chartBoot.js @@ -1,5 +1,4 @@ - -///Setup del chart desiderato con id univoco +///Setup del chart desiderato con id univoco window.setup = (id, config) => { var ctx = document.getElementById(id).getContext('2d'); //let currentDate = new Date(); diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index a04027f..8789204 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2201.1810

+

Versione: 3.0.2201.2111


Note di rilascio: