filter

client/src/App.js

@@ -13,6 +13,8 @@ import WelcomeWithFilter from "./Pages/WelcomeWithFilter";
 import "react-toastify/dist/ReactToastify.css";
 import CourseTable from "./Pages/CourseTable";
 import GenerateCSV from "./Pages/GenerateCSV";
+import ConsolidatedTable from "./Pages/ConsolidatedTable";
+
 
 function App() {
   return (
@@ -30,6 +32,7 @@ function App() {
         <Route path="/ResetPw/:token" element={<ResetPwPage />}></Route>
         <Route path="/Filter" element={<FilterPage />} />
         <Route path="/courses" element={<CourseTable />} />
+        <Route path="/consolidated" element={<ConsolidatedTable />} />
       </Routes>
     </Router>
   );

client/src/Pages/ConsolidatedTable.jsx

@@ -0,0 +1,58 @@
+import React, { useState, useEffect } from "react";
+import axios from "axios";
+
+const ConsolidatedTable = () => {
+  const [data, setData] = useState([]);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const response = await axios.get("http://localhost:8080/api/data/consolidated");
+        setData(response.data);
+        setLoading(false);
+      } catch (error) {
+        console.error("Error fetching consolidated data:", error);
+        setLoading(false);
+      }
+    };
+
+    fetchData();
+  }, []);
+
+  if (loading) {
+    return <div>Loading...</div>;
+  }
+
+  return (
+    <div>
+      <h1>Consolidated Data</h1>
+      <table border="1" style={{ width: "100%", textAlign: "left" }}>
+        <thead>
+          <tr>
+            <th>Faculty ID</th>
+            <th>Faculty Name</th>
+            <th>Course ID</th>
+            <th>Course Name</th>
+            <th>Task</th>
+          </tr>
+        </thead>
+        <tbody>
+          {data.map((faculty) =>
+            faculty.tasks.map((task, index) => (
+              <tr key={`${faculty.facultyId}-${index}`}>
+                <td>{faculty.facultyId}</td>
+                <td>{faculty.facultyName}</td>
+                <td>{task.courseId}</td>
+                <td>{task.courseName}</td>
+                <td>{task.task}</td>
+              </tr>
+            ))
+          )}
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+export default ConsolidatedTable;

client/src/Pages/CourseForm.jsx

@@ -99,15 +99,20 @@ const CourseForm = () => {
         await updateCourseStatus(course?.courseId || id);
         console.log("Form submitted successfully:", payload);
 
+        const filteredCourses = JSON.parse(localStorage.getItem("filteredCourses")) || [];
+
         // Redirect to courses page after successful submission
         navigate("/courses", {
           state: {
+            courses: filteredCourses,
             updatedCourse: {
               ...course,
               status: "Submitted",
             },
           },
         });
+
+        
       } catch (error) {
         console.error("Failed to save appointment:", error);
       }

client/src/Pages/FilterPage.jsx

@@ -23,16 +23,39 @@ const FilterPage = () => {
     }
   };
 
+  // const handleApplyFilter = async () => {
+  //   if (!formData.scheme || !formData.semester || !formData.department || !formData.program) {
+  //     alert("Please fill all the fields before applying the filter.");
+  //     return;
+  //   }
+
+  //   try {
+  //     const filteredCourses = await fetchCourses(formData);
+  //     console.log(formData);
+  //     if (filteredCourses.length > 0) {
+  //       navigate("/courses", { state: { courses: filteredCourses } });
+  //     } else {
+  //       alert("No courses found for the selected filters.");
+  //     }
+  //   } catch (error) {
+  //     console.error("Error fetching courses:", error);
+  //     alert("Failed to fetch courses. Please try again later.");
+  //   }
+  // };
+
   const handleApplyFilter = async () => {
     if (!formData.scheme || !formData.semester || !formData.department || !formData.program) {
       alert("Please fill all the fields before applying the filter.");
       return;
     }
-
+  
     try {
       const filteredCourses = await fetchCourses(formData);
       console.log(formData);
       if (filteredCourses.length > 0) {
+        // Save filteredCourses in localStorage
+        localStorage.setItem("filteredCourses", JSON.stringify(filteredCourses));
+  
         navigate("/courses", { state: { courses: filteredCourses } });
       } else {
         alert("No courses found for the selected filters.");
@@ -42,6 +65,7 @@ const FilterPage = () => {
       alert("Failed to fetch courses. Please try again later.");
     }
   };
+  
 
   const getSemesters = () => {
     if (!formData.program) return [];

server/controller/csvGeneratorController.js

@@ -40,7 +40,7 @@ const generateAppointmentCSV = async (req, res) => {
     });
 
     await csvWriter.writeRecords(csvData);
-    res.status(200).json({ message: "CSV generated successfully", path: "/generated_csv/appointments.csv" });
+    res.status(200).json({ message: "CSV generated successfully", path: "./generated_csv/appointments.csv" });
   } catch (error) {
     console.error("Error generating CSV:", error);
     res.status(500).json({ message: "Failed to generate CSV" });

server/routes/consolidatedRoutes.js

@@ -0,0 +1,34 @@
+const express = require("express");
+const router = express.Router();
+const Appointment = require("../models/Appointment");
+
+router.get("/consolidated", async (req, res) => {
+  try {
+    const appointments = await Appointment.find();
+
+    // Group data by faculty
+    const groupedData = appointments.reduce((acc, appointment) => {
+      if (!acc[appointment.facultyId]) {
+        acc[appointment.facultyId] = {
+          facultyId: appointment.facultyId,
+          facultyName: appointment.facultyName,
+          tasks: [],
+        };
+      }
+      acc[appointment.facultyId].tasks.push({
+        courseId: appointment.courseId,
+        courseName: appointment.courseName,
+        task: appointment.task,
+      });
+      return acc;
+    }, {});
+
+    const result = Object.values(groupedData);
+    res.status(200).json(result);
+  } catch (error) {
+    console.error("Error fetching consolidated data:", error);
+    res.status(500).json({ message: "Failed to fetch consolidated data" });
+  }
+});
+
+module.exports = router;

server/server.js

@@ -14,6 +14,7 @@ const courseRoutes = require("./routes/courseRoutes");
 const facultyRoutes = require("./routes/facultyRoutes");
 const appointmentRoutes = require("./routes/appointmentRoutes");
 const optionsRoutes = require("./routes/optionsRoutes");
+const consolidatedRoutes = require("./routes/consolidatedRoutes");
 const Course = require("./models/Course");
 
 // MongoDB Connection
@@ -50,8 +51,9 @@ require("./config/passport");
 app.use("/password", authRoutes);
 app.use("/api/courses", courseRoutes);
 app.use("/api/faculty", facultyRoutes);
-app.use("/api/appointments", appointmentRoutes); // Appointment route handles the updated structure
+app.use("/api/appointments", appointmentRoutes);
 app.use("/api/options", optionsRoutes);
+app.use("/api/data", consolidatedRoutes); // Moved after `app` initialization
 
 // Google OAuth Routes
 app.get(
@@ -157,8 +159,8 @@ app.patch("/api/courses/:courseId", async (req, res) => {
   const { courseId } = req.params;
   const { status } = req.body;
 
-  console.log('Request params:', req.params);
-  console.log('Request body:', req.body);
+  console.log("Request params:", req.params);
+  console.log("Request body:", req.body);
 
   if (!status) {
     console.error("Status is missing in the request body.");
@@ -168,8 +170,8 @@ app.patch("/api/courses/:courseId", async (req, res) => {
   try {
     const updatedCourse = await Course.findOneAndUpdate(
       { courseId: courseId }, // Use courseId field for finding the course
-      { status },              // Update the status field
-      { new: true }// Return the updated document
+      { status }, // Update the status field
+      { new: true } // Return the updated document
     );
 
     if (!updatedCourse) {
@@ -184,8 +186,6 @@ app.patch("/api/courses/:courseId", async (req, res) => {
   }
 });
 
-
-
 // Serve React Build Files
 app.use(express.static(path.join(__dirname, "../client/build")));
 app.get("*", (req, res) =>