Organization_Management : Organization Hierarchy #443

Merged
pramod.mahajan merged 180 commits from Organization_Management into main 2025-09-30 09:07:31 +00:00
Showing only changes of commit b2d7349fc9 - Show all commits

View File

@ -154,8 +154,7 @@ const Teams = () => {
setEmpJobRoles(data); setEmpJobRoles(data);
} }
}, [data]); }, [data]);
const filterAndSearchEmployees = useCallback(() => {
const filterAndSearchEmployees = useCallback(() => {
const statusFiltered = employees.filter((emp) => const statusFiltered = employees.filter((emp) =>
activeEmployee ? emp.isActive : !emp.isActive activeEmployee ? emp.isActive : !emp.isActive
); );
@ -166,19 +165,24 @@ const Teams = () => {
} }
const lowercasedSearchTerm = searchTerm.toLowerCase(); const lowercasedSearchTerm = searchTerm.toLowerCase();
const searchedAndFiltered = statusFiltered.filter((item) => { const searchedAndFiltered = statusFiltered.filter((item) => {
const fullName = const fullName = `${item.firstName} ${item.middleName} ${item.lastName}`.toLowerCase();
`${item.firstName} ${item.middleName} ${item.lastName}`.toLowerCase();
const roleName = getRole(item.jobRoleId).toLowerCase(); const roleName = getRole(item.jobRoleId).toLowerCase();
const orgName = (item.organizationName || "").toLowerCase();
const serviceName = (item.serviceName || "").toLowerCase();
return ( return (
fullName.includes(lowercasedSearchTerm) || fullName.includes(lowercasedSearchTerm) ||
roleName.includes(lowercasedSearchTerm) roleName.includes(lowercasedSearchTerm) ||
orgName.includes(lowercasedSearchTerm) ||
serviceName.includes(lowercasedSearchTerm)
); );
}); });
setFilteredEmployees(searchedAndFiltered); setFilteredEmployees(searchedAndFiltered);
}, [employees, activeEmployee, searchTerm, getRole]); }, [employees, activeEmployee, searchTerm, getRole]);
useEffect(() => { useEffect(() => {
filterAndSearchEmployees(); filterAndSearchEmployees();