Skip to content

Group C PR Sprint 4 #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Charan-Nimmagadda merged 5 commits into from
Apr 29, 2025
Merged

Group C PR Sprint 4 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d10c696
worked on ui enhancements
sanjay347 Apr 28, 2025
91bf277
made some final changes to the a1form
sanjay347 Apr 28, 2025
628ff57
made the changes
sanjay347 Apr 29, 2025
2c75b9f
made some changes
sanjay347 Apr 29, 2025
abf38d5
remove package fiel
sanjay347 Apr 29, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ pids
*.seed
*.pid.lock



# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

Expand Down
166 changes: 46 additions & 120 deletions client/src/pages/A1InternshipRequestForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const outcomeDescriptions = [
"Apply computer science algorithms to create practical solutions",
];

// Signature font options
const signatureFonts = [
{ name: "Dancing Script", class: "font-dancing-script" },
{ name: "Great Vibes", class: "font-great-vibes" },
Expand All @@ -29,7 +28,7 @@ const signatureFonts = [
{ name: "Caveat", class: "font-caveat" }
];

// Signature Font Picker Component

const SignatureInput = ({ id, value, onChange, disabled, placeholder }) => {
const [showFonts, setShowFonts] = useState(false);
const [selectedFont, setSelectedFont] = useState(signatureFonts[0].class);
Expand Down Expand Up @@ -91,7 +90,7 @@ const SignatureInput = ({ id, value, onChange, disabled, placeholder }) => {
const A1InternshipRequestForm = ({ userRole = "student" }) => {
const initialState = {
interneeName: "",
soonerId: "",
// soonerId: "",
interneeEmail: "",
workplaceName: "",
website: "",
Expand All @@ -102,10 +101,8 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
advisorJobTitle: "",
advisorEmail: "",
interneeSignature: "",
advisorSignature: "",
coordinatorApproval: "",
creditHours: "",
tasks: Array(5).fill({ description: "", outcomes: [] }), // Updated for outcomes
tasks: Array(5).fill({ description: "", outcomes: [] }),
supervisorComments: "",
coordinatorComments: "",
};
Expand Down Expand Up @@ -223,15 +220,15 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {

const validateForm = () => {
const namePattern = /^[A-Za-z\s]+$/;
const numberPattern = /^[0-9]+$/;
// const numberPattern = /^[0-9]+$/;
const phonePattern = /^[0-9]{10}$/;
const emailPattern = /^[\w.-]+@([\w-]+\.)+[\w-]{2,4}$/;
const newErrors = {};

if (!formData.interneeName) newErrors.interneeName = "Internee name is required";
else if (!namePattern.test(formData.interneeName)) newErrors.interneeName = "Name should contain only letters and spaces";
if (!formData.soonerId) newErrors.soonerId = "Sooner ID is required";
else if (!numberPattern.test(formData.soonerId)) newErrors.soonerId = "Sooner ID should be numeric";
//if (!formData.soonerId) newErrors.soonerId = "Sooner ID is required";
//else if (!numberPattern.test(formData.soonerId)) newErrors.soonerId = "Sooner ID should be numeric";
if (!formData.interneeEmail) newErrors.interneeEmail = "Email is required";
else if (!emailPattern.test(formData.interneeEmail)) newErrors.interneeEmail = "Invalid email format";
if (!formData.workplaceName) newErrors.workplaceName = "Workplace name is required";
Expand All @@ -247,12 +244,6 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
else if (!emailPattern.test(formData.advisorEmail)) newErrors.advisorEmail = "Invalid supervisor email format";
if (!formData.interneeSignature) newErrors.interneeSignature = "Internee signature is required";
else if (!namePattern.test(formData.interneeSignature)) newErrors.interneeSignature = "Signature should contain only letters and spaces";
if (formData.advisorSignature && !namePattern.test(formData.advisorSignature)) {
newErrors.advisorSignature = "Signature should contain only letters and spaces";
}
if (formData.coordinatorApproval && !namePattern.test(formData.coordinatorApproval)) {
newErrors.coordinatorApproval = "Approval should contain only letters and spaces";
}
if (!formData.creditHours) newErrors.creditHours = "Please select credit hours";
const tasksFilled = formData.tasks.filter((task) => task.description.trim() !== "").length >= 3;
if (!tasksFilled) newErrors.tasks = "At least 3 tasks are required";
Expand Down Expand Up @@ -354,7 +345,7 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
<tbody>
<tr>
<td colSpan="3">
Name<span className="required-asterisk">*</span>:<br />
First Name<span className="required-asterisk">*</span>:<br />
<input
type="text"
id="interneeName"
Expand Down Expand Up @@ -389,39 +380,42 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
</td>
</tr>
<tr>
<td colSpan="3">
Sooner ID<span className="required-asterisk">*</span>:<br />
<input
type="text"
id="soonerId"
value={formData.soonerId}
onChange={handleInputChange}
disabled={!isFieldEditable("soonerId")}
/>
{errors.soonerId && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.soonerId}</div>}
</td>
<td colSpan="3">
Website:<br />
<input
type="text"
id="website"
value={formData.website}
onChange={handleInputChange}
disabled={!isFieldEditable("website")}
/>
{errors.website && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.website}</div>}
</td>
<td colSpan="2">
Job Title:<br />
<input
type="text"
id="advisorJobTitle"
value={formData.advisorJobTitle}
onChange={handleInputChange}
disabled={!isFieldEditable("advisorJobTitle")}
/>
</td>
</tr>

<td colSpan="3">
Last Name:<br />
<input
type="text"

/>
{errors.website && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.website}</div>}
</td>


<td colSpan="3">
Website:<br />
<input
type="text"
id="website"
value={formData.website}
onChange={handleInputChange}
disabled={!isFieldEditable("website")}
/>
{errors.website && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.website}</div>}
</td>


<td colSpan="2">
Job Title:<br />
<input
type="text"
id="advisorJobTitle"
value={formData.advisorJobTitle}
onChange={handleInputChange}
disabled={!isFieldEditable("advisorJobTitle")}
/>
</td>
</tr>

<tr>
<td colSpan="3">
Email<span className="required-asterisk">*</span>:<br />
Expand All @@ -431,7 +425,7 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
value={formData.interneeEmail}
onChange={handleInputChange}
disabled
// disabled={!isFieldEditable("interneeEmail")}

/>
{errors.interneeEmail && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeEmail}</div>}
</td>
Expand Down Expand Up @@ -559,7 +553,7 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
<table>
<tbody>
<tr>
<td className="signature-cell" colSpan="3">
<td className="signature-cell" colSpan="1">
Internee Signature<span className="required-asterisk">*</span>:<br />
<div className="signature-field">
<SignatureInput
Expand All @@ -572,75 +566,7 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
</div>
{errors.interneeSignature && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeSignature}</div>}
</td>
<td className="signature-cell" colSpan="3">
Internship Supervisor Signature:<br />
<div className="signature-field">
<SignatureInput
id="advisorSignature"
value={formData.advisorSignature}
onChange={handleInputChange}
disabled={!isFieldEditable("advisorSignature")}
placeholder="Enter your full name"
/>
</div>
{errors.advisorSignature && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.advisorSignature}</div>}
</td>
<td className="signature-cell" colSpan="2">
Internship Coordinator Approval:<br />
<div className="signature-field">
<SignatureInput
id="coordinatorApproval"
value={formData.coordinatorApproval}
onChange={handleInputChange}
disabled={!isFieldEditable("coordinatorApproval")}
placeholder="Enter your full name"
/>
</div>
{errors.coordinatorApproval && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.coordinatorApproval}</div>}
</td>
</tr>
{/* <tr>
<td colSpan="3">
<label htmlFor="supervisorComments" style={{ fontWeight: "bold" }}>Supervisor Comments:</label><br />
<textarea
id="supervisorComments"
value={formData.supervisorComments}
onChange={handleInputChange}
placeholder="Enter any comments or feedback for this internship request"
style={{
width: "100%",
padding: "8px",
boxSizing: "border-box",
minHeight: "80px",
resize: "vertical",
marginTop: "5px",
border: "1px solid #ccc",
borderRadius: "3px"
}}
disabled={!isFieldEditable("supervisorComments")}
/>
</td>
<td colSpan="5">
<label htmlFor="coordinatorComments" style={{ fontWeight: "bold" }}>Coordinator Comments:</label><br />
<textarea
id="coordinatorComments"
value={formData.coordinatorComments}
onChange={handleInputChange}
placeholder="Enter any comments or feedback regarding this internship request"
style={{
width: "100%",
padding: "8px",
boxSizing: "border-box",
minHeight: "80px",
resize: "vertical",
marginTop: "5px",
border: "1px solid #ccc",
borderRadius: "3px"
}}
disabled={!isFieldEditable("coordinatorComments")}
/>
</td>
</tr> */}
</tr>
</tbody>
</table>

Expand Down
52 changes: 52 additions & 0 deletions client/src/styles/A1InternshipRequestForm.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,55 @@
max-width: 1200px;
border-radius: 12px;
}

.success-msg, .error-msg {
animation: fadeIn 0.5s;
}
@keyframes fadeIn {
from { opacity: 0; }
to { opacity: 1; }
}

.required-asterisk {
color: #d93025;
font-weight: bold;
font-size: 1.2em;
margin-left: 2px;
vertical-align: middle;
}

button[type="submit"] {
box-shadow: 0 2px 8px rgba(44, 110, 203, 0.08);
font-weight: 600;
letter-spacing: 0.5px;
}
button[type="submit"]:active {
background: #1e5dad;
box-shadow: 0 1px 2px #777;
}

input, select, textarea {
margin-bottom: 10px;
}
textarea {
min-height: 90px;
resize: vertical;
}

.section-card {
background: #f7fafd;
border-radius: 8px;
box-shadow: 0 1px 8px rgba(44, 110, 203, 0.04);
padding: 18px 20px 14px 20px;
margin-bottom: 28px;
border-left: 5px solid #007bff22;
}

.section-title {
color: #2451a0;
border-left: 4px solid #007bffcc;
padding-left: 10px;
margin-bottom: 16px;
font-size: 1.18rem;
background: transparent;
}
18 changes: 3 additions & 15 deletions server/models/InternshipRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ const Task = new mongoose.Schema({

});
const formA1 = new mongoose.Schema({
// student: {
// type: ObjectId,
// required: true,
// ref: 'UserTokenRequest'
// },

student:{
name:{
type: String,
Expand All @@ -39,11 +35,7 @@ const formA1 = new mongoose.Schema({
},
},
...formMetadata,
// student: {
// type: ObjectId,
// required: true,
// ref: 'UserTokenRequest'
// },

workplace: {
name: {
type: String,
Expand Down Expand Up @@ -77,11 +69,7 @@ const formA1 = new mongoose.Schema({
type: [Task],
required: true
},
// status: {
// type: String,
// required: true,
// enum: ['draft', 'submitted','pending manual review' ,'approved']
// },

approvals: {
type: [String],
enum: ["advisor", "coordinator"],
Expand Down
Loading