Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Some refactoring on workout sets

Roland Geiderc4e5d07f2bc0
diff --git a/requirements.txt b/requirements.txt
index e4c82db35..80fee8455 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,6 @@ Django~=3.1
django-crispy-forms~=1.11
django_compressor~=2.4
django_extensions~=3.1
-django-sortedm2m~=3.0
django-storages~=1.11
easy-thumbnails~=2.7
icalendar==4.0.7
@@ -41,3 +40,6 @@ docutils>=0.10,<0.17 # for botocore
six>=1.12.0 # for django-compressor
+# Not used anymore, but needed because some modules are imported in DB migration
+# files
+django-sortedm2m~=3.0
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index a2d493fa1..9939d76e8 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -19,11 +19,7 @@
from rest_framework import serializers
# wger
-from wger.core.api.serializers import (
- DaysOfWeekSerializer,
- RepetitionUnitSerializer,
- WeightUnitSerializer
-)
+from wger.core.api.serializers import DaysOfWeekSerializer
from wger.exercises.api.serializers import (
ExerciseSerializer,
MuscleSerializer
@@ -110,7 +106,7 @@ class SetSerializer(serializers.ModelSerializer):
class Meta:
model = Set
- fields = ['id', 'exerciseday', 'exercises', 'sets', 'order']
+ fields = ['id', 'exerciseday', 'sets', 'order']
class SettingSerializer(serializers.ModelSerializer):
@@ -154,8 +150,7 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):
has_weight = serializers.ReadOnlyField()
weight_list = serializers.ReadOnlyField()
setting_text = serializers.ReadOnlyField()
- repetition_units = RepetitionUnitSerializer(many=True)
- weight_units = WeightUnitSerializer(many=True)
+ settings_calculated = serializers.ReadOnlyField()
comment_list = serializers.ReadOnlyField()
image_list = WorkoutCanonicalFormExerciseImagesListSerializer(many=True)
obj = ExerciseSerializer()
diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.json
index 069e372c7..6c1b53cde 100644
--- a/wger/manager/fixtures/test-workout-data.json
+++ b/wger/manager/fixtures/test-workout-data.json
@@ -90,9 +90,6 @@
"pk": 1,
"model": "manager.set",
"fields": {
- "exercises": [
- 1
- ],
"exerciseday": 1,
"order": 1,
"sets": "2"
@@ -102,9 +99,6 @@
"pk": 2,
"model": "manager.set",
"fields": {
- "exercises": [
- 2
- ],
"exerciseday": 2,
"order": 1,
"sets": "4"
@@ -114,9 +108,6 @@
"pk": 3,
"model": "manager.set",
"fields": {
- "exercises": [
- 2
- ],
"exerciseday": 5,
"order": 1,
"sets": "4"
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index cdb134285..7f1759bdb 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -28,6 +28,7 @@ from django.forms import (
IntegerField,
ModelChoiceField,
ModelForm,
+ ModelMultipleChoiceField,
widgets
)
from django.utils.translation import (
@@ -90,19 +91,27 @@ class DayForm(ModelForm):
widgets = {'day': TranslatedSelectMultiple()}
+class OrderedModelMultipleChoiceField(ModelMultipleChoiceField):
+ """Ordered multiple choice field"""
+ def clean(self, value):
+ int_list = [int(i) for i in value]
+ qs = super(OrderedModelMultipleChoiceField, self).clean(int_list)
+ return sorted(qs, key=lambda x: int_list.index(x.pk))
+
+
class SetForm(ModelForm):
+
+ exercises = OrderedModelMultipleChoiceField(queryset=Exercise.objects.all(),
+ label=_('Exercises'),
+ required=False,
+ widget=ExerciseAjaxSelect,
+ help_text=_('You can search for more than one '
+ 'exercise, they will be grouped '
+ 'together for a superset.'))
+
class Meta:
model = Set
exclude = ('order', 'exerciseday')
- widgets = {'exercises': ExerciseAjaxSelect(), }
-
- # We need to overwrite the init method here because otherwise Django
- # will output a default help text, regardless of the widget used
- # https://code.djangoproject.com/ticket/9321
- def __init__(self, *args, **kwargs):
- super(SetForm, self).__init__(*args, **kwargs)
- self.fields['exercises'].help_text = _('You can search for more than one exercise, '
- 'they will be grouped together for a superset.')
class SettingForm(ModelForm):
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index c9d4d21c2..e5445778d 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -253,23 +253,23 @@ def reps_smart_text(settings, set_obj):
weight = setting.weight
return weight
+ out = {'text': '',
+ 'list': []}
+
if len(settings) == 0:
setting_text = ''
setting_list = []
- weight_list = []
- reps_list = []
- repetition_units = []
- weight_units = []
# Only one setting entry, this is a "compact" representation such as e.g.
# 4x10 or similar
elif len(settings) == 1:
+ setting = settings[0]
- rep_unit = get_weight_unit_reprentation(settings[0])
- reps = get_reps_reprentation(settings[0], rep_unit)
- weight_unit = settings[0].weight_unit
- weight = normalize_weight(settings[0])
- rir = get_rir_representation(settings[0])
+ rep_unit = get_weight_unit_reprentation(setting)
+ reps = get_reps_reprentation(setting, rep_unit)
+ weight_unit = settings[0].weight_unit.name
+ weight = normalize_weight(setting)
+ rir = get_rir_representation(setting)
setting_text = '{0} × {1}'.format(set_obj.sets, reps).strip()
setting_list_text = '{0} {1}'.format(reps, rep_unit).strip()
@@ -285,19 +285,19 @@ def reps_smart_text(settings, set_obj):
setting_list_text += ' ({0})'.format(rir) if rir else ''
setting_list = [setting_list_text] * set_obj.sets
- reps_list = [settings[0].reps] * set_obj.sets
- weight_list = [weight] * set_obj.sets
- repetition_units = [settings[0].repetition_unit] * set_obj.sets
- weight_units = [settings[0].weight_unit] * set_obj.sets
+
+ out['text'] = setting_text
+ setting = {'reps': setting.reps,
+ 'reps_unit': rep_unit,
+ 'weight': weight,
+ 'weight_unit': setting.weight_unit.name,
+ 'rir': setting.rir}
+ out['list'] = [setting] * set_obj.sets
# There's more than one setting, each set can have a different combination
# of repetitions, weight, etc. e.g. 10, 8, 8, 12
elif len(settings) > 1:
tmp_reps_text = []
- tmp_reps = []
- tmp_weight = []
- tmp_repetition_unit = []
- tmp_weight_unit = []
for setting in settings:
rep_unit = get_weight_unit_reprentation(setting)
@@ -311,19 +311,18 @@ def reps_smart_text(settings, set_obj):
reps += ' ({0})'.format(rir) if rir else ''
tmp_reps_text.append(reps)
- tmp_reps.append(setting.reps)
- tmp_weight.append(weight)
- tmp_repetition_unit.append(setting.repetition_unit)
- tmp_weight_unit.append(setting.weight_unit)
+ setting = {'reps': setting.reps,
+ 'reps_unit': setting.repetition_unit.name,
+ 'weight': weight,
+ 'weight_unit': setting.weight_unit.name,
+ 'rir': setting.rir}
+ out['list'].append(setting)
setting_text = ' – '.join(tmp_reps_text)
setting_list = tmp_reps_text
- repetition_units = tmp_repetition_unit
- weight_units = tmp_weight_unit
- reps_list = tmp_reps
- weight_list = tmp_weight
+ out['text'] = setting_text
- return setting_text, setting_list, weight_list, reps_list, repetition_units, weight_units
+ return setting_text, setting_list, out
class WorkoutCalendar(HTMLCalendar):
diff --git a/wger/manager/migrations/0011_remove_set_exercises.py b/wger/manager/migrations/0011_remove_set_exercises.py
new file mode 100644
index 000000000..4ef40f8d2
--- /dev/null
+++ b/wger/manager/migrations/0011_remove_set_exercises.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.1.5 on 2021-02-28 14:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('manager', '0010_auto_20210102_1446'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='set',
+ name='exercises',
+ ),
+ ]
diff --git a/wger/manager/models.py b/wger/manager/models.py
index f3355944a..b6a1257a2 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -18,6 +18,7 @@
# Standard Library
import datetime
import logging
+import typing
# Django
from django.contrib.auth.models import User
@@ -34,9 +35,6 @@ from django.db import models
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
-# Third Party
-from sortedm2m.fields import SortedManyToManyField
-
# wger
from wger.core.models import (
DaysOfWeek,
@@ -134,7 +132,8 @@ class Workout(models.Model):
caches are not needed anymore.
"""
workout_canonical_form = cache.get(cache_mapper.get_workout_canonical(self.pk))
- if not workout_canonical_form:
+ #if not workout_canonical_form:
+ if True:
day_canonical_repr = []
muscles_front = []
muscles_back = []
@@ -463,7 +462,7 @@ class Day(models.Model):
exercise_tmp = []
has_setting_tmp = True
- for exercise in set_obj.exercises.select_related():
+ for exercise in set_obj.exercises:
setting_tmp = []
exercise_images_tmp = []
@@ -485,8 +484,7 @@ class Day(models.Model):
setting_tmp.append(setting)
# "Smart" textual representation
- setting_text, setting_list, weight_list, reps_list, repetition_units, weight_units \
- = reps_smart_text(setting_tmp, set_obj)
+ setting_text, setting_list, out = reps_smart_text(setting_tmp, set_obj)
# Flag indicating whether all exercises have settings
has_setting_tmp = True if len(setting_tmp) > 0 else False
@@ -513,12 +511,10 @@ class Day(models.Model):
exercise_tmp.append({'obj': exercise,
'setting_obj_list': setting_tmp,
'setting_list': setting_list,
- 'repetition_units': repetition_units,
- 'weight_units': weight_units,
- 'weight_list': weight_list,
'has_weight': has_weight,
- 'reps_list': reps_list,
+
'setting_text': setting_text,
+ 'settings_calculated': out['list'],
'comment_list': comment_list,
'image_list': exercise_images_tmp})
@@ -581,8 +577,6 @@ class Set(models.Model):
exerciseday = models.ForeignKey(Day,
verbose_name=_('Exercise day'),
on_delete=models.CASCADE)
- exercises = SortedManyToManyField(Exercise,
- verbose_name=_('Exercises'))
order = models.IntegerField(blank=True,
null=True,
verbose_name=_('Order'))
@@ -622,6 +616,11 @@ class Set(models.Model):
reset_workout_canonical_form(self.exerciseday.training_id)
super(Set, self).delete(*args, **kwargs)
+ @property
+ def exercises(self) -> typing.List[Exercise]:
+ """Returns the exercises for this set"""
+ return list(dict.fromkeys([s.exercise for s in self.setting_set.all()]))
+
class Setting(models.Model):
"""
diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.py
index 78b539e89..305df80cc 100644
--- a/wger/manager/tests/test_copy_workout.py
+++ b/wger/manager/tests/test_copy_workout.py
@@ -87,10 +87,10 @@ class CopyWorkoutTestCase(WgerTestCase):
self.assertEqual(sets_original[j].sets, sets_copy[j].sets)
self.assertEqual(sets_original[j].order, sets_copy[j].order)
- exercises_original = sets_original[j].exercises.all()
- exercises_copy = sets_copy[j].exercises.all()
+ exercises_original = sets_original[j].exercises
+ exercises_copy = sets_copy[j].exercises
- for k in range(sets_original[j].exercises.count()):
+ for k in range(len(sets_original[j].exercises)):
self.assertEqual(exercises_original[k], exercises_copy[k])
def test_copy_workout_owner(self):
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index b85209af2..4aad28e4d 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -14,6 +14,7 @@
# Standard Library
import logging
+from decimal import Decimal
# Django
from django.core.cache import cache
@@ -30,6 +31,7 @@ from wger.core.tests.base_testcase import (
WgerTestCase
)
from wger.exercises.models import Exercise
+from wger.manager.helpers import reps_smart_text
from wger.manager.models import (
Day,
Set,
@@ -50,8 +52,7 @@ class SetAddTestCase(WgerAddTestCase):
url = reverse_lazy('manager:set:add', kwargs={'day_pk': 5})
user_success = 'test'
user_fail = 'admin'
- data = {'exercises': [1, ],
- 'exercise_list': 1, # Only for mobile version
+ data = {'exercise_list': 1, # Only for mobile version
'sets': 4,
'exercise1-TOTAL_FORMS': 4,
'exercise1-INITIAL_FORMS': 0,
@@ -94,8 +95,7 @@ class SetAddTestCase(WgerAddTestCase):
# POST the data
self.user_login('test')
exercises_id = [1, 2]
- post_data = {'exercises': exercises_id,
- 'exercise_list': 1, # Only for mobile version
+ post_data = {'exercise_list': 1, # Only for mobile version
'sets': 4,
'exercise1-TOTAL_FORMS': 4,
@@ -136,7 +136,7 @@ class SetAddTestCase(WgerAddTestCase):
exercise1 = Exercise.objects.get(pk=1)
# Check that everything got where it's supposed to
- for exercise in set_obj.exercises.all():
+ for exercise in set_obj.exercises:
self.assertIn(exercise.id, exercises_id)
settings = Setting.objects.filter(set=set_obj)
@@ -421,6 +421,92 @@ class SettingWorkoutCacheTestCase(WgerTestCase):
self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+class SetSmartRepr(WgerTestCase):
+ """Tests the "smart text representation" for sets"""
+
+ def test_smart_repr_one_setting(self):
+ """
+ Tests the representation with one setting
+ """
+ set_obj = Set.objects.get(pk=1)
+ settings = [i for i in set_obj.setting_set.all()]
+
+ setting_text, setting_list, out = reps_smart_text(settings, set_obj)
+ self.assertEqual(setting_text, '2 × 8 (3 RiR)')
+ self.assertEqual(len(out['list']), 2)
+ self.assertEqual(out['list'][0],
+ {'reps': 8,
+ 'reps_unit': '',
+ 'weight': None,
+ 'weight_unit': 'kg',
+ 'rir': '3'})
+
+ def test_smart_repr_custom_setting(self):
+ """
+ Tests the representation with several settings
+ """
+ set_obj = Set(exerciseday_id=1, order=1, sets=4)
+ setting1 = Setting(set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=8,
+ weight=Decimal(90),
+ weight_unit_id=1,
+ rir='3')
+ setting2 = Setting(set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=10,
+ weight=Decimal(80),
+ weight_unit_id=1,
+ rir='2.5')
+ setting3 = Setting(set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=10,
+ weight=Decimal(80),
+ weight_unit_id=1,
+ rir='2')
+ setting4 = Setting(set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=12,
+ weight=Decimal(80),
+ weight_unit_id=1,
+ rir='1')
+
+ setting_text, setting_list, out = reps_smart_text([setting1, setting2, setting3, setting4],
+ set_obj)
+ self.assertEqual(len(out['list']), 4)
+ self.assertEqual(setting_text,
+ '8 (90 kg, 3 RiR) – 10 (80 kg, 2.5 RiR) – '
+ '10 (80 kg, 2 RiR) – 12 (80 kg, 1 RiR)')
+ self.assertEqual(out['list'][0],
+ {'reps': 8,
+ 'reps_unit': 'Repetitions',
+ 'weight': Decimal('90'),
+ 'weight_unit': 'kg',
+ 'rir': '3'})
+ self.assertEqual(out['list'][1],
+ {'reps': 10,
+ 'reps_unit': 'Repetitions',
+ 'weight': Decimal('80'),
+ 'weight_unit': 'kg',
+ 'rir': '2.5'})
+ self.assertEqual(out['list'][2],
+ {'reps': 10,
+ 'reps_unit': 'Repetitions',
+ 'weight': Decimal('80'),
+ 'weight_unit': 'kg',
+ 'rir': '2'})
+ self.assertEqual(out['list'][3],
+ {'reps': 12,
+ 'reps_unit': 'Repetitions',
+ 'weight': Decimal('80'),
+ 'weight_unit': 'kg',
+ 'rir': '1'})
+
+
class SetApiTestCase(api_base_test.ApiBaseResourceTestCase):
"""
Tests the set overview resource
@@ -429,5 +515,4 @@ class SetApiTestCase(api_base_test.ApiBaseResourceTestCase):
resource = Set
private_resource = True
data = {'exerciseday': 5,
- 'sets': 4,
- 'exercises': [1, 2, 3]}
+ 'sets': 4}
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index f3c489093..0a81f28f5 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -19,11 +19,7 @@ from decimal import Decimal
from django.core.cache import cache
# wger
-from wger.core.models import (
- DaysOfWeek,
- RepetitionUnit,
- WeightUnit
-)
+from wger.core.models import DaysOfWeek
from wger.core.tests.base_testcase import WgerTestCase
from wger.exercises.models import (
Exercise,
@@ -52,8 +48,6 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
workout = Workout.objects.get(pk=1)
setting_1 = Setting.objects.get(pk=1)
setting_2 = Setting.objects.get(pk=2)
- repetition_unit = RepetitionUnit.objects.get(pk=1)
- weight_unit = WeightUnit.objects.get(pk=1)
muscle1 = Muscle.objects.get(pk=1)
muscle2 = Muscle.objects.get(pk=2)
image1 = '/media/exercise-images/1/protestschwein.jpg'
@@ -78,16 +72,26 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
{'image': image2, 'is_main': False}],
'comment_list': ['test 123'],
'has_weight': False,
- 'setting_list': ['8 (3 RiR)',
- '8 (3 RiR)'],
- 'reps_list': [8, 8],
- 'weight_list': [None, None],
'setting_obj_list': [setting_1],
'setting_text': '2 \xd7 8 (3 RiR)',
- 'repetition_units': [repetition_unit,
- repetition_unit],
- 'weight_units': [weight_unit,
- weight_unit]}],
+ 'setting_list': ['8 (3 RiR)',
+ '8 (3 RiR)'],
+ 'settings_calculated': [
+ {
+ "reps": 8,
+ "reps_unit": "",
+ "weight": None,
+ "weight_unit": "kg",
+ "rir": '3'
+ },
+ {
+ "reps": 8,
+ "reps_unit": "",
+ "weight": None,
+ "weight_unit": "kg",
+ "rir": '3'
+ }]
+ }],
'is_superset': False,
'has_settings': True,
@@ -124,22 +128,42 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'is_main': False}],
'comment_list': ['Foobar'],
'has_weight': True,
- 'reps_list': [10, 10, 10, 10],
'setting_list': ['10 (15 kg)',
'10 (15 kg)',
'10 (15 kg)',
'10 (15 kg)'],
- 'weight_list': [Decimal(15)] * 4,
'setting_obj_list': [setting_2],
'setting_text': '4 \xd7 10 (15 kg)',
- 'repetition_units': [repetition_unit,
- repetition_unit,
- repetition_unit,
- repetition_unit],
- 'weight_units': [weight_unit,
- weight_unit,
- weight_unit,
- weight_unit]}],
+ 'settings_calculated': [
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": Decimal(15),
+ "weight_unit": "kg",
+ "rir": None
+ },
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": Decimal(15),
+ "weight_unit": "kg",
+ "rir": None
+ },
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": Decimal(15),
+ "weight_unit": "kg",
+ "rir": None
+ },
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": Decimal(15),
+ "weight_unit": "kg",
+ "rir": None
+ }],
+ }],
'is_superset': False,
'has_settings': True,
@@ -180,8 +204,6 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
day = Day.objects.get(pk=5)
weekday1 = DaysOfWeek.objects.get(pk=3)
weekday2 = DaysOfWeek.objects.get(pk=5)
- repetition_unit = RepetitionUnit.objects.get(pk=1)
- weight_unit = WeightUnit.objects.get(pk=1)
muscle1 = Muscle.objects.get(pk=1)
muscle2 = Muscle.objects.get(pk=2)
image2 = '/media/exercise-images/1/wildschwein.jpg'
@@ -199,20 +221,40 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'image': image2,
'is_main': False}],
'comment_list': ['Foobar'],
- 'reps_list': [10, 10, 10, 10],
'has_weight': False,
'setting_list': ['10', '10', '10', '10'],
- 'weight_list': [None, None, None, None],
'setting_obj_list': [Setting.objects.get(pk=3)],
'setting_text': '4 \xd7 10',
- 'repetition_units': [repetition_unit,
- repetition_unit,
- repetition_unit,
- repetition_unit],
- 'weight_units': [weight_unit,
- weight_unit,
- weight_unit,
- weight_unit]}],
+ 'settings_calculated': [
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": None,
+ "weight_unit": "kg",
+ "rir": None
+ },
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": None,
+ "weight_unit": "kg",
+ "rir": None
+ },
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": None,
+ "weight_unit": "kg",
+ "rir": None
+ },
+ {
+ "reps": 10,
+ "reps_unit": "",
+ "weight": None,
+ "weight_unit": "kg",
+ "rir": None
+ }],
+ }],
'is_superset': False,
'has_settings': True,
'muscles': {'back': [muscle2],
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 006ba06b7..89991b2f6 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -132,7 +132,7 @@ def add(request, pk):
form_to_exercise = {}
for exercise_set in day.set_set.all():
- for exercise in exercise_set.exercises.all():
+ for exercise in exercise_set.exercises:
# Maximum possible values
total_sets += int(exercise_set.sets)
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 2b2bae693..6ca0e270a 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -101,13 +101,15 @@ def create(request, day_pk):
form.instance.exerciseday = day
set_obj = form.save()
+ order = 1
for formset in formsets:
instances = formset['formset'].save(commit=False)
for instance in instances:
instance.set = set_obj
- instance.order = 1
+ instance.order = order
instance.exercise = formset['exercise']
instance.save()
+ order += 1
return HttpResponseRedirect(reverse('manager:workout:view',
kwargs={'pk': day.get_owner_object().id}))
@@ -173,14 +175,14 @@ def edit(request, pk):
return HttpResponseForbidden()
formsets = []
- for exercise in set_obj.exercises.all():
+ for exercise in set_obj.exercises:
queryset = Setting.objects.filter(set=set_obj, exercise=exercise)
formset = SettingFormset(queryset=queryset, prefix='exercise{0}'.format(exercise.id))
formsets.append({'exercise': exercise, 'formset': formset})
if request.method == "POST":
formsets = []
- for exercise in set_obj.exercises.all():
+ for exercise in set_obj.exercises:
formset = SettingFormset(request.POST,
prefix='exercise{0}'.format(exercise.id))
formsets.append({'exercise': exercise, 'formset': formset})
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 3e073517d..8c7735cd7 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -160,16 +160,13 @@ def copy_workout(request, pk):
# Copy the sets
for current_set in sets:
current_set_id = current_set.id
- exercises = current_set.exercises.all()
+ exercises = current_set.exercises
current_set_copy = current_set
current_set_copy.pk = None
current_set_copy.exerciseday = day_copy
current_set_copy.save()
- # Exercises has Many2Many relationship
- current_set_copy.exercises.set(exercises)
-
# Go through the exercises
for exercise in exercises:
settings = exercise.setting_set.filter(set_id=current_set_id)
diff --git a/wger/utils/widgets.py b/wger/utils/widgets.py
index f522df4ac..5b4492269 100644
--- a/wger/utils/widgets.py
+++ b/wger/utils/widgets.py
@@ -115,11 +115,11 @@ class ExerciseAjaxSelect(SelectMultiple):
if value is None:
value = []
- output = ['<div>']
- output.append('<input type="text" id="exercise-search" class="form-control">')
- output.append('</div>')
+ output = ['<div>',
+ '<input type="text" id="exercise-search" class="form-control">',
+ '</div>',
+ '<div id="exercise-search-log">']
- output.append('<div id="exercise-search-log">')
options = self.render_options(choices, value)
if options:
output.append(options)