minor holiday bugfixes

varianter · Nov 6, 2023 · ef4c7a0 · ef4c7a0
1 parent 3db7148
commit ef4c7a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/backend/Api/Consultants/ConsultantExtensions.cs b/backend/Api/Consultants/ConsultantExtensions.cs
@@ -211,22 +211,23 @@ private static BookedHoursPerWeek GetBookedHours(Week week, IEnumerable<Detailed
             BookingType.Vacation,
             week);
 
+        var bookedTime = totalBillable + totalAbsence + totalVacations + totalHolidayHours;
+        var hoursPrWorkDay = consultant.Department.Organization.HoursPerWorkday;
 
-        var rawSellableTime = consultant.Department.Organization.HoursPerWorkday * 5 - totalBillable -
-                              totalOffered -
-                              totalVacations - totalVacations - totalHolidayHours;
+        var totalFreeTime =
+            Math.Max(hoursPrWorkDay * 5 - bookedTime, 0);
 
-        var totalSellableTime = Math.Max(rawSellableTime, 0);
-        var totalOverBooked = Math.Min(rawSellableTime, 0);
+        var totalOverbooked =
+            Math.Max(bookedTime - hoursPrWorkDay * 5, 0);
 
         return new BookedHoursPerWeek(
             week.Year,
             week.WeekNumber,
             week.ToSortableInt(),
-            week.ToString(),
-            new WeeklyBookingReadModel(totalBillable, totalOffered, totalAbsence, totalSellableTime,
+            GetDatesForWeek(week),
+            new WeeklyBookingReadModel(totalBillable, totalOffered, totalAbsence, totalFreeTime,
                 totalHolidayHours, totalVacations,
-                totalOverBooked)
+                totalOverbooked)
         );
     }
 }
diff --git a/backend/Api/Organisation/OrganisationHolidayExtensions.cs b/backend/Api/Organisation/OrganisationHolidayExtensions.cs
@@ -27,7 +27,7 @@ private static bool IsPublicHoliday(this Organization organization, DateOnly day
     {
         var publicHoliday = organization.GetPublicHoliday();
         var isPublicHoliday = publicHoliday.IsPublicHoliday(day.ToDateTime(TimeOnly.MinValue));
-        return isPublicHoliday || organization.IsChristmasHoliday(day);
+        return isPublicHoliday;
     }
 
     private static PublicHolidayBase GetPublicHoliday(this Organization organization)
@@ -44,7 +44,7 @@ private static PublicHolidayBase GetPublicHoliday(this Organization organization
 
     private static bool IsChristmasHoliday(this Organization organization, DateOnly date)
     {
-        if (organization.HasVacationInChristmas) return false;
+        if (!organization.HasVacationInChristmas) return false;
 
         var startDate = new DateOnly(date.Year, 12, 24);
         var endDate = new DateOnly(date.Year, 12, 31);