Compare commits

...

2 Commits

+20 -1
View File
@@ -110,7 +110,8 @@ export default function DoctorPage() {
fetchAll(); fetchAll();
}, [fetchAll]); }, [fetchAll]);
const filteredDoctors = doctors.filter((doc) => { const filteredDoctors = doctors
.filter((doc) => {
const matchesSearch = const matchesSearch =
doc.name.toLowerCase().includes(searchText.toLowerCase()) || doc.name.toLowerCase().includes(searchText.toLowerCase()) ||
doc.doctorId.toLowerCase().includes(searchText.toLowerCase()); doc.doctorId.toLowerCase().includes(searchText.toLowerCase());
@@ -120,6 +121,24 @@ export default function DoctorPage() {
: true; : true;
return matchesSearch && matchesDepartment; return matchesSearch && matchesDepartment;
})
.sort((a, b) => {
if (!filterDepartment) {
return a.globalSortOrder - b.globalSortOrder;
}
const aDept = a.departments.find(
(d: any) => d.departmentId === filterDepartment,
);
const bDept = b.departments.find(
(d: any) => d.departmentId === filterDepartment,
);
return (
(aDept?.deptSortOrder ?? Number.MAX_SAFE_INTEGER) -
(bDept?.deptSortOrder ?? Number.MAX_SAFE_INTEGER)
);
}); });
useEffect(() => { useEffect(() => {