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

Commits on Jul 3, 2019

  1. Implemented points system with deductions for incomplete attempts

    @MareePalmer
    MareePalmer committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    a204c96 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. Fixed unit tests for profile.

    @MareePalmer
    MareePalmer committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    bb50db9 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2019

  1. Got badges working on CodeWOF website. Moved ProfileView functions to… 

    … codewof_utils file.
    @MareePalmer
    MareePalmer committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    d338cb2 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. Added badges for consecutive days with attempts. Implementation begun… 

    … on determining number of consecutive days for attempts to award badges.
    @MareePalmer
    MareePalmer committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    ef4c80a View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2019

  1. Completed consecutive day badge calculations in async attempt request.

    @MareePalmer
    MareePalmer committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    722225f View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2019

  1. Added test data generator for test classes in codewof system

    @MareePalmer
    MareePalmer committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    e031a04 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2019

  1. Merge branch 'develop' into issue/gamification 

    # 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
    MareePalmer committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    dd6ebb1 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2019

  1. Ensured points system worked in merged app. Added points in dashbar b… 

    …y user dashboard link. Implemented backdate of points and badges. Re-engineered point allocation for questions.
    @MareePalmer
    MareePalmer committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    5225b60 View commit details
    Browse the repository at this point in the history

  2. Added custom backdate command. Fixed points adding per question - now… 

    … adds extra point for correct on the first try correctly.
    @MareePalmer
    MareePalmer committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    2be31d2 View commit details
    Browse the repository at this point in the history

  3. Added custom badge card html - not quite functional yet

    @MareePalmer
    MareePalmer committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    4011b33 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2019

  1. Added code for toasts when badges earned (toasts still don't show - b… 

    …ug). Added more attempts to test data generator. User test creation broken - user_type)
    @MareePalmer
    MareePalmer committed Sep 18, 2019
    Configuration menu
    Copy the full SHA
    1b4bd13 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2019

  1. Attempted to use UserFactory to generate test users, unsuccessful. Ad… 

    …ded badge_tier field to Badge model for points calculation.
    @MareePalmer
    MareePalmer committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    7e093a0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into issue/gamification

    @MareePalmer
    MareePalmer committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    06c93ed View commit details
    Browse the repository at this point in the history

  3. Added badge point calculations

    @MareePalmer
    MareePalmer committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    1d172bb View commit details
    Browse the repository at this point in the history

  4. Toasts now showing. Custom text based on badge earned yet to be imple… 

    …mented due to not recognizing toast component IDs.
    @MareePalmer
    MareePalmer committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    7e83a04 View commit details
    Browse the repository at this point in the history

  5. Added feature files to detail gamification tests.

    Maree Palmer committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    35a6839 View commit details
    Browse the repository at this point in the history

  6. Changed sampledata creation badge to be tier 0 (no points). Added mor… 

    …e points feature tests for attempting and solving questions, and earning a badge.
    Maree Palmer committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    08d7e8c View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2019

  1. Removed activity graph from dashboard. Fixed toasts to show custom ba… 

    …dge messages when achieved.
    @MareePalmer
    MareePalmer committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    471e43a View commit details
    Browse the repository at this point in the history

  2. Updated feature files

    Maree Palmer committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    891aad1 View commit details
    Browse the repository at this point in the history

  3. Merge https://github.com/uccser/codewof into develop

    Maree Palmer committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    3505543 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. Altered file style and updated docstrings to comply with style rules.

    @MareePalmer
    MareePalmer committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    05a27d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/mpa588/codewof into develop

    @MareePalmer
    MareePalmer committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    244cf7d View commit details
    Browse the repository at this point in the history

  3. Changed px to rem for activity graph css

    @MareePalmer
    MareePalmer committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    ad62562 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Renamed variables and rewrote documentation for function to get numbe… 

    …r of questions answered in the last month. Pluralized number of questions answered on the user dashboard.
    @MareePalmer
    MareePalmer committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    452e77b View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2019

  1. Only shows earned badges in the dashboard. Adjusted badge padding

    @MareePalmer
    MareePalmer committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c95d012 View commit details
    Browse the repository at this point in the history

  2. Added point notifications. Implemented parent field in model class fo… 

    …r displaying on the main page
    @MareePalmer
    MareePalmer committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    dfe7eaf View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. fixed style in sampledata

    @MareePalmer
    MareePalmer committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    44d63fb View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Resolve merge conflicts.

    @courtneycb
    courtneycb committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    7643db8 View commit details
    Browse the repository at this point in the history

  2. Correct rem unit conversion.

    @courtneycb
    courtneycb committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    074f373 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Fix badge wording alignment.

    @courtneycb
    courtneycb committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    1eba463 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Add achievements summary page.

    @courtneycb
    courtneycb committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    4d69fc1 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Merge branch 'develop' into gamification

    @courtneycb
    courtneycb committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    e36925b View commit details
    Browse the repository at this point in the history

  2. Review changes.

    @courtneycb
    courtneycb committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    04a8213 View commit details
    Browse the repository at this point in the history

  3. Add link to achievements page to badges on dashboard.

    @courtneycb
    courtneycb committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    7abc06a View commit details
    Browse the repository at this point in the history

  4. Tidy up. Trying to get toasts to be sticky.

    @courtneycb
    courtneycb committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    8be4d74 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. add backdate as manage.py command

    @eAlasdair
    eAlasdair committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    4a2b6ed View commit details
    Browse the repository at this point in the history

  2. Remove unused functions from backdate command.

    @courtneycb
    courtneycb committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    832bc67 View commit details
    Browse the repository at this point in the history

  3. Tidy up print statements in command.

    @courtneycb
    courtneycb committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    baf64ee View commit details
    Browse the repository at this point in the history

  4. Remove account creation badge.

    @courtneycb
    courtneycb committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    fba297a View commit details
    Browse the repository at this point in the history

  5. Remove magic numbers.

    @courtneycb
    courtneycb committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    93b9e94 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Hide user names during backdate for privacy

    @eAlasdair
    eAlasdair committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    bafd65c View commit details
    Browse the repository at this point in the history

  2. fix style

    @eAlasdair
    eAlasdair committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    717c2af View commit details
    Browse the repository at this point in the history

  3. collate backdate code and remove magic numbers

    @eAlasdair
    eAlasdair committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    f071773 View commit details
    Browse the repository at this point in the history

  4. Add badges to admin.

    @courtneycb
    courtneycb committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    a6f5fd3 View commit details
    Browse the repository at this point in the history

  5. change name of user2 acc.

    @courtneycb
    courtneycb committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    fb5e644 View commit details
    Browse the repository at this point in the history

  6. Remove user2 from sampledata.

    @courtneycb
    courtneycb committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    fe87e80 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. add more detail to admin views

    @eAlasdair
    eAlasdair committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    2eef186 View commit details
    Browse the repository at this point in the history

  2. style

    @eAlasdair
    eAlasdair committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    d3a3458 View commit details
    Browse the repository at this point in the history

  3. ROUGH. Tests working. Had to revert pytest. Essentially removes codew… 

    …of/ folder.
    @courtneycb
    courtneycb committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    2c77e23 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @courtneycb
    courtneycb committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    cedd108 View commit details
    Browse the repository at this point in the history

  5. style

    @courtneycb
    courtneycb committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    7a22f36 View commit details
    Browse the repository at this point in the history

  6. Add back in created account badge.

    @courtneycb
    courtneycb committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    eef1750 View commit details
    Browse the repository at this point in the history

  7. Fix up some tests.

    @courtneycb
    courtneycb committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    f3a553a View commit details
    Browse the repository at this point in the history

  8. Style.

    @courtneycb
    courtneycb committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    9c36fe4 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. make separate load_badges command and use it wherever load_questions … 

    …is used
    @eAlasdair
    eAlasdair committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    29f7a8b View commit details
    Browse the repository at this point in the history

  2. style

    @eAlasdair
    eAlasdair committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    9692e20 View commit details
    Browse the repository at this point in the history

  3. add backdate command to deployment update content code

    @eAlasdair
    eAlasdair committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    44f8e7c View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. add attempted question inline back into admin profile view

    @eAlasdair
    eAlasdair committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    190e89b View commit details
    Browse the repository at this point in the history

  2. Fix testing user login.

    @courtneycb
    courtneycb committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    ada428b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @courtneycb
    courtneycb committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    d00c6dc View commit details
    Browse the repository at this point in the history

  4. Naive fix for sampledate not awarding points

    @eAlasdair
    eAlasdair committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    1bc341d View commit details
    Browse the repository at this point in the history

  5. fix naive datetimes in sampledata

    @eAlasdair
    eAlasdair committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    3812009 View commit details
    Browse the repository at this point in the history

  6. remove attempted questions from profile view

    @eAlasdair
    eAlasdair committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    c0b81b4 View commit details
    Browse the repository at this point in the history

  7. Basic tests passing.

    @courtneycb
    courtneycb committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    e8d8134 View commit details
    Browse the repository at this point in the history

  8. Add basic user test.

    @courtneycb
    courtneycb committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    38fb2b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Add log of earned badges to admin view

    @eAlasdair
    eAlasdair committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    d6ead4e View commit details
    Browse the repository at this point in the history

  2. style

    @eAlasdair
    eAlasdair committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    4ed9e31 View commit details
    Browse the repository at this point in the history

  3. add full stop for style

    @eAlasdair
    eAlasdair committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    6dc9053 View commit details
    Browse the repository at this point in the history

  4. redo load_badges command and fix incorrect asset reference

    @eAlasdair
    eAlasdair committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    322bb13 View commit details
    Browse the repository at this point in the history

  5. Fix up programming model tests.

    @courtneycb
    courtneycb committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    5bb68a3 View commit details
    Browse the repository at this point in the history

  6. Add codewof utils tests.

    @courtneycb
    courtneycb committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    d5edad1 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @courtneycb
    courtneycb committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    ec2db4b View commit details
    Browse the repository at this point in the history

  8. Remove redundant codewof folder.

    @courtneycb
    courtneycb committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    72b7a2c View commit details
    Browse the repository at this point in the history

  9. Shift code that should be in models tests.

    @courtneycb
    courtneycb committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    bdfe098 View commit details
    Browse the repository at this point in the history

  10. Add base question model tests.

    @courtneycb
    courtneycb committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    aaa0e52 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. Delete old views file. Inheritance manager sucks.

    @courtneycb
    courtneycb committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    20bbddc View commit details
    Browse the repository at this point in the history

  2. Remove redundant index view.

    @courtneycb
    courtneycb committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    8586d64 View commit details
    Browse the repository at this point in the history

  3. Fix question model tests.

    @courtneycb
    courtneycb committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    e530084 View commit details
    Browse the repository at this point in the history

  4. migration for meta change

    @eAlasdair
    eAlasdair committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    2746b6c View commit details
    Browse the repository at this point in the history

  5. Add QuestionType model tests.

    @courtneycb
    courtneycb committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    6ae564c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @courtneycb
    courtneycb committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    fe7944a View commit details
    Browse the repository at this point in the history

  7. Remove old code.

    @courtneycb
    courtneycb committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    b6869b5 View commit details
    Browse the repository at this point in the history

  8. Latest.

    @courtneycb
    courtneycb committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    31cf22a View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2020

  1. Add some user model tests.

    @courtneycb
    courtneycb committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    4b28bd4 View commit details
    Browse the repository at this point in the history

  2. Fix days consecutively answered function and test

    @eAlasdair
    eAlasdair committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    9573670 View commit details
    Browse the repository at this point in the history

  3. Tidy up.

    @courtneycb
    courtneycb committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    d43f9bf View commit details
    Browse the repository at this point in the history

  4. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @courtneycb
    courtneycb committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    62158b7 View commit details
    Browse the repository at this point in the history

  5. minor clarity fixes for utils

    @eAlasdair
    eAlasdair committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    57e3130 View commit details
    Browse the repository at this point in the history

  6. Commit before pull.

    @courtneycb
    courtneycb committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    2ab116a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @courtneycb
    courtneycb committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    15cd2bd View commit details
    Browse the repository at this point in the history

  8. Add more utils tests.

    @courtneycb
    courtneycb committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    33a3419 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. Update check_badge_conditions test.

    @courtneycb
    courtneycb committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    bcef44a View commit details
    Browse the repository at this point in the history

  2. Pushing latest.

    @courtneycb
    courtneycb committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    f822d50 View commit details
    Browse the repository at this point in the history

  3. fix test

    @eAlasdair
    eAlasdair committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    f255701 View commit details
    Browse the repository at this point in the history

  4. Add some tests for backdate function

    @courtneycb
    courtneycb committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    1b85b8e View commit details
    Browse the repository at this point in the history

  5. All da style thaaaaangs.

    @courtneycb
    courtneycb committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    d90fb9f View commit details
    Browse the repository at this point in the history

  6. add tests for earning points under certain conditions

    @eAlasdair
    eAlasdair committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    d77fce2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @eAlasdair
    eAlasdair committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    1f7bd87 View commit details
    Browse the repository at this point in the history

  8. fix

    @eAlasdair
    eAlasdair committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    fb08dc1 View commit details
    Browse the repository at this point in the history

  9. Fix feature file scenario.

    @courtneycb
    courtneycb committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    0a82dad View commit details
    Browse the repository at this point in the history

  10. Merge branch 'gamification' of https://github.com/uccser/codewof into… 

    … gamification
    @courtneycb
    courtneycb committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    54451db View commit details
    Browse the repository at this point in the history