Skip to content

Commit 3b11825

Browse files
Merge pull request #157 from IPMS-Project/GroupC/APIendpoints
Group C Sprint 4 PR - A1 Schema
2 parents f7620d5 + 14db36d commit 3b11825

File tree

3 files changed

+41
-8
lines changed

3 files changed

+41
-8
lines changed

client/src/pages/A1InternshipRequestForm.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,17 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
128128
}
129129
};
130130

131+
useEffect(() => {
132+
const storedUser = JSON.parse(localStorage.getItem("ipmsUser"));
133+
if (storedUser) {
134+
setFormData((prev) => ({
135+
...prev,
136+
interneeName: storedUser.fullName || "",
137+
interneeEmail: storedUser.email || ""
138+
}));
139+
}
140+
}, []);
141+
131142
const handleInputChange = (e) => {
132143
const { id, value } = e.target;
133144
setFormData((prev) => ({ ...prev, [id]: value }));
@@ -349,7 +360,8 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
349360
id="interneeName"
350361
value={formData.interneeName}
351362
onChange={handleInputChange}
352-
disabled={!isFieldEditable("interneeName")}
363+
// disabled={!isFieldEditable("interneeName")}
364+
disabled
353365
/>
354366
{errors.interneeName && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeName}</div>}
355367
</td>
@@ -418,7 +430,8 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
418430
id="interneeEmail"
419431
value={formData.interneeEmail}
420432
onChange={handleInputChange}
421-
disabled={!isFieldEditable("interneeEmail")}
433+
disabled
434+
// disabled={!isFieldEditable("interneeEmail")}
422435
/>
423436
{errors.interneeEmail && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeEmail}</div>}
424437
</td>

server/models/InternshipRequest.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,28 @@ const Task = new mongoose.Schema({
2222

2323
});
2424
const formA1 = new mongoose.Schema({
25-
...formMetadata,
26-
student: {
27-
type: ObjectId,
28-
required: true,
29-
ref: 'UserTokenRequest'
25+
// student: {
26+
// type: ObjectId,
27+
// required: true,
28+
// ref: 'UserTokenRequest'
29+
// },
30+
student:{
31+
name:{
32+
type: String,
33+
required: true,
34+
},
35+
email:{
36+
unique: true,
37+
type: String,
38+
required:true,
39+
},
3040
},
41+
...formMetadata,
42+
// student: {
43+
// type: ObjectId,
44+
// required: true,
45+
// ref: 'UserTokenRequest'
46+
// },
3147
workplace: {
3248
name: {
3349
type: String,

server/services/insertData.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ async function insertFormData(formData) {
1919
}
2020

2121
const formattedData = {
22-
student: new mongoose.Types.ObjectId(), // TODO: Replace with actual signed-in student ID
22+
// student: new mongoose.Types.ObjectId(), // TODO: Replace with actual signed-in student ID
23+
student:{
24+
name:formData.interneeName,
25+
email:formData.interneeEmail
26+
},
2327
workplace: {
2428
name: formData.workplaceName,
2529
website: formData.website,

0 commit comments

Comments
 (0)