瀏覽代碼

Merge pull request 'update' (#13) from develop into main

Reviewed-on: https://git.2fi-solutions.com/wayne.lee/tsms/pulls/13
develop
jason.tom 4 月之前
父節點
當前提交
1cbfb12150
共有 1 個檔案被更改,包括 13 行新增13 行删除
  1. +13
    -13
      src/components/TimesheetTable/ProjectSelect.tsx

+ 13
- 13
src/components/TimesheetTable/ProjectSelect.tsx 查看文件

@@ -80,7 +80,7 @@ const AutocompleteProjectSelect: React.FC<Props> = ({
p.actualEnd ? !referenceDay.isAfter(p.actualEnd) : true, p.actualEnd ? !referenceDay.isAfter(p.actualEnd) : true,
); );
}, [allProjects, referenceDay]); }, [allProjects, referenceDay]);
console.log(assignedProjects)
const nonAssignedProjects = useMemo(() => { const nonAssignedProjects = useMemo(() => {
return differenceBy(allFilteredProjects, assignedProjects, "id"); return differenceBy(allFilteredProjects, assignedProjects, "id");
}, [allFilteredProjects, assignedProjects]); }, [allFilteredProjects, assignedProjects]);
@@ -97,18 +97,18 @@ const AutocompleteProjectSelect: React.FC<Props> = ({
label: `${p.code} - ${p.name}`, label: `${p.code} - ${p.name}`,
group: "assigned", group: "assigned",
})), })),
...(includeLeaves && leaveTypes
? leaveTypes.map((l) => ({
value: `leave-${l.id}`,
label: t(l.name),
group: "leaves",
}))
: []),
...nonAssignedProjects.map((p) => ({
value: p.id,
label: `${p.code} - ${p.name}`,
group: assignedProjects.length === 0 ? "all-projects" : "non-assigned",
})),
// ...(includeLeaves && leaveTypes
// ? leaveTypes.map((l) => ({
// value: `leave-${l.id}`,
// label: t(l.name),
// group: "leaves",
// }))
// : []),
// ...nonAssignedProjects.map((p) => ({
// value: p.id,
// label: `${p.code} - ${p.name}`,
// group: assignedProjects.length === 0 ? "all-projects" : "non-assigned",
// })),
]; ];
}, [assignedProjects, includeLeaves, leaveTypes, nonAssignedProjects, t]); }, [assignedProjects, includeLeaves, leaveTypes, nonAssignedProjects, t]);




Loading…
取消
儲存