Retter opp faktureringsgrad. Fixes #460

varianter · Apr 25, 2024 · be4834a · be4834a
1 parent 5174d57
commit be4834a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/backend/Api/StaffingController/ReadModelFactory.cs b/backend/Api/StaffingController/ReadModelFactory.cs
@@ -100,7 +100,7 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
             .Select(grouping => new DetailedBooking(
                 new BookingDetails(grouping.First().Engagement.Name, BookingType.Booking,
                     grouping.First().Engagement.Customer.Name,
-                    grouping.Key, grouping.First().Engagement.IsBillable),
+                    grouping.Key, false, grouping.First().Engagement.IsBillable),
                 weekSet.Select(week =>
                     new WeeklyHours(
                         week.ToSortableInt(), grouping
@@ -116,7 +116,7 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
             .Select(grouping => new DetailedBooking(
                 new BookingDetails(grouping.First().Engagement.Name, BookingType.Offer,
                     grouping.First().Engagement.Customer.Name,
-                    grouping.Key, grouping.First().Engagement.IsBillable),
+                    grouping.Key, false, grouping.First().Engagement.IsBillable),
                 weekSet.Select(week =>
                     new WeeklyHours(
                         week.ToSortableInt(),
@@ -132,7 +132,8 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
             .Select(grouping => new DetailedBooking(
                 new BookingDetails(grouping.Key, BookingType.PlannedAbsence,
                     grouping.Key,
-                    grouping.First().Absence.Id), //Empty projectName as PlannedAbsence does not have a project
+                    grouping.First().Absence.Id,//Empty projectName as PlannedAbsence does not have a project
+                    grouping.First().Absence.ExcludeFromBillRate),
                 weekSet.Select(week =>
                     new WeeklyHours(
                         week.ToSortableInt(),
@@ -141,6 +142,7 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
                                 absence.Week.Equals(week))
                             .Sum(absence => absence.Hours)
                     )).ToList()
+
             ));
 
 
@@ -190,6 +192,11 @@ private static BookedHoursPerWeek GetBookedHours(Week week, IEnumerable<Detailed
         var totalAbsence = DetailedBooking.GetTotalHoursPrBookingTypeAndWeek(detailedBookingsArray,
             BookingType.PlannedAbsence,
             week);
+
+        var totalExludableAbsence = detailedBookingsArray
+            .Where(s => s.BookingDetails.Type == BookingType.PlannedAbsence &&  s.BookingDetails.ExcludeFromBilling )
+            .Select(wh => wh.TotalHoursForWeek(week))
+            .Sum();        
 
         var totalVacations = DetailedBooking.GetTotalHoursPrBookingTypeAndWeek(detailedBookingsArray,
             BookingType.Vacation,
@@ -209,7 +216,7 @@ private static BookedHoursPerWeek GetBookedHours(Week week, IEnumerable<Detailed
             week.WeekNumber,
             week.ToSortableInt(),
             GetDatesForWeek(week),
-            new WeeklyBookingReadModel(totalBillable, totalOffered, totalAbsence, totalSellableTime,
+            new WeeklyBookingReadModel(totalBillable, totalOffered, totalAbsence, totalExludableAbsence,  totalSellableTime,
                 totalHolidayHours, totalVacations,
                 totalOverbooked)
         );

diff --git a/backend/Api/StaffingController/StaffingReadModel.cs b/backend/Api/StaffingController/StaffingReadModel.cs
@@ -59,7 +59,7 @@ public record DetailedBooking(
     [property: Required] BookingDetails BookingDetails,
     [property: Required] List<WeeklyHours> Hours)
 {
-    private double TotalHoursForWeek(Week week)
+    public double TotalHoursForWeek(Week week)
     {
         return Hours.Where(weeklySum => weeklySum.Week == week.ToSortableInt()).Sum(weeklyHours => weeklyHours.Hours);
     }
@@ -78,6 +78,7 @@ public record WeeklyBookingReadModel(
     [property: Required] double TotalBillable,
     [property: Required] double TotalOffered,
     [property: Required] double TotalPlannedAbsences,
+    [property: Required] double TotalExludableAbsence,
     [property: Required] double TotalSellableTime,
     [property: Required] double TotalHolidayHours,
     [property: Required] double TotalVacationHours,
@@ -88,6 +89,7 @@ public record BookingDetails(
     [property: Required] BookingType Type,
     [property: Required] string CustomerName,
     [property: Required] int ProjectId,
+    [property: Required] bool ExcludeFromBilling = false,
     [property: Required] bool IsBillable = false);
 
 public record WeeklyHours([property: Required] int Week, [property: Required] double Hours);

diff --git a/frontend/src/api-types.ts b/frontend/src/api-types.ts
@@ -249,6 +249,7 @@ export interface WeeklyBookingReadModel {
   totalVacationHours: number;
   /** @format double */
   totalOverbooking: number;
+  totalExludableAbsence: number;
 }
 
 export interface WeeklyHours {

diff --git a/frontend/src/components/staffingReports/ReportContent.tsx b/frontend/src/components/staffingReports/ReportContent.tsx
@@ -6,9 +6,11 @@ import IconActionButton from "@/components/Buttons/IconActionButton";
 import { Filter } from "react-feather";
 import ActiveFilters from "@/components/ActiveFilters";
 import WeekSelection from "@/components/WeekSelection";
+import { useSimpleConsultantsFilter } from "@/hooks/staffing/useConsultantsFilter";
 
 export function ReportContent() {
   const [isSideBarOpen, setIsSidebarOpen] = useState<boolean>(false);
+  const { filteredConsultants } = useSimpleConsultantsFilter();
 
   return (
     <>

diff --git a/frontend/src/hooks/staffing/useConsultantsFilter.ts b/frontend/src/hooks/staffing/useConsultantsFilter.ts
@@ -205,17 +205,19 @@ function setWeeklyInvoiceRate(
   numWorkHours: number,
 ) {
   const weeklyInvoiceRate = new Map<number, number>();
+
 
   weeklyTotalBillable.forEach((totalBillable, weekNumber) => {
     let totalAvailableWeekHours = 0;
 
     filteredConsultants.forEach((consultant) => {
       consultant.bookings.forEach((booking) => {
+        debugger
         if (booking.weekNumber === weekNumber) {
           let consultantAvailableWeekHours =
             numWorkHours -
             booking.bookingModel.totalHolidayHours -
-            booking.bookingModel.totalPlannedAbsences -
+            booking.bookingModel.totalExludableAbsence -
             booking.bookingModel.totalVacationHours;
 
           totalAvailableWeekHours += consultantAvailableWeekHours;