From a334a405851ff7eb2a2eac5df2731379e166d8ee Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 23 Dec 2024 15:43:25 +0100 Subject: [PATCH] MH: Mittelpunkt Samstagszuschlag Bugfix --- ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.cs | 4 +++- ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.cs | 4 +++- ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.cs | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.cs index 172e20b18..a2175278e 100644 --- a/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.cs +++ b/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.cs @@ -53,8 +53,10 @@ namespace Mittelpunkt { var d1 = sr.Start.Value; + var duration = sr.GroupRoundedDuration != null ? Convert.ToDouble(sr.GroupRoundedDuration.Value) : sr.DurationMinutes; + var saturday = d1.GetNextDayOfWeek(DayOfWeek.Saturday); - var unroundedEnd = d1.AddMinutes(sr.DurationMinutes); + var unroundedEnd = d1.AddMinutes(duration); var saturdayStart = new DateTime(saturday.Year, saturday.Month, saturday.Day, 13, 0, 0); var saturdayEnd = new DateTime(saturday.Year, saturday.Month, saturday.Day, 21, 0, 0); diff --git a/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.cs b/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.cs index f31d61444..6b83905dc 100644 --- a/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.cs +++ b/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.cs @@ -35,8 +35,10 @@ namespace Mittelpunkt { var d1 = sr.Start.Value; + var duration = sr.GroupRoundedDuration != null ? Convert.ToDouble(sr.GroupRoundedDuration.Value) : sr.DurationMinutes; + var saturday = d1.GetNextDayOfWeek(DayOfWeek.Saturday); - var unroundedEnd = d1.AddMinutes(sr.DurationMinutes); + var unroundedEnd = d1.AddMinutes(duration); var saturdayStart = new DateTime(saturday.Year, saturday.Month, saturday.Day, 13, 0, 0); var saturdayEnd = new DateTime(saturday.Year, saturday.Month, saturday.Day, 21, 0, 0); diff --git a/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.cs b/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.cs index 30d7b615a..df2153928 100644 --- a/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.cs +++ b/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.cs @@ -37,8 +37,11 @@ namespace Mittelpunkt { var d1 = sr.Start.Value; + var duration = sr.GroupRoundedDuration != null ? Convert.ToDouble(sr.GroupRoundedDuration.Value) : sr.DurationMinutes; + + var saturday = d1.GetNextDayOfWeek(DayOfWeek.Saturday); - var unroundedEnd = d1.AddMinutes(sr.DurationMinutes); + var unroundedEnd = d1.AddMinutes(duration); var saturdayStart = new DateTime(saturday.Year, saturday.Month, saturday.Day, 13, 0, 0); var saturdayEnd = new DateTime(saturday.Year, saturday.Month, saturday.Day, 21, 0, 0);