Skip to content
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

Nicholas smith branch #109

Merged
merged 8 commits into from
Sep 22, 2024
Merged

Nicholas smith branch #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb36990
Updated: with a new controller function to get new course plan effici…
firepenguindisopanda Sep 15, 2024
9ff19bd
Updated: to use the new controller to effectively get the data and re…
firepenguindisopanda Sep 15, 2024
e851030
Updated: Removed console log statements
firepenguindisopanda Sep 21, 2024
f0c7e8e
Updated: with a test function to test a query to get count of grades …
firepenguindisopanda Sep 21, 2024
6ab593a
Updated: with a route to send grades data by a studentid for profile …
firepenguindisopanda Sep 21, 2024
27b051c
Removed: express-validator package
firepenguindisopanda Sep 21, 2024
738c759
Updated: user and password for postgres container
firepenguindisopanda Sep 21, 2024
01aec12
Updated: removed an unused file, updated the query for the course pla…
firepenguindisopanda Sep 22, 2024
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
1 change: 0 additions & 1 deletion config/corsOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const allowedOrigins = require('./allowedOrigins');

const corsOptions = {
origin: (origin, callback) => {
console.log('origin: ', origin);
if (origin && allowedOrigins.includes(origin)) {
callback(null, true);
} else {
Expand Down
64 changes: 2 additions & 62 deletions controllers/getCoursePlanAdmin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,12 @@ async function getCoursePlanAdmin(programmeId, studentCourseCodes, programmeCour


eligibleCourses = getEligibleCourses(programmeId, studentCourseCodes, programmeCourses, semCourses, prereqs, antireqs, coursegroups);
// console.log("eligibleCourses: ", eligibleCourses);


degreeProgress = getDegreeProgress(programmeId, studentCourseCodes, programmeCourses, courses, programmeCreditRequirements, types);
// console.log("Degree Progress: ", degreeProgress);


plannedCourses = await getPlannedCourses(studentId, semesterId);
// console.log("Planned Courses: ", plannedCourses);




// -----------------FORMAT OUTPUT-------------------------



// // get planned courses
// for (let course of plannedCourses) {
// const progCourse = programmeCourses.find(progCourse => progCourse.courseCode === course && progCourse.programmeId === programmeId);
// let typeId = progCourse ? progCourse.typeId : null;
// const typeObj = types.find(type => type.id === typeId);
// let typeName = typeObj ? typeObj.type : null;
// // console.log("typeName: ",typeName);
// const courseObj = courses.find(c => c.courseCode === course);
// let courseName = courseObj ? courseObj.courseTitle : null;
// let credits = courseObj ? courseObj.credits : null;
// // console.log("credits:: ", credits);

// plannedCoursesObjs.push({
// "courseCode": progCourse.courseCode,
// "courseTitle": courseName,
// "type": typeName,
// "credits": credits
// })

// }


// console.log("degreeprogress Requiremtns: ", degreeProgress.Requirements);

if (plannedCoursesObjs) {

Expand All @@ -60,34 +28,6 @@ async function getCoursePlanAdmin(programmeId, studentCourseCodes, programmeCour

}


// for (type in degreeProgress.Requirements) {
// let planData = {};
// let plancourses =[];
// planData["creditType"] = type;
// planData["creditsRemaining"] = degreeProgress.Requirements[type][0];
// // console.log(type);
// // console.log(degreeProgress.Requirements[type][0]);
// for (let plannedCoursesObj of plannedCoursesObjs) {
// if (plannedCoursesObj.type === type) {
// // console.log(plannedCoursesObj);

// planData["creditsRemaining"] -= plannedCoursesObj.credits;
// // console.log("planData.creditsRemaining",planData.creditsRemaining);
// // console.log("remaining credits",planData["creditsRemaining"]);
// plancourses.push(plannedCoursesObj);
// }
// }
// planData["creditsRemaining"] = [planData.creditsRemaining, degreeProgress.Requirements[type][1]];
// planData["selectedCourses"] = plancourses;
// coursePlan.push(planData);

// }



// console.log("COURSEPLAN:::> ",coursePlan);

return coursePlan;

}
Expand Down
16 changes: 7 additions & 9 deletions controllers/getDegreeProgress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,31 @@ async function getDegreeProgress(student_id) {
for (i = 0; i < programmeCourse.length; i++) {
programmeCourses.push(programmeCourse[i].dataValues);
}
//console.log("programmeCourse: ", programmeCourses);


// get courses
let course = await Course.findAll();
let courses = [];
for (i = 0; i < course.length; i++) {
courses.push(course[i].dataValues);
}
//console.log("courses: ", courses);


// get programmeCreditRequirements
let pcrs = await PCR.findAll({ where: { programmeId } });
let programmeCreditRequirements = [];
for (i = 0; i < pcrs.length; i++) {
programmeCreditRequirements.push(pcrs[i].dataValues);
}
//console.log("PCR: ", programmeCreditRequirements);


// get types
let type = await Type.findAll();
let types = [];
for (i = 0; i < type.length; i++) {
types.push(type[i].dataValues);
}
//console.log("types: ", types);



let actualTotalCredits = 0;
Expand All @@ -89,7 +89,7 @@ async function getDegreeProgress(student_id) {
try {
let course = courses.find((c) => c.code === studentCourseCodes[i]);
const type = types.find(type => type.type === creditType);
//console.log(type);


let programmeCourse = programmeCourses.find(
(c) => c.courseCode === studentCourseCodes[i] && c.programmeId === programmeId && c.typeId === type.id);
Expand All @@ -103,7 +103,7 @@ async function getDegreeProgress(student_id) {
completedCourses.push(course.code);
creditRequirements[creditType][0] -= credits;
actualTotalCredits += credits;
//console.log(completedCourses);

}

} catch (error) {
Expand All @@ -125,9 +125,7 @@ async function getDegreeProgress(student_id) {

}

// (async () =>{
// console.log(await getDegreeProgress('816031565'))
// })()

module.exports = { getDegreeProgress };


27 changes: 0 additions & 27 deletions controllers/getEligibleCourses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,32 +241,5 @@ async function getAllEligibleCourses(studentId) {
}
}

// testing without Postman

// (async () =>{
// const dummyStudentCourses_db = await StudentCourse.findAll({
// attributes : ['courseCode'],
// where: {
// studentId : '816031565'
// }
// });
// const dummyStudentCourses = [
// 'COMP1600',
// 'COMP1601',
// 'INFO1600',
// 'MATH1115',
// 'FOUN1101'
// ]
// const test_e = await getEligibleCourses('816031565',2);
// console.log(test_e);
// })()
/**
* Expected
* 'COMP1602',
* 'COMP1603',
* 'COMP1604',
* 'FOUN1105',
* 'INFO1601'
*/
module.exports = { getEligibleCourses, getAllEligibleCourses };

2 changes: 1 addition & 1 deletion controllers/getPlannedCourses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async function getPlannedCourses(studentId, semesterId) {
]
}
});
// console.log("Advising Session: ",advisingSession);

if (advisingSession) {
let advisingSessionId = advisingSession.dataValues.id;
let SelectedCourses = await SelectedCourse.findAll({
Expand Down
Loading