-
-
Notifications
You must be signed in to change notification settings - Fork 588
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
Flexible routines #1827
Draft
rolandgeider
wants to merge
115
commits into
master
Choose a base branch
from
feature/flexible-routines
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Flexible routines #1827
+44,751
−44,174
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
This is just a first version, will probably need to work a bit more on it
While this is not 100% correct, it is a clearer name
This can be used for example to label the different date ranges or weeks, or set other info such as "deload", etc.
This has only the information the client needs to render the workout day
This field is now a charfield so that new options can be added
This allows us to know which entries were part of a dropset or similar
# Conflicts: # wger/core/templates/tags/render_day.html # wger/manager/tests/test_day.py # wger/manager/urls.py # wger/manager/views/day.py # wger/manager/views/set.py
# Conflicts: # wger/core/templatetags/wger_extras.py # wger/manager/views/day.py
This is clearer and is actually what the value currently represents.
# Conflicts: # wger/core/static/react/main.js # wger/manager/helpers.py # wger/manager/urls.py # wger/manager/views/log.py
This allows a setting to be automatically repeated until a new one appears and allows the user to confige e.g. an increasing weekly weight with only one entry.
This doesn't make much sense for such a field anyway
In this case, the computed value will be returned as-is
This makes the behaviour more consistent with the rest of the configs, even if practically this won't be used as much
This is basically a NULL option for the first iteration
This will allow to store the requirements needed for the rule to apply
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.
Backend changes for the flexible routines
wger-project/react#975
wger-project/flutter#682