Added function to calculate cumulative GPA(including unfinished semesters) #140

Suhas-13 · 2020-03-17T01:26:49Z

Closes #1

Calculate cumulative GPA and added optional parameter creditHour to Course class.

Signed-off-by: Suhas Hariharan hariharan774531@sas.edu.sg

Suhas-13 · 2020-03-17T01:29:55Z

Sorry I messed up the other branch so I just created a new pull request/branch with it all in one commit.

Suhas-13 · 2020-03-17T04:01:50Z

I just added something so it should calculate cumulative including current semester, I used the begdate thing to figure out whether the semester was over or not. I'm calculating credit hours for the non grade history grades based on the amount of blocks they take up, with an exception for interim which would be 0.25. Are there any other prefixes for interim other than IS on powerschool?

gary-kim

We already have a function for that. Take the one here and export it and use that instead.
https://github.com/gary-kim/saspes/blob/7722c9ea733cb67f0056f85a66a78e4abff2a285/src/js/helpers.js#L116

gary-kim

Just from a cursory look at the code. I haven't tested this yet.

src/js/saspowerschoolff.js

Suhas-13 · 2020-03-17T08:59:33Z

Is it okay with you if I take total_add out of the calculate_gpa function and rename it calcualte_credit_hours?

gary-kim · 2020-03-17T09:19:26Z

Is it okay with you if I take total_add out of the calculate_gpa function and rename it calcualte_credit_hours?

Yes. You don't have to ask :).

src/js/models/Course.js

Suhas-13 · 2020-03-17T11:07:11Z

I made the changes, does this look ready to merge?

gary-kim

Just tried testing and noticed a problem but other then that, I think we should be good.

src/js/saspowerschoolff.js

Suhas-13 · 2020-03-17T14:29:18Z

Not quite sure what happened, I just commited your suggestions than ran git rebase HEAD~7 --signoff to add signoffs as per what github prompted me to do to sign it, now it seems that theres conflicts?

Suhas-13 · 2020-03-17T14:38:03Z

Could I just do git reset --hard 25edb97 to go back to before?

gary-kim · 2020-03-17T14:43:48Z

You shouldn't need to. You can just run git fetch && git rebase origin/master and that will fix the conflicts.

Suhas-13 · 2020-03-17T14:45:10Z

Okay, it seems to have added a bunch more files to the files changed as well for this commit, would that all be resolved by rebasing?

…e class Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

…ious calculate_credit_hours function Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

…ive gpa message Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

Suhas-13 · 2020-03-17T15:01:26Z

Should be ready to merge?

gary-kim

A lot of this is probably going to be moved into a separate file when we convert to using Vue but for now, this looks great!

gary-kim · 2020-03-17T23:40:55Z

src/js/saspowerschoolff.js

+            let include_current_semester = false;
+            if (current_courses.length !== 0) {
+                for (let i = 0; i < current_courses.length; i++) {
+                    if (current_courses[i].link.includes("begdate")) {


The better way to do this would be something like

Suggested change

if (current_courses[i].link.includes("begdate")) {

if (new URL(current_courses[i].link).searchParams.get("begdate")) {

but we can deal with that during the cleanup if you'd like.

Sure, thanks okay if I merge it now?

If the PR's approved by someone with write access, you don't need to ask :)

gary-kim

One more thing I noticed that's probably better taken care of in cleanup.

gary-kim · 2020-03-17T23:42:17Z

src/js/saspowerschoolff.js

+                                    const $prev_course = element_list[t];
+                                    // Creates course object with each course from grade history page
+                                    const course = new Course($prev_course.getElementsByTagName("td")[0].textContent.trim(), "",
+                                        $prev_course.getElementsByTagName("td")[1].textContent.trim(), 0, "");


Suggested change

$prev_course.getElementsByTagName("td")[1].textContent.trim(), 0, "");

$prev_course.getElementsByTagName("td")[1].textContent.trim());

Suhas-13 changed the title ~~Calculate cumulative gpa, adds optional parameter creditHour to Cours…~~ Calculate cumulative gpa up to current semester, and adds optional parameter creditHour to Courses Mar 17, 2020

Suhas-13 requested a review from gary-kim March 17, 2020 01:28

Suhas-13 changed the title ~~Calculate cumulative gpa up to current semester, and adds optional parameter creditHour to Courses~~ added function to calculate cumulative GPA Mar 17, 2020

Suhas-13 changed the title ~~added function to calculate cumulative GPA~~ Added function to calculate cumulative GPA(only completed semesters) Mar 17, 2020

gary-kim added the feature New feature addition label Mar 17, 2020

gary-kim added this to the Open Beta v0.21.0 milestone Mar 17, 2020

Suhas-13 changed the title ~~Added function to calculate cumulative GPA(only completed semesters)~~ Added function to calculate cumulative GPA(including unfinished semesters) Mar 17, 2020

gary-kim requested changes Mar 17, 2020

View reviewed changes

gary-kim reviewed Mar 17, 2020

View reviewed changes

src/js/saspowerschoolff.js Outdated Show resolved Hide resolved

src/js/saspowerschoolff.js Outdated Show resolved Hide resolved

src/js/saspowerschoolff.js Outdated Show resolved Hide resolved

Suhas-13 linked an issue Mar 17, 2020 that may be closed by this pull request

Show the effect of current semester to cumulative GPA #1

Closed

gary-kim removed a link to an issue Mar 17, 2020

Show the effect of current semester to cumulative GPA #1

Closed

gary-kim reviewed Mar 17, 2020

View reviewed changes

src/js/models/Course.js Show resolved Hide resolved

gary-kim requested changes Mar 17, 2020

View reviewed changes

src/js/saspowerschoolff.js Outdated Show resolved Hide resolved

src/js/saspowerschoolff.js Outdated Show resolved Hide resolved

gary-kim reviewed Mar 17, 2020

View reviewed changes

src/js/saspowerschoolff.js Outdated Show resolved Hide resolved

Suhas-13 force-pushed the calculate-cumulative-gpa branch from 25edb97 to ef63cf4 Compare March 17, 2020 14:26

Suhas Hariharan added 5 commits March 17, 2020 22:45

Calculate cumulative gpa, adds optional parameter creditHour to Cours…

13589a4

…e class Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

fixed eslint errors

7380423

Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

Cumulative GPA now calculates curent semester as well

207f7b3

Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

Renamed total_add function to calculate_credit_hours and removed prev…

3100935

…ious calculate_credit_hours function Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

Modified course class to automatically calculate credit hours

cad6e66

Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

Suhas-13 force-pushed the calculate-cumulative-gpa branch from ef63cf4 to cad6e66 Compare March 17, 2020 14:46

Ensures middle school grades are not counted, slightly alters cumulat…

c164579

…ive gpa message Signed-off-by: Suhas Hariharan <hariharan774531@sas.edu.sg>

gary-kim approved these changes Mar 17, 2020

View reviewed changes

gary-kim reviewed Mar 17, 2020

View reviewed changes

Suhas-13 merged commit c1e0a1a into master Mar 18, 2020

gary-kim deleted the calculate-cumulative-gpa branch March 18, 2020 12:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added function to calculate cumulative GPA(including unfinished semesters) #140

Added function to calculate cumulative GPA(including unfinished semesters) #140

Suhas-13 commented Mar 17, 2020 •

edited by gary-kim

Loading

Suhas-13 commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020 •

edited

Loading

gary-kim left a comment

gary-kim left a comment

Suhas-13 commented Mar 17, 2020

gary-kim commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020

gary-kim left a comment

Suhas-13 commented Mar 17, 2020 •

edited

Loading

Suhas-13 commented Mar 17, 2020

gary-kim commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020

gary-kim left a comment

gary-kim Mar 17, 2020 •

edited

Loading

Suhas-13 Mar 18, 2020

gary-kim Mar 18, 2020

gary-kim left a comment

gary-kim Mar 17, 2020

	if (current_courses[i].link.includes("begdate")) {
	if (new URL(current_courses[i].link).searchParams.get("begdate")) {

	$prev_course.getElementsByTagName("td")[1].textContent.trim(), 0, "");
	$prev_course.getElementsByTagName("td")[1].textContent.trim());

Added function to calculate cumulative GPA(including unfinished semesters) #140

Added function to calculate cumulative GPA(including unfinished semesters) #140

Conversation

Suhas-13 commented Mar 17, 2020 • edited by gary-kim Loading

Suhas-13 commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020 • edited Loading

gary-kim left a comment

Choose a reason for hiding this comment

gary-kim left a comment

Choose a reason for hiding this comment

Suhas-13 commented Mar 17, 2020

gary-kim commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020

gary-kim left a comment

Choose a reason for hiding this comment

Suhas-13 commented Mar 17, 2020 • edited Loading

Suhas-13 commented Mar 17, 2020

gary-kim commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020

Suhas-13 commented Mar 17, 2020

gary-kim left a comment

Choose a reason for hiding this comment

gary-kim Mar 17, 2020 • edited Loading

Choose a reason for hiding this comment

Suhas-13 Mar 18, 2020

Choose a reason for hiding this comment

gary-kim Mar 18, 2020

Choose a reason for hiding this comment

gary-kim left a comment

Choose a reason for hiding this comment

gary-kim Mar 17, 2020

Choose a reason for hiding this comment

Suhas-13 commented Mar 17, 2020 •

edited by gary-kim

Loading

Suhas-13 commented Mar 17, 2020 •

edited

Loading

Suhas-13 commented Mar 17, 2020 •

edited

Loading

gary-kim Mar 17, 2020 •

edited

Loading