| @@ -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]); | ||||