diff --git a/GPW.CORE.SMART/Components/Calendario.razor.cs b/GPW.CORE.SMART/Components/Calendario.razor.cs index dbcabe7..07115b1 100644 --- a/GPW.CORE.SMART/Components/Calendario.razor.cs +++ b/GPW.CORE.SMART/Components/Calendario.razor.cs @@ -203,9 +203,10 @@ namespace GPW.CORE.Smart.Components string cssToday = "bg-info text-dark rounded-circle p-2"; string cssFest = "bg-danger text-warning rounded-pill2 px-0 opacity-50"; string cssChius = "bg-warning text-dark rounded-pill2 px-0 opacity-50"; + string cssFerie = "bg-success text-light px-0 opacity-50"; // recupero le fermate aziendali - if (ListFermateAzienda!=null && ListFermateAzienda.Count > 0) + if (ListFermateAzienda != null && ListFermateAzienda.Count > 0) { string cssSpec = ""; foreach (var item in ListFermateAzienda) @@ -222,6 +223,30 @@ namespace GPW.CORE.Smart.Components } } + // aggiungo ferie dipendente + if (ListRecordsRichieste != null && ListRecordsRichieste.Count > 0) + { + string cssSpec = ""; + foreach (var item in ListRecordsRichieste) + { + cssSpec = item.CodGiust == "FER" ? cssFerie : ""; + // creo il set di date + int numDay = item.DtEnd.Subtract(item.DtStart).Days; + for (int i = 0; i <= numDay; i++) + { + DateTime currDay = item.DtStart.AddDays(i); + if (!DateCFF.ContainsKey(currDay)) + { + if (currDay.DayOfWeek != DayOfWeek.Saturday && currDay.DayOfWeek != DayOfWeek.Sunday) + { + DateCFF.Add(currDay, cssSpec); + } + } + } + } + + } + if (ListRecords != null) { string currCss = ""; diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index 94949fb..b308911 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.2311.0709 + 3.0.2312.0708 enable www.egalware.com GPW Smart UI diff --git a/GPW.CORE.WRKLOG/Components/RegRichieste.razor.cs b/GPW.CORE.WRKLOG/Components/RegRichieste.razor.cs index 8825985..2c0da28 100644 --- a/GPW.CORE.WRKLOG/Components/RegRichieste.razor.cs +++ b/GPW.CORE.WRKLOG/Components/RegRichieste.razor.cs @@ -64,7 +64,7 @@ namespace GPW.CORE.WRKLOG.Components protected override async Task OnInitializedAsync() { dtInizio = new DateTime(DateTime.Today.Year, 1, 1); - dtFine = dtInizio.AddYears(1); + dtFine = dtInizio.AddYears(2); currRecord.IdxDipendente = AppMServ.IdxDipendente; CodGiust = ""; var rawGiust = await DataService.AnagGiust(); diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index 2b8b9b7..c29722d 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.2311.0811 + 3.0.2312.0618 enable enable diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index e2864cb..0d989c5 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2311.0811

+

Versione: 3.0.2312.0708


Note di rilascio: