From f48087387e8bec1caf183ebdfa22e490c4030837 Mon Sep 17 00:00:00 2001
From: Sigrid Elnan <sge@variant.no>
Date: Tue, 20 Aug 2024 08:42:16 +0200
Subject: [PATCH 1/5] start checking of person is quit or started

---
 .../StaffingController/ReadModelFactory.cs    | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/backend/Api/StaffingController/ReadModelFactory.cs b/backend/Api/StaffingController/ReadModelFactory.cs
index da504ae9..dc355721 100644
--- a/backend/Api/StaffingController/ReadModelFactory.cs
+++ b/backend/Api/StaffingController/ReadModelFactory.cs
@@ -166,6 +166,57 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
                 vacationsPrWeek));
         }
 
+        var startDate = consultant.StartDate;
+        var endDate = consultant.EndDate;
+        
+        var firstDayInScope = weekSet.First().FirstDayOfWorkWeek();
+        var firstWorkDayOutOfScope = weekSet.Last().LastWorkDayOfWeek();
+
+        if (startDate.HasValue && startDate > firstDayInScope)
+        {
+            var startWeeks = weekSet.Select(week =>
+            {
+                var isStartWeek = week.ContainsDate((DateOnly)startDate);
+                var hasStarted = startDate < week.FirstDayOfWorkWeek();
+
+                var dayDifference = Math.Max((startDate.Value.ToDateTime(new TimeOnly()) - week.FirstDayOfWorkWeek().ToDateTime(new TimeOnly())).Days, 0);
+
+                var hours = isStartWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday :
+                    hasStarted ? 0 : consultant.Department.Organization.HoursPerWorkday * 5;
+                
+                return new WeeklyHours(
+                    week.ToSortableInt(), 0
+                );
+
+            }).ToList();
+            detailedBookings = detailedBookings.Append(new DetailedBooking(
+                new BookingDetails("Ikke Startet eller Sluttet", BookingType.PlannedAbsence,
+                    "Variant",
+                    0, true), //Empty projectName as vacation does not have a project, 0 as projectId as vacation is weird
+                startWeeks));
+        }
+        
+        if (endDate.HasValue && endDate < firstWorkDayOutOfScope)
+        {
+           var endWeeks = weekSet.Select(week =>
+            {
+                var isEndWeek = week.ContainsDate((DateOnly)endDate);
+                var hasEnded = endDate < week.FirstDayOfWorkWeek();
+
+                var dayDifference = Math.Max((week.LastWorkDayOfWeek().ToDateTime(new TimeOnly()) - endDate.Value.ToDateTime(new TimeOnly())).Days, 0);
+
+                var hours = hasEnded ? consultant.Department.Organization.HoursPerWorkday * 5 : isEndWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday :
+                     0;
+                
+                return new WeeklyHours(
+                    week.ToSortableInt(), hours
+                );
+
+            });
+        }
+        
+       
+
         var detailedBookingList = detailedBookings.ToList();
 
         return detailedBookingList;

From 2e0d27d5c2d15bf5cd3142787a02e3fc39129e98 Mon Sep 17 00:00:00 2001
From: Sigrid Elnan <sge@variant.no>
Date: Mon, 26 Aug 2024 08:49:43 +0200
Subject: [PATCH 2/5] Make code hopefully more readable, and disable ability to
 change hours on frontend

---
 .../StaffingController/ReadModelFactory.cs    | 80 ++++++++++---------
 .../Staffing/DetailedBookingRows.tsx          | 14 +++-
 2 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/backend/Api/StaffingController/ReadModelFactory.cs b/backend/Api/StaffingController/ReadModelFactory.cs
index dc355721..748b8605 100644
--- a/backend/Api/StaffingController/ReadModelFactory.cs
+++ b/backend/Api/StaffingController/ReadModelFactory.cs
@@ -168,53 +168,21 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
 
         var startDate = consultant.StartDate;
         var endDate = consultant.EndDate;
-        
+
         var firstDayInScope = weekSet.First().FirstDayOfWorkWeek();
         var firstWorkDayOutOfScope = weekSet.Last().LastWorkDayOfWeek();
 
         if (startDate.HasValue && startDate > firstDayInScope)
         {
-            var startWeeks = weekSet.Select(week =>
-            {
-                var isStartWeek = week.ContainsDate((DateOnly)startDate);
-                var hasStarted = startDate < week.FirstDayOfWorkWeek();
-
-                var dayDifference = Math.Max((startDate.Value.ToDateTime(new TimeOnly()) - week.FirstDayOfWorkWeek().ToDateTime(new TimeOnly())).Days, 0);
-
-                var hours = isStartWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday :
-                    hasStarted ? 0 : consultant.Department.Organization.HoursPerWorkday * 5;
-                
-                return new WeeklyHours(
-                    week.ToSortableInt(), 0
-                );
-
-            }).ToList();
-            detailedBookings = detailedBookings.Append(new DetailedBooking(
-                new BookingDetails("Ikke Startet eller Sluttet", BookingType.PlannedAbsence,
-                    "Variant",
-                    0, true), //Empty projectName as vacation does not have a project, 0 as projectId as vacation is weird
-                startWeeks));
+            var startWeeks = GetHoursNotStartedOrQuit(startDate, weekSet, consultant, false);
+            detailedBookings = detailedBookings.Append(CreateDetailedBooking(startWeeks));
         }
-        
+
         if (endDate.HasValue && endDate < firstWorkDayOutOfScope)
         {
-           var endWeeks = weekSet.Select(week =>
-            {
-                var isEndWeek = week.ContainsDate((DateOnly)endDate);
-                var hasEnded = endDate < week.FirstDayOfWorkWeek();
-
-                var dayDifference = Math.Max((week.LastWorkDayOfWeek().ToDateTime(new TimeOnly()) - endDate.Value.ToDateTime(new TimeOnly())).Days, 0);
-
-                var hours = hasEnded ? consultant.Department.Organization.HoursPerWorkday * 5 : isEndWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday :
-                     0;
-                
-                return new WeeklyHours(
-                    week.ToSortableInt(), hours
-                );
-
-            });
+            var endWeeks = GetHoursNotStartedOrQuit(endDate, weekSet, consultant, true);
+            detailedBookings = detailedBookings.Append(CreateDetailedBooking(endWeeks));
         }
-        
        
 
         var detailedBookingList = detailedBookings.ToList();
@@ -222,6 +190,42 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
         return detailedBookingList;
     }
 
+    private static List<WeeklyHours> GetHoursNotStartedOrQuit(DateOnly? date, List<Week> weekSet, Consultant consultant, bool quit)
+    {
+        return weekSet
+            .Select(week =>
+            {
+                var isTargetWeek = week.ContainsDate((DateOnly)date);
+                var hasReached = date < week.FirstDayOfWorkWeek();
+
+                var maxWorkHoursForWeek = consultant.Department.Organization.HoursPerWorkday * 5 -
+                                          consultant.Department.Organization.GetTotalHolidayHoursOfWeek(week);
+
+                var dayDifference = quit ? 
+                    Math.Max((date.Value.ToDateTime(new TimeOnly()) - week.FirstDayOfWorkWeek().ToDateTime(new TimeOnly())).Days, 0) : 
+                    Math.Max((week.LastWorkDayOfWeek().ToDateTime(new TimeOnly()) - date.Value.ToDateTime(new TimeOnly())).Days, 0);
+
+                var hours = isTargetWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday : quit ? (
+                    hasReached ? consultant.Department.Organization.HoursPerWorkday * 5 : 0) : (
+                    hasReached ? 0 : consultant.Department.Organization.HoursPerWorkday * 5) ;
+
+                return new WeeklyHours(
+                    week.ToSortableInt(), Math.Min(hours, maxWorkHoursForWeek)
+                );
+            })
+            .ToList();
+    }
+    
+    private static DetailedBooking CreateDetailedBooking(List<WeeklyHours> weeks)
+    {
+        return new DetailedBooking(
+            new BookingDetails("Ikke startet eller sluttet", BookingType.PlannedAbsence,
+                "Ikke startet eller sluttet",
+                0, true), //Empty projectName as vacation does not have a project, 0 as projectId as vacation is weird
+            weeks
+        );
+    }
+
     private static BookedHoursPerWeek GetBookedHours(Week week, IEnumerable<DetailedBooking> detailedBookings,
         Consultant consultant)
     {
diff --git a/frontend/src/components/Staffing/DetailedBookingRows.tsx b/frontend/src/components/Staffing/DetailedBookingRows.tsx
index 16cb3da3..2ee214e2 100644
--- a/frontend/src/components/Staffing/DetailedBookingRows.tsx
+++ b/frontend/src/components/Staffing/DetailedBookingRows.tsx
@@ -340,7 +340,9 @@ function DetailedBookingCell({
       >
         {isChangingHours &&
           numWeeks <= 12 &&
-          detailedBooking.bookingDetails.type != BookingType.Vacation && (
+          detailedBooking.bookingDetails.type != BookingType.Vacation &&
+          detailedBooking.bookingDetails.projectName !=
+            "Ikke startet eller sluttet" && (
             <button
               tabIndex={-1}
               disabled={hours == 0}
@@ -368,7 +370,11 @@ function DetailedBookingCell({
           step={workHoursPerDay}
           value={hours}
           draggable={true}
-          disabled={detailedBooking.bookingDetails.type == BookingType.Vacation}
+          disabled={
+            detailedBooking.bookingDetails.type == BookingType.Vacation ||
+            detailedBooking.bookingDetails.projectName ==
+              "Ikke startet eller sluttet"
+          }
           onChange={(e) =>
             hourDragValue == undefined && setHours(Number(e.target.value))
           }
@@ -401,7 +407,9 @@ function DetailedBookingCell({
         ></input>
         {isChangingHours &&
           numWeeks <= 12 &&
-          detailedBooking.bookingDetails.type != BookingType.Vacation && (
+          detailedBooking.bookingDetails.type != BookingType.Vacation &&
+          detailedBooking.bookingDetails.projectName !=
+            "Ikke startet eller sluttet" && (
             <button
               tabIndex={-1}
               className={`my-1 p-1 rounded-full hover:bg-primary/10 hidden ${

From 55ed7b1fbef96cd414275beaf2f555e87c620cce Mon Sep 17 00:00:00 2001
From: Sigrid Elnan <sge@variant.no>
Date: Mon, 26 Aug 2024 09:21:53 +0200
Subject: [PATCH 3/5] Make notStartedOrQuit its own bookingType

---
 .../StaffingController/ReadModelFactory.cs    | 18 +++++----
 .../StaffingController/StaffingReadModel.cs   |  6 ++-
 frontend/mockdata/mockData.ts                 |  1 +
 frontend/src/api-types.ts                     |  4 ++
 .../Staffing/DetailedBookingRows.tsx          | 11 +++---
 frontend/src/components/Staffing/WeekCell.tsx | 38 +++++++++++++------
 .../src/components/Staffing/helpers/utils.tsx | 13 ++++++-
 .../hooks/staffing/useConsultantsFilter.ts    |  1 +
 8 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/backend/Api/StaffingController/ReadModelFactory.cs b/backend/Api/StaffingController/ReadModelFactory.cs
index 748b8605..bde8e5e3 100644
--- a/backend/Api/StaffingController/ReadModelFactory.cs
+++ b/backend/Api/StaffingController/ReadModelFactory.cs
@@ -175,13 +175,13 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
         if (startDate.HasValue && startDate > firstDayInScope)
         {
             var startWeeks = GetHoursNotStartedOrQuit(startDate, weekSet, consultant, false);
-            detailedBookings = detailedBookings.Append(CreateDetailedBooking(startWeeks));
+            detailedBookings = detailedBookings.Append(CreateNotStartedOrQuitDetailedBooking(startWeeks));
         }
 
         if (endDate.HasValue && endDate < firstWorkDayOutOfScope)
         {
             var endWeeks = GetHoursNotStartedOrQuit(endDate, weekSet, consultant, true);
-            detailedBookings = detailedBookings.Append(CreateDetailedBooking(endWeeks));
+            detailedBookings = detailedBookings.Append(CreateNotStartedOrQuitDetailedBooking(endWeeks));
         }
        
 
@@ -216,12 +216,12 @@ private static List<WeeklyHours> GetHoursNotStartedOrQuit(DateOnly? date, List<W
             .ToList();
     }
     
-    private static DetailedBooking CreateDetailedBooking(List<WeeklyHours> weeks)
+    private static DetailedBooking CreateNotStartedOrQuitDetailedBooking(List<WeeklyHours> weeks)
     {
         return new DetailedBooking(
-            new BookingDetails("Ikke startet eller sluttet", BookingType.PlannedAbsence,
+            new BookingDetails("Ikke startet eller sluttet", BookingType.NotStartedOrQuit,
                 "Ikke startet eller sluttet",
-                0, true), //Empty projectName as vacation does not have a project, 0 as projectId as vacation is weird
+                0, true), //Empty projectName as NotStartedOrQuit does not have a project, 0 as projectId as NotStartedOrQuit since its just used to mark not started or quit
             weeks
         );
     }
@@ -247,6 +247,10 @@ private static BookedHoursPerWeek GetBookedHours(Week week, IEnumerable<Detailed
         var totalAbsence = DetailedBooking.GetTotalHoursPrBookingTypeAndWeek(detailedBookingsArray,
             BookingType.PlannedAbsence,
             week);
+
+        var totalNotStartedOrQuit =
+            DetailedBooking.GetTotalHoursPrBookingTypeAndWeek(detailedBookingsArray, BookingType.NotStartedOrQuit,
+                week);
         
         var totalExludableAbsence = detailedBookingsArray
             .Where(s => s.BookingDetails.Type == BookingType.PlannedAbsence &&  s.BookingDetails.ExcludeFromBilling )
@@ -257,7 +261,7 @@ private static BookedHoursPerWeek GetBookedHours(Week week, IEnumerable<Detailed
             BookingType.Vacation,
             week);
 
-        var bookedTime = totalBillable + totalAbsence + totalVacations + totalHolidayHours + totalNonBillable;
+        var bookedTime = totalBillable + totalAbsence + totalVacations + totalHolidayHours + totalNonBillable + totalNotStartedOrQuit;
         var hoursPrWorkDay = consultant.Department.Organization.HoursPerWorkday;
 
         var totalSellableTime =
@@ -273,7 +277,7 @@ private static BookedHoursPerWeek GetBookedHours(Week week, IEnumerable<Detailed
             GetDatesForWeek(week),
             new WeeklyBookingReadModel(totalBillable, totalOffered, totalAbsence, totalExludableAbsence,  totalSellableTime,
                 totalHolidayHours, totalVacations,
-                totalOverbooked)
+                totalOverbooked, totalNotStartedOrQuit)
         );
     }
 
diff --git a/backend/Api/StaffingController/StaffingReadModel.cs b/backend/Api/StaffingController/StaffingReadModel.cs
index 5c8f08ec..ec6dc9ea 100644
--- a/backend/Api/StaffingController/StaffingReadModel.cs
+++ b/backend/Api/StaffingController/StaffingReadModel.cs
@@ -86,7 +86,8 @@ public record WeeklyBookingReadModel(
     [property: Required] double TotalSellableTime,
     [property: Required] double TotalHolidayHours,
     [property: Required] double TotalVacationHours,
-    [property: Required] double TotalOverbooking);
+    [property: Required] double TotalOverbooking, 
+    [property: Required] double TotalNotStartedOrQuit);
 
 public record BookingDetails(
     [property: Required] string ProjectName,
@@ -104,5 +105,6 @@ public enum BookingType
     Booking,
     PlannedAbsence,
     Vacation,
-    Available
+    Available,
+    NotStartedOrQuit
 }
\ No newline at end of file
diff --git a/frontend/mockdata/mockData.ts b/frontend/mockdata/mockData.ts
index 030c0e91..b253eacb 100644
--- a/frontend/mockdata/mockData.ts
+++ b/frontend/mockdata/mockData.ts
@@ -17,6 +17,7 @@ const MockWeeklyBookingReadModel: WeeklyBookingReadModel = {
   totalOffered: 0,
   totalVacationHours: 0,
   totalExludableAbsence: 0,
+  totalNotStartedOrQuit: 0,
 };
 
 export const MockConsultants: ConsultantReadModel[] = [
diff --git a/frontend/src/api-types.ts b/frontend/src/api-types.ts
index c1441569..77086d9f 100644
--- a/frontend/src/api-types.ts
+++ b/frontend/src/api-types.ts
@@ -38,6 +38,7 @@ export enum BookingType {
   PlannedAbsence = "PlannedAbsence",
   Vacation = "Vacation",
   Available = "Available",
+  NotStartedOrQuit = "NotStartedOrQuit",
 }
 
 export interface ConsultantReadModel {
@@ -273,7 +274,10 @@ export interface WeeklyBookingReadModel {
   totalVacationHours: number;
   /** @format double */
   totalOverbooking: number;
+  /** @format double */
   totalExludableAbsence: number;
+  /** @format double */
+  totalNotStartedOrQuit: number;
 }
 
 export interface WeeklyHours {
diff --git a/frontend/src/components/Staffing/DetailedBookingRows.tsx b/frontend/src/components/Staffing/DetailedBookingRows.tsx
index 2ee214e2..d163f887 100644
--- a/frontend/src/components/Staffing/DetailedBookingRows.tsx
+++ b/frontend/src/components/Staffing/DetailedBookingRows.tsx
@@ -341,8 +341,8 @@ function DetailedBookingCell({
         {isChangingHours &&
           numWeeks <= 12 &&
           detailedBooking.bookingDetails.type != BookingType.Vacation &&
-          detailedBooking.bookingDetails.projectName !=
-            "Ikke startet eller sluttet" && (
+          detailedBooking.bookingDetails.type !=
+            BookingType.NotStartedOrQuit && (
             <button
               tabIndex={-1}
               disabled={hours == 0}
@@ -372,8 +372,7 @@ function DetailedBookingCell({
           draggable={true}
           disabled={
             detailedBooking.bookingDetails.type == BookingType.Vacation ||
-            detailedBooking.bookingDetails.projectName ==
-              "Ikke startet eller sluttet"
+            detailedBooking.bookingDetails.type != BookingType.NotStartedOrQuit
           }
           onChange={(e) =>
             hourDragValue == undefined && setHours(Number(e.target.value))
@@ -408,8 +407,8 @@ function DetailedBookingCell({
         {isChangingHours &&
           numWeeks <= 12 &&
           detailedBooking.bookingDetails.type != BookingType.Vacation &&
-          detailedBooking.bookingDetails.projectName !=
-            "Ikke startet eller sluttet" && (
+          detailedBooking.bookingDetails.type !=
+            BookingType.NotStartedOrQuit && (
             <button
               tabIndex={-1}
               className={`my-1 p-1 rounded-full hover:bg-primary/10 hidden ${
diff --git a/frontend/src/components/Staffing/WeekCell.tsx b/frontend/src/components/Staffing/WeekCell.tsx
index 14544068..e3db5d5a 100644
--- a/frontend/src/components/Staffing/WeekCell.tsx
+++ b/frontend/src/components/Staffing/WeekCell.tsx
@@ -1,7 +1,14 @@
 import { BookedHoursPerWeek, ConsultantReadModel } from "@/api-types";
 import { HoveredWeek } from "@/components/Staffing/HoveredWeek";
 import InfoPill from "@/components/Staffing/InfoPill";
-import { AlertTriangle, Coffee, FileText, Moon, Sun } from "react-feather";
+import {
+  AlertTriangle,
+  Calendar,
+  Coffee,
+  FileText,
+  Moon,
+  Sun,
+} from "react-feather";
 import { getInfopillVariantByColumnCount } from "@/components/Staffing/helpers/utils";
 import React from "react";
 
@@ -148,14 +155,27 @@ export function WeekCell(props: {
               variant={getInfopillVariantByColumnCount(columnCount)}
             />
           )}
+          {bookedHoursPerWeek.bookingModel.totalNotStartedOrQuit > 0 && (
+            <InfoPill
+              text={bookedHoursPerWeek.bookingModel.totalNotStartedOrQuit.toLocaleString(
+                "nb-No",
+                {
+                  maximumFractionDigits: 1,
+                  minimumFractionDigits: 0,
+                },
+              )}
+              colors="bg-absence/60 text-absence_darker border-absence_darker"
+              icon={<Calendar size="12" />}
+              variant={getInfopillVariantByColumnCount(columnCount)}
+            />
+          )}
         </div>
         <p
           className={`text-right ${
             isListElementVisible ? "normal-medium" : "normal"
           }`}
         >
-          {bookedHoursPerWeek.bookingModel.totalPlannedAbsences > 0 &&
-          checkIfNotStartedOrQuit(consultant, bookedHoursPerWeek, numWorkHours)
+          {checkIfNotStartedOrQuit(consultant, bookedHoursPerWeek, numWorkHours)
             ? "-"
             : bookedHoursPerWeek.bookingModel.totalBillable.toLocaleString(
                 "nb-No",
@@ -171,17 +191,11 @@ function checkIfNotStartedOrQuit(
   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;
+  const notStartedOrQuitHours =
+    bookedHoursPerWeek.bookingModel.totalNotStartedOrQuit;
 
   return (
-    hours?.hours ==
+    notStartedOrQuitHours ==
     numWorkHours - bookedHoursPerWeek.bookingModel.totalHolidayHours
   );
 }
diff --git a/frontend/src/components/Staffing/helpers/utils.tsx b/frontend/src/components/Staffing/helpers/utils.tsx
index a9c14aae..75499342 100644
--- a/frontend/src/components/Staffing/helpers/utils.tsx
+++ b/frontend/src/components/Staffing/helpers/utils.tsx
@@ -5,7 +5,14 @@ import {
   EngagementState,
 } from "@/api-types";
 import React, { ReactElement } from "react";
-import { Briefcase, Coffee, FileText, Moon, Sun } from "react-feather";
+import {
+  Briefcase,
+  Calendar,
+  Coffee,
+  FileText,
+  Moon,
+  Sun,
+} from "react-feather";
 import { InfoPillVariant } from "@/components/Staffing/InfoPill";
 
 export function getColorByStaffingType(type: BookingType): string {
@@ -20,6 +27,8 @@ export function getColorByStaffingType(type: BookingType): string {
       return "bg-absence";
     case BookingType.Available:
       return "bg-available";
+    case BookingType.NotStartedOrQuit:
+      return "bg-absence/60";
     default:
       return "";
   }
@@ -69,6 +78,8 @@ export function getIconByBookingType(
       return <Moon size={size} className="text-absence_darker" />;
     case BookingType.Available:
       return <Coffee size={size} className="text-available_darker" />;
+    case BookingType.NotStartedOrQuit:
+      return <Calendar size={size} className="text-absence_darker/70" />;
     default:
       return <></>;
   }
diff --git a/frontend/src/hooks/staffing/useConsultantsFilter.ts b/frontend/src/hooks/staffing/useConsultantsFilter.ts
index 7ee8d49b..e7062964 100644
--- a/frontend/src/hooks/staffing/useConsultantsFilter.ts
+++ b/frontend/src/hooks/staffing/useConsultantsFilter.ts
@@ -286,6 +286,7 @@ function setWeeklyInvoiceRate(
             numWorkHours -
             booking.bookingModel.totalHolidayHours -
             booking.bookingModel.totalExludableAbsence -
+            booking.bookingModel.totalNotStartedOrQuit -
             booking.bookingModel.totalVacationHours;
 
           totalAvailableWeekHours += consultantAvailableWeekHours;

From 9e48976c4b600efd36a0f19ffbc785b0c55eee21 Mon Sep 17 00:00:00 2001
From: Sigrid Elnan <sge@variant.no>
Date: Thu, 29 Aug 2024 14:21:52 +0200
Subject: [PATCH 4/5] Disable field, try to make more readable

---
 .../StaffingController/ReadModelFactory.cs    | 30 ++++++++++++++-----
 .../Staffing/DetailedBookingRows.tsx          |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/backend/Api/StaffingController/ReadModelFactory.cs b/backend/Api/StaffingController/ReadModelFactory.cs
index bde8e5e3..f40781ba 100644
--- a/backend/Api/StaffingController/ReadModelFactory.cs
+++ b/backend/Api/StaffingController/ReadModelFactory.cs
@@ -201,13 +201,9 @@ private static List<WeeklyHours> GetHoursNotStartedOrQuit(DateOnly? date, List<W
                 var maxWorkHoursForWeek = consultant.Department.Organization.HoursPerWorkday * 5 -
                                           consultant.Department.Organization.GetTotalHolidayHoursOfWeek(week);
 
-                var dayDifference = quit ? 
-                    Math.Max((date.Value.ToDateTime(new TimeOnly()) - week.FirstDayOfWorkWeek().ToDateTime(new TimeOnly())).Days, 0) : 
-                    Math.Max((week.LastWorkDayOfWeek().ToDateTime(new TimeOnly()) - date.Value.ToDateTime(new TimeOnly())).Days, 0);
-
-                var hours = isTargetWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday : quit ? (
-                    hasReached ? consultant.Department.Organization.HoursPerWorkday * 5 : 0) : (
-                    hasReached ? 0 : consultant.Department.Organization.HoursPerWorkday * 5) ;
+                var hours = quit
+                    ? GetHoursForWeekWhenQuitting(date, week, isTargetWeek, hasReached, consultant)
+                    : GetHoursForWeekWhenStarting(date, week, isTargetWeek, hasReached, consultant);
 
                 return new WeeklyHours(
                     week.ToSortableInt(), Math.Min(hours, maxWorkHoursForWeek)
@@ -215,6 +211,26 @@ private static List<WeeklyHours> GetHoursNotStartedOrQuit(DateOnly? date, List<W
             })
             .ToList();
     }
+
+    private static double GetHoursForWeekWhenStarting(DateOnly? startDate, Week week, Boolean isStartWeek,
+        bool hasStarted, Consultant consultant)
+    {
+        var dayDifference = Math.Max((week.LastWorkDayOfWeek().ToDateTime(new TimeOnly()) - startDate.Value.ToDateTime(new TimeOnly())).Days, 0);
+
+        return isStartWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday : 
+            hasStarted ? 0 : consultant.Department.Organization.HoursPerWorkday * 5 ;
+    }
+
+    private static double GetHoursForWeekWhenQuitting(DateOnly? endDate, Week week, bool isFinalWeek, bool hasQuit,
+        Consultant consultant)
+    {
+        var dayDifference = Math.Max((endDate.Value.ToDateTime(new TimeOnly()) - week.FirstDayOfWorkWeek().ToDateTime(new TimeOnly())).Days, 0);
+
+        return isFinalWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday :
+            hasQuit ? consultant.Department.Organization.HoursPerWorkday * 5 : 0;
+    }
+    
+    
     
     private static DetailedBooking CreateNotStartedOrQuitDetailedBooking(List<WeeklyHours> weeks)
     {
diff --git a/frontend/src/components/Staffing/DetailedBookingRows.tsx b/frontend/src/components/Staffing/DetailedBookingRows.tsx
index d163f887..e9414073 100644
--- a/frontend/src/components/Staffing/DetailedBookingRows.tsx
+++ b/frontend/src/components/Staffing/DetailedBookingRows.tsx
@@ -372,7 +372,7 @@ function DetailedBookingCell({
           draggable={true}
           disabled={
             detailedBooking.bookingDetails.type == BookingType.Vacation ||
-            detailedBooking.bookingDetails.type != BookingType.NotStartedOrQuit
+            detailedBooking.bookingDetails.type == BookingType.NotStartedOrQuit
           }
           onChange={(e) =>
             hourDragValue == undefined && setHours(Number(e.target.value))

From cc1e11c445123d8ce75e98fabcbfea3e7096dfa7 Mon Sep 17 00:00:00 2001
From: Sigrid Elnan <sge@variant.no>
Date: Thu, 29 Aug 2024 15:02:59 +0200
Subject: [PATCH 5/5] More clear names

---
 .../StaffingController/ReadModelFactory.cs    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/backend/Api/StaffingController/ReadModelFactory.cs b/backend/Api/StaffingController/ReadModelFactory.cs
index f40781ba..b841bf72 100644
--- a/backend/Api/StaffingController/ReadModelFactory.cs
+++ b/backend/Api/StaffingController/ReadModelFactory.cs
@@ -174,13 +174,13 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
 
         if (startDate.HasValue && startDate > firstDayInScope)
         {
-            var startWeeks = GetHoursNotStartedOrQuit(startDate, weekSet, consultant, false);
+            var startWeeks = GetNonEmploymentHoursNotStartedOrQuit(startDate, weekSet, consultant, false);
             detailedBookings = detailedBookings.Append(CreateNotStartedOrQuitDetailedBooking(startWeeks));
         }
 
         if (endDate.HasValue && endDate < firstWorkDayOutOfScope)
         {
-            var endWeeks = GetHoursNotStartedOrQuit(endDate, weekSet, consultant, true);
+            var endWeeks = GetNonEmploymentHoursNotStartedOrQuit(endDate, weekSet, consultant, true);
             detailedBookings = detailedBookings.Append(CreateNotStartedOrQuitDetailedBooking(endWeeks));
         }
        
@@ -190,40 +190,41 @@ private static List<DetailedBooking> DetailedBookings(Consultant consultant,
         return detailedBookingList;
     }
 
-    private static List<WeeklyHours> GetHoursNotStartedOrQuit(DateOnly? date, List<Week> weekSet, Consultant consultant, bool quit)
+    private static List<WeeklyHours> GetNonEmploymentHoursNotStartedOrQuit(DateOnly? date, List<Week> weekSet, Consultant consultant, bool quit)
     {
         return weekSet
             .Select(week =>
             {
                 var isTargetWeek = week.ContainsDate((DateOnly)date);
-                var hasReached = date < week.FirstDayOfWorkWeek();
 
                 var maxWorkHoursForWeek = consultant.Department.Organization.HoursPerWorkday * 5 -
                                           consultant.Department.Organization.GetTotalHolidayHoursOfWeek(week);
 
-                var hours = quit
-                    ? GetHoursForWeekWhenQuitting(date, week, isTargetWeek, hasReached, consultant)
-                    : GetHoursForWeekWhenStarting(date, week, isTargetWeek, hasReached, consultant);
+                var hoursOutsideEmployment = quit
+                    ? GetNonEmployedHoursForWeekWhenQuitting(date, week, isTargetWeek, consultant)
+                    : GetNonEmployedHoursForWeekWhenStarting(date, week, isTargetWeek, consultant);
 
                 return new WeeklyHours(
-                    week.ToSortableInt(), Math.Min(hours, maxWorkHoursForWeek)
+                    week.ToSortableInt(), Math.Min(hoursOutsideEmployment, maxWorkHoursForWeek)
                 );
             })
             .ToList();
     }
 
-    private static double GetHoursForWeekWhenStarting(DateOnly? startDate, Week week, Boolean isStartWeek,
-        bool hasStarted, Consultant consultant)
+    private static double GetNonEmployedHoursForWeekWhenStarting(DateOnly? startDate, Week week, Boolean isStartWeek,
+         Consultant consultant)
     {
+        var hasStarted = startDate < week.FirstDayOfWorkWeek();
         var dayDifference = Math.Max((week.LastWorkDayOfWeek().ToDateTime(new TimeOnly()) - startDate.Value.ToDateTime(new TimeOnly())).Days, 0);
 
         return isStartWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday : 
             hasStarted ? 0 : consultant.Department.Organization.HoursPerWorkday * 5 ;
     }
 
-    private static double GetHoursForWeekWhenQuitting(DateOnly? endDate, Week week, bool isFinalWeek, bool hasQuit,
+    private static double GetNonEmployedHoursForWeekWhenQuitting(DateOnly? endDate, Week week, bool isFinalWeek, 
         Consultant consultant)
     {
+        var hasQuit = endDate < week.FirstDayOfWorkWeek();
         var dayDifference = Math.Max((endDate.Value.ToDateTime(new TimeOnly()) - week.FirstDayOfWorkWeek().ToDateTime(new TimeOnly())).Days, 0);
 
         return isFinalWeek ? dayDifference * consultant.Department.Organization.HoursPerWorkday :