Feat: Base step on workhours pr day for organisation (#504)

varianter · Jul 24, 2024 · 6d6b7c2 · 6d6b7c2
1 parent 29c64bf
commit 6d6b7c2
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 16 deletions.
diff --git a/frontend/src/app/[organisation]/kunder/[customer]/page.tsx b/frontend/src/app/[organisation]/kunder/[customer]/page.tsx
@@ -6,6 +6,7 @@ import CustomerSidebar from "@/components/CostumerTable/CustomerSidebar";
 import CustomerTable from "@/components/CostumerTable/CustomerTable";
 import { fetchWithToken } from "@/data/apiCallsWithToken";
 import { ConsultantFilterProvider } from "@/hooks/ConsultantFilterProvider";
+import { fetchWorkHoursPerWeek } from "@/hooks/fetchWorkHoursPerDay";
 import { Metadata } from "next";
 
 export const metadata: Metadata = {
@@ -27,6 +28,9 @@ export default async function Kunde({
       `organisations/${params.organisation}/departments`,
     )) ?? [];
 
+  const numWorkHours =
+    (await fetchWorkHoursPerWeek(params.organisation)) ?? 37.5;
+
   return (
     <ConsultantFilterProvider
       consultants={[]}
@@ -37,7 +41,11 @@ export default async function Kunde({
       {customer && (
         <>
           <CustomerSidebar customer={customer} />
-          <CustomerTable customer={customer} orgUrl={params.organisation} />
+          <CustomerTable
+            customer={customer}
+            orgUrl={params.organisation}
+            numWorkHours={numWorkHours}
+          />
         </>
       )}
     </ConsultantFilterProvider>

diff --git a/frontend/src/app/[organisation]/prosjekt/[project]/page.tsx b/frontend/src/app/[organisation]/prosjekt/[project]/page.tsx
@@ -7,6 +7,7 @@ import { ProjectWithCustomerModel } from "@/api-types";
 import Sidebar from "./Sidebar";
 import { ConsultantFilterProvider } from "@/hooks/ConsultantFilterProvider";
 import { parseYearWeekFromUrlString } from "@/data/urlUtils";
+import { fetchWorkHoursPerWeek } from "@/hooks/fetchWorkHoursPerDay";
 
 export default async function Project({
   params,
@@ -25,6 +26,9 @@ export default async function Project({
   );
   const weekSpan = searchParams.weekSpan || undefined;
 
+  const numWorkHours =
+    (await fetchWorkHoursPerWeek(params.organisation)) ?? 37.5;
+
   const consultants =
     (await fetchEmployeesWithImageAndToken(
       `${params.organisation}/staffings${
@@ -49,7 +53,7 @@ export default async function Project({
             <h2>{project.customerName}</h2>
           </div>
 
-          <EditEngagementHour project={project} />
+          <EditEngagementHour project={project} numWorkHours={numWorkHours} />
         </div>
       </ConsultantFilterProvider>
     );

diff --git a/frontend/src/components/CostumerTable/CustomerTable.tsx b/frontend/src/components/CostumerTable/CustomerTable.tsx
@@ -12,9 +12,11 @@ import { WeekSpanTableHead } from "../Staffing/WeekTableHead";
 export default function CustomerTable({
   customer,
   orgUrl,
+  numWorkHours,
 }: {
   customer: CustomersWithProjectsReadModel;
   orgUrl: string;
+  numWorkHours: number;
 }) {
   const {
     selectedWeek,
@@ -111,6 +113,7 @@ export default function CustomerTable({
             selectedWeek={selectedWeek}
             selectedWeekSpan={selectedWeekSpan}
             weekList={weekList}
+            numWorkHours={numWorkHours}
           />
         ))}
       </>

diff --git a/frontend/src/components/CostumerTable/EngagementRow.tsx b/frontend/src/components/CostumerTable/EngagementRow.tsx
@@ -23,12 +23,14 @@ export default function EngagementRows({
   selectedWeek,
   selectedWeekSpan,
   weekList,
+  numWorkHours,
 }: {
   engagement: EngagementReadModel;
   orgUrl: string;
   selectedWeek: Week;
   selectedWeekSpan: number;
   weekList: DateTime[];
+  numWorkHours: number;
 }) {
   const [isListElementVisible, setIsListElementVisible] = useState(false);
   const [isRowHovered, setIsRowHovered] = useState(false);
@@ -148,6 +150,7 @@ export default function EngagementRows({
             consultants={selectedConsultants}
             setConsultants={setSelectedConsultants}
             withBorder={true}
+            numWorkHours={numWorkHours}
           />
         ))}
     </>

diff --git a/frontend/src/components/Staffing/ConsultantRow.tsx b/frontend/src/components/Staffing/ConsultantRow.tsx
@@ -212,6 +212,7 @@ export default function ConsultantRows({
                 modalRef={changeEngagementModalRef}
                 project={selectedProject}
                 onClose={onCloseEngagementModal}
+                numWorkHours={numWorkHours}
               />
             )}
           </div>
@@ -240,6 +241,7 @@ export default function ConsultantRows({
             consultant={currentConsultant}
             detailedBooking={db}
             openEngagementAndSetID={openEngagementAndSetID}
+            numWorkHours={numWorkHours}
           />
         ))}
       {isListElementVisible && addNewRow && (

diff --git a/frontend/src/components/Staffing/DetailedBookingRows.tsx b/frontend/src/components/Staffing/DetailedBookingRows.tsx
@@ -54,10 +54,12 @@ export function DetailedBookingRows(props: {
   consultant: ConsultantReadModel;
   detailedBooking: DetailedBooking;
   openEngagementAndSetID: (id: number) => void;
+  numWorkHours: number;
 }) {
   const { setConsultants } = useContext(FilteredContext);
 
-  const { consultant, detailedBooking, openEngagementAndSetID } = props;
+  const { consultant, detailedBooking, openEngagementAndSetID, numWorkHours } =
+    props;
   const [hourDragValue, setHourDragValue] = useState<number | undefined>(
     undefined,
   );
@@ -178,6 +180,7 @@ export function DetailedBookingRows(props: {
             startDragWeek={startDragWeek}
             setStartDragWeek={setStartDragWeek}
             setCurrentDragWeek={setCurrentDragWeek}
+            numWorkHours={numWorkHours}
           />
         ))}
     </tr>
@@ -226,6 +229,7 @@ function DetailedBookingCell({
   startDragWeek,
   setStartDragWeek,
   setCurrentDragWeek,
+  numWorkHours,
 }: {
   detailedBooking: DetailedBooking;
   detailedBookingHours: WeeklyHours;
@@ -236,6 +240,7 @@ function DetailedBookingCell({
   setHourDragValue: React.Dispatch<React.SetStateAction<number | undefined>>;
   setStartDragWeek: React.Dispatch<React.SetStateAction<number | undefined>>;
   setCurrentDragWeek: React.Dispatch<React.SetStateAction<number | undefined>>;
+  numWorkHours: number;
 }) {
   const { setConsultants } = useContext(FilteredContext);
   const [hours, setHours] = useState(detailedBookingHours.hours);
@@ -248,6 +253,8 @@ function DetailedBookingCell({
   const organisationName = usePathname().split("/")[1];
   const numWeeks = detailedBooking.hours.length;
 
+  const workHoursPerDay = numWorkHours / 5;
+
   function updateSingularHours() {
     setIsDisabledHotkeys(false);
     if (oldHours != hours && hourDragValue == undefined) {
@@ -343,7 +350,7 @@ function DetailedBookingCell({
                 numWeeks <= 12 && "lg:flex"
               }  `}
               onClick={() => {
-                setHours(Math.max(hours - 7.5, 0));
+                setHours(Math.max(hours - workHoursPerDay, 0));
               }}
             >
               <Minus
@@ -358,7 +365,7 @@ function DetailedBookingCell({
           ref={inputRef}
           type="number"
           min="0"
-          step="7.5"
+          step={workHoursPerDay}
           value={hours}
           draggable={true}
           disabled={detailedBooking.bookingDetails.type == BookingType.Vacation}
@@ -401,7 +408,7 @@ function DetailedBookingCell({
                 numWeeks <= 8 && "md:flex"
               } ${numWeeks <= 12 && "lg:flex"} `}
               onClick={() => {
-                setHours(hours + 7.5);
+                setHours(hours + workHoursPerDay);
               }}
             >
               <Plus className="w-4 h-4 text-primary" />

diff --git a/frontend/src/components/Staffing/EditEngagementHourModal/AddEngagementHoursRow.tsx b/frontend/src/components/Staffing/EditEngagementHourModal/AddEngagementHoursRow.tsx
@@ -11,11 +11,13 @@ export function AddEngagementHoursRow({
   weekList,
   project,
   consultantWWeekHours,
+  numWorkHours,
 }: {
   consultant: ConsultantReadModel;
   weekList: DateTime[];
   project?: ProjectWithCustomerModel;
   consultantWWeekHours?: ConsultantWithWeekHours;
+  numWorkHours: number;
 }) {
   const [hourDragValue, setHourDragValue] = useState<number | undefined>(
     undefined,
@@ -97,6 +99,7 @@ export function AddEngagementHoursRow({
             )?.hours || 0
           }
           updateHours={updateHours}
+          numWorkHours={numWorkHours}
         />
       ))}
     </tr>

diff --git a/frontend/src/components/Staffing/EditEngagementHourModal/DetailedEngagementModalCell.tsx b/frontend/src/components/Staffing/EditEngagementHourModal/DetailedEngagementModalCell.tsx
@@ -25,6 +25,7 @@ export function DetailedEngagementModalCell({
   firstDayInWeek,
   initHours,
   updateHours,
+  numWorkHours,
 }: {
   project?: ProjectWithCustomerModel;
   consultant: ConsultantReadModel;
@@ -38,6 +39,7 @@ export function DetailedEngagementModalCell({
   firstDayInWeek: DateTime;
   initHours: number;
   updateHours: (res: ConsultantReadModel | undefined) => void;
+  numWorkHours: number;
 }) {
   const [hours, setHours] = useState(initHours);
   const [isChangingHours, setIsChangingHours] = useState(false);
@@ -47,6 +49,8 @@ export function DetailedEngagementModalCell({
   const inputRef = useRef<HTMLInputElement | null>(null);
   const organisationName = usePathname().split("/")[1];
 
+  const workHoursPerDay = numWorkHours / 5;
+
   function updateSingularHours() {
     if (oldHours != hours && hourDragValue == undefined) {
       setOldHours(hours);
@@ -137,7 +141,7 @@ export function DetailedEngagementModalCell({
               numWeeks <= 12 && "lg:flex"
             }  `}
             onClick={() => {
-              setHours(Math.max(hours - 7.5, 0));
+              setHours(Math.max(hours - workHoursPerDay, 0));
             }}
           >
             <Minus
@@ -152,7 +156,7 @@ export function DetailedEngagementModalCell({
           ref={inputRef}
           type="number"
           min="0"
-          step="7.5"
+          step={workHoursPerDay}
           value={hours}
           draggable={true}
           onChange={(e) =>
@@ -190,7 +194,7 @@ export function DetailedEngagementModalCell({
               numWeeks <= 8 && "md:flex"
             } ${numWeeks <= 12 && "lg:flex"} `}
             onClick={() => {
-              setHours(hours + 7.5);
+              setHours(hours + workHoursPerDay);
             }}
           >
             <Plus className="w-4 h-4 text-primary" />

diff --git a/frontend/src/components/Staffing/EditEngagementHourModal/EditEngagementHour.tsx b/frontend/src/components/Staffing/EditEngagementHourModal/EditEngagementHour.tsx
@@ -23,8 +23,10 @@ import ChangeEngagementState from "@/components/ChangeEngagementState";
 
 export function EditEngagementHour({
   project,
+  numWorkHours,
 }: {
   project?: ProjectWithCustomerModel;
+  numWorkHours: number;
 }) {
   const {
     selectedWeek,
@@ -164,6 +166,7 @@ export function EditEngagementHour({
               }
               consultants={selectedConsultants}
               setConsultants={setSelectedConsultants}
+              numWorkHours={numWorkHours}
             />
           ))}
 
@@ -182,6 +185,7 @@ export function EditEngagementHour({
               weekList={weekList}
               project={chosenProject}
               consultantWWeekHours={consultant}
+              numWorkHours={numWorkHours}
             />
           ))}
           <tr>

diff --git a/frontend/src/components/Staffing/EditEngagementHourModal/EditEngagementHoursModal.tsx b/frontend/src/components/Staffing/EditEngagementHourModal/EditEngagementHoursModal.tsx
@@ -22,10 +22,12 @@ export function EditEngagementHourModal({
   modalRef,
   project,
   onClose,
+  numWorkHours,
 }: {
   modalRef: RefObject<HTMLDialogElement>;
   project?: ProjectWithCustomerModel;
   onClose: () => void;
+  numWorkHours: number;
 }) {
   const {
     selectedWeek,
@@ -164,6 +166,7 @@ export function EditEngagementHourModal({
                 }
                 consultants={selectedConsultants}
                 setConsultants={setSelectedConsultants}
+                numWorkHours={numWorkHours}
               />
             ))}
 
@@ -185,6 +188,7 @@ export function EditEngagementHourModal({
                 weekList={weekList}
                 project={chosenProject}
                 consultantWWeekHours={consultant}
+                numWorkHours={numWorkHours}
               />
             ))}
             <tr>

diff --git a/frontend/src/components/Staffing/EditEngagementHourModal/EditEngagementHoursRow.tsx b/frontend/src/components/Staffing/EditEngagementHourModal/EditEngagementHoursRow.tsx
@@ -20,12 +20,14 @@ export function EditEngagementHoursRow({
   consultants,
   setConsultants,
   withBorder = false,
+  numWorkHours,
 }: {
   consultant: ConsultantReadModel;
   detailedBooking?: DetailedBooking;
   consultants: ConsultantReadModel[];
   setConsultants: React.Dispatch<React.SetStateAction<ConsultantReadModel[]>>;
   withBorder?: boolean;
+  numWorkHours: number;
 }) {
   const [hourDragValue, setHourDragValue] = useState<number | undefined>(
     undefined,
@@ -71,6 +73,7 @@ export function EditEngagementHoursRow({
                 setCurrentDragWeek={setCurrentDragWeek}
                 setConsultants={setConsultants}
                 consultants={consultants}
+                numWorkHours={numWorkHours}
               />
             ))}
         </>
@@ -91,6 +94,7 @@ function EditBookingCell({
   setCurrentDragWeek,
   setConsultants,
   consultants,
+  numWorkHours,
 }: {
   detailedBooking: DetailedBooking;
   detailedBookingHours: WeeklyHours;
@@ -103,6 +107,7 @@ function EditBookingCell({
   setCurrentDragWeek: React.Dispatch<React.SetStateAction<number | undefined>>;
   setConsultants: React.Dispatch<React.SetStateAction<ConsultantReadModel[]>>;
   consultants: ConsultantReadModel[];
+  numWorkHours: number;
 }) {
   const [hours, setHours] = useState(detailedBookingHours.hours);
   const [isChangingHours, setIsChangingHours] = useState(false);
@@ -113,6 +118,8 @@ function EditBookingCell({
   const organisationName = usePathname().split("/")[1];
   const numWeeks = detailedBooking.hours.length;
 
+  const workHoursPerDay = numWorkHours / 5;
+
   function updateSingularHours() {
     if (oldHours != hours && hourDragValue == undefined) {
       setDetailedBookingHours({
@@ -206,7 +213,7 @@ function EditBookingCell({
                 numWeeks <= 12 && "lg:flex"
               }  `}
               onClick={() => {
-                setHours(Math.max(hours - 7.5, 0));
+                setHours(Math.max(hours - workHoursPerDay, 0));
               }}
             >
               <Minus
@@ -221,7 +228,7 @@ function EditBookingCell({
           ref={inputRef}
           type="number"
           min="0"
-          step="7.5"
+          step={workHoursPerDay}
           value={hours}
           draggable={true}
           disabled={detailedBooking.bookingDetails.type == BookingType.Vacation}
@@ -262,7 +269,7 @@ function EditBookingCell({
                 numWeeks <= 8 && "md:flex"
               } ${numWeeks <= 12 && "lg:flex"} `}
               onClick={() => {
-                setHours(hours + 7.5);
+                setHours(hours + workHoursPerDay);
               }}
             >
               <Plus className="w-4 h-4 text-primary" />