Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fa2b02ad23 | |||
| 199797fdf4 | |||
| 5efe049fbd | |||
| a008f09923 |
@@ -84,7 +84,11 @@ export const createAppointment = async (req, res) => {
|
||||
<tr>
|
||||
<td style="padding: 8px 0;"><b>Date:</b></td>
|
||||
<td style="padding: 8px 0;">
|
||||
${new Date(date).toLocaleDateString()}
|
||||
${new Date(date).toLocaleDateString("en-GB", {
|
||||
day: "2-digit",
|
||||
month: "long",
|
||||
year: "numeric",
|
||||
})}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@@ -110,7 +110,8 @@ export default function DoctorPage() {
|
||||
fetchAll();
|
||||
}, [fetchAll]);
|
||||
|
||||
const filteredDoctors = doctors.filter((doc) => {
|
||||
const filteredDoctors = doctors
|
||||
.filter((doc) => {
|
||||
const matchesSearch =
|
||||
doc.name.toLowerCase().includes(searchText.toLowerCase()) ||
|
||||
doc.doctorId.toLowerCase().includes(searchText.toLowerCase());
|
||||
@@ -120,6 +121,24 @@ export default function DoctorPage() {
|
||||
: true;
|
||||
|
||||
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(() => {
|
||||
|
||||
Reference in New Issue
Block a user