RPE (rate of perceived exertion) #479 #546
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
November 1, 2020 15:15
|
I'll take a look when I'm back home later today |
rolandgeider
reviewed
Nov 5, 2020
wger/manager/helpers.py
Outdated
| @@ -212,7 +212,7 @@ def get_reps_reprentation(setting, rep_unit): | |||
| "Until Failure" unit | |||
| """ | |||
| if setting.repetition_unit_id != 2: | |||
| reps = "{0} {1}".format(setting.reps, rep_unit).strip() | |||
| reps = "{0} {1} ({2})".format(setting.reps, rep_unit, setting.rpe).strip() | |||
There was a problem hiding this comment.
We need to add a bit more of logic here when there's no value selected. So instead of "3 × 4 (None) (10 kg)", "3 × 4 (10 kg)" or 3 × 4 (10 kg 2RiR)"
wger/manager/helpers.py
Outdated
| @@ -285,7 +285,7 @@ def normalize_weight(setting): | |||
| reps = get_reps_reprentation(setting, rep_unit) | |||
| weight = normalize_weight(setting) | |||
| if weight: | |||
| reps += ' ({0} {1})'.format(weight, setting.weight_unit) | |||
| reps += ' x {0} {1}'.format(weight, setting.weight_unit) | |||
| blank=True, | ||
| null=True, | ||
| choices=NUMBERS) | ||
|
|
There was a problem hiding this comment.
Can you change this to rir (Reps In Reserve) instead? You can leave the options 4 to 1 in 0,5 steps. You can leave the field as Integer and make the second value in the touple a string.
|
Ping :) |
|
I have merged this manually and polished a couple of things, thanks for the work!! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DecimalField needs to be resolved. Creating a DecimalField in Settings is validated with Integer. The issue is currently solved using IntegerField.