diff --git a/GPW.CORE.Data/Controllers/GPWController.cs b/GPW.CORE.Data/Controllers/GPWController.cs index 045835f..289056d 100644 --- a/GPW.CORE.Data/Controllers/GPWController.cs +++ b/GPW.CORE.Data/Controllers/GPWController.cs @@ -563,7 +563,7 @@ namespace GPW.CORE.Data.Controllers .ToList(); rawRichDip = localDbCtx .DbSetRegRichieste - .Where(x => (idxDipendente == 0 || x.IdxDipendente == idxDipendente) && (x.DtStart >= dtInizio && x.DtStart <= dtFine)) + .Where(x => (idxDipendente == 0 || x.IdxDipendente == idxDipendente) && ((x.DtStart >= dtInizio && x.DtStart <= dtFine) || (x.DtStart <= dtInizio && dtFine <= x.DtEnd) || (x.DtEnd >= dtInizio && x.DtEnd<= dtFine))) .ToList(); // calcolo intervallo date... @@ -600,8 +600,11 @@ namespace GPW.CORE.Data.Controllers ListMalattie = rawMalattie .Where(x => thisDay >= x.DtInizio && thisDay <= x.DtInizio.AddDays(x.NumGG)) .ToList(), + ListFerieDip = rawRichDip + .Where(x => x.CodGiust == "FER" && (thisDay >= x.DtStart && thisDay <= x.DtEnd)) + .ToList(), ListRichiesteDip = rawRichDip - .Where(x => thisDay.Date == x.DtStart.Date) + .Where(x => x.CodGiust != "FER" && (thisDay.Date == x.DtStart.Date)) .ToList() }; diff --git a/GPW.CORE.Data/DTO/DailyDataDTO.cs b/GPW.CORE.Data/DTO/DailyDataDTO.cs index d525bfa..a48b327 100644 --- a/GPW.CORE.Data/DTO/DailyDataDTO.cs +++ b/GPW.CORE.Data/DTO/DailyDataDTO.cs @@ -23,6 +23,7 @@ namespace GPW.CORE.Data.DTO public List? ListCheckC19 { get; set; } = null; public List? ListFermateAzienda { get; set; } = null; public List? ListMalattie { get; set; } = null; + public List? ListFerieDip { get; set; } = null; public List? ListRichiesteDip { get; set; } = null; public DateTime DtInizio diff --git a/GPW.CORE.WRKLOG/Components/DayHoriz.razor b/GPW.CORE.WRKLOG/Components/DayHoriz.razor index e80d5d3..d29f395 100644 --- a/GPW.CORE.WRKLOG/Components/DayHoriz.razor +++ b/GPW.CORE.WRKLOG/Components/DayHoriz.razor @@ -76,31 +76,36 @@ } } - @if (hasPermFerie) + @if (hasFerie) + { + if (DayDTO.ListFerieDip != null && DayDTO.ListFerieDip.Count > 0) + { + @foreach (var richiesta in DayDTO.ListFerieDip) + { +
+
+ FERIE +
+
+ @richiesta.Note +
+
+ } + } + } + @if (hasPerm) { if (DayDTO.ListRichiesteDip != null && DayDTO.ListRichiesteDip.Count > 0) { @foreach (var richiesta in DayDTO.ListRichiesteDip) { -
- @if (richiesta.CodGiust == "FER") - { -
- @richiesta.CodGiust -
-
- @richiesta.Note -
- } - else - { -
- @richiesta.CodGiust | @richiesta.Note -
-
- @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}") -
- } +
+
+ @richiesta.CodGiust | @richiesta.Note +
+
+ @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}") +
} } diff --git a/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs b/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs index bf241e4..9a05215 100644 --- a/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs +++ b/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs @@ -18,8 +18,9 @@ namespace GPW.CORE.WRKLOG.Components #region Private Properties - private bool noData { - get => DayDTO == null || DayDTO.ListRA == null || DayDTO.ListRA.Count == 0; + private bool noData + { + get => DayDTO == null || DayDTO.ListRA == null || DayDTO.ListRA.Count == 0; } private bool hasFest @@ -27,9 +28,14 @@ namespace GPW.CORE.WRKLOG.Components get => DayDTO != null && DayDTO.ListFermateAzienda != null; } - private bool hasPermFerie + private bool hasFerie { - get => DayDTO != null && DayDTO.ListRichiesteDip!= null; + get => DayDTO != null && DayDTO.ListFerieDip != null; + } + + private bool hasPerm + { + get => DayDTO != null && DayDTO.ListRichiesteDip != null; } private bool OkTemp diff --git a/GPW.CORE.WRKLOG/Data/GpwDataService.cs b/GPW.CORE.WRKLOG/Data/GpwDataService.cs index b55d207..caecd1e 100644 --- a/GPW.CORE.WRKLOG/Data/GpwDataService.cs +++ b/GPW.CORE.WRKLOG/Data/GpwDataService.cs @@ -1160,6 +1160,7 @@ namespace GPW.CORE.WRKLOG.Data } // invalido la cache... await ExecFlushRedisPattern($"{rKeyDipendenti}:*"); + await ExecFlushRedisPattern($"{rKeyDailyData}:*"); } catch { } @@ -1249,6 +1250,7 @@ namespace GPW.CORE.WRKLOG.Data } // invalido la cache... await ExecFlushRedisPattern($"{rKeyDipendenti}:*"); + await ExecFlushRedisPattern($"{rKeyDailyData}:*"); } catch { } diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index 1e7ff36..a6dd809 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.2304.1109 + 3.0.2304.1110 enable enable diff --git a/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user new file mode 100644 index 0000000..e26d9c8 --- /dev/null +++ b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user @@ -0,0 +1,13 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAADrbAogtj/xpZqylbgs9Hb3AAAAAASAAACgAAAAEAAAAFm1lcdH7oj+NFy4QgZ7q18YAAAAROPsyRR12dhPTKfMEQ5yNCAZJ5K7C4pvFAAAAEFBVTwItjyYP2BlOTsuK1g9myQ8 + True|2023-04-11T07:18:55.4555319Z;True|2023-04-11T09:16:05.8827677+02:00;True|2022-06-06T12:56:03.5790550+02:00;False|2022-06-06T12:54:19.4739620+02:00;False|2022-06-06T12:53:46.4246554+02:00; + + + \ No newline at end of file diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index fea65a4..1d84e0e 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2304.1109

+

Versione: 3.0.2304.1110


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index ceac059..d52adf1 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2304.1109 +3.0.2304.1110 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 6a7f49e..249aebd 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 3.0.2304.1109 + 3.0.2304.1110 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false