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

Jump to bottom

codeWOF Gamification with changes #196

Merged
merged 101 commits into from
Apr 15, 2020
Merged

codeWOF Gamification with changes #196

merged 101 commits into from
Apr 15, 2020

Conversation

courtneycb
Copy link
Contributor

@courtneycb courtneycb commented Mar 27, 2020 •
edited
Loading

This work is done by Maree Palmer.
The original pull request can be found at #75 however I could not update this, hence a new PR.

This PR downgrades pytest to v5.3.5 to workaround Teemu/pytest-sugar#187

The changes/additions @eAlasdair and I have made to Maree's work include:

  • Adding an achievements landing page that shows all of the badges, with un-achieved badges greyed out.
  • Got the backdate command running
  • Fixed several issues with the backdate command
  • Fixed several issues with the sampledata command
  • Added tests for points and badges logic (codewof_utils file), most programming and user models.
  • Added new load_badges command with code that was originally implemented in sampledata
  • Added backdate and load_badges to the deployment schedule
  • Additions to the Django admin
  • Removed redundant code
  • Removed half implemented features 'activity_graph' and 'badge_card'. These have been made into a new issue Finish features that were half implemented in gamification #203
  • Basic css fix to prevent words wrapping underneath badge icons.

A description of Maree's changes can be found in #75

MareePalmer and others added 30 commits July 3, 2019 19:13
@MareePalmer
Implemented points system with deductions for incomplete attempts
a204c96
@MareePalmer
Fixed unit tests for profile.
bb50db9
@MareePalmer
Got badges working on CodeWOF website. Moved ProfileView functions to…
d338cb2 
… codewof_utils file.
@MareePalmer
Added badges for consecutive days with attempts. Implementation begun…
ef4c80a 
… on determining number of consecutive days for attempts to award badges.
@MareePalmer
Completed consecutive day badge calculations in async attempt request.
722225f
@MareePalmer
Added test data generator for test classes in codewof system
e031a04
@MareePalmer
Merge branch 'develop' into issue/gamification
dd6ebb1 
# Conflicts:
#	codewof/codewof/admin.py
#	codewof/codewof/views.py
#	codewof/general/management/commands/sampledata.py
#	codewof/programming/models.py
#	codewof/programming/urls.py
#	codewof/templates/users/user_detail.html
#	codewof/users/views.py
@MareePalmer
Ensured points system worked in merged app. Added points in dashbar b…
5225b60 
…y user dashboard link. Implemented backdate of points and badges. Re-engineered point allocation for questions.
@MareePalmer
Added custom backdate command. Fixed points adding per question - now…
2be31d2 
… adds extra point for correct on the first try correctly.
@MareePalmer
Added custom badge card html - not quite functional yet
4011b33
@MareePalmer
Added code for toasts when badges earned (toasts still don't show - b…
1b4bd13 
…ug). Added more attempts to test data generator. User test creation broken - user_type)
@MareePalmer
Attempted to use UserFactory to generate test users, unsuccessful. Ad…
7e093a0 
…ded badge_tier field to Badge model for points calculation.
@MareePalmer
Merge branch 'develop' into issue/gamification
06c93ed
@MareePalmer
Added badge point calculations
1d172bb
@MareePalmer
Toasts now showing. Custom text based on badge earned yet to be imple…
7e83a04 
…mented due to not recognizing toast component IDs.
Added feature files to detail gamification tests.
35a6839
Changed sampledata creation badge to be tier 0 (no points). Added mor…
08d7e8c 
…e points feature tests for attempting and solving questions, and earning a badge.
@MareePalmer
Removed activity graph from dashboard. Fixed toasts to show custom ba…
471e43a 
…dge messages when achieved.
Updated feature files
891aad1
Merge https://github.com/uccser/codewof into develop
3505543
@MareePalmer
Altered file style and updated docstrings to comply with style rules.
05a27d8
@MareePalmer
Merge branch 'develop' of https://github.com/mpa588/codewof into develop
244cf7d
@MareePalmer
Changed px to rem for activity graph css
ad62562
@MareePalmer
Renamed variables and rewrote documentation for function to get numbe…
452e77b 
…r of questions answered in the last month. Pluralized number of questions answered on the user dashboard.
@MareePalmer
Only shows earned badges in the dashboard. Adjusted badge padding
c95d012
@MareePalmer
Added point notifications. Implemented parent field in model class fo…
dfe7eaf 
…r displaying on the main page
@MareePalmer
fixed style in sampledata
44d63fb
@courtneycb
Resolve merge conflicts.
7643db8
@courtneycb
Correct rem unit conversion.
074f373
@courtneycb
Fix badge wording alignment.
1eba463
courtneycb and others added 24 commits April 9, 2020 12:21
@courtneycb
Delete old views file. Inheritance manager sucks.
20bbddc
@courtneycb
Remove redundant index view.
8586d64
@courtneycb
Fix question model tests.
e530084
@eAlasdair
migration for meta change
2746b6c
@courtneycb
Add QuestionType model tests.
6ae564c
@courtneycb
Merge branch 'gamification' of https://github.com/uccser/codewof into…
fe7944a 
… gamification
@courtneycb
Remove old code.
b6869b5
@courtneycb
Latest.
31cf22a
@courtneycb
Add some user model tests.
4b28bd4
@eAlasdair
Fix days consecutively answered function and test
9573670
@courtneycb
Tidy up.
d43f9bf
@courtneycb
Merge branch 'gamification' of https://github.com/uccser/codewof into…
62158b7 
… gamification
@eAlasdair
minor clarity fixes for utils
57e3130
@courtneycb
Commit before pull.
2ab116a
@courtneycb
Merge branch 'gamification' of https://github.com/uccser/codewof into…
15cd2bd 
… gamification
@courtneycb
Add more utils tests.
33a3419
@courtneycb
Update check_badge_conditions test.
bcef44a
@courtneycb
Pushing latest.
f822d50
@eAlasdair
fix test
f255701
@courtneycb
Add some tests for backdate function
1b85b8e
@courtneycb
All da style thaaaaangs.
d90fb9f
@eAlasdair
add tests for earning points under certain conditions
d77fce2
@eAlasdair
Merge branch 'gamification' of https://github.com/uccser/codewof into…
1f7bd87 
… gamification
@eAlasdair
fix
fb08dc1
@eAlasdair eAlasdair changed the title codeWOF Gamification with minor changes codeWOF Gamification with changes Apr 14, 2020
eAlasdair
eAlasdair previously approved these changes Apr 14, 2020
View reviewed changes
Copy link
Contributor

@eAlasdair eAlasdair left a comment

Choose a reason for hiding this comment

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

Ready for merge to develop, not yet to release

@courtneycb courtneycb merged commit 66efdf6 into develop Apr 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eAlasdair eAlasdair eAlasdair left review comments

Assignees

@courtneycb courtneycb

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@courtneycb @eAlasdair @MareePalmer