diff --git a/src/components/CreateTeam/StaffAllocation.tsx b/src/components/CreateTeam/StaffAllocation.tsx index 6f267de..9bda1fb 100644 --- a/src/components/CreateTeam/StaffAllocation.tsx +++ b/src/components/CreateTeam/StaffAllocation.tsx @@ -121,6 +121,7 @@ const StaffAllocation: React.FC = ({ allStaffs: staff }) => { { label: t("Staff Id"), name: "staffId" }, { label: t("Staff Name"), name: "name" }, { label: t("Position"), name: "currentPosition" }, + { label: t("Active"), name: "active", type: "checkbox" }, ], [addStaff, t] ); @@ -136,6 +137,7 @@ const StaffAllocation: React.FC = ({ allStaffs: staff }) => { { label: t("Staff Id"), name: "staffId" }, { label: t("Staff Name"), name: "name" }, { label: t("Position"), name: "currentPosition" }, + { label: t("Active"), name: "active", type: "checkbox" }, { label: t("teamLead"), name: "action", diff --git a/src/components/EditTeam/Allocation.tsx b/src/components/EditTeam/Allocation.tsx index 4d2274c..fe842b6 100644 --- a/src/components/EditTeam/Allocation.tsx +++ b/src/components/EditTeam/Allocation.tsx @@ -131,6 +131,7 @@ const Allocation: React.FC = ({ allStaffs: staff, teamLead }) => { { label: t("Staff Id"), name: "staffId" }, { label: t("Staff Name"), name: "name" }, { label: t("Position"), name: "currentPosition" }, + { label: t("Active"), name: "active", type: "checkbox" }, ], [addStaff, t] ); @@ -146,6 +147,7 @@ const Allocation: React.FC = ({ allStaffs: staff, teamLead }) => { { label: t("Staff Id"), name: "staffId" }, { label: t("Staff Name"), name: "name" }, { label: t("Position"), name: "currentPosition" }, + { label: t("Active"), name: "active", type: "checkbox" }, { label: t("teamLead"), name: "action", diff --git a/src/i18n/en/projects.json b/src/i18n/en/projects.json index 266a863..c0ab451 100644 --- a/src/i18n/en/projects.json +++ b/src/i18n/en/projects.json @@ -12,5 +12,6 @@ "Details": "Details", "Awarded Project": "Awarded Project", "Project to be bidded": "Project to be bidded", - "On-going": "On-going" + "On-going": "On-going", + "Active": "Active" } \ No newline at end of file diff --git a/src/i18n/en/team.json b/src/i18n/en/team.json index c4bb8d0..9380355 100644 --- a/src/i18n/en/team.json +++ b/src/i18n/en/team.json @@ -21,5 +21,6 @@ "Staff Name": "Staff Name", "Position": "Position", "Search by Staff Id, Name or Position.": "Search by Staff Id, Name or Position.", - "An error has occurred. Please try again later.": "An error has occurred. Please try again later" + "An error has occurred. Please try again later.": "An error has occurred. Please try again later", + "Active": "Active" } \ No newline at end of file diff --git a/src/i18n/zh/projects.json b/src/i18n/zh/projects.json index 93550f4..dd2329a 100644 --- a/src/i18n/zh/projects.json +++ b/src/i18n/zh/projects.json @@ -12,5 +12,6 @@ "Details": "詳細信息", "Awarded Project": "已獲得的項目", "Project to be bidded": "待投標項目", - "On-going": "進行中" + "On-going": "進行中", + "Active": "在職" } \ No newline at end of file diff --git a/src/i18n/zh/staff.json b/src/i18n/zh/staff.json index 199418d..12ca937 100644 --- a/src/i18n/zh/staff.json +++ b/src/i18n/zh/staff.json @@ -29,5 +29,6 @@ "Confirm": "確認", "Cancel": "取消", "Save": "儲存", - "Edit Salary": "編輯薪金點" + "Edit Salary": "編輯薪金點", + "Active": "在職" } \ No newline at end of file diff --git a/src/i18n/zh/team.json b/src/i18n/zh/team.json index 0735308..92b21f3 100644 --- a/src/i18n/zh/team.json +++ b/src/i18n/zh/team.json @@ -21,5 +21,6 @@ "Staff Name": "員工名稱", "Position": "職位", "Search by Staff Id, Name or Position.": "按員工編號、姓名或職位搜索", - "An error has occurred. Please try again later.": "發生了錯誤。請稍後再試" + "An error has occurred. Please try again later.": "發生了錯誤。請稍後再試", + "Active": "在職" } \ No newline at end of file