From 40c274424de05fa4e34d893258873c8c3016ec87 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Thu, 4 Jul 2024 14:45:54 +0800
Subject: [PATCH] add sub-contract fee to project

---
 src/app/api/projects/actions.ts                       |  1 +
 src/app/api/projects/index.ts                         |  1 +
 src/components/CreateProject/CreateProject.tsx        |  1 +
 src/components/CreateProject/ProjectClientDetails.tsx | 10 ++++++++++
 src/components/CreateProject/TaskSetup.tsx            |  2 +-
 5 files changed, 14 insertions(+), 1 deletion(-)

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<Props> = ({
       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<Props> = ({
               />
             </Grid>
 
+            <Grid item xs={6}>
+              <TextField
+                label={t("Sub-Contract Fee")}
+                fullWidth
+                type="number"
+                inputProps={{ step: "0.01" }}
+                {...register("subContractFee", { valueAsNumber: true })}
+              />
+            </Grid>
+
             <Grid item xs={6}>
               <Checkbox
                 {...register("isClpProject")}
diff --git a/src/components/CreateProject/TaskSetup.tsx b/src/components/CreateProject/TaskSetup.tsx
index 759b05f..0cd2a94 100644
--- a/src/components/CreateProject/TaskSetup.tsx
+++ b/src/components/CreateProject/TaskSetup.tsx
@@ -137,7 +137,7 @@ const TaskSetup: React.FC<Props> = ({
               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}