Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix code "exercise_base" -> "exercise"

Roland Geider8b5bb07bc9c9
diff --git a/wger/core/demo.py b/wger/core/demo.py
index d5b870d19..888cd1866 100644
--- a/wger/core/demo.py
+++ b/wger/core/demo.py
@@ -34,6 +34,7 @@ from wger.exercises.models import (
)
from wger.manager.models import (
Day,
+ Routine,
Schedule,
ScheduleStep,
Set,
@@ -93,15 +94,20 @@ def create_demo_entries(user):
#
setting_list = []
weight_log = []
- workout = Workout(user=user, name=_('Sample workout'))
- workout.save()
+ routine = Routine(
+ user=user,
+ name=_('Sample workout'),
+ start=datetime.date.today(),
+ end=datetime.date.today() + datetime.timedelta(days=60),
+ )
+ routine.save()
monday = DaysOfWeek.objects.get(pk=1)
wednesday = DaysOfWeek.objects.get(pk=3)
- day = Day(training=workout, description=_('Sample day'))
+ day = Day(training=routine, description=_('Sample day'))
day.save()
day.day.add(monday)
- day2 = Day(training=workout, description=_('Another sample day'))
+ day2 = Day(training=routine, description=_('Another sample day'))
day2.save()
day2.day.add(wednesday)
@@ -118,8 +124,8 @@ def create_demo_entries(user):
for i in range(1, 8):
log = WorkoutLog(
user=user,
- exercise_base=exercise,
- workout=workout,
+ exercise=exercise,
+ routine=routine,
reps=reps,
weight=18 - reps + random.randint(1, 4),
date=datetime.date.today() - datetime.timedelta(weeks=i),
@@ -138,8 +144,8 @@ def create_demo_entries(user):
for i in range(1, 8):
log = WorkoutLog(
user=user,
- exercise_base=exercise,
- workout=workout,
+ exercise=exercise,
+ routine=routine,
reps=reps,
weight=30 - reps + random.randint(1, 4),
date=datetime.date.today() - datetime.timedelta(weeks=i),
@@ -158,8 +164,8 @@ def create_demo_entries(user):
for i in range(1, 8):
log = WorkoutLog(
user=user,
- exercise_base=exercise,
- workout=workout,
+ exercise=exercise,
+ routine=routine,
reps=reps,
weight=110 - reps + random.randint(1, 10),
date=datetime.date.today() - datetime.timedelta(weeks=i),
@@ -366,7 +372,7 @@ def create_demo_entries(user):
step = ScheduleStep()
step.schedule = schedule
- step.workout = workout
+ step.workout = routine
step.duration = 4
step.order = 2
step.save()
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index c9ef15538..a1148117b 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -371,7 +371,8 @@ class ExerciseTranslationSerializer(serializers.ModelSerializer):
# -> Check if the language already exists, excluding the current object
if self.instance:
if self.instance.exercise_base.exercises.filter(
- ~Q(id=self.instance.pk), language=value['language']
+ ~Q(id=self.instance.pk),
+ language=value['language'],
).exists():
raise serializers.ValidationError(
f"There is already a translation for this exercise in {value['language']}"
@@ -380,7 +381,8 @@ class ExerciseTranslationSerializer(serializers.ModelSerializer):
# -> Check if the language already exists
else:
if Exercise.objects.filter(
- exercise_base=value['exercise_base'], language=value['language']
+ exercise_base=value['exercise_base'],
+ language=value['language'],
).exists():
raise serializers.ValidationError(
f"There is already a translation for this exercise in {value['language']}"
diff --git a/wger/exercises/management/commands/delete-unused-exercises.py b/wger/exercises/management/commands/delete-unused-exercises.py
index 678f64d2a..8ba6c68a7 100644
--- a/wger/exercises/management/commands/delete-unused-exercises.py
+++ b/wger/exercises/management/commands/delete-unused-exercises.py
@@ -42,19 +42,19 @@ class Command(BaseCommand):
out = f'{ExerciseBase.objects.all().count()} exercises currently in the database'
self.stdout.write(out)
- bases = set(Setting.objects.all().values_list('exercise_base', flat=True))
- bases_logs = set(WorkoutLog.objects.all().values_list('exercise_base', flat=True))
- bases.update(bases_logs)
+ exercises = set(Setting.objects.all().values_list('exercise_base', flat=True))
+ logs = set(WorkoutLog.objects.all().values_list('exercise', flat=True))
+ exercises.update(logs)
# Ask for confirmation
- out = f'{len(bases)} exercises are in use, delete the rest?'
+ out = f'{len(exercises)} exercises are in use, delete the rest?'
self.stdout.write(out)
response = ''
while response not in ('y', 'n'):
response = input('Type y to delete or n to exit: ')
if response == 'y':
- ExerciseBase.objects.exclude(pk__in=bases).delete()
+ ExerciseBase.objects.exclude(pk__in=exercises).delete()
out = self.style.SUCCESS('Done! You can now run python manage.py sync-exercises')
self.stdout.write(out)
else:
diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.json
index 9a5f7bc9b..e9c4dcffd 100644
--- a/wger/manager/fixtures/test-workout-data.json
+++ b/wger/manager/fixtures/test-workout-data.json
@@ -1,224 +1,254 @@
[
- {
- "pk": 1,
- "model": "manager.workout",
- "fields": {
- "name": "A test workout",
- "user": 1,
- "creation_date": "2012-11-01",
- "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna"
- }
- },
- {
- "pk": 2,
- "model": "manager.workout",
- "fields": {
- "name": "Another test workout",
- "user": 1,
- "creation_date": "2012-11-10",
- "description": "The wild boar (Sus scrofa), also known as the \"wild swine\", \"common wild pig\", or simply \"wild pig\", is a suid native to much of Eurasia and North Africa"
- }
- },
- {
- "pk": 3,
- "model": "manager.workout",
- "fields": {
- "name": "My test workout",
- "user": 2,
- "creation_date": "2012-11-20",
- "description": ""
- }
- },
-
-
- {
- "pk": 1,
- "model": "manager.day",
- "fields": {
- "training": 1,
- "description": "A day",
- "day": [
- 2
- ]
- }
- },
- {
- "pk": 2,
- "model": "manager.day",
- "fields": {
- "training": 1,
- "description": "Another day",
- "day": [
- 4
- ]
- }
- },
- {
- "pk": 3,
- "model": "manager.day",
- "fields": {
- "training": 2,
- "description": "Test day 1",
- "day": [
- 1
- ]
- }
- },
- {
- "pk": 4,
- "model": "manager.day",
- "fields": {
- "training": 1,
- "description": "Test day 2",
- "day": [
- 5
- ]
- }
- },
- {
- "pk": 5,
- "model": "manager.day",
- "fields": {
- "training": 3,
- "description": "A cool day",
- "day": [
- 5,
- 3
- ]
- }
- },
-
-
- {
- "pk": 1,
- "model": "manager.set",
- "fields": {
- "exerciseday": 1,
- "order": 1,
- "sets": "2"
- }
- },
- {
- "pk": 2,
- "model": "manager.set",
- "fields": {
- "exerciseday": 2,
- "order": 1,
- "sets": "4"
- }
- },
- {
- "pk": 3,
- "model": "manager.set",
- "fields": {
- "exerciseday": 5,
- "order": 1,
- "sets": "4"
- }
- },
-
- {
- "pk": 1,
- "model": "manager.setting",
- "fields": {
- "comment": "",
- "set": 1,
- "reps": 8,
- "repetition_unit_id": 1,
- "weight_unit_id": 1,
- "weight": null,
- "order": 1,
- "exercise_base": 1,
- "rir": 3
- }
- },
- {
- "pk": 2,
- "model": "manager.setting",
- "fields": {
- "comment": "",
- "set": 2,
- "reps": 10,
- "repetition_unit_id": 1,
- "weight_unit_id": 1,
- "weight": 15,
- "order": 1,
- "exercise_base": 2
- }
- },
- {
- "pk": 3,
- "model": "manager.setting",
- "fields": {
- "comment": "",
- "set": 3,
- "reps": 10,
- "repetition_unit_id": 1,
- "weight_unit_id": 1,
- "weight": null,
- "order": 1,
- "exercise_base": 2
- }
- },
-
- {
- "pk": 1,
- "model": "manager.workoutlog",
- "fields": {
- "weight": 30,
- "workout": 1,
- "reps": 8,
- "user": 1,
- "date": "2012-10-01",
- "exercise_base": 1
- }
- },
- {
- "pk": 2,
- "model": "manager.workoutlog",
- "fields": {
- "weight": 32,
- "workout": 1,
- "reps": 8,
- "user": 1,
- "date": "2012-10-10",
- "exercise_base": 1
- }
- },
- {
- "pk": 3,
- "model": "manager.workoutlog",
- "fields": {
- "weight": 38,
- "workout": 1,
- "reps": 8,
- "user": 1,
- "date": "2013-10-30",
- "exercise_base": 1
- }
- },
- {
- "pk": 4,
- "model": "manager.workoutlog",
- "fields": {
- "weight": 30,
- "workout": 1,
- "reps": 8,
- "user": 1,
- "date": "2012-11-01",
- "exercise_base": 1
- }
- },
- {
- "pk": 5,
- "model": "manager.workoutlog",
- "fields": {
- "weight": 30,
- "workout": 3,
- "reps": 8,
- "user": 2,
- "date": "2012-11-01",
- "exercise_base": 2
- }
+ {
+ "pk": 1,
+ "model": "manager.workout",
+ "fields": {
+ "name": "A test workout",
+ "user": 1,
+ "creation_date": "2012-11-01",
+ "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna"
}
+ },
+ {
+ "pk": 2,
+ "model": "manager.workout",
+ "fields": {
+ "name": "Another test workout",
+ "user": 1,
+ "creation_date": "2012-11-10",
+ "description": "The wild boar (Sus scrofa), also known as the \"wild swine\", \"common wild pig\", or simply \"wild pig\", is a suid native to much of Eurasia and North Africa"
+ }
+ },
+ {
+ "pk": 3,
+ "model": "manager.workout",
+ "fields": {
+ "name": "My test workout",
+ "user": 2,
+ "creation_date": "2012-11-20",
+ "description": ""
+ }
+ },
+ {
+ "pk": 1,
+ "model": "manager.routine",
+ "fields": {
+ "name": "A test workout",
+ "user": 1,
+ "created": "2024-06-01",
+ "start": "2024-06-01",
+ "end": "2024-09-01",
+ "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna"
+ }
+ },
+ {
+ "pk": 2,
+ "model": "manager.routine",
+ "fields": {
+ "name": "Another test workout",
+ "user": 1,
+ "created": "2024-06-01",
+ "start": "2024-06-01",
+ "end": "2024-09-01",
+ "description": "The wild boar (Sus scrofa), also known as the \"wild swine\", \"common wild pig\", or simply \"wild pig\", is a suid native to much of Eurasia and North Africa"
+ }
+ },
+ {
+ "pk": 3,
+ "model": "manager.routine",
+ "fields": {
+ "name": "My test workout",
+ "user": 2,
+ "created": "2024-06-01",
+ "start": "2024-06-01",
+ "end": "2024-09-01",
+ "description": ""
+ }
+ },
+ {
+ "pk": 1,
+ "model": "manager.day",
+ "fields": {
+ "training": 1,
+ "description": "A day",
+ "day": [
+ 2
+ ]
+ }
+ },
+ {
+ "pk": 2,
+ "model": "manager.day",
+ "fields": {
+ "training": 1,
+ "description": "Another day",
+ "day": [
+ 4
+ ]
+ }
+ },
+ {
+ "pk": 3,
+ "model": "manager.day",
+ "fields": {
+ "training": 2,
+ "description": "Test day 1",
+ "day": [
+ 1
+ ]
+ }
+ },
+ {
+ "pk": 4,
+ "model": "manager.day",
+ "fields": {
+ "training": 1,
+ "description": "Test day 2",
+ "day": [
+ 5
+ ]
+ }
+ },
+ {
+ "pk": 5,
+ "model": "manager.day",
+ "fields": {
+ "training": 3,
+ "description": "A cool day",
+ "day": [
+ 5,
+ 3
+ ]
+ }
+ },
+ {
+ "pk": 1,
+ "model": "manager.set",
+ "fields": {
+ "exerciseday": 1,
+ "order": 1,
+ "sets": "2"
+ }
+ },
+ {
+ "pk": 2,
+ "model": "manager.set",
+ "fields": {
+ "exerciseday": 2,
+ "order": 1,
+ "sets": "4"
+ }
+ },
+ {
+ "pk": 3,
+ "model": "manager.set",
+ "fields": {
+ "exerciseday": 5,
+ "order": 1,
+ "sets": "4"
+ }
+ },
+ {
+ "pk": 1,
+ "model": "manager.setting",
+ "fields": {
+ "comment": "",
+ "set": 1,
+ "reps": 8,
+ "repetition_unit_id": 1,
+ "weight_unit_id": 1,
+ "weight": null,
+ "order": 1,
+ "exercise_base": 1,
+ "rir": 3
+ }
+ },
+ {
+ "pk": 2,
+ "model": "manager.setting",
+ "fields": {
+ "comment": "",
+ "set": 2,
+ "reps": 10,
+ "repetition_unit_id": 1,
+ "weight_unit_id": 1,
+ "weight": 15,
+ "order": 1,
+ "exercise_base": 2
+ }
+ },
+ {
+ "pk": 3,
+ "model": "manager.setting",
+ "fields": {
+ "comment": "",
+ "set": 3,
+ "reps": 10,
+ "repetition_unit_id": 1,
+ "weight_unit_id": 1,
+ "weight": null,
+ "order": 1,
+ "exercise_base": 2
+ }
+ },
+ {
+ "pk": 1,
+ "model": "manager.workoutlog",
+ "fields": {
+ "weight": 30,
+ "routine": 1,
+ "reps": 8,
+ "user": 1,
+ "date": "2012-10-01",
+ "exercise": 1
+ }
+ },
+ {
+ "pk": 2,
+ "model": "manager.workoutlog",
+ "fields": {
+ "weight": 32,
+ "routine": 1,
+ "reps": 8,
+ "user": 1,
+ "date": "2012-10-10",
+ "exercise": 1
+ }
+ },
+ {
+ "pk": 3,
+ "model": "manager.workoutlog",
+ "fields": {
+ "weight": 38,
+ "routine": 1,
+ "reps": 8,
+ "user": 1,
+ "date": "2013-10-30",
+ "exercise": 1
+ }
+ },
+ {
+ "pk": 4,
+ "model": "manager.workoutlog",
+ "fields": {
+ "weight": 30,
+ "routine": 1,
+ "reps": 8,
+ "user": 1,
+ "date": "2012-11-01",
+ "exercise": 1
+ }
+ },
+ {
+ "pk": 5,
+ "model": "manager.workoutlog",
+ "fields": {
+ "weight": 30,
+ "routine": 3,
+ "reps": 8,
+ "user": 2,
+ "date": "2012-11-01",
+ "exercise": 2
+ }
+ }
]
diff --git a/wger/manager/management/commands/dummy-generator-workout-diary.py b/wger/manager/management/commands/dummy-generator-workout-diary.py
index 38fcbc8a2..836a9ba94 100644
--- a/wger/manager/management/commands/dummy-generator-workout-diary.py
+++ b/wger/manager/management/commands/dummy-generator-workout-diary.py
@@ -16,38 +16,16 @@
import datetime
import logging
import random
-import uuid
-from random import (
- choice,
- randint,
-)
-from uuid import uuid4
# Django
from django.contrib.auth.models import User
from django.core.management.base import BaseCommand
-from django.utils import timezone
# wger
-from wger.core.models import (
- DaysOfWeek,
- Language,
-)
-from wger.exercises.models import Exercise
from wger.manager.models import (
- Day,
- Set,
- Setting,
- Workout,
+ Routine,
WorkoutLog,
)
-from wger.nutrition.models import (
- Ingredient,
- LogItem,
- Meal,
- MealItem,
- NutritionPlan,
-)
logger = logging.getLogger(__name__)
@@ -89,8 +67,8 @@ class Command(BaseCommand):
self.stdout.write(f'- processing user {user.username}')
# Create a log for each workout day, set, setting, reps, weight, date
- for workout in Workout.objects.filter(user=user):
- for day in workout.day_set.all():
+ for routine in Routine.objects.filter(user=user):
+ for day in routine.day_set.all():
for workout_set in day.set_set.all():
for setting in workout_set.setting_set.all():
for reps in (8, 10, 12):
@@ -98,8 +76,8 @@ class Command(BaseCommand):
date = datetime.date.today() - datetime.timedelta(weeks=i)
log = WorkoutLog(
user=user,
- exercise_base=setting.exercise_base,
- workout=workout,
+ exercise=setting.exercise_base,
+ routine=routine,
reps=reps,
weight=50 - reps + random.randint(1, 10),
date=date,
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index c2fde9efa..72d9beeff 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -35,7 +35,6 @@ from wger.utils.cache import reset_workout_log
# Local
from ..consts import RIR_OPTIONS
from .session import WorkoutSession
-from .workout import Workout
class WorkoutLog(models.Model):
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 5dd514e13..0e30f0a3b 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -92,7 +92,7 @@ class CalendarAccessTestCase(WgerTestCase):
def test_access_not_shared(self):
"""
- Test accessing the URL of a unshared calendar page
+ Test accessing the URL of an unshared calendar page
"""
url = reverse('manager:workout:calendar', kwargs={'username': 'test'})
@@ -220,7 +220,7 @@ class WeightlogTestCase(WgerTestCase):
log = WorkoutLog()
log.user = user1
log.date = datetime.date(2014, 1, 5)
- log.exercise_base = ExerciseBase.objects.get(pk=1)
+ log.exercise = ExerciseBase.objects.get(pk=1)
log.workout = workout1
log.weight = 10
log.reps = 10
diff --git a/wger/weight/helpers.py b/wger/weight/helpers.py
index e4a722b75..69871c04c 100644
--- a/wger/weight/helpers.py
+++ b/wger/weight/helpers.py
@@ -133,10 +133,10 @@ def group_log_entries(user, year, month, day=None):
'logs': OrderedDict(),
}
- if not out[entry.date]['logs'].get(entry.exercise_base):
- out[entry.date]['logs'][entry.exercise_base] = []
+ if not out[entry.date]['logs'].get(entry.exercise):
+ out[entry.date]['logs'][entry.exercise] = []
- out[entry.date]['logs'][entry.exercise_base].append(entry)
+ out[entry.date]['logs'][entry.exercise].append(entry)
# Sessions
for entry in sessions: