From 81ad75326831cb55dc7f9be1b6f042ca8bad8499 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 Apr 2023 10:03:22 +0200 Subject: [PATCH] Fix display ferie multi-giorno --- GPW.CORE.SMART/GPW.CORE.SMART.csproj | 2 +- GPW.CORE.SMART/Pages/DayOff.razor.cs | 8 ++++---- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index 5fc12cf..2bbc843 100644 --- a/GPW.CORE.SMART/GPW.CORE.SMART.csproj +++ b/GPW.CORE.SMART/GPW.CORE.SMART.csproj @@ -3,7 +3,7 @@ net6.0 enable - 3.0.2303.2808 + 3.0.2304.0309 enable www.egalware.com GPW Smart UI diff --git a/GPW.CORE.SMART/Pages/DayOff.razor.cs b/GPW.CORE.SMART/Pages/DayOff.razor.cs index 99a08be..f311af9 100644 --- a/GPW.CORE.SMART/Pages/DayOff.razor.cs +++ b/GPW.CORE.SMART/Pages/DayOff.razor.cs @@ -264,7 +264,7 @@ namespace GPW.CORE.Smart.Pages { string cssSpec = ""; foreach (var item in ListFermateAzienda) - { + { cssSpec = item.codGiust == "FEST" ? cssFest : cssChius; if (!DateCFF.ContainsKey(item.data)) @@ -272,7 +272,7 @@ namespace GPW.CORE.Smart.Pages if (item.data.DayOfWeek != DayOfWeek.Saturday && item.data.DayOfWeek != DayOfWeek.Sunday) { DateCFF.Add(item.data, cssSpec); - } + } } eventList.Add(new CalendarEvent() @@ -309,8 +309,8 @@ namespace GPW.CORE.Smart.Pages break; } // aggiungo x tutte le date richieste... - int numGG = item.DtEnd.Subtract(item.DtStart).Days; - for (int i = 0; i <= numGG; i++) + int numGG = item.DtEnd.Subtract(item.DtStart).Days + 1; + for (int i = 0; i < numGG; i++) { dtIns = item.DtStart.Date.AddDays(i); if (!DateRDip.ContainsKey(dtIns)) diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 846d745..cb474eb 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2303.2808

+

Versione: 3.0.2304.0309


Note di rilascio: