Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Formatting

Roland Geider87f9be3f53e6
diff --git a/wger/core/management/commands/extract-i18n.py b/wger/core/management/commands/extract-i18n.py
index 86d94dac5..8ca4c7f51 100644
--- a/wger/core/management/commands/extract-i18n.py
+++ b/wger/core/management/commands/extract-i18n.py
@@ -47,13 +47,12 @@ class Command(BaseCommand):
replace('(', '_').\
replace(')', '_')
-
# Collect all translatable items
data = [i for i in ExerciseCategory.objects.all()] \
+ [i for i in Equipment.objects.all()] \
+ [i for i in RepetitionUnit.objects.all()]
- # + [i for i in Muscle.objects.all()] \
+ # + [i for i in Muscle.objects.all()] \
#
# Django - write to .tpl file
@@ -107,4 +106,3 @@ class Command(BaseCommand):
f.write(out)
self.stdout.write(self.style.SUCCESS(f'Wrote content to i18n.dart!'))
-
diff --git a/wger/core/tests/api_base_test.py b/wger/core/tests/api_base_test.py
index fb2724d44..313018c58 100644
--- a/wger/core/tests/api_base_test.py
+++ b/wger/core/tests/api_base_test.py
@@ -200,17 +200,26 @@ class ApiPostTestCase(object):
else:
# Anonymous user
response = self.client.post(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Authorized user (owner)
self.get_credentials()
response = self.client.post(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.post(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_post(self):
"""
@@ -239,17 +248,26 @@ class ApiPostTestCase(object):
else:
# Anonymous user
response = self.client.post(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Logged in user
self.get_credentials()
response = self.client.post(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.post(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_post_special_endpoints(self):
"""
@@ -310,17 +328,26 @@ class ApiPatchTestCase(object):
else:
# Anonymous user
response = self.client.patch(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Authorized user (owner)
self.get_credentials()
response = self.client.patch(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.patch(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_patch(self):
"""
@@ -334,17 +361,24 @@ class ApiPatchTestCase(object):
else:
# Anonymous user
response = self.client.patch(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Logged in user
self.get_credentials()
response = self.client.patch(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.patch(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_patch_special_endpoints(self):
"""
@@ -417,17 +451,26 @@ class ApiPutTestCase(object):
else:
# Anonymous user
response = self.client.put(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Authorized user (owner)
self.get_credentials()
response = self.client.put(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.put(self.url_detail, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_put(self):
"""
@@ -442,17 +485,24 @@ class ApiPutTestCase(object):
else:
# Anonymous user
response = self.client.put(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Authorized user (owner)
self.get_credentials()
response = self.client.put(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.put(self.url, data=self.data)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_put_special_endpoints(self):
"""
@@ -511,17 +561,26 @@ class ApiDeleteTestCase(object):
else:
# Anonymous user
response = self.client.delete(self.url_detail)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Logged in user
self.get_credentials()
response = self.client.delete(self.url_detail)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.delete(self.url_detail)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_delete(self):
"""
@@ -544,17 +603,26 @@ class ApiDeleteTestCase(object):
else:
# Anonymous user
response = self.client.delete(self.url)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Authorized user (owner)
self.get_credentials()
response = self.client.delete(self.url)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.delete(self.url)
- self.assertIn(response.status_code, (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_403_FORBIDDEN)
+ )
def test_delete_special_endpoints(self):
"""
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index f0838d4cf..320698e19 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -34,12 +34,10 @@ from rest_framework.decorators import (
from rest_framework.response import Response
# wger
-from wger.exercises.views.helper import HistoryModes
from wger.config.models import LanguageConfig
from wger.core.api.viewsets import CreateUpdateModelViewSet
from wger.exercises.api.permissions import CanEditExercises
from wger.exercises.api.serializers import (
- ExerciseTranslationSerializer,
EquipmentSerializer,
ExerciseAliasSerializer,
ExerciseBaseInfoSerializer,
@@ -49,6 +47,7 @@ from wger.exercises.api.serializers import (
ExerciseImageSerializer,
ExerciseInfoSerializer,
ExerciseSerializer,
+ ExerciseTranslationSerializer,
ExerciseVariationSerializer,
ExerciseVideoSerializer,
MuscleSerializer,
@@ -65,6 +64,7 @@ from wger.exercises.models import (
Muscle,
Variation,
)
+from wger.exercises.views.helper import HistoryModes
from wger.utils.language import load_item_languages
diff --git a/wger/exercises/migrations/0018_auto_20220219_1336.py b/wger/exercises/migrations/0018_auto_20220219_1336.py
index d5c80eea0..34ea60c7b 100644
--- a/wger/exercises/migrations/0018_auto_20220219_1336.py
+++ b/wger/exercises/migrations/0018_auto_20220219_1336.py
@@ -27,7 +27,9 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='historicalexercise',
name='update_date',
- field=models.DateTimeField(blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'),
+ field=models.DateTimeField(
+ blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'
+ ),
preserve_default=False,
),
]
diff --git a/wger/exercises/migrations/0019_auto_20220302_2130.py b/wger/exercises/migrations/0019_auto_20220302_2130.py
index acade0ba9..e5fbd2110 100644
--- a/wger/exercises/migrations/0019_auto_20220302_2130.py
+++ b/wger/exercises/migrations/0019_auto_20220302_2130.py
@@ -24,12 +24,24 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='exercisecomment',
name='exercise',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='exercises.exercise', verbose_name='Exercise'),
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.exercise',
+ verbose_name='Exercise'
+ ),
),
migrations.AlterField(
model_name='historicalexercisecomment',
name='exercise',
- field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='exercises.exercise', verbose_name='Exercise'),
+ field=models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercise',
+ verbose_name='Exercise'
+ ),
),
migrations.RunPython(delete_pending_exercises),
]
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.py
index e27f32c7d..9a4a652b9 100644
--- a/wger/exercises/models/base.py
+++ b/wger/exercises/models/base.py
@@ -16,23 +16,27 @@
# Standard Library
import uuid
+from typing import (
+ List,
+ Optional,
+)
# Django
-from typing import List, Optional
-
from django.core.checks import translation
from django.db import models
-from django.utils.translation import gettext_lazy as _, get_language
+from django.utils.translation import (
+ get_language,
+ gettext_lazy as _,
+)
# Third Party
from simple_history.models import HistoricalRecords
# wger
-from wger.utils.constants import DEFAULT_LANGUAGE
from wger.core.models import Language
+from wger.utils.constants import DEFAULT_LANGUAGE
from wger.utils.models import AbstractLicenseModel
-
# Local
from .category import ExerciseCategory
from .equipment import Equipment
@@ -45,11 +49,7 @@ class ExerciseBase(AbstractLicenseModel, models.Model):
Model for an exercise base
"""
- uuid = models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- verbose_name='UUID'
- )
+ uuid = models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='UUID')
"""Globally unique ID, to identify the base across installations"""
category = models.ForeignKey(
diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.py
index 510cdd80d..e09cb3b76 100644
--- a/wger/exercises/models/exercise.py
+++ b/wger/exercises/models/exercise.py
@@ -70,10 +70,7 @@ class Exercise(AbstractLicenseModel, models.Model):
)
"""The submission date"""
- update_date = models.DateTimeField(
- _('Date'),
- auto_now=True
- )
+ update_date = models.DateTimeField(_('Date'), auto_now=True)
"""Datetime of the last modification"""
language = models.ForeignKey(
diff --git a/wger/exercises/tests/test_exercise_base.py b/wger/exercises/tests/test_exercise_base.py
index cfc7a762c..3ced3348c 100644
--- a/wger/exercises/tests/test_exercise_base.py
+++ b/wger/exercises/tests/test_exercise_base.py
@@ -16,7 +16,7 @@
from wger.core.tests.base_testcase import WgerTestCase
from wger.exercises.models import (
Exercise,
- ExerciseBase
+ ExerciseBase,
)
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index a0fd0b3e9..b4a92ad62 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -126,34 +126,32 @@ def view(request, id, slug=None):
Detail view for an exercise
"""
- template_data = {}
- template_data['comment_edit'] = False
- template_data['show_shariff'] = True
-
exercise = get_object_or_404(Exercise, pk=id)
-
- template_data['exercise'] = exercise
-
- template_data["muscles_main_front"] = exercise.muscles.filter(is_front=True)
- template_data["muscles_main_back"] = exercise.muscles.filter(is_front=False)
- template_data["muscles_sec_front"] = exercise.muscles_secondary.filter(is_front=True)
- template_data["muscles_sec_back"] = exercise.muscles_secondary.filter(is_front=False)
+ context = {
+ 'comment_edit': False,
+ 'show_shariff': True,
+ 'exercise': exercise,
+ "muscles_main_front": exercise.muscles.filter(is_front=True),
+ "muscles_main_back": exercise.muscles.filter(is_front=False),
+ "muscles_sec_front": exercise.muscles_secondary.filter(is_front=True),
+ "muscles_sec_back": exercise.muscles_secondary.filter(is_front=False),
+ }
# If the user is logged in, load the log and prepare the entries for
# rendering in the D3 chart
entry_log = []
chart_data = []
if request.user.is_authenticated:
- logs = WorkoutLog.objects.filter(user=request.user, exercise=exercise.exercise_base)
+ logs = WorkoutLog.objects.filter(user=request.user, exercise_base=exercise.exercise_base)
entry_log, chart_data = process_log_entries(logs)
- template_data['logs'] = entry_log
- template_data['json'] = chart_data
- template_data['svg_uuid'] = str(uuid.uuid4())
- template_data['cache_vary_on'] = "{}-{}".format(exercise.id, load_language().id)
- template_data['allow_upload_videos'] = settings.WGER_SETTINGS['ALLOW_UPLOAD_VIDEOS']
+ context['logs'] = entry_log
+ context['json'] = chart_data
+ context['svg_uuid'] = str(uuid.uuid4())
+ context['cache_vary_on'] = "{}-{}".format(exercise.id, load_language().id)
+ context['allow_upload_videos'] = settings.WGER_SETTINGS['ALLOW_UPLOAD_VIDEOS']
- return render(request, 'exercise/view.html', template_data)
+ return render(request, 'exercise/view.html', context)
class ExerciseForm(ModelForm):
@@ -218,10 +216,8 @@ class ExerciseForm(ModelForm):
min_edit_dist = levenshtein(exercise_name.casefold(), name.casefold())
if min_edit_dist < MIN_EDIT_DISTANCE_THRESHOLD:
raise ValidationError(
- _(
- '%(name)s is too similar to existing exercise '
- '"%(exercise_name)s"'
- ),
+ _('%(name)s is too similar to existing exercise '
+ '"%(exercise_name)s"'),
params={
'name': name,
'exercise_name': exercise_name
@@ -423,4 +419,3 @@ class ExerciseDeleteView(
context = super(ExerciseDeleteView, self).get_context_data(**kwargs)
context['title'] = _('Delete {0}?').format(self.object.name)
return context
-
diff --git a/wger/exercises/views/helper.py b/wger/exercises/views/helper.py
index 72d65d249..e96b4eda0 100644
--- a/wger/exercises/views/helper.py
+++ b/wger/exercises/views/helper.py
@@ -11,6 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU Affero General Public License
+# Standard Library
import enum
diff --git a/wger/exercises/views/history.py b/wger/exercises/views/history.py
index ac3127791..af0e2b7c8 100644
--- a/wger/exercises/views/history.py
+++ b/wger/exercises/views/history.py
@@ -20,11 +20,13 @@ import logging
from django.contrib.auth.decorators import permission_required
from django.shortcuts import render
+# Third Party
+from actstream.models import Action
+
# wger
-from wger.exercises.views.helper import HistoryModes
from wger.exercises.models import Exercise
+from wger.exercises.views.helper import HistoryModes
-from actstream.models import Action
logger = logging.getLogger(__name__)
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 06e69c238..a3d6eaae6 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -51,7 +51,7 @@ from wger.core.models import (
)
from wger.exercises.models import (
Exercise,
- ExerciseBase
+ ExerciseBase,
)
from wger.manager.consts import RIR_OPTIONS
from wger.manager.models import (
diff --git a/wger/manager/migrations/0016_move_to_exercise_base.py b/wger/manager/migrations/0016_move_to_exercise_base.py
index eca9923aa..6acf54596 100644
--- a/wger/manager/migrations/0016_move_to_exercise_base.py
+++ b/wger/manager/migrations/0016_move_to_exercise_base.py
@@ -2,7 +2,6 @@
from django.db import migrations, models
import django.db.models.deletion
-
"""
Migration script to move foreign keys in Settings and WorkoutLog from
Exercise to ExerciseBase. We first add a nullable FK to ExerciseBase,
diff --git a/wger/manager/models/set.py b/wger/manager/models/set.py
index 32a04e9ed..f97847634 100644
--- a/wger/manager/models/set.py
+++ b/wger/manager/models/set.py
@@ -26,7 +26,10 @@ from django.db import models
from django.utils.translation import gettext_lazy as _
# wger
-from wger.exercises.models import Exercise, ExerciseBase
+from wger.exercises.models import (
+ Exercise,
+ ExerciseBase,
+)
from wger.utils.cache import reset_workout_canonical_form
from wger.utils.helpers import normalize_decimal
@@ -96,7 +99,9 @@ class Set(models.Model):
@property
def exercise_bases(self) -> typing.List[ExerciseBase]:
"""Returns the exercises for this set"""
- out = list(dict.fromkeys([s.exercise_base for s in self.setting_set.select_related().all()]))
+ out = list(
+ dict.fromkeys([s.exercise_base for s in self.setting_set.select_related().all()])
+ )
for exercise in out:
exercise.settings = self.reps_smart_text(exercise)
diff --git a/wger/manager/models/setting.py b/wger/manager/models/setting.py
index 7afd7ee9d..8c658c06b 100644
--- a/wger/manager/models/setting.py
+++ b/wger/manager/models/setting.py
@@ -27,7 +27,10 @@ from wger.core.models import (
RepetitionUnit,
WeightUnit,
)
-from wger.exercises.models import ExerciseBase, Exercise
+from wger.exercises.models import (
+ Exercise,
+ ExerciseBase,
+)
from wger.utils.cache import reset_workout_canonical_form
# Local
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index a10c3f1b2..842cb68df 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -78,7 +78,8 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
{
'exercise_list': [
{
- 'obj': ExerciseBase.objects.get(pk=1),
+ 'obj':
+ ExerciseBase.objects.get(pk=1),
'image_list': [
{
'image': image1,
@@ -104,7 +105,8 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'backsecondary': [],
'front': [muscle1]
},
- 'obj': Set.objects.get(pk=1),
+ 'obj':
+ Set.objects.get(pk=1),
'settings_computed': [setting1] * 2
}
]
@@ -124,7 +126,8 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'day_list': [DaysOfWeek.objects.get(pk=4)],
'text': 'Thursday'
},
- 'obj': Day.objects.get(pk=2),
+ 'obj':
+ Day.objects.get(pk=2),
'muscles': {
'back': [muscle2],
'frontsecondary': [muscle1],
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 43146a56c..0553fc1d9 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -88,9 +88,9 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, LoginRequiredMixin):
success_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_base
- # return context
+ # context = super(WorkoutLogUpdateView, self).get_context_data(**kwargs)
+ # context['title'] = _('Edit log entry for %s') % self.object.exercise_base
+ # return context
class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, LoginRequiredMixin):
@@ -298,7 +298,9 @@ class WorkoutLogDetailView(DetailView, LoginRequiredMixin):
if exercise_log:
workout_log[day_id][exercise_base_id] = {}
workout_log[day_id][exercise_base_id]['log_by_date'] = entry_log
- workout_log[day_id][exercise_base_id]['div_uuid'] = 'div-' + str(uuid.uuid4())
+ workout_log[day_id][exercise_base_id]['div_uuid'] = 'div-' + str(
+ uuid.uuid4()
+ )
workout_log[day_id][exercise_base_id]['chart_data'] = chart_data
context['workout_log'] = workout_log
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 52415361a..45abcfd33 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -85,9 +85,7 @@ def create(request, day_pk):
if form.is_valid():
for base in form.cleaned_data['exercises']:
formset = SettingFormset(
- request.POST,
- queryset=Setting.objects.none(),
- prefix=f'base{base.id}'
+ request.POST, queryset=Setting.objects.none(), prefix=f'base{base.id}'
)
formsets.append({'exercise_base': base, 'formset': formset})
all_valid = True
diff --git a/wger/urls.py b/wger/urls.py
index 002157cc2..b7e9fcd24 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -123,9 +123,10 @@ router.register(
exercises_api_views.ExerciseCategoryViewSet,
basename='exercisecategory',
)
-router.register(r'video',
- exercises_api_views.ExerciseVideoViewSet,
- basename='video',
+router.register(
+ r'video',
+ exercises_api_views.ExerciseVideoViewSet,
+ basename='video',
)
router.register(
r'exerciseimage',