admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Same Employee Displayed in Both Active and Inactive Lists in Project > Teams

Browse Source
This commit is contained in:
Kartik Sharma 2025-10-01 10:31:46 +05:30
parent d5df200ede
commit 2921e116a9
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/Project/Team/Teams.jsx
View File

@ -93,20 +93,27 @@ const Teams = () => {
};
const filteredEmployees = useMemo(() => {
if (!projectEmployees || !searchTerm?.trim()) return projectEmployees;
if (!projectEmployees) return [];
const lower = searchTerm.toLowerCase();
let filtered = projectEmployees;
return projectEmployees?.filter((emp) => {
const fullName = `${emp.firstName ?? ""} ${
emp.lastName ?? ""
}`.toLowerCase();
if (activeEmployee) {
filtered = projectEmployees.filter((emp) => !emp.isActive);
}
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 employeeHandler = useCallback(
(msg) => {
@ -284,8 +291,8 @@ const Teams = () => {
<td>
{emp.reAllocationDate
? moment(emp.reAllocationDate).format(
"DD-MMM-YYYY"
)
"DD-MMM-YYYY"
)
: "Present"}
</td>
)}
@ -317,7 +324,7 @@ const Teams = () => {
{!employeeLodaing && filteredEmployees.length === 0 && (
<div className="text-center text-muted py-3 d-flex justify-content-center align-items-center py-12">
<p>
{!activeEmployee
{activeEmployee
? "No active employees assigned to the project"
: "No inactive employees assigned to the project"}
</p>