-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Add Grades feature #229
Add Grades feature #229
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this PR has the same issue that @Durbin-Elijah's did. If you remember, awhile back, we had an unknown contributor who made a PR to main
that got accepted, causing divergent history between main
/dev
because all changes on main
were intended to come directly from dev
, nowhere else. It appears the branch submitted in this PR was pulled from main
instead of dev
causing it to try to merge those non-existent commits to dev
. Would it be possible to go through and remove any commits that are not apart of this change so once we are ready for a new version, I can force override main
? (Only force overriding because our branches should be built from dev
, not main
.)
Yeah, I should be able to do this, would you be able to point me to which commit this starts so I can remove the changes? |
Looks like just commits c6524de, 86d4753, and 5ed0d93 need to be removed, preferably with a rebase. If anything is left committing to |
* Update codeql.yml * Update codeql.yml
fcf551e
to
dc5ec3a
Compare
Merged with changes from dev and dropped any changes from main. Ready for a second look |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally looks great, see comments for 2 minor changes I found.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, nice job!
Pull Request Template
Screenshots
Description
I've added a Grades table that populates or updates the grades of a user after they respond to a question(Responses.js). Moreover, these changes involve using points that are added to questions using the 'weights' attribute of a question. The 'weights' of a question can be added or if they're not present will be auto-populated with a default value of '1' for each.
Important: before testing this branch the databases have to be dropped, re-added, and then migrated/seeded. The first four steps must be performed in MySQL while steps 5-8 are performed in the dir server/
Fixes # (issue)
Additional Information
Checklist:
Before you submit your Pull Request, please make sure you have completed the following tasks: