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

Flexible routines #1827

Open
wants to merge 160 commits into
base: master
Choose a base branch
from
Open

Flexible routines #1827

wants to merge 160 commits into from

Conversation

rolandgeider
Copy link
Member

@rolandgeider rolandgeider commented Nov 21, 2024 •
edited
Loading

Backend changes for the flexible routines

wger-project/react#975
wger-project/flutter#682

@rolandgeider
Start adding the models for the improved routines
6f54568
@rolandgeider
Add logic to calculate the dates and workout days from the given loop
6de7790
@rolandgeider
Add simple weight calculations
9a321b7
@rolandgeider
Correctly skip calculations if the user didn't log the needed weights
50c3498
@rolandgeider
Handle the need_log_to_apply flag
8b1e660
@rolandgeider
add escape hatch in form of custom logic used to calculate the sets
2d36272 
This is just a first version, will probably need to work a bit more on it
@rolandgeider
Consolidate migrations
2830eea
@rolandgeider
Merge branch 'master' into feature/flexible-routines
c3936b2
@rolandgeider
Start exposing the routine data over the API
93138f8
@rolandgeider
Expose the calculate date sequence over the API
5511e1a
@rolandgeider
Expose the calculated weight config for each workout day
750ace6
@rolandgeider
Finally remove the canonical representation logic for the old workouts
fec9380
@rolandgeider
Simplify some of the dataclasses
2593be6
@rolandgeider
Add first draft for migrating workouts to routines
f57c27d
@rolandgeider
Add configuration to calculate the number of sets as well as the roun…
9720d01 
…ding value
@rolandgeider
Rename SetNg to Slot
2a00af6 
While this is not 100% correct, it is a clearer name
@rolandgeider
Move rounding to SlotConfig, as it makes more sense here
6b078f2
@rolandgeider
Move the "is_dropset" flag to the slot config, which is where it belongs
cea3b11
@rolandgeider
Properly handle Null configuration options
23aeb3e
@rolandgeider
Handle last_day_in_week flag
1506f8b
@rolandgeider
Move the API documentation to the docs repo
1c00d8e
@rolandgeider
Expose the full routine structure over the API
13bbffa
@rolandgeider
Merge branch 'refs/heads/master' into feature/flexible-routines
e167118
@rolandgeider
Merge branch 'refs/heads/master' into feature/flexible-routines
cafd89d
@rolandgeider
Add label model
b1471cf 
This can be used for example to label the different date ranges or weeks, or set
other info such as "deload", etc.
@rolandgeider
Expose a different view than the pure data structure
a98ed5b 
This has only the information the client needs to render the workout day
@rolandgeider
Don't use a boolean flag for dropsets
b445b8b 
This field is now a charfield so that new options can be added
@rolandgeider
Add foreign key to next log entry
3444430 
This allows us to know which entries were part of a dropset or similar
@rolandgeider
Fix code "exercise_base" -> "exercise"
8b5bb07
@rolandgeider
Automatically create a session for logs
ba5cc26
@rolandgeider
Add default rounding values to the user profile
4bd13a9
@rolandgeider
Check if the user has an email set
18c8f62
@rolandgeider
Allo the requirements field in the serializer to be nullable
a30e4fe
@rolandgeider
Add edit url for routines
e1b8b53
@rolandgeider
Calculate the intensity for the statistics
6de967a
@rolandgeider
Use correct url for editing
b0da8f6
@rolandgeider
Add edit progression url
abaf6ea
@rolandgeider
Remove slots from rest days and add tests
065d432
@rolandgeider
Add permissions and endpoints to manage routine templates
2387f33
@rolandgeider
Cleanup unused workout templates, logic and urls
3c8e8bd
@rolandgeider
Remove old workout model and associated views
c5930a8
@rolandgeider
Fix tests
78ae0fa
@rolandgeider
Expose the max RiR over the API
9134649
@rolandgeider
Set default value for max_rir
34599c7
@rolandgeider
Put the check for fit_in_week first
eaabf1e
@rolandgeider
Merge branch 'master' into feature/flexible-routines
f5837d4 
# Conflicts:
#	wger/core/static/react/main.js
#	wger/nutrition/views/plan.py
@rolandgeider rolandgeider marked this pull request as ready for review January 10, 2025 20:48
@rolandgeider
Don't use the hard coded default cache in the tests
cfdade9
@rolandgeider
Add session object to every log, fix tests
23e026c
@rolandgeider
Re-add hard coded locmem test
3d98589 
This should be changed in the future, though
@rolandgeider
Add rest and rest target values to the log table
829939e 
This makes the behaviour consistent with the other fields even if this value
is probably not the most useful we have
@rolandgeider
The requirements field is not required
70beb41
@rolandgeider
Refactor the dummy generator for workout logs
1c9f660 
This now creates random entries for the existing exercises and sets
defined in the routine (useful e.g. to generate "realistic" statistics
for charts, log table, etc.)
@rolandgeider
Formatting
b0c16e5
@rolandgeider
Fix test
7c6d76e
@rolandgeider
Increase range of logs
aac5d7f
@rolandgeider
Remove unused file
2a564b4
@rolandgeider
Rename workout log field for more consistency
1e2e75b
@rolandgeider
Change field type for log values to decimal field
5f2803e 
This is more correct since the planned values can be decimals as well
@rolandgeider
Pass max-* values to calculation class
1930a26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@rolandgeider