-
-
Notifications
You must be signed in to change notification settings - Fork 641
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
Open
rolandgeider
wants to merge
186
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.
Open
Flexible routines #1827
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
This is more correct since the planned values can be decimals as well
# Conflicts: # wger/exercises/sync.py # wger/manager/management/commands/dummy-generator-workout-diary.py # wger/manager/management/commands/dummy-generator-workout-plans.py # wger/manager/models/schedule.py # wger/manager/models/workout.py # wger/manager/tests/test_set.py
* "exercise base" to "exercise" and * "exercise" to "translation"
Remove the "base" from exercise related endpoints and remove others that were only kept for backwards compatibility
Also update the logic used in get_config to use the requirements field instead. This might be expanded in the future to allow for other rules.
Note that this just makes the situation a bit more bearable and we should definitely further rework this
The clients can filter this on their side by iteration number
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