Self hosted FLOSS fitness/workout, nutrition and weight tracker
Start moving references from Exercise to ExerciseBase
Roland Geider9184689d1bc7
diff --git a/extras/dummy_generator/generator.py b/extras/dummy_generator/generator.pyindex 90052a289..38fcbe856 100644--- a/extras/dummy_generator/generator.py+++ b/extras/dummy_generator/generator.py@@ -419,7 +419,7 @@ if hasattr(args, 'number_logs'):date = datetime.date.today() - datetime.timedelta(weeks=i)log = WorkoutLog(user=user,- exercise=setting.exercise,+ exercise_base=setting.exercise.exercise_base,workout=workout,reps=reps,weight=50 - reps + random.randint(1, 10),diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex c4517ff23..e460b863e 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -151,7 +151,7 @@ def view(request, id, slug=None):entry_log = []chart_data = []if request.user.is_authenticated:- logs = WorkoutLog.objects.filter(user=request.user, exercise=exercise)+ logs = WorkoutLog.objects.filter(user=request.user, exercise=exercise.exercise_base)entry_log, chart_data = process_log_entries(logs)template_data['logs'] = entry_logdiff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 7a3ec2d92..7399c3e15 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -384,7 +384,7 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):ordering_fields = '__all__'filterset_fields = ('date',- 'exercise',+ 'exercise_base','reps','weight','workout',diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.jsonindex 0678267ec..df2359f43 100644--- a/wger/manager/fixtures/test-workout-data.json+++ b/wger/manager/fixtures/test-workout-data.json@@ -170,7 +170,7 @@"reps": 8,"user": 1,"date": "2012-10-01",- "exercise": 1+ "exercise_base": 1}},{@@ -182,7 +182,7 @@"reps": 8,"user": 1,"date": "2012-10-10",- "exercise": 1+ "exercise_base": 1}},{@@ -194,7 +194,7 @@"reps": 8,"user": 1,"date": "2013-10-30",- "exercise": 1+ "exercise_base": 1}},{@@ -206,7 +206,7 @@"reps": 8,"user": 1,"date": "2012-11-01",- "exercise": 1+ "exercise_base": 1}},{@@ -218,7 +218,7 @@"reps": 8,"user": 2,"date": "2012-11-01",- "exercise": 2+ "exercise_base": 2}}]diff --git a/wger/manager/forms.py b/wger/manager/forms.pyindex 7a3d5030a..fa56a1111 100644--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@ -49,7 +49,10 @@ from wger.core.models import (RepetitionUnit,WeightUnit,)-from wger.exercises.models import Exercise+from wger.exercises.models import (+ Exercise,+ ExerciseBase+)from wger.manager.consts import RIR_OPTIONSfrom wger.manager.models import (Day,@@ -160,8 +163,8 @@ class WorkoutLogForm(ModelForm):label=_('Unit'),required=False,)- exercise = ModelChoiceField(- queryset=Exercise.objects.all(),+ exercise_base = ModelChoiceField(+ queryset=ExerciseBase.objects.all(),label=_('Exercise'),required=False,)diff --git a/wger/manager/migrations/0016_alter_workoutlog_exercise.py b/wger/manager/migrations/0016_alter_workoutlog_exercise.pynew file mode 100644index 000000000..450aeae20--- /dev/null+++ b/wger/manager/migrations/0016_alter_workoutlog_exercise.py@@ -0,0 +1,20 @@+# Generated by Django 3.2.10 on 2022-04-20 12:39++from django.db import migrations, models+import django.db.models.deletion+++class Migration(migrations.Migration):++ dependencies = [+ ('exercises', '0020_auto_20220302_2136'),+ ('manager', '0015_auto_20211028_1113'),+ ]++ operations = [+ migrations.RenameField(+ model_name='workoutlog',+ old_name='exercise',+ new_name='exercise_base',+ ),+ ]diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 4e1e4ad0d..a107c16ce 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -25,7 +25,7 @@ from wger.core.models import (RepetitionUnit,WeightUnit,)-from wger.exercises.models import Exercise+from wger.exercises.models import ExerciseBasefrom wger.utils.cache import reset_workout_logfrom wger.utils.fields import Html5DateField@@ -46,8 +46,8 @@ class WorkoutLog(models.Model):editable=False,on_delete=models.CASCADE,)- exercise = models.ForeignKey(- Exercise,+ exercise_base = models.ForeignKey(+ ExerciseBase,verbose_name=_('Exercise'),on_delete=models.CASCADE,)diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex 51b0ef676..9510710c3 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -30,7 +30,7 @@ from wger.core.tests.base_testcase import (WgerDeleteTestCase,WgerTestCase,)-from wger.exercises.models import Exercise+from wger.exercises.models import ExerciseBasefrom wger.manager.models import (Workout,WorkoutLog,@@ -286,7 +286,7 @@ class WeightlogTestCase(WgerTestCase):log = WorkoutLog()log.user = user1log.date = datetime.date(2014, 1, 5)- log.exercise = Exercise.objects.get(pk=1)+ log.exercise_base = ExerciseBase.objects.get(pk=1)log.workout = workout1log.weight = 10log.reps = 10@@ -354,7 +354,7 @@ class WeightLogEntryEditTestCase(WgerTestCase):'repetition_unit': 2,'weight_unit': 3,'weight': 10,- 'exercise': 1,+ 'exercise_base': 1,'rir': 2,})@@ -587,7 +587,7 @@ class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):resource = WorkoutLogprivate_resource = Truedata = {- "exercise": 1,+ "exercise_base": 1,"workout": 3,"reps": 3,"repetition_unit": 1,diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex 2e2052210..d80de3644 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -87,10 +87,10 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, LoginRequiredMixin):form_class = WorkoutLogFormsuccess_url = reverse_lazy('manager:workout:calendar')- def get_context_data(self, **kwargs):- context = super(WorkoutLogUpdateView, self).get_context_data(**kwargs)- context['title'] = _('Edit log entry for %s') % self.object.exercise.name- return context+ # def get_context_data(self, **kwargs):+ # context = super(WorkoutLogUpdateView, self).get_context_data(**kwargs)+ # context['title'] = _('Edit log entry for %s') % self.object.exercise_base+ # return contextclass WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, LoginRequiredMixin):@@ -100,7 +100,7 @@ class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, LoginRequiredMixin):model = WorkoutLogfields = (- 'exercise',+ 'exercise_base','workout','repetition_unit','reps',@@ -118,7 +118,7 @@ def add(request, pk):# NOTE: This function is waaaay too complex and convoluted. While updating# to crispy forms, the template logic could be reduced a lot, but- # there is still a lot optimisations that could happen here.+ # there is still a lot of optimisations that could happen here.# Load the day and check ownershipday = get_object_or_404(Day, pk=pk)@@ -285,7 +285,7 @@ class WorkoutLogDetailView(DetailView, LoginRequiredMixin):exercise_log[exercise_id] = []# Filter the logs for user and exclude all units that are not weight- logs = exercise_obj.workoutlog_set.filter(+ logs = exercise_obj.exercise_base.workoutlog_set.filter(user=self.owner_user,weight_unit__in=(1, 2),repetition_unit=1,diff --git a/wger/weight/helpers.py b/wger/weight/helpers.pyindex d4d1f6d4f..b14e83ef0 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):- out[entry.date]['logs'][entry.exercise] = []+ if not out[entry.date]['logs'].get(entry.exercise_base):+ out[entry.date]['logs'][entry.exercise_base] = []- out[entry.date]['logs'][entry.exercise].append(entry)+ out[entry.date]['logs'][entry.exercise_base].append(entry)# Sessionsfor entry in sessions: