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

166152326 Allows comparison of members #24

Merged
merged 1 commit into from
Jun 19, 2019

Conversation

justMuriithi
Copy link
Contributor

Title

This PR allows for the comparison of members' weight data

Description

When two users are training together it would be useful to see a comparison of some sorts. Two graphs showing the users' weight data gives a good visual impression of the comparison

Type of change

  • Bug fix (non-breaking change which fixes an issue)

  • New feature (non-breaking change which adds functionality)

  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

  • This change requires a documentation update

How Can This Be Manually Tested?

To be able to test the feature, check out the branch story/166152326-comparison-of-members and then python manage.py runserver.

  • Login as a gym manager

  • Navigate to the URL http://127.0.0.1:8000/en/gym/<gym_id>/members on your browser

image

  • Select 2 users

image

  • Compare

image

Acceptance Criteria:

Checklist:

  • Adds a means to compare weight data of 2 members
  • Assigns comparison functionality to the gym manager

PT stories

#166152326

wger/weight/static/js/compare_weight.js Outdated Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Outdated Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Outdated Show resolved Hide resolved
@justMuriithi justMuriithi force-pushed the story/166152326-comparison-of-members branch from 24a2fd5 to 826e215 Compare June 18, 2019 15:20
@justMuriithi justMuriithi added the 🚧 Work in Progress When a PR is not yet ready to be reviewed label Jun 18, 2019
@justMuriithi justMuriithi force-pushed the story/166152326-comparison-of-members branch from 826e215 to db33821 Compare June 18, 2019 16:03
wger/weight/static/js/compare_weight.js Outdated Show resolved Hide resolved
wger/weight/static/js/compare_weight.js Outdated Show resolved Hide resolved
@justMuriithi justMuriithi force-pushed the story/166152326-comparison-of-members branch 2 times, most recently from d133e79 to da3bf0d Compare June 18, 2019 16:20
@justMuriithi justMuriithi force-pushed the story/166152326-comparison-of-members branch 2 times, most recently from bba54af to dafd3a1 Compare June 19, 2019 08:43
- Adds a means to compare weight data of 2 members
- Assigns comparison functionality to gym manager

[Delivers #166152326]
@justMuriithi justMuriithi force-pushed the story/166152326-comparison-of-members branch from dafd3a1 to aa344d4 Compare June 19, 2019 08:44
@justMuriithi justMuriithi added 👍 ready Ready for review and removed 🚧 Work in Progress When a PR is not yet ready to be reviewed labels Jun 19, 2019
Copy link
Contributor

@Tevinthuku Tevinthuku left a comment

Choose a reason for hiding this comment

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

This works as expected. I can now compare the weights of two users successfully

Copy link
Contributor

@misocho misocho left a comment

Choose a reason for hiding this comment

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

Good work with the comparison graphs. We can now visually compare two users.

Copy link
Contributor

@Kimaiyo077 Kimaiyo077 left a comment

Choose a reason for hiding this comment

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

I was able to compare weight entries of two users graphically which can be helpful data. Nice work @justMuriithi

Copy link
Contributor

@michael-basweti michael-basweti left a comment

Choose a reason for hiding this comment

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

works according to the task description

@michael-basweti michael-basweti merged commit d22707f into develop Jun 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
👍 ready Ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants