diff --git a/server/routes/consolidatedRoutes.js b/server/routes/consolidatedRoutes.js index 8a7b784..2034dba 100644 --- a/server/routes/consolidatedRoutes.js +++ b/server/routes/consolidatedRoutes.js @@ -14,7 +14,7 @@ router.get("/consolidated-table", async (req, res) => { const groupedData = {}; appointments.forEach((appointment) => { - const key = `${appointment.facultyId}-${appointment.courseId}`; + const key = `${appointment.facultyId}-${appointment.courseId}-${appointment.academicYear}-${appointment.examPeriod}`; if (!groupedData[key]) { groupedData[key] = { facultyId: appointment.facultyId, @@ -32,10 +32,11 @@ router.get("/consolidated-table", async (req, res) => { experience: "20+", // Dummy value tasks: new Set(), // Use a set to avoid duplicate tasks }; - } + } groupedData[key].tasks.add(appointment.task); }); + // Add course details to the grouped data Object.values(groupedData).forEach((data) => { const course = courses.find((c) => c.courseId === data.courseId);