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

Merged
merged 83 commits into from
May 26, 2024
Merged

Add Grades feature #229

merged 83 commits into from
May 26, 2024

Conversation

Justin-Fernbaugh
Copy link
Member

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/

  1. DROP DATABASE myclassroom_development;
  2. CREATE DATABASE myclassroom_development;
  3. DROP DATABASE myclassroom_test;
  4. CREATE DATABASE myclassroom_test;
  5. npx sequelize-cli db:migrate --env test
  6. npx sequelize-cli db:migrate --env dev
  7. npx sequelize-cli db:seed:all --env test
  8. npx sequelize-cli db:seed:all --env dev

Fixes # (issue)

Additional Information

Checklist:

Before you submit your Pull Request, please make sure you have completed the following tasks:

  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have made corresponding changes to the documentation.
  • My changes generate no new warnings.
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.
  • Any dependent changes have been merged and published in downstream modules.
  • I have tagged my PR with the appropriate label(s).

@Justin-Fernbaugh Justin-Fernbaugh added the development Updates and modifications to development/deployment tools label May 22, 2024
@Justin-Fernbaugh Justin-Fernbaugh self-assigned this May 22, 2024
@Justin-Fernbaugh Justin-Fernbaugh requested review from a team May 22, 2024 18:56
server/app/api/users.js Dismissed Show resolved Hide resolved
server/app/api/users.js Dismissed Show dismissed Hide dismissed
@Justin-Fernbaugh Justin-Fernbaugh linked an issue May 23, 2024 that may be closed by this pull request
Copy link
Member

@nilsstreedain nilsstreedain left a 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.)

@Justin-Fernbaugh
Copy link
Member Author

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?

@nilsstreedain
Copy link
Member

nilsstreedain commented May 24, 2024

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 /client, that should also probably be removed.

@Justin-Fernbaugh Justin-Fernbaugh requested a review from a team as a code owner May 26, 2024 18:25
@Justin-Fernbaugh
Copy link
Member Author

Merged with changes from dev and dropped any changes from main. Ready for a second look

Copy link
Member

@nilsstreedain nilsstreedain left a 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.

server/.env.example Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
nilsstreedain
nilsstreedain previously approved these changes May 26, 2024
Copy link
Member

@nilsstreedain nilsstreedain left a comment

Choose a reason for hiding this comment

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

Looks great!

Copy link
Member

@nilsstreedain nilsstreedain left a 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!

@Justin-Fernbaugh Justin-Fernbaugh added this pull request to the merge queue May 26, 2024
Merged via the queue into dev with commit 01ef1de May 26, 2024
2 checks passed
@Justin-Fernbaugh Justin-Fernbaugh deleted the fernbauj/gradebook branch May 26, 2024 21:49
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
development Updates and modifications to development/deployment tools
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Connect live questions with grades in DB
4 participants