From c66f4a3227873ce8a89f21b8ce5054f4876756dc Mon Sep 17 00:00:00 2001
From: Mahima <mahi.ch@tuta.io>
Date: Sun, 20 Apr 2025 03:45:56 -0500
Subject: [PATCH 1/6] Update A3 modal and dashboard: ViewFormModal &
 SupervisorDashboard enhancements

---
 client/src/pages/SupervisorDashboard.js | 107 ++++++++++++------------
 client/src/pages/ViewFormModal.js       |  65 +++++++++-----
 2 files changed, 95 insertions(+), 77 deletions(-)

diff --git a/client/src/pages/SupervisorDashboard.js b/client/src/pages/SupervisorDashboard.js
index 18cc054d..f4f4404c 100644
--- a/client/src/pages/SupervisorDashboard.js
+++ b/client/src/pages/SupervisorDashboard.js
@@ -12,16 +12,16 @@ const SupervisorDashboard = () => {
   useEffect(() => {
     const fetchRequests = async () => {
       try {
-        const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/submissions/pending`);
-
+        const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/evaluation`);
         setRequests(res.data);
         setLoading(false);
       } catch (err) {
-        console.error("Error fetching requests:", err);
+        console.error("AXIOS ERROR:", err.response?.data || err.message);
         setMessage("Error fetching requests.");
         setLoading(false);
       }
     };
+
     fetchRequests();
   }, []);
 
@@ -30,7 +30,10 @@ const SupervisorDashboard = () => {
     if (!confirmed) return;
 
     try {
-      const res =  await axios.post(`${process.env.REACT_APP_API_URL}/api/submissions/${id}/${action}`, { comment });
+      const res = await axios.post(
+        `${process.env.REACT_APP_API_URL}/api/evaluation/${id}/${action}`,
+        { comment }
+      );
 
       setMessage(res.data.message || `${action} successful`);
       setRequests(prev => prev.filter(req => req._id !== id));
@@ -43,63 +46,57 @@ const SupervisorDashboard = () => {
 
   const openFormView = (form) => setSelectedForm(form);
   const closeFormView = () => setSelectedForm(null);
+  const formatDate = (date) => new Date(date).toLocaleDateString();
 
-  const formatDate = (dateStr) => new Date(dateStr).toLocaleDateString();
-
-  const sortedRequests = [...requests].sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
-
-  let content;
-
-  if (loading) {
-    content = <p>Loading...</p>;
-  }
-  else if (sortedRequests.length === 0) {
-    content = (
-      <div className="empty-message-container">
-        <div className="empty-message">No pending approvals.</div>
-      </div>
-    );
-  }
-  else {
-    content = (
-      <table className="dashboard-table">
-        <thead>
-          <tr>
-            <th>Student Name</th>
-            <th>Student ID</th>
-            <th>Form Type</th>
-            <th>Date Submitted</th>
-            <th>Status</th>
-          </tr>
-        </thead>
-        <tbody>
-          {sortedRequests.map((req) => (
-            <tr key={req._id}>
-              <td>{req.name}</td>
-              <td>
-                <button className="link-button" onClick={() => openFormView(req)}>
-                  {req.student_id}
-                </button>
-              </td>
-              <td>{req.form_type}</td>
-              <td>{formatDate(req.createdAt)}</td>
-              <td>
-                <span className={`status-badge ${req.supervisor_status}`}>
-                  {req.supervisor_status}
-                </span>
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    );
-  }
+  const sortedRequests = [...requests].sort(
+    (a, b) => new Date(b.createdAt) - new Date(a.createdAt)
+  );
 
   return (
     <div className="dashboard-container">
       <h2>Supervisor Dashboard</h2>
       {message && <p className="status-msg">{message}</p>}
-      {content}
+      {loading ? (
+        <p>Loading...</p>
+      ) : sortedRequests.length === 0 ? (
+        <div className="empty-message-container">
+          <div className="empty-message">No A3 forms available.</div>
+        </div>
+      ) : (
+        <table className="dashboard-table">
+          <thead>
+            <tr>
+              <th>Student Name</th>
+              <th>Sooner ID</th>
+              <th>Email</th>
+              <th>Form Type</th>
+              <th>Submitted</th>
+              <th>Status</th>
+            </tr>
+          </thead>
+          <tbody>
+            {sortedRequests.map((req) => (
+              <tr key={req._id}>
+                <td>{req.interneeName}</td>
+                <td>
+                  <button className="link-button" onClick={() => openFormView(req)}>
+                    {req.interneeID}
+                  </button>
+                </td>
+                <td>{req.interneeEmail}</td>
+                <td>{req.form_type}</td>
+                <td>{formatDate(req.createdAt)}</td>
+                <td>
+                  <span className={`status-badge ${req.supervisor_status}`}>
+                    {req.supervisor_status}
+                  </span>
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      )}
+
       {selectedForm && (
         <ViewFormModal
           formData={selectedForm}
diff --git a/client/src/pages/ViewFormModal.js b/client/src/pages/ViewFormModal.js
index e913db19..86f42b4f 100644
--- a/client/src/pages/ViewFormModal.js
+++ b/client/src/pages/ViewFormModal.js
@@ -2,7 +2,6 @@ import React, { useState } from "react";
 import "../styles/SupervisorDashboard.css";
 
 const ViewFormModal = ({ formData, onClose, onAction }) => {
-  const form = typeof formData.details === "string" ? JSON.parse(formData.details) : formData.details;
   const [comment, setComment] = useState("");
   const [error, setError] = useState("");
 
@@ -11,34 +10,56 @@ const ViewFormModal = ({ formData, onClose, onAction }) => {
       setError("Comment is required before taking action.");
       return;
     }
-    setError("");  // clear error
-    onAction(formData._id, action, comment);
+
+    const confirmed = window.confirm(`Are you sure you want to ${action} this request?`);
+    if (!confirmed) return;
+
+    setError("");
+    onAction(formData._id, action, comment.trim());
   };
 
+  const formatSignature = (sig) =>
+    sig?.type === "text" ? `${sig.value} (Font: ${sig.font})` : "Signature unavailable";
+
   return (
     <div className="modal-overlay">
-      <div className="modal-box">
-        <h2>Form: {formData.form_type}</h2>
-        <p><strong>Student:</strong> {formData.name}</p>
+      <div className="modal-box" style={{ maxHeight: "90vh", overflowY: "auto" }}>
+        <h2>A3 – Job Performance Evaluation</h2>
 
-        {form.tasks && (
-          <div>
-            <strong>Tasks:</strong>
-            <ul>{form.tasks.map((task, i) => <li key={i}>{task}</li>)}</ul>
-          </div>
-        )}
+        <h3>Internee Details</h3>
+        <p><strong>Name:</strong> {formData.interneeName}</p>
+        <p><strong>Sooner ID:</strong> {formData.interneeID}</p>
+        <p><strong>Email:</strong> {formData.interneeEmail}</p>
 
-        {form.outcomes && (
-          <div>
-            <strong>Outcomes:</strong>
-            <ul>{form.outcomes.map((o, i) => <li key={i}>{o}</li>)}</ul>
-          </div>
+        <h3>Evaluation</h3>
+        {formData.evaluations?.length > 0 ? (
+          <table className="dashboard-table" style={{ marginTop: "10px" }}>
+            <thead>
+              <tr>
+                <th>Category</th>
+                <th>Rating</th>
+                <th>Comment</th>
+              </tr>
+            </thead>
+            <tbody>
+              {formData.evaluations.map((item, index) => (
+                <tr key={index}>
+                  <td>{item.category}</td>
+                  <td>{item.rating}</td>
+                  <td>{item.comment || "-"}</td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        ) : (
+          <p>No evaluation data found.</p>
         )}
 
-        {form.week && <p><strong>Week:</strong> {form.week}</p>}
-        {form.lessonsLearned && <p><strong>Lessons Learned:</strong> {form.lessonsLearned}</p>}
+        <h3>Signatures</h3>
+        <p><strong>Advisor Signature:</strong> {formatSignature(formData.advisorSignature)}</p>
+        <p><strong>Coordinator Signature:</strong> {formatSignature(formData.coordinatorSignature)}</p>
 
-        <div>
+        <div style={{ marginTop: "15px" }}>
           <label><strong>Comment:</strong></label>
           <textarea
             value={comment}
@@ -50,7 +71,7 @@ const ViewFormModal = ({ formData, onClose, onAction }) => {
           {error && <p style={{ color: "red", marginTop: "5px" }}>{error}</p>}
         </div>
 
-        <div style={{ marginTop: "15px", display: "flex", gap: "10px", justifyContent: "center" }}>
+        <div style={{ display: "flex", justifyContent: "center", gap: "10px", marginTop: "15px" }}>
           <button className="approve" onClick={() => handleDecision("approve")}>Approve</button>
           <button className="reject" onClick={() => handleDecision("reject")}>Reject</button>
         </div>
@@ -63,4 +84,4 @@ const ViewFormModal = ({ formData, onClose, onAction }) => {
   );
 };
 
-export default ViewFormModal;
+export default ViewFormModal;
\ No newline at end of file

From 78aad85c2c790e8b293cc59d51d49ee3c325ea71 Mon Sep 17 00:00:00 2001
From: Mahima <mahi.ch@tuta.io>
Date: Sun, 20 Apr 2025 03:46:33 -0500
Subject: [PATCH 2/6] Add A3 backend routes and model fields

---
 server/index.js                   |  4 +-
 server/models/Evaluation.js       |  5 ++-
 server/routes/evaluationRoutes.js | 75 +++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 server/routes/evaluationRoutes.js

diff --git a/server/index.js b/server/index.js
index 45104393..009215f8 100644
--- a/server/index.js
+++ b/server/index.js
@@ -17,6 +17,7 @@ const outcomeRoutes = require("./routes/outcomeRoutes");
 const cronJobManager = require("./utils/cronUtils");
 const { registerAllJobs } = require("./jobs/registerCronJobs");
 const Evaluation = require("./models/Evaluation");
+const evaluationRoutes = require("./routes/evaluationRoutes");
 
 const app = express();
 app.use(express.json());
@@ -25,6 +26,7 @@ app.use("/api/form", formRoutes); // register route as /api/form/submit
 app.use("/api/email", emailRoutes);
 app.use("/api/token", tokenRoutes);
 app.use("/api", outcomeRoutes);
+app.use("/api/evaluation", evaluationRoutes);
 
 const mongoConfig = {
   serverSelectionTimeoutMS: 5000,
@@ -143,4 +145,4 @@ process.on("SIGINT", async () => {
 });
 
 const PORT = process.env.PORT || 5001;
-app.listen(PORT, () => console.log(`Server running on port ${PORT}`));
+app.listen(PORT, () => console.log(`Server running on port ${PORT}`));
\ No newline at end of file
diff --git a/server/models/Evaluation.js b/server/models/Evaluation.js
index 0ea16faf..4f838107 100644
--- a/server/models/Evaluation.js
+++ b/server/models/Evaluation.js
@@ -1,4 +1,5 @@
 const mongoose = require('mongoose');
+const formMetadata = require('./FormMetadata');
 
 const signatureSchema = new mongoose.Schema({
   type: { type: String, enum: ['text', 'draw'], required: true },
@@ -20,6 +21,8 @@ const evaluationItemSchema = new mongoose.Schema({
 }, { _id: false });
 
 const evaluationSchema = new mongoose.Schema({
+  ...formMetadata,
+  interneeId: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: false },
   internshipId: { type: mongoose.Schema.Types.ObjectId, ref: 'Internship', required: false },
 
   interneeName: {
@@ -58,4 +61,4 @@ const evaluationSchema = new mongoose.Schema({
 
 evaluationSchema.index({ interneeID: 1, internshipId: 1 });
 
-module.exports = mongoose.model('Evaluation', evaluationSchema);
+module.exports = mongoose.model('Evaluation', evaluationSchema);
\ No newline at end of file
diff --git a/server/routes/evaluationRoutes.js b/server/routes/evaluationRoutes.js
new file mode 100644
index 00000000..0a0cce23
--- /dev/null
+++ b/server/routes/evaluationRoutes.js
@@ -0,0 +1,75 @@
+const express = require('express');
+const router = express.Router();
+const Evaluation = require('../models/Evaluation');
+
+//POST: Submit A3 Form
+router.post('/submit', async (req, res) => {
+  try {
+    const formData = req.body;
+    const newEvaluation = new Evaluation(formData);
+    await newEvaluation.save();
+    res.status(201).json({ message: 'A3 form submitted successfully.' });
+  } catch (error) {
+    console.error('Error submitting A3 form:', error);
+    res.status(500).json({ error: 'Failed to submit A3 form.' });
+  }
+});
+
+//GET: Fetch A3 Forms for Supervisor Dashboard
+router.get('/', async (req, res) => {
+    try {
+      const evaluations = await Evaluation.find({ form_type: 'A3' }).sort({ createdAt: -1 }); // ⬅️ Add sorting
+      res.status(200).json(evaluations);
+    } catch (error) {
+      console.error('Error fetching evaluations:', error);
+      res.status(500).json({ error: 'Failed to fetch evaluations.' });
+    }
+  });
+
+//POST: Approve A3 Form
+router.post('/:id/approve', async (req, res) => {
+  try {
+    const { id } = req.params;
+    const { comment } = req.body;
+
+    const updated = await Evaluation.findByIdAndUpdate(
+      id,
+      {
+        supervisor_status: 'approved',
+        supervisor_comment: comment || '',
+      },
+      { new: true }
+    );
+
+    if (!updated) return res.status(404).json({ error: 'Form not found.' });
+    res.status(200).json({ message: 'Form approved successfully.', updated });
+  } catch (error) {
+    console.error('Error approving A3 form:', error);
+    res.status(500).json({ error: 'Failed to approve request.' });
+  }
+});
+
+//Reject A3 Form
+router.post('/:id/reject', async (req, res) => {
+  try {
+    const { id } = req.params;
+    const { comment } = req.body;
+
+    const updated = await Evaluation.findByIdAndUpdate(
+      id,
+      {
+        supervisor_status: 'rejected',
+        supervisor_comment: comment || '',
+      },
+      { new: true }
+    );
+
+    if (!updated) return res.status(404).json({ error: 'Form not found.' });
+    res.status(200).json({ message: 'Form rejected successfully.', updated });
+  } catch (error) {
+    console.error('Error rejecting A3 form:', error);
+    res.status(500).json({ error: 'Failed to reject request.' });
+  }
+});
+
+module.exports = router;
\ No newline at end of file

From 1f3db3aa79187331f8c8091a82d3020774de1de9 Mon Sep 17 00:00:00 2001
From: Mahima <mahi.ch@tuta.io>
Date: Sun, 20 Apr 2025 18:28:28 -0500
Subject: [PATCH 3/6] Add FormMetadata.js from backend branch

---
 server/models/FormMetadata.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 server/models/FormMetadata.js

diff --git a/server/models/FormMetadata.js b/server/models/FormMetadata.js
new file mode 100644
index 00000000..027a2f56
--- /dev/null
+++ b/server/models/FormMetadata.js
@@ -0,0 +1,19 @@
+const mongoose = require("mongoose");
+
+const formMetadata = {
+  student_id: { type: mongoose.Schema.Types.ObjectId, ref: "UserTokenRequest"},
+  supervisor_id: { type: mongoose.Schema.Types.ObjectId, ref: "UserTokenRequest"},
+  coordinator_id: { type: mongoose.Schema.Types.ObjectId, ref: "UserTokenRequest"},
+
+  supervisor_status: { type: String, enum: ["pending", "approved", "rejected"], default: "pending" },
+  supervisor_comment: String,
+  supervisor_reminder_count: { type: Number, default: 0 },
+  last_supervisor_reminder_at: Date,
+
+  coordinator_status: { type: String, enum: ["pending", "approved", "rejected"], default: "pending" },
+  coordinator_comment: String,
+  coordinator_reminder_count: { type: Number, default: 0 },
+  last_coordinator_reminder_at: Date,
+};
+
+module.exports = formMetadata;

From 714160ae1c5e1e56293ec420c93311c417edecca Mon Sep 17 00:00:00 2001
From: Hozen <enzo.durel@gmail.com>
Date: Sun, 20 Apr 2025 22:14:04 -0500
Subject: [PATCH 4/6] Resolve bad get evaluation (form_type ->
 supervisor_status)

---
 server/routes/evaluationRoutes.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/routes/evaluationRoutes.js b/server/routes/evaluationRoutes.js
index 0a0cce23..0cfd13aa 100644
--- a/server/routes/evaluationRoutes.js
+++ b/server/routes/evaluationRoutes.js
@@ -18,8 +18,8 @@ router.post('/submit', async (req, res) => {
 //GET: Fetch A3 Forms for Supervisor Dashboard
 router.get('/', async (req, res) => {
     try {
-      const evaluations = await Evaluation.find({ form_type: 'A3' }).sort({ createdAt: -1 }); // ⬅️ Add sorting
-      res.status(200).json(evaluations);
+        const evaluations = await Evaluation.find({ supervisor_status: "pending" }).sort({ createdAt: -1 }); // ⬅️ Add sorting
+        res.status(200).json(evaluations);
     } catch (error) {
       console.error('Error fetching evaluations:', error);
       res.status(500).json({ error: 'Failed to fetch evaluations.' });
@@ -72,4 +72,4 @@ router.post('/:id/reject', async (req, res) => {
   }
 });
 
-module.exports = router;
\ No newline at end of file
+module.exports = router;

From 309ff07e5623da52babd1f15e9d053a0ccc348ba Mon Sep 17 00:00:00 2001
From: Mahima <mahi.ch@tuta.io>
Date: Mon, 21 Apr 2025 03:00:29 -0500
Subject: [PATCH 5/6] updated A3

---
 .DS_Store                                | Bin 0 -> 6148 bytes
 client/src/pages/SupervisorDashboard.js  |  65 +++++-----
 client/src/pages/ViewFormModal.js        | 139 +++++++++++-----------
 server/controllers/approvalController.js | 145 ++++++++++++++++-------
 server/index.js                          |   3 +-
 server/routes/approvalRoutes.js          |  40 +++++--
 server/routes/formRoutes.js              | 124 ++++++++++---------
 7 files changed, 306 insertions(+), 210 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2e8fb0f442aea0379f8042d68e67b48ec7e9c756
GIT binary patch
literal 6148
zcmeHKK}*9h6n>d=wurEU!Y)F=>zH$jAYSU62M=DX=s{(!c4)CSvUct;20iPK@#-(}
z@929;Cf2FPq4FNQd@nEWCC!(RGyou){a_8C3;-4?VZp}Y3!!$>2`L!QETT|-#E|Ys
z^3so_KM~E2-^c*1T?sBBf)KipUq9LuJE*l+CF=8SID|d)w%`D<2DcD=SaHgD`jk<E
z1bgnmJ(c-bvHVl4KS=J(PI~t5qA*G8^%qf?DbAMWEX$g=&b@0n@X}7&Pnw<HDb<do
zjQp|P@sGpqpj}?vm2uh$<8DtSgh3ZW&Q8KOkb|b|$3dcUJ>6j0w%smQhQr2Yz3Qwt
zwnkNFxYa;=V|{ZpvaO|+)$POfO>`T}2gL~p-2F-x436Oujoke2y<Qy2_zL~woN+88
zGr$Zm1Jh%`oIuw6^oHb-m;q+sk1#;zgM&)w8q74RqXP@|1VAjJTM63q6G%CZLDyiW
z5nE7%PDRwI!aOmAPDj6E;#`B7Mx74AJU)aOS(q1!P@`l2jtU3iYUGj`U<UFG%;;*F
z?*F~--~ag}t}z45z`tTZ6kA@aiBmFn>%`>fu60l^P)R5*)A*i(hPsL|magIosuJ`&
XWFWc*GmYp$;U57-0~gG|R2g^!o=|Zv

literal 0
HcmV?d00001

diff --git a/client/src/pages/SupervisorDashboard.js b/client/src/pages/SupervisorDashboard.js
index f4f4404c..d6c091cb 100644
--- a/client/src/pages/SupervisorDashboard.js
+++ b/client/src/pages/SupervisorDashboard.js
@@ -9,48 +9,49 @@ const SupervisorDashboard = () => {
   const [loading, setLoading] = useState(true);
   const [message, setMessage] = useState("");
 
-  useEffect(() => {
-    const fetchRequests = async () => {
-      try {
-        const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/evaluation`);
-        setRequests(res.data);
-        setLoading(false);
-      } catch (err) {
-        console.error("AXIOS ERROR:", err.response?.data || err.message);
-        setMessage("Error fetching requests.");
-        setLoading(false);
-      }
-    };
+  const fetchRequests = async () => {
+    try {
+      const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/supervisor/forms`);
+      setRequests(res.data);
+      setLoading(false);
+    } catch (err) {
+      console.error("Error fetching requests:", err);
+      setMessage("Error fetching requests.");
+      setLoading(false);
+    }
+  };
 
+  useEffect(() => {
     fetchRequests();
   }, []);
 
-  const handleAction = async (id, action, comment) => {
+  const handleAction = async (formType, id, action, comment, signature) => {
     const confirmed = window.confirm(`Are you sure you want to ${action} this request?`);
-    if (!confirmed) return;
-
+    if (!confirmed) return false;
+  
     try {
       const res = await axios.post(
-        `${process.env.REACT_APP_API_URL}/api/evaluation/${id}/${action}`,
-        { comment }
+        `${process.env.REACT_APP_API_URL}/api/supervisor/form/${formType}/${id}/${action}`,
+        { comment, signature }
       );
-
       setMessage(res.data.message || `${action} successful`);
-      setRequests(prev => prev.filter(req => req._id !== id));
-      setSelectedForm(null);
+      setRequests(prev => prev.filter(req => req._id !== id)); // remove from table
+      return true;
     } catch (err) {
       console.error(`Failed to ${action} request:`, err);
       setMessage(`Failed to ${action} request.`);
+      return false;
     }
   };
+  
 
   const openFormView = (form) => setSelectedForm(form);
   const closeFormView = () => setSelectedForm(null);
   const formatDate = (date) => new Date(date).toLocaleDateString();
 
-  const sortedRequests = [...requests].sort(
-    (a, b) => new Date(b.createdAt) - new Date(a.createdAt)
-  );
+  const sortedRequests = [...requests]
+    .filter((req) => req.supervisor_status?.toLowerCase() === "pending")
+    .sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
 
   return (
     <div className="dashboard-container">
@@ -60,7 +61,7 @@ const SupervisorDashboard = () => {
         <p>Loading...</p>
       ) : sortedRequests.length === 0 ? (
         <div className="empty-message-container">
-          <div className="empty-message">No A3 forms available.</div>
+          <div className="empty-message">No pending approvals.</div>
         </div>
       ) : (
         <table className="dashboard-table">
@@ -77,18 +78,18 @@ const SupervisorDashboard = () => {
           <tbody>
             {sortedRequests.map((req) => (
               <tr key={req._id}>
-                <td>{req.interneeName}</td>
+                <td>{req.interneeName || req.studentName}</td>
                 <td>
                   <button className="link-button" onClick={() => openFormView(req)}>
-                    {req.interneeID}
+                    {req.interneeID || req.soonerId}
                   </button>
                 </td>
-                <td>{req.interneeEmail}</td>
+                <td>{req.interneeEmail || req.studentEmail}</td>
                 <td>{req.form_type}</td>
                 <td>{formatDate(req.createdAt)}</td>
                 <td>
-                  <span className={`status-badge ${req.supervisor_status}`}>
-                    {req.supervisor_status}
+                  <span className={`status-badge ${req.supervisor_status || req.status}`}>
+                    {req.supervisor_status || req.status}
                   </span>
                 </td>
               </tr>
@@ -101,11 +102,13 @@ const SupervisorDashboard = () => {
         <ViewFormModal
           formData={selectedForm}
           onClose={closeFormView}
-          onAction={handleAction}
+          onAction={(id, action, comment, signature) =>
+            handleAction(selectedForm.form_type, id, action, comment, signature)
+          }
         />
       )}
     </div>
   );
 };
 
-export default SupervisorDashboard;
\ No newline at end of file
+export default SupervisorDashboard;
diff --git a/client/src/pages/ViewFormModal.js b/client/src/pages/ViewFormModal.js
index 86f42b4f..c759c2f1 100644
--- a/client/src/pages/ViewFormModal.js
+++ b/client/src/pages/ViewFormModal.js
@@ -3,85 +3,90 @@ import "../styles/SupervisorDashboard.css";
 
 const ViewFormModal = ({ formData, onClose, onAction }) => {
   const [comment, setComment] = useState("");
+  const [signature, setSignature] = useState("");
   const [error, setError] = useState("");
 
   const handleDecision = (action) => {
-    if (!comment.trim()) {
-      setError("Comment is required before taking action.");
-      return;
-    }
-
-    const confirmed = window.confirm(`Are you sure you want to ${action} this request?`);
-    if (!confirmed) return;
-
+    if (!comment.trim()) return setError("Comment is required.");
+    if (!signature.trim()) return setError("Signature is required.");
     setError("");
-    onAction(formData._id, action, comment.trim());
+    onAction(formData._id, action, comment.trim(), signature.trim());
   };
 
-  const formatSignature = (sig) =>
-    sig?.type === "text" ? `${sig.value} (Font: ${sig.font})` : "Signature unavailable";
-
-  return (
-    <div className="modal-overlay">
-      <div className="modal-box" style={{ maxHeight: "90vh", overflowY: "auto" }}>
-        <h2>A3 – Job Performance Evaluation</h2>
-
-        <h3>Internee Details</h3>
-        <p><strong>Name:</strong> {formData.interneeName}</p>
-        <p><strong>Sooner ID:</strong> {formData.interneeID}</p>
-        <p><strong>Email:</strong> {formData.interneeEmail}</p>
-
-        <h3>Evaluation</h3>
-        {formData.evaluations?.length > 0 ? (
-          <table className="dashboard-table" style={{ marginTop: "10px" }}>
-            <thead>
-              <tr>
-                <th>Category</th>
-                <th>Rating</th>
-                <th>Comment</th>
-              </tr>
-            </thead>
-            <tbody>
-              {formData.evaluations.map((item, index) => (
-                <tr key={index}>
-                  <td>{item.category}</td>
-                  <td>{item.rating}</td>
-                  <td>{item.comment || "-"}</td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        ) : (
-          <p>No evaluation data found.</p>
-        )}
+  // ✅ Inserted rendering helpers
+  const renderA1 = () => (
+    <>
+      <h2>A1 – Internship Request Form</h2>
+      <p><strong>Name:</strong> {formData.studentName}</p>
+      <p><strong>Email:</strong> {formData.studentEmail}</p>
+      <p><strong>Sooner ID:</strong> {formData.soonerId}</p>
+      <p><strong>Workplace:</strong> {formData.workplace?.name}</p>
+    </>
+  );
 
-        <h3>Signatures</h3>
-        <p><strong>Advisor Signature:</strong> {formatSignature(formData.advisorSignature)}</p>
-        <p><strong>Coordinator Signature:</strong> {formatSignature(formData.coordinatorSignature)}</p>
+  const renderA3 = () => (
+    <>
+      <h2>A3 – Final Job Performance Evaluation</h2>
+      <p><strong>Name:</strong> {formData.interneeName}</p>
+      <p><strong>Email:</strong> {formData.interneeEmail}</p>
+      <p><strong>Sooner ID:</strong> {formData.interneeID}</p>
 
-        <div style={{ marginTop: "15px" }}>
-          <label><strong>Comment:</strong></label>
-          <textarea
-            value={comment}
-            onChange={(e) => setComment(e.target.value)}
-            placeholder="Add your comment before approval or rejection"
-            rows={4}
-            style={{ width: "100%", marginTop: "5px", borderRadius: "4px", padding: "8px" }}
-          />
-          {error && <p style={{ color: "red", marginTop: "5px" }}>{error}</p>}
-        </div>
+      <h3>Evaluation Items</h3>
+      <table className="dashboard-table">
+        <thead>
+          <tr>
+            <th>Category</th>
+            <th>Rating</th>
+            <th>Comment</th>
+          </tr>
+        </thead>
+        <tbody>
+          {formData.evaluations?.map((item, i) => (
+            <tr key={i}>
+              <td>{item.category}</td>
+              <td>{item.rating}</td>
+              <td>{item.comment || "-"}</td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </>
+  );
 
-        <div style={{ display: "flex", justifyContent: "center", gap: "10px", marginTop: "15px" }}>
-          <button className="approve" onClick={() => handleDecision("approve")}>Approve</button>
-          <button className="reject" onClick={() => handleDecision("reject")}>Reject</button>
-        </div>
+  const renderSignaturesAndActions = () => (
+    <>
+      <h3>Supervisor Review</h3>
+      <label>Signature:</label>
+      <input
+        type="text"
+        value={signature}
+        onChange={(e) => setSignature(e.target.value)}
+        style={{ width: "100%", marginBottom: "8px" }}
+      />
+      <label>Comment:</label>
+      <textarea
+        value={comment}
+        onChange={(e) => setComment(e.target.value)}
+        rows={3}
+        style={{ width: "100%" }}
+      />
+      {error && <p style={{ color: "red" }}>{error}</p>}
+      <div style={{ marginTop: "10px", display: "flex", justifyContent: "center", gap: "10px" }}>
+        <button className="approve" onClick={() => handleDecision("approve")}>Approve</button>
+        <button className="reject" onClick={() => handleDecision("reject")}>Reject</button>
+        <button onClick={onClose}>Close</button>
+      </div>
+    </>
+  );
 
-        <div style={{ marginTop: "10px", textAlign: "center" }}>
-          <button className="reject" onClick={onClose}>Close</button>
-        </div>
+  return (
+    <div className="modal-overlay">
+      <div className="modal-box" style={{ maxHeight: "90vh", overflowY: "auto" }}>
+        {formData.form_type === "A1" ? renderA1() : renderA3()}
+        {renderSignaturesAndActions()}
       </div>
     </div>
   );
 };
 
-export default ViewFormModal;
\ No newline at end of file
+export default ViewFormModal;
diff --git a/server/controllers/approvalController.js b/server/controllers/approvalController.js
index 32582466..3e96e640 100644
--- a/server/controllers/approvalController.js
+++ b/server/controllers/approvalController.js
@@ -1,62 +1,119 @@
-const Submission = require("../models/Submission");
 const InternshipRequest = require("../models/InternshipRequest");
+const WeeklyReport = require("../models/WeeklyReport");
+const Evaluation = require("../models/Evaluation");
 const EmailService = require("../services/emailService");
 
-// Get Supervisor Pending Submissions
-exports.getPendingSubmissions = async (req, res) => {
+// =========================================== //
+//           Managing Supervisor Forms         //
+// =========================================== //
+
+exports.getSupervisorForms = async (req, res, filter) => {
   try {
-    const submissions = await Submission.find({ supervisor_status: "pending" });
-    res.json(submissions);
+    const requests = await InternshipRequest.find(filter).populate("student_id", "userName email");
+    const typedRequests = requests.map((req) => ({
+      ...req.toObject(),
+      form_type: "A1",
+    }));
+
+    const reports = await WeeklyReport.find(filter).populate("student_id", "userName email");
+    const typedReports = reports.map((report) => ({
+      ...report.toObject(),
+      form_type: "A2",
+    }));
+
+    const evaluations = await Evaluation.find(filter).populate("student_id", "userName email");
+    const typedEvaluations = evaluations.map((evaluation) => ({
+      ...evaluation.toObject(),
+      form_type: "A3",
+    }));
+
+    const allRequests = [...typedRequests, ...typedReports, ...typedEvaluations];
+    allRequests.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
+
+    res.status(200).json(allRequests);
   } catch (err) {
     res.status(500).json({
-      message: "Failed to fetch pending submissions",
+      message: "Failed to fetch internship requests",
       error: err.message,
     });
   }
 };
 
-// Supervisor Approve Submission
-exports.approveSubmission = async (req, res) => {
-  const { id } = req.params;
-  const { comment } = req.body;
+exports.handleSupervisorFormAction = async (req, res, action) => {
   try {
-    const submission = await Submission.findByIdAndUpdate(
-      id,
-      { supervisor_status: "Approved", supervisor_comment: comment || "" },
-      { new: true }
-    );
-    if (!submission)
-      return res.status(404).json({ message: "Submission not found" });
-    res.json({ message: "Submission Approved", updatedSubmission: submission });
+    const form_type = req.params.type;
+    const formId = req.params.id;
+    const { comment = "", signature = "" } = req.body;
+
+    const models = {
+      A1: require("../models/InternshipRequest"),
+      A2: require("../models/WeeklyReport"),
+      A3: require("../models/Evaluation"),
+    };
+
+    const FormModel = models[form_type];
+    if (!FormModel) {
+      return res.status(400).json({ message: "Invalid form type" });
+    }
+
+    if (!["approve", "reject"].includes(action)) {
+      return res.status(400).json({ message: "Invalid action" });
+    }
+
+    const update = {
+      supervisor_status: action === "approve" ? "approved" : "rejected",
+      supervisor_comment: comment + (signature ? ` | Supervisor Signature: ${signature}` : ""),
+    };
+
+    const form = await FormModel.findByIdAndUpdate(formId, update, {
+      new: true,
+    }).populate("student_id", "userName email");
+
+    if (!form) {
+      return res.status(404).json({ message: "Form not found" });
+    }
+
+    // 🔍 Resolve recipient email based on form structure
+    const studentEmail =
+      form.student_id?.email ||
+      form.interneeEmail ||
+      form.studentEmail ||
+      null;
+
+    if (!studentEmail) {
+      console.warn("⚠️ No student email found for form:", form._id);
+    } else {
+      const emailSubject = `Form ${action === "approve" ? "Approved" : "Rejected"}`;
+      let emailBody = `<p>Your ${form_type} form has been ${action}ed by the supervisor.</p>`;
+      if (comment) {
+        emailBody += `<p>Comment: ${comment}</p>`;
+      }
+
+      await EmailService.sendEmail({
+        to: studentEmail,
+        subject: emailSubject,
+        html: emailBody,
+      });
+    }
+
+    res.status(200).json({
+      message: `Form ${action}ed successfully`,
+      updatedForm: form,
+    });
   } catch (err) {
-    res.status(500).json({ message: "Approval Failed", error: err });
+    console.error("SupervisorFormAction error:", err);
+    res.status(500).json({ message: "Error processing form", error: err.message });
   }
 };
 
-// Supervisor Reject Submission
-exports.rejectSubmission = async (req, res) => {
-  const { id } = req.params;
-  const { comment } = req.body;
-  try {
-    const submission = await Submission.findByIdAndUpdate(
-      id,
-      { supervisor_status: "Rejected", supervisor_comment: comment || "" },
-      { new: true }
-    );
-    if (!submission)
-      return res.status(404).json({ message: "Submission not found" });
-    res.json({ message: "Submission Rejected", updatedSubmission: submission });
-  } catch (err) {
-    res.status(500).json({ message: "Rejection Failed", error: err });
-  }
-};
+// =========================================== //
+//           Coordinator Dashboard             //
+// =========================================== //
 
-// Coordinator Dashboard: Get All Internship Requests
 exports.getCoordinatorRequests = async (req, res) => {
   try {
-    const requests = await InternshipRequest.find({
-      status: "submitted",
-    }).populate("student", "userName email");
+    const requests = await InternshipRequest.find({ status: "submitted" })
+      .populate("student", "userName email");
     res.status(200).json(requests);
   } catch (err) {
     res.status(500).json({ message: "Failed to fetch requests" });
@@ -66,9 +123,7 @@ exports.getCoordinatorRequests = async (req, res) => {
 exports.getCoordinatorRequestDetails = async (req, res) => {
   try {
     const requestData = await InternshipRequest.findById(req.params.id).lean();
-
-    if (!requestData)
-      return res.status(404).json({ message: "Request not found" });
+    if (!requestData) return res.status(404).json({ message: "Request not found" });
 
     res.status(200).json({ requestData, supervisorStatus: "Not Submitted" });
   } catch (err) {
@@ -94,7 +149,7 @@ exports.coordinatorApproveRequest = async (req, res) => {
 
     res.json({ message: "Request Approved Successfully" });
   } catch (err) {
-    res.status(500).json({ message: "Approval failed" });
+    res.status(500).json({ message: "Approval failed", error: err.message });
   }
 };
 
@@ -119,6 +174,6 @@ exports.coordinatorRejectRequest = async (req, res) => {
 
     res.json({ message: "Request Rejected Successfully" });
   } catch (err) {
-    res.status(500).json({ message: "Rejection failed" });
+    res.status(500).json({ message: "Rejection failed", error: err.message });
   }
 };
diff --git a/server/index.js b/server/index.js
index 009215f8..9bd92537 100644
--- a/server/index.js
+++ b/server/index.js
@@ -17,7 +17,7 @@ const outcomeRoutes = require("./routes/outcomeRoutes");
 const cronJobManager = require("./utils/cronUtils");
 const { registerAllJobs } = require("./jobs/registerCronJobs");
 const Evaluation = require("./models/Evaluation");
-const evaluationRoutes = require("./routes/evaluationRoutes");
+
 
 const app = express();
 app.use(express.json());
@@ -26,7 +26,6 @@ app.use("/api/form", formRoutes); // register route as /api/form/submit
 app.use("/api/email", emailRoutes);
 app.use("/api/token", tokenRoutes);
 app.use("/api", outcomeRoutes);
-app.use("/api/evaluation", evaluationRoutes);
 
 const mongoConfig = {
   serverSelectionTimeoutMS: 5000,
diff --git a/server/routes/approvalRoutes.js b/server/routes/approvalRoutes.js
index a365622e..0913ac09 100644
--- a/server/routes/approvalRoutes.js
+++ b/server/routes/approvalRoutes.js
@@ -2,9 +2,8 @@ const express = require("express");
 const router = express.Router();
 
 const {
-  getPendingSubmissions,
-  approveSubmission,
-  rejectSubmission,
+  getSupervisorForms,
+  handleSupervisorFormAction,
   getCoordinatorRequests,
   getCoordinatorRequestDetails,
   coordinatorApproveRequest,
@@ -13,17 +12,38 @@ const {
 
 const { isSupervisor, isCoordinator } = require("../middleware/authMiddleware");
 
+// =========================================== //
+//          Supervisor Approval Routes         //
+// =========================================== //
+
 // Supervisor APIs
-router.get("/submissions/pending", isSupervisor, getPendingSubmissions);
-router.post("/submissions/:id/approve", isSupervisor, approveSubmission);
-router.post("/submissions/:id/reject", isSupervisor, rejectSubmission);
+router.get("/supervisor/forms", isSupervisor, (req, res) => {
+    // const supervisorId = req.user._id,
+    return getSupervisorForms(req, res, {
+        // supervisor_id: supervisorId,
+        supervisor_status: { $in: ["pending"] },
+    })
+});
+// Approve route
+router.post("/supervisor/form/:type/:id/approve", isSupervisor, (req, res) =>
+    handleSupervisorFormAction(req, res, "approve")
+);
+
+// Reject route
+router.post("/supervisor/form/:type/:id/reject", isSupervisor, (req, res) =>
+    handleSupervisorFormAction(req, res, "reject")
+);
+
+// =========================================== //
+//         Coordinator Approval Routes         //
+// =========================================== //
 
 // Coordinator APIs
 router.get("/coordinator/requests", isCoordinator, getCoordinatorRequests);
 router.get(
-  "/coordinator/request/:id",
-  isCoordinator,
-  getCoordinatorRequestDetails
+    "/coordinator/request/:id",
+    isCoordinator,
+    getCoordinatorRequestDetails
 );
 router.post(
   "/coordinator/request/:id/approve",
@@ -36,4 +56,4 @@ router.post(
   coordinatorRejectRequest
 );
 
-module.exports = router;
+module.exports = router;
\ No newline at end of file
diff --git a/server/routes/formRoutes.js b/server/routes/formRoutes.js
index c80f3ebe..fbbf298d 100644
--- a/server/routes/formRoutes.js
+++ b/server/routes/formRoutes.js
@@ -1,71 +1,85 @@
-const express = require('express');
+const express = require("express");
 const router = express.Router();
-const { insertFormData } = require('../services/insertData');
+const InternshipRequest = require('../models/InternshipRequest');
+const Evaluation = require('../models/Evaluation');
+const emailService = require("../services/emailService");
 
-let status = '';
+// ==========================
+// A1: InternshipRequest Form
+// ==========================
 
-// Validate required fields
-function validateFormData(formData) {
-  const requiredFields = [
-    'workplaceName',
-    'website',
-    'phone',
-    'advisorName',
-    'advisorJobTitle',
-    'advisorEmail',
-    'creditHours',
-    'startDate',
-    'endDate',
-    'tasks'
-  ];
+// Submit A1 form
+router.post("/submit", async (req, res) => {
+  try {
+    const form = new InternshipRequest({
+      ...req.body,
+      supervisor_status: "pending" // ✅ Required for dashboard visibility
+    });
 
-  for (const field of requiredFields) {
-    if (!formData[field] || formData[field] === '') {
-      return `Missing or empty required field: ${field}`;
-    }
+    await form.save();
+    res.status(201).json({ message: "A1 form submitted successfully!" });
+  } catch (error) {
+    console.error("A1 Validation Errors:", error.errors);
+    res.status(400).json({ message: error.message, errors: error.errors });
   }
+});
 
-  if (!Array.isArray(formData.tasks) || formData.tasks.length === 0) {
-    return 'Tasks must be a non-empty array';
+// Get all A1 forms for supervisor (if still used anywhere)
+router.get('/a1forms', async (req, res) => {
+  try {
+    const forms = await InternshipRequest.find({
+      $or: [
+        { supervisor_comment: { $exists: false } },
+        { supervisor_comment: "" }
+      ]
+    }).sort({ createdAt: -1 });
+
+    res.status(200).json(forms);
+  } catch (error) {
+    console.error('Error fetching A.1 forms:', error);
+    res.status(500).json({ message: 'Failed to fetch forms' });
   }
-  // for (const [index, task] of formData.tasks.entries()) {
-  //   if (!task.description || !task.outcomes) {
-  //     return `Task at index ${index} is missing description or outcomes`;
-  //   }
-  // }
+});
 
-  // uncomment below if student has to fill in task outcomes
-  // const filledTasks = formData.tasks.filter((task) => task.description && task.outcomes );  
-  // if (filledTasks.length < 3)
-  //   return `At least 3 tasks must have description and outcomes; only ${filledTasks.length} do`;
+// Get a specific A1 form by Sooner ID
+router.get('/a1forms/:soonerId', async (req, res) => {
+  try {
+    const form = await InternshipRequest.findOne({
+      soonerId: req.params.soonerId,
+      $or: [
+        { supervisor_comment: { $exists: false } },
+        { supervisor_comment: "" }
+      ]
+    });
 
-  const tasks = formData.tasks;
-  console.log(tasks);
-  if (tasks.filter((task) => task.description).length < 3)
-    return 'At least 3 tasks must be provided';
-  const uniqueOutcomes = new Set();
-  tasks.forEach((task) => {
-    if (Array.isArray(task.outcomes)) {
-      task.outcomes.forEach(outcome => uniqueOutcomes.add(outcome));
-    } 
-  });
-  formData.status = uniqueOutcomes.size < 3 ? 'pending manual review' : 'submitted';
-  return null;
-}
+    if (!form) {
+      return res.status(404).json({ message: "Form not found" });
+    }
 
-router.post('/submit', async (req, res) => {
-  const formData = req.body;
-  const validationError = validateFormData(formData);
-  if (validationError) {
-    return res.status(400).json({ message: validationError });
+    res.status(200).json(form);
+  } catch (error) {
+    console.error('Error fetching form:', error);
+    res.status(500).json({ message: 'Error fetching form' });
   }
+});
 
+// ===================
+// A3: Evaluation Form
+// ===================
+
+// Submit A3 form
+router.post("/submit-a3", async (req, res) => {
   try {
-    await insertFormData(formData);
-    res.status(200).json({ message: 'Form received and handled!', status, manual: formData.status !== 'submitted'});
-  } catch (error) {
-    console.error('Error handling form data:', error);
-    res.status(500).json({ message: 'Something went wrong' });
+    const form = new Evaluation({
+      ...req.body,
+      supervisor_status: "pending" // ✅ Required for dashboard visibility
+    });
+
+    await form.save();
+    res.status(201).json({ message: "A3 form submitted successfully!" });
+  } catch (err) {
+    console.error("A3 submission error:", err);
+    res.status(500).json({ message: "Failed to submit A3 form" });
   }
 });
 

From d8c58cc9cd11c43c247240eacd9045fb5a863790 Mon Sep 17 00:00:00 2001
From: Mahima <mahi.ch@tuta.io>
Date: Mon, 21 Apr 2025 03:05:27 -0500
Subject: [PATCH 6/6] Resolve conflict: delete evaluationRoutes.js after rebase

---
 .DS_Store                         | Bin 6148 -> 0 bytes
 server/routes/evaluationRoutes.js |  75 ------------------------------
 2 files changed, 75 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 server/routes/evaluationRoutes.js

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 2e8fb0f442aea0379f8042d68e67b48ec7e9c756..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKK}*9h6n>d=wurEU!Y)F=>zH$jAYSU62M=DX=s{(!c4)CSvUct;20iPK@#-(}
z@929;Cf2FPq4FNQd@nEWCC!(RGyou){a_8C3;-4?VZp}Y3!!$>2`L!QETT|-#E|Ys
z^3so_KM~E2-^c*1T?sBBf)KipUq9LuJE*l+CF=8SID|d)w%`D<2DcD=SaHgD`jk<E
z1bgnmJ(c-bvHVl4KS=J(PI~t5qA*G8^%qf?DbAMWEX$g=&b@0n@X}7&Pnw<HDb<do
zjQp|P@sGpqpj}?vm2uh$<8DtSgh3ZW&Q8KOkb|b|$3dcUJ>6j0w%smQhQr2Yz3Qwt
zwnkNFxYa;=V|{ZpvaO|+)$POfO>`T}2gL~p-2F-x436Oujoke2y<Qy2_zL~woN+88
zGr$Zm1Jh%`oIuw6^oHb-m;q+sk1#;zgM&)w8q74RqXP@|1VAjJTM63q6G%CZLDyiW
z5nE7%PDRwI!aOmAPDj6E;#`B7Mx74AJU)aOS(q1!P@`l2jtU3iYUGj`U<UFG%;;*F
z?*F~--~ag}t}z45z`tTZ6kA@aiBmFn>%`>fu60l^P)R5*)A*i(hPsL|magIosuJ`&
XWFWc*GmYp$;U57-0~gG|R2g^!o=|Zv

diff --git a/server/routes/evaluationRoutes.js b/server/routes/evaluationRoutes.js
deleted file mode 100644
index 0cfd13aa..00000000
--- a/server/routes/evaluationRoutes.js
+++ /dev/null
@@ -1,75 +0,0 @@
-const express = require('express');
-const router = express.Router();
-const Evaluation = require('../models/Evaluation');
-
-//POST: Submit A3 Form
-router.post('/submit', async (req, res) => {
-  try {
-    const formData = req.body;
-    const newEvaluation = new Evaluation(formData);
-    await newEvaluation.save();
-    res.status(201).json({ message: 'A3 form submitted successfully.' });
-  } catch (error) {
-    console.error('Error submitting A3 form:', error);
-    res.status(500).json({ error: 'Failed to submit A3 form.' });
-  }
-});
-
-//GET: Fetch A3 Forms for Supervisor Dashboard
-router.get('/', async (req, res) => {
-    try {
-        const evaluations = await Evaluation.find({ supervisor_status: "pending" }).sort({ createdAt: -1 }); // ⬅️ Add sorting
-        res.status(200).json(evaluations);
-    } catch (error) {
-      console.error('Error fetching evaluations:', error);
-      res.status(500).json({ error: 'Failed to fetch evaluations.' });
-    }
-  });
-
-//POST: Approve A3 Form
-router.post('/:id/approve', async (req, res) => {
-  try {
-    const { id } = req.params;
-    const { comment } = req.body;
-
-    const updated = await Evaluation.findByIdAndUpdate(
-      id,
-      {
-        supervisor_status: 'approved',
-        supervisor_comment: comment || '',
-      },
-      { new: true }
-    );
-
-    if (!updated) return res.status(404).json({ error: 'Form not found.' });
-    res.status(200).json({ message: 'Form approved successfully.', updated });
-  } catch (error) {
-    console.error('Error approving A3 form:', error);
-    res.status(500).json({ error: 'Failed to approve request.' });
-  }
-});
-
-//Reject A3 Form
-router.post('/:id/reject', async (req, res) => {
-  try {
-    const { id } = req.params;
-    const { comment } = req.body;
-
-    const updated = await Evaluation.findByIdAndUpdate(
-      id,
-      {
-        supervisor_status: 'rejected',
-        supervisor_comment: comment || '',
-      },
-      { new: true }
-    );
-
-    if (!updated) return res.status(404).json({ error: 'Form not found.' });
-    res.status(200).json({ message: 'Form rejected successfully.', updated });
-  } catch (error) {
-    console.error('Error rejecting A3 form:', error);
-    res.status(500).json({ error: 'Failed to reject request.' });
-  }
-});
-
-module.exports = router;