From 3d7b3d43300a1596ab76ef5cf6f036ddf9179fc7 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 7 Aug 2024 15:23:13 +0200 Subject: [PATCH] =?UTF-8?q?AWOMuensterlandRecklinghausen/CustomMitarbeiter?= =?UTF-8?q?stundenkontoBerechnung=20-=20Samstagszuschlag=20Uhrzeit=20ge?= =?UTF-8?q?=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomMitarbeiterstundenkontoBerechnung.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs index c2fb0cbea..dc692ac91 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/CustomMitarbeiterstundenkontoBerechnung.cs @@ -380,15 +380,15 @@ namespace AWOMuensterlandRecklinghausen } var d1 = sr.Start.Value; - //if (sr.Start.Value > new DateTime(2023,05,19)) - //{ - // string test = "jep"; - //} - var saturday = d1.GetNextDayOfWeek(DayOfWeek.Saturday); var sunday = d1.GetNextDayOfWeek(DayOfWeek.Sunday); var unroundedEnd = d1.AddMinutes((double)duration); - var saturdayStart = new DateTime(saturday.Year, saturday.Month, saturday.Day, 14, 0, 0); + + var saturdayStart = new DateTime(saturday.Year, saturday.Month, saturday.Day, 13, 0, 0); + if (d1 <= new DateTime(2024, 07, 31)) + { + saturdayStart = new DateTime(saturday.Year, saturday.Month, saturday.Day, 14, 0, 0); + } var saturdayEnd = new DateTime(saturday.Year, saturday.Month, saturday.Day, 23, 0, 0); dd.HoursSunday += (decimal)d1.GetIntersectingMinutes(unroundedEnd, sunday, sunday.AddHours(23).AddMinutes(59).AddSeconds(59));