diff --git a/.gitignore b/.gitignore
index 7f5b38cc7..1851250da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,3 +141,4 @@ dist
 /client/package-lock.json
 /server/package-lock.json
 
+.DS_Store
\ No newline at end of file
diff --git a/client/src/pages/CoordinatorCumulativeReviewForm.js b/client/src/pages/CoordinatorCumulativeReviewForm.js
new file mode 100644
index 000000000..0dd496df3
--- /dev/null
+++ b/client/src/pages/CoordinatorCumulativeReviewForm.js
@@ -0,0 +1,122 @@
+import React, { useEffect, useState } from "react";
+import { useParams, useNavigate } from "react-router-dom";
+import axios from "axios";
+import Swal from "sweetalert2";
+import "../styles/CoordinatorCumulativeReviewForm.css";
+
+const CoordinatorCumulativeReviewForm = () => {
+  const { groupIndex } = useParams();
+  const navigate = useNavigate();
+
+  const [reports, setReports] = useState([]);
+  const [coordinatorComment, setCoordinatorComment] = useState("");
+  const [supervisorComment, setSupervisorComment] = useState("");
+  const [loading, setLoading] = useState(true);
+
+  // Fetch the report group when component mounts
+  useEffect(() => {
+    const fetchGroup = async () => {
+      try {
+        const res = await axios.get(
+          `${process.env.REACT_APP_API_URL}/api/reports/cumulative/group/${groupIndex}`
+        );
+        if (res.data.success) {
+          const fetchedReports = res.data.group.reports || [];
+          setReports(fetchedReports);
+          setSupervisorComment(fetchedReports[0]?.supervisorComments || "Not available");
+        }
+      } catch (err) {
+        console.error("Failed to fetch group:", err);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchGroup();
+  }, [groupIndex]);
+
+  // Submit coordinator comments for all reports in the group
+  const handleSubmit = async () => {
+    if (!coordinatorComment.trim()) {
+      Swal.fire("Error", "Comment cannot be empty.", "error");
+      return;
+    }
+  
+    try {
+      const weeks = reports.map((report) => report.week); // extract weeks
+  
+      await axios.post(`${process.env.REACT_APP_API_URL}/api/reports/coordinator-comments`, {
+        groupIndex: parseInt(groupIndex),
+        comments: coordinatorComment.trim(),
+        weeks,
+      });
+  
+      Swal.fire("Success", "Coordinator comment submitted.", "success");
+  
+      localStorage.setItem("reviewedGroupIndex", groupIndex); // ✅ For dashboard refresh
+      navigate("/coordinator-dashboard");
+    } catch (err) {
+      console.error("Failed to submit coordinator comment", err);
+      Swal.fire("Error", "Failed to submit comment. Please try again.", "error");
+    }
+  };
+  
+
+  if (loading) {
+    return <p className="coordinator-review-container">Loading...</p>;
+  }
+
+  return (
+    <div className="coordinator-review-container">
+      <h2>Review Cumulative Weekly Reports</h2>
+
+      <table className="coordinator-review-table">
+        <thead>
+          <tr>
+            <th>Week</th>
+            <th>Hours</th>
+            <th>Tasks</th>
+            <th>Lessons</th>
+          </tr>
+        </thead>
+        <tbody>
+          {reports.map((report, idx) => (
+            <tr key={idx}>
+              <td>{report.week}</td>
+              <td>{report.hours}</td>
+              <td>{report.tasks}</td>
+              <td>{report.lessons}</td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+
+      <div className="comment-section">
+        <label><strong>Supervisor Comment</strong></label>
+        <div className="readonly-display">{supervisorComment}</div>
+      </div>
+
+      <div className="comment-section">
+        <label htmlFor="coordinatorComments"><strong>Coordinator Comment</strong></label>
+        <textarea
+          id="coordinatorComments"
+          className="coordinator-comment-box"
+          placeholder="Add coordinator comments here..."
+          value={coordinatorComment}
+          onChange={(e) => setCoordinatorComment(e.target.value)}
+        />
+      </div>
+
+      <div className="button-group">
+        <button className="cancel-btn" onClick={() => navigate("/coordinator-dashboard")}>
+          Cancel
+        </button>
+        <button className="submit-btn" onClick={handleSubmit}>
+          Submit Comment
+        </button>
+      </div>
+    </div>
+  );
+};
+
+export default CoordinatorCumulativeReviewForm;
diff --git a/client/src/pages/CoordinatorDashboard.js b/client/src/pages/CoordinatorDashboard.js
index 8259b6507..ed7121555 100644
--- a/client/src/pages/CoordinatorDashboard.js
+++ b/client/src/pages/CoordinatorDashboard.js
@@ -1,48 +1,124 @@
 import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import axios from "axios";
-import "../styles/dashboard.css";
-
-function CoordinatorDashboard() {
-  const [requests, setRequests] = useState([]);
+import { useNavigate } from "react-router-dom";
+import "../styles/SupervisorDashboard.css"; 
+const CoordinatorDashboard = () => {
+  const [activeTab, setActiveTab] = useState("requests"); // 'requests' or 'reports'
   const navigate = useNavigate();
+  // TEAM A's Internship Requests Logic
+  const [requests, setRequests] = useState([]);
+  const [loadingRequests, setLoadingRequests] = useState(true);
 
-  const fetchRequests = async () => {
+  useEffect(() => {
+    if (activeTab === "requests") {
+      fetchInternshipRequests();
+    }
+  }, [activeTab]);
+
+  const fetchInternshipRequests = async () => {
     try {
-      const res = await axios.get(
-        `${process.env.REACT_APP_API_URL}/api/coordinator/requests`
-      );
-      setRequests(res.data);
+      const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/coordinator/requests`);
+      setRequests(res.data || []);
     } catch (err) {
-      console.error("Failed to fetch requests:", err);
+      console.error("Error fetching internship requests:", err);
+    } finally {
+      setLoadingRequests(false);
     }
   };
+  // Group D's Weekly Report Review Logic
+
+  const [reportGroups, setReportGroups] = useState([]);
+  const [loadingReports, setLoadingReports] = useState(true);
 
   useEffect(() => {
-    fetchRequests();
-  }, []);
+    if (activeTab === "reports") {
+      fetchReportGroups();
+    }
+  }, [activeTab]);
 
+  const fetchReportGroups = async () => {
+    try {
+      const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/reports/supervised-groups`);
+      const filtered = res.data?.groups?.filter(group => {
+        const key = `coordinator_reviewed_${group.groupIndex}`;
+        return !localStorage.getItem(key);
+      });
+      setReportGroups(filtered || []);
+    } catch (err) {
+      console.error("Error fetching reports:", err);
+    } finally {
+      setLoadingReports(false);
+    }
+  };
+
+  const handleReviewClick = (group) => {
+    localStorage.setItem(`coordinator_reviewed_${group.groupIndex}`, "true");
+    navigate(`/review-cumulative/${group.groupIndex}`);
+  };
+
+  
+  // Render UI
+  
   return (
     <div className="dashboard-container">
-      <h2 className="dashboard-title">Coordinator Dashboard</h2>
-
-      {requests.length === 0 ? (
-        <p>No Pending Requests</p>
-      ) : (
-        requests.map((req) => (
-          <div
-            key={req._id}
-            className="request-card"
-            onClick={() => navigate(`/coordinator/request/${req._id}`)}
-          >
-            {/* <h4>{req.student.userName}</h4>
-            <p>Email: {req.student.email}</p> */}
-            <p>Company: {req.workplace.name}</p>
-          </div>
-        ))
+      <h2>Coordinator Dashboard</h2>
+
+      {/* Tabs */}
+      <div className="tab-toggle">
+        <button onClick={() => setActiveTab("requests")} className={activeTab === "requests" ? "active" : ""}>Internship Requests</button>
+        <button onClick={() => setActiveTab("reports")} className={activeTab === "reports" ? "active" : ""}>Weekly Reports Review</button>
+      </div>
+
+      {/* Tab: Internship Requests */}
+      {activeTab === "requests" && (
+        <>
+          {loadingRequests ? <p>Loading...</p> : (
+            <table className="dashboard-table">
+              <thead>
+                <tr>
+                  <th>Student Name</th>
+                  <th>Student ID</th>
+                  <th>Company</th>
+                  <th>Status</th>
+                </tr>
+              </thead>
+              <tbody>
+                {requests.map(req => (
+                  <tr key={req._id}>
+                    <td>{req.studentName}</td>
+                    <td>{req.studentId}</td>
+                    <td>{req.companyName}</td>
+                    <td>{req.status}</td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )}
+        </>
+      )}
+
+      {/* Tab: Weekly Reports Review */}
+      {activeTab === "reports" && (
+        <>
+          {loadingReports ? <p>Loading reports...</p> : (
+            reportGroups.length === 0
+              ? <p>No reports to review</p>
+              : reportGroups.map(group => (
+                <div className="report-group-card" key={group.groupIndex}>
+                  <h4>Weeks: {group.weeks?.join(", ")}</h4>
+                  <ul>
+                    {group.reports.map((r, i) => (
+                      <li key={i}>Week {r.week} — Hours: {r.hours} — Tasks: {r.tasks}</li>
+                    ))}
+                  </ul>
+                  <button onClick={() => handleReviewClick(group)}>Review & Comment</button>
+                </div>
+              ))
+          )}
+        </>
       )}
     </div>
   );
-}
+};
 
 export default CoordinatorDashboard;
diff --git a/client/src/pages/CoordinatorReviewForm.js b/client/src/pages/CoordinatorReviewForm.js
new file mode 100644
index 000000000..e3f793c34
--- /dev/null
+++ b/client/src/pages/CoordinatorReviewForm.js
@@ -0,0 +1,76 @@
+import React, { useEffect, useState } from "react";
+import axios from "axios";
+import { useParams, useNavigate } from "react-router-dom";
+import "../styles/CumulativeReviewForm.css";
+
+const CoordinatorReviewForm = () => {
+  const { groupIndex } = useParams();
+  const navigate = useNavigate();
+  const [reports, setReports] = useState([]);
+  const [comment, setComment] = useState("");
+  const [message, setMessage] = useState("");
+
+  useEffect(() => {
+    const fetchGroup = async () => {
+      try {
+        const res = await axios.get(
+          `${process.env.REACT_APP_API_URL}/api/reports/group/${groupIndex}`
+        );
+        if (res.data.success) {
+          setReports(res.data.group.reports);
+        }
+      } catch (err) {
+        console.error("Failed to load group reports", err);
+      }
+    };
+
+    fetchGroup();
+  }, [groupIndex]);
+
+  const handleSubmit = async () => {
+    try {
+      const promises = reports.map((r) =>
+        axios.put(
+          `${process.env.REACT_APP_API_URL}/api/reports/${r._id}/coordinator-comment`,
+          { coordinatorComments: comment }
+        )
+      );
+      await Promise.all(promises);
+      setMessage("Coordinator comment submitted successfully!");
+      setTimeout(() => navigate("/coordinator-dashboard"), 1500);
+    } catch (err) {
+      console.error("Failed to submit coordinator comments", err);
+      setMessage("Failed to submit comment.");
+    }
+  };
+
+  return (
+    <div className="cumulative-review-container">
+      <h2>Coordinator Review - Group {parseInt(groupIndex) + 1}</h2>
+
+      {reports.map((r, idx) => (
+        <div key={r._id} className="review-report-card">
+          <h4>Week {r.week}</h4>
+          <p><strong>Hours:</strong> {r.hours}</p>
+          <p><strong>Tasks:</strong> {r.tasks}</p>
+          <p><strong>Lessons:</strong> {r.lessons}</p>
+          <p><strong>Supervisor Comments:</strong> {r.supervisorComments}</p>
+        </div>
+      ))}
+
+      <textarea
+        value={comment}
+        onChange={(e) => setComment(e.target.value)}
+        placeholder="Write your coordinator comments..."
+      ></textarea>
+
+      <button onClick={handleSubmit} className="submit-button">
+        Submit Coordinator Comment
+      </button>
+
+      {message && <p className="form-message">{message}</p>}
+    </div>
+  );
+};
+
+export default CoordinatorReviewForm;
diff --git a/client/src/pages/CumulativeReviewForm.js b/client/src/pages/CumulativeReviewForm.js
new file mode 100644
index 000000000..d621db4fc
--- /dev/null
+++ b/client/src/pages/CumulativeReviewForm.js
@@ -0,0 +1,134 @@
+import React, { useEffect, useState } from "react";
+import { useParams, useNavigate } from "react-router-dom";
+import axios from "axios";
+import Swal from "sweetalert2";
+import "../styles/CumulativeReviewForm.css";
+
+const CumulativeReviewForm = () => {
+  const { groupIndex } = useParams();
+  const navigate = useNavigate();
+
+  const [groupData, setGroupData] = useState(null);
+  const [loading, setLoading] = useState(true);
+  const [comment, setComment] = useState("");
+
+  useEffect(() => {
+    const fetchGroup = async () => {
+      try {
+        const res = await axios.get(
+          `${process.env.REACT_APP_API_URL}/api/reports/cumulative/group/${groupIndex}`
+        );
+        setGroupData(res.data.group);
+      } catch (err) {
+        console.error("Failed to fetch group:", err);
+        Swal.fire({
+          icon: "error",
+          title: "Failed to load report group.",
+        });
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchGroup();
+  }, [groupIndex]);
+
+  const handleSubmit = async () => {
+    if (!comment.trim()) {
+      return Swal.fire({
+        icon: "warning",
+        title: "Comment cannot be empty!",
+      });
+    }
+
+    try {
+      await axios.post(
+        `${process.env.REACT_APP_API_URL}/api/reports/supervisor-comments`,
+        {
+          groupIndex: groupData.groupIndex,
+          comments: comment,
+          weeks: groupData.weeks,
+        }
+      );
+
+      Swal.fire({
+        icon: "success",
+        title: "Comment Submitted Successfully!",
+        timer: 1500,
+        showConfirmButton: false,
+      });
+
+      navigate("/supervisor-dashboard");
+    } catch (err) {
+      console.error("Error submitting comment:", err);
+      Swal.fire({
+        icon: "error",
+        title: "Failed to submit comment.",
+      });
+    }
+  };
+
+  if (loading) return <p>Loading...</p>;
+  if (!groupData) return <p>No data found.</p>;
+
+  return (
+    <div className="cumulative-review-container">
+      <h2>Review Cumulative Weekly Reports</h2>
+
+      <table className="report-table">
+        <thead>
+          <tr>
+            <th>Week</th>
+            <th>Hours</th>
+            <th>Tasks</th>
+            <th>Lessons</th>
+          </tr>
+        </thead>
+        <tbody>
+  {groupData.reports.map((report, index) => (
+    <tr
+      key={index}
+      className="clickable-row"
+      onClick={() =>
+        navigate(
+          `/weekly-report/${groupIndex}/week-${report.week}/${groupData.studentName}`,
+          {
+            state: { reportData: report },
+          }
+        )
+      }
+    >
+      <td>{report.week}</td>
+      <td>{report.hours}</td>
+      <td>{report.tasks}</td>
+      <td>{report.lessons}</td>
+    </tr>
+  ))}
+</tbody>
+
+      </table>
+
+      <textarea
+        placeholder="Add supervisor comments here..."
+        rows={5}
+        value={comment}
+        onChange={(e) => setComment(e.target.value)}
+      />
+
+      <div className="actions">
+        <button
+          className="cancel-btn"
+          onClick={() => navigate("/supervisor-dashboard")}
+        >
+          Cancel
+        </button>
+
+        <button className="submit-btn" onClick={handleSubmit}>
+          Submit Comment
+        </button>
+      </div>
+    </div>
+  );
+};
+
+export default CumulativeReviewForm;
diff --git a/client/src/pages/Home.js b/client/src/pages/Home.js
index 1c08db672..ffe18418f 100644
--- a/client/src/pages/Home.js
+++ b/client/src/pages/Home.js
@@ -259,4 +259,4 @@ function Home() {
   );
 }
 
-export default Home;
+export default Home;
\ No newline at end of file
diff --git a/client/src/pages/SignUp.js b/client/src/pages/SignUp.js
index 3346fac17..424c2d0ef 100644
--- a/client/src/pages/SignUp.js
+++ b/client/src/pages/SignUp.js
@@ -11,7 +11,7 @@ import Swal from "sweetalert2";
 function SignUp() {
   const navigate = useNavigate();
   const [role, setRole] = useState("-");
-  
+
   const [step, setStep] = useState(1);
   const [fullName, setFullName] = useState("");
   const [ouEmail, setOuEmail] = useState("");
@@ -62,7 +62,7 @@ function SignUp() {
       return;
     }
 
-    if (role=== "student" && !/^\d{9}$/.test(soonerId)) {
+    if (role === "student" && !/^\d{9}$/.test(soonerId)) {
       Swal.fire({
         icon: "error",
         title: "Invalid Sooner ID",
@@ -77,7 +77,7 @@ function SignUp() {
         {
           fullName,
           ouEmail,
-          soonerId : role === "student" ? soonerId : "",
+          soonerId: role === "student" ? soonerId : "",
           password,
           semester,
           academicAdvisor: role === "student" ? academicAdvisor : "",
@@ -118,15 +118,17 @@ function SignUp() {
           title: "Email Already Exists",
           text: "The provided email ID is already registered. Try logging in.",
         });
-      } 
-      else if(role=== "student" && error.response && error.response.status === 402){
+      } else if (
+        role === "student" &&
+        error.response &&
+        error.response.status === 402
+      ) {
         Swal.fire({
           icon: "error",
           title: "Sooner ID Already Exists",
           text: "The provided Sooner ID is already registered.",
         });
-      }
-      else {
+      } else {
         console.log("Error response:", error.response);
         Swal.fire({
           icon: "error",
@@ -139,7 +141,6 @@ function SignUp() {
 
   return (
     <div className="signup-container">
-      
       <form onSubmit={createUser} className="signup-form">
         {step === 1 && (
           <div className="role-selection">
@@ -277,17 +278,19 @@ function SignUp() {
               />
             </div>
 
-            {role === "student" && <div className="form-group">
-              <label htmlFor="soonerId">Sooner ID</label>
-              <input
-                type="text"
-                id="soonerId"
-                value={soonerId}
-                onChange={(e) => setSoonerId(e.target.value)}
-                placeholder="Enter your 9-digit Sooner ID"
-                required
-              />
-            </div>}
+            {role === "student" && (
+              <div className="form-group">
+                <label htmlFor="soonerId">Sooner ID</label>
+                <input
+                  type="text"
+                  id="soonerId"
+                  value={soonerId}
+                  onChange={(e) => setSoonerId(e.target.value)}
+                  placeholder="Enter your 9-digit Sooner ID"
+                  required
+                />
+              </div>
+            )}
 
             <div className="password-row">
               <div className="form-group password-col">
@@ -392,7 +395,7 @@ function SignUp() {
               >
                 <input
                   type="checkbox"
-                  style={{ appearance: "none" }}
+                  // style={{ appearance: "none" }}
                   checked={agreed}
                   onChange={(e) => setAgreed(e.target.checked)}
                   required
diff --git a/client/src/pages/SubmittedReports.js b/client/src/pages/SubmittedReports.js
new file mode 100644
index 000000000..fb69be6e7
--- /dev/null
+++ b/client/src/pages/SubmittedReports.js
@@ -0,0 +1,70 @@
+import React, { useEffect, useState } from "react";
+import axios from "axios";
+import { useNavigate } from "react-router-dom";
+import "../styles/SubmittedReports.css";
+
+const SubmittedReports = () => {
+  const [reports, setReports] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    const fetchReports = async () => {
+      try {
+        const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/reports/mine`);
+        if (res.data.success) {
+          setReports(res.data.reports);
+        }
+      } catch (err) {
+        console.error("Error fetching reports", err);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchReports();
+  }, []);
+
+  return (
+    <div className="submitted-reports-container">
+      <h2>Previous Weekly Reports</h2>
+
+      {loading ? (
+        <p>Loading...</p>
+      ) : reports.length === 0 ? (
+        <p>No reports found.</p>
+      ) : (
+        <table className="submitted-reports-table">
+          <thead>
+            <tr>
+              <th>Week</th>
+              <th>Hours</th>
+              <th>Tasks</th>
+              <th>Lessons</th>
+              <th>Supervisor Comments</th>
+            </tr>
+          </thead>
+          <tbody>
+            {reports.map((report) => (
+              <tr
+                key={report._id}
+                className="clickable-row"
+                onClick={() => navigate(`/submitted-reports/view/${report._id}`)}
+              >
+                <td>{report.week}</td>
+                <td>{report.hours}</td>
+                <td>{report.tasks}</td>
+                <td>{report.lessons}</td>
+                <td className="highlight-comment">
+                  {report.supervisorComments || "—"}
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      )}
+    </div>
+  );
+};
+
+export default SubmittedReports;
diff --git a/client/src/pages/SupervisorDashboard.js b/client/src/pages/SupervisorDashboard.js
index 1f3ba4b9c..74198b254 100644
--- a/client/src/pages/SupervisorDashboard.js
+++ b/client/src/pages/SupervisorDashboard.js
@@ -6,6 +6,7 @@ import ViewFormModal from "./ViewFormModal";
 
 const SupervisorDashboard = () => {
   const [requests, setRequests] = useState([]);
+  // const [cumulativeReports, setCumulativeReports] = useState([]);
   const [selectedForm, setSelectedForm] = useState(null);
   const [loading, setLoading] = useState(true);
   const [message, setMessage] = useState("");
@@ -19,7 +20,8 @@ const SupervisorDashboard = () => {
       
       const fetchRequests = async () => {
       try {
-          const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/supervisor/forms`,
+        const res = await axios.get(
+          `${process.env.REACT_APP_API_URL}/api/supervisor/forms`,
           {
             headers: {
               Authorization: `Bearer ${token}`,
@@ -28,8 +30,8 @@ const SupervisorDashboard = () => {
 
           const formatted = res.data.map(item => ({
             _id: item._id,
-            name: item.student_id?.userName || item.student_id?.name || "N/A",
-            student_id: item.student?._id || item._id,
+            interneeName: item.interneeName || item.student_id?.userName || "N/A",
+            interneeEmail: item.interneeEmail || item.student_id?.email || "N/A",
             form_type: item.form_type,
             createdAt: item.createdAt || item.submittedAt,
             supervisor_status: item.supervisor_status || "pending",
@@ -51,10 +53,8 @@ const SupervisorDashboard = () => {
             status: item.status || "pending",
             supervisor_comment: item.supervisor_comment || "N/A"
         }));
-        
 
         setRequests(formatted);
-        setLoading(false);
       } catch (err) {
         console.error("Error fetching A1 Internship forms:", err);
         setMessage("Error fetching A1 Internship forms.", err);
@@ -63,7 +63,6 @@ const SupervisorDashboard = () => {
     };
     fetchRequests();
   }, [token]);
-
   // const handleFormActionComplete = () => {
   //   fetchRequests(); // Refresh table after Approve/Reject
   //   setSelectedForm(null);
@@ -85,15 +84,14 @@ const SupervisorDashboard = () => {
       );
 
       setMessage(res.data.message || `${action} successful`);
-      setRequests(prev => prev.filter(req => req._id !== id)); // remove from table
+      setRequests((prev) => prev.filter((req) => req._id !== id));
       return true;
     } catch (err) {
-      console.error(`Failed to ${action} request:`, err);
+      console.error(err);
       setMessage(`Failed to ${action} request.`);
       return false;
     }
   };
-  
 
   const openFormView = (form) => setSelectedForm(form);
   const closeFormView = () => setSelectedForm(null);
@@ -172,4 +170,4 @@ const SupervisorDashboard = () => {
     );
   };
 
-export default SupervisorDashboard;
\ No newline at end of file
+export default SupervisorDashboard;
diff --git a/client/src/pages/WeeklyFourWeekReportForm.js b/client/src/pages/WeeklyFourWeekReportForm.js
new file mode 100644
index 000000000..440cfbab5
--- /dev/null
+++ b/client/src/pages/WeeklyFourWeekReportForm.js
@@ -0,0 +1,151 @@
+
+import React, { useState } from "react";
+import axios from "axios";
+import "../styles/WeeklyFourWeekReportForm.css";
+
+const WeeklyFourWeekReportForm = () => {
+  const userRole = localStorage.getItem("role") || "student"; // Default role is student
+
+  const isStudent = userRole === "student";
+  const isSupervisor = userRole === "supervisor";
+  const isCoordinator = userRole === "coordinator";
+
+  const [formData, setFormData] = useState({
+    week: "Week 1",
+    tasks: "",
+    lessons: "",
+    challenges: "",
+    supervisorComments: "",
+    coordinatorComments: "",
+  });
+
+  const [message, setMessage] = useState("");
+
+  const handleChange = (e) => {
+    const { name, value } = e.target;
+    setFormData((prev) => ({ ...prev, [name]: value }));
+  };
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+
+    const payload = {
+      studentId: "123456",
+      ...formData,
+    };
+
+    console.log("Payload Sending:", payload);
+
+    try {
+      await axios.post(`${process.env.REACT_APP_API_URL}/api/fourWeekReports`, payload);
+      setMessage("✅ Report Submitted Successfully!");
+
+      setFormData({
+        week: "Week 1",
+        tasks: "",
+        lessons: "",
+        challenges: "",
+        supervisorComments: "",
+        coordinatorComments: "",
+      });
+    } catch (error) {
+      console.error(error);
+      setMessage("❌ Submission Failed! Please try again.");
+    }
+  };
+
+  return (
+    <div className="four-week-container">
+      <h2 className="four-week-title">4-Week Progress Report</h2>
+
+      <form onSubmit={handleSubmit}>
+
+        {/* Select Week */}
+        <label className="four-week-label">Select Week:</label>
+        <select
+          name="week"
+          className="four-week-select"
+          value={formData.week}
+          onChange={handleChange}
+          disabled={!isStudent}
+        >
+          {[4, 8, 12, 16].map((week) => (
+            <option key={week} value={`Week ${week}`}>
+              Week {week}
+            </option>
+          ))}
+        </select>
+
+        {/* Tasks */}
+        <label className="four-week-label">Tasks Performed:</label>
+        <textarea
+          name="tasks"
+          className="four-week-textarea"
+          placeholder="Mention tasks you worked on..."
+          value={formData.tasks}
+          onChange={handleChange}
+          required
+          disabled={!isStudent}
+        />
+
+        {/* Lessons */}
+        <label className="four-week-label">Lessons Learned:</label>
+        <textarea
+          name="lessons"
+          className="four-week-textarea"
+          placeholder="What new did you learn?"
+          value={formData.lessons}
+          onChange={handleChange}
+          required
+          disabled={!isStudent}
+        />
+
+        {/* Challenges */}
+        <label className="four-week-label">Challenges Faced:</label>
+        <textarea
+          name="challenges"
+          className="four-week-textarea"
+          placeholder="Mention challenges..."
+          value={formData.challenges}
+          onChange={handleChange}
+          required
+          disabled={!isStudent}
+        />
+
+        {/* Supervisor Comments */}
+        <label className="four-week-label">Supervisor Comments:</label>
+        <textarea
+          name="supervisorComments"
+          className="four-week-textarea"
+          placeholder={isSupervisor ? "Enter your comments here..." : "Only Supervisor can fill..."}
+          value={formData.supervisorComments}
+          onChange={handleChange}
+          disabled={!isSupervisor}
+        />
+        {!isSupervisor && (
+          <p style={{ fontSize: "13px", color: "grey" }}>*Only Supervisors are allowed to fill this section.</p>
+        )}
+
+        {/* Coordinator Comments */}
+        <label className="four-week-label">Coordinator Comments:</label>
+        <textarea
+          name="coordinatorComments"
+          className="four-week-textarea"
+          placeholder={isCoordinator ? "Enter your comments here..." : "Only Coordinator can fill..."}
+          value={formData.coordinatorComments}
+          onChange={handleChange}
+          disabled={!isCoordinator}
+        />
+        {!isCoordinator && (
+          <p style={{ fontSize: "13px", color: "grey" }}>*Only Coordinators are allowed to fill this section.</p>
+        )}
+
+        <button type="submit" className="four-week-button">Submit</button>
+
+        {message && <p className="form-message">{message}</p>}
+      </form>
+    </div>
+  );
+};
+
+export default WeeklyFourWeekReportForm;
\ No newline at end of file
diff --git a/client/src/pages/WeeklyProgressReportForm.css b/client/src/pages/WeeklyProgressReportForm.css
deleted file mode 100644
index b8b8989fa..000000000
--- a/client/src/pages/WeeklyProgressReportForm.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* WeeklyProgressReportForm.css */
-
-.a2-form-container {
-    max-width: 700px;
-    margin: auto;
-    padding: 2rem;
-    border: 1px solid #ccc;
-    background: #f9f9f9;
-    border-radius: 8px;
-  }
-  
-  .form-row {
-    display: flex;
-    gap: 1rem;
-    margin-bottom: 1rem;
-    justify-content: space-between;
-  }
-  
-  .form-row label {
-    flex: 1;
-  }
-  
-  .form-group {
-    margin-bottom: 1rem;
-  }
-  
-  textarea {
-    width: 100%;
-    height: 100px;
-  }
-  
-  .submit-button {
-    background: maroon;
-    color: white;
-    padding: 0.7rem 1.5rem;
-    border: none;
-    border-radius: 6px;
-    cursor: pointer;
-  }
-  
-  .form-message {
-    margin-top: 1rem;
-    color: green;
-  }
-  
\ No newline at end of file
diff --git a/client/src/pages/WeeklyProgressReportForm.js b/client/src/pages/WeeklyProgressReportForm.js
index 2e9b8c54e..b2bee0d99 100644
--- a/client/src/pages/WeeklyProgressReportForm.js
+++ b/client/src/pages/WeeklyProgressReportForm.js
@@ -1,132 +1,272 @@
-
-
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import axios from "axios";
-import "./WeeklyProgressReportForm.css"; // optional: for clean styling
+import { useNavigate, useParams } from "react-router-dom";
+import "../styles/WeeklyProgressReportForm.css";
+
+const WeeklyProgressReportForm = ({ role = "student", readOnly = false }) => {
+  const navigate = useNavigate();
+  const { reportId } = useParams();
 
-const WeeklyProgressReportForm = () => {
   const [formData, setFormData] = useState({
-    week: "Week 1",
+    name: "",
+    email: "",
+    supervisorName: "",
+    supervisorEmail: "",
+    coordinatorName: "Naveena",
+    coordinatorEmail: "naveena.suddapalli-1@ou.edu",
+    creditHours: "",
+    completedHours: 0,
+    requiredHours: 0,
+    week: "",
     hours: "",
     tasks: "",
     lessons: "",
     supervisorComments: "",
+    coordinatorComments: "",
   });
 
   const [message, setMessage] = useState("");
 
+  // Load report data in read-only mode
+  useEffect(() => {
+    if (readOnly && reportId) {
+      axios
+        .get(`${process.env.REACT_APP_API_URL}/api/reports/${reportId}`)
+        .then((res) => {
+          if (res.data.success) {
+            setFormData((prev) => ({
+              ...prev,
+              ...res.data.report,
+            }));
+          }
+        })
+        .catch((err) => {
+          console.error("Failed to load report", err);
+        });
+    }
+  }, [readOnly, reportId]);   
+
+  // Auto-fill A1 data
+  useEffect(() => {
+    const fetchA1Data = async () => {
+      try {
+        const email = "vikash@example.com"; // TODO: replace with real session email
+        const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/reports/a1/${email}`);
+
+        if (res.data.success) {
+          const {
+            name,
+            email: userEmail,
+            supervisorName,
+            supervisorEmail,
+            creditHours,
+            completedHours,
+            requiredHours,
+          } = res.data.form;
+
+          setFormData((prev) => ({
+            ...prev,
+            name,
+            email: userEmail,
+            supervisorName,
+            supervisorEmail,
+            creditHours,
+            completedHours,
+            requiredHours: requiredHours || (creditHours ? creditHours * 60 : 0),
+          }));
+        }
+      } catch (err) {
+        console.error("A1 form not found or failed to fetch.");
+        setMessage("⚠️ You must submit the A1 form before submitting weekly reports.");
+      }
+    };
+
+    if (!readOnly) fetchA1Data();
+  }, [readOnly]);
+
   const handleChange = (e) => {
     const { name, value } = e.target;
+
+    if (readOnly && !(role === "coordinator" && name === "coordinatorComments")) return;
+
+    if (name === "hours") {
+      const num = parseInt(value);
+      if (num > 40) return setFormData((prev) => ({ ...prev, hours: 40 }));
+      if (num < 1 && value !== "") return setFormData((prev) => ({ ...prev, hours: 1 }));
+    }
+
     setFormData((prev) => ({ ...prev, [name]: value }));
   };
 
   const handleSubmit = async (e) => {
     e.preventDefault();
-  
-    // Get the user ID from localStorage (ensure it exists)
-    // const user = JSON.parse(localStorage.getItem("user"));
-    // const studentId = user?.user?._id;
-  
-    // // Check if studentId exists in localStorage
-    // if (!studentId) {
-    //   setMessage("Student ID not found. Please log in again.");
-    //   return;
-    // }
-  
-    // Check that all required fields are filled
-    if (!formData.week || !formData.hours || !formData.tasks || !formData.lessons) {
-      setMessage("Please fill in all the fields.");
-      return;
+    const { week, hours, tasks, lessons, name, email, supervisorName, supervisorEmail } = formData;
+
+    if (!name || !email || !supervisorName || !supervisorEmail) {
+      return setMessage("Please complete the A1 form first.");
     }
-  
-    //const payload = { studentId, ...formData };
-    const payload = {  ...formData };
-  
+
+    if (!week || !hours || !tasks || !lessons) {
+      return setMessage("Please fill in all the required fields.");
+    }
+
     try {
-      // Sending the form data to the backend
-      const res = await axios.post(`${process.env.REACT_APP_API_URL}/api/reports`, payload);
-  
-      // Display success message
-      setMessage(res.data.message || "Report submitted!");
+      const res = await axios.post(`${process.env.REACT_APP_API_URL}/api/reports`, formData);
+      setMessage(res.data.message || "Report submitted successfully!");
       setFormData({
-        week: "Week 1",
+        name: "",
+        email: "",
+        supervisorName: "",
+        supervisorEmail: "",
+        coordinatorName: "Naveena",
+        coordinatorEmail: "naveena.suddapalli-1@ou.edu",
+        creditHours: "",
+        completedHours: 0,
+        requiredHours: 0,
+        week: "",
         hours: "",
         tasks: "",
         lessons: "",
         supervisorComments: "",
+        coordinatorComments: "",
       });
     } catch (err) {
       console.error(err);
-      setMessage("Submission failed. Try again.");
+      setMessage("Submission failed. Please try again.");
+    }
+  };
+
+  const handleCoordinatorSubmit = async () => {
+    try {
+      const res = await axios.put(
+        `${process.env.REACT_APP_API_URL}/api/reports/${reportId}/coordinator-comment`,
+        { coordinatorComments: formData.coordinatorComments }
+      );
+      setMessage(res.data.message || "Coordinator comment submitted!");
+    } catch (err) {
+      console.error(err);
+      setMessage("Failed to submit coordinator comment.");
     }
   };
-  
 
   return (
     <div className="a2-form-container">
-      <h2>A.2 - Weekly Progress Report</h2>
+      <h2>Weekly Progress Report</h2>
+
+      <button className="view-submissions-btn" onClick={() => navigate("/submitted-reports")}>
+        View Previous Submissions
+      </button>
+
       <form onSubmit={handleSubmit} className="a2-form">
-        <div className="form-row">
-          <label>
-            Logbook Week:
-            <select name="week" value={formData.week} onChange={handleChange}>
+        {/* Identity Fields */}
+        {["name", "email", "supervisorName", "supervisorEmail", "coordinatorName", "coordinatorEmail"].map((field) => (
+          <div className="form-group" key={field}>
+            <label>{field.replace(/([A-Z])/g, " $1").replace("Email", "Email*").replace("Name", "Name*")}</label>
+            <input type={field.includes("Email") ? "email" : "text"} name={field} value={formData[field]} readOnly required />
+          </div>
+        ))}
+
+        {/* Progress Display */}
+        {!readOnly && (
+          <div className="form-group progress-info">
+            <p><strong>Credit Hours:</strong> {formData.creditHours || "--"}</p>
+            <p><strong>Required Hours:</strong> {formData.requiredHours || "--"}</p>
+            <p><strong>Completed Hours:</strong> {formData.completedHours || "--"}</p>
+            {formData.requiredHours && (
+              <>
+                <p>
+                  <strong>Progress:</strong>{" "}
+                  {Math.min(100, Math.round((formData.completedHours / formData.requiredHours) * 100))}%
+                </p>
+                <div className="progress-bar-outer">
+                  <div
+                    className="progress-bar-inner"
+                    style={{ width: `${Math.min(100, Math.round((formData.completedHours / formData.requiredHours) * 100))}%` }}
+                  ></div>
+                </div>
+              </>
+            )}
+          </div>
+        )}
+
+        <hr className="section-divider" />
+
+        {/* Week & Hours */}
+        <div className="week-hours-row">
+          <div className="form-group">
+            <label>Week</label>
+            <select name="week" value={formData.week} onChange={handleChange} disabled={readOnly} required>
+              <option value="">-- Select Week --</option>
               {Array.from({ length: 15 }, (_, i) => (
-                <option key={i} value={`Week ${i + 1}`}>
-                  Week {i + 1}
-                </option>
+                <option key={i} value={`Week ${i + 1}`}>Week {i + 1}</option>
               ))}
             </select>
-          </label>
-          <label>
-            Number of Hours:
+          </div>
+
+          <div className="form-group floating-label-group">
             <input
               type="number"
               name="hours"
               value={formData.hours}
               onChange={handleChange}
+              placeholder=" "
               required
-              placeholder="e.g., 12"
+              min="1"
+              max="40"
+              readOnly={readOnly}
             />
-          </label>
+            <label>Hours Worked</label>
+          </div>
         </div>
 
-        <div className="form-group">
-          <label>Tasks Performed:</label>
-          <textarea
-            name="tasks"
-            value={formData.tasks}
-            onChange={handleChange}
-            required
-          />
-        </div>
+        {/* Tasks & Lessons */}
+        {["tasks", "lessons"].map((field) => (
+          <div className="form-group floating-label-group" key={field}>
+            <textarea
+              name={field}
+              value={formData[field]}
+              onChange={handleChange}
+              placeholder=" "
+              required
+              readOnly={readOnly}
+            />
+            <label>{field === "tasks" ? "Tasks Performed" : "Lessons Learned"}</label>
+            <div className="textarea-count">{formData[field].length}/300</div>
+          </div>
+        ))}
 
-        <div className="form-group">
-          <label>Lessons Learned:</label>
-          <textarea
-            name="lessons"
-            value={formData.lessons}
-            onChange={handleChange}
-            required
-          />
-        </div>
+        {/* Comments */}
+        {["supervisorComments", "coordinatorComments"].map((field) => (
+          <div className="form-group floating-label-group" key={field}>
+            <textarea
+              name={field}
+              value={formData[field]}
+              onChange={handleChange}
+              placeholder=" "
+              readOnly={field === "supervisorComments" || !(readOnly && role === "coordinator")}
+            />
+            <label>{field === "supervisorComments" ? "Supervisor Comments" : "Coordinator Comments"}</label>
+            <div className="textarea-count">{formData[field].length}/300</div>
+          </div>
+        ))}
 
-        <div className="form-group">
-          <label>Internship Supervisor Approval & Comments:</label>
-          <textarea
-            name="supervisorComments"
-            value={formData.supervisorComments}
-            onChange={handleChange}
-            placeholder="(Optional) If supervisor is filling directly"
-          />
-        </div>
+        {/* Buttons */}
+        {readOnly && role === "coordinator" && (
+          <button className="submit-button" type="button" onClick={handleCoordinatorSubmit}>
+            Submit Coordinator Comment
+          </button>
+        )}
 
-        <button type="submit" className="submit-button">
-          Submit Report
-        </button>
+        {!readOnly && (
+          <button type="submit" className="submit-button">
+            Submit Report
+          </button>
+        )}
       </form>
-      {message && <p className="form-message">{message}</p>}
+
+      {message && <p className={`form-message ${message.includes("⚠️") ? "error" : ""}`}>{message}</p>}
     </div>
   );
 };
 
-export default WeeklyProgressReportForm;
+export default WeeklyProgressReportForm;
\ No newline at end of file
diff --git a/client/src/router.js b/client/src/router.js
index 51ce1e444..c30181e08 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -19,10 +19,15 @@ import CoordinatorRequestDetailView from "./pages/CoordinatorRequestDetailView";
 import TokenRenewal from "./pages/TokenRenewal";
 import StudentDashboard from "./pages/StudentDashboard";
 import ProtectedRouteStudent from "./pages/ProtectedRouteStudent";
+import WeeklyFourWeekReportForm from "./pages/WeeklyFourWeekReportForm";
+import SubmittedReports from "./pages/SubmittedReports";
+import CumulativeReviewForm from "./pages/CumulativeReviewForm";
+import CoordinatorReviewForm from "./pages/CoordinatorReviewForm";
+import CoordinatorCumulativeReviewForm from "./pages/CoordinatorCumulativeReviewForm";
 import ProtectedSupervisor from "./pages/ProtectedSupervisor";
 
 // Create and export the router configuration
-const router = createBrowserRouter([  
+const router = createBrowserRouter([
   {
     path: "/",
     element: <Layout />,
@@ -35,20 +40,19 @@ const router = createBrowserRouter([
       {
         path: "signup",
         element: <SignUp />,
-      },  
+      },
       {
         path: "weekly-report",
         element: <WeeklyProgressReportForm />,
       },
       {
-        path: "/student-dashboard",
+        path: "student-dashboard",
         element: (
           <ProtectedRouteStudent>
             <StudentDashboard />
           </ProtectedRouteStudent>
-        )
+        ),
       },
-      
       {
         path: "a1-form",
         element: <A1InternshipRequestForm />,
@@ -85,8 +89,36 @@ const router = createBrowserRouter([
         path: "renew-token/:token",
         element: <TokenRenewal />,
       },
+      {
+        path: "four-week-report",
+        element: <WeeklyFourWeekReportForm />,
+      },
+      {
+        path: "submitted-reports",
+        element: <SubmittedReports />,
+      },
+      {
+        path: "submitted-reports/view/:reportId",
+        element: <WeeklyProgressReportForm readOnly={true} />,
+      },
+      {
+        path: "review-cumulative/:groupIndex",
+        element: <CumulativeReviewForm />,
+      },
+      {
+        path: "coordinator-review/:groupIndex",
+        element: <CoordinatorReviewForm />,
+      },
+      {
+        path: "review-cumulative/:groupIndex/coordinator",
+        element: <CoordinatorCumulativeReviewForm />,
+      },
+      {
+        path: "weekly-report/:groupIndex/week-:weekNumber/:studentName",
+        element: <Home />,
+      },
     ],
   },
 ]);
 
-export default router;
+export default router;
\ No newline at end of file
diff --git a/client/src/styles/CoordinatorCumulativeReviewForm.css b/client/src/styles/CoordinatorCumulativeReviewForm.css
new file mode 100644
index 000000000..10f0e47e8
--- /dev/null
+++ b/client/src/styles/CoordinatorCumulativeReviewForm.css
@@ -0,0 +1,63 @@
+/* CoordinatorCumulativeReviewForm.css */
+
+.coordinator-review-container {
+    max-width: 900px;
+    margin: auto;
+    padding: 2rem;
+    background: #fff;
+    border-radius: 10px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  }
+  
+  .coordinator-review-container h2 {
+    text-align: center;
+    margin-bottom: 2rem;
+  }
+  
+  .coordinator-review-table {
+    width: 100%;
+    border-collapse: collapse;
+    margin-bottom: 2rem;
+  }
+  
+  .coordinator-review-table th,
+  .coordinator-review-table td {
+    padding: 12px;
+    border: 1px solid #ddd;
+    text-align: center;
+  }
+  
+  textarea.coordinator-comment-box {
+    width: 100%;
+    min-height: 100px;
+    padding: 10px;
+    font-size: 1rem;
+    border: 2px solid #aa1e2e;
+    border-radius: 4px;
+    resize: vertical;
+    margin-bottom: 1rem;
+  }
+  
+  .button-group {
+    display: flex;
+    justify-content: center;
+    gap: 1rem;
+  }
+  
+  .button-group button {
+    padding: 10px 20px;
+    border: none;
+    border-radius: 6px;
+    font-weight: bold;
+    cursor: pointer;
+  }
+  
+  .button-group .cancel-btn {
+    background: #e0e0e0;
+  }
+  
+  .button-group .submit-btn {
+    background: #aa1e2e;
+    color: white;
+  }
+  
\ No newline at end of file
diff --git a/client/src/styles/CumulativeReviewForm.css b/client/src/styles/CumulativeReviewForm.css
new file mode 100644
index 000000000..a1a4e2148
--- /dev/null
+++ b/client/src/styles/CumulativeReviewForm.css
@@ -0,0 +1,184 @@
+.cumulative-review-container {
+    padding: 30px 20px;
+    max-width: 900px;
+    margin: auto;
+    background-color: #fff;
+    border-radius: 12px;
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.06);
+    animation: fadeSlideIn 0.6s ease;
+  }
+  
+  @keyframes fadeSlideIn {
+    from {
+      opacity: 0;
+      transform: translateY(20px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+  
+  .cumulative-review-container h2 {
+    color: #263238;
+    margin-bottom: 25px;
+    text-align: center;
+    font-weight: 700;
+    font-size: 1.8rem;
+  }
+  
+  .report-table {
+    width: 100%;
+    border-collapse: collapse;
+    margin-bottom: 25px;
+  }
+  
+  .report-table th,
+  .report-table td {
+    padding: 14px 18px;
+    border-bottom: 1px solid #ddd;
+    text-align: center;
+    transition: all 0.3s ease;
+  }
+  
+  .report-table th {
+    background-color: #9b111e;
+    color: white;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    font-size: 14px;
+    border-left: 2px solid #fff;
+  }
+  
+  .report-table tr:hover {
+    background-color: #fef2f2;
+    box-shadow: 0 0 15px rgba(155, 17, 30, 0.2);
+    transform: translateY(-2px);
+  }
+  
+  textarea {
+    width: 100%;
+    padding: 15px;
+    border-radius: 8px;
+    border: 1px solid #ddd;
+    margin-bottom: 25px;
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.05);
+    font-size: 14px;
+    transition: all 0.3s ease;
+    resize: vertical;
+  }
+  
+  textarea:hover {
+    border-color: #9b111e;
+    box-shadow: 0 0 10px rgba(155, 17, 30, 0.15);
+    transform: scale(1.01);
+  }
+  
+  textarea:focus {
+    border-color: #9b111e;
+    outline: none;
+    box-shadow: 0 0 12px rgba(155, 17, 30, 0.3);
+    transform: scale(1.015);
+  }
+  
+  .actions {
+    display: flex;
+    gap: 20px;
+    justify-content: center;
+    flex-wrap: wrap;
+    margin-top: 10px;
+  }
+  
+  .actions button {
+    padding: 12px 24px;
+    border: none;
+    border-radius: 8px;
+    cursor: pointer;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    min-width: 140px;
+    letter-spacing: 0.5px;
+    font-size: 14px;
+  }
+  
+  /* Cancel Button */
+  .actions button.cancel-btn {
+    background-color: #e0e0e0;
+    color: #333;
+  }
+  
+  .actions button.cancel-btn:hover {
+    background-color: #bdbdbd;
+    transform: scale(1.05);
+    box-shadow: 0 0 8px rgba(0,0,0,0.2);
+  }
+  
+  /* Submit Button */
+  .actions button.submit-btn {
+    background-color: #9b111e;
+    color: white;
+  }
+  
+  .actions button.submit-btn:hover {
+    background-color: #b71c1c;
+    transform: scale(1.1);
+    box-shadow: 0 0 14px rgba(155, 17, 30, 0.4);
+  }
+  
+  .clickable-row {
+    cursor: pointer;
+    transition: all 0.3s ease;
+  }
+  
+  .clickable-row:hover {
+    background-color: #fff0f0;
+    box-shadow: 0 0 10px rgba(155, 17, 30, 0.2);
+    transform: scale(1.01);
+  }
+  
+  @media (max-width: 600px) {
+    .cumulative-review-container {
+      padding: 20px 15px;
+    }
+  
+    .actions button {
+      width: 100%;
+    }
+  }
+  .comment-box {
+    width: 100%;
+    height: 100px;
+    margin-top: 1rem;
+    padding: 10px;
+    border: 1px solid #900c3f;
+    border-radius: 8px;
+    resize: vertical;
+  }
+  
+  .button-group {
+    margin-top: 1rem;
+    display: flex;
+    justify-content: center;
+    gap: 1rem;
+  }
+  
+  .cancel-button,
+  .submit-button {
+    padding: 10px 20px;
+    font-weight: bold;
+    border-radius: 6px;
+    cursor: pointer;
+  }
+  
+  .cancel-button {
+    background: #ccc;
+    color: black;
+    border: none;
+  }
+  
+  .submit-button {
+    background: #900c3f;
+    color: white;
+    border: none;
+  }
+  
\ No newline at end of file
diff --git a/client/src/styles/SubmittedReports.css b/client/src/styles/SubmittedReports.css
new file mode 100644
index 000000000..036b18921
--- /dev/null
+++ b/client/src/styles/SubmittedReports.css
@@ -0,0 +1,110 @@
+.submitted-reports-container {
+    max-width: 1000px;
+    margin: 3rem auto;
+    padding: 2rem;
+    background: #fff;
+    border-radius: 16px;
+    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.08);
+    animation: fadeSlideIn 0.8s ease;
+  }
+  
+  @keyframes fadeSlideIn {
+    0% {
+      opacity: 0;
+      transform: translateY(20px);
+    }
+    100% {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+  
+  .submitted-reports-container h2 {
+    text-align: center;
+    font-size: 2rem;
+    font-weight: 700;
+    color: #263238;
+    margin-bottom: 2rem;
+    position: relative;
+  }
+  
+  .submitted-reports-table-wrapper {
+    overflow-x: auto;
+  }
+  
+  .submitted-reports-table {
+    width: 100%;
+    border-collapse: collapse;
+    border-radius: 12px;
+    overflow: hidden;
+    box-shadow: 0 0 10px rgba(155, 17, 30, 0.15);
+  }
+  
+  .submitted-reports-table th {
+    background-color: #9b111e;
+    color: #fff;
+    font-weight: 600;
+    text-transform: uppercase;
+    padding: 14px 20px;
+    font-size: 13px;
+    letter-spacing: 0.5px;
+  }
+  
+  .submitted-reports-table td {
+    text-align: center;
+    padding: 14px 16px;
+    font-size: 14px;
+    transition: all 0.3s ease;
+  }
+  
+  .submitted-reports-table tr {
+    transition: all 0.3s ease;
+  }
+  
+  .submitted-reports-table tr:hover {
+    background-color: #fff3f3;
+    box-shadow: 0 2px 10px rgba(155, 17, 30, 0.2);
+    transform: scale(1.01);
+    cursor: pointer;
+  }
+  
+  .submitted-reports-table td:last-child {
+    font-weight: 600;
+    color: #2e7d32;
+  }
+  
+  /* Glowing border on container hover */
+  .submitted-reports-container:hover {
+    box-shadow: 0 0 20px rgba(155, 17, 30, 0.2);
+  }
+  
+  /* Optional scroll fade (if many rows) */
+  .submitted-reports-table-wrapper::-webkit-scrollbar {
+    height: 8px;
+  }
+  .submitted-reports-table-wrapper::-webkit-scrollbar-thumb {
+    background-color: rgba(155, 17, 30, 0.5);
+    border-radius: 10px;
+  }
+  .submitted-reports-table td:last-child {
+    animation: glowUp 2s ease-in-out infinite alternate;
+  }
+  
+  @keyframes glowUp {
+    from {
+      text-shadow: 0 0 5px rgba(155, 17, 30, 0.3);
+    }
+    to {
+      text-shadow: 0 0 12px rgba(155, 17, 30, 0.6);
+    }
+  }
+  .clickable-row {
+    cursor: pointer;
+    transition: all 0.3s ease;
+  }
+  .clickable-row:hover {
+    background-color: #fff0f0;
+    transform: scale(1.01);
+    box-shadow: 0 0 10px rgba(155, 17, 30, 0.15);
+  }
+      
\ No newline at end of file
diff --git a/client/src/styles/SupervisorDashboard.css b/client/src/styles/SupervisorDashboard.css
index e8993f727..3683360af 100644
--- a/client/src/styles/SupervisorDashboard.css
+++ b/client/src/styles/SupervisorDashboard.css
@@ -1,205 +1,229 @@
 .dashboard-container {
-    padding: 20px;
-    background-color: #f9f9f9;
-    border-radius: 8px;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-  }
-  
-  .dashboard-container h2 {
-    font-size: 20px;
-    margin-bottom: 20px;
-    color: #333;
-  }
-
-  .toggle-button {
-    position: absolute;
-    right: 50px;
-    top: 100px;
-    transform: translateY(-50%);
-    width: 0;
-    height: 0;
-    border-left: 6px solid transparent;
-    border-right: 6px solid transparent;
-    border-top: 6px solid #cddbea8a;
-    cursor: pointer;
-    transition: transform 0.2s;
-  }
-  
-  .toggle-button.collapsed {
-    transform: translateY(-50%) rotate(180deg);
-  }
-  
-  .forms-list {
-    margin-top: 10px;
-    overflow: hidden;
-    transition: max-height 0.3s ease;
-  }
-  
-  .form-item {
-    border-bottom: 1px solid #eee;
-    padding: 5px 0;
-  }
-  
-  .clickable-row {
-    cursor: pointer;
-  }
-  
-  .clickable-row:hover {
-    background-color: #f5f5f5;
-  }
-  
-  .dashboard-table {
-    width: 100%;
-    border-collapse: collapse;
-    margin-top: 20px;
-    transition: max-height 0.3s ease;
-  }
-
-  .dashboard-table.collapsed{
-    max-height: 0;
-    overflow: hidden;
-  }
-  
-  .dashboard-table th,
-  .dashboard-table td {
-    padding: 12px 16px;
-    text-align: left;
-    border-bottom: 1px solid #ddd;
-  }
-  
-  .dashboard-table th {
-    background-color: #861f1f;
-    color: white;
-    font-weight: bold;
-  }
-  
-  .link-button {
-    background: none;
-    border: none;
-    color: #333;
-    cursor: pointer;
-    font-size: 15px;
-    padding: 0;
-    text-align: left;
-  }
-  
-  .link-button:hover {
-    background: none !important; /* Prevents red background */
-    color: #007bff; /* Optional: subtle hover color, or use 'inherit' */
-    text-decoration: underline;
-  }
-  
-  
-  /* Action buttons */
-  .action-buttons {
-    display: flex;
-    gap: 10px;
-  }
-  
-  .approve {
-    background-color: #28a745;
-    color: white;
-    padding: 6px 12px;
-    border: none;
-    border-radius: 5px;
-    font-weight: 600;
-    cursor: pointer;
-  }
-  
-  .reject {
-    background-color: #dc3545;
-    color: white;
-    padding: 6px 12px;
-    border: none;
-    border-radius: 5px;
-    font-weight: 600;
-    cursor: pointer;
-  }
-  
-  .approve:hover {
-    background-color: #218838;
-  }
-  
-  .reject:hover {
-    background-color: #c82333;
-  }
-  
-  .status-badge {
-    padding: 4px 8px;
-    border-radius: 4px;
-    font-size: 12px;
-    font-weight: bold;
-    text-transform: capitalize;
-    display: inline-block;
-  }
-  
-  .status-badge.pending {
-    background-color: #fff3cd;
-    color: #856404;
-  }
-  
-  .status-badge.approved {
-    background-color: #d4edda;
-    color: #155724;
-  }
-  
-  .status-badge.rejected {
-    background-color: #f8d7da;
-    color: #721c24;
-  }
-  
-  /* Empty state */
-  .empty-message-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 20vh;
-  }
-  
-  .empty-message {
-    font-size: 28px;
-    color: #000000;
-    text-align: center;
-    margin: 20px 0;
-    font-weight: bold;
-  }
-  
-  /* Modal override styles (if needed) */
-  .modal-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100vh;
-    width: 100vw;
-    background-color: rgba(0, 0, 0, 0.5);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    z-index: 999;
-  }
-  
-  .modal-box {
-    background-color: #fff;
-    padding: 20px;
-    border-radius: 10px;
-    width: 600px;
-    max-width: 95%;
-    max-height: 85vh;
-    overflow-y: auto;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  }
-  
-  .modal-box h3 {
-    margin-top: 0;
-    color: hsl(0, 0%, 20%);
-  }
-  
-  .form-details {
-    background: #f4f4f4;
-    padding: 15px;
-    border-radius: 5px;
-    font-family: monospace;
-    white-space: pre-wrap;
-    margin-bottom: 15px;
-  }
-  
\ No newline at end of file
+  padding: 40px 20px;
+  max-width: 1200px;
+  margin: auto;
+  background-color: #f9f9f9;
+  border-radius: 12px;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.06);
+  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+}
+
+.dashboard-container h2 {
+  color: #263238;
+  margin-bottom: 30px;
+}
+
+.section-heading {
+  font-size: 22px;
+  font-weight: 700;
+  color: #222;
+  margin-top: 40px;
+  margin-bottom: 25px;
+}
+
+.status-msg {
+  margin-bottom: 20px;
+  padding: 12px 18px;
+  background: #e8f5e9;
+  border-left: 5px solid #4caf50;
+  color: #2e7d32;
+  font-weight: 500;
+}
+
+.dashboard-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 40px;
+}
+
+.dashboard-table th,
+.dashboard-table td {
+  padding: 14px 18px;
+  border-bottom: 1px solid #ddd;
+}
+
+.dashboard-table th {
+  background-color: #263238;
+  color: #fff;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  font-size: 13px;
+}
+
+.link-button {
+  background: none;
+  border: none;
+  color: #1565c0;
+  cursor: pointer;
+  font-weight: 500;
+}
+
+.link-button:hover {
+  text-decoration: underline;
+}
+
+.status-badge {
+  padding: 6px 10px;
+  border-radius: 16px;
+  font-size: 12px;
+  font-weight: 600;
+  text-transform: capitalize;
+}
+
+.status-badge.pending {
+  background: #fff3cd;
+  color: #856404;
+}
+
+.status-badge.approved {
+  background: #d4edda;
+  color: #155724;
+}
+
+.status-badge.rejected {
+  background: #f8d7da;
+  color: #721c24;
+}
+
+.cumulative-report-card {
+  background: #fff;
+  border-radius: 12px;
+  padding: 25px;
+  margin: 25px 0;
+  box-shadow: 0 0 15px rgba(0, 123, 255, 0.1);
+  border-left: 5px solid #007bff;
+  transition: 0.3s ease all;
+}
+
+.cumulative-report-card:hover {
+  transform: translateY(-3px);
+  box-shadow: 0 0 25px rgba(0, 123, 255, 0.3);
+}
+
+.weeks-covered {
+  font-size: 16px;
+  color: #222;
+  font-weight: 600;
+  margin-bottom: 15px;
+}
+
+.week-report-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  gap: 12px;
+  margin-bottom: 20px;
+  padding: 0;
+  list-style: none;
+}
+
+.week-report-item {
+  background: #f1f8ff;
+  border: 1px solid #dfefff;
+  padding: 12px 16px;
+  border-radius: 8px;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  box-shadow: 0 0 5px rgba(0, 123, 255, 0.08);
+  transition: box-shadow 0.2s ease, transform 0.2s ease;
+}
+
+.week-report-item:hover {
+  box-shadow: 0 0 15px rgba(0, 123, 255, 0.25);
+  transform: translateY(-2px);
+  background: #e3f2fd;
+}
+
+.week-report-item span {
+  font-size: 14px;
+  color: #555;
+}
+
+.week-report-item strong {
+  font-size: 15px;
+  color: #212121;
+}
+
+/* Change the color of the "Review & Comment" button to match the top bar red */
+.review-button.red-btn {
+  background: #9b111e; /* Red color */
+  color: white;
+  padding: 10px 20px;
+  border: none;
+  border-radius: 6px;
+  cursor: pointer;
+  font-weight: 600;
+  transition: 0.3s ease all;
+}
+
+/* Shine effect when hovering over the "Review & Comment" button */
+.review-button.red-btn:hover {
+  background: #b71c1c; /* Darker red for hover effect */
+  box-shadow: 0 0 10px rgba(211, 47, 47, 0.6); /* Glow effect */
+  transform: scale(1.05); /* Slightly enlarge the button */
+}
+
+/* Change the side color (weeks section) to the same red as the button */
+.cumulative-report-card {
+  background: #fff;
+  border-radius: 12px;
+  padding: 25px;
+  margin: 25px 0;
+  box-shadow: 0 0 15px rgba(0, 123, 255, 0.1);
+  border-left: 5px solid #9b111e; /* Red color for border */
+  transition: 0.3s ease all;
+}
+
+/* Shine effect when hovering over the week blocks */
+.cumulative-report-card:hover {
+  transform: translateY(-3px);
+  box-shadow: 0 0 25px rgba(155, 17, 30, 0.3); /* Glow effect */
+}
+
+/* Update the hover effect for the week report items (individual weeks) */
+.week-report-item {
+  background: #f1f8ff;
+  border: 1px solid #dfefff;
+  padding: 12px 16px;
+  border-radius: 8px;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  box-shadow: 0 0 5px rgba(155, 17, 30, 0.08); /* Red shadow */
+  transition: box-shadow 0.2s ease, transform 0.2s ease;
+}
+
+/* Shine and glow effect when hovering over individual weeks */
+.week-report-item:hover {
+  box-shadow: 0 0 15px rgba(155, 17, 30, 0.25); /* Glow effect */
+  transform: translateY(-2px); /* Lift the item slightly */
+  background: #e3f2fd;
+}
+
+.week-report-item span {
+  font-size: 14px;
+  color: #555;
+}
+
+.week-report-item strong {
+  font-size: 15px;
+  color: #212121;
+}
+.tab-toggle button {
+  margin-right: 10px;
+  padding: 8px 16px;
+  border: none;
+  background: #ddd;
+  cursor: pointer;
+}
+.tab-toggle .active {
+  background: #007bff;
+  color: white;
+  font-weight: bold;
+}
+.report-group-card {
+  border: 1px solid #ccc;
+  padding: 16px;
+  margin: 20px 0;
+  border-radius: 12px;
+}
\ No newline at end of file
diff --git a/client/src/styles/WeeklyFourWeekReportForm.css b/client/src/styles/WeeklyFourWeekReportForm.css
new file mode 100644
index 000000000..2d4e8cd1c
--- /dev/null
+++ b/client/src/styles/WeeklyFourWeekReportForm.css
@@ -0,0 +1,147 @@
+
+.four-week-container {
+    max-width: 650px;
+    margin: 50px auto;
+    padding: 40px;
+    background-color: #f9f9f9;
+    border-radius: 15px;
+    box-shadow: 0 8px 30px rgba(0, 0, 0, 0.1);
+    transition: 0.3s;
+  }
+  
+  .four-week-container:hover {
+    transform: scale(1.01);
+  }
+  
+  .four-week-title {
+    text-align: center;
+    margin-bottom: 30px;
+    color: #1c1c1c;
+    font-size: 32px;
+    font-weight: bold;
+    letter-spacing: 1px;
+  }
+  
+  .four-week-label {
+    font-weight: 600;
+    margin-top: 20px;
+    display: block;
+    color: #333;
+    font-size: 14px;
+    transition: 0.3s;
+  }
+  
+  .four-week-input,
+  .four-week-textarea,
+  .four-week-select {
+    width: 100%;
+    padding: 12px;
+    margin-top: 8px;
+    margin-bottom: 20px;
+    border-radius: 8px;
+    border: 1px solid #ccc;
+    background-color: #fff;
+    transition: 0.3s;
+    font-size: 15px;
+  }
+  
+  .four-week-input:hover,
+  .four-week-textarea:hover,
+  .four-week-select:hover {
+    background-color: #f3f3f3;
+    border-color: #a00027;
+  }
+  
+  .four-week-input:focus,
+  .four-week-textarea:focus,
+  .four-week-select:focus {
+    border-color: #a00027;
+    box-shadow: 0 0 8px rgba(160, 0, 39, 0.3);
+    outline: none;
+  }
+  
+  .four-week-textarea {
+    min-height: 100px;
+  }
+  
+  .four-week-button {
+    width: 100%;
+    padding: 14px;
+    background-color: #a00027;
+    color: #fff;
+    border: none;
+    border-radius: 8px;
+    cursor: pointer;
+    font-size: 17px;
+    font-weight: 600;
+    transition: 0.3s;
+  }
+  
+  .four-week-button:hover {
+    background-color: #800020;
+    transform: translateY(-2px);
+  }
+  
+  .form-message {
+    text-align: center;
+    font-weight: 600;
+    color: green;
+    margin-top: 15px;
+    animation: fade 1s ease-in-out;
+  }
+  
+  @keyframes fade {
+    from {
+      opacity: 0;
+    }
+    to {
+      opacity: 1;
+    }
+  }
+  .input-group {
+    transition: transform 0.3s ease, box-shadow 0.3s ease;
+    padding: 10px;
+    border-radius: 10px;
+  }
+  
+  .input-group:hover,
+  .input-group:focus-within {
+    transform: scale(1.02);
+    box-shadow: 0 0 12px rgba(160, 0, 39, 0.15);
+  }
+  .input-group {
+    margin-bottom: 25px;
+    padding: 15px;
+    border-radius: 12px;
+    background-color: #f9f9f9;
+    transition: 0.4s ease-in-out;
+    box-shadow: 0 0 0px rgba(0, 0, 0, 0.1);
+  }
+  
+  .input-group:has(textarea:focus),
+  .input-group:has(select:focus) {
+    box-shadow: 0 0 12px rgba(160, 0, 39, 0.3), 0 0 25px rgba(160, 0, 39, 0.1);
+    transform: scale(1.02);
+    background-color: #ffffff;
+    border: 1px solid rgba(160, 0, 39, 0.2);
+  }
+  .four-week-textarea:disabled {
+    background-color: #f1f1f1;
+    cursor: not-allowed;
+    opacity: 0.8;
+  }
+  /* Pop effect on hover for form fields */
+.four-week-textarea:hover,
+.four-week-select:hover {
+  transform: scale(1.03);
+  transition: all 0.3s ease;
+  box-shadow: 0 0 10px rgba(160, 0, 39, 0.2);
+  border-color: #a00027;
+}
+
+.four-week-textarea:focus,
+.four-week-select:focus {
+  transform: scale(1.03);
+  box-shadow: 0 0 15px rgba(160, 0, 39, 0.3);
+  border-color: #a00027;
+}
\ No newline at end of file
diff --git a/client/src/styles/WeeklyProgressReportForm.css b/client/src/styles/WeeklyProgressReportForm.css
new file mode 100644
index 000000000..a9e6ff2a3
--- /dev/null
+++ b/client/src/styles/WeeklyProgressReportForm.css
@@ -0,0 +1,329 @@
+
+.a2-form-container {
+  max-width: 700px;
+  margin: 3rem auto;
+  padding: 2rem;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.06);
+  animation: fadeSlideIn 0.8s ease;
+}
+
+@keyframes fadeSlideIn {
+  0% {
+    opacity: 0;
+    transform: translateY(30px);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+h2 {
+  text-align: center;
+  color: #263238;
+  margin-bottom: 1.5rem;
+  font-weight: 700;
+  font-size: 1.8rem;
+}
+
+.form-row {
+  display: flex;
+  gap: 1rem;
+  margin-bottom: 1rem;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+.form-row label,
+.form-group label {
+  font-weight: 600;
+  display: block;
+  color: #333;
+  margin-bottom: 0.5rem;
+}
+
+input, select, textarea {
+  width: 100%;
+  padding: 10px;
+  border-radius: 6px;
+  border: 1px solid #ddd;
+  transition: all 0.3s ease;
+  font-size: 14px;
+  background-color: #fff;
+  max-width: 100%;
+}
+
+input:hover, select:hover, textarea:hover {
+  box-shadow: 0 0 8px rgba(155, 17, 30, 0.08);
+}
+
+input:focus, select:focus, textarea:focus {
+  border-color: #9b111e;
+  box-shadow: 0 0 10px rgba(155, 17, 30, 0.2);
+  transform: scale(1.02);
+}
+
+textarea {
+  min-height: 100px;
+  resize: vertical;
+}
+
+textarea[readonly] {
+  background-color: #f1f1f1;
+  cursor: not-allowed;
+  color: #555;
+}
+
+.textarea-count {
+  text-align: right;
+  font-size: 12px;
+  color: #666;
+  margin-top: 4px;
+}
+
+.form-group {
+  margin-bottom: 1.2rem;
+  position: relative;
+}
+
+.floating-label-group {
+  position: relative;
+}
+
+.floating-label-group input:focus + label,
+.floating-label-group input:not(:placeholder-shown) + label,
+.floating-label-group textarea:focus + label,
+.floating-label-group textarea:not(:placeholder-shown) + label {
+  top: -10px;
+  left: 8px;
+  background: #fff;
+  font-size: 12px;
+  padding: 0 4px;
+  color: #9b111e;
+}
+
+.floating-label-group label {
+  position: absolute;
+  top: 10px;
+  left: 12px;
+  color: #888;
+  font-size: 14px;
+  pointer-events: none;
+  transition: 0.3s ease;
+}
+
+.submit-button {
+  background: #9b111e;
+  color: white;
+  padding: 0.8rem 1.5rem;
+  border: none;
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  display: block;
+  width: 100%;
+  margin-top: 1rem;
+  font-weight: 600;
+  font-size: 15px;
+}
+
+.submit-button:hover {
+  background: #b71c1c;
+  transform: scale(1.05);
+  box-shadow: 0 0 12px rgba(155, 17, 30, 0.4);
+}
+
+.form-message {
+  margin-top: 1rem;
+  text-align: center;
+  font-weight: 600;
+  color: green;
+  animation: fadeIn 0.5s ease;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(5px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.a2-form-container:hover {
+  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.08);
+  transition: 0.3s ease;
+}
+
+@media (max-width: 500px) {
+  .form-row {
+    flex-direction: column;
+  }
+}
+
+/* Hover Pop effect for Week select & Hours input */
+.week-hours-row select,
+.week-hours-row input[type="number"] {
+  transition: all 0.3s ease;
+}
+
+.week-hours-row select:hover,
+.week-hours-row input[type="number"]:hover {
+  transform: scale(1.03);
+  border-color: #9b111e;
+  box-shadow: 0 0 10px rgba(155, 17, 30, 0.15);
+}
+
+.week-hours-row input[type="number"]:focus {
+  transform: scale(1.04);
+  border-color: #9b111e;
+  box-shadow: 0 0 12px rgba(155, 17, 30, 0.3);
+}
+
+.week-hours-row select:focus {
+  transform: scale(1.04);
+  border-color: #9b111e;
+  box-shadow: 0 0 12px rgba(155, 17, 30, 0.3);
+}
+.view-submissions-btn {
+  background: #fff;
+  border: 2px solid #9b111e;
+  color: #9b111e;
+  padding: 8px 20px;
+  font-weight: 600;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  margin-bottom: 1.5rem;
+}
+
+.view-submissions-btn:hover {
+  background: #9b111e;
+  color: #fff;
+  transform: scale(1.05);
+  box-shadow: 0 0 10px rgba(155, 17, 30, 0.2);
+}
+/* Progress bar container */
+.progress-info {
+  background: #f8f8f8;
+  border: 1px solid #ddd;
+  padding: 1rem;
+  margin-bottom: 1.5rem;
+  border-radius: 8px;
+  font-size: 14px;
+  color: #444;
+  line-height: 1.6;
+}
+
+/* Progress bar */
+.progress-bar-outer {
+  width: 100%;
+  height: 14px;
+  background: #e0e0e0;
+  border-radius: 20px;
+  margin-top: 0.4rem;
+  overflow: hidden;
+}
+
+.progress-bar-inner {
+  height: 100%;
+  background: #9b111e;
+  transition: width 0.5s ease-in-out;
+}
+
+/* Divider between sections */
+.section-divider {
+  border-top: 1px dashed #ccc;
+  margin: 2rem 0 1.5rem;
+}
+
+/* Label subtitle under headers */
+.subtitle-label {
+  font-size: 13px;
+  font-weight: 500;
+  color: #777;
+  margin-top: -0.8rem;
+  margin-bottom: 1rem;
+}
+
+/* Badge for credit status */
+.credit-badge {
+  display: inline-block;
+  background: #e7f3ff;
+  color: #0c3b87;
+  font-size: 12px;
+  padding: 2px 8px;
+  border-radius: 20px;
+  font-weight: 600;
+  margin-left: 6px;
+  text-transform: uppercase;
+}
+
+/* Glow input on valid */
+input:valid,
+textarea:valid,
+select:valid {
+  border-color: #4caf50;
+  box-shadow: 0 0 6px rgba(76, 175, 80, 0.3);
+}
+
+/* Error message styling */
+.form-message.error {
+  color: #d32f2f;
+}
+/* Add glowing pop effect on form group hover */
+.form-group:hover {
+  transform: scale(1.02);
+  box-shadow: 0 0 12px rgba(155, 17, 30, 0.1);
+  transition: all 0.3s ease;
+  background-color: #fafafa;
+  border-radius: 8px;
+}
+
+/* Pop and glow for progress-info */
+.progress-info:hover {
+  transform: scale(1.02);
+  box-shadow: 0 0 14px rgba(155, 17, 30, 0.15);
+  transition: all 0.3s ease;
+  background-color: #fdfdfd;
+}
+
+/* Extra smooth entry animation */
+.form-group,
+.progress-info {
+  transition: all 0.3s ease;
+}
+
+/* Pop + glow on hover for read-only fields too */
+input[readonly]:hover,
+textarea[readonly]:hover {
+  box-shadow: 0 0 10px rgba(155, 17, 30, 0.1);
+  transform: scale(1.01);
+}
+.form-group:hover,
+.progress-info:hover {
+  cursor: pointer;
+}
+.form-group:hover,.progress-info:hover
+ {
+  box-shadow: 0 0 16px rgba(155, 17, 30, 0.25); /* stronger glow */
+  background-color: #fffdfd;
+  transform: scale(1.03);
+}
+.progress-info {
+  background-color: #fafafa;
+  padding: 1rem 1.2rem;
+  border: 1px solid #eee;
+  border-left: 5px solid #9b111e;
+  border-radius: 10px;
+  transition: all 0.3s ease;
+  box-shadow: 0 2px 6px rgba(0,0,0,0.06);
+}
+.progress-info:hover {
+  box-shadow: 0 0 15px rgba(155, 17, 30, 0.2);
+  transform: scale(1.02);
+  background-color: #fffdfd;
+}
diff --git a/server/controllers/fourWeekReportController.js b/server/controllers/fourWeekReportController.js
new file mode 100644
index 000000000..9308f10b3
--- /dev/null
+++ b/server/controllers/fourWeekReportController.js
@@ -0,0 +1,39 @@
+const FourWeekReport = require("../models/fourWeekReport");
+
+const fourWeekReportController = {
+  createReport: async (req, res) => {
+    try {
+      const { studentId, week, tasks, lessons, challenges, supervisorComments, coordinatorComments } = req.body;
+
+      const newReport = new FourWeekReport({
+        studentId,
+        week,
+        tasks,
+        lessons,
+        challenges,
+        supervisorComments,
+        coordinatorComments,   // newly added
+      });
+
+      await newReport.save();
+
+      res.status(201).json({ success: true, message: "Report submitted successfully!" });
+    } catch (error) {
+      console.error("Error:", error);
+      res.status(500).json({ success: false, message: "Internal Server Error" });
+    }
+  },
+
+  getReports: async (req, res) => {
+    try {
+      const { studentId } = req.params;
+      const reports = await FourWeekReport.find({ studentId }).sort({ createdAt: -1 });
+      res.status(200).json({ success: true, reports });
+    } catch (error) {
+      console.error("Error:", error);
+      res.status(500).json({ success: false, message: "Internal Server Error" });
+    }
+  },
+};
+
+module.exports = fourWeekReportController;
diff --git a/server/controllers/internshipRequestController.js b/server/controllers/internshipRequestController.js
new file mode 100644
index 000000000..e03c0c073
--- /dev/null
+++ b/server/controllers/internshipRequestController.js
@@ -0,0 +1,53 @@
+const InternshipRequest = require("../models/internshiprequest");
+const WeeklyReport = require("../models/WeeklyReport");
+
+exports.getA1ByEmail = async (req, res) => {
+  try {
+    const { email } = req.params;
+
+    // Find A1 form by matching the student's email via the populated 'student' reference
+    const form = await InternshipRequest.findOne()
+      .populate({
+        path: "student",
+        match: { email }, // only match where user's email matches
+        select: "name email"
+      });
+
+    // If student wasn't matched via population or form doesn't exist
+    if (!form || !form.student) {
+      return res.status(404).json({
+        success: false,
+        message: "A1 form not found for this email.",
+      });
+    }
+
+    // Fetch all submitted weekly reports by this student email
+    const reports = await WeeklyReport.find({ email });
+
+    // Sum up the completed hours
+    const completedHours = reports.reduce((sum, report) => sum + (report.hours || 0), 0);
+
+    // Calculate required hours
+    const creditHours = form.creditHours || 0;
+    const requiredHours = creditHours * 60;
+
+    res.status(200).json({
+      success: true,
+      form: {
+        name: form.student.name,
+        email: form.student.email,
+        supervisorName: form.internshipAdvisor?.name || "",
+        supervisorEmail: form.internshipAdvisor?.email || "",
+        creditHours,
+        completedHours,
+        requiredHours
+      }
+    });
+  } catch (err) {
+    console.error("Error fetching A1 form:", err);
+    res.status(500).json({
+      success: false,
+      message: "Server error while retrieving A1 data.",
+    });
+  }
+};
diff --git a/server/controllers/reportController.js b/server/controllers/reportController.js
index d14e0ff18..c51795460 100644
--- a/server/controllers/reportController.js
+++ b/server/controllers/reportController.js
@@ -1,88 +1,284 @@
-const User = require("../models/User");
 const WeeklyReport = require("../models/WeeklyReport");
+const SupervisorReview = require("../models/SupervisorReview");
+const CoordinatorReview = require("../models/CoordinatorReview");
+const InternshipRequest = require("../models/internshiprequest");
+const { sendStudentProgressEmail } = require("../jobs/reminderEmail");
 
-/**
- * Report Controller – handles weekly report submissions and retrieval
- */
+const STATIC_USER_ID = "vikash123";
 
 const reportController = {
-  // POST /api/reports
   createReport: async (req, res) => {
     try {
-      const {
-        studentId,
-        week,
-        hours,
-        tasks,
-        lessons,
-        supervisorComments
-      } = req.body;
-       
-
-      // Role-check: Only students can submit (based on their ID)
-      // const user = await User.findById(studentId);
-      // if (!user || user.role.toLowerCase() !== "student") {
-      //   return res.status(403).json({
-      //     success: false,
-      //     message: "Only students can submit reports.",
-      //   });
-      // }
-
-      // Basic field validation
+      const { week, hours, tasks, lessons, name, email, supervisorName, supervisorEmail, coordinatorName, coordinatorEmail } = req.body;
+
       if (!week || hours === undefined || isNaN(hours) || !tasks || !lessons) {
-        return res.status(400).json({
-          success: false,
-          message: "All required fields must be valid.",
-        });
+        return res.status(400).json({ success: false, message: "All required fields must be valid." });
       }
-      
 
-      // Save the report
       const newReport = new WeeklyReport({
-        //studentId,
+        studentId: STATIC_USER_ID,
+        name,
+        email,
+        supervisorName,
+        supervisorEmail,
+        coordinatorName,
+        coordinatorEmail,
         week,
         hours,
         tasks,
         lessons,
-        supervisorComments: supervisorComments || "",
+        supervisorComments: "",
+        coordinatorComments: "",
       });
-      
 
       await newReport.save();
 
-      res.status(201).json({
+      const reports = await WeeklyReport.find({ email }).sort({ week: 1 });
+      const completedHours = reports.reduce((sum, r) => sum + (r.hours || 0), 0);
+
+      const internshipForm = await InternshipRequest.findOne({ email });
+      const requiredHours = internshipForm ? internshipForm.creditHours * 60 : 0;
+
+      await sendStudentProgressEmail({
+        name,
+        email,
+        completedHours,
+        remainingHours: requiredHours - completedHours,
+      });
+
+      return res.status(201).json({
         success: true,
-        message: "Report submitted successfully.",
+        message: "Weekly report submitted successfully.",
+        reports
       });
+
     } catch (error) {
       console.error("Error in createReport:", error);
-      res.status(500).json({
-        success: false,
-        message: "Internal server error.",
-      });
+      return res.status(500).json({ success: false, message: "Internal server error." });
     }
   },
 
-  // GET /api/reports/:userId
   getReportsByStudent: async (req, res) => {
     try {
       const { userId } = req.params;
+      const reports = await WeeklyReport.find({ studentId: userId }).sort({ week: 1 });
 
-      const reports = await WeeklyReport.find({ studentId: userId }).sort({
-        createdAt: -1,
+      return res.status(200).json({ success: true, reports });
+    } catch (error) {
+      console.error("Error in getReportsByStudent:", error);
+      return res.status(500).json({ success: false, message: "Failed to fetch reports." });
+    }
+  },
+
+  getMyReports: async (req, res) => {
+    try {
+      const studentId = req.user?.id || STATIC_USER_ID;
+      const reports = await WeeklyReport.find({ studentId }).sort({ week: 1 });
+
+      const reviews = await SupervisorReview.find({ studentId });
+
+      const weekToComment = {};
+      reviews.forEach((review) => {
+        review.weeks.forEach((week) => {
+          weekToComment[week] = review.comments;
+        });
       });
 
-      res.status(200).json({
-        success: true,
-        reports,
+      const enrichedReports = reports.map((r) => ({
+        ...r._doc,
+        supervisorComments: weekToComment[r.week] || "",
+      }));
+
+      return res.status(200).json({ success: true, reports: enrichedReports });
+
+    } catch (error) {
+      console.error("Error in getMyReports:", error);
+      return res.status(500).json({ success: false, message: "Failed to fetch your reports." });
+    }
+  },
+
+  getCumulativeReports: async (req, res) => {
+    try {
+      const reports = await WeeklyReport.find({ studentId: STATIC_USER_ID }).sort({ createdAt: 1 });
+
+      if (!reports.length) {
+        return res.status(200).json({ success: true, cumulativeReports: [] });
+      }
+
+      const groupedReports = [];
+
+      for (let i = 0; i < reports.length; i += 4) {
+        const groupIndex = i / 4;
+
+        const isReviewed = await SupervisorReview.findOne({
+          studentId: STATIC_USER_ID,
+          groupIndex,
+        });
+
+        if (isReviewed) continue;
+
+        groupedReports.push({
+          groupIndex,
+          weeks: reports.slice(i, i + 4).map(r => r.week),
+          reports: reports.slice(i, i + 4),
+        });
+      }
+
+      return res.status(200).json({ success: true, cumulativeReports: groupedReports });
+
+    } catch (error) {
+      console.error("Error in getCumulativeReports:", error);
+      return res.status(500).json({ success: false, message: "Internal server error." });
+    }
+  },
+
+  getCumulativeGroup: async (req, res) => {
+    try {
+      const { groupIndex } = req.params;
+      const index = parseInt(groupIndex);
+
+      const reports = await WeeklyReport.find({ studentId: STATIC_USER_ID }).sort({ createdAt: 1 });
+
+      if (!reports.length) {
+        return res.status(404).json({ success: false, message: "No reports found." });
+      }
+
+      const groupedReports = [];
+      for (let i = 0; i < reports.length; i += 4) {
+        groupedReports.push({
+          groupIndex: i / 4,
+          weeks: reports.slice(i, i + 4).map(r => r.week),
+          reports: reports.slice(i, i + 4),
+        });
+      }
+
+      const targetGroup = groupedReports[index];
+      if (!targetGroup) {
+        return res.status(404).json({ success: false, message: "Group not found." });
+      }
+
+      return res.status(200).json({ success: true, group: targetGroup });
+
+    } catch (error) {
+      console.error("Error in getCumulativeGroup:", error);
+      return res.status(500).json({ success: false, message: "Internal server error." });
+    }
+  },
+
+  getReportById: async (req, res) => {
+    try {
+      const report = await WeeklyReport.findById(req.params.id);
+      if (!report) {
+        return res.status(404).json({ success: false, message: "Report not found" });
+      }
+
+      return res.status(200).json({ success: true, report });
+    } catch (error) {
+      console.error("Error in getReportById:", error);
+      return res.status(500).json({ success: false, message: "Failed to fetch report" });
+    }
+  },
+
+  submitSupervisorComments: async (req, res) => {
+    try {
+      const { groupIndex, comments, weeks } = req.body;
+
+      if (!comments || !weeks || weeks.length === 0) {
+        return res.status(400).json({ success: false, message: "Invalid comment data." });
+      }
+
+      const newReview = new SupervisorReview({
+        studentId: STATIC_USER_ID,
+        groupIndex,
+        weeks,
+        comments,
       });
+
+      await newReview.save();
+
+      await WeeklyReport.updateMany(
+        { studentId: STATIC_USER_ID, week: { $in: weeks } },
+        { $set: { supervisorComments: comments } }
+      );
+
+      return res.status(200).json({ success: true, message: "Supervisor comment submitted successfully." });
+
     } catch (error) {
-      console.error("Error in getReportsByStudent:", error);
-      res
-        .status(500)
-        .json({ success: false, message: "Failed to retrieve reports." });
+      console.error("Error in submitSupervisorComments:", error);
+      return res.status(500).json({ success: false, message: "Failed to submit comment." });
     }
   },
+
+  getSupervisorReviewedGroups: async (req, res) => {
+    try {
+      const supervisorReviews = await SupervisorReview.find({
+        studentId: STATIC_USER_ID
+      });
+
+      const reviewedGroups = [];
+
+      for (const review of supervisorReviews) {
+        const reports = await WeeklyReport.find({
+          studentId: STATIC_USER_ID,
+          week: { $in: review.weeks }
+        });
+
+        const allCoordinatorCommentsPresent = reports.every(
+          (r) => r.coordinatorComments && r.coordinatorComments.trim() !== ""
+        );
+
+        if (allCoordinatorCommentsPresent) continue;
+
+        reviewedGroups.push({
+          groupIndex: review.groupIndex,
+          weeks: review.weeks,
+          reports,
+        });
+      }
+
+      return res.status(200).json({ success: true, groups: reviewedGroups });
+    } catch (error) {
+      console.error("Error in getSupervisorReviewedGroups:", error);
+      return res.status(500).json({
+        success: false,
+        message: "Failed to fetch supervisor-reviewed groups.",
+      });
+    }
+  },
+
+  submitCoordinatorGroupComments: async (req, res) => {
+    try {
+      const { groupIndex, comments, weeks } = req.body;
+
+      if (!comments || !weeks || weeks.length === 0) {
+        return res.status(400).json({ success: false, message: "Invalid comment data." });
+      }
+
+      const firstWeek = weeks[0];
+      const firstReport = await WeeklyReport.findOne({ studentId: STATIC_USER_ID, week: firstWeek });
+
+      const newReview = new CoordinatorReview({
+        studentId: STATIC_USER_ID,
+        groupIndex,
+        weeks,
+        supervisorComments: firstReport?.supervisorComments || "",
+        coordinatorComments: comments,
+      });
+
+      await newReview.save();
+
+      await WeeklyReport.updateMany(
+        { studentId: STATIC_USER_ID, week: { $in: weeks } },
+        { $set: { coordinatorComments: comments } }
+      );
+
+      return res.status(200).json({ success: true, message: "Coordinator comment submitted successfully." });
+
+    } catch (error) {
+      console.error("Error in submitCoordinatorGroupComments:", error);
+      return res.status(500).json({ success: false, message: "Failed to submit comment." });
+    }
+  }
 };
 
-module.exports = reportController;
+module.exports = reportController;
\ No newline at end of file
diff --git a/server/index.js b/server/index.js
index d6be77755..80b7fe977 100644
--- a/server/index.js
+++ b/server/index.js
@@ -10,20 +10,22 @@ const formRoutes = require("./routes/formRoutes");
 const emailRoutes = require("./routes/emailRoutes");
 const tokenRoutes = require("./routes/token");
 const approvalRoutes = require("./routes/approvalRoutes");
-const studentRoutes = require("./routes/studentRoutes")
+const studentRoutes = require("./routes/studentRoutes");
 
 const outcomeRoutes = require("./routes/outcomeRoutes");
 
 // Import cron job manager and register jobs
-const cronJobManager = require("./utils/cronUtils");
+const cronJobManager = require("./utils/cronUtils").cronJobManager;
 const { registerAllJobs } = require("./jobs/registerCronJobs");
 const Evaluation = require("./models/Evaluation");
+const fourWeekReportRoutes = require("./routes/fourWeekReportRoutes");
+const path = require("path");
 
 
 const app = express();
 app.use(express.json());
 app.use(cors());
-app.use("/api/form", formRoutes); // register route as /api/form/submit
+app.use("/api/form", formRoutes);
 app.use("/api/email", emailRoutes);
 app.use("/api/token", tokenRoutes);
 app.use("/api", outcomeRoutes);
@@ -40,9 +42,8 @@ mongoose
   .connect(process.env.MONGO_URI, mongoConfig)
   .then(async () => {
     console.log("Connected to Local MongoDB");
-    // Initialize cron jobs after database connection is established
     try {
-      await registerAllJobs(); // Register cronjobs
+      await registerAllJobs();
       console.log("Cron jobs initialized successfully");
     } catch (error) {
       console.error("Failed to initialize cron jobs:", error);
@@ -80,7 +81,9 @@ app.use("/api/token", tokenRoutes);
 app.use("/api", approvalRoutes);
 
 app.use("/api/reports", weeklyReportRoutes);
-app.use("/api/student",studentRoutes)
+app.use("/api/student", studentRoutes);
+app.use("/api/fourWeekReports", fourWeekReportRoutes);
+
 app.post("/api/createUser", async (req, res) => {
   try {
     const { userName, email, password, role } = req.body;
@@ -96,9 +99,20 @@ app.post("/api/createUser", async (req, res) => {
       .json({ message: "Failed to create user", error: error.message });
   }
 });
+
 app.post("/api/evaluation", async (req, res) => {
   try {
-    const { interneeName, interneeID, interneeEmail, advisorSignature, advisorAgreement, coordinatorSignature, coordinatorAgreement, ratings, comments } = req.body;
+    const {
+      interneeName,
+      interneeID,
+      interneeEmail,
+      advisorSignature,
+      advisorAgreement,
+      coordinatorSignature,
+      coordinatorAgreement,
+      ratings,
+      comments,
+    } = req.body;
 
     const evaluations = Object.keys(ratings).map((category) => ({
       category,
@@ -126,13 +140,12 @@ app.post("/api/evaluation", async (req, res) => {
 });
 
 
-//Form A.4
 
+
+//Form A.4
 const presentationRoutes = require("./routes/presentationRoutes");
 app.use("/api/presentation", presentationRoutes);
 
-
-// Graceful shutdown (async Mongoose support)
 process.on("SIGINT", async () => {
   try {
     cronJobManager.stopAllJobs();
diff --git a/server/jobs/cronJobsConfig.js b/server/jobs/cronJobsConfig.js
index 3946910ff..69829511f 100644
--- a/server/jobs/cronJobsConfig.js
+++ b/server/jobs/cronJobsConfig.js
@@ -3,9 +3,11 @@ const { coordinatorReminder, supervisorReminder } = require("./reminderEmail");
 const { checkAndSendReminders } = require("./tokenExpiryCheck");
 const autoDeactivateCronjobs = require("./autoDeactivateCronjobs");
 
-// Map of job names to their corresponding functions
+// Map of job names to actual handler functions
 const jobFunctions = {
   coordinatorApprovalReminder: coordinatorReminder,
+  supervisorApprovalReminder: supervisorReminder,
+  // Add future cron jobs here
   supervisorApprovalReminder: supervisorReminder,  
   tokenExpiryReminder: checkAndSendReminders,
   autoDeactivateCronjobs: autoDeactivateCronjobs,
@@ -16,31 +18,33 @@ async function getCronJobs() {
   try {
     const jobs = await CronJob.find({ isActive: true });
 
-    // Transform database records into the expected format
     return jobs.reduce((acc, job) => {
-      if (jobFunctions[job.name]) {
+      const jobFn = jobFunctions[job.name];
+
+      if (jobFn) {
         acc[job.name] = {
           schedule: job.schedule,
           job: async () => {
             try {
-              // Update last run time
+              // Update last execution time
               await CronJob.findByIdAndUpdate(job._id, {
                 lastRun: new Date(),
               });
 
-              // Execute the job
-              await jobFunctions[job.name]();
+              await jobFn(); // Execute job function
+              console.log(`[CronJob] ${job.name} executed at ${new Date().toISOString()}`);
             } catch (error) {
-              console.error(`Error executing job ${job.name}:`, error);
+              console.error(`[CronJob Error] ${job.name}:`, error.message || error);
             }
           },
-          options: job.options,
+          options: job.options || {},
         };
       }
+
       return acc;
     }, {});
   } catch (error) {
-    console.error("Error fetching cron jobs:", error);
+    console.error("[CronJob Setup Error]:", error);
     return {};
   }
 }
diff --git a/server/jobs/reminderEmail.js b/server/jobs/reminderEmail.js
index c209392ba..c0435d255 100644
--- a/server/jobs/reminderEmail.js
+++ b/server/jobs/reminderEmail.js
@@ -1,18 +1,65 @@
 const emailService = require("../services/emailService");
-const dayjs = require("dayjs");
+const Submission = require("../models/InternshipRequest");
 const NotificationLog = require("../models/NotifLog");
+const User = require("../models/User");
+const WeeklyReport = require("../models/WeeklyReport");
+const SupervisorReview = require("../models/SupervisorReview");
+const InternshipRequest = require("../models/InternshipRequest");
 const UserTokenRequest = require("../models/TokenRequest");
-const logger = require("../utils/logger"); // Replace console
+const logger = require("../utils/logger");
+const dayjs = require("dayjs");
 
+// Coordinator reminder: weekly report reviewed by supervisor but not yet commented by coordinator
 const coordinatorReminder = async () => {
-    await emailService.sendEmail({
-    to: process.env.EMAIL_DEFAULT_SENDER,
-    subject: "Reminder: Coordinator Approval Pending",
-    html: "<p>This is a cron-based reminder email from IPMS.</p>",
-    text: "Reminder: Coordinator Approval Pending",
-  });
+  const now = dayjs();
+  try {
+    const supervisorReviews = await SupervisorReview.find({});
+
+    for (const review of supervisorReviews) {
+      const { studentId, weeks } = review;
+      const reports = await WeeklyReport.find({
+        studentId,
+        week: { $in: weeks },
+      });
+
+      const allCoordinatorCommentsMissing = reports.every(
+        (r) => !r.coordinatorComments || r.coordinatorComments.trim() === ""
+      );
+
+      if (!allCoordinatorCommentsMissing) continue;
+
+      const coordinatorEmail = reports[0]?.coordinatorEmail;
+      const studentEmail = reports[0]?.email;
+
+      const internship = await InternshipRequest.findOne({
+        email: studentEmail,
+      });
+      if (!internship || dayjs().isAfter(dayjs(internship.endDate))) continue;
+
+      await emailService.sendEmail({
+        to: coordinatorEmail,
+        subject: `Reminder: Coordinator Review Pending (Weeks ${weeks.join(
+          ", "
+        )})`,
+        html: `<p>Supervisor has reviewed weeks <strong>${weeks.join(
+          ", "
+        )}</strong>.</p>
+               <p>Please add your coordinator comments in IPMS dashboard before the internship ends.</p>`,
+        text: `Reminder to review weeks ${weeks.join(", ")} as coordinator.`,
+      });
+
+      logger.info(
+        `[Reminder Sent] Coordinator: "${coordinatorEmail}" for weeks: ${weeks.join(
+          ", "
+        )}`
+      );
+    }
+  } catch (err) {
+    logger.error("[CoordinatorReminder Error]:", err.message || err);
+  }
 };
 
+// Utility to get all forms of type A1, A2, A3
 const getAllForms = async (filter = {}) => {
   const models = {
     A1: require("../models/InternshipRequest"),
@@ -20,105 +67,92 @@ const getAllForms = async (filter = {}) => {
     A3: require("../models/Evaluation"),
   };
 
-  const formPromises = Object.entries(models).map(async ([form_type, Model]) => {
+  const formPromises = Object.entries(models).map(
+    async ([form_type, Model]) => {
       const results = await Model.find(filter);
       return results;
-  });
+    }
+  );
 
   const allResults = await Promise.all(formPromises);
-
-  // Flatten the array of arrays into a single list
   return allResults.flat();
 };
 
-
+// Supervisor reminder: weekly progress reports pending review
 const supervisorReminder = async () => {
-    const now = dayjs();
-    const fiveWorkingDays = now.subtract(7, "day").toDate(); // Approximate 5 working days as 7 calendar days
-
-    try {
-	const pendingSubs = await getAllForms({
-            supervisor_status: "pending",
-            last_supervisor_reminder_at: { $lt: fiveWorkingDays },
+  const now = dayjs();
+  const fiveWorkingDaysAgo = now.subtract(7, "day").toDate();
+
+  try {
+    const pendingSubs = await Submission.find({
+      supervisor_status: "pending",
+      createdAt: { $lt: fiveWorkingDaysAgo },
+    });
+
+    const supervisors = await UserTokenRequest.find({
+      role: "supervisor",
+      isActivated: true,
+    });
+
+    for (const submission of pendingSubs) {
+      const student = await User.findById(submission.student_id);
+      const supervisor = await User.findById(submission.supervisor_id);
+
+      if (!student || !supervisor) continue;
+
+      const reminderCount = submission.supervisor_reminder_count || 0;
+      const lastReminded =
+        submission.last_supervisor_reminder_at || submission.createdAt;
+      const nextReminderDue = dayjs(lastReminded).add(5, "day");
+      const shouldRemindAgain = now.isAfter(nextReminderDue);
+
+      if (reminderCount >= 2 && shouldRemindAgain) {
+        await emailService.sendEmail({
+          to: student.email,
+          subject: `Supervisor Not Responding for "${submission.name}"`,
+          html: `<p>Your submission "<strong>${submission.name}</strong>" has not been reviewed by your supervisor after multiple reminders.</p>
+                 <p>Please consider resending or deleting the request.</p>`,
+          text: `Your submission "${submission.name}" is still awaiting supervisor review.`,
         });
 
-        const supervisors = await UserTokenRequest.find({
-            role: "supervisor",
-            isActivated: true,
+        await NotificationLog.create({
+          submissionId: submission._id,
+          type: "studentEscalation",
+          recipientEmail: student.email,
+          message: `Student notified about supervisor inaction for "${submission.name}".`,
         });
 
-	for (const submission of pendingSubs) {
-
-            const student = await UserTokenRequest.findById(submission.student_id);
-            // This case is for the future with token management
-            // const supervisor = await UserTokenRequest.findById(submission.supervisor_id);
-
-	    const reminderCount = submission.supervisor_reminder_count || 0;
-	    const lastReminded = submission.last_supervisor_reminder_at || submission.createdAt;
-
-	    const nextReminderDue = dayjs(lastReminded).add(5, "day");
-	    const shouldRemindAgain = now.isAfter(nextReminderDue);
-
-	    if (reminderCount >= 2 && shouldRemindAgain) {
-		// Escalate to student
-		await emailService.sendEmail({
-		    to: student.ouEmail,
-		    subject: `Supervisor Not Responding for "${submission._id}"`,
-		    html: `<p>Your submission "${submission._id}" has not been reviewed by the supervisor after multiple reminders.</p>
-			<p>Please consider resending the form or deleting the request.</p>`,
-		    text: `Your submission "${submission._id}" is still awaiting supervisor review.`,
-		});
-
-		// Log notification in database
-		await NotificationLog.create({
-		    submission_id: submission._id,
-		    type: "studentEscalation",
-		    recipient_email: student.ouEmail,
-		    message: `Student notified about supervisor status on: "${submission._id}"`,
-		});
-		
-		logger.info(`Returned to student for resubmit/delete: "${submission._id}"`);
-	    } else if (shouldRemindAgain) {
-
-                for (const supervisor of supervisors) {
-                    await emailService.sendEmail({
-                        to: supervisor.ouEmail,
-                        subject: `Reminder: Please Review Submission "${submission._id}"`,
-                        html: `<p>This is a reminder to review the submission by ${student.ouEmail}.</p>`,
-                        text: `Reminder to review submission "${submission._id}".`,
-                    });
-                }
-                
-                /*
-		// This is for the future with token management
-		await emailService.sendEmail({
-		    to: supervisor.ouEmail,
-		    subject: `Reminder: Please Review Submission "${submission._id}"`,
-		    html: `<p>This is a reminder to review the submission by ${student.ouEmail}.</p>`,
-		    text: `Reminder to review submission "${submission._id}".`,
-		});
-                */
-
-		// Update the document
-		submission.supervisor_reminder_count = reminderCount + 1;
-		submission.last_supervisor_reminder_at = new Date();
-
-                try {
-		    await submission.save();
-                }
-                catch (err) {
-                    logger.error(`Failed to save submission: ${err.message}`);
-                }
-		
-		logger.info(`Reminder sent to supervisor for "${submission._id}"`);
-	    }
-	}
-    } catch (err) {
-	logger.error("Error in supervisorReminder:", err.message);
+        logger.info(`[Escalated] Student notified for: "${submission.name}"`);
+      } else if (shouldRemindAgain) {
+        for (const sup of supervisors) {
+          await emailService.sendEmail({
+            to: sup.ouEmail,
+            subject: `Reminder: Please Review Submission "${submission._id}"`,
+            html: `<p>This is a reminder to review the submission by ${student.email}.</p>`,
+            text: `Reminder to review submission "${submission._id}".`,
+          });
+        }
+
+        submission.supervisor_reminder_count = reminderCount + 1;
+        submission.last_supervisor_reminder_at = new Date();
+
+        try {
+          await submission.save();
+        } catch (err) {
+          logger.error(`Failed to save submission: ${err.message}`);
+        }
+
+        logger.info(
+          `[Reminder Sent] Supervisor: "${supervisor.email}" for "${submission.name}"`
+        );
+      }
     }
+  } catch (err) {
+    logger.error("[SupervisorReminder Error]:", err.message || err);
+  }
 };
 
 module.exports = {
-    coordinatorReminder,
-    supervisorReminder
+  coordinatorReminder,
+  supervisorReminder,
 };
diff --git a/server/jobs/reminderEmail.test.js b/server/jobs/reminderEmail.test.js
deleted file mode 100644
index 1ed22370a..000000000
--- a/server/jobs/reminderEmail.test.js
+++ /dev/null
@@ -1,183 +0,0 @@
-const emailService = require("../services/emailService");
-const { coordinatorReminder, supervisorReminder } = require('./reminderEmail');
-const mockingoose = require("mockingoose");
-const InternshipRequest = require("../models/InternshipRequest");
-const WeeklyReport = require("../models/WeeklyReport");
-const Evaluation = require("../models/Evaluation");
-const NotificationLog = require("../models/NotifLog");
-const UserTokenRequest = require("../models/TokenRequest");
-const mongoose = require("mongoose");
-
-jest.mock("../services/emailService");
-
-describe("reminderEmail", () => {
-    beforeEach( () => {
-        emailService.sendEmail.mockClear();
-    });
-
-    it("coordinatorReminder sends email", async () => {
-        await coordinatorReminder();
-        // Check sendEmail was called
-        expect(emailService.sendEmail).toHaveBeenCalledTimes(1);
-        expect(emailService.sendEmail).toHaveBeenCalledWith({to: process.env.EMAIL_DEFAULT_SENDER,
-            subject: "Reminder: Coordinator Approval Pending",
-            html: "<p>This is a cron-based reminder email from IPMS.</p>",
-            text: "Reminder: Coordinator Approval Pending",})
-    });
-})
-
-// Supervisor reminder test
-
-describe("supervisorReminder", () => {
-    beforeEach(() => {
-	mockingoose.resetAll();
-	jest.clearAllMocks();
-    });
-
-    it("should send a reminder to the supervisor", async () => {
-
-	const submissionId = new mongoose.Types.ObjectId();
-	const studentId = new mongoose.Types.ObjectId();
-	const studentMail = "student@example.com"
-	const supervisorId = new mongoose.Types.ObjectId();
-	const supervisorMail = "supervisor@example.com"
-	
-        const fakeInternshipRequest = {
-            _id: submissionId,
-            student_id: studentId,
-            supervisor_id: supervisorId,
-            supervisor_status: "pending",
-            supervisor_reminder_count: 0,
-            last_supervisor_reminder_at: new Date(Date.now() - 6 * 24 * 60 * 60 * 1000),
-            createdAt: new Date(Date.now() - 8 * 24 * 60 * 60 * 1000),
-            topic: "AI Research",
-            description: "Exploring generative AI models",
-            status: "submitted",
-            endDate: new Date("2025-04-28T00:00:00Z"),
-            startDate: new Date("2025-04-01T00:00:00Z"),
-            creditHours: 3,
-            internshipAdvisor: {
-                email: "advisor.mail@ou.edu"
-            },
-            workplace: {
-                name: "Workplace name"
-            },
-            student: studentId,
-            save: jest.fn(),
-        }
-        
-	// Mocking the InternshipRequest model
-	mockingoose(InternshipRequest).toReturn([fakeInternshipRequest], "find");
-        mockingoose(WeeklyReport).toReturn([], "find");
-        mockingoose(Evaluation).toReturn([], "find");
-        jest.spyOn(UserTokenRequest, "find").mockResolvedValue([
-            { _id: supervisorId, ouEmail: supervisorMail, role: "supervisor", isActivated: true }
-        ]);
-	jest.spyOn(UserTokenRequest, "findById").mockImplementation((id) => {
-	    if (id.equals(studentId)) {
-		return Promise.resolve({ _id: studentId, ouEmail: studentMail });
-	    }
-	    if (id.equals(supervisorId)) {
-		return Promise.resolve({ _id: supervisorId, ouEmail: supervisorMail });
-	    }
-	    return Promise.resolve(null);
-	});
-	mockingoose(NotificationLog).toReturn({}, "save");
-	jest.spyOn(InternshipRequest.prototype, "save").mockResolvedValue(true);
-
-	// Function to be tested
-	await supervisorReminder();
-
-	// Expectations
-	expect(emailService.sendEmail).toHaveBeenCalledWith(
-	    expect.objectContaining({
-		to: expect.any(String),
-		subject: expect.stringContaining("Reminder")
-	    })
-	);
-	
-	expect(InternshipRequest.prototype.save).toHaveBeenCalled();
-    });
-});
-
-describe("supervisorReminder escalation", () => {
-    beforeEach(() => {
-	mockingoose.resetAll();
-	jest.clearAllMocks();
-	jest.restoreAllMocks();
-    });
-
-    it("should return to the student after multiple reminders", async () => {
-	const submissionId = new mongoose.Types.ObjectId();
-	const studentId = new mongoose.Types.ObjectId();
-	const studentMail = "student@example.com"
-	const supervisorId = new mongoose.Types.ObjectId();
-	const supervisorMail = "supervisor@example.com"
-
-	const fakeInternshipRequestData = {
-            _id: submissionId,
-            student_id: studentId,
-            supervisor_id: supervisorId,
-            supervisor_status: "pending",
-            supervisor_reminder_count: 2,
-            last_supervisor_reminder_at: new Date(Date.now() - 6 * 24 * 60 * 60 * 1000),
-            createdAt: new Date(Date.now() - 8 * 24 * 60 * 60 * 1000),
-            topic: "AI Research",
-            description: "Exploring generative AI models",
-            status: "submitted",
-            endDate: new Date("2025-04-28T00:00:00Z"),
-            startDate: new Date("2025-04-01T00:00:00Z"),
-            creditHours: 3,
-            internshipAdvisor: {
-                email: "advisor.mail@ou.edu"
-            },
-            workplace: {
-                name: "Workplace name"
-            },
-            student: studentId,
-            save: jest.fn(),
-        }
-
-	mockingoose(InternshipRequest).toReturn([fakeInternshipRequestData], "find");
-        mockingoose(WeeklyReport).toReturn([], "find");
-        mockingoose(Evaluation).toReturn([], "find");
-        jest.spyOn(UserTokenRequest, "find").mockResolvedValue([
-            { _id: supervisorId, ouEmail: supervisorMail, role: "supervisor", isActivated: true }
-        ]);
-	jest.spyOn(UserTokenRequest, "findById").mockImplementation((id) => {
-	    if (id.equals(studentId)) {
-		return Promise.resolve({ _id: studentId, ouEmail: studentMail });
-	    }
-	    if (id.equals(supervisorId)) {
-		return Promise.resolve({ _id: supervisorId, ouEmail: supervisorMail });
-	    }
-	    return Promise.resolve(null);
-	});
-
-	const saveSpy = jest.spyOn(InternshipRequest.prototype, "save").mockResolvedValue(true);
-	const notifLogSpy = jest.spyOn(NotificationLog, "create").mockResolvedValue(true);
-	mockingoose(NotificationLog).toReturn({}, "save");
-
-	await supervisorReminder();
-
-	// Confirm student escalation email was sent
-	expect(emailService.sendEmail).toHaveBeenCalledWith(
-	    expect.objectContaining({
-		to: studentMail,
-		subject: expect.stringContaining("Supervisor Not Responding"),
-	    })
-	);
-
-	// Confirm student escalation notification was logged
-	expect(notifLogSpy).toHaveBeenCalledWith(
-	    expect.objectContaining({
-		submission_id: submissionId,
-		type: "studentEscalation",
-		recipient_email: studentMail,
-	    })
-	);
-
-	// Should NOT save the submission (unless you track escalations)
-	expect(saveSpy).not.toHaveBeenCalled();
-    });
-});
diff --git a/server/jobs/reminderSupervisor.js b/server/jobs/reminderSupervisor.js
new file mode 100644
index 000000000..80483d803
--- /dev/null
+++ b/server/jobs/reminderSupervisor.js
@@ -0,0 +1,40 @@
+
+const WeeklyReport = require("../models/WeeklyReport");
+const User = require("../models/User");
+const transporter = require("../config/nodemailer");
+
+const sendReminderMailsToSupervisors = async () => {
+  try {
+    const pendingReports = await WeeklyReport.find({
+      supervisorComments: { $in: [null, ""] },
+      createdAt: { $lte: new Date(Date.now() - 5 * 24 * 60 * 60 * 1000) }, // older than 5 days
+    });
+
+    if (pendingReports.length === 0) {
+      console.log("No pending reports found");
+      return;
+    }
+
+    for (const report of pendingReports) {
+      const supervisor = await User.findById(report.supervisorId);
+
+      if (!supervisor) {
+        console.warn(`Supervisor not found for report ID: ${report._id}`);
+        continue;
+      }
+
+      await transporter.sendMail({
+        from: `IPMS Team <${process.env.EMAIL}>`,
+        to: supervisor.email,
+        subject: "Reminder: Pending Weekly Report Comment",
+        text: `Hello ${supervisor.userName}, Please review and comment on the student's weekly report for ${report.week}.`,
+      });
+
+      console.log(`Reminder sent to ${supervisor.email}`);
+    }
+  } catch (error) {
+    console.error("Error in sending reminder mails:", error);
+  }
+};
+
+module.exports = sendReminderMailsToSupervisors;
\ No newline at end of file
diff --git a/server/middleware/verifyToken.js b/server/middleware/verifyToken.js
new file mode 100644
index 000000000..b2de97409
--- /dev/null
+++ b/server/middleware/verifyToken.js
@@ -0,0 +1,19 @@
+const jwt = require("jsonwebtoken");
+
+const verifyToken = (req, res, next) => {
+  const token = req.header("Authorization");
+
+  if (!token) {
+    return res.status(401).json({ message: "Access Denied. No token provided." });
+  }
+
+  try {
+    const verified = jwt.verify(token, process.env.JWT_SECRET);
+    req.user = verified; // so we can use req.user.id later
+    next();
+  } catch (err) {
+    return res.status(400).json({ message: "Invalid Token" });
+  }
+};
+
+module.exports = verifyToken;
diff --git a/server/models/CoordinatorReview.js b/server/models/CoordinatorReview.js
new file mode 100644
index 000000000..517c8f2b0
--- /dev/null
+++ b/server/models/CoordinatorReview.js
@@ -0,0 +1,30 @@
+const mongoose = require("mongoose");
+
+const coordinatorReviewSchema = new mongoose.Schema({
+  studentId: {
+    type: String,
+    required: true,
+  },
+  groupIndex: {
+    type: Number,
+    required: true,
+  },
+  weeks: {
+    type: [String],
+    required: true,
+  },
+  supervisorComments: {
+    type: String,
+    default: "",
+  },
+  coordinatorComments: {
+    type: String,
+    required: true,
+  },
+  reviewedAt: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+module.exports = mongoose.model("CoordinatorReview", coordinatorReviewSchema);
diff --git a/server/models/InternshipRequest.js b/server/models/InternshipRequest.js
index bbb4ee7eb..68dced0e8 100644
--- a/server/models/InternshipRequest.js
+++ b/server/models/InternshipRequest.js
@@ -79,4 +79,4 @@ formA1.virtual("requiredHours").get(function() {
     return this.creditHours * 60;
 })
 
-module.exports = mongoose.model("InternshipRequest", formA1);
+module.exports = mongoose.models.InternshipRequest || mongoose.model("InternshipRequest", formA1);
\ No newline at end of file
diff --git a/server/models/SupervisorReview.js b/server/models/SupervisorReview.js
new file mode 100644
index 000000000..da59ab3d7
--- /dev/null
+++ b/server/models/SupervisorReview.js
@@ -0,0 +1,26 @@
+const mongoose = require("mongoose");
+
+const supervisorReviewSchema = new mongoose.Schema({
+  studentId: {
+    type: String,
+    required: true,
+  },
+  groupIndex: {
+    type: Number,
+    required: true,
+  },
+  weeks: {
+    type: [String],
+    required: true,
+  },
+  comments: {
+    type: String,
+    required: true,
+  },
+  reviewedAt: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+module.exports = mongoose.model("SupervisorReview", supervisorReviewSchema);
diff --git a/server/models/WeeklyReport.js b/server/models/WeeklyReport.js
index fbf3186fd..f6c063131 100644
--- a/server/models/WeeklyReport.js
+++ b/server/models/WeeklyReport.js
@@ -2,15 +2,44 @@ const mongoose = require("mongoose");
 const formMetadata = require("./FormMetadata");
 
 const weeklyReportSchema = new mongoose.Schema({
+  studentId: {
+    type: String,
+    required: true,
+  },
+
+  // New Fields from A1
+  name: {
+    type: String,
+    required: true,
+  },
+
+  email: {
+    type: String,
+    required: true,
+  },
+
+  supervisorName: {
+    type: String,
+    required: true,
+  },
+
+  supervisorEmail: {
+    type: String,
+    required: true,
+  },
+
+  // Fixed Coordinator Info
+  coordinatorName: {
+    type: String,
+    default: "Naveena",
+  },
 
-  ...formMetadata,
-    
-  // studentId: {
-  //   type: mongoose.Schema.Types.ObjectId,
-  //   ref: "User",
-  //   required: true,
-  // },
+  coordinatorEmail: {
+    type: String,
+    default: "naveena.suddapalli-1@ou.edu",
+  },
 
+  // Report Data
   week: {
     type: String,
     required: true,
@@ -36,6 +65,11 @@ const weeklyReportSchema = new mongoose.Schema({
     default: "",
   },
 
+  coordinatorComments: {
+    type: String,
+    default: "",
+  },
+
   submittedAt: {
     type: Date,
     default: Date.now,
diff --git a/server/models/fourWeekReport.js b/server/models/fourWeekReport.js
new file mode 100644
index 000000000..dcc07aaa1
--- /dev/null
+++ b/server/models/fourWeekReport.js
@@ -0,0 +1,33 @@
+
+const mongoose = require("mongoose");
+
+const fourWeekReportSchema = new mongoose.Schema({
+  studentId: {
+    type: String,
+    required: true,
+  },
+  week: {
+    type: String,
+    required: true,
+  },
+  tasks: {
+    type: String,
+    required: true,
+  },
+  lessons: {
+    type: String,
+    required: true,
+  },
+  challenges: {
+    type: String,
+    required: true,
+  },
+  supervisorComments: {
+    type: String,
+  },
+  coordinatorComments: {
+    type: String,
+  },
+}, { timestamps: true });
+
+module.exports = mongoose.model("FourWeekReport", fourWeekReportSchema);
\ No newline at end of file
diff --git a/server/routes/fourWeekReportRoutes.js b/server/routes/fourWeekReportRoutes.js
new file mode 100644
index 000000000..33e20ad30
--- /dev/null
+++ b/server/routes/fourWeekReportRoutes.js
@@ -0,0 +1,8 @@
+const express = require("express");
+const router = express.Router();
+const fourWeekReportController = require("../controllers/fourWeekReportController");
+
+router.post("/", fourWeekReportController.createReport);
+router.get("/:studentId", fourWeekReportController.getReports);
+
+module.exports = router;
diff --git a/server/routes/weeklyReportRoutes.js b/server/routes/weeklyReportRoutes.js
index ecc133dfa..40b25eb0a 100644
--- a/server/routes/weeklyReportRoutes.js
+++ b/server/routes/weeklyReportRoutes.js
@@ -1,13 +1,28 @@
 const express = require("express");
 const router = express.Router();
 const reportController = require("../controllers/reportController");
+const { getA1ByEmail } = require("../controllers/internshipRequestController");
 
-// Routing weekly report actions
-
-// POST - Submit a new weekly report
+// ---------------------- Weekly Report ----------------------
 router.post("/", reportController.createReport);
+router.get("/mine", reportController.getMyReports);
+router.get("/student/:userId", reportController.getReportsByStudent);
+
+//  No conflict – safely namespaced
+router.get("/a1/:email", getA1ByEmail);
+
+// ------------------ Comments: Supervisor & Coordinator ------------------
+router.post("/supervisor-comments", reportController.submitSupervisorComments);
+router.post("/coordinator-comments", reportController.submitCoordinatorGroupComments);
+
+// ---------------------- Cumulative Reports ----------------------
+router.get("/cumulative/reports", reportController.getCumulativeReports);
+router.get("/cumulative/group/:groupIndex", reportController.getCumulativeGroup);
+
+// ---------------------- Group Fetches ----------------------
+router.get("/supervised-groups", reportController.getSupervisorReviewedGroups);
 
-// GET - Fetch all reports by a specific student
-router.get("/:userId", reportController.getReportsByStudent);
+// ---------------------- Single Report (must remain last!) ----------------------
+router.get("/:id", reportController.getReportById);
 
 module.exports = router;
diff --git a/server/utils/cronUtils.js b/server/utils/cronUtils.js
index 7c78d073e..992e0aa2d 100644
--- a/server/utils/cronUtils.js
+++ b/server/utils/cronUtils.js
@@ -75,4 +75,4 @@ class CronJobManager {
 
 
 const cronJobManager = new CronJobManager();
-module.exports = cronJobManager;
+module.exports = cronJobManager;
\ No newline at end of file
diff --git a/server/utils/cronUtils.test.js b/server/utils/cronUtils.test.js
new file mode 100644
index 000000000..346f41adb
--- /dev/null
+++ b/server/utils/cronUtils.test.js
@@ -0,0 +1,99 @@
+const cron = require("node-cron");
+const logger = require("./logger");
+const cronJobManager = require("./cronUtils");
+
+jest.mock("node-cron", () => ({
+  validate: jest.fn(),
+  schedule: jest.fn(),
+}));
+
+jest.mock("./logger", () => ({
+  info: jest.fn(),
+  warn: jest.fn(),
+  error: jest.fn(),
+}));
+
+describe("cronUtils", () => {
+  const mockJobFunction = jest.fn().mockResolvedValue();
+
+  beforeEach(() => {
+    cron.validate.mockClear();
+    cron.schedule.mockClear();
+    logger.info.mockClear();
+    logger.warn.mockClear();
+    logger.error.mockClear();
+    cronJobManager.stopAllJobs();
+  });
+
+  afterEach(() => {
+    cronJobManager.stopAllJobs();
+    jest.clearAllMocks();
+  });
+
+  test("should create an instance of CronJobManager", () => {
+    expect(cronJobManager).toBeDefined();
+    expect(cronJobManager.jobs instanceof Map).toBe(true);
+  });
+
+  test("should register job with runOnInit = true", () => {
+    cron.validate.mockReturnValue(true);
+    cron.schedule.mockReturnValue({ stop: jest.fn() });
+
+    const result = cronJobManager.registerJob(
+      "Job1",
+      "*/1 * * * *",
+      mockJobFunction,
+      { runOnInit: true }
+    );
+
+    expect(result).toBe(true);
+    expect(logger.info).toHaveBeenCalledWith(
+      `Running job Job1 immediately on init`
+    );
+  });
+
+  test("should register job with runOnInit = false", () => {
+    cron.validate.mockReturnValue(true);
+    cron.schedule.mockReturnValue({ stop: jest.fn() });
+
+    const result = cronJobManager.registerJob(
+      "Job2",
+      "*/1 * * * *",
+      mockJobFunction
+    );
+
+    expect(result).toBe(true);
+  });
+
+  test("should not register job with invalid cron", () => {
+    cron.validate.mockReturnValue(false);
+
+    const result = cronJobManager.registerJob("InvalidJob", "invalid", mockJobFunction);
+
+    expect(result).toBe(false);
+    expect(logger.error).toHaveBeenCalledWith(
+      "Invalid cron expression: invalid"
+    );
+  });
+
+  test("should stop a specific job", () => {
+    cron.validate.mockReturnValue(true);
+    const stopFn = jest.fn();
+    cron.schedule.mockReturnValue({ stop: stopFn });
+
+    cronJobManager.registerJob("Job3", "*/1 * * * *", mockJobFunction);
+    cronJobManager.stopJob("Job3");
+
+    expect(stopFn).toHaveBeenCalled();
+  });
+
+  test("should list registered jobs", () => {
+    cron.validate.mockReturnValue(true);
+    cron.schedule.mockReturnValue({ stop: jest.fn() });
+
+    cronJobManager.registerJob("Job4", "*/1 * * * *", mockJobFunction);
+
+    const jobs = cronJobManager.listJobs();
+    expect(jobs.length).toBeGreaterThan(0);
+  });
+});