Same Employee Displayed in Both Active and Inactive Lists in Project > Teams #447
@ -93,20 +93,27 @@ const Teams = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const filteredEmployees = useMemo(() => {
|
const filteredEmployees = useMemo(() => {
|
||||||
if (!projectEmployees || !searchTerm?.trim()) return projectEmployees;
|
if (!projectEmployees) return [];
|
||||||
|
|
||||||
const lower = searchTerm.toLowerCase();
|
let filtered = projectEmployees;
|
||||||
|
|
||||||
return projectEmployees?.filter((emp) => {
|
if (activeEmployee) {
|
||||||
const fullName = `${emp.firstName ?? ""} ${
|
filtered = projectEmployees.filter((emp) => !emp.isActive);
|
||||||
emp.lastName ?? ""
|
}
|
||||||
}`.toLowerCase();
|
|
||||||
|
|
||||||
const joberole = getJobRole(emp?.jobRoleId)?.toLowerCase();
|
// Apply search filter if present
|
||||||
|
if (searchTerm?.trim()) {
|
||||||
|
const lower = searchTerm.toLowerCase();
|
||||||
|
filtered = filtered.filter((emp) => {
|
||||||
|
const fullName = `${emp.firstName ?? ""} ${emp.lastName ?? ""}`.toLowerCase();
|
||||||
|
const jobRole = getJobRole(emp?.jobRoleId)?.toLowerCase();
|
||||||
|
return fullName.includes(lower) || jobRole.includes(lower);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return filtered;
|
||||||
|
}, [projectEmployees, searchTerm, activeEmployee]);
|
||||||
|
|
||||||
return fullName?.includes(lower) || joberole?.includes(lower);
|
|
||||||
});
|
|
||||||
}, [projectEmployees, searchTerm]);
|
|
||||||
const handleSearch = (e) => setSearchTerm(e.target.value);
|
const handleSearch = (e) => setSearchTerm(e.target.value);
|
||||||
const employeeHandler = useCallback(
|
const employeeHandler = useCallback(
|
||||||
(msg) => {
|
(msg) => {
|
||||||
@ -284,8 +291,8 @@ const Teams = () => {
|
|||||||
<td>
|
<td>
|
||||||
{emp.reAllocationDate
|
{emp.reAllocationDate
|
||||||
? moment(emp.reAllocationDate).format(
|
? moment(emp.reAllocationDate).format(
|
||||||
"DD-MMM-YYYY"
|
"DD-MMM-YYYY"
|
||||||
)
|
)
|
||||||
: "Present"}
|
: "Present"}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
@ -317,7 +324,7 @@ const Teams = () => {
|
|||||||
{!employeeLodaing && filteredEmployees.length === 0 && (
|
{!employeeLodaing && filteredEmployees.length === 0 && (
|
||||||
<div className="text-center text-muted py-3 d-flex justify-content-center align-items-center py-12">
|
<div className="text-center text-muted py-3 d-flex justify-content-center align-items-center py-12">
|
||||||
<p>
|
<p>
|
||||||
{!activeEmployee
|
{activeEmployee
|
||||||
? "No active employees assigned to the project"
|
? "No active employees assigned to the project"
|
||||||
: "No inactive employees assigned to the project"}
|
: "No inactive employees assigned to the project"}
|
||||||
</p>
|
</p>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user