From 0f78b05e33b9122d51ffc1fa162afa784a575b9f Mon Sep 17 00:00:00 2001 From: nethra4321 <108627909+nethra4321@users.noreply.github.com> Date: Thu, 24 Apr 2025 11:25:13 -0500 Subject: [PATCH 1/2] saving changes --- server/models/InternshipRequest.js | 19 +++++++++++++++---- server/services/insertData.js | 6 +++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/server/models/InternshipRequest.js b/server/models/InternshipRequest.js index 14b7bdc4..d5950cb2 100644 --- a/server/models/InternshipRequest.js +++ b/server/models/InternshipRequest.js @@ -13,10 +13,21 @@ const Task = new mongoose.Schema({ } }); const formA1 = new mongoose.Schema({ - student: { - type: ObjectId, - required: true, - ref: 'UserTokenRequest' + // student: { + // type: ObjectId, + // required: true, + // ref: 'UserTokenRequest' + // }, + student:{ + name:{ + type: String, + required: true, + }, + email:{ + unique: true, + type: String, + required:true, + }, }, workplace: { name: { diff --git a/server/services/insertData.js b/server/services/insertData.js index 27eded26..b31ef8ea 100644 --- a/server/services/insertData.js +++ b/server/services/insertData.js @@ -20,7 +20,11 @@ async function insertFormData(formData) { } const formattedData = { - student: new mongoose.Types.ObjectId(), // TODO: Replace with actual signed-in student ID + // student: new mongoose.Types.ObjectId(), // TODO: Replace with actual signed-in student ID + student:{ + name:formData.interneeName, + email:formData.interneeEmail + }, workplace: { name: formData.workplaceName, website: formData.website, From 14db36df76d1f63ffd83d3730b8834e53a051132 Mon Sep 17 00:00:00 2001 From: nethra4321 <108627909+nethra4321@users.noreply.github.com> Date: Thu, 24 Apr 2025 15:14:47 -0500 Subject: [PATCH 2/2] added student name, email to schema. Auto populated name and email fields --- client/src/pages/A1InternshipRequestForm.js | 17 +++++++++++++++-- server/models/InternshipRequest.js | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/client/src/pages/A1InternshipRequestForm.js b/client/src/pages/A1InternshipRequestForm.js index 009a0979..82950c9c 100644 --- a/client/src/pages/A1InternshipRequestForm.js +++ b/client/src/pages/A1InternshipRequestForm.js @@ -128,6 +128,17 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => { } }; + useEffect(() => { + const storedUser = JSON.parse(localStorage.getItem("ipmsUser")); + if (storedUser) { + setFormData((prev) => ({ + ...prev, + interneeName: storedUser.fullName || "", + interneeEmail: storedUser.email || "" + })); + } + }, []); + const handleInputChange = (e) => { const { id, value } = e.target; setFormData((prev) => ({ ...prev, [id]: value })); @@ -349,7 +360,8 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => { id="interneeName" value={formData.interneeName} onChange={handleInputChange} - disabled={!isFieldEditable("interneeName")} + // disabled={!isFieldEditable("interneeName")} + disabled /> {errors.interneeName &&