Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions server/Submission.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const mongoose = require('mongoose');

const SubmissionSchema = new mongoose.Schema({
student: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true },
internshipRequest: { type: mongoose.Schema.Types.ObjectId, ref: 'InternshipRequest' },
status: { type: String, default: 'pending' },
submittedAt: { type: Date, default: Date.now },
});

module.exports = mongoose.model('Submission', SubmissionSchema);
10 changes: 10 additions & 0 deletions server/models/Submission.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const mongoose = require('mongoose');

const SubmissionSchema = new mongoose.Schema({
student: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true },
internshipRequest: { type: mongoose.Schema.Types.ObjectId, ref: 'InternshipRequest' },
status: { type: String, default: 'pending' },
submittedAt: { type: Date, default: Date.now },
});

module.exports = mongoose.model('Submission', SubmissionSchema);
38 changes: 3 additions & 35 deletions server/routes/approvalRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ const InternshipRequest = require("../models/InternshipRequest");

// Supervisor APIs
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")
Expand All @@ -44,37 +43,6 @@ router.get("/coordinator/request/:id", isCoordinator, getCoordinatorRequestDetai
router.post("/coordinator/request/:id/approve", isCoordinator, coordinatorApproveRequest);
router.post("/coordinator/request/:id/reject", isCoordinator, coordinatorRejectRequest);

const approveFormA3 = async (req, res) => {
const { formId } = req.params;

try {
//find the form by formId
const form = await Evaluation.findById(formId);

if (!form) {
return res.status(404).json({ message: "Form not found" });
}

//check if form is already locked
if (form.locked) {
return res.status(403).json({ message: "This form is locked and cannot be edited." });
}

//approve the form
form.status = "approved";

//lock the form after approval by coordinator
form.locked = true;

await form.save();

return res.status(200).json({ message: "Form A.3 approved and locked successfully!" });
} catch (err) {
console.error("Error approving form A.3:", err);
return res.status(500).json({ message: "Something went wrong" });
}
};

// NEW Coordinator API: Approve Form A.3
router.post("/coordinator/form-a3/:formId/approve", isCoordinator, approveFormA3);

Expand All @@ -100,4 +68,4 @@ router.post("/form/:formId/approve", async (req, res) => {
}
});

module.exports = router;
module.exports = router;
3 changes: 1 addition & 2 deletions server/services/insertData.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ async function insertFormData(formData) {
try {
console.log("Received Form Data:\n", JSON.stringify(formData, null, 2));

// Dynamically find the student based on email
const student = await User.findOne({ email: formData.email });

if (!student) {
throw new Error("Student not found in users collection");
}

const formattedData = {
student: student._id, // ✅ Real user's ID from database
student: student._id,
workplace: {
name: formData.workplaceName,
website: formData.website,
Expand Down