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.

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

Update macOS scripts and support multiple types of GPA (new) #101

Merged
merged 35 commits into from
Mar 18, 2020

Conversation

kdk1616
Copy link
Collaborator

@kdk1616 kdk1616 commented Feb 15, 2020

This PR contains two features.

kdk1616 and others added 17 commits January 12, 2020 17:09
…. Made function for toggling between weighted, unweighted, and % GPA (only works for current quarter right now... Also, There is a bu where if you select another quarter you cannot return to the initial quarter and have it work properly...).
Apparently kdk1616's editor completely changed the formatting of
the README. As there were no substantial changes, I have reverted
all changes that were made to the README.
There is a function in extraFunctions.js to convert a percentage to
a GPA out of 4.0; the inline code duplicating that behavior has been
replaced by a function call.
This is a minor change, as the currently selected term is the same as
the current term when Aspine is first loading, but it aids code
readability for the refactoring to come.
Abstracting away the iterator reduces the potential for errors and
simplifies the code.
The GPA and calcGPA attributes of each term's object under tableData are
now themselves objects with attributes "percent", "outOfFour", and
"outOfFive". This approach is more scalable and also allows all GPAs
to be returned by a single function, computeGPA, which has been modified
to compute all three formats of GPA.
The current quarter need not be hardcoded anymore.
Also, the refactored GPAType uses jQuery and is more readable.
Because the selection of the <select> element is a string and it is
being compared to the number zero, I have changed triple equals
to double equals in order to invoke type coercion.
@psvenk psvenk changed the title GPA Types Feature (Install Script Stuff) GPA Types Feature, Install Script Stuff, and Test Corrections Feb 17, 2020
@psvenk psvenk force-pushed the master branch 3 times, most recently from 2c334f3 to e6a8705 Compare February 19, 2020 01:25
@psvenk psvenk changed the title GPA Types Feature, Install Script Stuff, and Test Corrections Update macOS install script, support multiple types of GPA, and support percent test corrections Feb 19, 2020
@psvenk psvenk changed the title Update macOS install script, support multiple types of GPA, and support percent test corrections Update macOS scripts, support multiple types of GPA, and support percent test corrections Feb 19, 2020
@psvenk psvenk self-requested a review February 19, 2020 01:38
@psvenk psvenk force-pushed the master branch 3 times, most recently from 49458de to 5a79cb1 Compare February 19, 2020 19:54
@psvenk psvenk changed the title Update macOS scripts, support multiple types of GPA, and support percent test corrections Update macOS scripts and support multiple types of GPA Feb 19, 2020
@psvenk psvenk changed the title Update macOS scripts and support multiple types of GPA Update macOS scripts and support multiple types of GPA (new) Feb 19, 2020
Instead of taking `type` as a parameter and giving a different value
depending on the type, cumGPA() now returns an object containing all GPA
types.
The "GPA Type" button now controls the GPA type of all terms in
the dropdown instead of only the selected one, and the term can be
changed while a non-percent GPA type is selected.
@psvenk psvenk self-assigned this Mar 8, 2020
psvenk added 3 commits March 16, 2020 17:07
This makes the UI work more intuitively and allows the term dropdown
to resize horizontally as needed.
Fix a bug in which fetching a new term would overwrite the current
term data
Copy link
Member

@Ruborcalor Ruborcalor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall great work! Two minor comments.

public/home.js Outdated Show resolved Hide resolved
public/js/buttonFunctions.js Outdated Show resolved Hide resolved
psvenk added 2 commits March 16, 2020 19:46
Fix some bugs that would be encountered if a user modifies some
assignments, thus generating a calculated GPA, in any one of
the non-percent GPA types.
@psvenk
Copy link
Member

psvenk commented Mar 17, 2020

I have addressed every issue that I have identified, except for redesigning the cumulative GPA indicator so that it updates along with the quarters in showing percent, unweighted, or weighted instead of just showing all three always. It would also be nice to have a calculated cumulative GPA which uses calcGPA for each quarter (falling back to GPA if needed).

psvenk added 4 commits March 16, 2020 20:58
Instead of having a rich-text presentation of the cumulative GPA showing
all GPA types at once, make it cycle through the GPA types along with
the quarters (current, Q1, Q2, Q3, Q4).
@psvenk psvenk requested a review from Ruborcalor March 17, 2020 01:54
Copy link
Member

@psvenk psvenk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@kdk1616
Copy link
Collaborator Author

kdk1616 commented Mar 17, 2020

I approve!

@psvenk psvenk changed the base branch from master to staging March 18, 2020 00:56
@psvenk psvenk merged commit daf1ffc into Aspine:staging Mar 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revise Mac install script Improved GPA calculator
3 participants