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 &&
{errors.interneeName}
} @@ -418,7 +430,8 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => { id="interneeEmail" value={formData.interneeEmail} onChange={handleInputChange} - disabled={!isFieldEditable("interneeEmail")} + disabled + // disabled={!isFieldEditable("interneeEmail")} /> {errors.interneeEmail &&
{errors.interneeEmail}
} diff --git a/server/models/InternshipRequest.js b/server/models/InternshipRequest.js index bbb4ee7e..d66fbf62 100644 --- a/server/models/InternshipRequest.js +++ b/server/models/InternshipRequest.js @@ -22,12 +22,28 @@ const Task = new mongoose.Schema({ }); const formA1 = new mongoose.Schema({ - ...formMetadata, - 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, + }, }, + ...formMetadata, + // student: { + // type: ObjectId, + // required: true, + // ref: 'UserTokenRequest' + // }, workplace: { name: { type: String, diff --git a/server/services/insertData.js b/server/services/insertData.js index 8d0e9541..99348e1c 100644 --- a/server/services/insertData.js +++ b/server/services/insertData.js @@ -19,7 +19,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,