Show '-' in staffing if consultant has not started yet or quit (#471)

varianter · May 29, 2024 · f734997 · f734997
1 parent 0e07035
commit f734997
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/frontend/src/components/FilteredConsultantsList.tsx b/frontend/src/components/FilteredConsultantsList.tsx
@@ -10,6 +10,7 @@ import { FilteredContext } from "@/hooks/ConsultantFilterProvider";
 
 export default function StaffingTable() {
   const {
+    numWorkHours,
     filteredConsultants,
     weeklyTotalBillable,
     weeklyTotalBillableAndOffered,
@@ -111,7 +112,11 @@ export default function StaffingTable() {
         </thead>
         <tbody>
           {filteredConsultants.map((consultant) => (
-            <ConsultantRows key={consultant.id} consultant={consultant} />
+            <ConsultantRows
+              key={consultant.id}
+              consultant={consultant}
+              numWorkHours={numWorkHours}
+            />
           ))}
         </tbody>
         <StaffingSums

diff --git a/frontend/src/components/Staffing/ConsultantRow.tsx b/frontend/src/components/Staffing/ConsultantRow.tsx
@@ -20,8 +20,10 @@ import Image from "next/image";
 
 export default function ConsultantRows({
   consultant,
+  numWorkHours,
 }: {
   consultant: ConsultantReadModel;
+  numWorkHours: number;
 }) {
   const [currentConsultant, setCurrentConsultant] =
     useState<ConsultantReadModel>(consultant);
@@ -226,6 +228,7 @@ export default function ConsultantRows({
             columnCount={columnCount}
             isLastCol={index == currentConsultant.bookings.length - 1}
             isSecondLastCol={index == currentConsultant.bookings.length - 2}
+            numWorkHours={numWorkHours}
           />
         ))}
       </tr>

diff --git a/frontend/src/components/Staffing/WeekCell.tsx b/frontend/src/components/Staffing/WeekCell.tsx
@@ -15,6 +15,7 @@ export function WeekCell(props: {
   columnCount: number;
   isLastCol: boolean;
   isSecondLastCol: boolean;
+  numWorkHours: number;
 }) {
   const {
     bookedHoursPerWeek: bookedHoursPerWeek,
@@ -26,6 +27,7 @@ export function WeekCell(props: {
     columnCount,
     isLastCol,
     isSecondLastCol,
+    numWorkHours,
   } = props;
 
   let pillNumber = 0;
@@ -152,11 +154,34 @@ export function WeekCell(props: {
             isListElementVisible ? "normal-medium" : "normal"
           }`}
         >
-          {bookedHoursPerWeek.bookingModel.totalBillable.toLocaleString(
-            "nb-No",
-          )}
+          {bookedHoursPerWeek.bookingModel.totalPlannedAbsences > 0 &&
+          checkIfNotStartedOrQuit(consultant, bookedHoursPerWeek, numWorkHours)
+            ? "-"
+            : bookedHoursPerWeek.bookingModel.totalBillable.toLocaleString(
+                "nb-No",
+              )}
         </p>
       </div>
     </td>
   );
 }
+
+function checkIfNotStartedOrQuit(
+  consultant: ConsultantReadModel,
+  bookedHoursPerWeek: BookedHoursPerWeek,
+  numWorkHours: number,
+) {
+  const project = consultant.detailedBooking.find(
+    (b) => b.bookingDetails.projectName == "Ikke startet eller sluttet",
+  );
+  const hours = project?.hours.find(
+    (h) => h.week == bookedHoursPerWeek.sortableWeek,
+  );
+
+  if (!hours?.hours) return false;
+
+  return (
+    hours?.hours ==
+    numWorkHours - bookedHoursPerWeek.bookingModel.totalHolidayHours
+  );
+}
diff --git a/frontend/src/hooks/staffing/useConsultantsFilter.ts b/frontend/src/hooks/staffing/useConsultantsFilter.ts
@@ -82,6 +82,7 @@ export function useConsultantsFilter() {
   );
 
   return {
+    numWorkHours,
     filteredConsultants,
     weeklyTotalBillable,
     weeklyTotalBillableAndOffered,