diff --git a/src/app/api/projects/actions.ts b/src/app/api/projects/actions.ts index d1d3e47..4a7dbd3 100644 --- a/src/app/api/projects/actions.ts +++ b/src/app/api/projects/actions.ts @@ -63,6 +63,7 @@ export interface CreateProjectInputs { // Miscellaneous expectedProjectFee: number; + subContractFee?: number; } export interface ManhourAllocation { diff --git a/src/app/api/projects/index.ts b/src/app/api/projects/index.ts index 3660546..a7cb551 100644 --- a/src/app/api/projects/index.ts +++ b/src/app/api/projects/index.ts @@ -36,6 +36,7 @@ export interface MainProject { clientContactId: number; clientSubsidiaryId: number; expectedProjectFee: number; + subContractFee: number; } export interface ProjectCategory { diff --git a/src/components/CreateProject/CreateProject.tsx b/src/components/CreateProject/CreateProject.tsx index 31ea689..c212691 100644 --- a/src/components/CreateProject/CreateProject.tsx +++ b/src/components/CreateProject/CreateProject.tsx @@ -280,6 +280,7 @@ const CreateProject: React.FC = ({ projectName: mainProjects !== undefined ? mainProjects[0].projectName : undefined, projectDescription: mainProjects !== undefined ? mainProjects[0].projectDescription : undefined, expectedProjectFee: mainProjects !== undefined ? mainProjects[0].expectedProjectFee : undefined, + subContractFee: mainProjects !== undefined ? mainProjects[0].subContractFee : undefined, clientId: allCustomers !== undefined ? allCustomers[0].id : undefined, ...defaultInputs, diff --git a/src/components/CreateProject/ProjectClientDetails.tsx b/src/components/CreateProject/ProjectClientDetails.tsx index 27a0f18..85862af 100644 --- a/src/components/CreateProject/ProjectClientDetails.tsx +++ b/src/components/CreateProject/ProjectClientDetails.tsx @@ -330,6 +330,16 @@ const ProjectClientDetails: React.FC = ({ /> + + + + = ({ disableClearable // disablePortal noOptionsText={t("No Task List Source")} - value={taskTemplates.find(taskTemplate => taskTemplate.id === selectedTaskTemplateId)} + value={taskTemplates.find(taskTemplate => taskTemplate.id === selectedTaskTemplateId) ?? {id: "All", name: t("All tasks")}} options={[{id: "All", name: t("All tasks")}, ...taskTemplates.map(taskTemplate => ({id: taskTemplate.id, name: taskTemplate.name}))]} getOptionLabel={(taskTemplate) => taskTemplate.name} isOptionEqualToValue={(option, value) => option?.id === value?.id}