Code

Flexible routines#1827

Code

Open

rolandgeider wants to merge 150 commits intomasterwger-project/wger:masterfrom feature/flexible-routineswger-project/wger:feature/flexible-routinesCopy head branch name to clipboard

+45,588-46,905

Commits

Commits on Mar 4, 2024

• Start adding the models for the improved routines

  rolandgeider

  committed
  6f54568

  Copy full SHA for 6f54568

Commits on Mar 6, 2024

• Add logic to calculate the dates and workout days from the given loop

  rolandgeider

  committed
  6de7790

  Copy full SHA for 6de7790

Commits on Mar 7, 2024

• Add simple weight calculations

  rolandgeider

  committed
  9a321b7

  Copy full SHA for 9a321b7

Commits on Mar 9, 2024

• Correctly skip calculations if the user didn't log the needed weights

  rolandgeider

  committed
  50c3498

  Copy full SHA for 50c3498

Commits on Mar 10, 2024

• Handle the need_log_to_apply flag

  rolandgeider

  committed
  8b1e660

  Copy full SHA for 8b1e660

Commits on Mar 12, 2024

• add escape hatch in form of custom logic used to calculate the sets

  Show description for 2d36272
  rolandgeider

  committed
  2d36272

  Copy full SHA for 2d36272

• Consolidate migrations

  rolandgeider

  committed
  2830eea

  Copy full SHA for 2830eea

Commits on Mar 21, 2024

• Merge branch 'master' into feature/flexible-routines

  rolandgeider

  committed
  c3936b2

  Copy full SHA for c3936b2

• Start exposing the routine data over the API

  rolandgeider

  committed
  93138f8

  Copy full SHA for 93138f8

Commits on Mar 27, 2024

• Expose the calculate date sequence over the API

  rolandgeider

  committed
  5511e1a

  Copy full SHA for 5511e1a

Commits on Mar 30, 2024

• Expose the calculated weight config for each workout day

  rolandgeider

  committed
  750ace6

  Copy full SHA for 750ace6

Commits on Mar 31, 2024

• Finally remove the canonical representation logic for the old workouts

  rolandgeider

  committed
  fec9380

  Copy full SHA for fec9380

Commits on Apr 7, 2024

• Simplify some of the dataclasses

  rolandgeider

  committed
  2593be6

  Copy full SHA for 2593be6

Commits on Apr 17, 2024

• Add first draft for migrating workouts to routines

  rolandgeider

  committed
  f57c27d

  Copy full SHA for f57c27d

Commits on Apr 18, 2024

• Add configuration to calculate the number of sets as well as the rounding value

  rolandgeider

  committed
  9720d01

  Copy full SHA for 9720d01

• Rename SetNg to Slot

  Show description for 2a00af6
  rolandgeider

  committed
  2a00af6

  Copy full SHA for 2a00af6

Commits on Apr 19, 2024

• Move rounding to SlotConfig, as it makes more sense here

  rolandgeider

  committed
  6b078f2

  Copy full SHA for 6b078f2

Commits on Apr 21, 2024

• Move the "is_dropset" flag to the slot config, which is where it belongs

  rolandgeider

  committed
  cea3b11

  Copy full SHA for cea3b11

Commits on Apr 24, 2024

• Properly handle Null configuration options

  rolandgeider

  committed
  23aeb3e

  Copy full SHA for 23aeb3e

Commits on Apr 25, 2024

• Handle last_day_in_week flag

  rolandgeider

  committed
  1506f8b

  Copy full SHA for 1506f8b

• Move the API documentation to the docs repo

  rolandgeider

  committed
  1c00d8e

  Copy full SHA for 1c00d8e

• Expose the full routine structure over the API

  rolandgeider

  committed
  13bbffa

  Copy full SHA for 13bbffa

Commits on May 23, 2024

• Merge branch 'refs/heads/master' into feature/flexible-routines

  rolandgeider

  committed
  e167118

  Copy full SHA for e167118

Commits on May 31, 2024

• Merge branch 'refs/heads/master' into feature/flexible-routines

  rolandgeider

  committed
  cafd89d

  Copy full SHA for cafd89d

• Add label model

  Show description for b1471cf
  rolandgeider

  committed
  b1471cf

  Copy full SHA for b1471cf

Commits on Jun 7, 2024

• Expose a different view than the pure data structure

  Show description for a98ed5b
  rolandgeider

  committed
  a98ed5b

  Copy full SHA for a98ed5b

Commits on Jun 12, 2024

• Don't use a boolean flag for dropsets

  Show description for b445b8b
  rolandgeider

  committed
  b445b8b

  Copy full SHA for b445b8b

• Add foreign key to next log entry

  Show description for 3444430
  rolandgeider

  committed
  3444430

  Copy full SHA for 3444430

• Fix code "exercise_base" -> "exercise"

  rolandgeider

  committed
  8b5bb07

  Copy full SHA for 8b5bb07

• Automatically create a session for logs

  rolandgeider

  committed
  ba5cc26

  Copy full SHA for ba5cc26

• Remove unneeded helper method

  rolandgeider

  committed
  31277e4

  Copy full SHA for 31277e4

• The next_log foreign key is editable

  rolandgeider

  committed
  034b90c

  Copy full SHA for 034b90c

• Add some ownership checks to the log

  rolandgeider

  committed
  f958a95

  Copy full SHA for f958a95

Commits on Jun 13, 2024

• Add a type to the day model as well

  Show description for 037fa29
  rolandgeider

  committed
  037fa29

  Copy full SHA for 037fa29

• Output the set configuration as a human readable string

  rolandgeider

  committed
  cddbeb5

  Copy full SHA for cddbeb5

• Small fixes, also expose slot comment

  rolandgeider

  committed
  b83434e

  Copy full SHA for b83434e

Commits on Jun 19, 2024

• Add the possibility to configure ranges for weight, reps and rest time

  rolandgeider

  committed
  bea884c

  Copy full SHA for bea884c

• Don't use an em dash to separate the sets

  Show description for 03c8dc3
  rolandgeider

  committed
  03c8dc3

  Copy full SHA for 03c8dc3

• Improve workout day output

  Show description for d78d9d0
  rolandgeider

  committed
  d78d9d0

  Copy full SHA for d78d9d0

Commits on Jun 20, 2024

• Add some tests for the gym and display modes

  rolandgeider

  committed
  d8eba56

  Copy full SHA for d8eba56

• Add RiR to RPE conversion

  rolandgeider

  committed
  9d804f4

  Copy full SHA for 9d804f4

• Consistently name functions

  rolandgeider

  committed
  039346f

  Copy full SHA for 039346f

• Remove trigger field

  Show description for c4c6563
  rolandgeider

  committed
  c4c6563

  Copy full SHA for c4c6563

Commits on Jun 21, 2024

• Start removing the old workout models

  rolandgeider

  committed
  728364d

  Copy full SHA for 728364d

• Remove more old workout models

  rolandgeider

  committed
  d67c206

  Copy full SHA for d67c206

• Fix migration

  rolandgeider

  committed
  0e19fdf

  Copy full SHA for 0e19fdf

• Remove unused views

  rolandgeider

  committed
  1454d4a

  Copy full SHA for 1454d4a

• Finally rename DayNg to just Day

  rolandgeider

  committed
  0b1f82d

  Copy full SHA for 0b1f82d

• Add endpoint that returns the day data for a complete iteration

  rolandgeider

  committed
  7795c6e

  Copy full SHA for 7795c6e

Commits on Jun 25, 2024

• Small improvements to the text representation of the slot

  rolandgeider

  committed
  1cd27e0

  Copy full SHA for 1cd27e0

Commits on Jun 26, 2024

• Expose the logs for the routine

  rolandgeider

  committed
  a8e94a5

  Copy full SHA for a8e94a5

Commits on Jun 27, 2024

• Expose remaining clot config objects over the API

  rolandgeider

  committed
  4005375

  Copy full SHA for 4005375

Commits on Jul 4, 2024

• Allow need_log_to_apply to be nullable as well

  rolandgeider

  committed
  1af701b

  Copy full SHA for 1af701b

Commits on Jul 7, 2024

• Use the date and user information from the session

  Show description for 49f2caf
  rolandgeider

  committed
  49f2caf

  Copy full SHA for 49f2caf

Commits on Jul 8, 2024

• Merge branch 'refs/heads/master' into feature/flexible-routines

  Show description for a0c5d30
  rolandgeider

  committed
  a0c5d30

  Copy full SHA for a0c5d30

• Rename exercise model to translation

  rolandgeider

  committed
  385df1d

  Copy full SHA for 385df1d

• Rename exercisebase model to exercise

  rolandgeider

  committed
  e7d4ffc

  Copy full SHA for e7d4ffc

• Re-add local import

  Show description for 3a62e16
  rolandgeider

  committed
  3a62e16

  Copy full SHA for 3a62e16

Commits on Jul 9, 2024

• Further renaming base to exercise

  rolandgeider

  committed
  b1bfb77

  Copy full SHA for b1bfb77

Commits on Jul 10, 2024

• Update key in API

  rolandgeider

  committed
  b465ff4

  Copy full SHA for b465ff4

• Make all need_log_to_apply fields nullable

  rolandgeider

  committed
  393459e

  Copy full SHA for 393459e

• Bump version

  rolandgeider

  committed
  de53bda

  Copy full SHA for de53bda

Commits on Jul 20, 2024

• Use correct serializer for the Day endpoint

  rolandgeider

  committed
  670ceb4

  Copy full SHA for 670ceb4

• Don't set the user when creating day objects

  rolandgeider

  committed
  b280b41

  Copy full SHA for b280b41

• Expose slots and slot configs over the API

  rolandgeider

  committed
  8d7e3f5

  Copy full SHA for 8d7e3f5

• Expose the routine over the day endpoint

  rolandgeider

  committed
  3f74825

  Copy full SHA for 3f74825

Commits on Oct 5, 2024

• Fix linting in Dockerfile

  rolandgeider

  committed
  88cb2ba

  Copy full SHA for 88cb2ba

• Merge branch 'master' into feature/flexible-routines

  Show description for fb243d4
  rolandgeider

  committed
  fb243d4

  Copy full SHA for fb243d4

Commits on Oct 6, 2024

• Set the iteration for calculated rest days as well

  rolandgeider

  committed
  de7655c

  Copy full SHA for de7655c

Commits on Oct 9, 2024

• Merge branch 'master' into feature/flexible-routines

  rolandgeider

  committed
  276d4eb

  Copy full SHA for 276d4eb

Commits on Oct 19, 2024

• Fix typo

  rolandgeider

  committed
  99af895

  Copy full SHA for 99af895

Commits on Oct 20, 2024

• Remove the 'replace' flag

  Show description for 88589f6
  rolandgeider

  committed
  88589f6

  Copy full SHA for 88589f6

Commits on Oct 22, 2024

• Remove "next_day" foreign key

  Show description for 49bbd18
  rolandgeider

  committed
  49bbd18

  Copy full SHA for 49bbd18

Commits on Oct 23, 2024

• Remove trailing comma from the text representation

  rolandgeider

  committed
  8dbc009

  Copy full SHA for 8dbc009

Commits on Oct 25, 2024

• Allow the description to be left blank in days

  rolandgeider

  committed
  f33b18e

  Copy full SHA for f33b18e

Commits on Oct 27, 2024

• Update migrations

  rolandgeider

  committed
  3f3d9ae

  Copy full SHA for 3f3d9ae

Commits on Oct 28, 2024

• Move toggle to fit to week to routine object

  Show description for b2b56f0
  rolandgeider

  committed
  b2b56f0

  Copy full SHA for b2b56f0

• Start adding caching to routine calculations

  rolandgeider

  committed
  f7d22e2

  Copy full SHA for f7d22e2

• Rename SlotConfig to SlotEntry, this makes more sense

  rolandgeider

  committed
  059660b

  Copy full SHA for 059660b

• Update test fixtures

  rolandgeider

  committed
  bad75f9

  Copy full SHA for bad75f9

Commits on Oct 29, 2024

• Add JSON field for additional configuration

  rolandgeider

  committed
  30c1431

  Copy full SHA for 30c1431

Commits on Oct 30, 2024

• Add missing fields to serializers

  rolandgeider

  committed
  f8a89e8

  Copy full SHA for f8a89e8

• Always set repetition and weight units

  rolandgeider

  committed
  9e69907

  Copy full SHA for 9e69907

Commits on Nov 7, 2024

• Correctly calculate sets for one exercise

  rolandgeider

  committed
  4b8913e

  Copy full SHA for 4b8913e

• Some renaming

  rolandgeider

  committed
  8998ca8

  Copy full SHA for 8998ca8

• Some config values are always positive integers

  rolandgeider

  committed
  17c21ff

  Copy full SHA for 17c21ff

Commits on Nov 14, 2024

• Merge branch 'master' into feature/flexible-routines

  Show description for 37bf698
  rolandgeider

  committed
  37bf698

  Copy full SHA for 37bf698

• Merge branch 'master' into feature/flexible-routines

  Show description for 5c73bb1
  rolandgeider

  committed
  5c73bb1

  Copy full SHA for 5c73bb1

Commits on Nov 17, 2024

• Allow empty day names

  rolandgeider

  committed
  1e30666

  Copy full SHA for 1e30666

• Calculate statistics for the routine

  rolandgeider

  committed
  4d8255a

  Copy full SHA for 4d8255a

• Update react files

  rolandgeider

  committed
  4696bf2

  Copy full SHA for 4696bf2

Commits on Nov 19, 2024

• Remove link to schedules

  rolandgeider

  committed
  e08b0c7

  Copy full SHA for e08b0c7

Commits on Nov 20, 2024

• Show rest time in text representation

  rolandgeider

  committed
  d251906

  Copy full SHA for d251906

Commits on Nov 21, 2024

• Rename muscle_group to muscle

  Show description for 677974e
  rolandgeider

  committed
  677974e

  Copy full SHA for 677974e

• Remove some unused views

  rolandgeider

  committed
  87a585d

  Copy full SHA for 87a585d

• Merge branch 'master' into feature/flexible-routines

  Show description for 2535824
  rolandgeider

  committed
  2535824

  Copy full SHA for 2535824

• Rename some urls, etc

  rolandgeider

  committed
  8a7c081

  Copy full SHA for 8a7c081

• Update react files

  rolandgeider

  committed
  fd1ffd5

  Copy full SHA for fd1ffd5

• Move copy view to routine file

  rolandgeider

  committed
  a00a79e

  Copy full SHA for a00a79e

• First round of fixing the PDF export views

  rolandgeider

  committed
  70be923

  Copy full SHA for 70be923

• Bump version

  rolandgeider

  committed
  9138f85

  Copy full SHA for 9138f85

Commits on Nov 22, 2024

• Remove unused parameters for exercise PDF

  rolandgeider

  committed
  f2f5406

  Copy full SHA for f2f5406

• Check that both the entry and the max variant are set

  rolandgeider

  committed
  e4fd899

  Copy full SHA for e4fd899

Commits on Nov 25, 2024

• Expose the day in the session serializer

  rolandgeider

  committed
  dc34bd2

  Copy full SHA for dc34bd2

• Add react view for new log and session form

  rolandgeider

  committed
  ee1cf3d

  Copy full SHA for ee1cf3d

• Add fields to configure the maximum number of sets as well

  rolandgeider

  committed
  84e41d3

  Copy full SHA for 84e41d3

• Add "repeat" parameter to the abstract config objects

  Show description for 2e2247f
  rolandgeider

  committed
  2e2247f

  Copy full SHA for 2e2247f

• Don't allow "need_log_to_apply" to be nullable

  Show description for 47519f9
  rolandgeider

  committed
  47519f9

  Copy full SHA for 47519f9

• Allow rounding values to be nullable

  Show description for b952fb5
  rolandgeider

  committed
  b952fb5

  Copy full SHA for b952fb5

Commits on Nov 28, 2024

• Handle base being zero

  rolandgeider

  committed
  140137b

  Copy full SHA for 140137b

• Remove unused code and tests

  rolandgeider

  committed
  1d14386

  Copy full SHA for 1d14386

Commits on Nov 29, 2024

• Allow setting max rir values

  Show description for f1a9670
  rolandgeider

  committed
  f1a9670

  Copy full SHA for f1a9670

• Remove more unused code

  rolandgeider

  committed
  2cb3b97

  Copy full SHA for 2cb3b97

• Add 'not applicable' option

  Show description for 41a445d
  rolandgeider

  committed
  41a445d

  Copy full SHA for 41a445d

• Add requirements field for progression rules

  Show description for 67b6396
  rolandgeider

  committed
  67b6396

  Copy full SHA for 67b6396

Commits on Dec 6, 2024

• Merge branch 'master' into feature/flexible-routines

  rolandgeider

  committed
  f1b3661

  Copy full SHA for f1b3661

• Handle filtering on the json field

  rolandgeider

  committed
  7941e73

  Copy full SHA for 7941e73

Commits on Dec 12, 2024

• Add target values for log values

  rolandgeider

  committed
  5853544

  Copy full SHA for 5853544

• Fix migration script for workout logs and sessions

  rolandgeider

  committed
  b5e4c85

  Copy full SHA for b5e4c85

Commits on Dec 13, 2024

• Remove schedule models and logic

  rolandgeider

  committed
  122afcf

  Copy full SHA for 122afcf

• Fix ican generation and tests

  rolandgeider

  committed
  c5cffbd

  Copy full SHA for c5cffbd

• Remove unused functions

  rolandgeider

  committed
  f13d4ee

  Copy full SHA for f13d4ee

• Rename url

  rolandgeider

  committed
  da989c4

  Copy full SHA for da989c4

• Don't set a content disposition header

  Show description for d7924a4
  rolandgeider

  committed
  d7924a4

  Copy full SHA for d7924a4

• Always call get_or_create

  Show description for 5073a74
  rolandgeider

  committed
  5073a74

  Copy full SHA for 5073a74

• Fix some tests

  rolandgeider

  committed
  741064b

  Copy full SHA for 741064b

• Fix email reminders command and tests

  rolandgeider

  committed
  1db132d

  Copy full SHA for 1db132d

Commits on Dec 14, 2024

• Remove unused imports and other fixes

  rolandgeider

  committed
  af834cf

  Copy full SHA for af834cf

• Merge branch 'master' into feature/flexible-routines

  Show description for 5901308
  rolandgeider

  committed
  5901308

  Copy full SHA for 5901308

• Add filterset to allow more fine grained filter options for logs

  rolandgeider

  committed
  d0b9a99

  Copy full SHA for d0b9a99

Commits on Dec 17, 2024

• Put logs and statistics under the routine URL

  Show description for 03bb3ea
  rolandgeider

  committed
  03bb3ea

  Copy full SHA for 03bb3ea

Commits on Dec 20, 2024

• Add default rounding values to the user profile

  rolandgeider

  committed
  4bd13a9

  Copy full SHA for 4bd13a9

• Check if the user has an email set

  rolandgeider

  committed
  18c8f62

  Copy full SHA for 18c8f62

Commits on Dec 21, 2024

• Allo the requirements field in the serializer to be nullable

  rolandgeider

  committed
  a30e4fe

  Copy full SHA for a30e4fe

• Add edit url for routines

  rolandgeider

  committed
  e1b8b53

  Copy full SHA for e1b8b53

Commits on Dec 25, 2024

• Calculate the intensity for the statistics

  rolandgeider

  committed
  6de967a

  Copy full SHA for 6de967a

• Use correct url for editing

  rolandgeider

  committed
  b0da8f6

  Copy full SHA for b0da8f6

Commits on Jan 4, 2025

• Add edit progression url

  rolandgeider

  committed
  abaf6ea

  Copy full SHA for abaf6ea

• Remove slots from rest days and add tests

  rolandgeider

  committed
  065d432

  Copy full SHA for 065d432

• Add permissions and endpoints to manage routine templates

  rolandgeider

  committed
  2387f33

  Copy full SHA for 2387f33

• Cleanup unused workout templates, logic and urls

  rolandgeider

  committed
  3c8e8bd

  Copy full SHA for 3c8e8bd

• Remove old workout model and associated views

  rolandgeider

  committed
  c5930a8

  Copy full SHA for c5930a8

• Fix tests

  rolandgeider

  committed
  78ae0fa

  Copy full SHA for 78ae0fa

Commits on Jan 8, 2025

• Expose the max RiR over the API

  rolandgeider

  committed
  9134649

  Copy full SHA for 9134649

Commits on Jan 10, 2025

• Set default value for max_rir

  rolandgeider

  committed
  34599c7

  Copy full SHA for 34599c7

• Put the check for fit_in_week first

  rolandgeider

  committed
  eaabf1e

  Copy full SHA for eaabf1e

• Merge branch 'master' into feature/flexible-routines

  Show description for f5837d4
  rolandgeider

  committed
  f5837d4

  Copy full SHA for f5837d4

Commits on Jan 11, 2025

• Don't use the hard coded default cache in the tests

  rolandgeider

  committed
  cfdade9

  Copy full SHA for cfdade9

• Add session object to every log, fix tests

  rolandgeider

  committed
  23e026c

  Copy full SHA for 23e026c

• Re-add hard coded locmem test

  Show description for 3d98589
  rolandgeider

  committed
  3d98589

  Copy full SHA for 3d98589