@hed-hog/operations 0.0.322 → 0.0.326

package/hedhog/frontend/app/_components/project-form-screen.tsx.ejs

@@ -69,6 +69,7 @@ import { useRouter } from 'next/navigation';
 import { useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
+import { PersonPicker } from '../../contact/_components/person-picker';
 import {
   fetchOperations,
   getOperationsErrorMessage,
@@ -90,7 +91,6 @@ import {
 import { ContractFormScreen } from './contract-form-screen';
 import { DepartmentSelectWithCreate } from './department-select-with-create';
 import { OperationsHeader } from './operations-header';
-import { PersonSelectWithCreate } from './person-select-with-create';
 
 const OPTION_PAGE_SIZE = 12;
 
@@ -102,6 +102,8 @@ type TeamAssignmentState = {
   weeklyHours: string;
   allocationPercent: string;
   status: string;
+  startDate: string;
+  endDate: string;
 };
 
 type ProjectFormState = {
@@ -190,11 +192,13 @@ function buildEmptyForm(
       projectRoleId: 'none',
       roleLabel: '',
       weeklyHours: '',
-      allocationPercent: '',
-      status: 'active',
-    })),
-  };
-}
+      allocationPercent: '',
+      status: 'active',
+      startDate: new Date().toISOString().split('T')[0] ?? '',
+      endDate: '',
+    })),
+  };
+}
 
 function toFormState(
   project: OperationsProjectDetails,
@@ -270,8 +274,13 @@ function toFormState(
           assignment?.allocationPercent !== undefined
             ? String(assignment.allocationPercent)
             : '',
-        status: assignment?.status ?? 'active',
-      };
+        status: assignment?.status ?? 'active',
+        startDate:
+          normalizeDateInputValue(assignment?.startDate) ||
+          new Date().toISOString().split('T')[0] ||
+          '',
+        endDate: normalizeDateInputValue(assignment?.endDate),
+      };
     }),
   };
 }
@@ -674,6 +683,8 @@ export function ProjectFormScreen({
               weeklyHours: z.string(),
               allocationPercent: z.string(),
               status: z.string(),
+              startDate: z.string(),
+              endDate: z.string(),
             })
           )
           .superRefine((assignments, ctx) => {
@@ -981,8 +992,8 @@ export function ProjectFormScreen({
           weeklyHours: parseNumberInput(assignment.weeklyHours),
           allocationPercent: parseNumberInput(assignment.allocationPercent),
           status: assignment.status,
-          startDate: trimToNull(values.startDate),
-          endDate: trimToNull(values.endDate),
+          startDate: trimToNull(assignment.startDate),
+          endDate: trimToNull(assignment.endDate),
         })),
     };
 
@@ -1134,7 +1145,7 @@ export function ProjectFormScreen({
                           : ''
                       }
                     >
-                      <PersonSelectWithCreate
+                      <PersonPicker
                         label=""
                         entityLabel={t('fields.clientName')}
                         value={null}
@@ -1602,6 +1613,40 @@ export function ProjectFormScreen({
                             );
                           }}
                         />
+                        <div className="flex items-center gap-2 xl:col-span-4">
+                          <div className="flex-1">
+                            <label className="text-xs text-muted-foreground">
+                              {t('fields.assignmentStartDate')}
+                            </label>
+                            <Input
+                              className="h-9"
+                              type="date"
+                              value={assignment.startDate}
+                              disabled={!assignment.selected}
+                              onChange={(event) =>
+                                updateAssignment(assignment.collaboratorId, {
+                                  startDate: event.target.value,
+                                })
+                              }
+                            />
+                          </div>
+                          <div className="flex-1">
+                            <label className="text-xs text-muted-foreground">
+                              {t('fields.assignmentEndDate')}
+                            </label>
+                            <Input
+                              className="h-9"
+                              type="date"
+                              value={assignment.endDate}
+                              disabled={!assignment.selected}
+                              onChange={(event) =>
+                                updateAssignment(assignment.collaboratorId, {
+                                  endDate: event.target.value,
+                                })
+                              }
+                            />
+                          </div>
+                        </div>
                       </div>
                     );
                   })}