Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Automatically format the code with yapf and isort

Roland Geiderea2984f3fcf0
diff --git a/.github/contributing.md b/.github/contributing.md
index 43317d4eb..2700e5357 100644
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -15,8 +15,7 @@ in a pull request.
## Questions
Are you just using the software and have a question or improvement?
-* Ask it on the [gitter channel](https://gitter.im/wger-project/wger),
-* the [discord server](https://discord.gg/rPWFv6W)
+* Ask on the [discord server](https://discord.gg/rPWFv6W)
* or just [open an issue](https://github.com/wger-project/wger/issues)
## Issues
@@ -30,8 +29,8 @@ You want to contribute code? Awesome! Here are some tips:
* Make sure the tests are running (``python3 manage.py test``)...
* ... and if you write new code, write new tests
-* Lint the code with flake8 (``flake8 --config .github/linters/.flake8 ./wger``)
-and isort (``isort``)
+* Your code will be automatically linted and formatted with yapf and isort
+ when it's merged.
* You can expect a response from a maintainer within a week, if you
haven’t heard anything by then, feel free to ping the thread.
diff --git a/.github/linters/.flake8 b/.github/linters/.flake8
deleted file mode 100644
index d846951fb..000000000
--- a/.github/linters/.flake8
+++ /dev/null
@@ -1,16 +0,0 @@
-[flake8]
-# H101: Use TODO(NAME)
-# W503: line break before binary operator
-ignore = H101,W503
-max-line-length = 100
-
-# Removed migrations from exclude list since github's superlinter lints them anyway
-exclude =
- extras,
- build,
- dist,
- yarn,
- settings.py,
- docs,
- urls.py : E501
- apps.py : F401
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2328922ad..f66db9eb7 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -7,12 +7,11 @@
### Please check that the PR fulfills these requirements
- [ ] Tests for the changes have been added (for bug fixes / features)
-- [ ] New python code has been linted with with flake8 (``flake8 --config .github/linters/.flake8 ./wger``)
-and isort (``isort``)
- [ ] Added yourself to AUTHORS.rst
### Other questions
* Does this PR introduce a breaking change such as a database migration? (i.e.
-what changes might users need to make in their running application due to
-this PR?)
+ what changes might users need to make in their local instance due to this PR?)
+* Note that your code will be automatically linted and formatted with yapf and
+ isort when it's merged
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 58336044c..3eb150d92 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -49,7 +49,6 @@ jobs:
uses: docker://ghcr.io/github/super-linter:slim-v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- VALIDATE_PYTHON_FLAKE8: true
VALIDATE_MD: true
VALIDATE_JAVASCRIPT_ES: true
VALIDATE_JSON: true
diff --git a/docs/conf.py b/docs/conf.py
index d1445aa9d..af0288df5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
#
# wger Workout Manager documentation build configuration file, created by
# sphinx-quickstart on Mon Dec 1 22:22:02 2014.
diff --git a/extras/bench/test_Simple.py b/extras/bench/test_Simple.py
index d121141c2..08e1d13ba 100644
--- a/extras/bench/test_Simple.py
+++ b/extras/bench/test_Simple.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
"""
Simple FunkLoad test
"""
diff --git a/extras/dummy_generator/generator.py b/extras/dummy_generator/generator.py
index 92e4269eb..7284b48ae 100644
--- a/extras/dummy_generator/generator.py
+++ b/extras/dummy_generator/generator.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# This file is part of wger Workout Manager.
#
diff --git a/manage.py b/manage.py
index 4ebf00873..5d93c5006 100644
--- a/manage.py
+++ b/manage.py
@@ -9,7 +9,7 @@ from django.core.management import execute_from_command_line
# wger
from wger.tasks import (
get_path,
- setup_django_environment
+ setup_django_environment,
)
diff --git a/setup.cfg b/setup.cfg
index 4426d5335..07fbdb4d7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -67,3 +67,17 @@ combine_as_imports=True
# If set to true - isort will add imports even if the file specified is
# currently completely empty.
force_adds=False
+
+# Include a trailing comma after the imports. This ensures that yapf doesn't
+# reformat the code
+include_trailing_comma = True
+
+[yapf]
+based_on_style = pep8
+column_limit = 100
+blank_line_before_nested_class_or_def = True
+dedent_closing_brackets = True
+split_penalty_import_names = 100
+
+## Too much...
+#split_all_comma_separated_values = True
diff --git a/setup.py b/setup.py
index e4eaff647..adcda2b55 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
# Third Party
from setuptools import (
find_packages,
- setup
+ setup,
)
# wger
diff --git a/wger/__main__.py b/wger/__main__.py
index b42898a4f..94f3ebcfd 100644
--- a/wger/__main__.py
+++ b/wger/__main__.py
@@ -20,8 +20,6 @@ import sys
# Third Party
from invoke import run
-
-
"""
This simple wrapper script is used as a console entry point in the packaged
version of the application. It simply redirects all arguments to the invoke
diff --git a/wger/config/__init__.py b/wger/config/__init__.py
index b0db020b9..029d22a19 100644
--- a/wger/config/__init__.py
+++ b/wger/config/__init__.py
@@ -15,10 +15,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.config.apps.ConfigConfig'
diff --git a/wger/config/migrations/0001_initial.py b/wger/config/migrations/0001_initial.py
index b71f379e2..1a1055351 100644
--- a/wger/config/migrations/0001_initial.py
+++ b/wger/config/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
@@ -14,27 +14,68 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='GymConfig',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('default_gym', models.ForeignKey(blank=True, to='gym.Gym',
- help_text='Select the default gym for this installation. This will assign all new registered users to this gym and update all existing users without a gym.',
- null=True, verbose_name='Default gym', on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'default_gym',
+ models.ForeignKey(
+ blank=True,
+ to='gym.Gym',
+ help_text=
+ 'Select the default gym for this installation. This will assign all new registered users to this gym and update all existing users without a gym.',
+ null=True,
+ verbose_name='Default gym',
+ on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='LanguageConfig',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('item', models.CharField(max_length=2, editable=False, choices=[(b'1', 'Exercises'), (b'2', 'Ingredients')])),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'item',
+ models.CharField(
+ max_length=2,
+ editable=False,
+ choices=[(b'1', 'Exercises'), (b'2', 'Ingredients')]
+ )
+ ),
('show', models.BooleanField(default=1)),
- ('language', models.ForeignKey(related_name='language_source', editable=False, to='core.Language', on_delete=models.CASCADE)),
- ('language_target', models.ForeignKey(related_name='language_target', editable=False, to='core.Language', on_delete=models.CASCADE)),
+ (
+ 'language',
+ models.ForeignKey(
+ related_name='language_source',
+ editable=False,
+ to='core.Language',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'language_target',
+ models.ForeignKey(
+ related_name='language_target',
+ editable=False,
+ to='core.Language',
+ on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['item', 'language_target'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
]
diff --git a/wger/config/migrations/0002_auto_20190618_1617.py b/wger/config/migrations/0002_auto_20190618_1617.py
index bb039d2cc..4af38a6a1 100644
--- a/wger/config/migrations/0002_auto_20190618_1617.py
+++ b/wger/config/migrations/0002_auto_20190618_1617.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.11.21 on 2019-06-18 16:17
from django.db import migrations, models
@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
model_name='languageconfig',
name='item',
field=models.CharField(
- choices=[('1', 'Exercises'), ('2', 'Ingredients')], editable=False, max_length=2),
+ choices=[
+ ('1', 'Exercises'),
+ ('2', 'Ingredients'),
+ ], editable=False, max_length=2
+ ),
),
]
diff --git a/wger/config/models.py b/wger/config/models.py
index bad98a29b..51da39349 100644
--- a/wger/config/models.py
+++ b/wger/config/models.py
@@ -26,19 +26,18 @@ from django.utils.translation import gettext_lazy as _
# wger
from wger.core.models import (
Language,
- UserProfile
+ UserProfile,
)
from wger.gym.helpers import is_any_gym_admin
from wger.gym.models import (
Gym,
- GymUserConfig
+ GymUserConfig,
)
from wger.utils.cache import (
cache_mapper,
- delete_template_fragment_cache
+ delete_template_fragment_cache,
)
-
logger = logging.getLogger(__name__)
@@ -55,24 +54,29 @@ class LanguageConfig(models.Model):
(SHOW_ITEM_INGREDIENTS, _('Ingredients')),
)
- language = models.ForeignKey(Language,
- related_name='language_source',
- editable=False,
- on_delete=models.CASCADE)
- language_target = models.ForeignKey(Language,
- related_name='language_target',
- editable=False,
- on_delete=models.CASCADE)
- item = models.CharField(max_length=2,
- choices=SHOW_ITEM_LIST,
- editable=False)
+ language = models.ForeignKey(
+ Language,
+ related_name='language_source',
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ language_target = models.ForeignKey(
+ Language,
+ related_name='language_target',
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ item = models.CharField(max_length=2, choices=SHOW_ITEM_LIST, editable=False)
show = models.BooleanField(default=1)
class Meta:
"""
Set some other properties
"""
- ordering = ["item", "language_target", ]
+ ordering = [
+ "item",
+ "language_target",
+ ]
def __str__(self):
"""
@@ -117,15 +121,19 @@ class GymConfig(models.Model):
TODO: close registration (users can only become members thorough an admin)
"""
- default_gym = models.ForeignKey(Gym,
- verbose_name=_('Default gym'),
- help_text=_('Select the default gym for this installation. '
- 'This will assign all new registered users to this '
- 'gym and update all existing users without a '
- 'gym.'),
- null=True,
- blank=True,
- on_delete=models.CASCADE)
+ default_gym = models.ForeignKey(
+ Gym,
+ verbose_name=_('Default gym'),
+ help_text=_(
+ 'Select the default gym for this installation. '
+ 'This will assign all new registered users to this '
+ 'gym and update all existing users without a '
+ 'gym.'
+ ),
+ null=True,
+ blank=True,
+ on_delete=models.CASCADE
+ )
"""
Default gym for the wger installation
"""
diff --git a/wger/config/signals.py b/wger/config/signals.py
index 8f3de71ed..7a4698d5a 100644
--- a/wger/config/signals.py
+++ b/wger/config/signals.py
@@ -14,7 +14,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.db.models.signals import post_save
from django.dispatch import receiver
diff --git a/wger/config/tests/test_custom_header.py b/wger/config/tests/test_custom_header.py
index d49554073..111d6daf1 100644
--- a/wger/config/tests/test_custom_header.py
+++ b/wger/config/tests/test_custom_header.py
@@ -41,23 +41,27 @@ class GymNameHeaderTestCase(WgerTestCase):
# Gym 1, custom header activated
gym = Gym.objects.get(pk=1)
self.assertTrue(gym.config.show_name)
- for username in ('test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5'):
+ for username in (
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ ):
self.user_login(username)
self.check_header(gym=gym.name)
# Gym 2, custom header deactivated
gym = Gym.objects.get(pk=2)
self.assertFalse(gym.config.show_name)
- for username in ('trainer4',
- 'trainer5',
- 'demo',
- 'member6',
- 'member7',):
+ for username in (
+ 'trainer4',
+ 'trainer5',
+ 'demo',
+ 'member6',
+ 'member7',
+ ):
self.user_login(username)
self.check_header(gym=None)
diff --git a/wger/config/tests/test_gym_config.py b/wger/config/tests/test_gym_config.py
index 065eecad0..fcacc7cfa 100644
--- a/wger/config/tests/test_gym_config.py
+++ b/wger/config/tests/test_gym_config.py
@@ -25,7 +25,7 @@ from wger.core.models import UserProfile
from wger.core.tests.base_testcase import WgerTestCase
from wger.gym.models import (
Gym,
- GymUserConfig
+ GymUserConfig,
)
@@ -45,11 +45,13 @@ class GymConfigTestCase(WgerTestCase):
gym_config.save()
# Register
- registration_data = {'username': 'myusername',
- 'password1': 'Aerieth4yuv5',
- 'password2': 'Aerieth4yuv5',
- 'email': '[email protected]',
- 'g-recaptcha-response': 'PASSED', }
+ registration_data = {
+ 'username': 'myusername',
+ 'password1': 'Aerieth4yuv5',
+ 'password2': 'Aerieth4yuv5',
+ 'email': '[email protected]',
+ 'g-recaptcha-response': 'PASSED',
+ }
response = self.client.post(reverse('core:user:registration'), registration_data)
self.assertEqual(response.status_code, 302)
new_user = User.objects.all().last()
@@ -67,11 +69,13 @@ class GymConfigTestCase(WgerTestCase):
gym_config.save()
# Register
- registration_data = {'username': 'myusername',
- 'password1': 'Iem2ahl1eizo',
- 'password2': 'Iem2ahl1eizo',
- 'email': '[email protected]',
- 'g-recaptcha-response': 'PASSED', }
+ registration_data = {
+ 'username': 'myusername',
+ 'password1': 'Iem2ahl1eizo',
+ 'password2': 'Iem2ahl1eizo',
+ 'email': '[email protected]',
+ 'g-recaptcha-response': 'PASSED',
+ }
response = self.client.post(reverse('core:user:registration'), registration_data)
self.assertEqual(response.status_code, 302)
diff --git a/wger/config/urls.py b/wger/config/urls.py
index 6e6111c73..df02506fc 100644
--- a/wger/config/urls.py
+++ b/wger/config/urls.py
@@ -22,30 +22,29 @@ from django.urls import path
# wger
from wger.config.views import (
gym_config,
- language_config
+ language_config,
)
-
# sub patterns for language configs
patterns_language_config = [
- path('<int:pk>/edit',
- language_config.LanguageConfigUpdateView.as_view(),
- name='edit'),
+ path('<int:pk>/edit', language_config.LanguageConfigUpdateView.as_view(), name='edit'),
]
-
# sub patterns for default gym
patterns_gym_config = [
- path('edit',
- gym_config.GymConfigUpdateView.as_view(),
- name='edit'),
+ path('edit', gym_config.GymConfigUpdateView.as_view(), name='edit'),
]
-
#
# Actual patterns
#
urlpatterns = [
- path('language-config/', include((patterns_language_config, 'language_config'), namespace="language_config")),
- path('gym-config/', include((patterns_gym_config, 'gym_config'), namespace="gym_config")),
+ path(
+ 'language-config/',
+ include((patterns_language_config, 'language_config'), namespace="language_config")
+ ),
+ path(
+ 'gym-config/',
+ include((patterns_gym_config, 'gym_config'), namespace="gym_config"),
+ ),
]
diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.py
index 6796cf42e..af03aafc5 100644
--- a/wger/config/views/gym_config.py
+++ b/wger/config/views/gym_config.py
@@ -26,7 +26,6 @@ from django.views.generic import UpdateView
from wger.config.models import GymConfig
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
diff --git a/wger/config/views/language_config.py b/wger/config/views/language_config.py
index f05b18961..3d71ec4ce 100644
--- a/wger/config/views/language_config.py
+++ b/wger/config/views/language_config.py
@@ -20,7 +20,7 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.urls import reverse_lazy
from django.utils.translation import gettext_lazy
@@ -30,14 +30,15 @@ from django.views.generic import UpdateView
from wger.config.models import LanguageConfig
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
-class LanguageConfigUpdateView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- UpdateView):
+class LanguageConfigUpdateView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ UpdateView,
+):
"""
Generic view to edit a language config
"""
diff --git a/wger/core/__init__.py b/wger/core/__init__.py
index ff2015c66..2bf9d6269 100644
--- a/wger/core/__init__.py
+++ b/wger/core/__init__.py
@@ -15,10 +15,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.core.apps.CoreConfig'
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index 6ec1094e5..2ddae9be6 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -30,7 +30,7 @@ from wger.core.models import (
License,
RepetitionUnit,
UserProfile,
- WeightUnit
+ WeightUnit,
)
@@ -38,35 +38,38 @@ class UserprofileSerializer(serializers.ModelSerializer):
"""
Workout session serializer
"""
+
class Meta:
model = UserProfile
- fields = ['user',
- 'gym',
- 'is_temporary',
- 'show_comments',
- 'show_english_ingredients',
- 'workout_reminder_active',
- 'workout_reminder',
- 'workout_duration',
- 'last_workout_notification',
- 'notification_language',
- 'timer_active',
- 'timer_active',
- 'age',
- 'birthdate',
- 'height',
- 'gender',
- 'sleep_hours',
- 'work_hours',
- 'work_intensity',
- 'sport_hours',
- 'sport_intensity',
- 'freetime_hours',
- 'freetime_intensity',
- 'calories',
- 'weight_unit',
- 'ro_access',
- 'num_days_weight_reminder']
+ fields = [
+ 'user',
+ 'gym',
+ 'is_temporary',
+ 'show_comments',
+ 'show_english_ingredients',
+ 'workout_reminder_active',
+ 'workout_reminder',
+ 'workout_duration',
+ 'last_workout_notification',
+ 'notification_language',
+ 'timer_active',
+ 'timer_active',
+ 'age',
+ 'birthdate',
+ 'height',
+ 'gender',
+ 'sleep_hours',
+ 'work_hours',
+ 'work_intensity',
+ 'sport_hours',
+ 'sport_intensity',
+ 'freetime_hours',
+ 'freetime_intensity',
+ 'calories',
+ 'weight_unit',
+ 'ro_access',
+ 'num_days_weight_reminder',
+ ]
class UsernameSerializer(serializers.Serializer):
@@ -88,11 +91,14 @@ class UserApiSerializer(serializers.ModelSerializer):
class UserRegistrationSerializer(serializers.ModelSerializer):
email = serializers.EmailField(
- required=False,
- validators=[UniqueValidator(queryset=User.objects.all())]
+ required=False, validators=[
+ UniqueValidator(queryset=User.objects.all()),
+ ]
+ )
+ username = serializers.CharField(
+ required=True,
+ validators=[UniqueValidator(queryset=User.objects.all())],
)
- username = serializers.CharField(required=True,
- validators=[UniqueValidator(queryset=User.objects.all())])
password = serializers.CharField(write_only=True, required=True, validators=[validate_password])
class Meta:
@@ -113,16 +119,17 @@ class LanguageSerializer(serializers.ModelSerializer):
"""
Language serializer
"""
+
class Meta:
model = Language
- fields = ['short_name',
- 'full_name']
+ fields = ['short_name', 'full_name']
class DaysOfWeekSerializer(serializers.ModelSerializer):
"""
DaysOfWeek serializer
"""
+
class Meta:
model = DaysOfWeek
fields = ['day_of_week']
@@ -132,28 +139,32 @@ class LicenseSerializer(serializers.ModelSerializer):
"""
License serializer
"""
+
class Meta:
model = License
- fields = ['id',
- 'full_name',
- 'short_name',
- 'url']
+ fields = [
+ 'id',
+ 'full_name',
+ 'short_name',
+ 'url',
+ ]
class RepetitionUnitSerializer(serializers.ModelSerializer):
"""
Repetition unit serializer
"""
+
class Meta:
model = RepetitionUnit
- fields = ['id',
- 'name']
+ fields = ['id', 'name']
class WeightUnitSerializer(serializers.ModelSerializer):
"""
Weight unit serializer
"""
+
class Meta:
model = WeightUnit
fields = ['id', 'name']
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 6fc0179ff..3fed41c33 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -24,7 +24,7 @@ from django.contrib.auth.models import User
# Third Party
from rest_framework import (
status,
- viewsets
+ viewsets,
)
from rest_framework.decorators import action
from rest_framework.permissions import AllowAny
@@ -42,7 +42,7 @@ from wger.core.api.serializers import (
UsernameSerializer,
UserprofileSerializer,
UserRegistrationSerializer,
- WeightUnitSerializer
+ WeightUnitSerializer,
)
from wger.core.models import (
DaysOfWeek,
@@ -50,15 +50,14 @@ from wger.core.models import (
License,
RepetitionUnit,
UserProfile,
- WeightUnit
+ WeightUnit,
)
from wger.utils.api_token import create_token
from wger.utils.permissions import (
UpdateOnlyPermission,
- WgerPermission
+ WgerPermission,
)
-
logger = logging.getLogger(__name__)
@@ -97,7 +96,7 @@ class ApplicationVersionView(viewsets.ViewSet):
"""
Returns the application's version
"""
- permission_classes = (AllowAny,)
+ permission_classes = (AllowAny, )
def get(self, request):
return Response(get_version())
@@ -107,7 +106,7 @@ class UserAPILoginView(viewsets.ViewSet):
"""
API endpoint for api user objects
"""
- permission_classes = (AllowAny,)
+ permission_classes = (AllowAny, )
queryset = User.objects.all()
serializer_class = UserApiSerializer
throttle_scope = 'login'
@@ -127,17 +126,20 @@ class UserAPILoginView(viewsets.ViewSet):
user = User.objects.get(username=username)
except User.DoesNotExist:
logger.info(f"Tried logging via API with unknown user: '{username}'")
- return Response({'detail': 'Username or password unknown'},
- status=status.HTTP_401_UNAUTHORIZED)
+ return Response(
+ {'detail': 'Username or password unknown'},
+ status=status.HTTP_401_UNAUTHORIZED,
+ )
if user.check_password(password):
token = create_token(user)
- return Response({'token': token.key},
- status=status.HTTP_200_OK)
+ return Response({'token': token.key}, status=status.HTTP_200_OK)
else:
logger.info(f"User '{username}' tried logging via API with a wrong password")
- return Response({'detail': 'Username or password unknown'},
- status=status.HTTP_401_UNAUTHORIZED)
+ return Response(
+ {'detail': 'Username or password unknown'},
+ status=status.HTTP_401_UNAUTHORIZED,
+ )
class UserAPIRegistrationViewSet(viewsets.ViewSet):
@@ -162,9 +164,13 @@ class UserAPIRegistrationViewSet(viewsets.ViewSet):
user.userprofile.save()
token = create_token(user)
- return Response({'message': 'api user successfully registered',
- 'token': token.key},
- status=status.HTTP_201_CREATED)
+ return Response(
+ {
+ 'message': 'api user successfully registered',
+ 'token': token.key
+ },
+ status=status.HTTP_201_CREATED
+ )
class LanguageViewSet(viewsets.ReadOnlyModelViewSet):
@@ -174,8 +180,7 @@ class LanguageViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Language.objects.all()
serializer_class = LanguageSerializer
ordering_fields = '__all__'
- filterset_fields = ('full_name',
- 'short_name')
+ filterset_fields = ('full_name', 'short_name')
class DaysOfWeekViewSet(viewsets.ReadOnlyModelViewSet):
@@ -195,9 +200,11 @@ class LicenseViewSet(viewsets.ReadOnlyModelViewSet):
queryset = License.objects.all()
serializer_class = LicenseSerializer
ordering_fields = '__all__'
- filterset_fields = ('full_name',
- 'short_name',
- 'url')
+ filterset_fields = (
+ 'full_name',
+ 'short_name',
+ 'url',
+ )
class RepetitionUnitViewSet(viewsets.ReadOnlyModelViewSet):
diff --git a/wger/core/demo.py b/wger/core/demo.py
index 46d345574..3bbe1adb8 100644
--- a/wger/core/demo.py
+++ b/wger/core/demo.py
@@ -35,19 +35,18 @@ from wger.manager.models import (
Set,
Setting,
Workout,
- WorkoutLog
+ WorkoutLog,
)
from wger.nutrition.models import (
Ingredient,
IngredientWeightUnit,
Meal,
MealItem,
- NutritionPlan
+ NutritionPlan,
)
from wger.utils.language import load_language
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -109,12 +108,14 @@ def create_demo_entries(user):
# Weight log entries
for reps in (8, 10, 12):
for i in range(1, 8):
- log = WorkoutLog(user=user,
- exercise=exercise,
- workout=workout,
- reps=reps,
- weight=18 - reps + random.randint(1, 4),
- date=datetime.date.today() - datetime.timedelta(weeks=i))
+ log = WorkoutLog(
+ user=user,
+ exercise=exercise,
+ workout=workout,
+ reps=reps,
+ weight=18 - reps + random.randint(1, 4),
+ date=datetime.date.today() - datetime.timedelta(weeks=i)
+ )
weight_log.append(log)
# French press
@@ -130,12 +131,14 @@ def create_demo_entries(user):
# Weight log entries
for reps in (7, 10):
for i in range(1, 8):
- log = WorkoutLog(user=user,
- exercise=exercise,
- workout=workout,
- reps=reps,
- weight=30 - reps + random.randint(1, 4),
- date=datetime.date.today() - datetime.timedelta(weeks=i))
+ log = WorkoutLog(
+ user=user,
+ exercise=exercise,
+ workout=workout,
+ reps=reps,
+ weight=30 - reps + random.randint(1, 4),
+ date=datetime.date.today() - datetime.timedelta(weeks=i)
+ )
weight_log.append(log)
# Squats
@@ -151,12 +154,14 @@ def create_demo_entries(user):
# Weight log entries
for reps in (5, 10, 12):
for i in range(1, 8):
- log = WorkoutLog(user=user,
- exercise=exercise,
- workout=workout,
- reps=reps,
- weight=110 - reps + random.randint(1, 10),
- date=datetime.date.today() - datetime.timedelta(weeks=i))
+ log = WorkoutLog(
+ user=user,
+ exercise=exercise,
+ workout=workout,
+ reps=reps,
+ weight=110 - reps + random.randint(1, 10),
+ date=datetime.date.today() - datetime.timedelta(weeks=i)
+ )
weight_log.append(log)
# Crunches
@@ -194,9 +199,11 @@ def create_demo_entries(user):
for i in range(1, 20):
creation_date = datetime.date.today() - datetime.timedelta(days=i)
if creation_date not in existing_entries:
- entry = WeightEntry(user=user,
- weight=80 + 0.5 * i + random.randint(1, 3),
- date=creation_date)
+ entry = WeightEntry(
+ user=user,
+ weight=80 + 0.5 * i + random.randint(1, 3),
+ date=creation_date,
+ )
temp.append(entry)
WeightEntry.objects.bulk_create(temp)
diff --git a/wger/core/forms.py b/wger/core/forms.py
index fe4b9df73..95c9ffc3d 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -18,7 +18,7 @@
from django import forms
from django.contrib.auth.forms import (
AuthenticationForm,
- UserCreationForm
+ UserCreationForm,
)
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
@@ -27,7 +27,7 @@ from django.forms import (
EmailField,
Form,
PasswordInput,
- widgets
+ widgets,
)
from django.utils.translation import gettext as _
@@ -36,7 +36,7 @@ from captcha.fields import ReCaptchaField
from captcha.widgets import ReCaptchaV3
from crispy_forms.bootstrap import (
Accordion,
- AccordionGroup
+ AccordionGroup,
)
from crispy_forms.helper import FormHelper
from crispy_forms.layout import (
@@ -44,7 +44,7 @@ from crispy_forms.layout import (
Column,
Layout,
Row,
- Submit
+ Submit,
)
# wger
@@ -72,29 +72,30 @@ class UserLoginForm(AuthenticationForm):
class UserPreferencesForm(forms.ModelForm):
- first_name = forms.CharField(label=_('First name'),
- required=False)
- last_name = forms.CharField(label=_('Last name'),
- required=False)
- email = EmailField(label=_("Email"),
- help_text=_("Used for password resets and, optionally, e-mail reminders."),
- required=False)
+ first_name = forms.CharField(label=_('First name'), required=False)
+ last_name = forms.CharField(label=_('Last name'), required=False)
+ email = EmailField(
+ label=_("Email"),
+ help_text=_("Used for password resets and, optionally, e-mail reminders."),
+ required=False
+ )
class Meta:
model = UserProfile
- fields = ('show_comments',
- 'show_english_ingredients',
- 'workout_reminder_active',
- 'workout_reminder',
- 'workout_duration',
- 'notification_language',
- 'weight_unit',
- 'timer_active',
- 'timer_pause',
- 'ro_access',
- 'num_days_weight_reminder',
- 'birthdate'
- )
+ fields = (
+ 'show_comments',
+ 'show_english_ingredients',
+ 'workout_reminder_active',
+ 'workout_reminder',
+ 'workout_duration',
+ 'notification_language',
+ 'weight_unit',
+ 'timer_active',
+ 'timer_pause',
+ 'ro_access',
+ 'num_days_weight_reminder',
+ 'birthdate',
+ )
def __init__(self, *args, **kwargs):
super(UserPreferencesForm, self).__init__(*args, **kwargs)
@@ -102,39 +103,44 @@ class UserPreferencesForm(forms.ModelForm):
self.helper.form_class = 'wger-form'
self.helper.layout = Layout(
Accordion(
- AccordionGroup(_("Personal data"),
- 'email',
- Row(Column('first_name', css_class='form-group col-6 mb-0'),
- Column('last_name', css_class='form-group col-6 mb-0'),
- css_class='form-row'),
- ),
- AccordionGroup(_("Workout reminders"),
- 'workout_reminder_active',
- 'workout_reminder',
- 'workout_duration',
- ),
- AccordionGroup(f"{_('Gym mode')} ({_('mobile version only')})",
- "timer_active",
- "timer_pause"
- ),
- AccordionGroup(_("Other settings"),
- "ro_access",
- "notification_language",
- "weight_unit",
- "show_comments",
- "show_english_ingredients",
- "num_days_weight_reminder",
- "birthdate",
- )
- ),
- ButtonHolder(Submit('submit', _("Save"), css_class='btn-success btn-block'))
+ AccordionGroup(
+ _("Personal data"),
+ 'email',
+ Row(
+ Column('first_name', css_class='form-group col-6 mb-0'),
+ Column('last_name', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ ),
+ ),
+ AccordionGroup(
+ _("Workout reminders"),
+ 'workout_reminder_active',
+ 'workout_reminder',
+ 'workout_duration',
+ ),
+ AccordionGroup(
+ f"{_('Gym mode')} ({_('mobile version only')})", "timer_active", "timer_pause"
+ ),
+ AccordionGroup(
+ _("Other settings"),
+ "ro_access",
+ "notification_language",
+ "weight_unit",
+ "show_comments",
+ "show_english_ingredients",
+ "num_days_weight_reminder",
+ "birthdate",
+ )
+ ), ButtonHolder(Submit('submit', _("Save"), css_class='btn-success btn-block'))
)
class UserEmailForm(forms.ModelForm):
- email = EmailField(label=_("Email"),
- help_text=_("Used for password resets and, optionally, email reminders."),
- required=False)
+ email = EmailField(
+ label=_("Email"),
+ help_text=_("Used for password resets and, optionally, email reminders."),
+ required=False
+ )
class Meta:
model = User
@@ -164,10 +170,8 @@ class UserEmailForm(forms.ModelForm):
class UserPersonalInformationForm(UserEmailForm):
- first_name = forms.CharField(label=_('First name'),
- required=False)
- last_name = forms.CharField(label=_('Last name'),
- required=False)
+ first_name = forms.CharField(label=_('First name'), required=False)
+ last_name = forms.CharField(label=_('Last name'), required=False)
class Meta:
model = User
@@ -181,9 +185,11 @@ class PasswordConfirmationForm(Form):
This can be used to make sure the user really wants to perform a dangerous
action. The form must be initialised with a user object.
"""
- password = CharField(label=_("Password"),
- widget=PasswordInput,
- help_text=_('Please enter your current password.'))
+ password = CharField(
+ label=_("Password"),
+ widget=PasswordInput,
+ help_text=_('Please enter your current password.')
+ )
def __init__(self, user, data=None):
self.user = user
@@ -209,23 +215,23 @@ class RegistrationForm(UserCreationForm, UserEmailForm):
Registration form with reCAPTCHA field
"""
- captcha = ReCaptchaField(widget=ReCaptchaV3,
- label='reCaptcha',
- help_text=_('The form is secured with reCAPTCHA'))
+ captcha = ReCaptchaField(
+ widget=ReCaptchaV3,
+ label='reCaptcha',
+ help_text=_('The form is secured with reCAPTCHA'),
+ )
def __init__(self, *args, **kwargs):
super(RegistrationForm, self).__init__(*args, **kwargs)
self.helper = FormHelper()
self.helper.form_class = 'wger-form'
self.helper.layout = Layout(
- 'username',
- 'email',
+ 'username', 'email',
Row(
Column('password1', css_class='form-group col-6 mb-0'),
Column('password2', css_class='form-group col-6 mb-0'),
css_class='form-row'
- ),
- 'captcha',
+ ), 'captcha',
ButtonHolder(Submit('submit', _("Register"), css_class='btn-success btn-block'))
)
@@ -240,14 +246,12 @@ class RegistrationFormNoCaptcha(UserCreationForm, UserEmailForm):
self.helper = FormHelper()
self.helper.form_class = 'wger-form'
self.helper.layout = Layout(
- 'username',
- 'email',
+ 'username', 'email',
Row(
Column('password1', css_class='form-group col-6 mb-0'),
Column('password2', css_class='form-group col-6 mb-0'),
css_class='form-row'
- ),
- ButtonHolder(Submit('submit', _("Register"), css_class='btn-success btn-block'))
+ ), ButtonHolder(Submit('submit', _("Register"), css_class='btn-success btn-block'))
)
@@ -255,24 +259,30 @@ class FeedbackRegisteredForm(forms.Form):
"""
Feedback form used for logged in users
"""
- contact = forms.CharField(max_length=50,
- min_length=10,
- label=_('Contact'),
- help_text=_('Some way of answering you (e-mail, etc.)'),
- required=False)
-
- comment = forms.CharField(max_length=500,
- min_length=10,
- widget=widgets.Textarea,
- label=_('Comment'),
- help_text=_('What do you want to say?'),
- required=True)
+ contact = forms.CharField(
+ max_length=50,
+ min_length=10,
+ label=_('Contact'),
+ help_text=_('Some way of answering you (e-mail, etc.)'),
+ required=False
+ )
+
+ comment = forms.CharField(
+ max_length=500,
+ min_length=10,
+ widget=widgets.Textarea,
+ label=_('Comment'),
+ help_text=_('What do you want to say?'),
+ required=True
+ )
class FeedbackAnonymousForm(FeedbackRegisteredForm):
"""
Feedback form used for anonymous users (has additionally a reCAPTCHA field)
"""
- captcha = ReCaptchaField(widget=ReCaptchaV3,
- label='reCaptcha',
- help_text=_('The form is secured with reCAPTCHA'))
+ captcha = ReCaptchaField(
+ widget=ReCaptchaV3,
+ label='reCaptcha',
+ help_text=_('The form is secured with reCAPTCHA'),
+ )
diff --git a/wger/core/management/commands/add-user-rest.py b/wger/core/management/commands/add-user-rest.py
index 536727eef..4c5989449 100644
--- a/wger/core/management/commands/add-user-rest.py
+++ b/wger/core/management/commands/add-user-rest.py
@@ -3,8 +3,6 @@ from django.core.management.base import BaseCommand
# wger
from wger.core.models import User
-
-
"""
Custom command permitting users to create user accounts
"""
@@ -22,7 +20,7 @@ class Command(BaseCommand):
'--disable',
action='store_true',
dest='disable',
- default=False
+ default=False,
)
def handle(self, *args, **options):
@@ -33,13 +31,17 @@ class Command(BaseCommand):
if options['disable']:
user.userprofile.can_add_user = False
- self.stdout.write(self.style.SUCCESS(
- f"{options['name']} is now DISABLED from adding users via the API"))
+ self.stdout.write(
+ self.style.
+ SUCCESS(f"{options['name']} is now DISABLED from adding users via the API")
+ )
else:
user.userprofile.can_add_user = True
- self.stdout.write(self.style.SUCCESS(
- f"{options['name']} is now ALLOWED to add users via the API"))
+ self.stdout.write(
+ self.style.
+ SUCCESS(f"{options['name']} is now ALLOWED to add users via the API")
+ )
user.userprofile.save()
except Exception as exc:
diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.py
index ef9a89a3a..0dc4b01b8 100644
--- a/wger/core/management/commands/clear-cache.py
+++ b/wger/core/management/commands/clear-cache.py
@@ -19,19 +19,19 @@ from django.contrib.auth.models import User
from django.core.cache import cache
from django.core.management.base import (
BaseCommand,
- CommandError
+ CommandError,
)
# wger
from wger.core.models import Language
from wger.manager.models import (
Workout,
- WorkoutLog
+ WorkoutLog,
)
from wger.utils.cache import (
delete_template_fragment_cache,
reset_workout_canonical_form,
- reset_workout_log
+ reset_workout_log,
)
@@ -45,32 +45,39 @@ class Command(BaseCommand):
def add_arguments(self, parser):
- parser.add_argument('--clear-template',
- action='store_true',
- dest='clear_template',
- default=False,
- help='Clear only template caches')
-
- parser.add_argument('--clear-workout-cache',
- action='store_true',
- dest='clear_workout',
- default=False,
- help='Clear only the workout canonical view')
-
- parser.add_argument('--clear-all',
- action='store_true',
- dest='clear_all',
- default=False,
- help='Clear ALL cached entries')
+ parser.add_argument(
+ '--clear-template',
+ action='store_true',
+ dest='clear_template',
+ default=False,
+ help='Clear only template caches'
+ )
+
+ parser.add_argument(
+ '--clear-workout-cache',
+ action='store_true',
+ dest='clear_workout',
+ default=False,
+ help='Clear only the workout canonical view'
+ )
+
+ parser.add_argument(
+ '--clear-all',
+ action='store_true',
+ dest='clear_all',
+ default=False,
+ help='Clear ALL cached entries'
+ )
def handle(self, **options):
"""
Process the options
"""
- if (not options['clear_template']
- and not options['clear_workout']
- and not options['clear_all']):
+ if (
+ not options['clear_template'] and not options['clear_workout']
+ and not options['clear_all']
+ ):
raise CommandError('Please select what cache you need to delete, see help')
# Exercises, cached template fragments
@@ -86,16 +93,16 @@ class Command(BaseCommand):
if int(options['verbosity']) >= 3:
self.stdout.write(f" Year {entry.year}")
- for month in WorkoutLog.objects.filter(user=user,
- date__year=entry.year).dates('date',
- 'month'):
+ for month in WorkoutLog.objects.filter(user=user, date__year=entry.year
+ ).dates('date', 'month'):
if int(options['verbosity']) >= 3:
self.stdout.write(f" Month {entry.month}")
reset_workout_log(user.id, entry.year, entry.month)
- for day in WorkoutLog.objects.filter(user=user,
- date__year=entry.year,
- date__month=month.month).dates('date',
- 'day'):
+ for day in WorkoutLog.objects.filter(
+ user=user,
+ date__year=entry.year,
+ date__month=month.month,
+ ).dates('date', 'day'):
if int(options['verbosity']) >= 3:
self.stdout.write(f" Day {day.day}")
reset_workout_log(user.id, entry.year, entry.month, day)
diff --git a/wger/core/management/commands/extract-i18n.py b/wger/core/management/commands/extract-i18n.py
index 581c6dc1f..9186070c8 100644
--- a/wger/core/management/commands/extract-i18n.py
+++ b/wger/core/management/commands/extract-i18n.py
@@ -22,7 +22,7 @@ from wger.core.models import RepetitionUnit
from wger.exercises.models import (
Equipment,
ExerciseCategory,
- Muscle
+ Muscle,
)
diff --git a/wger/core/management/commands/list-users-api.py b/wger/core/management/commands/list-users-api.py
index 9490ae9e2..046832e7c 100644
--- a/wger/core/management/commands/list-users-api.py
+++ b/wger/core/management/commands/list-users-api.py
@@ -3,8 +3,6 @@ from django.core.management.base import BaseCommand
# wger
from wger.core.models import UserProfile
-
-
"""
List users registered via the API
"""
diff --git a/wger/core/migrations/0001_initial.py b/wger/core/migrations/0001_initial.py
index 3981fca7f..e735f0992 100644
--- a/wger/core/migrations/0001_initial.py
+++ b/wger/core/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
from django.conf import settings
import django.core.validators
@@ -16,70 +16,318 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='DaysOfWeek',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('day_of_week', models.CharField(max_length=9, verbose_name='Day of the week')),
],
options={
'ordering': ['pk'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Language',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('short_name', models.CharField(max_length=2, verbose_name='Language short name')),
('full_name', models.CharField(max_length=30, verbose_name='Language full name')),
],
options={
'ordering': ['full_name'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='License',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('full_name', models.CharField(max_length=60, verbose_name='Full name')),
- ('short_name', models.CharField(max_length=15, verbose_name='Short name, e.g. CC-BY-SA 3')),
- ('url', models.URLField(help_text='Link to license text or other information', null=True, verbose_name='Link', blank=True)),
+ (
+ 'short_name',
+ models.CharField(max_length=15, verbose_name='Short name, e.g. CC-BY-SA 3')
+ ),
+ (
+ 'url',
+ models.URLField(
+ help_text='Link to license text or other information',
+ null=True,
+ verbose_name='Link',
+ blank=True
+ )
+ ),
],
options={
'ordering': ['full_name'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='UserProfile',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('is_temporary', models.BooleanField(default=False, editable=False)),
- ('show_comments', models.BooleanField(default=True, help_text='Check to show exercise comments on the workout view', verbose_name='Show exercise comments')),
- ('show_english_ingredients', models.BooleanField(default=True, help_text='Check to also show ingredients in English while creating\na nutritional plan. These ingredients are extracted from a list provided\nby the US Department of Agriculture. It is extremely complete, with around\n7000 entries, but can be somewhat overwhelming and make the search difficult.', verbose_name='Also use ingredients in English')),
- ('workout_reminder_active', models.BooleanField(default=False, help_text='Check to activate automatic reminders for workouts. You need to provide a valid email for this to work.', verbose_name='Activate workout reminders')),
- ('workout_reminder', models.IntegerField(default=14, help_text='The number of days you want to be reminded before a workout expires.', verbose_name='Remind before expiration', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)])),
- ('workout_duration', models.IntegerField(default=12, help_text='Default duration in weeks of workouts not in a schedule. Used for email workout reminders.', verbose_name='Default duration of workouts', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)])),
+ (
+ 'show_comments',
+ models.BooleanField(
+ default=True,
+ help_text='Check to show exercise comments on the workout view',
+ verbose_name='Show exercise comments'
+ )
+ ),
+ (
+ 'show_english_ingredients',
+ models.BooleanField(
+ default=True,
+ help_text=
+ 'Check to also show ingredients in English while creating\na nutritional plan. These ingredients are extracted from a list provided\nby the US Department of Agriculture. It is extremely complete, with around\n7000 entries, but can be somewhat overwhelming and make the search difficult.',
+ verbose_name='Also use ingredients in English'
+ )
+ ),
+ (
+ 'workout_reminder_active',
+ models.BooleanField(
+ default=False,
+ help_text=
+ 'Check to activate automatic reminders for workouts. You need to provide a valid email for this to work.',
+ verbose_name='Activate workout reminders'
+ )
+ ),
+ (
+ 'workout_reminder',
+ models.IntegerField(
+ default=14,
+ help_text=
+ 'The number of days you want to be reminded before a workout expires.',
+ verbose_name='Remind before expiration',
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(30)
+ ]
+ )
+ ),
+ (
+ 'workout_duration',
+ models.IntegerField(
+ default=12,
+ help_text=
+ 'Default duration in weeks of workouts not in a schedule. Used for email workout reminders.',
+ verbose_name='Default duration of workouts',
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(30)
+ ]
+ )
+ ),
('last_workout_notification', models.DateField(null=True, editable=False)),
- ('timer_active', models.BooleanField(default=True, help_text='Check to activate timer pauses between exercises.', verbose_name='Use pauses in workout timer')),
- ('timer_pause', models.IntegerField(default=90, help_text='Default duration in seconds of pauses used by the timer in the gym mode.', verbose_name='Default duration of workout pauses', validators=[django.core.validators.MinValueValidator(10), django.core.validators.MaxValueValidator(400)])),
- ('age', models.IntegerField(max_length=2, null=True, verbose_name='Age', validators=[django.core.validators.MinValueValidator(10), django.core.validators.MaxValueValidator(100)])),
- ('height', models.IntegerField(max_length=2, null=True, verbose_name='Height (cm)', validators=[django.core.validators.MinValueValidator(140), django.core.validators.MaxValueValidator(230)])),
- ('gender', models.CharField(default=b'1', max_length=1, null=True, choices=[(b'1', 'Male'), (b'2', 'Female')])),
- ('sleep_hours', models.IntegerField(default=7, help_text='The average hours of sleep per day', null=True, verbose_name='Hours of sleep', validators=[django.core.validators.MinValueValidator(4), django.core.validators.MaxValueValidator(10)])),
- ('work_hours', models.IntegerField(default=8, help_text='Average hours per day', null=True, verbose_name='Work', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(15)])),
- ('work_intensity', models.CharField(default=b'1', choices=[(b'1', 'Low'), (b'2', 'Medium'), (b'3', 'High')], max_length=1, help_text='Approximately', null=True, verbose_name='Physical intensity')),
- ('sport_hours', models.IntegerField(default=3, help_text='Average hours per week', null=True, verbose_name='Sport', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)])),
- ('sport_intensity', models.CharField(default=b'2', choices=[(b'1', 'Low'), (b'2', 'Medium'), (b'3', 'High')], max_length=1, help_text='Approximately', null=True, verbose_name='Physical intensity')),
- ('freetime_hours', models.IntegerField(default=8, help_text='Average hours per day', null=True, verbose_name='Free time', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(15)])),
- ('freetime_intensity', models.CharField(default=b'1', choices=[(b'1', 'Low'), (b'2', 'Medium'), (b'3', 'High')], max_length=1, help_text='Approximately', null=True, verbose_name='Physical intensity')),
- ('calories', models.IntegerField(default=2500, help_text='Total caloric intake, including e.g. any surplus', null=True, verbose_name='Total daily calories', validators=[django.core.validators.MinValueValidator(1500), django.core.validators.MaxValueValidator(5000)])),
- ('weight_unit', models.CharField(default=b'kg', max_length=2, verbose_name='Weight unit', choices=[(b'kg', 'Metric (kilogram)'), (b'lb', 'Imperial (pound)')])),
- ('gym', models.ForeignKey(blank=True, editable=False, to='gym.Gym', null=True, on_delete=models.CASCADE)),
- ('notification_language', models.ForeignKey(default=2, verbose_name='Notification language', to='core.Language', help_text='Language to use when sending you email notifications, e.g. email reminders for workouts. This does not affect the language used on the website.', on_delete=models.CASCADE)),
- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'timer_active',
+ models.BooleanField(
+ default=True,
+ help_text='Check to activate timer pauses between exercises.',
+ verbose_name='Use pauses in workout timer'
+ )
+ ),
+ (
+ 'timer_pause',
+ models.IntegerField(
+ default=90,
+ help_text=
+ 'Default duration in seconds of pauses used by the timer in the gym mode.',
+ verbose_name='Default duration of workout pauses',
+ validators=[
+ django.core.validators.MinValueValidator(10),
+ django.core.validators.MaxValueValidator(400)
+ ]
+ )
+ ),
+ (
+ 'age',
+ models.IntegerField(
+ max_length=2,
+ null=True,
+ verbose_name='Age',
+ validators=[
+ django.core.validators.MinValueValidator(10),
+ django.core.validators.MaxValueValidator(100)
+ ]
+ )
+ ),
+ (
+ 'height',
+ models.IntegerField(
+ max_length=2,
+ null=True,
+ verbose_name='Height (cm)',
+ validators=[
+ django.core.validators.MinValueValidator(140),
+ django.core.validators.MaxValueValidator(230)
+ ]
+ )
+ ),
+ (
+ 'gender',
+ models.CharField(
+ default=b'1',
+ max_length=1,
+ null=True,
+ choices=[(b'1', 'Male'), (b'2', 'Female')]
+ )
+ ),
+ (
+ 'sleep_hours',
+ models.IntegerField(
+ default=7,
+ help_text='The average hours of sleep per day',
+ null=True,
+ verbose_name='Hours of sleep',
+ validators=[
+ django.core.validators.MinValueValidator(4),
+ django.core.validators.MaxValueValidator(10)
+ ]
+ )
+ ),
+ (
+ 'work_hours',
+ models.IntegerField(
+ default=8,
+ help_text='Average hours per day',
+ null=True,
+ verbose_name='Work',
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(15)
+ ]
+ )
+ ),
+ (
+ 'work_intensity',
+ models.CharField(
+ default=b'1',
+ choices=[(b'1', 'Low'), (b'2', 'Medium'), (b'3', 'High')],
+ max_length=1,
+ help_text='Approximately',
+ null=True,
+ verbose_name='Physical intensity'
+ )
+ ),
+ (
+ 'sport_hours',
+ models.IntegerField(
+ default=3,
+ help_text='Average hours per week',
+ null=True,
+ verbose_name='Sport',
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(30)
+ ]
+ )
+ ),
+ (
+ 'sport_intensity',
+ models.CharField(
+ default=b'2',
+ choices=[(b'1', 'Low'), (b'2', 'Medium'), (b'3', 'High')],
+ max_length=1,
+ help_text='Approximately',
+ null=True,
+ verbose_name='Physical intensity'
+ )
+ ),
+ (
+ 'freetime_hours',
+ models.IntegerField(
+ default=8,
+ help_text='Average hours per day',
+ null=True,
+ verbose_name='Free time',
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(15)
+ ]
+ )
+ ),
+ (
+ 'freetime_intensity',
+ models.CharField(
+ default=b'1',
+ choices=[(b'1', 'Low'), (b'2', 'Medium'), (b'3', 'High')],
+ max_length=1,
+ help_text='Approximately',
+ null=True,
+ verbose_name='Physical intensity'
+ )
+ ),
+ (
+ 'calories',
+ models.IntegerField(
+ default=2500,
+ help_text='Total caloric intake, including e.g. any surplus',
+ null=True,
+ verbose_name='Total daily calories',
+ validators=[
+ django.core.validators.MinValueValidator(1500),
+ django.core.validators.MaxValueValidator(5000)
+ ]
+ )
+ ),
+ (
+ 'weight_unit',
+ models.CharField(
+ default=b'kg',
+ max_length=2,
+ verbose_name='Weight unit',
+ choices=[(b'kg', 'Metric (kilogram)'), (b'lb', 'Imperial (pound)')]
+ )
+ ),
+ (
+ 'gym',
+ models.ForeignKey(
+ blank=True,
+ editable=False,
+ to='gym.Gym',
+ null=True,
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'notification_language',
+ models.ForeignKey(
+ default=2,
+ verbose_name='Notification language',
+ to='core.Language',
+ help_text=
+ 'Language to use when sending you email notifications, e.g. email reminders for workouts. This does not affect the language used on the website.',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'user',
+ models.OneToOneField(
+ editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
]
diff --git a/wger/core/migrations/0002_auto_20141225_1512.py b/wger/core/migrations/0002_auto_20141225_1512.py
index 9ab897765..685c379cb 100644
--- a/wger/core/migrations/0002_auto_20141225_1512.py
+++ b/wger/core/migrations/0002_auto_20141225_1512.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
@@ -13,37 +13,70 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='userprofile',
name='ro_access',
- field=models.BooleanField(help_text='Allow anonymous users to access your workouts and logs in a read-only mode. You can then share the links to social media.', verbose_name='Allow read-only access', default=False),
+ field=models.BooleanField(
+ help_text=
+ 'Allow anonymous users to access your workouts and logs in a read-only mode. You can then share the links to social media.',
+ verbose_name='Allow read-only access',
+ default=False
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='freetime_intensity',
- field=models.CharField(choices=[('1', 'Low'), ('2', 'Medium'), ('3', 'High')], null=True, max_length=1, help_text='Approximately', default='1', verbose_name='Physical intensity'),
+ field=models.CharField(
+ choices=[('1', 'Low'), ('2', 'Medium'), ('3', 'High')],
+ null=True,
+ max_length=1,
+ help_text='Approximately',
+ default='1',
+ verbose_name='Physical intensity'
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='gender',
- field=models.CharField(choices=[('1', 'Male'), ('2', 'Female')], null=True, default='1', max_length=1),
+ field=models.CharField(
+ choices=[('1', 'Male'), ('2', 'Female')], null=True, default='1', max_length=1
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='sport_intensity',
- field=models.CharField(choices=[('1', 'Low'), ('2', 'Medium'), ('3', 'High')], null=True, max_length=1, help_text='Approximately', default='2', verbose_name='Physical intensity'),
+ field=models.CharField(
+ choices=[('1', 'Low'), ('2', 'Medium'), ('3', 'High')],
+ null=True,
+ max_length=1,
+ help_text='Approximately',
+ default='2',
+ verbose_name='Physical intensity'
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='weight_unit',
- field=models.CharField(choices=[('kg', 'Metric (kilogram)'), ('lb', 'Imperial (pound)')], verbose_name='Weight unit', max_length=2, default='kg'),
+ field=models.CharField(
+ choices=[('kg', 'Metric (kilogram)'), ('lb', 'Imperial (pound)')],
+ verbose_name='Weight unit',
+ max_length=2,
+ default='kg'
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='work_intensity',
- field=models.CharField(choices=[('1', 'Low'), ('2', 'Medium'), ('3', 'High')], null=True, max_length=1, help_text='Approximately', default='1', verbose_name='Physical intensity'),
+ field=models.CharField(
+ choices=[('1', 'Low'), ('2', 'Medium'), ('3', 'High')],
+ null=True,
+ max_length=1,
+ help_text='Approximately',
+ default='1',
+ verbose_name='Physical intensity'
+ ),
preserve_default=True,
),
]
diff --git a/wger/core/migrations/0003_auto_20150217_1554.py b/wger/core/migrations/0003_auto_20150217_1554.py
index a7873f460..9311d6e42 100644
--- a/wger/core/migrations/0003_auto_20150217_1554.py
+++ b/wger/core/migrations/0003_auto_20150217_1554.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
import django.core.validators
@@ -14,25 +14,49 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='userprofile',
name='num_days_weight_reminder',
- field=models.IntegerField(verbose_name='Automatic reminders for weight entries', max_length=30, null=True, help_text='Number of days after the last weight entry (enter 0 to deactivate)'),
+ field=models.IntegerField(
+ verbose_name='Automatic reminders for weight entries',
+ max_length=30,
+ null=True,
+ help_text='Number of days after the last weight entry (enter 0 to deactivate)'
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='age',
- field=models.IntegerField(verbose_name='Age', null=True, validators=[django.core.validators.MinValueValidator(10), django.core.validators.MaxValueValidator(100)]),
+ field=models.IntegerField(
+ verbose_name='Age',
+ null=True,
+ validators=[
+ django.core.validators.MinValueValidator(10),
+ django.core.validators.MaxValueValidator(100)
+ ]
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='height',
- field=models.IntegerField(verbose_name='Height (cm)', null=True, validators=[django.core.validators.MinValueValidator(140), django.core.validators.MaxValueValidator(230)]),
+ field=models.IntegerField(
+ verbose_name='Height (cm)',
+ null=True,
+ validators=[
+ django.core.validators.MinValueValidator(140),
+ django.core.validators.MaxValueValidator(230)
+ ]
+ ),
preserve_default=True,
),
migrations.AlterField(
model_name='userprofile',
name='ro_access',
- field=models.BooleanField(verbose_name='Allow external access', default=False, help_text='Allow external users to access your workouts and logs in a read-only mode. You need to set this before you can share links e.g. to social media.'),
+ field=models.BooleanField(
+ verbose_name='Allow external access',
+ default=False,
+ help_text=
+ 'Allow external users to access your workouts and logs in a read-only mode. You need to set this before you can share links e.g. to social media.'
+ ),
preserve_default=True,
),
]
diff --git a/wger/core/migrations/0004_auto_20150217_1914.py b/wger/core/migrations/0004_auto_20150217_1914.py
index 91e31785b..cef2d29a1 100644
--- a/wger/core/migrations/0004_auto_20150217_1914.py
+++ b/wger/core/migrations/0004_auto_20150217_1914.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
@@ -13,7 +13,12 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='userprofile',
name='num_days_weight_reminder',
- field=models.IntegerField(default=0, verbose_name='Automatic reminders for weight entries', max_length=30, help_text='Number of days after the last weight entry (enter 0 to deactivate)'),
+ field=models.IntegerField(
+ default=0,
+ verbose_name='Automatic reminders for weight entries',
+ max_length=30,
+ help_text='Number of days after the last weight entry (enter 0 to deactivate)'
+ ),
preserve_default=True,
),
]
diff --git a/wger/core/migrations/0005_auto_20151025_2236.py b/wger/core/migrations/0005_auto_20151025_2236.py
index 39d9e61c2..5227c795e 100644
--- a/wger/core/migrations/0005_auto_20151025_2236.py
+++ b/wger/core/migrations/0005_auto_20151025_2236.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
import django.core.validators
from django.conf import settings
@@ -16,14 +16,32 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='UserCache',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ )
+ ),
('last_activity', models.DateField(null=True)),
- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'user',
+ models.OneToOneField(
+ editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
],
),
migrations.AlterField(
model_name='userprofile',
name='num_days_weight_reminder',
- field=models.IntegerField(default=0, verbose_name='Automatic reminders for weight entries', help_text='Number of days after the last weight entry (enter 0 to deactivate)', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(30)]),
+ field=models.IntegerField(
+ default=0,
+ verbose_name='Automatic reminders for weight entries',
+ help_text='Number of days after the last weight entry (enter 0 to deactivate)',
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(30)
+ ]
+ ),
),
]
diff --git a/wger/core/migrations/0006_auto_20151025_2237.py b/wger/core/migrations/0006_auto_20151025_2237.py
index 3a6b9e633..b1388844c 100644
--- a/wger/core/migrations/0006_auto_20151025_2237.py
+++ b/wger/core/migrations/0006_auto_20151025_2237.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
@@ -59,6 +59,4 @@ class Migration(migrations.Migration):
('manager', '0004_auto_20150609_1603'),
]
- operations = [
- migrations.RunPython(create_usercache, delete_usercache)
- ]
+ operations = [migrations.RunPython(create_usercache, delete_usercache)]
diff --git a/wger/core/migrations/0007_repetitionunit.py b/wger/core/migrations/0007_repetitionunit.py
index 8715c93aa..f954f3ead 100644
--- a/wger/core/migrations/0007_repetitionunit.py
+++ b/wger/core/migrations/0007_repetitionunit.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
@@ -13,7 +13,12 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='RepetitionUnit',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, primary_key=True, auto_created=True
+ )
+ ),
('name', models.CharField(verbose_name='Name', max_length=100)),
],
options={
diff --git a/wger/core/migrations/0008_weightunit.py b/wger/core/migrations/0008_weightunit.py
index 0c4bfac48..2d0fec73f 100644
--- a/wger/core/migrations/0008_weightunit.py
+++ b/wger/core/migrations/0008_weightunit.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
@@ -13,7 +13,12 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='WeightUnit',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('name', models.CharField(verbose_name='Name', max_length=100)),
],
options={
diff --git a/wger/core/migrations/0009_auto_20160303_2340.py b/wger/core/migrations/0009_auto_20160303_2340.py
index a661d6a2e..f6ccfaf40 100644
--- a/wger/core/migrations/0009_auto_20160303_2340.py
+++ b/wger/core/migrations/0009_auto_20160303_2340.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
diff --git a/wger/core/migrations/0010_auto_20170403_0144.py b/wger/core/migrations/0010_auto_20170403_0144.py
index 04cb0c5aa..2a4a7d7dd 100644
--- a/wger/core/migrations/0010_auto_20170403_0144.py
+++ b/wger/core/migrations/0010_auto_20170403_0144.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.9.12 on 2017-04-02 16:44
from django.db import migrations, models
import wger.core.models
@@ -15,11 +15,20 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='userprofile',
name='birthdate',
- field=models.DateField(null=True, validators=[wger.core.models.birthdate_validator], verbose_name='Date of Birth'),
+ field=models.DateField(
+ null=True,
+ validators=[wger.core.models.birthdate_validator],
+ verbose_name='Date of Birth'
+ ),
),
migrations.AlterField(
model_name='license',
name='full_name',
- field=models.CharField(help_text='If a license has been localized, e.g. the Creative Commons licenses for the different countries, add them as separate entries here.', max_length=60, verbose_name='Full name'),
+ field=models.CharField(
+ help_text=
+ 'If a license has been localized, e.g. the Creative Commons licenses for the different countries, add them as separate entries here.',
+ max_length=60,
+ verbose_name='Full name'
+ ),
),
]
diff --git a/wger/core/migrations/0011_auto_20201201_0653.py b/wger/core/migrations/0011_auto_20201201_0653.py
index f7d0599a1..bd4258de7 100644
--- a/wger/core/migrations/0011_auto_20201201_0653.py
+++ b/wger/core/migrations/0011_auto_20201201_0653.py
@@ -15,10 +15,12 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='userprofile',
name='gym',
- field=models.ForeignKey(blank=True,
- editable=False,
- null=True,
- on_delete=django.db.models.deletion.SET_NULL,
- to='gym.gym'),
+ field=models.ForeignKey(
+ blank=True,
+ editable=False,
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ to='gym.gym'
+ ),
),
]
diff --git a/wger/core/migrations/0012_auto_20210210_1228.py b/wger/core/migrations/0012_auto_20210210_1228.py
index 4cfb95c50..d2acf82f7 100644
--- a/wger/core/migrations/0012_auto_20210210_1228.py
+++ b/wger/core/migrations/0012_auto_20210210_1228.py
@@ -16,11 +16,13 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='userprofile',
name='added_by',
- field=models.ForeignKey(editable=False,
- null=True,
- on_delete=django.db.models.deletion.CASCADE,
- related_name='added_by',
- to=settings.AUTH_USER_MODEL),
+ field=models.ForeignKey(
+ editable=False,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name='added_by',
+ to=settings.AUTH_USER_MODEL
+ ),
),
migrations.AddField(
model_name='userprofile',
diff --git a/wger/core/models.py b/wger/core/models.py
index f45c6d3d4..731d85a3c 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -23,7 +23,7 @@ from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
from django.core.validators import (
MaxValueValidator,
- MinValueValidator
+ MinValueValidator,
)
from django.db import models
from django.db.models import IntegerField
@@ -43,18 +43,18 @@ class Language(models.Model):
"""
# e.g. 'de'
- short_name = models.CharField(max_length=2,
- verbose_name=_('Language short name'))
+ short_name = models.CharField(max_length=2, verbose_name=_('Language short name'))
# e.g. 'Deutsch'
- full_name = models.CharField(max_length=30,
- verbose_name=_('Language full name'))
+ full_name = models.CharField(max_length=30, verbose_name=_('Language full name'))
class Meta:
"""
Set Meta options
"""
- ordering = ["full_name", ]
+ ordering = [
+ "full_name",
+ ]
#
# Django methods
@@ -117,27 +117,30 @@ class UserProfile(models.Model):
UNITS_LB = 'lb'
UNITS = (
(UNITS_KG, _('Metric (kilogram)')),
- (UNITS_LB, _('Imperial (pound)'))
+ (UNITS_LB, _('Imperial (pound)')),
)
- user = models.OneToOneField(User,
- editable=False,
- on_delete=models.CASCADE)
+ user = models.OneToOneField(
+ User,
+ editable=False,
+ on_delete=models.CASCADE,
+ )
"""
The user
"""
- gym = models.ForeignKey(Gym,
- editable=False,
- null=True,
- blank=True,
- on_delete=models.SET_NULL)
+ gym = models.ForeignKey(
+ Gym,
+ editable=False,
+ null=True,
+ blank=True,
+ on_delete=models.SET_NULL,
+ )
"""
The gym this user belongs to, if any
"""
- is_temporary = models.BooleanField(default=False,
- editable=False)
+ is_temporary = models.BooleanField(default=False, editable=False)
"""
Flag to mark a temporary user (demo account)
"""
@@ -146,10 +149,12 @@ class UserProfile(models.Model):
# User preferences
#
- show_comments = models.BooleanField(verbose_name=_('Show exercise comments'),
- help_text=_('Check to show exercise comments on the '
- 'workout view'),
- default=True)
+ show_comments = models.BooleanField(
+ verbose_name=_('Show exercise comments'),
+ help_text=_('Check to show exercise comments on the '
+ 'workout view'),
+ default=True,
+ )
"""
Show exercise comments on workout view
"""
@@ -158,33 +163,44 @@ class UserProfile(models.Model):
# (obviously this is only meaningful if the user has a language other than english)
show_english_ingredients = models.BooleanField(
verbose_name=_('Also use ingredients in English'),
- help_text=_("""Check to also show ingredients in English while creating
+ help_text=_(
+ """Check to also show ingredients in English while creating
a nutritional plan. These ingredients are extracted from a list provided
by the US Department of Agriculture. It is extremely complete, with around
-7000 entries, but can be somewhat overwhelming and make the search difficult."""),
- default=True)
-
- workout_reminder_active = models.BooleanField(verbose_name=_('Activate workout reminders'),
- help_text=_('Check to activate automatic '
- 'reminders for workouts. You need '
- 'to provide a valid email for this '
- 'to work.'),
- default=False)
-
- workout_reminder = IntegerField(verbose_name=_('Remind before expiration'),
- help_text=_('The number of days you want to be reminded '
- 'before a workout expires.'),
- default=14,
- validators=[MinValueValidator(1), MaxValueValidator(30)])
- workout_duration = IntegerField(verbose_name=_('Default duration of workouts'),
- help_text=_('Default duration in weeks of workouts not '
- 'in a schedule. Used for email workout '
- 'reminders.'),
- default=12,
- validators=[MinValueValidator(1), MaxValueValidator(30)])
- last_workout_notification = models.DateField(editable=False,
- blank=False,
- null=True)
+7000 entries, but can be somewhat overwhelming and make the search difficult."""
+ ),
+ default=True
+ )
+
+ workout_reminder_active = models.BooleanField(
+ verbose_name=_('Activate workout reminders'),
+ help_text=_(
+ 'Check to activate automatic '
+ 'reminders for workouts. You need '
+ 'to provide a valid email for this '
+ 'to work.'
+ ),
+ default=False
+ )
+
+ workout_reminder = IntegerField(
+ verbose_name=_('Remind before expiration'),
+ help_text=_('The number of days you want to be reminded '
+ 'before a workout expires.'),
+ default=14,
+ validators=[MinValueValidator(1), MaxValueValidator(30)]
+ )
+ workout_duration = IntegerField(
+ verbose_name=_('Default duration of workouts'),
+ help_text=_(
+ 'Default duration in weeks of workouts not '
+ 'in a schedule. Used for email workout '
+ 'reminders.'
+ ),
+ default=12,
+ validators=[MinValueValidator(1), MaxValueValidator(30)]
+ )
+ last_workout_notification = models.DateField(editable=False, blank=False, null=True)
"""
The last time the user got a workout reminder email
@@ -192,28 +208,36 @@ by the US Department of Agriculture. It is extremely complete, with around
send users an email once per week
"""
- notification_language = models.ForeignKey(Language,
- verbose_name=_('Notification language'),
- help_text=_('Language to use when sending you email '
- 'notifications, e.g. email reminders for '
- 'workouts. This does not affect the '
- 'language used on the website.'),
- default=2,
- on_delete=models.CASCADE)
+ notification_language = models.ForeignKey(
+ Language,
+ verbose_name=_('Notification language'),
+ help_text=_(
+ 'Language to use when sending you email '
+ 'notifications, e.g. email reminders for '
+ 'workouts. This does not affect the '
+ 'language used on the website.'
+ ),
+ default=2,
+ on_delete=models.CASCADE
+ )
- timer_active = models.BooleanField(verbose_name=_('Use pauses in workout timer'),
- help_text=_('Check to activate timer pauses between '
- 'exercises.'),
- default=True)
+ timer_active = models.BooleanField(
+ verbose_name=_('Use pauses in workout timer'),
+ help_text=_('Check to activate timer pauses between '
+ 'exercises.'),
+ default=True
+ )
"""
Switch to activate pauses in the gym view
"""
- timer_pause = IntegerField(verbose_name=_('Default duration of workout pauses'),
- help_text=_('Default duration in seconds of pauses used by '
- 'the timer in the gym mode.'),
- default=90,
- validators=[MinValueValidator(10), MaxValueValidator(400)])
+ timer_pause = IntegerField(
+ verbose_name=_('Default duration of workout pauses'),
+ help_text=_('Default duration in seconds of pauses used by '
+ 'the timer in the gym mode.'),
+ default=90,
+ validators=[MinValueValidator(10), MaxValueValidator(400)]
+ )
"""
Default duration of workout pauses in the gym view
"""
@@ -221,137 +245,168 @@ by the US Department of Agriculture. It is extremely complete, with around
#
# User statistics
#
- age = IntegerField(verbose_name=_('Age'),
- blank=False,
- null=True,
- validators=[MinValueValidator(10), MaxValueValidator(100)])
+ age = IntegerField(
+ verbose_name=_('Age'),
+ blank=False,
+ null=True,
+ validators=[MinValueValidator(10), MaxValueValidator(100)]
+ )
"""The user's age"""
- birthdate = models.DateField(verbose_name=('Date of Birth'),
- blank=False,
- null=True,
- validators=[birthdate_validator])
-
+ birthdate = models.DateField(
+ verbose_name=('Date of Birth'),
+ blank=False,
+ null=True,
+ validators=[birthdate_validator],
+ )
"""The user's date of birth"""
- height = IntegerField(verbose_name=_('Height (cm)'),
- blank=False,
- validators=[MinValueValidator(140), MaxValueValidator(230)],
- null=True)
+ height = IntegerField(
+ verbose_name=_('Height (cm)'),
+ blank=False,
+ validators=[MinValueValidator(140), MaxValueValidator(230)],
+ null=True
+ )
"""The user's height"""
- gender = models.CharField(max_length=1,
- choices=GENDER,
- default=GENDER_MALE,
- blank=False,
- null=True)
+ gender = models.CharField(
+ max_length=1,
+ choices=GENDER,
+ default=GENDER_MALE,
+ blank=False,
+ null=True,
+ )
"""Gender"""
- sleep_hours = IntegerField(verbose_name=_('Hours of sleep'),
- help_text=_('The average hours of sleep per day'),
- default=7,
- blank=False,
- null=True,
- validators=[MinValueValidator(4), MaxValueValidator(10)])
+ sleep_hours = IntegerField(
+ verbose_name=_('Hours of sleep'),
+ help_text=_('The average hours of sleep per day'),
+ default=7,
+ blank=False,
+ null=True,
+ validators=[MinValueValidator(4), MaxValueValidator(10)]
+ )
"""The average hours of sleep per day"""
- work_hours = IntegerField(verbose_name=_('Work'),
- help_text=_('Average hours per day'),
- default=8,
- blank=False,
- null=True,
- validators=[MinValueValidator(1), MaxValueValidator(15)])
+ work_hours = IntegerField(
+ verbose_name=_('Work'),
+ help_text=_('Average hours per day'),
+ default=8,
+ blank=False,
+ null=True,
+ validators=[MinValueValidator(1), MaxValueValidator(15)]
+ )
"""The average hours at work per day"""
- work_intensity = models.CharField(verbose_name=_('Physical intensity'),
- help_text=_('Approximately'),
- max_length=1,
- choices=INTENSITY,
- default=INTENSITY_LOW,
- blank=False,
- null=True)
+ work_intensity = models.CharField(
+ verbose_name=_('Physical intensity'),
+ help_text=_('Approximately'),
+ max_length=1,
+ choices=INTENSITY,
+ default=INTENSITY_LOW,
+ blank=False,
+ null=True
+ )
"""Physical intensity of work"""
- sport_hours = IntegerField(verbose_name=_('Sport'),
- help_text=_('Average hours per week'),
- default=3,
- blank=False,
- null=True,
- validators=[MinValueValidator(1), MaxValueValidator(30)])
+ sport_hours = IntegerField(
+ verbose_name=_('Sport'),
+ help_text=_('Average hours per week'),
+ default=3,
+ blank=False,
+ null=True,
+ validators=[MinValueValidator(1), MaxValueValidator(30)]
+ )
"""The average hours performing sports per week"""
- sport_intensity = models.CharField(verbose_name=_('Physical intensity'),
- help_text=_('Approximately'),
- max_length=1,
- choices=INTENSITY,
- default=INTENSITY_MEDIUM,
- blank=False,
- null=True)
+ sport_intensity = models.CharField(
+ verbose_name=_('Physical intensity'),
+ help_text=_('Approximately'),
+ max_length=1,
+ choices=INTENSITY,
+ default=INTENSITY_MEDIUM,
+ blank=False,
+ null=True
+ )
"""Physical intensity of sport activities"""
- freetime_hours = IntegerField(verbose_name=_('Free time'),
- help_text=_('Average hours per day'),
- default=8,
- blank=False,
- null=True,
- validators=[MinValueValidator(1), MaxValueValidator(15)])
+ freetime_hours = IntegerField(
+ verbose_name=_('Free time'),
+ help_text=_('Average hours per day'),
+ default=8,
+ blank=False,
+ null=True,
+ validators=[MinValueValidator(1), MaxValueValidator(15)]
+ )
"""The average hours of free time per day"""
- freetime_intensity = models.CharField(verbose_name=_('Physical intensity'),
- help_text=_('Approximately'),
- max_length=1,
- choices=INTENSITY,
- default=INTENSITY_LOW,
- blank=False,
- null=True)
+ freetime_intensity = models.CharField(
+ verbose_name=_('Physical intensity'),
+ help_text=_('Approximately'),
+ max_length=1,
+ choices=INTENSITY,
+ default=INTENSITY_LOW,
+ blank=False,
+ null=True
+ )
"""Physical intensity during free time"""
- calories = IntegerField(verbose_name=_('Total daily calories'),
- help_text=_('Total caloric intake, including e.g. any surplus'),
- default=2500,
- blank=False,
- null=True,
- validators=[MinValueValidator(1500), MaxValueValidator(5000)])
+ calories = IntegerField(
+ verbose_name=_('Total daily calories'),
+ help_text=_('Total caloric intake, including e.g. any surplus'),
+ default=2500,
+ blank=False,
+ null=True,
+ validators=[MinValueValidator(1500), MaxValueValidator(5000)]
+ )
"""Basic caloric intake based on physical activity"""
#
# Others
#
- weight_unit = models.CharField(verbose_name=_('Weight unit'),
- max_length=2,
- choices=UNITS,
- default=UNITS_KG)
+ weight_unit = models.CharField(
+ verbose_name=_('Weight unit'),
+ max_length=2,
+ choices=UNITS,
+ default=UNITS_KG,
+ )
"""Preferred weight unit"""
- ro_access = models.BooleanField(verbose_name=_('Allow external access'),
- help_text=_('Allow external users to access your workouts and '
- 'logs in a read-only mode. You need to set this '
- 'before you can share links e.g. to social media.'),
- default=False)
+ ro_access = models.BooleanField(
+ verbose_name=_('Allow external access'),
+ help_text=_(
+ 'Allow external users to access your workouts and '
+ 'logs in a read-only mode. You need to set this '
+ 'before you can share links e.g. to social media.'
+ ),
+ default=False
+ )
"""Allow anonymous read-only access"""
- num_days_weight_reminder = models.IntegerField(verbose_name=_('Automatic reminders for weight '
- 'entries'),
- help_text=_('Number of days after the last '
- 'weight entry (enter 0 to '
- 'deactivate)'),
- validators=[MinValueValidator(0),
- MaxValueValidator(30)],
- default=0)
+ num_days_weight_reminder = models.IntegerField(
+ verbose_name=_('Automatic reminders for weight '
+ 'entries'),
+ help_text=_('Number of days after the last '
+ 'weight entry (enter 0 to '
+ 'deactivate)'),
+ validators=[MinValueValidator(0), MaxValueValidator(30)],
+ default=0
+ )
"""Number of Days for email weight reminder"""
#
# API
#
- added_by = models.ForeignKey(User,
- editable=False,
- null=True,
- related_name='added_by',
- on_delete=models.CASCADE)
+ added_by = models.ForeignKey(
+ User,
+ editable=False,
+ null=True,
+ related_name='added_by',
+ on_delete=models.CASCADE,
+ )
"""User that originally registered this user via REST API"""
- can_add_user = models.BooleanField(default=False,
- editable=False)
+ can_add_user = models.BooleanField(default=False, editable=False)
"""
Flag to indicate whether the (app) user can register other users on his
behalf over the REST API
@@ -374,10 +429,12 @@ by the US Department of Agriculture. It is extremely complete, with around
"""
Return the address as saved in the current contract (user's gym)
"""
- out = {'zip_code': '',
- 'city': '',
- 'street': '',
- 'phone': ''}
+ out = {
+ 'zip_code': '',
+ 'city': '',
+ 'street': '',
+ 'phone': '',
+ }
if self.user.contract_member.exists():
last_contract = self.user.contract_member.last()
out['zip_code'] = last_contract.zip_code
@@ -391,8 +448,10 @@ by the US Department of Agriculture. It is extremely complete, with around
"""
Make sure the total amount of hours is 24
"""
- if ((self.sleep_hours and self.freetime_hours and self.work_hours)
- and (self.sleep_hours + self.freetime_hours + self.work_hours) > 24):
+ if (
+ (self.sleep_hours and self.freetime_hours and self.work_hours)
+ and (self.sleep_hours + self.freetime_hours + self.work_hours) > 24
+ ):
raise ValidationError(_('The sum of all hours has to be 24'))
def __str__(self):
@@ -436,10 +495,12 @@ by the US Department of Agriculture. It is extremely complete, with around
weight = self.weight if self.use_metric else AbstractWeight(self.weight, 'lb').kg
try:
- rate = ((10 * weight) # in kg
- + (decimal.Decimal(6.25) * self.height) # in cm
- - (5 * self.age) # in years
- + factor)
+ rate = (
+ (10 * weight) # in kg
+ + (decimal.Decimal(6.25) * self.height) # in cm
+ - (5 * self.age) # in years
+ + factor
+ )
# Any of the entries is missing
except TypeError:
rate = 0
@@ -492,10 +553,12 @@ by the US Department of Agriculture. It is extremely complete, with around
"""
Create a new weight entry as needed
"""
- if (not WeightEntry.objects.filter(user=self.user).exists()
- or (datetime.date.today()
- - WeightEntry.objects.filter(user=self.user).latest().date
- > datetime.timedelta(days=3))):
+ if (
+ not WeightEntry.objects.filter(user=self.user).exists() or (
+ datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date >
+ datetime.timedelta(days=3)
+ )
+ ):
entry = WeightEntry()
entry.weight = weight
entry.user = self.user
@@ -548,14 +611,15 @@ class DaysOfWeek(models.Model):
This model is needed so that 'Day' can have multiple days of the week selected
"""
- day_of_week = models.CharField(max_length=9,
- verbose_name=_('Day of the week'))
+ day_of_week = models.CharField(max_length=9, verbose_name=_('Day of the week'))
class Meta:
"""
Order by day-ID, this is needed for some DBs
"""
- ordering = ["pk", ]
+ ordering = [
+ "pk",
+ ]
def __str__(self):
"""
@@ -569,28 +633,35 @@ class License(models.Model):
License for an item (exercise, ingredient, etc.)
"""
- full_name = models.CharField(max_length=60,
- verbose_name=_('Full name'),
- help_text=_('If a license has been localized, e.g. the Creative '
- 'Commons licenses for the different countries, add '
- 'them as separate entries here.'))
+ full_name = models.CharField(
+ max_length=60,
+ verbose_name=_('Full name'),
+ help_text=_(
+ 'If a license has been localized, e.g. the Creative '
+ 'Commons licenses for the different countries, add '
+ 'them as separate entries here.'
+ )
+ )
"""Full name"""
- short_name = models.CharField(max_length=15,
- verbose_name=_('Short name, e.g. CC-BY-SA 3'))
+ short_name = models.CharField(max_length=15, verbose_name=_('Short name, e.g. CC-BY-SA 3'))
"""Short name, e.g. CC-BY-SA 3"""
- url = models.URLField(verbose_name=_('Link'),
- help_text=_('Link to license text or other information'),
- blank=True,
- null=True)
+ url = models.URLField(
+ verbose_name=_('Link'),
+ help_text=_('Link to license text or other information'),
+ blank=True,
+ null=True
+ )
"""URL to full license text or other information"""
class Meta:
"""
Set Meta options
"""
- ordering = ["full_name", ]
+ ordering = [
+ "full_name",
+ ]
#
# Django methods
@@ -620,10 +691,11 @@ class RepetitionUnit(models.Model):
"""
Set Meta options
"""
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
- name = models.CharField(max_length=100,
- verbose_name=_('Name'))
+ name = models.CharField(max_length=100, verbose_name=_('Name'))
def __str__(self):
"""
@@ -659,10 +731,11 @@ class WeightUnit(models.Model):
"""
Set Meta options
"""
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
- name = models.CharField(max_length=100,
- verbose_name=_('Name'))
+ name = models.CharField(max_length=100, verbose_name=_('Name'))
def __str__(self):
"""
diff --git a/wger/core/signals.py b/wger/core/signals.py
index a9199b0eb..3a8ae80be 100644
--- a/wger/core/signals.py
+++ b/wger/core/signals.py
@@ -14,7 +14,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Standard Library
import datetime
@@ -22,14 +21,14 @@ import datetime
from django.contrib.auth.models import User
from django.db.models.signals import (
post_save,
- pre_save
+ pre_save,
)
from django.dispatch import receiver
# wger
from wger.core.models import (
UserCache,
- UserProfile
+ UserProfile,
)
from wger.utils.helpers import disable_for_loaddata
@@ -61,8 +60,10 @@ def set_user_age(sender, instance, **kwargs):
if instance.age is None and instance.birthdate is not None:
today = datetime.date.today()
birthday = instance.birthdate
- instance.age = (today.year - birthday.year
- - ((today.month, today.day) < (birthday.month, birthday.day)))
+ instance.age = (
+ today.year - birthday.year -
+ ((today.month, today.day) < (birthday.month, birthday.day))
+ )
post_save.connect(create_user_profile, sender=User)
diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.py
index d2e7cb0b9..9dafaa572 100644
--- a/wger/core/templatetags/wger_extras.py
+++ b/wger/core/templatetags/wger_extras.py
@@ -23,16 +23,15 @@ from django.utils.html import strip_spaces_between_tags
from django.utils.safestring import mark_safe
from django.utils.translation import (
gettext_lazy as _,
- pgettext
+ pgettext,
)
# wger
from wger.utils.constants import (
PAGINATION_MAX_TOTAL_PAGES,
- PAGINATION_PAGES_AROUND_CURRENT
+ PAGINATION_PAGES_AROUND_CURRENT,
)
-
register = template.Library()
@@ -53,9 +52,11 @@ def render_day(day, editable=True):
"""
Renders a day as it will be displayed in the workout overview
"""
- return {'day': day.canonical_representation,
- 'workout': day.training,
- 'editable': editable}
+ return {
+ 'day': day.canonical_representation,
+ 'workout': day.training,
+ 'editable': editable,
+ }
@register.inclusion_tag('tags/pagination.html')
@@ -86,8 +87,7 @@ def pagination(paginator, page):
page_range = paginator.page_range
# Set the template variables
- return {'page': page,
- 'page_range': page_range}
+ return {'page': page, 'page_range': page_range}
@register.inclusion_tag('tags/render_weight_log.html')
@@ -96,9 +96,11 @@ def render_weight_log(log, div_uuid, user=None):
Renders a weight log series
"""
- return {'log': log,
- 'div_uuid': div_uuid,
- 'user': user}
+ return {
+ 'log': log,
+ 'div_uuid': div_uuid,
+ 'user': user,
+ }
@register.inclusion_tag('tags/license-sidebar.html')
@@ -107,8 +109,7 @@ def license_sidebar(license, author=None):
Renders the license notice for exercises
"""
- return {'license': license,
- 'author': author}
+ return {'license': license, 'author': author}
@register.inclusion_tag('tags/muscles.html')
@@ -136,8 +137,7 @@ def render_muscles(muscles=None, muscles_sec=None):
+ [i.image_url_secondary for i in out_sec] \
+ [static(f"images/muscles/muscular_system_{front_back}.svg")]
- return {"backgrounds": backgrounds,
- "empty": False}
+ return {"backgrounds": backgrounds, "empty": False}
@register.inclusion_tag('tags/language_select.html', takes_context=True)
@@ -146,9 +146,11 @@ def language_select(context, language):
Renders a link to change the current language.
"""
- return {'language_name': language[1],
- 'path': f'images/icons/flag-{language[0]}.svg',
- 'i18n_path': context['i18n_path'][language[0]]}
+ return {
+ 'language_name': language[1],
+ 'path': f'images/icons/flag-{language[0]}.svg',
+ 'i18n_path': context['i18n_path'][language[0]]
+ }
@register.filter
@@ -231,6 +233,7 @@ def format_username(user):
class SpacelessNode(template.base.Node):
+
def __init__(self, nodelist):
self.nodelist = nodelist
@@ -247,6 +250,6 @@ def spaceless_config(parser, token):
This is django's spaceless tag, copied here to use our configurable
SpacelessNode
"""
- nodelist = parser.parse(('endspaceless_config',))
+ nodelist = parser.parse(('endspaceless_config', ))
parser.delete_first_token()
return SpacelessNode(nodelist)
diff --git a/wger/core/tests/api_base_test.py b/wger/core/tests/api_base_test.py
index 2f1fbfa9a..c4b792a67 100644
--- a/wger/core/tests/api_base_test.py
+++ b/wger/core/tests/api_base_test.py
@@ -12,7 +12,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.contrib.auth.models import User
@@ -103,6 +102,7 @@ class ApiGetTestCase(object):
"""
Base test case for testing GET access to the API
"""
+
def test_ordering(self):
"""
Test that ordering the resource works
@@ -303,8 +303,10 @@ class ApiPatchTestCase(object):
# 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_403_FORBIDDEN, status.HTTP_404_NOT_FOUND))
+ self.assertIn(
+ response.status_code,
+ (status.HTTP_403_FORBIDDEN, status.HTTP_404_NOT_FOUND),
+ )
else:
# Anonymous user
response = self.client.patch(self.url_detail, data=self.data)
@@ -402,8 +404,10 @@ class ApiPutTestCase(object):
# print(f'201: {self.url_detail}')
obj = self.resource.objects.get(pk=response.data['id'])
obj2 = self.resource.objects.get(pk=self.pk)
- self.assertNotEqual(obj.get_owner_object().user.username,
- obj2.get_owner_object().user.username)
+ self.assertNotEqual(
+ obj.get_owner_object().user.username,
+ obj2.get_owner_object().user.username,
+ )
self.assertEqual(obj.get_owner_object().user.username, self.user_fail)
self.assertEqual(count_before + 1, count_after)
@@ -576,14 +580,15 @@ class ApiDeleteTestCase(object):
self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
-class ApiBaseResourceTestCase(BaseTestCase,
- ApiBaseTestCase,
-
- ApiGetTestCase,
- ApiPostTestCase,
- ApiDeleteTestCase,
- ApiPutTestCase,
- ApiPatchTestCase):
+class ApiBaseResourceTestCase(
+ BaseTestCase,
+ ApiBaseTestCase,
+ ApiGetTestCase,
+ ApiPostTestCase,
+ ApiDeleteTestCase,
+ ApiPutTestCase,
+ ApiPatchTestCase,
+):
"""
Base test case for the REST API
diff --git a/wger/core/tests/base_testcase.py b/wger/core/tests/base_testcase.py
index b2ff0afe9..1bd824514 100644
--- a/wger/core/tests/base_testcase.py
+++ b/wger/core/tests/base_testcase.py
@@ -26,14 +26,13 @@ from django.core.cache import cache
from django.test import TestCase
from django.urls import (
NoReverseMatch,
- reverse
+ reverse,
)
from django.utils.translation import activate
# wger
from wger.utils.constants import TWOPLACES
-
STATUS_CODES_FAIL = (302, 403, 404)
@@ -73,15 +72,19 @@ def delete_testcase_add_methods(cls):
"""
for user in get_user_list(cls.user_fail):
+
def test_unauthorized(self):
self.user_login(user)
self.delete_object(fail=False)
+
setattr(cls, f'test_unauthorized_{user}', test_unauthorized)
for user in get_user_list(cls.user_success):
+
def test_authorized(self):
self.user_login(user)
self.delete_object(fail=False)
+
setattr(cls, f'test_authorized_{user}', test_authorized)
@@ -93,34 +96,36 @@ class BaseTestCase(object):
REST API tests
"""
- fixtures = ('days_of_week',
- 'gym_config',
- 'groups',
- 'setting_repetition_units',
- 'setting_weight_units',
- 'test-languages',
- 'test-licenses',
- 'test-gyms',
- 'test-gymsconfig',
- 'test-user-data',
- 'test-gym-adminconfig.json',
- 'test-gym-userconfig.json',
- 'test-admin-user-notes',
- 'test-gym-user-documents',
- 'test-contracts',
- 'test-apikeys',
- 'test-weight-data',
- 'test-equipment',
- 'test-exercises',
- 'test-exercise-images',
- 'test-weight-units',
- 'test-ingredients',
- 'test-nutrition-data',
- 'test-nutrition-diary',
- 'test-workout-data',
- 'test-workout-session',
- 'test-schedules',
- 'test-gallery-images')
+ fixtures = (
+ 'days_of_week',
+ 'gym_config',
+ 'groups',
+ 'setting_repetition_units',
+ 'setting_weight_units',
+ 'test-languages',
+ 'test-licenses',
+ 'test-gyms',
+ 'test-gymsconfig',
+ 'test-user-data',
+ 'test-gym-adminconfig.json',
+ 'test-gym-userconfig.json',
+ 'test-admin-user-notes',
+ 'test-gym-user-documents',
+ 'test-contracts',
+ 'test-apikeys',
+ 'test-weight-data',
+ 'test-equipment',
+ 'test-exercises',
+ 'test-exercise-images',
+ 'test-weight-units',
+ 'test-ingredients',
+ 'test-nutrition-data',
+ 'test-nutrition-diary',
+ 'test-workout-data',
+ 'test-workout-session',
+ 'test-schedules',
+ 'test-gallery-images',
+ )
current_user = 'anonymous'
current_password = ''
@@ -268,9 +273,9 @@ class WgerDeleteTestCase(WgerTestCase):
else:
self.assertEqual(response.status_code, 302)
self.assertEqual(count_before - 1, count_after)
- self.assertRaises(self.object_class.DoesNotExist,
- self.object_class.objects.get,
- pk=self.pk)
+ self.assertRaises(
+ self.object_class.DoesNotExist, self.object_class.objects.get, pk=self.pk
+ )
# TODO: the redirection page might not have a language prefix (e.g. /user/login
# instead of /en/user/login) so there is an additional redirect
diff --git a/wger/core/tests/test_apikey.py b/wger/core/tests/test_apikey.py
index a03baae58..3cd93c639 100644
--- a/wger/core/tests/test_apikey.py
+++ b/wger/core/tests/test_apikey.py
@@ -25,7 +25,6 @@ from rest_framework.authtoken.models import Token
# wger
from wger.core.tests.base_testcase import WgerTestCase
-
logger = logging.getLogger(__name__)
diff --git a/wger/core/tests/test_change_password.py b/wger/core/tests/test_change_password.py
index fc31db8fd..3bb5bf20d 100644
--- a/wger/core/tests/test_change_password.py
+++ b/wger/core/tests/test_change_password.py
@@ -22,7 +22,6 @@ from django.urls import reverse
# wger
from wger.core.tests.base_testcase import WgerTestCase
-
logger = logging.getLogger(__name__)
@@ -42,9 +41,11 @@ class ChangePasswordTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
# Fill in the change password form
- form_data = {'old_password': 'testtest',
- 'new_password1': 'shuZoh2oGu7i',
- 'new_password2': 'shuZoh2oGu7i'}
+ form_data = {
+ 'old_password': 'testtest',
+ 'new_password1': 'shuZoh2oGu7i',
+ 'new_password2': 'shuZoh2oGu7i',
+ }
response = self.client.post(reverse('core:user:change-password'), form_data)
self.assertEqual(response.status_code, 302)
diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.py
index a28c9094a..fdc998408 100644
--- a/wger/core/tests/test_delete_user.py
+++ b/wger/core/tests/test_delete_user.py
@@ -22,7 +22,6 @@ from django.urls import reverse
# wger
from wger.core.tests.base_testcase import WgerTestCase
-
logger = logging.getLogger(__name__)
@@ -44,8 +43,10 @@ class DeleteUserTestCase(WgerTestCase):
# Wrong user password
if not fail:
- response = self.client.post(reverse('core:user:delete'),
- {'password': 'not the user password'})
+ response = self.client.post(
+ reverse('core:user:delete'),
+ {'password': 'not the user password'},
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(User.objects.filter(username='test').count(), 1)
@@ -83,22 +84,27 @@ class DeleteUserByAdminTestCase(WgerTestCase):
response = self.client.get(reverse('core:user:delete', kwargs={'user_pk': 2}))
self.assertEqual(User.objects.filter(username='test').count(), 1)
if fail:
- self.assertIn(response.status_code, (302, 403),
- f'Unexpected status code for user {self.current_user}')
+ self.assertIn(
+ response.status_code, (302, 403),
+ f'Unexpected status code for user {self.current_user}'
+ )
else:
- self.assertEqual(response.status_code, 200,
- f'Unexpected status code for user {self.current_user}')
+ self.assertEqual(
+ response.status_code, 200, f'Unexpected status code for user {self.current_user}'
+ )
# Wrong admin password
if not fail:
- response = self.client.post(reverse('core:user:delete', kwargs={'user_pk': 2}),
- {'password': 'blargh'})
+ response = self.client.post(
+ reverse('core:user:delete', kwargs={'user_pk': 2}), {'password': 'blargh'}
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(User.objects.filter(username='test').count(), 1)
# Correct user password
- response = self.client.post(reverse('core:user:delete', kwargs={'user_pk': 2}),
- {'password': self.current_password})
+ response = self.client.post(
+ reverse('core:user:delete', kwargs={'user_pk': 2}), {'password': self.current_password}
+ )
if fail:
self.assertIn(response.status_code, (302, 403))
self.assertEqual(User.objects.filter(username='test').count(), 1)
diff --git a/wger/core/tests/test_feedback.py b/wger/core/tests/test_feedback.py
index d07b4d361..bfbacac65 100644
--- a/wger/core/tests/test_feedback.py
+++ b/wger/core/tests/test_feedback.py
@@ -34,8 +34,10 @@ class FeedbackTestCase(WgerTestCase):
"""
response = self.client.get(reverse('core:feedback'))
self.assertEqual(response.status_code, 200)
- response = self.client.post(reverse('core:feedback'),
- {'comment': 'A very long and interesting comment'})
+ response = self.client.post(
+ reverse('core:feedback'),
+ {'comment': 'A very long and interesting comment'},
+ )
if logged_in:
self.assertEqual(response.status_code, 302)
self.assertEqual(len(mail.outbox), 1)
@@ -52,9 +54,12 @@ class FeedbackTestCase(WgerTestCase):
self.assertEqual(len(mail.outbox), 0)
# Correctly filled in reCaptcha
- response = self.client.post(reverse('core:feedback'),
- {'comment': 'A very long and interesting comment',
- 'g-recaptcha-response': 'PASSED'})
+ response = self.client.post(
+ reverse('core:feedback'), {
+ 'comment': 'A very long and interesting comment',
+ 'g-recaptcha-response': 'PASSED'
+ }
+ )
self.assertEqual(response.status_code, 302)
self.assertEqual(len(mail.outbox), 1)
diff --git a/wger/core/tests/test_index.py b/wger/core/tests/test_index.py
index 91c86821d..f26304fed 100644
--- a/wger/core/tests/test_index.py
+++ b/wger/core/tests/test_index.py
@@ -12,7 +12,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.urls import reverse
@@ -77,10 +76,11 @@ class DashboardTestCase(WgerTestCase):
#
# 3. Add a weight entry
#
- self.client.post(reverse('weight:add'),
- {'weight': 100,
- 'date': '2012-01-01',
- 'user': 1},)
+ self.client.post(reverse('weight:add'), {
+ 'weight': 100,
+ 'date': '2012-01-01',
+ 'user': 1,
+ })
response = self.client.get(reverse('core:dashboard'))
self.assertEqual(response.status_code, 200)
diff --git a/wger/core/tests/test_language.py b/wger/core/tests/test_language.py
index c90820a79..111035fc6 100644
--- a/wger/core/tests/test_language.py
+++ b/wger/core/tests/test_language.py
@@ -26,7 +26,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
@@ -67,8 +67,7 @@ class CreateLanguageTestCase(WgerAddTestCase):
object_class = Language
url = 'core:language:add'
- data = {'short_name': 'dk',
- 'full_name': 'Dansk'}
+ data = {'short_name': 'dk', 'full_name': 'Dansk'}
class EditLanguageTestCase(WgerEditTestCase):
@@ -79,8 +78,7 @@ class EditLanguageTestCase(WgerEditTestCase):
object_class = Language
url = 'core:language:edit'
pk = 1
- data = {'short_name': 'dk',
- 'full_name': 'Dansk'}
+ data = {'short_name': 'dk', 'full_name': 'Dansk'}
class DeleteLanguageTestCase(WgerDeleteTestCase):
diff --git a/wger/core/tests/test_license.py b/wger/core/tests/test_license.py
index 945eebf73..4c45781c8 100644
--- a/wger/core/tests/test_license.py
+++ b/wger/core/tests/test_license.py
@@ -21,7 +21,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
@@ -34,8 +34,10 @@ class LicenseRepresentationTestCase(WgerTestCase):
"""
Test that the representation of an object is correct
"""
- self.assertEqual(f"{License.objects.get(pk=1)}",
- 'A cool and free license - Germany (ACAFL - DE)')
+ self.assertEqual(
+ f"{License.objects.get(pk=1)}",
+ 'A cool and free license - Germany (ACAFL - DE)',
+ )
class LicenseOverviewTest(WgerAccessTestCase):
@@ -53,8 +55,7 @@ class AddLicenseTestCase(WgerAddTestCase):
object_class = License
url = 'core:license:add'
- data = {'full_name': 'Something here',
- 'short_name': 'SH'}
+ data = {'full_name': 'Something here', 'short_name': 'SH'}
class DeleteLicenseTestCase(WgerDeleteTestCase):
@@ -75,8 +76,7 @@ class EditLicenseTestCase(WgerEditTestCase):
object_class = License
url = 'core:license:edit'
pk = 1
- data = {'full_name': 'Something here 1.1',
- 'short_name': 'SH 1.1'}
+ data = {'full_name': 'Something here 1.1', 'short_name': 'SH 1.1'}
class LicenseApiTestCase(api_base_test.ApiBaseResourceTestCase):
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py
index fd0bf4f6a..bb3a0dcaf 100644
--- a/wger/core/tests/test_preferences.py
+++ b/wger/core/tests/test_preferences.py
@@ -26,7 +26,6 @@ from wger.core.tests.base_testcase import WgerTestCase
from wger.utils.constants import TWOPLACES
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -50,19 +49,22 @@ class PreferencesTestCase(WgerTestCase):
self.assertTemplateUsed('preferences.html')
# Change some preferences
- response = self.client.post(reverse('core:user:preferences'),
- {'show_comments': True,
- 'show_english_ingredients': True,
- 'email': '[email protected]',
- 'workout_reminder_active': True,
- 'workout_reminder': '30',
- 'workout_duration': 12,
- 'notification_language': 2,
- 'timer_active': False,
- 'timer_pause': 100,
- 'num_days_weight_reminder': 10,
- 'weight_unit': 'kg',
- 'birthdate': '02/25/1987'})
+ response = self.client.post(
+ reverse('core:user:preferences'), {
+ 'show_comments': True,
+ 'show_english_ingredients': True,
+ 'email': '[email protected]',
+ 'workout_reminder_active': True,
+ 'workout_reminder': '30',
+ 'workout_duration': 12,
+ 'notification_language': 2,
+ 'timer_active': False,
+ 'timer_pause': 100,
+ 'num_days_weight_reminder': 10,
+ 'weight_unit': 'kg',
+ 'birthdate': '02/25/1987',
+ }
+ )
self.assertEqual(response.status_code, 302)
response = self.client.get(reverse('core:user:preferences'))
@@ -74,19 +76,22 @@ class PreferencesTestCase(WgerTestCase):
self.assertEqual(User.objects.get(username='test').email, '[email protected]')
# Change some preferences
- response = self.client.post(reverse('core:user:preferences'),
- {'show_comments': False,
- 'show_english_ingredients': True,
- 'email': '',
- 'workout_reminder_active': True,
- 'workout_reminder': 22,
- 'workout_duration': 10,
- 'notification_language': 2,
- 'timer_active': True,
- 'timer_pause': 40,
- 'num_days_weight_reminder': 10,
- 'weight_unit': 'lb',
- 'birthdate': '02/25/1987'})
+ response = self.client.post(
+ reverse('core:user:preferences'), {
+ 'show_comments': False,
+ 'show_english_ingredients': True,
+ 'email': '',
+ 'workout_reminder_active': True,
+ 'workout_reminder': 22,
+ 'workout_duration': 10,
+ 'notification_language': 2,
+ 'timer_active': True,
+ 'timer_pause': 40,
+ 'num_days_weight_reminder': 10,
+ 'weight_unit': 'lb',
+ 'birthdate': '02/25/1987',
+ }
+ )
self.assertEqual(response.status_code, 302)
response = self.client.get(reverse('core:user:preferences'))
@@ -102,19 +107,25 @@ class PreferencesTestCase(WgerTestCase):
# Member2 has a contract
user = User.objects.get(username='member2')
- self.assertEqual(user.userprofile.address,
- {'phone': '01234-567890',
- 'zip_code': '00000',
- 'street': 'Gassenstr. 14',
- 'city': 'The City'})
+ self.assertEqual(
+ user.userprofile.address, {
+ 'phone': '01234-567890',
+ 'zip_code': '00000',
+ 'street': 'Gassenstr. 14',
+ 'city': 'The City',
+ }
+ )
# Test has no contracts
user = User.objects.get(username='test')
- self.assertEqual(user.userprofile.address,
- {'phone': '',
- 'zip_code': '',
- 'street': '',
- 'city': ''})
+ self.assertEqual(
+ user.userprofile.address, {
+ 'phone': '',
+ 'zip_code': '',
+ 'street': '',
+ 'city': '',
+ }
+ )
class UserBodyweightTestCase(WgerTestCase):
@@ -201,6 +212,7 @@ class PreferencesCalculationsTestCase(WgerTestCase):
"""
Tests the different calculation method in the user profile
"""
+
def test_last_weight_entry(self):
"""
Tests that the last weight entry is correctly returned
@@ -235,9 +247,11 @@ class PreferencesCalculationsTestCase(WgerTestCase):
user = User.objects.get(pk=2)
bmi = user.userprofile.calculate_bmi()
- self.assertEqual(bmi,
- user.userprofile.weight.quantize(TWOPLACES)
- / decimal.Decimal(1.80 * 1.80).quantize(TWOPLACES))
+ self.assertEqual(
+ bmi,
+ user.userprofile.weight.quantize(TWOPLACES) /
+ decimal.Decimal(1.80 * 1.80).quantize(TWOPLACES)
+ )
def test_basal_metabolic_rate(self):
"""
@@ -269,23 +283,31 @@ class PreferencesCalculationsTestCase(WgerTestCase):
self.user_login('test')
user = User.objects.get(pk=2)
- self.assertEqual(user.userprofile.calculate_activities(),
- decimal.Decimal(1.57).quantize(TWOPLACES))
+ self.assertEqual(
+ user.userprofile.calculate_activities(),
+ decimal.Decimal(1.57).quantize(TWOPLACES)
+ )
# Gender has no influence
user.userprofile.gender = "2"
- self.assertEqual(user.userprofile.calculate_activities(),
- decimal.Decimal(1.57).quantize(TWOPLACES))
+ self.assertEqual(
+ user.userprofile.calculate_activities(),
+ decimal.Decimal(1.57).quantize(TWOPLACES)
+ )
# Change some of the parameters
user.userprofile.work_intensity = '3'
- self.assertEqual(user.userprofile.calculate_activities(),
- decimal.Decimal(1.80).quantize(TWOPLACES))
+ self.assertEqual(
+ user.userprofile.calculate_activities(),
+ decimal.Decimal(1.80).quantize(TWOPLACES)
+ )
user.userprofile.work_intensity = '2'
user.userprofile.sport_intensity = '2'
- self.assertEqual(user.userprofile.calculate_activities(),
- decimal.Decimal(1.52).quantize(TWOPLACES))
+ self.assertEqual(
+ user.userprofile.calculate_activities(),
+ decimal.Decimal(1.52).quantize(TWOPLACES)
+ )
# TODO: the user can't delete or create new profiles
diff --git a/wger/core/tests/test_registration.py b/wger/core/tests/test_registration.py
index fe6ab7417..ccd987fa7 100644
--- a/wger/core/tests/test_registration.py
+++ b/wger/core/tests/test_registration.py
@@ -22,11 +22,10 @@ from django.urls import reverse
# wger
from wger.core.forms import (
RegistrationForm,
- RegistrationFormNoCaptcha
+ RegistrationFormNoCaptcha,
)
from wger.core.tests.base_testcase import WgerTestCase
-
logger = logging.getLogger(__name__)
@@ -40,19 +39,27 @@ class RegistrationTestCase(WgerTestCase):
Tests that the correct form is used depending on global
configuration settings
"""
- with self.settings(WGER_SETTINGS={'USE_RECAPTCHA': True,
- 'REMOVE_WHITESPACE': False,
- 'ALLOW_REGISTRATION': True,
- 'ALLOW_GUEST_USERS': True,
- 'TWITTER': False}):
+ with self.settings(
+ WGER_SETTINGS={
+ 'USE_RECAPTCHA': True,
+ 'REMOVE_WHITESPACE': False,
+ 'ALLOW_REGISTRATION': True,
+ 'ALLOW_GUEST_USERS': True,
+ 'TWITTER': False,
+ }
+ ):
response = self.client.get(reverse('core:user:registration'))
self.assertIsInstance(response.context['form'], RegistrationForm)
- with self.settings(WGER_SETTINGS={'USE_RECAPTCHA': False,
- 'REMOVE_WHITESPACE': False,
- 'ALLOW_REGISTRATION': True,
- 'ALLOW_GUEST_USERS': True,
- 'TWITTER': False}):
+ with self.settings(
+ WGER_SETTINGS={
+ 'USE_RECAPTCHA': False,
+ 'REMOVE_WHITESPACE': False,
+ 'ALLOW_REGISTRATION': True,
+ 'ALLOW_GUEST_USERS': True,
+ 'TWITTER': False,
+ }
+ ):
response = self.client.get(reverse('core:user:registration'))
self.assertIsInstance(response.context['form'], RegistrationFormNoCaptcha)
@@ -63,11 +70,13 @@ class RegistrationTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
# Fill in the registration form
- registration_data = {'username': 'myusername',
- 'password1': 'quai8fai7Zae',
- 'password2': 'quai8fai7Zae',
- 'email': 'not an email',
- 'g-recaptcha-response': 'PASSED', }
+ registration_data = {
+ 'username': 'myusername',
+ 'password1': 'quai8fai7Zae',
+ 'password2': 'quai8fai7Zae',
+ 'email': 'not an email',
+ 'g-recaptcha-response': 'PASSED',
+ }
count_before = User.objects.count()
# Wrong email
@@ -103,21 +112,27 @@ class RegistrationTestCase(WgerTestCase):
Test that with deactivated registration no users can register
"""
- with self.settings(WGER_SETTINGS={'USE_RECAPTCHA': False,
- 'REMOVE_WHITESPACE': False,
- 'ALLOW_GUEST_USERS': True,
- 'ALLOW_REGISTRATION': False}):
+ with self.settings(
+ WGER_SETTINGS={
+ 'USE_RECAPTCHA': False,
+ 'REMOVE_WHITESPACE': False,
+ 'ALLOW_GUEST_USERS': True,
+ 'ALLOW_REGISTRATION': False,
+ }
+ ):
# Fetch the registration page
response = self.client.get(reverse('core:user:registration'))
self.assertEqual(response.status_code, 302)
# Fill in the registration form
- registration_data = {'username': 'myusername',
- 'password1': 'Xee4fuev1ohj',
- 'password2': 'Xee4fuev1ohj',
- 'email': '[email protected]',
- 'g-recaptcha-response': 'PASSED', }
+ registration_data = {
+ 'username': 'myusername',
+ 'password1': 'Xee4fuev1ohj',
+ 'password2': 'Xee4fuev1ohj',
+ 'email': '[email protected]',
+ 'g-recaptcha-response': 'PASSED',
+ }
count_before = User.objects.count()
response = self.client.post(reverse('core:user:registration'), registration_data)
diff --git a/wger/core/tests/test_repetition_unit.py b/wger/core/tests/test_repetition_unit.py
index a17e5dd3c..09887299d 100644
--- a/wger/core/tests/test_repetition_unit.py
+++ b/wger/core/tests/test_repetition_unit.py
@@ -21,7 +21,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
@@ -55,14 +55,16 @@ class AddTestCase(WgerAddTestCase):
url = 'core:repetition-unit:add'
data = {'name': 'Furlongs'}
user_success = 'admin',
- user_fail = ('general_manager1',
- 'general_manager2',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_fail = (
+ 'general_manager1',
+ 'general_manager2',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class DeleteTestCase(WgerDeleteTestCase):
@@ -74,14 +76,16 @@ class DeleteTestCase(WgerDeleteTestCase):
object_class = RepetitionUnit
url = 'core:repetition-unit:delete'
user_success = 'admin',
- user_fail = ('general_manager1',
- 'general_manager2',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_fail = (
+ 'general_manager1',
+ 'general_manager2',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class EditTestCase(WgerEditTestCase):
@@ -94,14 +98,16 @@ class EditTestCase(WgerEditTestCase):
url = 'core:repetition-unit:edit'
data = {'name': 'Furlongs'}
user_success = 'admin',
- user_fail = ('general_manager1',
- 'general_manager2',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_fail = (
+ 'general_manager1',
+ 'general_manager2',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class ApiTestCase(api_base_test.ApiBaseResourceTestCase):
diff --git a/wger/core/tests/test_robots_txt.py b/wger/core/tests/test_robots_txt.py
index 57aad466b..ea684f826 100644
--- a/wger/core/tests/test_robots_txt.py
+++ b/wger/core/tests/test_robots_txt.py
@@ -29,5 +29,4 @@ class RobotsTxtTestCase(WgerTestCase):
response = self.client.get(reverse('robots'))
for lang in Language.objects.all():
- self.assertTrue(f'wger.de/{lang.short_name}/sitemap.xml'
- in str(response.content))
+ self.assertTrue(f'wger.de/{lang.short_name}/sitemap.xml' in str(response.content))
diff --git a/wger/core/tests/test_sitemap.py b/wger/core/tests/test_sitemap.py
index 07abcd32b..49a7d22ce 100644
--- a/wger/core/tests/test_sitemap.py
+++ b/wger/core/tests/test_sitemap.py
@@ -32,14 +32,16 @@ class SitemapTestCase(WgerTestCase):
def test_sitemap_exercises(self):
- response = self.client.get(reverse('django.contrib.sitemaps.views.sitemap',
- kwargs={'section': 'exercises'}))
+ response = self.client.get(
+ reverse('django.contrib.sitemaps.views.sitemap', kwargs={'section': 'exercises'})
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['urlset']), 9)
def test_sitemap_ingredients(self):
- response = self.client.get(reverse('django.contrib.sitemaps.views.sitemap',
- kwargs={'section': 'nutrition'}))
+ response = self.client.get(
+ reverse('django.contrib.sitemaps.views.sitemap', kwargs={'section': 'nutrition'})
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['urlset']), 13)
diff --git a/wger/core/tests/test_spaceless.py b/wger/core/tests/test_spaceless.py
index b4d72a9ad..143da4e11 100644
--- a/wger/core/tests/test_spaceless.py
+++ b/wger/core/tests/test_spaceless.py
@@ -18,13 +18,12 @@ import logging
# Django
from django.template import (
Context,
- Template
+ Template,
)
# wger
from wger.core.tests.base_testcase import WgerTestCase
-
logger = logging.getLogger(__name__)
@@ -37,8 +36,10 @@ class SpacelessTestCase(WgerTestCase):
"""
Tests the custom spaceless template tag
"""
- t = Template('{% load wger_extras %}'
- '{% spaceless_config %}<p>A text</p> <p>more</p>{% endspaceless_config %}')
+ t = Template(
+ '{% load wger_extras %}'
+ '{% spaceless_config %}<p>A text</p> <p>more</p>{% endspaceless_config %}'
+ )
context = Context()
with self.settings(WGER_SETTINGS={'REMOVE_WHITESPACE': True}):
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index 253700475..bb06687d3 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -24,7 +24,7 @@ from django.urls import reverse
# wger
from wger.core.demo import (
create_demo_entries,
- create_temporary_user
+ create_temporary_user,
)
from wger.core.tests.base_testcase import WgerTestCase
from wger.manager.models import (
@@ -32,11 +32,11 @@ from wger.manager.models import (
Schedule,
ScheduleStep,
Workout,
- WorkoutLog
+ WorkoutLog,
)
from wger.nutrition.models import (
Meal,
- NutritionPlan
+ NutritionPlan,
)
from wger.weight.models import WeightEntry
@@ -58,11 +58,15 @@ class DemoUserTestCase(WgerTestCase):
Tests that the helper function creates demo data (workout, etc.)
for the demo users
"""
- with self.settings(WGER_SETTINGS={'USE_RECAPTCHA': True,
- 'REMOVE_WHITESPACE': False,
- 'ALLOW_REGISTRATION': True,
- 'ALLOW_GUEST_USERS': False,
- 'TWITTER': False}):
+ with self.settings(
+ WGER_SETTINGS={
+ 'USE_RECAPTCHA': True,
+ 'REMOVE_WHITESPACE': False,
+ 'ALLOW_REGISTRATION': True,
+ 'ALLOW_GUEST_USERS': False,
+ 'TWITTER': False,
+ }
+ ):
self.assertEqual(self.count_temp_users(), 1)
self.client.get(reverse('core:dashboard'))
self.assertEqual(self.count_temp_users(), 1)
@@ -109,9 +113,9 @@ class DemoUserTestCase(WgerTestCase):
temp = []
for i in range(1, 5):
creation_date = datetime.date.today() - datetime.timedelta(days=i)
- entry = WeightEntry(user=user,
- weight=80 + 0.5 * i + random.randint(1, 3),
- date=creation_date)
+ entry = WeightEntry(
+ user=user, weight=80 + 0.5 * i + random.randint(1, 3), date=creation_date
+ )
temp.append(entry)
WeightEntry.objects.bulk_create(temp)
create_demo_entries(user)
@@ -168,13 +172,12 @@ class DemoUserTestCase(WgerTestCase):
demo_notice_text = 'You are using a guest account'
self.user_login('demo')
self.assertContains(self.client.get(reverse('core:dashboard')), demo_notice_text)
- self.assertContains(self.client.get(reverse('manager:workout:overview')),
- demo_notice_text)
- self.assertContains(self.client.get(reverse('exercise:exercise:overview')),
- demo_notice_text)
+ self.assertContains(self.client.get(reverse('manager:workout:overview')), demo_notice_text)
+ self.assertContains(
+ self.client.get(reverse('exercise:exercise:overview')), demo_notice_text
+ )
self.assertContains(self.client.get(reverse('exercise:muscle:overview')), demo_notice_text)
- self.assertContains(self.client.get(reverse('nutrition:plan:overview')),
- demo_notice_text)
+ self.assertContains(self.client.get(reverse('nutrition:plan:overview')), demo_notice_text)
self.assertContains(self.client.get(reverse('software:issues')), demo_notice_text)
self.assertContains(self.client.get(reverse('software:license')), demo_notice_text)
diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.py
index 511de690c..c5048ee97 100644
--- a/wger/core/tests/test_user.py
+++ b/wger/core/tests/test_user.py
@@ -16,14 +16,14 @@
from django.contrib.auth.models import User
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
# wger
from wger.core.tests.base_testcase import (
WgerAccessTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
@@ -32,20 +32,24 @@ class StatusUserTestCase(WgerTestCase):
Test activating and deactivating users
"""
- user_success = ('general_manager1',
- 'general_manager2',
- 'manager1',
- 'manager2',
- 'trainer1',
- 'trainer2',
- 'trainer3')
-
- user_fail = ('member1',
- 'member2',
- 'member3',
- 'member4',
- 'manager3',
- 'trainer4')
+ user_success = (
+ 'general_manager1',
+ 'general_manager2',
+ 'manager1',
+ 'manager2',
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'manager3',
+ 'trainer4',
+ )
def activate(self, fail=False):
"""
@@ -140,20 +144,26 @@ class EditUserTestCase(WgerEditTestCase):
object_class = User
url = 'core:user:edit'
pk = 2
- data = {'email': '[email protected]',
- 'first_name': 'Name',
- 'last_name': 'Last name'}
- user_success = ('admin',
- 'general_manager1',
- 'general_manager2',
- 'manager1',
- 'manager2')
- user_fail = ('member1',
- 'member2',
- 'manager3',
- 'trainer2',
- 'trainer3',
- 'trainer4')
+ data = {
+ 'email': '[email protected]',
+ 'first_name': 'Name',
+ 'last_name': 'Last name',
+ }
+ user_success = (
+ 'admin',
+ 'general_manager1',
+ 'general_manager2',
+ 'manager1',
+ 'manager2',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'manager3',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ )
class EditUserTestCase2(WgerEditTestCase):
@@ -164,18 +174,24 @@ class EditUserTestCase2(WgerEditTestCase):
object_class = User
url = 'core:user:edit'
pk = 19
- data = {'email': '[email protected]',
- 'first_name': 'Name',
- 'last_name': 'Last name'}
- user_success = ('admin',
- 'general_manager1',
- 'general_manager2',
- 'manager3')
- user_fail = ('member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4')
+ data = {
+ 'email': '[email protected]',
+ 'first_name': 'Name',
+ 'last_name': 'Last name',
+ }
+ user_success = (
+ 'admin',
+ 'general_manager1',
+ 'general_manager2',
+ 'manager3',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ )
class UserListTestCase(WgerAccessTestCase):
@@ -184,17 +200,21 @@ class UserListTestCase(WgerAccessTestCase):
"""
url = 'core:user:list'
- user_success = ('admin',
- 'general_manager1',
- 'general_manager2')
- user_fail = ('member1',
- 'member2',
- 'manager1',
- 'manager2',
- 'manager3',
- 'trainer2',
- 'trainer3',
- 'trainer4')
+ user_success = (
+ 'admin',
+ 'general_manager1',
+ 'general_manager2',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'manager1',
+ 'manager2',
+ 'manager3',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ )
class UserDetailPageTestCase(WgerAccessTestCase):
@@ -203,16 +223,20 @@ class UserDetailPageTestCase(WgerAccessTestCase):
"""
url = reverse_lazy('core:user:overview', kwargs={'pk': 2})
- user_success = ('trainer1',
- 'trainer2',
- 'manager1',
- 'general_manager1',
- 'general_manager2')
- user_fail = ('trainer4',
- 'trainer5',
- 'manager3',
- 'member1',
- 'member2')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'manager1',
+ 'general_manager1',
+ 'general_manager2',
+ )
+ user_fail = (
+ 'trainer4',
+ 'trainer5',
+ 'manager3',
+ 'member1',
+ 'member2',
+ )
class UserDetailPageTestCase2(WgerAccessTestCase):
@@ -221,13 +245,17 @@ class UserDetailPageTestCase2(WgerAccessTestCase):
"""
url = reverse_lazy('core:user:overview', kwargs={'pk': 19})
- user_success = ('trainer4',
- 'trainer5',
- 'manager3',
- 'general_manager1',
- 'general_manager2')
- user_fail = ('trainer1',
- 'trainer2',
- 'manager1',
- 'member1',
- 'member2')
+ user_success = (
+ 'trainer4',
+ 'trainer5',
+ 'manager3',
+ 'general_manager1',
+ 'general_manager2',
+ )
+ user_fail = (
+ 'trainer1',
+ 'trainer2',
+ 'manager1',
+ 'member1',
+ 'member2',
+ )
diff --git a/wger/core/tests/test_user_rest_registration.py b/wger/core/tests/test_user_rest_registration.py
index 3f181d3f5..0a9105ecc 100644
--- a/wger/core/tests/test_user_rest_registration.py
+++ b/wger/core/tests/test_user_rest_registration.py
@@ -11,7 +11,7 @@ from rest_framework.authtoken.models import Token
from rest_framework.status import (
HTTP_201_CREATED,
HTTP_400_BAD_REQUEST,
- HTTP_403_FORBIDDEN
+ HTTP_403_FORBIDDEN,
)
# wger
@@ -43,8 +43,10 @@ class CreateUserCommand(WgerTestCase):
self.assertTrue(user.userprofile.can_add_user)
call_command('add-user-rest', 'test', disable=True, stdout=self.out, no_color=True)
- self.assertEqual('test is now DISABLED from adding users via the API\n',
- self.out.getvalue())
+ self.assertEqual(
+ 'test is now DISABLED from adding users via the API\n',
+ self.out.getvalue(),
+ )
user = User.objects.get(username='test')
self.assertFalse(user.userprofile.can_add_user)
@@ -65,11 +67,14 @@ class CreateUserCommand(WgerTestCase):
token = Token.objects.get(user=user)
count_before = User.objects.count()
- response = self.client.post(reverse('api_register'),
- {'username': 'restapi',
- 'email': '[email protected]',
- 'password': 'AekaiLe0ga'},
- Authorization=f'Token {token.key}')
+ response = self.client.post(
+ reverse('api_register'), {
+ 'username': 'restapi',
+ 'email': '[email protected]',
+ 'password': 'AekaiLe0ga'
+ },
+ Authorization=f'Token {token.key}'
+ )
count_after = User.objects.count()
self.assertEqual(response.status_code, HTTP_201_CREATED)
@@ -87,10 +92,13 @@ class CreateUserCommand(WgerTestCase):
token = Token.objects.get(user=user)
count_before = User.objects.count()
- response = self.client.post(reverse('api_register'),
- {'username': 'restapi',
- 'password': 'AekaiLe0ga'},
- Authorization=f'Token {token.key}')
+ response = self.client.post(
+ reverse('api_register'), {
+ 'username': 'restapi',
+ 'password': 'AekaiLe0ga'
+ },
+ Authorization=f'Token {token.key}'
+ )
count_after = User.objects.count()
self.assertEqual(response.status_code, HTTP_201_CREATED)
@@ -106,10 +114,13 @@ class CreateUserCommand(WgerTestCase):
self.user_login('admin')
count_before = User.objects.count()
- response = self.client.post(reverse('api_register'),
- {'username': 'restapi',
- 'email': '[email protected]',
- 'password': 'AekaiLe0ga'})
+ response = self.client.post(
+ reverse('api_register'), {
+ 'username': 'restapi',
+ 'email': '[email protected]',
+ 'password': 'AekaiLe0ga'
+ }
+ )
count_after = User.objects.count()
self.assertEqual(response.status_code, HTTP_403_FORBIDDEN)
@@ -122,9 +133,11 @@ class CreateUserCommand(WgerTestCase):
user = User.objects.get(username='test')
token = Token.objects.get(user=user)
- response = self.client.post(reverse('api_register'),
- {'password': 'AekaiLe0ga'},
- Authorization=f'Token {token.key}')
+ response = self.client.post(
+ reverse('api_register'),
+ {'password': 'AekaiLe0ga'},
+ Authorization=f'Token {token.key}',
+ )
self.assertEqual(response.status_code, HTTP_400_BAD_REQUEST)
@@ -135,11 +148,14 @@ class CreateUserCommand(WgerTestCase):
user = User.objects.get(username='test')
token = Token.objects.get(user=user)
- response = self.client.post(reverse('api_register'),
- {'username': 'restapi',
- 'email': 'example.com',
- 'password': 'AekaiLe0ga'},
- Authorization=f'Token {token.key}')
+ response = self.client.post(
+ reverse('api_register'), {
+ 'username': 'restapi',
+ 'email': 'example.com',
+ 'password': 'AekaiLe0ga'
+ },
+ Authorization=f'Token {token.key}'
+ )
self.assertEqual(response.status_code, HTTP_400_BAD_REQUEST)
@@ -150,10 +166,13 @@ class CreateUserCommand(WgerTestCase):
user = User.objects.get(username='test')
token = Token.objects.get(user=user)
- response = self.client.post(reverse('api_register'),
- {'username': 'restapi',
- 'email': '[email protected]',
- 'password': 'AekaiLe0ga'},
- Authorization=f'Token {token.key}')
+ response = self.client.post(
+ reverse('api_register'), {
+ 'username': 'restapi',
+ 'email': '[email protected]',
+ 'password': 'AekaiLe0ga'
+ },
+ Authorization=f'Token {token.key}'
+ )
self.assertEqual(response.status_code, HTTP_400_BAD_REQUEST)
diff --git a/wger/core/tests/test_weight_unit.py b/wger/core/tests/test_weight_unit.py
index bf8335718..c8d72dea9 100644
--- a/wger/core/tests/test_weight_unit.py
+++ b/wger/core/tests/test_weight_unit.py
@@ -21,7 +21,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
@@ -55,14 +55,16 @@ class AddTestCase(WgerAddTestCase):
url = 'core:weight-unit:add'
data = {'name': 'Furlongs'}
user_success = 'admin',
- user_fail = ('general_manager1',
- 'general_manager2',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_fail = (
+ 'general_manager1',
+ 'general_manager2',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class DeleteTestCase(WgerDeleteTestCase):
@@ -74,14 +76,16 @@ class DeleteTestCase(WgerDeleteTestCase):
object_class = WeightUnit
url = 'core:weight-unit:delete'
user_success = 'admin',
- user_fail = ('general_manager1',
- 'general_manager2',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_fail = (
+ 'general_manager1',
+ 'general_manager2',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class EditTestCase(WgerEditTestCase):
@@ -94,14 +98,16 @@ class EditTestCase(WgerEditTestCase):
url = 'core:weight-unit:edit'
data = {'name': 'Furlongs'}
user_success = 'admin',
- user_fail = ('general_manager1',
- 'general_manager2',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_fail = (
+ 'general_manager1',
+ 'general_manager2',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class ApiTestCase(api_base_test.ApiBaseResourceTestCase):
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 951911d58..71436b40b 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -14,11 +14,10 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.conf.urls import (
include,
- url
+ url,
)
from django.contrib.auth import views
from django.urls import path
@@ -32,173 +31,245 @@ from wger.core.views import (
misc,
repetition_units,
user,
- weight_units
+ weight_units,
)
-
# sub patterns for languages
patterns_language = [
- path('list',
- languages.LanguageListView.as_view(),
- name='overview'),
- path('<int:pk>/view',
- languages.LanguageDetailView.as_view(),
- name='view'),
- path('<int:pk>/delete',
- languages.LanguageDeleteView.as_view(),
- name='delete'),
- path('<int:pk>/edit',
- languages.LanguageEditView.as_view(),
- name='edit'),
- path('add',
- languages.LanguageCreateView.as_view(),
- name='add'),
+ path(
+ 'list',
+ languages.LanguageListView.as_view(),
+ name='overview',
+ ),
+ path(
+ '<int:pk>/view',
+ languages.LanguageDetailView.as_view(),
+ name='view',
+ ),
+ path(
+ '<int:pk>/delete',
+ languages.LanguageDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ '<int:pk>/edit',
+ languages.LanguageEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'add',
+ languages.LanguageCreateView.as_view(),
+ name='add',
+ ),
]
# sub patterns for user
patterns_user = [
- path('login',
- views.LoginView.as_view(template_name='user/login.html',
- authentication_form=UserLoginForm),
- name='login'),
- path('logout',
- user.logout,
- name='logout'),
- path('delete',
- user.delete,
- name='delete'),
- path('<int:user_pk>/delete',
- user.delete,
- name='delete'),
- path('<int:user_pk>/trainer-login',
- user.trainer_login,
- name='trainer-login'),
- path('registration',
- user.registration,
- name='registration'),
- path('preferences',
- user.preferences,
- name='preferences'),
- path('api-key',
- user.api_key,
- name='api-key'),
- path('demo-entries',
- misc.demo_entries,
- name='demo-entries'),
- path('<int:pk>/activate',
- user.UserActivateView.as_view(),
- name='activate'),
- path('<int:pk>/deactivate',
- user.UserDeactivateView.as_view(),
- name='deactivate'),
- path('<int:pk>/edit',
- user.UserEditView.as_view(),
- name='edit'),
- path('<int:pk>/overview',
- user.UserDetailView.as_view(),
- name='overview'),
- path('list',
- user.UserListView.as_view(),
- name='list'),
+ path(
+ 'login',
+ views.LoginView.as_view(template_name='user/login.html', authentication_form=UserLoginForm),
+ name='login',
+ ),
+ path(
+ 'logout',
+ user.logout,
+ name='logout',
+ ),
+ path(
+ 'delete',
+ user.delete,
+ name='delete',
+ ),
+ path(
+ '<int:user_pk>/delete',
+ user.delete,
+ name='delete',
+ ),
+ path(
+ '<int:user_pk>/trainer-login',
+ user.trainer_login,
+ name='trainer-login',
+ ),
+ path(
+ 'registration',
+ user.registration,
+ name='registration',
+ ),
+ path(
+ 'preferences',
+ user.preferences,
+ name='preferences',
+ ),
+ path(
+ 'api-key',
+ user.api_key,
+ name='api-key',
+ ),
+ path(
+ 'demo-entries',
+ misc.demo_entries,
+ name='demo-entries',
+ ),
+ path(
+ '<int:pk>/activate',
+ user.UserActivateView.as_view(),
+ name='activate',
+ ),
+ path(
+ '<int:pk>/deactivate',
+ user.UserDeactivateView.as_view(),
+ name='deactivate',
+ ),
+ path(
+ '<int:pk>/edit',
+ user.UserEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/overview',
+ user.UserDetailView.as_view(),
+ name='overview',
+ ),
+ path(
+ 'list',
+ user.UserListView.as_view(),
+ name='list',
+ ),
# Password reset is implemented by Django, no need to cook our own soup here
# (besides the templates)
- path('password/change',
- user.WgerPasswordChangeView.as_view(),
- name='change-password'),
- path('password/reset/',
- user.WgerPasswordResetView.as_view(),
- name='password_reset'),
- path('password/reset/done/',
- views.PasswordResetDoneView.as_view(),
- name='password_reset_done'),
- url(r'^password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ path(
+ 'password/change',
+ user.WgerPasswordChangeView.as_view(),
+ name='change-password',
+ ),
+ path(
+ 'password/reset/',
+ user.WgerPasswordResetView.as_view(),
+ name='password_reset',
+ ),
+ path(
+ 'password/reset/done/',
+ views.PasswordResetDoneView.as_view(),
+ name='password_reset_done',
+ ),
+ url(
+ r'^password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
user.WgerPasswordResetConfirmView.as_view(),
- name='password_reset_confirm'),
- path('password/reset/complete/',
- views.PasswordResetCompleteView.as_view(),
- name='password_reset_complete'),
+ name='password_reset_confirm',
+ ),
+ path(
+ 'password/reset/complete/',
+ views.PasswordResetCompleteView.as_view(),
+ name='password_reset_complete',
+ ),
]
-
# sub patterns for licenses
patterns_license = [
- path('license/list',
- license.LicenseListView.as_view(),
- name='list'),
- path('license/add',
- license.LicenseAddView.as_view(),
- name='add'),
- path('license/<int:pk>/edit',
- license.LicenseUpdateView.as_view(),
- name='edit'),
- path('license/<int:pk>/delete',
- license.LicenseDeleteView.as_view(),
- name='delete'),
+ path(
+ 'license/list',
+ license.LicenseListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'license/add',
+ license.LicenseAddView.as_view(),
+ name='add',
+ ),
+ path(
+ 'license/<int:pk>/edit',
+ license.LicenseUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'license/<int:pk>/delete',
+ license.LicenseDeleteView.as_view(),
+ name='delete',
+ ),
]
# sub patterns for setting units
patterns_repetition_units = [
- path('list',
- repetition_units.ListView.as_view(),
- name='list'),
- path('add',
- repetition_units.AddView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- repetition_units.UpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- repetition_units.DeleteView.as_view(),
- name='delete'),
+ path(
+ 'list',
+ repetition_units.ListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'add',
+ repetition_units.AddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ repetition_units.UpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ repetition_units.DeleteView.as_view(),
+ name='delete',
+ ),
]
# sub patterns for setting units
patterns_weight_units = [
- path('list',
- weight_units.ListView.as_view(),
- name='list'),
- path('add',
- weight_units.AddView.as_view(),
- name='add'),
- path('<int:pk>)/edit',
- weight_units.UpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- weight_units.DeleteView.as_view(),
- name='delete'),
+ path(
+ 'list',
+ weight_units.ListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'add',
+ weight_units.AddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>)/edit',
+ weight_units.UpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ weight_units.DeleteView.as_view(),
+ name='delete',
+ ),
]
-
#
# Actual patterns
#
urlpatterns = [
# The landing page
- path('',
- misc.index,
- name='index'),
+ path('', misc.index, name='index'),
# The dashboard
- path('dashboard',
- misc.dashboard,
- name='dashboard'),
+ path('dashboard', misc.dashboard, name='dashboard'),
# Others
- path('about',
- TemplateView.as_view(template_name="misc/about.html"),
- name='about'),
- path('contact',
- misc.ContactClassView.as_view(template_name="misc/contact.html"),
- name='contact'),
- path('feedback',
- misc.FeedbackClass.as_view(),
- name='feedback'),
-
+ path(
+ 'about',
+ TemplateView.as_view(template_name="misc/about.html"),
+ name='about',
+ ),
+ path(
+ 'contact',
+ misc.ContactClassView.as_view(template_name="misc/contact.html"),
+ name='contact',
+ ),
+ path(
+ 'feedback',
+ misc.FeedbackClass.as_view(),
+ name='feedback',
+ ),
path('language/', include((patterns_language, 'language'), namespace="language")),
path('user/', include((patterns_user, 'user'), namespace="user")),
path('license/', include((patterns_license, 'license'), namespace="license")),
- path('repetition-unit/', include((patterns_repetition_units, 'repetition-unit'), namespace="repetition-unit")),
+ path(
+ 'repetition-unit/',
+ include((patterns_repetition_units, 'repetition-unit'), namespace="repetition-unit")
+ ),
path('weight-unit/', include((patterns_weight_units, 'weight-unit'), namespace="weight-unit")),
]
diff --git a/wger/core/views/languages.py b/wger/core/views/languages.py
index 94b9ea94c..a7373acdf 100644
--- a/wger/core/views/languages.py
+++ b/wger/core/views/languages.py
@@ -20,29 +20,28 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
DetailView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.core.models import Language
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index 63bd330b5..e6f959fc5 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -20,28 +20,27 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.core.models import License
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py
index b5a80031d..53383d94d 100644
--- a/wger/core/views/misc.py
+++ b/wger/core/views/misc.py
@@ -29,7 +29,7 @@ from django.shortcuts import render
from django.template.loader import render_to_string
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.text import slugify
from django.utils.translation import gettext as _
@@ -43,11 +43,11 @@ from crispy_forms.layout import Submit
# wger
from wger.core.demo import (
create_demo_entries,
- create_temporary_user
+ create_temporary_user,
)
from wger.core.forms import (
FeedbackAnonymousForm,
- FeedbackRegisteredForm
+ FeedbackRegisteredForm,
)
from wger.core.models import DaysOfWeek
from wger.manager.models import Schedule
@@ -55,7 +55,6 @@ from wger.nutrition.models import NutritionPlan
from wger.weight.helpers import get_last_entries
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -79,8 +78,12 @@ def demo_entries(request):
if not settings.WGER_SETTINGS['ALLOW_GUEST_USERS']:
return HttpResponseRedirect(reverse('software:features'))
- if (((not request.user.is_authenticated or request.user.userprofile.is_temporary)
- and not request.session['has_demo_data'])):
+ if (
+ (
+ (not request.user.is_authenticated or request.user.userprofile.is_temporary)
+ and not request.session['has_demo_data']
+ )
+ ):
# If we reach this from a page that has no user created by the
# middleware, do that now
if not request.user.is_authenticated:
@@ -90,10 +93,15 @@ def demo_entries(request):
# OK, continue
create_demo_entries(request.user)
request.session['has_demo_data'] = True
- messages.success(request, _('We have created sample workout, workout schedules, weight '
- 'logs, (body) weight and nutrition plan entries so you can '
- 'better see what this site can do. Feel free to edit or '
- 'delete them!'))
+ messages.success(
+ request,
+ _(
+ 'We have created sample workout, workout schedules, weight '
+ 'logs, (body) weight and nutrition plan entries so you can '
+ 'better see what this site can do. Feel free to edit or '
+ 'delete them!'
+ )
+ )
return HttpResponseRedirect(reverse('core:dashboard'))
@@ -156,12 +164,17 @@ def dashboard(request):
class ContactClassView(TemplateView):
+
def get_context_data(self, **kwargs):
context = super(ContactClassView, self).get_context_data(**kwargs)
- context.update({'discord': 'https://discord.gg/rPWFv6W',
- 'contribute': reverse('software:contribute'),
- 'issues': reverse('software:issues'),
- 'feedback': reverse('core:feedback')})
+ context.update(
+ {
+ 'discord': 'https://discord.gg/rPWFv6W',
+ 'contribute': reverse('software:contribute'),
+ 'issues': reverse('software:issues'),
+ 'feedback': reverse('core:feedback')
+ }
+ )
return context
diff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.py
index b8b135c55..512a78b3b 100644
--- a/wger/core/views/repetition_units.py
+++ b/wger/core/views/repetition_units.py
@@ -20,29 +20,28 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http import HttpResponseForbidden
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.core.models import RepetitionUnit
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index f1361ed6f..7ea9fa747 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -23,44 +23,44 @@ from django.contrib import messages
from django.contrib.auth import (
authenticate,
login as django_login,
- logout as django_logout
+ logout as django_logout,
)
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.contrib.auth.models import User
from django.contrib.auth.views import (
LoginView,
PasswordChangeView,
PasswordResetConfirmView,
- PasswordResetView
+ PasswordResetView,
)
from django.http import (
HttpResponseForbidden,
HttpResponseNotFound,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.template.context_processors import csrf
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils import translation
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
DetailView,
ListView,
RedirectView,
- UpdateView
+ UpdateView,
)
# Third Party
@@ -70,7 +70,7 @@ from crispy_forms.layout import (
Column,
Layout,
Row,
- Submit
+ Submit,
)
from rest_framework.authtoken.models import Token
@@ -82,28 +82,27 @@ from wger.core.forms import (
RegistrationFormNoCaptcha,
UserLoginForm,
UserPersonalInformationForm,
- UserPreferencesForm
+ UserPreferencesForm,
)
from wger.core.models import Language
from wger.gym.models import (
AdminUserNote,
Contract,
- GymUserConfig
+ GymUserConfig,
)
from wger.manager.models import (
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.nutrition.models import NutritionPlan
from wger.utils.api_token import create_token
from wger.utils.generic_views import (
WgerFormMixin,
- WgerMultiplePermissionRequiredMixin
+ WgerMultiplePermissionRequiredMixin,
)
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -117,8 +116,7 @@ def login(request):
form = UserLoginForm
form.helper.form_action = reverse('core:user:login') + next_url
- return LoginView.as_view(template_name='user/login.html',
- authentication_form=form)
+ return LoginView.as_view(template_name='user/login.html', authentication_form=form)
@login_required()
@@ -152,8 +150,10 @@ def delete(request, user_pk=None):
if form.is_valid():
user.delete()
- messages.success(request,
- _('Account "{0}" was successfully deleted').format(user.username))
+ messages.success(
+ request,
+ _('Account "{0}" was successfully deleted').format(user.username)
+ )
if not user_pk:
django_logout(request)
@@ -162,8 +162,7 @@ def delete(request, user_pk=None):
gym_pk = request.user.userprofile.gym_id
return HttpResponseRedirect(reverse('gym:gym:user-list', kwargs={'pk': gym_pk}))
form.helper.form_action = request.path
- context = {'form': form,
- 'user_delete': user}
+ context = {'form': form, 'user_delete': user}
return render(request, 'user/delete_account.html', context)
@@ -192,20 +191,23 @@ def trainer_login(request, user_pk):
if request.user.userprofile.gym != user.userprofile.gym:
return HttpResponseNotFound(
'There are no users in gym "{}" with user ID "{}".'.format(
- request.user.userprofile.gym, user_pk,
- ))
+ request.user.userprofile.gym,
+ user_pk,
+ )
+ )
# Check if we're switching back to our original account
own = False
- if (user.has_perm('gym.gym_trainer')
- or user.has_perm('gym.manage_gym')
- or user.has_perm('gym.manage_gyms')):
+ if (
+ user.has_perm('gym.gym_trainer') or user.has_perm('gym.manage_gym')
+ or user.has_perm('gym.manage_gyms')
+ ):
own = True
# Note: when logging without authenticating, it is necessary to set the
# authentication backend
if own:
- del(request.session['trainer.identity'])
+ del (request.session['trainer.identity'])
django_login(request, user, 'django.contrib.auth.backends.ModelBackend')
if not own:
@@ -215,8 +217,9 @@ def trainer_login(request, user_pk):
else:
return HttpResponseRedirect(reverse('core:index'))
else:
- return HttpResponseRedirect(reverse('gym:gym:user-list',
- kwargs={'pk': user.userprofile.gym_id}))
+ return HttpResponseRedirect(
+ reverse('gym:gym:user-list', kwargs={'pk': user.userprofile.gym_id})
+ )
def logout(request):
@@ -258,9 +261,7 @@ def registration(request):
username = form.cleaned_data['username']
password = form.cleaned_data['password1']
email = form.cleaned_data['email']
- user = User.objects.create_user(username,
- email,
- password)
+ user = User.objects.create_user(username, email, password)
user.save()
# Pre-set some values of the user's profile
@@ -313,9 +314,11 @@ def preferences(request):
form.save()
redirect = True
else:
- data = {'first_name': request.user.first_name,
- 'last_name': request.user.last_name,
- 'email': request.user.email}
+ data = {
+ 'first_name': request.user.first_name,
+ 'last_name': request.user.last_name,
+ 'email': request.user.email
+ }
form = UserPreferencesForm(initial=data, instance=request.user.userprofile)
@@ -338,9 +341,11 @@ def preferences(request):
return render(request, 'user/preferences.html', template_data)
-class UserDeactivateView(LoginRequiredMixin,
- WgerMultiplePermissionRequiredMixin,
- RedirectView):
+class UserDeactivateView(
+ LoginRequiredMixin,
+ WgerMultiplePermissionRequiredMixin,
+ RedirectView,
+):
"""
Deactivates a user
"""
@@ -371,9 +376,11 @@ class UserDeactivateView(LoginRequiredMixin,
return reverse('core:user:overview', kwargs=({'pk': pk}))
-class UserActivateView(LoginRequiredMixin,
- WgerMultiplePermissionRequiredMixin,
- RedirectView):
+class UserActivateView(
+ LoginRequiredMixin,
+ WgerMultiplePermissionRequiredMixin,
+ RedirectView,
+):
"""
Activates a previously deactivated user
"""
@@ -404,10 +411,12 @@ class UserActivateView(LoginRequiredMixin,
return reverse('core:user:overview', kwargs=({'pk': pk}))
-class UserEditView(WgerFormMixin,
- LoginRequiredMixin,
- WgerMultiplePermissionRequiredMixin,
- UpdateView):
+class UserEditView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ WgerMultiplePermissionRequiredMixin,
+ UpdateView,
+):
"""
View to update the personal information of an user by an admin
"""
@@ -509,9 +518,13 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
workouts = Workout.objects.filter(user=self.object).all()
for workout in workouts:
logs = WorkoutLog.objects.filter(workout=workout)
- out.append({'workout': workout,
- 'logs': logs.dates('date', 'day').count(),
- 'last_log': logs.last()})
+ out.append(
+ {
+ 'workout': workout,
+ 'logs': logs.dates('date', 'day').count(),
+ 'last_log': logs.last()
+ }
+ )
context['workouts'] = out
context['weight_entries'] = WeightEntry.objects.filter(user=self.object)\
.order_by('-date')[:5]
@@ -534,19 +547,17 @@ class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
Overview of all users in the instance
"""
model = User
- permission_required = ('gym.manage_gyms',)
+ permission_required = ('gym.manage_gyms', )
template_name = 'user/list.html'
def get_queryset(self):
"""
Return a list with the users, not really a queryset.
"""
- out = {'admins': [],
- 'members': []}
+ out = {'admins': [], 'members': []}
for u in User.objects.select_related('usercache', 'userprofile__gym').all():
- out['members'].append({'obj': u,
- 'last_log': u.usercache.last_activity})
+ out['members'].append({'obj': u, 'last_log': u.usercache.last_activity})
return out
@@ -556,12 +567,16 @@ class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
"""
context = super(UserListView, self).get_context_data(**kwargs)
context['show_gym'] = True
- context['user_table'] = {'keys': [_('ID'),
- _('Username'),
- _('Name'),
- _('Last activity'),
- _('Gym')],
- 'users': context['object_list']['members']}
+ context['user_table'] = {
+ 'keys': [
+ _('ID'),
+ _('Username'),
+ _('Name'),
+ _('Last activity'),
+ _('Gym'),
+ ],
+ 'users': context['object_list']['members']
+ }
return context
@@ -580,8 +595,7 @@ class WgerPasswordChangeView(PasswordChangeView):
Column('new_password1', css_class='form-group col-6 mb-0'),
Column('new_password2', css_class='form-group col-6 mb-0'),
css_class='form-row'
- ),
- ButtonHolder(Submit('submit', _("Save"), css_class='btn-success btn-block'))
+ ), ButtonHolder(Submit('submit', _("Save"), css_class='btn-success btn-block'))
)
return form
diff --git a/wger/core/views/weight_units.py b/wger/core/views/weight_units.py
index 94eb4f2bc..1942e4dc2 100644
--- a/wger/core/views/weight_units.py
+++ b/wger/core/views/weight_units.py
@@ -20,29 +20,28 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http import HttpResponseForbidden
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.core.models import WeightUnit
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/exercises/__init__.py b/wger/exercises/__init__.py
index 1857b73d9..c0cf77a01 100644
--- a/wger/exercises/__init__.py
+++ b/wger/exercises/__init__.py
@@ -15,10 +15,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.exercises.apps.ExerciseConfig'
diff --git a/wger/exercises/admin.py b/wger/exercises/admin.py
index e86b9f238..512967f86 100644
--- a/wger/exercises/admin.py
+++ b/wger/exercises/admin.py
@@ -21,7 +21,7 @@ from wger.exercises.models import (
Exercise,
ExerciseCategory,
ExerciseComment,
- Muscle
+ Muscle,
)
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 05234b539..31b412434 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -25,7 +25,7 @@ from wger.exercises.models import (
ExerciseCategory,
ExerciseComment,
ExerciseImage,
- Muscle
+ Muscle,
)
@@ -33,73 +33,88 @@ class ExerciseBaseSerializer(serializers.ModelSerializer):
"""
Exercise serializer
"""
+
class Meta:
model = ExerciseBase
- fields = ['id',
- 'uuid',
- 'category',
- 'muscles',
- 'muscles_secondary',
- 'equipment',
- 'creation_date']
+ fields = [
+ 'id',
+ 'uuid',
+ 'category',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment',
+ 'creation_date',
+ ]
class EquipmentSerializer(serializers.ModelSerializer):
"""
Equipment serializer
"""
+
class Meta:
model = Equipment
- fields = ['id',
- 'name']
+ fields = [
+ 'id',
+ 'name',
+ ]
class ExerciseImageSerializer(serializers.ModelSerializer):
"""
ExerciseImage serializer
"""
+
class Meta:
model = ExerciseImage
- fields = ['id',
- 'uuid',
- 'exercise_base',
- 'image',
- 'is_main',
- 'status']
+ fields = [
+ 'id',
+ 'uuid',
+ 'exercise_base',
+ 'image',
+ 'is_main',
+ 'status',
+ ]
class ExerciseCommentSerializer(serializers.ModelSerializer):
"""
ExerciseComment serializer
"""
+
class Meta:
model = ExerciseComment
- fields = ['id',
- 'exercise',
- 'comment']
+ fields = [
+ 'id',
+ 'exercise',
+ 'comment',
+ ]
class ExerciseCategorySerializer(serializers.ModelSerializer):
"""
ExerciseCategory serializer
"""
+
class Meta:
model = ExerciseCategory
- fields = ['id',
- 'name']
+ fields = ['id', 'name']
class MuscleSerializer(serializers.ModelSerializer):
"""
Muscle serializer
"""
+
class Meta:
model = Muscle
- fields = ['id',
- 'name',
- 'is_front',
- 'image_url_main',
- 'image_url_secondary']
+ fields = [
+ 'id',
+ 'name',
+ 'is_front',
+ 'image_url_main',
+ 'image_url_secondary',
+ ]
class ExerciseSerializer(serializers.ModelSerializer):
@@ -117,21 +132,23 @@ class ExerciseSerializer(serializers.ModelSerializer):
class Meta:
model = Exercise
- fields = ("id",
- "uuid",
- "name",
- "exercise_base",
- "status",
- "description",
- "creation_date",
- "category",
- "muscles",
- "muscles_secondary",
- "equipment",
- "language",
- "license",
- "license_author",
- "variations")
+ fields = (
+ "id",
+ "uuid",
+ "name",
+ "exercise_base",
+ "status",
+ "description",
+ "creation_date",
+ "category",
+ "muscles",
+ "muscles_secondary",
+ "equipment",
+ "language",
+ "license",
+ "license_author",
+ "variations",
+ )
class ExerciseInfoSerializer(serializers.ModelSerializer):
@@ -150,18 +167,20 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
class Meta:
model = Exercise
depth = 1
- fields = ["id",
- "name",
- "uuid",
- "description",
- "creation_date",
- "category",
- "muscles",
- "muscles_secondary",
- "equipment",
- "language",
- "license",
- "license_author",
- "images",
- "comments",
- "variations"]
+ fields = [
+ "id",
+ "name",
+ "uuid",
+ "description",
+ "creation_date",
+ "category",
+ "muscles",
+ "muscles_secondary",
+ "equipment",
+ "language",
+ "license",
+ "license_author",
+ "images",
+ "comments",
+ "variations",
+ ]
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 2d88a028f..4274e72fd 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -27,7 +27,7 @@ from easy_thumbnails.files import get_thumbnailer
from rest_framework import viewsets
from rest_framework.decorators import (
action,
- api_view
+ api_view,
)
from rest_framework.permissions import IsAuthenticatedOrReadOnly
from rest_framework.response import Response
@@ -42,7 +42,7 @@ from wger.exercises.api.serializers import (
ExerciseImageSerializer,
ExerciseInfoSerializer,
ExerciseSerializer,
- MuscleSerializer
+ MuscleSerializer,
)
from wger.exercises.models import (
Equipment,
@@ -50,15 +50,14 @@ from wger.exercises.models import (
ExerciseCategory,
ExerciseComment,
ExerciseImage,
- Muscle
+ Muscle,
)
from wger.utils.language import (
load_item_languages,
- load_language
+ load_language,
)
from wger.utils.permissions import CreateOnlyPermission
-
logger = logging.getLogger(__name__)
@@ -71,10 +70,12 @@ class ExerciseBaseViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = ExerciseBaseSerializer
permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
ordering_fields = '__all__'
- filterset_fields = ('category',
- 'muscles',
- 'muscles_secondary',
- 'equipment')
+ filterset_fields = (
+ 'category',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment',
+ )
class ExerciseViewSet(viewsets.ReadOnlyModelViewSet):
@@ -86,13 +87,15 @@ class ExerciseViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = ExerciseSerializer
permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
ordering_fields = '__all__'
- filterset_fields = ('uuid',
- 'creation_date',
- 'exercise_base',
- 'description',
- 'language',
- 'status',
- 'name')
+ filterset_fields = (
+ 'uuid',
+ 'creation_date',
+ 'exercise_base',
+ 'description',
+ 'language',
+ 'status',
+ 'name',
+ )
def perform_create(self, serializer):
"""
@@ -161,13 +164,14 @@ def search(request):
json_response = {}
if q:
- languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES,
- language_code=request.GET.get('language', None))
- exercises = (Exercise.objects.filter(name__icontains=q)
- .filter(language__in=languages)
- .filter(status=Exercise.STATUS_ACCEPTED)
- .order_by('exercise_base__category__name', 'name')
- .distinct())
+ languages = load_item_languages(
+ LanguageConfig.SHOW_ITEM_EXERCISES, language_code=request.GET.get('language', None)
+ )
+ exercises = (
+ Exercise.objects.filter(name__icontains=q).filter(language__in=languages).filter(
+ status=Exercise.STATUS_ACCEPTED
+ ).order_by('exercise_base__category__name', 'name').distinct()
+ )
for exercise in exercises:
if exercise.main_image:
@@ -204,13 +208,15 @@ class ExerciseInfoViewset(viewsets.ReadOnlyModelViewSet):
queryset = Exercise.objects.accepted()
serializer_class = ExerciseInfoSerializer
ordering_fields = '__all__'
- filterset_fields = ('creation_date',
- 'description',
- 'language',
- 'name',
- 'exercise_base',
- 'license',
- 'license_author')
+ filterset_fields = (
+ 'creation_date',
+ 'description',
+ 'language',
+ 'name',
+ 'exercise_base',
+ 'license',
+ 'license_author',
+ )
class EquipmentViewSet(viewsets.ReadOnlyModelViewSet):
@@ -220,7 +226,7 @@ class EquipmentViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Equipment.objects.all()
serializer_class = EquipmentSerializer
ordering_fields = '__all__'
- filterset_fields = ('name',)
+ filterset_fields = ('name', )
class ExerciseCategoryViewSet(viewsets.ReadOnlyModelViewSet):
@@ -230,7 +236,7 @@ class ExerciseCategoryViewSet(viewsets.ReadOnlyModelViewSet):
queryset = ExerciseCategory.objects.all()
serializer_class = ExerciseCategorySerializer
ordering_fields = '__all__'
- filterset_fields = ('name',)
+ filterset_fields = ('name', )
class ExerciseImageViewSet(viewsets.ModelViewSet):
@@ -241,11 +247,13 @@ class ExerciseImageViewSet(viewsets.ModelViewSet):
serializer_class = ExerciseImageSerializer
permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
ordering_fields = '__all__'
- filterset_fields = ('is_main',
- 'status',
- 'exercise_base',
- 'license',
- 'license_author')
+ filterset_fields = (
+ 'is_main',
+ 'status',
+ 'exercise_base',
+ 'license',
+ 'license_author',
+ )
@action(detail=True)
def thumbnails(self, request, pk):
@@ -283,8 +291,7 @@ class ExerciseCommentViewSet(viewsets.ReadOnlyModelViewSet):
"""
serializer_class = ExerciseCommentSerializer
ordering_fields = '__all__'
- filterset_fields = ('comment',
- 'exercise')
+ filterset_fields = ('comment', 'exercise')
def get_queryset(self):
"""Filter by language for exercise comments"""
@@ -303,5 +310,4 @@ class MuscleViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Muscle.objects.all()
serializer_class = MuscleSerializer
ordering_fields = '__all__'
- filterset_fields = ('name',
- 'is_front')
+ filterset_fields = ('name', 'is_front')
diff --git a/wger/exercises/forms.py b/wger/exercises/forms.py
index 180847eea..adc29ae4b 100644
--- a/wger/exercises/forms.py
+++ b/wger/exercises/forms.py
@@ -20,20 +20,24 @@ from django import forms
# wger
from wger.exercises.models import (
ExerciseComment,
- ExerciseImage
+ ExerciseImage,
)
class ExerciseImageForm(forms.ModelForm):
+
class Meta:
model = ExerciseImage
- fields = ('image',
- 'is_main',
- 'license',
- 'license_author')
+ fields = (
+ 'image',
+ 'is_main',
+ 'license',
+ 'license_author',
+ )
class CommentForm(forms.ModelForm):
+
class Meta:
model = ExerciseComment
- exclude = ('exercise',)
+ exclude = ('exercise', )
diff --git a/wger/exercises/management/commands/download-exercise-images.py b/wger/exercises/management/commands/download-exercise-images.py
index c7da9b7b0..96395c073 100644
--- a/wger/exercises/management/commands/download-exercise-images.py
+++ b/wger/exercises/management/commands/download-exercise-images.py
@@ -21,13 +21,13 @@ import os
from django.conf import settings
from django.core.exceptions import (
ImproperlyConfigured,
- ValidationError
+ ValidationError,
)
from django.core.files import File
from django.core.files.temp import NamedTemporaryFile
from django.core.management.base import (
BaseCommand,
- CommandError
+ CommandError,
)
from django.core.validators import URLValidator
@@ -39,10 +39,9 @@ from requests.utils import default_user_agent
from wger import get_version
from wger.exercises.models import (
ExerciseBase,
- ExerciseImage
+ ExerciseImage,
)
-
IMAGE_API = "{0}/api/v2/exerciseimage/?status=2"
@@ -54,20 +53,24 @@ class Command(BaseCommand):
be modified via the GUI.
"""
- help = ('Download exercise images from wger.de and update the local database\n'
- '\n'
- 'ATTENTION: The script will download the images from the server and add them\n'
- ' to your local exercises. The exercises are identified by\n'
- ' their UUID field, if you manually edited or changed it\n'
- ' the script will not be able to match them.')
+ help = (
+ 'Download exercise images from wger.de and update the local database\n'
+ '\n'
+ 'ATTENTION: The script will download the images from the server and add them\n'
+ ' to your local exercises. The exercises are identified by\n'
+ ' their UUID field, if you manually edited or changed it\n'
+ ' the script will not be able to match them.'
+ )
def add_arguments(self, parser):
- parser.add_argument('--remote-url',
- action='store',
- dest='remote_url',
- default='https://wger.de',
- help='Remote URL to fetch the exercises from (default: '
- 'https://wger.de)')
+ parser.add_argument(
+ '--remote-url',
+ action='store',
+ dest='remote_url',
+ default='https://wger.de',
+ help='Remote URL to fetch the exercises from (default: '
+ 'https://wger.de)'
+ )
def handle(self, **options):
diff --git a/wger/exercises/management/commands/redo-capitalize-names.py b/wger/exercises/management/commands/redo-capitalize-names.py
index f3f0369e1..6dd83467f 100644
--- a/wger/exercises/management/commands/redo-capitalize-names.py
+++ b/wger/exercises/management/commands/redo-capitalize-names.py
@@ -37,8 +37,10 @@ class Command(BaseCommand):
exercises = Exercise.objects.all()
for exercise in exercises:
if options['verbosity'] > 1:
- self.stdout.write('#{} {} -> {}'.format(exercise.id,
- exercise.name,
- smart_capitalize(exercise.name_original)))
+ self.stdout.write(
+ '#{} {} -> {}'.format(
+ exercise.id, exercise.name, smart_capitalize(exercise.name_original)
+ )
+ )
exercise.name = smart_capitalize(exercise.name_original)
exercise.save()
diff --git a/wger/exercises/migrations/0001_initial.py b/wger/exercises/migrations/0001_initial.py
index 4c4da095b..74429ad4a 100644
--- a/wger/exercises/migrations/0001_initial.py
+++ b/wger/exercises/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
import django.core.validators
import wger.exercises.models
@@ -15,114 +15,255 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Equipment',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('name', models.CharField(max_length=50, verbose_name='Name')),
],
options={
'ordering': ['name'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Exercise',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('license_author', models.CharField(help_text='If you are not the author, enter the name or source here. This is needed for some licenses e.g. the CC-BY-SA.', max_length=50, null=True, verbose_name='Author', blank=True)),
- ('status', models.CharField(default=b'1', max_length=2, editable=False, choices=[(b'1', 'Pending'), (b'2', 'Accepted'), (b'3', 'Declined')])),
- ('description', models.TextField(max_length=2000, verbose_name='Description', validators=[django.core.validators.MinLengthValidator(40)])),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'license_author',
+ models.CharField(
+ help_text=
+ 'If you are not the author, enter the name or source here. This is needed for some licenses e.g. the CC-BY-SA.',
+ max_length=50,
+ null=True,
+ verbose_name='Author',
+ blank=True
+ )
+ ),
+ (
+ 'status',
+ models.CharField(
+ default=b'1',
+ max_length=2,
+ editable=False,
+ choices=[(b'1', 'Pending'), (b'2', 'Accepted'), (b'3', 'Declined')]
+ )
+ ),
+ (
+ 'description',
+ models.TextField(
+ max_length=2000,
+ verbose_name='Description',
+ validators=[django.core.validators.MinLengthValidator(40)]
+ )
+ ),
('name', models.CharField(max_length=200, verbose_name='Name')),
- ('creation_date', models.DateField(auto_now_add=True, verbose_name='Date', null=True)),
+ (
+ 'creation_date',
+ models.DateField(auto_now_add=True, verbose_name='Date', null=True)
+ ),
],
options={
'ordering': ['name'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='ExerciseCategory',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('name', models.CharField(max_length=100, verbose_name='Name')),
],
options={
'ordering': ['name'],
'verbose_name_plural': 'Exercise Categories',
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='ExerciseComment',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('comment', models.CharField(help_text='A comment about how to correctly do this exercise.', max_length=200, verbose_name='Comment')),
- ('exercise', models.ForeignKey(editable=False, to='exercises.Exercise', verbose_name='Exercise', on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'comment',
+ models.CharField(
+ help_text='A comment about how to correctly do this exercise.',
+ max_length=200,
+ verbose_name='Comment'
+ )
+ ),
+ (
+ 'exercise',
+ models.ForeignKey(
+ editable=False,
+ to='exercises.Exercise',
+ verbose_name='Exercise',
+ on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='ExerciseImage',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('license_author', models.CharField(help_text='If you are not the author, enter the name or source here. This is needed for some licenses e.g. the CC-BY-SA.', max_length=50, null=True, verbose_name='Author', blank=True)),
- ('status', models.CharField(default=b'1', max_length=2, editable=False, choices=[(b'1', 'Pending'), (b'2', 'Accepted'), (b'3', 'Declined')])),
- ('image', models.ImageField(help_text='Only PNG and JPEG formats are supported', upload_to=wger.exercises.models.exercise_image_upload_dir, verbose_name='Image')),
- ('is_main', models.BooleanField(default=False, help_text='Tick the box if you want to set this image as the main one for the exercise (will be shown e.g. in the search). The first image is automatically marked by the system.', verbose_name='Is main picture')),
- ('exercise', models.ForeignKey(verbose_name='Exercise', to='exercises.Exercise', on_delete=models.CASCADE)),
- ('license', models.ForeignKey(default=2, verbose_name='License', to='core.License', on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'license_author',
+ models.CharField(
+ help_text=
+ 'If you are not the author, enter the name or source here. This is needed for some licenses e.g. the CC-BY-SA.',
+ max_length=50,
+ null=True,
+ verbose_name='Author',
+ blank=True
+ )
+ ),
+ (
+ 'status',
+ models.CharField(
+ default=b'1',
+ max_length=2,
+ editable=False,
+ choices=[(b'1', 'Pending'), (b'2', 'Accepted'), (b'3', 'Declined')]
+ )
+ ),
+ (
+ 'image',
+ models.ImageField(
+ help_text='Only PNG and JPEG formats are supported',
+ upload_to=wger.exercises.models.exercise_image_upload_dir,
+ verbose_name='Image'
+ )
+ ),
+ (
+ 'is_main',
+ models.BooleanField(
+ default=False,
+ help_text=
+ 'Tick the box if you want to set this image as the main one for the exercise (will be shown e.g. in the search). The first image is automatically marked by the system.',
+ verbose_name='Is main picture'
+ )
+ ),
+ (
+ 'exercise',
+ models.ForeignKey(
+ verbose_name='Exercise', to='exercises.Exercise', on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'license',
+ models.ForeignKey(
+ default=2,
+ verbose_name='License',
+ to='core.License',
+ on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['-is_main', 'id'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Muscle',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('name', models.CharField(help_text='In latin, e.g. "Pectoralis major"', max_length=50, verbose_name='Name')),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'name',
+ models.CharField(
+ help_text='In latin, e.g. "Pectoralis major"',
+ max_length=50,
+ verbose_name='Name'
+ )
+ ),
('is_front', models.BooleanField(default=1)),
],
options={
'ordering': ['name'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.AddField(
model_name='exercise',
name='category',
- field=models.ForeignKey(verbose_name='Category', to='exercises.ExerciseCategory', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Category', to='exercises.ExerciseCategory', on_delete=models.CASCADE
+ ),
preserve_default=True,
),
migrations.AddField(
model_name='exercise',
name='equipment',
- field=models.ManyToManyField(to='exercises.Equipment', null=True, verbose_name='Equipment', blank=True),
+ field=models.ManyToManyField(
+ to='exercises.Equipment', null=True, verbose_name='Equipment', blank=True
+ ),
preserve_default=True,
),
migrations.AddField(
model_name='exercise',
name='language',
- field=models.ForeignKey(verbose_name='Language', to='core.Language', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Language', to='core.Language', on_delete=models.CASCADE
+ ),
preserve_default=True,
),
migrations.AddField(
model_name='exercise',
name='license',
- field=models.ForeignKey(default=2, verbose_name='License', to='core.License', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ default=2, verbose_name='License', to='core.License', on_delete=models.CASCADE
+ ),
preserve_default=True,
),
migrations.AddField(
model_name='exercise',
name='muscles',
- field=models.ManyToManyField(to='exercises.Muscle', null=True, verbose_name='Primary muscles', blank=True),
+ field=models.ManyToManyField(
+ to='exercises.Muscle', null=True, verbose_name='Primary muscles', blank=True
+ ),
preserve_default=True,
),
migrations.AddField(
model_name='exercise',
name='muscles_secondary',
- field=models.ManyToManyField(related_name='secondary_muscles', null=True, verbose_name='Secondary muscles', to='exercises.Muscle', blank=True),
+ field=models.ManyToManyField(
+ related_name='secondary_muscles',
+ null=True,
+ verbose_name='Secondary muscles',
+ to='exercises.Muscle',
+ blank=True
+ ),
preserve_default=True,
),
]
diff --git a/wger/exercises/migrations/0002_auto_20150307_1841.py b/wger/exercises/migrations/0002_auto_20150307_1841.py
index aea75c7fa..96ef2a283 100644
--- a/wger/exercises/migrations/0002_auto_20150307_1841.py
+++ b/wger/exercises/migrations/0002_auto_20150307_1841.py
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
import uuid
+
def generate_uuids(apps, schema_editor):
"""
Generate new UUIDs for each exercise
@@ -26,7 +27,9 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='exercise',
name='uuid',
- field=models.CharField(editable=False, max_length=36, verbose_name='UUID', default=uuid.uuid4),
+ field=models.CharField(
+ editable=False, max_length=36, verbose_name='UUID', default=uuid.uuid4
+ ),
preserve_default=True,
),
migrations.RunPython(generate_uuids),
diff --git a/wger/exercises/migrations/0003_auto_20160921_2000.py b/wger/exercises/migrations/0003_auto_20160921_2000.py
index 699706b6a..9022a5229 100644
--- a/wger/exercises/migrations/0003_auto_20160921_2000.py
+++ b/wger/exercises/migrations/0003_auto_20160921_2000.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.9.9 on 2016-09-21 18:00
from django.db import migrations, models
@@ -21,6 +21,7 @@ def capitalize_name(apps, schema_editor):
The algorithm is copied here as it was implemented on the day the migration
was written.
"""
+
def capitalize(input):
out = []
for word in input.split(' '):
@@ -35,6 +36,7 @@ def capitalize_name(apps, schema_editor):
exercise.name = capitalize(exercise.name_original)
exercise.save()
+
class Migration(migrations.Migration):
dependencies = [
diff --git a/wger/exercises/migrations/0004_auto_20170404_0114.py b/wger/exercises/migrations/0004_auto_20170404_0114.py
index e2174c4dc..75f2c63ab 100644
--- a/wger/exercises/migrations/0004_auto_20170404_0114.py
+++ b/wger/exercises/migrations/0004_auto_20170404_0114.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.9.12 on 2017-04-04 01:14
from django.db import migrations, models
import uuid
@@ -15,22 +15,36 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='exercise',
name='equipment',
- field=models.ManyToManyField(blank=True, to='exercises.Equipment', verbose_name='Equipment'),
+ field=models.ManyToManyField(
+ blank=True, to='exercises.Equipment', verbose_name='Equipment'
+ ),
),
migrations.AlterField(
model_name='exercise',
name='muscles',
- field=models.ManyToManyField(blank=True, to='exercises.Muscle', verbose_name='Primary muscles'),
+ field=models.ManyToManyField(
+ blank=True, to='exercises.Muscle', verbose_name='Primary muscles'
+ ),
),
migrations.AlterField(
model_name='exercise',
name='muscles_secondary',
- field=models.ManyToManyField(blank=True, related_name='secondary_muscles', to='exercises.Muscle', verbose_name='Secondary muscles'),
+ field=models.ManyToManyField(
+ blank=True,
+ related_name='secondary_muscles',
+ to='exercises.Muscle',
+ verbose_name='Secondary muscles'
+ ),
),
migrations.AlterField(
model_name='exercise',
name='status',
- field=models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')], default='1', editable=False, max_length=2),
+ field=models.CharField(
+ choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')],
+ default='1',
+ editable=False,
+ max_length=2
+ ),
),
migrations.AlterField(
model_name='exercise',
@@ -40,11 +54,21 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='exerciseimage',
name='is_main',
- field=models.BooleanField(default=False, help_text='Tick the box if you want to set this image as the main one for the exercise (will be shown e.g. in the search). The first image is automatically marked by the system.', verbose_name='Main picture'),
+ field=models.BooleanField(
+ default=False,
+ help_text=
+ 'Tick the box if you want to set this image as the main one for the exercise (will be shown e.g. in the search). The first image is automatically marked by the system.',
+ verbose_name='Main picture'
+ ),
),
migrations.AlterField(
model_name='exerciseimage',
name='status',
- field=models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')], default='1', editable=False, max_length=2),
+ field=models.CharField(
+ choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')],
+ default='1',
+ editable=False,
+ max_length=2
+ ),
),
]
diff --git a/wger/exercises/migrations/0005_auto_20190618_1617.py b/wger/exercises/migrations/0005_auto_20190618_1617.py
index 7757a4267..d4245c269 100644
--- a/wger/exercises/migrations/0005_auto_20190618_1617.py
+++ b/wger/exercises/migrations/0005_auto_20190618_1617.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.11.21 on 2019-06-18 16:17
from django.db import migrations
@@ -13,10 +13,16 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='exercise',
- options={'base_manager_name': 'objects', 'ordering': ['name']},
+ options={
+ 'base_manager_name': 'objects',
+ 'ordering': ['name']
+ },
),
migrations.AlterModelOptions(
name='exerciseimage',
- options={'base_manager_name': 'objects', 'ordering': ['-is_main', 'id']},
+ options={
+ 'base_manager_name': 'objects',
+ 'ordering': ['-is_main', 'id']
+ },
),
]
diff --git a/wger/exercises/migrations/0006_auto_20201203_0203.py b/wger/exercises/migrations/0006_auto_20201203_0203.py
index 903f3cbf2..4ad8ab868 100644
--- a/wger/exercises/migrations/0006_auto_20201203_0203.py
+++ b/wger/exercises/migrations/0006_auto_20201203_0203.py
@@ -14,19 +14,23 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Variation',
fields=[
- ('id', models.AutoField(auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID')),
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ )
+ ),
],
),
migrations.AddField(
model_name='exercise',
name='variations',
- field=models.ForeignKey(default='',
- null=True,
- on_delete=django.db.models.deletion.CASCADE,
- to='exercises.variation',
- verbose_name='Variations'),
+ field=models.ForeignKey(
+ default='',
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.variation',
+ verbose_name='Variations'
+ ),
),
]
diff --git a/wger/exercises/migrations/0007_auto_20201203_1042.py b/wger/exercises/migrations/0007_auto_20201203_1042.py
index 8268dd1f1..fb06b53e4 100644
--- a/wger/exercises/migrations/0007_auto_20201203_1042.py
+++ b/wger/exercises/migrations/0007_auto_20201203_1042.py
@@ -2,7 +2,6 @@
from django.db import migrations
-
exercise_variation_ids = [
#
# exercises in English
@@ -115,13 +114,22 @@ exercise_variation_ids = [
[10, 12],
# Latzug
- [158, 226, 243, 244, ],
+ [
+ 158,
+ 226,
+ 243,
+ 244,
+ ],
# Rudern
[245, 59, 70, 224, 76],
# Frontdrücken
- [19, 153, 66, ],
+ [
+ 19,
+ 153,
+ 66,
+ ],
# Shrugs
[8, 137, 67],
diff --git a/wger/exercises/migrations/0008_exercisebase.py b/wger/exercises/migrations/0008_exercisebase.py
index 853365b5c..e4fd7aa84 100644
--- a/wger/exercises/migrations/0008_exercisebase.py
+++ b/wger/exercises/migrations/0008_exercisebase.py
@@ -16,36 +16,81 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='ExerciseBase',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False,
- verbose_name='ID')),
- ('license_author', models.CharField(blank=True,
- help_text='If you are not the author, enter \
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ )
+ ),
+ (
+ 'license_author',
+ models.CharField(
+ blank=True,
+ help_text='If you are not the author, enter \
the name or source here. This is \
needed for some licenses e.g. the \
CC-BY-SA.',
- max_length=50, null=True,
- verbose_name='Author')),
- ('status', models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'),
- ('3', 'Declined')],
- default='1', editable=False, max_length=2)),
- ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
- to='exercises.exercisecategory',
- verbose_name='Category')),
- ('equipment', models.ManyToManyField(blank=True, to='exercises.Equipment',
- verbose_name='Equipment')),
- ('license', models.ForeignKey(default=2,
- on_delete=django.db.models.deletion.CASCADE,
- to='core.license', verbose_name='License')),
- ('muscles', models.ManyToManyField(blank=True, to='exercises.Muscle',
- verbose_name='Primary muscles')),
- ('muscles_secondary', models.ManyToManyField(blank=True,
- related_name='secondary_muscles_base',
- to='exercises.Muscle',
- verbose_name='Secondary muscles')),
- ('variations', models.ForeignKey(null=True,
- on_delete=django.db.models.deletion.CASCADE,
- to='exercises.variation',
- verbose_name='Variations')),
+ max_length=50,
+ null=True,
+ verbose_name='Author'
+ )
+ ),
+ (
+ 'status',
+ models.CharField(
+ choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')],
+ default='1',
+ editable=False,
+ max_length=2
+ )
+ ),
+ (
+ 'category',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.exercisecategory',
+ verbose_name='Category'
+ )
+ ),
+ (
+ 'equipment',
+ models.ManyToManyField(
+ blank=True, to='exercises.Equipment', verbose_name='Equipment'
+ )
+ ),
+ (
+ 'license',
+ models.ForeignKey(
+ default=2,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='core.license',
+ verbose_name='License'
+ )
+ ),
+ (
+ 'muscles',
+ models.ManyToManyField(
+ blank=True, to='exercises.Muscle', verbose_name='Primary muscles'
+ )
+ ),
+ (
+ 'muscles_secondary',
+ models.ManyToManyField(
+ blank=True,
+ related_name='secondary_muscles_base',
+ to='exercises.Muscle',
+ verbose_name='Secondary muscles'
+ )
+ ),
+ (
+ 'variations',
+ models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.variation',
+ verbose_name='Variations'
+ )
+ ),
('uuid', models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='UUID')),
],
options={
@@ -55,15 +100,22 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='exercise',
name='exercise_base',
- field=models.ForeignKey(default=None, null=True,
- on_delete=django.db.models.deletion.CASCADE,
- related_name='exercises', to='exercises.exercisebase',
- verbose_name='ExerciseBase'),
+ field=models.ForeignKey(
+ default=None,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name='exercises',
+ to='exercises.exercisebase',
+ verbose_name='ExerciseBase'
+ ),
),
migrations.AlterField(
model_name='exerciseimage',
name='exercise',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
- to='exercises.exercisebase', verbose_name='Exercise'),
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.exercisebase',
+ verbose_name='Exercise'
+ ),
),
]
diff --git a/wger/exercises/migrations/0009_auto_20201211_0139.py b/wger/exercises/migrations/0009_auto_20201211_0139.py
index 2cbda9e85..2f5c8dca8 100644
--- a/wger/exercises/migrations/0009_auto_20201211_0139.py
+++ b/wger/exercises/migrations/0009_auto_20201211_0139.py
@@ -8,9 +8,7 @@ def copy_columns(apps, schema_editor):
ExerciseBase = apps.get_model('exercises', 'ExerciseBase')
for exercise in Exercise.objects.all():
- exercise_base = ExerciseBase.objects.create(
- category=exercise.category,
- )
+ exercise_base = ExerciseBase.objects.create(category=exercise.category, )
exercise_base.equipment.set(exercise.equipment.all())
exercise_base.muscles.set(exercise.muscles.all())
exercise_base.muscles_secondary.set(exercise.muscles_secondary.all())
diff --git a/wger/exercises/migrations/0011_auto_20201214_0033.py b/wger/exercises/migrations/0011_auto_20201214_0033.py
index b333c9bb6..79f03571b 100644
--- a/wger/exercises/migrations/0011_auto_20201214_0033.py
+++ b/wger/exercises/migrations/0011_auto_20201214_0033.py
@@ -6,368 +6,636 @@ exercise_mapping = [
# 111 c4856da3-8454-4857-8997-336d06df590f Squats
# 7 36c27886-b10b-41b6-ac60-f02ee3784041 Kniebeuge
# 608 993cf4e0-e664-4cc2-aa46-683c6fc7a74f Приседания
- {'en': 'c4856da3-8454-4857-8997-336d06df590f',
- 'de': '36c27886-b10b-41b6-ac60-f02ee3784041',
- 'ru': '993cf4e0-e664-4cc2-aa46-683c6fc7a74f'},
+ {
+ 'en': 'c4856da3-8454-4857-8997-336d06df590f',
+ 'de': '36c27886-b10b-41b6-ac60-f02ee3784041',
+ 'ru': '993cf4e0-e664-4cc2-aa46-683c6fc7a74f'
+ },
# 160 b1d6d536-7f4a-4dd3-8b76-62d7a984e115 Pistol Squat
# 358 40a0019e-eaf2-491f-a134-9fdd51121358 Einbeinige Kniebeuge (Pistol Squat)
- {'en': 'b1d6d536-7f4a-4dd3-8b76-62d7a984e115', 'de': '40a0019e-eaf2-491f-a134-9fdd51121358'},
+ {
+ 'en': 'b1d6d536-7f4a-4dd3-8b76-62d7a984e115',
+ 'de': '40a0019e-eaf2-491f-a134-9fdd51121358'
+ },
# 346 1d90f3a8-56e4-4c15-a4b4-94fc0e114e8c Bulgarian Split Squat
# 695 cf21383b-b96a-40b5-b047-b9c3ddcab963 Bulgarian Split Squat
- {'en': '1d90f3a8-56e4-4c15-a4b4-94fc0e114e8c', 'de': 'cf21383b-b96a-40b5-b047-b9c3ddcab963'},
+ {
+ 'en': '1d90f3a8-56e4-4c15-a4b4-94fc0e114e8c',
+ 'de': 'cf21383b-b96a-40b5-b047-b9c3ddcab963'
+ },
# 202 eed05679-d1cb-44a2-a17d-dd5b0097c874 Pendelay Rows
# 731 196f9a72-7518-45c4-a4f2-d3ba3e0d3b3e Pendelay Rows
- {'en': 'eed05679-d1cb-44a2-a17d-dd5b0097c874', 'de': '196f9a72-7518-45c4-a4f2-d3ba3e0d3b3e'},
+ {
+ 'en': 'eed05679-d1cb-44a2-a17d-dd5b0097c874',
+ 'de': '196f9a72-7518-45c4-a4f2-d3ba3e0d3b3e'
+ },
# 130 2966e4a2-4306-4cb5-a2dc-8951cd192555 Leg Press on Hackenschmidt Machine
# 402 634dcf89-c346-4af8-8b09-61f238798877 Kniebeuge an Hackenschmidtmaschine
- {'en': '2966e4a2-4306-4cb5-a2dc-8951cd192555', 'de': '634dcf89-c346-4af8-8b09-61f238798877'},
+ {
+ 'en': '2966e4a2-4306-4cb5-a2dc-8951cd192555',
+ 'de': '634dcf89-c346-4af8-8b09-61f238798877'
+ },
# 104 e7677699-5e4f-49e6-a645-e8915a203c4d Calf Raises on Hackenschmitt Machine
# 23 c7b98fb5-7723-471a-92a1-7b4e892a5468 Wadenheben an Hackenschmidt
- {'en': 'e7677699-5e4f-49e6-a645-e8915a203c4d', 'de': 'c7b98fb5-7723-471a-92a1-7b4e892a5468'},
+ {
+ 'en': 'e7677699-5e4f-49e6-a645-e8915a203c4d',
+ 'de': 'c7b98fb5-7723-471a-92a1-7b4e892a5468'
+ },
# 105 22cca8fc-cfaf-4941-b0f7-faf9f2937c52 Deadlifts
# 9 521a5e4f-6f35-43e5-9d1c-6e75c4956e96 Kreuzheben
- {'en': '22cca8fc-cfaf-4941-b0f7-faf9f2937c52', 'de': '521a5e4f-6f35-43e5-9d1c-6e75c4956e96'},
+ {
+ 'en': '22cca8fc-cfaf-4941-b0f7-faf9f2937c52',
+ 'de': '521a5e4f-6f35-43e5-9d1c-6e75c4956e96'
+ },
# 570 f4dd363c-b49c-419a-b8ae-0d8e18728d8e Sumo Squats
# 762 b399006c-bb45-451e-908e-1b279b2a42a6 Sumo Squats (Pilé Squats) Kniebeuge
- {'en': 'f4dd363c-b49c-419a-b8ae-0d8e18728d8e', 'de': 'b399006c-bb45-451e-908e-1b279b2a42a6'},
+ {
+ 'en': 'f4dd363c-b49c-419a-b8ae-0d8e18728d8e',
+ 'de': 'b399006c-bb45-451e-908e-1b279b2a42a6'
+ },
# 91 d325dd5c-6833-41c7-8eea-6b95c4871133 Crunches
# 4 0e10ac9b-ed1d-42c9-b8cc-123c22ccc5d5 Crunches
- {'en': 'd325dd5c-6833-41c7-8eea-6b95c4871133', 'de': '0e10ac9b-ed1d-42c9-b8cc-123c22ccc5d5'},
+ {
+ 'en': 'd325dd5c-6833-41c7-8eea-6b95c4871133',
+ 'de': '0e10ac9b-ed1d-42c9-b8cc-123c22ccc5d5'
+ },
# 92 8d6c13c6-256d-4137-b1c6-b0e817697639 Crunches With Cable
# 33 5c47b690-d19f-4523-9c47-47160693eefc Crunches am Seil
- {'en': '8d6c13c6-256d-4137-b1c6-b0e817697639', 'de': '5c47b690-d19f-4523-9c47-47160693eefc'},
+ {
+ 'en': '8d6c13c6-256d-4137-b1c6-b0e817697639',
+ 'de': '5c47b690-d19f-4523-9c47-47160693eefc'
+ },
# 94 6709577b-95ec-4053-a822-d5fe1f753966 Crunches on Machine
# 51 efbece79-4384-49d1-bb88-e16fcd8de5aa Crunches an Maschine
- {'en': '6709577b-95ec-4053-a822-d5fe1f753966', 'de': 'efbece79-4384-49d1-bb88-e16fcd8de5aa'},
+ {
+ 'en': '6709577b-95ec-4053-a822-d5fe1f753966',
+ 'de': 'efbece79-4384-49d1-bb88-e16fcd8de5aa'
+ },
# 307 1b8b1657-40fd-4e3b-97b7-1c79b1079f8e Bear Walk
# 718 e4b3da5b-1803-42af-a50e-ffbac3853cd0 Bear Walk
- {'en': '1b8b1657-40fd-4e3b-97b7-1c79b1079f8e', 'de': 'e4b3da5b-1803-42af-a50e-ffbac3853cd0'},
+ {
+ 'en': '1b8b1657-40fd-4e3b-97b7-1c79b1079f8e',
+ 'de': 'e4b3da5b-1803-42af-a50e-ffbac3853cd0'
+ },
# 192 5da6340b-22ec-4c1b-a443-eef2f59f92f0 Bench Press
# 15 198dcb2e-e35f-4b69-ae8b-e1124d438eae Bankdrücken LH
- {'en': '5da6340b-22ec-4c1b-a443-eef2f59f92f0', 'de': '198dcb2e-e35f-4b69-ae8b-e1124d438eae'},
+ {
+ 'en': '5da6340b-22ec-4c1b-a443-eef2f59f92f0',
+ 'de': '198dcb2e-e35f-4b69-ae8b-e1124d438eae'
+ },
# 88 03d821e7-e1ac-4026-903b-d406381cbf76 Bench Press Narrow Grip
# 38 4def60e7-ed8d-4a9d-bf76-ceb15ecf9779 Bankdrücken Eng
- {'en': '03d821e7-e1ac-4026-903b-d406381cbf76', 'de': '4def60e7-ed8d-4a9d-bf76-ceb15ecf9779'},
+ {
+ 'en': '03d821e7-e1ac-4026-903b-d406381cbf76',
+ 'de': '4def60e7-ed8d-4a9d-bf76-ceb15ecf9779'
+ },
# 97 0ec76f5d-1311-4d6d-bf79-00fa17c3061a Benchpress Dumbbells
# 77 06450bcb-03a8-4bd7-8349-ef677ee57ea3 Bankdrücken KH
- {'en': '0ec76f5d-1311-4d6d-bf79-00fa17c3061a', 'de': '06450bcb-03a8-4bd7-8349-ef677ee57ea3'},
+ {
+ 'en': '0ec76f5d-1311-4d6d-bf79-00fa17c3061a',
+ 'de': '06450bcb-03a8-4bd7-8349-ef677ee57ea3'
+ },
# 129 8c6c1544-cbf8-403c-ae12-b27b392702f8 Biceps Curl With Cable
# 3 ef487de3-f071-41bf-85a6-6e76afe9c732 Bizeps am Kabel
- {'en': '8c6c1544-cbf8-403c-ae12-b27b392702f8', 'de': 'ef487de3-f071-41bf-85a6-6e76afe9c732'},
+ {
+ 'en': '8c6c1544-cbf8-403c-ae12-b27b392702f8',
+ 'de': 'ef487de3-f071-41bf-85a6-6e76afe9c732'
+ },
# 80 38919515-ce04-4383-9c3f-5846edd0e844 Biceps Curls With SZ-bar
# 44 8277124a-9ef2-442a-9824-7ab4439a5f1f Bizeps Curls Mit ß-Stange
- {'en': '38919515-ce04-4383-9c3f-5846edd0e844', 'de': '8277124a-9ef2-442a-9824-7ab4439a5f1f'},
+ {
+ 'en': '38919515-ce04-4383-9c3f-5846edd0e844',
+ 'de': '8277124a-9ef2-442a-9824-7ab4439a5f1f'
+ },
# 74 c56078d2-ae85-4524-a467-d1e143b6df1a Biceps Curls With Barbell
# 24 2e3fa138-3894-4f61-959a-d8966804a1a3 Bizeps LH-Curls
- {'en': 'c56078d2-ae85-4524-a467-d1e143b6df1a', 'de': '2e3fa138-3894-4f61-959a-d8966804a1a3'},
+ {
+ 'en': 'c56078d2-ae85-4524-a467-d1e143b6df1a',
+ 'de': '2e3fa138-3894-4f61-959a-d8966804a1a3'
+ },
# 275 dfa090e4-77ae-40ed-86c0-4696fe93dcf1 Dumbbell Concentration Curl
# 681 ec0c53a5-15b9-4c2f-ac7c-00888db9f8ee Konzentrations-Curls
- {'en': 'dfa090e4-77ae-40ed-86c0-4696fe93dcf1', 'de': 'ec0c53a5-15b9-4c2f-ac7c-00888db9f8ee'},
+ {
+ 'en': 'dfa090e4-77ae-40ed-86c0-4696fe93dcf1',
+ 'de': 'ec0c53a5-15b9-4c2f-ac7c-00888db9f8ee'
+ },
# 86 6dcc9adb-939c-4581-9e44-d0d73753997b Hammercurls
# 46 ff454f5a-70ee-40fb-9200-5e7e42960ef0 Hammercurls
- {'en': '6dcc9adb-939c-4581-9e44-d0d73753997b', 'de': 'ff454f5a-70ee-40fb-9200-5e7e42960ef0'},
+ {
+ 'en': '6dcc9adb-939c-4581-9e44-d0d73753997b',
+ 'de': 'ff454f5a-70ee-40fb-9200-5e7e42960ef0'
+ },
# 138 5baf40e5-ea3c-4f8d-b60a-d294ee2de55b Hammercurls on Cable
# 134 06e9de49-ac1b-45c1-b289-475118932434 Hammercurls am Seil
- {'en': '5baf40e5-ea3c-4f8d-b60a-d294ee2de55b', 'de': '06e9de49-ac1b-45c1-b289-475118932434'},
+ {
+ 'en': '5baf40e5-ea3c-4f8d-b60a-d294ee2de55b',
+ 'de': '06e9de49-ac1b-45c1-b289-475118932434'
+ },
# 771 bdcae845-6726-457f-8e04-203754a78e1c Reverse Curl
# 815 7662a76a-3ea7-4b63-86d9-c0702b554090 Reverse Curls
- {'en': 'bdcae845-6726-457f-8e04-203754a78e1c', 'de': '7662a76a-3ea7-4b63-86d9-c0702b554090'},
+ {
+ 'en': 'bdcae845-6726-457f-8e04-203754a78e1c',
+ 'de': '7662a76a-3ea7-4b63-86d9-c0702b554090'
+ },
# 298 fa56d30a-7a8f-4084-aa68-46bd52f97959 Dumbbell Incline Curl
# 242 0842e81e-7b90-4d68-8e6b-e9a7c0186b54 Bizeps KH-Curls Schrägbank
- {'en': 'fa56d30a-7a8f-4084-aa68-46bd52f97959', 'de': '0842e81e-7b90-4d68-8e6b-e9a7c0186b54'},
+ {
+ 'en': 'fa56d30a-7a8f-4084-aa68-46bd52f97959',
+ 'de': '0842e81e-7b90-4d68-8e6b-e9a7c0186b54'
+ },
# 81 48a59aa8-4568-409c-8afe-f8cb99c558ea Biceps Curls With Dumbbell
# 26 8cbbffcc-1989-43de-9200-03869480398c Bizeps KH-Curls
- {'en': '48a59aa8-4568-409c-8afe-f8cb99c558ea', 'de': '8cbbffcc-1989-43de-9200-03869480398c'},
+ {
+ 'en': '48a59aa8-4568-409c-8afe-f8cb99c558ea',
+ 'de': '8cbbffcc-1989-43de-9200-03869480398c'
+ },
# 227 53ca25b3-61d9-4f72-bfdb-492b83484ff5 Arnold Shoulder Press
# 228 880bff63-6798-4ffc-a818-b2a1ccfec0f7 Arnold Press
- {'en': '53ca25b3-61d9-4f72-bfdb-492b83484ff5', 'de': '880bff63-6798-4ffc-a818-b2a1ccfec0f7'},
+ {
+ 'en': '53ca25b3-61d9-4f72-bfdb-492b83484ff5',
+ 'de': '880bff63-6798-4ffc-a818-b2a1ccfec0f7'
+ },
# 150 3721be0c-2a59-4bb9-90d3-695faaf028af Shrugs, Barbells
# 137 a63d40df-a872-44e7-87d2-9b58b67d5406 Shrugs (Schulterheben) Mit LH
- {'en': '3721be0c-2a59-4bb9-90d3-695faaf028af', 'de': 'a63d40df-a872-44e7-87d2-9b58b67d5406'},
+ {
+ 'en': '3721be0c-2a59-4bb9-90d3-695faaf028af',
+ 'de': 'a63d40df-a872-44e7-87d2-9b58b67d5406'
+ },
# 151 ee61aef0-f0c7-4a7a-882a-3b39312dfffd Shrugs, Dumbbells
# 8 6dde45fc-7fdf-4523-a039-9c373677a750 Shrugs (Schulterheben) Mit KH
- {'en': 'ee61aef0-f0c7-4a7a-882a-3b39312dfffd', 'de': '6dde45fc-7fdf-4523-a039-9c373677a750'},
+ {
+ 'en': 'ee61aef0-f0c7-4a7a-882a-3b39312dfffd',
+ 'de': '6dde45fc-7fdf-4523-a039-9c373677a750'
+ },
# 387 b229c57f-5363-41e2-add7-c2501a31de0b Wall Squat
# 707 7f3e45fa-3b17-4cdb-90d5-cb9957212cbf Wall Squat
- {'en': 'b229c57f-5363-41e2-add7-c2501a31de0b', 'de': '7f3e45fa-3b17-4cdb-90d5-cb9957212cbf'},
+ {
+ 'en': 'b229c57f-5363-41e2-add7-c2501a31de0b',
+ 'de': '7f3e45fa-3b17-4cdb-90d5-cb9957212cbf'
+ },
# 93 4bd55b0a-559a-4458-aabd-e66619b63610 Negative Crunches
# 32 f5e98b51-6c0e-4c77-94ec-158210669f6d Crunches an Negativbank
- {'en': '4bd55b0a-559a-4458-aabd-e66619b63610', 'de': 'f5e98b51-6c0e-4c77-94ec-158210669f6d'},
+ {
+ 'en': '4bd55b0a-559a-4458-aabd-e66619b63610',
+ 'de': 'f5e98b51-6c0e-4c77-94ec-158210669f6d'
+ },
# 330 6572a8e9-083c-4622-8f0c-6107a013a490 Superman
# 735 bd58585e-4bf4-46cc-ba38-717a7857e21c Superman
- {'en': '6572a8e9-083c-4622-8f0c-6107a013a490', 'de': 'bd58585e-4bf4-46cc-ba38-717a7857e21c'},
+ {
+ 'en': '6572a8e9-083c-4622-8f0c-6107a013a490',
+ 'de': 'bd58585e-4bf4-46cc-ba38-717a7857e21c'
+ },
# 238 7729ffe5-a896-4deb-80e0-f4e6163c0c09 Plank
# 417 257cdb33-ba8b-410a-9396-5132b08dc912 Unterarmstütze - Plank
- {'en': '7729ffe5-a896-4deb-80e0-f4e6163c0c09', 'de': '257cdb33-ba8b-410a-9396-5132b08dc912'},
+ {
+ 'en': '7729ffe5-a896-4deb-80e0-f4e6163c0c09',
+ 'de': '257cdb33-ba8b-410a-9396-5132b08dc912'
+ },
# 325 a36f852f-a29f-4f93-81b6-1012047ac1ee Side Plank
# 715 2c6cd166-40e1-4b68-96b7-c30b31e28b99 Side Plank
- {'en': 'a36f852f-a29f-4f93-81b6-1012047ac1ee', 'de': '2c6cd166-40e1-4b68-96b7-c30b31e28b99'},
+ {
+ 'en': 'a36f852f-a29f-4f93-81b6-1012047ac1ee',
+ 'de': '2c6cd166-40e1-4b68-96b7-c30b31e28b99'
+ },
# 116 6e862700-3d63-486c-99ae-744c68d2f753 Good Mornings
# 50 a311a463-f219-4741-b4fb-247013dc8dd8 Good Mornings
- {'en': '6e862700-3d63-486c-99ae-744c68d2f753', 'de': 'a311a463-f219-4741-b4fb-247013dc8dd8'},
+ {
+ 'en': '6e862700-3d63-486c-99ae-744c68d2f753',
+ 'de': 'a311a463-f219-4741-b4fb-247013dc8dd8'
+ },
# 326 bf9e572d-d138-43e9-a486-a5c6ad9033f8 Full Sit Outs
# 710 143cf744-ce94-458c-9c74-1aea6c64cfc7 Full Sit Outs
- {'en': 'bf9e572d-d138-43e9-a486-a5c6ad9033f8', 'de': '143cf744-ce94-458c-9c74-1aea6c64cfc7'},
+ {
+ 'en': 'bf9e572d-d138-43e9-a486-a5c6ad9033f8',
+ 'de': '143cf744-ce94-458c-9c74-1aea6c64cfc7'
+ },
# 95 fb750082-7034-4c51-b1e4-dfa0fe2dac8e Sit-ups
# 57 60f329dd-f8ab-469a-8a88-39f80275b3a7 Sit Ups
- {'en': 'fb750082-7034-4c51-b1e4-dfa0fe2dac8e', 'de': '60f329dd-f8ab-469a-8a88-39f80275b3a7'},
+ {
+ 'en': 'fb750082-7034-4c51-b1e4-dfa0fe2dac8e',
+ 'de': '60f329dd-f8ab-469a-8a88-39f80275b3a7'
+ },
# 83 aa4fcd9b-baee-41cf-b4c5-8462bc43a8be Dips Between Two Benches
# 68 011b956d-33b3-4600-9e42-2e7dcbac9fb5 Dips Zwischen 2 Bänke
- {'en': 'aa4fcd9b-baee-41cf-b4c5-8462bc43a8be', 'de': '011b956d-33b3-4600-9e42-2e7dcbac9fb5'},
+ {
+ 'en': 'aa4fcd9b-baee-41cf-b4c5-8462bc43a8be',
+ 'de': '011b956d-33b3-4600-9e42-2e7dcbac9fb5'
+ },
# 354 6335de72-146f-4f38-886d-6b8a27db62ff Burpees
# 719 5bae16b0-cefb-4fc7-be2b-e31794335c42 Burpees
- {'en': '6335de72-146f-4f38-886d-6b8a27db62ff', 'de': '5bae16b0-cefb-4fc7-be2b-e31794335c42'},
+ {
+ 'en': '6335de72-146f-4f38-886d-6b8a27db62ff',
+ 'de': '5bae16b0-cefb-4fc7-be2b-e31794335c42'
+ },
# 289 6add5973-86d0-4543-928a-6bb8b3f34efc Axe Hold
# 677 8e9d8968-323d-468c-9174-8cf11a105fad Axe Hold
- {'en': '6add5973-86d0-4543-928a-6bb8b3f34efc', 'de': '8e9d8968-323d-468c-9174-8cf11a105fad'},
+ {
+ 'en': '6add5973-86d0-4543-928a-6bb8b3f34efc',
+ 'de': '8e9d8968-323d-468c-9174-8cf11a105fad'
+ },
# 98 3c3857f8-d224-4d5a-8cc1-f4e7982d3475 Butterfly
# 30 9df24c6f-016b-4623-8878-f71c235c50fa Butterfly
- {'en': '3c3857f8-d224-4d5a-8cc1-f4e7982d3475', 'de': '9df24c6f-016b-4623-8878-f71c235c50fa'},
+ {
+ 'en': '3c3857f8-d224-4d5a-8cc1-f4e7982d3475',
+ 'de': '9df24c6f-016b-4623-8878-f71c235c50fa'
+ },
# 99 08637e04-d995-4c07-b021-a20f26b6fd97 Butterfly Narrow Grip
# 52 44b0d79a-5c5b-43df-bf62-3e67148f1c33 Butterfly Eng
- {'en': '08637e04-d995-4c07-b021-a20f26b6fd97', 'de': '44b0d79a-5c5b-43df-bf62-3e67148f1c33'},
+ {
+ 'en': '08637e04-d995-4c07-b021-a20f26b6fd97',
+ 'de': '44b0d79a-5c5b-43df-bf62-3e67148f1c33'
+ },
# 124 8715a96e-c8a2-458a-b023-4ea7d82fdab8 Butterfly Reverse
# 21 605b4a25-bc1d-4604-bd93-c85b2aaf84ae Butterfly Reverse
- {'en': '8715a96e-c8a2-458a-b023-4ea7d82fdab8', 'de': '605b4a25-bc1d-4604-bd93-c85b2aaf84ae'},
+ {
+ 'en': '8715a96e-c8a2-458a-b023-4ea7d82fdab8',
+ 'de': '605b4a25-bc1d-4604-bd93-c85b2aaf84ae'
+ },
# 394 659f3fb9-2370-42fb-9c29-9aaf65c7a7de Facepull
# 415 237c8770-4c1f-433d-b8b4-b1ae5c69bbc5 Face Pulls
- {'en': '659f3fb9-2370-42fb-9c29-9aaf65c7a7de', 'de': '237c8770-4c1f-433d-b8b4-b1ae5c69bbc5'},
+ {
+ 'en': '659f3fb9-2370-42fb-9c29-9aaf65c7a7de',
+ 'de': '237c8770-4c1f-433d-b8b4-b1ae5c69bbc5'
+ },
# 281 e1881607-9418-4bcc-8c69-2301a579637e L Hold
# 753 6ae461d7-daea-4ac7-999b-826fe28263b0 L Hold
- {'en': 'e1881607-9418-4bcc-8c69-2301a579637e', 'de': '6ae461d7-daea-4ac7-999b-826fe28263b0'},
+ {
+ 'en': 'e1881607-9418-4bcc-8c69-2301a579637e',
+ 'de': '6ae461d7-daea-4ac7-999b-826fe28263b0'
+ },
# 143 b192c4eb-31c6-458e-b566-d3f38b5aa30c Long-Pulley (low Row)
# 37 91fa0487-b137-4bef-86cf-39816cd5ee48 Long-Pulley
- {'en': 'b192c4eb-31c6-458e-b566-d3f38b5aa30c', 'de': '91fa0487-b137-4bef-86cf-39816cd5ee48'},
+ {
+ 'en': 'b192c4eb-31c6-458e-b566-d3f38b5aa30c',
+ 'de': '91fa0487-b137-4bef-86cf-39816cd5ee48'
+ },
# 144 bcabc8cf-c005-4630-8853-ef4922e7fd91 Long-Pulley, Narrow
# 136 490a615c-4185-4560-88a5-020f3aa40be2 Long-Pulley (eng)
- {'en': 'bcabc8cf-c005-4630-8853-ef4922e7fd91', 'de': '490a615c-4185-4560-88a5-020f3aa40be2'},
+ {
+ 'en': 'bcabc8cf-c005-4630-8853-ef4922e7fd91',
+ 'de': '490a615c-4185-4560-88a5-020f3aa40be2'
+ },
# 103 399666e7-30a7-4b86-833d-4422e4c72b61 Sitting Calf Raises
# 14 47b4d57a-3bb3-4a03-a522-a0559a254730 Wadenheben Sitzend
- {'en': '399666e7-30a7-4b86-833d-4422e4c72b61', 'de': '47b4d57a-3bb3-4a03-a522-a0559a254730'},
+ {
+ 'en': '399666e7-30a7-4b86-833d-4422e4c72b61',
+ 'de': '47b4d57a-3bb3-4a03-a522-a0559a254730'
+ },
# 102 abc4c62e-27b2-4c31-8766-40f8dca84cab Standing Calf Raises
# 13 283d4ec5-1b29-41bb-997d-74c30e7a68b5 Wadenheben Stehend
- {'en': 'abc4c62e-27b2-4c31-8766-40f8dca84cab', 'de': '283d4ec5-1b29-41bb-997d-74c30e7a68b5'},
+ {
+ 'en': 'abc4c62e-27b2-4c31-8766-40f8dca84cab',
+ 'de': '283d4ec5-1b29-41bb-997d-74c30e7a68b5'
+ },
# 308 074530d6-801a-404b-b3b7-adc207be69be Calf Press Using Leg Press Machine
# 745 84afd45e-235a-41c3-8711-ea9f6d08eeb6 Wadendrücken an Beinpresse
- {'en': '074530d6-801a-404b-b3b7-adc207be69be', 'de': '84afd45e-235a-41c3-8711-ea9f6d08eeb6'},
+ {
+ 'en': '074530d6-801a-404b-b3b7-adc207be69be',
+ 'de': '84afd45e-235a-41c3-8711-ea9f6d08eeb6'
+ },
# 85 ee00d53e-4482-44aa-b780-bbc570061841 French Press (skullcrusher) Dumbbells
# 58 bdf8997a-84ce-434a-ae95-1f9fc50f43bb Frenchpress KH
- {'en': 'ee00d53e-4482-44aa-b780-bbc570061841', 'de': 'bdf8997a-84ce-434a-ae95-1f9fc50f43bb'},
+ {
+ 'en': 'ee00d53e-4482-44aa-b780-bbc570061841',
+ 'de': 'bdf8997a-84ce-434a-ae95-1f9fc50f43bb'
+ },
# 84 ee4a350b-c681-407f-a414-6ec243809ec7 French Press (skullcrusher) SZ-bar
# 25 9972e42d-43d8-43c0-b547-4638ca3e47be Frenchpress ß-Stange
- {'en': 'ee4a350b-c681-407f-a414-6ec243809ec7', 'de': '9972e42d-43d8-43c0-b547-4638ca3e47be'},
+ {
+ 'en': 'ee4a350b-c681-407f-a414-6ec243809ec7',
+ 'de': '9972e42d-43d8-43c0-b547-4638ca3e47be'
+ },
# 788 6c8e863c-f6c2-4ad0-a0e9-5e6d9e6a928b Leg Press
# 6 a27cfdd9-5299-49ab-85f5-6e4042657549 Beinpresse
- {'en': '6c8e863c-f6c2-4ad0-a0e9-5e6d9e6a928b', 'de': 'a27cfdd9-5299-49ab-85f5-6e4042657549'},
+ {
+ 'en': '6c8e863c-f6c2-4ad0-a0e9-5e6d9e6a928b',
+ 'de': 'a27cfdd9-5299-49ab-85f5-6e4042657549'
+ },
# 115 560e1a20-33e1-45db-ba5b-63f8c51af76d Leg Presses (narrow)
# 54 e7d0cc2d-e28b-479f-91d9-7eab7b686fd8 Beinpresse Eng
- {'en': '560e1a20-33e1-45db-ba5b-63f8c51af76d', 'de': 'e7d0cc2d-e28b-479f-91d9-7eab7b686fd8'},
+ {
+ 'en': '560e1a20-33e1-45db-ba5b-63f8c51af76d',
+ 'de': 'e7d0cc2d-e28b-479f-91d9-7eab7b686fd8'
+ },
# 112 587c0052-f2bc-48ca-8af9-415175308901 Dumbbell Lunges Standing
# 55 27301836-ed7f-4510-83e7-66c0b8041a44 Ausfallschritte Stehend
# 363 c38e34a7-5560-46a1-bae4-c4fce9619e55 Výpad Statický
- {'en': '587c0052-f2bc-48ca-8af9-415175308901',
- 'de': '27301836-ed7f-4510-83e7-66c0b8041a44',
- 'cs': 'c38e34a7-5560-46a1-bae4-c4fce9619e55'},
+ {
+ 'en': '587c0052-f2bc-48ca-8af9-415175308901',
+ 'de': '27301836-ed7f-4510-83e7-66c0b8041a44',
+ 'cs': 'c38e34a7-5560-46a1-bae4-c4fce9619e55'
+ },
# 113 ffd4ce7e-e14f-49d4-9dc9-dc1362631382 Dumbbell Lunges Walking
# 5 5675ae61-6597-4806-ae5c-2dda5a5ac03c Ausfallschritte im Gehen
- {'en': 'ffd4ce7e-e14f-49d4-9dc9-dc1362631382', 'de': '5675ae61-6597-4806-ae5c-2dda5a5ac03c'},
+ {
+ 'en': 'ffd4ce7e-e14f-49d4-9dc9-dc1362631382',
+ 'de': '5675ae61-6597-4806-ae5c-2dda5a5ac03c'
+ },
# 145 754391c6-39d5-4bb6-a311-68a520f6fd3a Fly With Dumbbells
# 18 c0119734-a412-4f34-91f1-cd1c1177fcb8 Fliegende KH Flachbank
- {'en': '754391c6-39d5-4bb6-a311-68a520f6fd3a', 'de': 'c0119734-a412-4f34-91f1-cd1c1177fcb8'},
+ {
+ 'en': '754391c6-39d5-4bb6-a311-68a520f6fd3a',
+ 'de': 'c0119734-a412-4f34-91f1-cd1c1177fcb8'
+ },
# 146 acf1f2df-46c4-49a3-8e6c-2979ea4204b1 Fly With Dumbbells, Decline Bench
# 73 3b34d81d-7882-46a6-bb83-40f84d3f8300 Fliegende KH Schrägbank
- {'en': 'acf1f2df-46c4-49a3-8e6c-2979ea4204b1', 'de': '3b34d81d-7882-46a6-bb83-40f84d3f8300'},
+ {
+ 'en': 'acf1f2df-46c4-49a3-8e6c-2979ea4204b1',
+ 'de': '3b34d81d-7882-46a6-bb83-40f84d3f8300'
+ },
# 409 75ec610d-216a-49fe-b395-c5fd8ee14b53 Reverse Plank
# 713 24e5637e-60eb-41f5-b964-31e2af990bfc Reverse Plank
- {'en': '75ec610d-216a-49fe-b395-c5fd8ee14b53', 'de': '24e5637e-60eb-41f5-b964-31e2af990bfc'},
+ {
+ 'en': '75ec610d-216a-49fe-b395-c5fd8ee14b53',
+ 'de': '24e5637e-60eb-41f5-b964-31e2af990bfc'
+ },
# 181 f6c4e2fa-226d-46e8-87dc-75fc8cd628bd Chin-ups
# 747 9e71d2a3-9021-4270-a7b9-0d8bd28e7394 Chin-ups
- {'en': 'f6c4e2fa-226d-46e8-87dc-75fc8cd628bd', 'de': '9e71d2a3-9021-4270-a7b9-0d8bd28e7394'},
+ {
+ 'en': 'f6c4e2fa-226d-46e8-87dc-75fc8cd628bd',
+ 'de': '9e71d2a3-9021-4270-a7b9-0d8bd28e7394'
+ },
# 346 1d90f3a8-56e4-4c15-a4b4-94fc0e114e8c Bulgarian Split Squat
# 695 cf21383b-b96a-40b5-b047-b9c3ddcab963 Bulgarian Split Squat
- {'en': '1d90f3a8-56e4-4c15-a4b4-94fc0e114e8c', 'de': 'cf21383b-b96a-40b5-b047-b9c3ddcab963'},
+ {
+ 'en': '1d90f3a8-56e4-4c15-a4b4-94fc0e114e8c',
+ 'de': 'cf21383b-b96a-40b5-b047-b9c3ddcab963'
+ },
# 781 7191e015-0c60-4376-9be0-733b9754b7f8 Dips
# 29 41b495fd-562e-4d6e-942a-60dc52d5e194 Dips
- {'en': '7191e015-0c60-4376-9be0-733b9754b7f8', 'de': '41b495fd-562e-4d6e-942a-60dc52d5e194'},
+ {
+ 'en': '7191e015-0c60-4376-9be0-733b9754b7f8',
+ 'de': '41b495fd-562e-4d6e-942a-60dc52d5e194'
+ },
# 279 88568115-5e88-4afc-b005-e2f7d453ac13 Tricep Dumbbell Kickback
# 232 ebe60386-bf33-4f50-87a6-d44c5f454158 Kick-Backs
- {'en': '88568115-5e88-4afc-b005-e2f7d453ac13', 'de': 'ebe60386-bf33-4f50-87a6-d44c5f454158'},
+ {
+ 'en': '88568115-5e88-4afc-b005-e2f7d453ac13',
+ 'de': 'ebe60386-bf33-4f50-87a6-d44c5f454158'
+ },
# 128 f57a0c60-7d37-4eb3-a94e-1a90292e8c02 Hyperextensions
# 60 913d71cc-ba7a-4902-bfa8-3c5203129d72 Hyperextensions
- {'en': 'f57a0c60-7d37-4eb3-a94e-1a90292e8c02', 'de': '913d71cc-ba7a-4902-bfa8-3c5203129d72'},
+ {
+ 'en': 'f57a0c60-7d37-4eb3-a94e-1a90292e8c02',
+ 'de': '913d71cc-ba7a-4902-bfa8-3c5203129d72'
+ },
# 195 9d756e84-6b77-4f17-b21d-7d266d6a8bd2 Push Ups
# 172 35871103-6cfe-493f-afe1-8401f88fed84 Liegestütz
- {'en': '9d756e84-6b77-4f17-b21d-7d266d6a8bd2', 'de': '35871103-6cfe-493f-afe1-8401f88fed84'},
+ {
+ 'en': '9d756e84-6b77-4f17-b21d-7d266d6a8bd2',
+ 'de': '35871103-6cfe-493f-afe1-8401f88fed84'
+ },
# 260 36ef5f12-6f77-4754-a926-39915e4b57a5 Decline Pushups
# 721 e386cd27-aef6-4565-88ad-639b0ea04e3a Negativ Pushups
- {'en': '36ef5f12-6f77-4754-a926-39915e4b57a5', 'de': 'e386cd27-aef6-4565-88ad-639b0ea04e3a'},
+ {
+ 'en': '36ef5f12-6f77-4754-a926-39915e4b57a5',
+ 'de': 'e386cd27-aef6-4565-88ad-639b0ea04e3a'
+ },
# 139 88bbdbde-c9b6-45a1-aee9-efc6f02cfab3 Triceps Machine
# 27 ca03dd79-4a92-47ef-a461-e67ccc406f82 Trizepsmaschine
- {'en': '88bbdbde-c9b6-45a1-aee9-efc6f02cfab3', 'de': 'ca03dd79-4a92-47ef-a461-e67ccc406f82'},
+ {
+ 'en': '88bbdbde-c9b6-45a1-aee9-efc6f02cfab3',
+ 'de': 'ca03dd79-4a92-47ef-a461-e67ccc406f82'
+ },
# 338 20b88059-3958-4184-9134-b48656ad868d Isometric Wipers
# 724 666d1c77-d74b-411c-be3e-1e60a02c548d Isometric Wipers
- {'en': '20b88059-3958-4184-9134-b48656ad868d', 'de': '666d1c77-d74b-411c-be3e-1e60a02c548d'},
+ {
+ 'en': '20b88059-3958-4184-9134-b48656ad868d',
+ 'de': '666d1c77-d74b-411c-be3e-1e60a02c548d'
+ },
# 90 20a76bd0-1e56-4a4e-bd79-0ab118552bde Triceps Extensions on Cable With Bar
# 63 60aab5bf-ff7a-4e50-9e92-1f4813c3da75 Trizeps Seildrücken Mit Stange
- {'en': '20a76bd0-1e56-4a4e-bd79-0ab118552bde', 'de': '60aab5bf-ff7a-4e50-9e92-1f4813c3da75'},
+ {
+ 'en': '20a76bd0-1e56-4a4e-bd79-0ab118552bde',
+ 'de': '60aab5bf-ff7a-4e50-9e92-1f4813c3da75'
+ },
# 89 f1b5e525-6232-4d60-a243-9b2cd6c55298 Triceps Extensions on Cable
# 1 b83e3d85-a53d-4939-a61c-7baa2e94d358 Trizeps Seildrücken
- {'en': 'f1b5e525-6232-4d60-a243-9b2cd6c55298', 'de': 'b83e3d85-a53d-4939-a61c-7baa2e94d358'},
+ {
+ 'en': 'f1b5e525-6232-4d60-a243-9b2cd6c55298',
+ 'de': 'b83e3d85-a53d-4939-a61c-7baa2e94d358'
+ },
# 270 625aefd5-7ba2-40e9-bdc3-7d3ab1bcf3b8 Pause Bench
# 725 5009eedc-554f-43ef-852e-77ba45a7297c Pause Bench
- {'en': '625aefd5-7ba2-40e9-bdc3-7d3ab1bcf3b8', 'de': '5009eedc-554f-43ef-852e-77ba45a7297c'},
+ {
+ 'en': '625aefd5-7ba2-40e9-bdc3-7d3ab1bcf3b8',
+ 'de': '5009eedc-554f-43ef-852e-77ba45a7297c'
+ },
# 149 79a3a34c-262f-4cae-b827-b5a85b11b860 Lateral Raises on Cable, One Armed
# 132 382731d2-ae07-4a3c-a055-09dadd5f12e0 Seitheben am Kabel, Einarmig
- {'en': '79a3a34c-262f-4cae-b827-b5a85b11b860', 'de': '382731d2-ae07-4a3c-a055-09dadd5f12e0'},
+ {
+ 'en': '79a3a34c-262f-4cae-b827-b5a85b11b860',
+ 'de': '382731d2-ae07-4a3c-a055-09dadd5f12e0'
+ },
# 148 5345766a-c092-457a-aa21-8ee6ffa855d4 Lateral Raises
# 20 72e78f4d-65f7-4ddd-9247-cdc1e133fa80 Seitheben KH
- {'en': '5345766a-c092-457a-aa21-8ee6ffa855d4', 'de': '72e78f4d-65f7-4ddd-9247-cdc1e133fa80'},
+ {
+ 'en': '5345766a-c092-457a-aa21-8ee6ffa855d4',
+ 'de': '72e78f4d-65f7-4ddd-9247-cdc1e133fa80'
+ },
# 191 f2e563d2-507b-4586-88c8-77652cd19648 Front Squats
# 390 d23d1980-3a50-4d3f-8123-90d7e55c7804 Front Kniebeuge
- {'en': 'f2e563d2-507b-4586-88c8-77652cd19648', 'de': 'd23d1980-3a50-4d3f-8123-90d7e55c7804'},
+ {
+ 'en': 'f2e563d2-507b-4586-88c8-77652cd19648',
+ 'de': 'd23d1980-3a50-4d3f-8123-90d7e55c7804'
+ },
# 229 89e6d2ea-9a17-4a77-9a52-d5bcf39d57fd Military Press
# 153 47c33837-be38-4ebb-b19a-84c280f5f2b0 Frontdrücken LH
- {'en': '89e6d2ea-9a17-4a77-9a52-d5bcf39d57fd', 'de': '47c33837-be38-4ebb-b19a-84c280f5f2b0'},
+ {
+ 'en': '89e6d2ea-9a17-4a77-9a52-d5bcf39d57fd',
+ 'de': '47c33837-be38-4ebb-b19a-84c280f5f2b0'
+ },
# 854 37097633-de80-4271-9b7c-291f359e0ef4 Hip Thrust
# 230 981ef1f0-414a-478b-bc1b-9c6afa45bc77 Beckenheben
- {'en': '37097633-de80-4271-9b7c-291f359e0ef4', 'de': '981ef1f0-414a-478b-bc1b-9c6afa45bc77'},
+ {
+ 'en': '37097633-de80-4271-9b7c-291f359e0ef4',
+ 'de': '981ef1f0-414a-478b-bc1b-9c6afa45bc77'
+ },
# 177 a24a0521-6391-419c-bd89-795bba0eb5ee Leg Extension
# 133 da7fccca-941e-457a-a2eb-d0c56d419938 Beinbeuger Sitzend
- {'en': 'a24a0521-6391-419c-bd89-795bba0eb5ee', 'de': 'da7fccca-941e-457a-a2eb-d0c56d419938'},
+ {
+ 'en': 'a24a0521-6391-419c-bd89-795bba0eb5ee',
+ 'de': 'da7fccca-941e-457a-a2eb-d0c56d419938'
+ },
# 109 f82c579e-c069-4dc7-8e36-a3266dfd8e4a Bent Over Rowing
# 59 126d719a-4b59-4458-b182-d578cdcfee1a Rudern Vorgebeugt LH
- {'en': 'f82c579e-c069-4dc7-8e36-a3266dfd8e4a', 'de': '126d719a-4b59-4458-b182-d578cdcfee1a'},
+ {
+ 'en': 'f82c579e-c069-4dc7-8e36-a3266dfd8e4a',
+ 'de': '126d719a-4b59-4458-b182-d578cdcfee1a'
+ },
# 108 57747eb3-411a-4efd-8842-a45e562320ee Rowing, Seated
# 245 788ef0a5-492f-48a7-87dc-b15dda185bb8 Rudern Eng Zum Bauch
- {'en': '57747eb3-411a-4efd-8842-a45e562320ee', 'de': '788ef0a5-492f-48a7-87dc-b15dda185bb8'},
+ {
+ 'en': '57747eb3-411a-4efd-8842-a45e562320ee',
+ 'de': '788ef0a5-492f-48a7-87dc-b15dda185bb8'
+ },
# 119 9926e18f-4e2b-4c20-9477-9bfb08d229bc Shoulder Press, Barbell
# 266 197600e7-9bb2-448c-baca-244d679e7b07 Schulterdrücken LH
- {'en': '9926e18f-4e2b-4c20-9477-9bfb08d229bc', 'de': '197600e7-9bb2-448c-baca-244d679e7b07'},
+ {
+ 'en': '9926e18f-4e2b-4c20-9477-9bfb08d229bc',
+ 'de': '197600e7-9bb2-448c-baca-244d679e7b07'
+ },
# 123 1df6a1b5-7bd2-402f-9d5e-94f9ed6d8b54 Shoulder Press, Dumbbells
# 241 0d4390ea-51dc-42dc-94af-ba0e94a73484 Schulterdrücken KH
- {'en': '1df6a1b5-7bd2-402f-9d5e-94f9ed6d8b54', 'de': '0d4390ea-51dc-42dc-94af-ba0e94a73484'},
+ {
+ 'en': '1df6a1b5-7bd2-402f-9d5e-94f9ed6d8b54',
+ 'de': '0d4390ea-51dc-42dc-94af-ba0e94a73484'
+ },
# 107 7ce6b090-5099-4cd0-83ae-1a02725c868b Pull-ups
# 36 4e741c73-d40a-4fad-b0e0-76edd9bbe8df Klimmzüge
- {'en': '7ce6b090-5099-4cd0-83ae-1a02725c868b', 'de': '4e741c73-d40a-4fad-b0e0-76edd9bbe8df'},
+ {
+ 'en': '7ce6b090-5099-4cd0-83ae-1a02725c868b',
+ 'de': '4e741c73-d40a-4fad-b0e0-76edd9bbe8df'
+ },
# 140 d46adbda-7c60-42a0-b1fd-9ec111b35956 Pull Ups on Machine
# 48 22897ebe-cf17-44cf-97e6-87566285684d Klimmzüge an Maschine
- {'en': 'd46adbda-7c60-42a0-b1fd-9ec111b35956', 'de': '22897ebe-cf17-44cf-97e6-87566285684d'},
+ {
+ 'en': 'd46adbda-7c60-42a0-b1fd-9ec111b35956',
+ 'de': '22897ebe-cf17-44cf-97e6-87566285684d'
+ },
# 87 d147a6c2-ce64-424b-baf3-4ca841a51512 Dumbbells on Scott Machine
# 28 d7c553b1-e84d-4dbc-9f6c-05db489b27c8 KH an Scottmaschine
- {'en': 'd147a6c2-ce64-424b-baf3-4ca841a51512', 'de': 'd7c553b1-e84d-4dbc-9f6c-05db489b27c8'},
+ {
+ 'en': 'd147a6c2-ce64-424b-baf3-4ca841a51512',
+ 'de': 'd7c553b1-e84d-4dbc-9f6c-05db489b27c8'
+ },
# 100 b72ae8d4-ede6-4480-8fc5-7b80e369f7ed Decline Bench Press Barbell
# 17 3ef8a516-d0d4-4078-9b4a-d7783da0fcf7 Negativ Bankdrücken
- {'en': 'b72ae8d4-ede6-4480-8fc5-7b80e369f7ed', 'de': '3ef8a516-d0d4-4078-9b4a-d7783da0fcf7'},
+ {
+ 'en': 'b72ae8d4-ede6-4480-8fc5-7b80e369f7ed',
+ 'de': '3ef8a516-d0d4-4078-9b4a-d7783da0fcf7'
+ },
# 101 80d318b3-4b8a-41aa-9c6c-0a2a921fe1e6 Decline Bench Press Dumbbell
# 720 341c73d5-2e9a-4f13-89c9-c984c86cc088 Negativ Bankdrücken KH
- {'en': '80d318b3-4b8a-41aa-9c6c-0a2a921fe1e6', 'de': '341c73d5-2e9a-4f13-89c9-c984c86cc088'},
+ {
+ 'en': '80d318b3-4b8a-41aa-9c6c-0a2a921fe1e6',
+ 'de': '341c73d5-2e9a-4f13-89c9-c984c86cc088'
+ },
# 318 bd07fc6b-db86-4139-b6de-e328cea0f694 Turkish Get-Up
# 717 1546af08-017c-4de5-b13f-cb3a1999733d Turkish Get-Up
- {'en': 'bd07fc6b-db86-4139-b6de-e328cea0f694', 'de': '1546af08-017c-4de5-b13f-cb3a1999733d'},
+ {
+ 'en': 'bd07fc6b-db86-4139-b6de-e328cea0f694',
+ 'de': '1546af08-017c-4de5-b13f-cb3a1999733d'
+ },
# 154 cd4fac32-48fb-4237-a263-a44c5108790a Leg Curls (laying)
# 22 8f0170a2-5274-4487-a295-1a9baf2c92a3 Beinbeuger Liegend
- {'en': 'cd4fac32-48fb-4237-a263-a44c5108790a', 'de': '8f0170a2-5274-4487-a295-1a9baf2c92a3'},
+ {
+ 'en': 'cd4fac32-48fb-4237-a263-a44c5108790a',
+ 'de': '8f0170a2-5274-4487-a295-1a9baf2c92a3'
+ },
# 118 89c98117-dd53-4334-bfa6-72a96525629a Leg Curls (standing)
# 72 9075241c-0493-4f2a-a399-a57e3634093e Beinbeuger Stehend
- {'en': '89c98117-dd53-4334-bfa6-72a96525629a', 'de': '9075241c-0493-4f2a-a399-a57e3634093e'},
+ {
+ 'en': '89c98117-dd53-4334-bfa6-72a96525629a',
+ 'de': '9075241c-0493-4f2a-a399-a57e3634093e'
+ },
# 263 9f622058-85a4-4272-ad99-e5696e772137 Roman Chair
# 714 68f96d3e-9172-468c-9018-06f71a97faff Beinheben am Roman Chair
- {'en': '9f622058-85a4-4272-ad99-e5696e772137', 'de': '68f96d3e-9172-468c-9018-06f71a97faff'},
+ {
+ 'en': '9f622058-85a4-4272-ad99-e5696e772137',
+ 'de': '68f96d3e-9172-468c-9018-06f71a97faff'
+ },
# 421 170cc52f-345f-41b3-bdae-8a5e0c9aa449 Bent-over Lateral Raises
# 47 e701de98-32c6-4e9d-956d-434cf5bcaaf0 Vorgebeugtes Seitheben
- {'en': '170cc52f-345f-41b3-bdae-8a5e0c9aa449', 'de': 'e701de98-32c6-4e9d-956d-434cf5bcaaf0'},
+ {
+ 'en': '170cc52f-345f-41b3-bdae-8a5e0c9aa449',
+ 'de': 'e701de98-32c6-4e9d-956d-434cf5bcaaf0'
+ },
# 185 bdb7bdbb-8930-46e5-8b98-eb13e604553f Squat Jumps
# 296 032a38cf-b15a-4761-b684-577e41893f54 Tiefe Hocksprünge
- {'en': 'bdb7bdbb-8930-46e5-8b98-eb13e604553f', 'de': '032a38cf-b15a-4761-b684-577e41893f54'},
+ {
+ 'en': 'bdb7bdbb-8930-46e5-8b98-eb13e604553f',
+ 'de': '032a38cf-b15a-4761-b684-577e41893f54'
+ },
]
@@ -384,7 +652,7 @@ def create_exercise_mapping(apps, schema_editor):
pass
# print(exercise_group[lang], "does not exist")
- if(len(exercise_objects) > 0):
+ if (len(exercise_objects) > 0):
exercise_base_main = exercise_objects[0].exercise_base
for exercise in exercise_objects[1:]:
ExerciseBase.objects.get(id=exercise.exercise_base.id).delete()
diff --git a/wger/exercises/migrations/0013_auto_20210503_1232.py b/wger/exercises/migrations/0013_auto_20210503_1232.py
index ece9dbccd..ef37b2107 100644
--- a/wger/exercises/migrations/0013_auto_20210503_1232.py
+++ b/wger/exercises/migrations/0013_auto_20210503_1232.py
@@ -19,21 +19,25 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='exercisebase',
name='license_author',
- field=models.CharField(blank=True,
- help_text='If you are not the author, enter the name or source '
- 'here. This is needed for some licenses e.g. the '
- 'CC-BY-SA.',
- max_length=50,
- null=True,
- verbose_name='Author'),
+ field=models.CharField(
+ blank=True,
+ help_text='If you are not the author, enter the name or source '
+ 'here. This is needed for some licenses e.g. the '
+ 'CC-BY-SA.',
+ max_length=50,
+ null=True,
+ verbose_name='Author'
+ ),
),
migrations.AlterField(
model_name='exercisebase',
name='variations',
- field=models.ForeignKey(blank=True,
- null=True,
- on_delete=django.db.models.deletion.CASCADE,
- to='exercises.variation',
- verbose_name='Variations'),
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.variation',
+ verbose_name='Variations'
+ ),
),
]
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index c8b12d0a3..cf2148c02 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -17,8 +17,8 @@
# Standard Library
import logging
-import uuid
import pathlib
+import uuid
# Django
from django.conf import settings
@@ -41,16 +41,15 @@ import bleach
from wger.core.models import Language
from wger.utils.cache import (
delete_template_fragment_cache,
- reset_workout_canonical_form
+ reset_workout_canonical_form,
)
from wger.utils.helpers import smart_capitalize
from wger.utils.managers import SubmissionManager
from wger.utils.models import (
AbstractLicenseModel,
- AbstractSubmissionModel
+ AbstractSubmissionModel,
)
-
logger = logging.getLogger(__name__)
@@ -59,16 +58,20 @@ class Muscle(models.Model):
Muscle an exercise works out
"""
- name = models.CharField(max_length=50,
- verbose_name=_('Name'),
- help_text=_('In latin, e.g. "Pectoralis major"'))
+ name = models.CharField(
+ max_length=50,
+ verbose_name=_('Name'),
+ help_text=_('In latin, e.g. "Pectoralis major"'),
+ )
# Whether to use the front or the back image for background
is_front = models.BooleanField(default=1)
# Metaclass to set some other properties
class Meta:
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
# Image to use when displaying this as a main muscle in an exercise
@property
@@ -98,14 +101,18 @@ class Equipment(models.Model):
Equipment used or needed by an exercise
"""
- name = models.CharField(max_length=50,
- verbose_name=_('Name'))
+ name = models.CharField(
+ max_length=50,
+ verbose_name=_('Name'),
+ )
class Meta:
"""
Set default ordering
"""
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
def __str__(self):
"""
@@ -124,13 +131,17 @@ class ExerciseCategory(models.Model):
"""
Model for an exercise category
"""
- name = models.CharField(max_length=100,
- verbose_name=_('Name'),)
+ name = models.CharField(
+ max_length=100,
+ verbose_name=_('Name'),
+ )
# Metaclass to set some other properties
class Meta:
verbose_name_plural = _("Exercise Categories")
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
def __str__(self):
"""
@@ -194,31 +205,41 @@ class ExerciseBase(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
uuid = models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='UUID')
"""Globally unique ID, to identify the base across installations"""
- category = models.ForeignKey(ExerciseCategory,
- verbose_name=_('Category'),
- on_delete=models.CASCADE)
-
- muscles = models.ManyToManyField(Muscle,
- blank=True,
- verbose_name=_('Primary muscles'))
+ category = models.ForeignKey(
+ ExerciseCategory,
+ verbose_name=_('Category'),
+ on_delete=models.CASCADE,
+ )
+
+ muscles = models.ManyToManyField(
+ Muscle,
+ blank=True,
+ verbose_name=_('Primary muscles'),
+ )
"""Main muscles trained by the exercise"""
- muscles_secondary = models.ManyToManyField(Muscle,
- verbose_name=_('Secondary muscles'),
- related_name='secondary_muscles_base',
- blank=True)
+ muscles_secondary = models.ManyToManyField(
+ Muscle,
+ verbose_name=_('Secondary muscles'),
+ related_name='secondary_muscles_base',
+ blank=True,
+ )
"""Secondary muscles trained by the exercise"""
- equipment = models.ManyToManyField(Equipment,
- verbose_name=_('Equipment'),
- blank=True)
+ equipment = models.ManyToManyField(
+ Equipment,
+ verbose_name=_('Equipment'),
+ blank=True,
+ )
"""Equipment needed by this exercise"""
- variations = models.ForeignKey(Variation,
- verbose_name=_('Variations'),
- on_delete=models.CASCADE,
- null=True,
- blank=True)
+ variations = models.ForeignKey(
+ Variation,
+ verbose_name=_('Variations'),
+ on_delete=models.CASCADE,
+ null=True,
+ blank=True,
+ )
"""Variations of this exercise"""
#
@@ -241,40 +262,53 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
objects = SubmissionManager()
"""Custom manager"""
- description = models.TextField(max_length=2000,
- verbose_name=_('Description'),
- validators=[MinLengthValidator(40)])
+ description = models.TextField(
+ max_length=2000,
+ verbose_name=_('Description'),
+ validators=[MinLengthValidator(40)],
+ )
"""Description on how to perform the exercise"""
- name = models.CharField(max_length=200,
- verbose_name=_('Name'))
+ name = models.CharField(max_length=200, verbose_name=_('Name'))
"""The exercise's name, with correct uppercase"""
- name_original = models.CharField(max_length=200,
- verbose_name=_('Name'),
- default='')
+ name_original = models.CharField(
+ max_length=200,
+ verbose_name=_('Name'),
+ default='',
+ )
"""The exercise's name, as entered by the user"""
- creation_date = models.DateField(_('Date'),
- auto_now_add=True,
- null=True,
- blank=True)
+ creation_date = models.DateField(
+ _('Date'),
+ auto_now_add=True,
+ null=True,
+ blank=True,
+ )
"""The submission date"""
- language = models.ForeignKey(Language,
- verbose_name=_('Language'),
- on_delete=models.CASCADE)
+ language = models.ForeignKey(
+ Language,
+ verbose_name=_('Language'),
+ on_delete=models.CASCADE,
+ )
"""The exercise's language"""
- 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 exercise across installations"""
- exercise_base = models.ForeignKey(ExerciseBase,
- verbose_name='ExerciseBase',
- on_delete=models.CASCADE,
- default=None,
- null=True,
- related_name='exercises')
+ exercise_base = models.ForeignKey(
+ ExerciseBase,
+ verbose_name='ExerciseBase',
+ on_delete=models.CASCADE,
+ default=None,
+ null=True,
+ related_name='exercises',
+ )
""" Refers to the base exercise with non translated information """
#
@@ -282,7 +316,9 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
#
class Meta:
base_manager_name = 'objects'
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
def get_absolute_url(self):
"""
@@ -404,14 +440,15 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
context = {
'exercise': self.name,
'url': url,
- 'site': Site.objects.get_current().domain
+ 'site': Site.objects.get_current().domain,
}
message = render_to_string('exercise/email_new.tpl', context)
- mail.send_mail(subject,
- message,
- settings.WGER_SETTINGS['EMAIL_FROM'],
- [user.email],
- fail_silently=True)
+ mail.send_mail(
+ subject,
+ message,
+ settings.WGER_SETTINGS['EMAIL_FROM'], [user.email],
+ fail_silently=True
+ )
def set_author(self, request):
"""
@@ -429,11 +466,13 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
subject = _('New user submitted exercise')
- message = _('The user {0} submitted a new exercise "{1}".').format(
- request.user.username, self.name_original)
- mail.mail_admins(str(subject),
- str(message),
- fail_silently=True)
+ message = _('The user {0} submitted a new exercise "{1}".'
+ ).format(request.user.username, self.name_original)
+ mail.mail_admins(
+ str(subject),
+ str(message),
+ fail_silently=True,
+ )
def exercise_image_upload_dir(instance, filename):
@@ -452,27 +491,37 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
objects = SubmissionManager()
"""Custom manager"""
- 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 image across installations"""
- exercise_base = models.ForeignKey(ExerciseBase,
- verbose_name=_('Exercise'),
- on_delete=models.CASCADE)
+ exercise_base = models.ForeignKey(
+ ExerciseBase,
+ verbose_name=_('Exercise'),
+ on_delete=models.CASCADE,
+ )
"""The exercise the image belongs to"""
- image = models.ImageField(verbose_name=_('Image'),
- help_text=_('Only PNG and JPEG formats are supported'),
- upload_to=exercise_image_upload_dir)
+ image = models.ImageField(
+ verbose_name=_('Image'),
+ help_text=_('Only PNG and JPEG formats are supported'),
+ upload_to=exercise_image_upload_dir,
+ )
"""Uploaded image"""
- is_main = models.BooleanField(verbose_name=_('Main picture'),
- default=False,
- help_text=_("Tick the box if you want to set this image as the "
- "main one for the exercise (will be shown e.g. in "
- "the search). The first image is automatically "
- "marked by the system."))
+ is_main = models.BooleanField(
+ verbose_name=_('Main picture'),
+ default=False,
+ help_text=_(
+ "Tick the box if you want to set this image as the "
+ "main one for the exercise (will be shown e.g. in "
+ "the search). The first image is automatically "
+ "marked by the system."
+ )
+ )
"""A flag indicating whether the image is the exercise's main image"""
class Meta:
@@ -556,26 +605,30 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
self.license_author = request.user.username
subject = _('New user submitted image')
- message = _('The user {0} submitted a new image "{1}" for exercise {2}.').format(
- request.user.username,
- self.name,
- self.exercise)
- mail.mail_admins(str(subject),
- str(message),
- fail_silently=True)
+ message = _('The user {0} submitted a new image "{1}" for exercise {2}.'
+ ).format(request.user.username, self.name, self.exercise)
+ mail.mail_admins(
+ str(subject),
+ str(message),
+ fail_silently=True,
+ )
class ExerciseComment(models.Model):
"""
Model for an exercise comment
"""
- exercise = models.ForeignKey(Exercise,
- verbose_name=_('Exercise'),
- editable=False,
- on_delete=models.CASCADE)
- comment = models.CharField(max_length=200,
- verbose_name=_('Comment'),
- help_text=_('A comment about how to correctly do this exercise.'))
+ exercise = models.ForeignKey(
+ Exercise,
+ verbose_name=_('Exercise'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ comment = models.CharField(
+ max_length=200,
+ verbose_name=_('Comment'),
+ help_text=_('A comment about how to correctly do this exercise.')
+ )
def __str__(self):
"""
diff --git a/wger/exercises/signals.py b/wger/exercises/signals.py
index 6f40cc1b5..f24493249 100644
--- a/wger/exercises/signals.py
+++ b/wger/exercises/signals.py
@@ -14,11 +14,10 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.db.models.signals import (
post_delete,
- pre_save
+ pre_save,
)
from django.dispatch import receiver
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index 9fe6f1151..4614b6e3b 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -24,7 +24,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import ExerciseCategory
@@ -48,17 +48,19 @@ class CategoryOverviewTestCase(WgerAccessTestCase):
url = 'exercise:category:list'
anonymous_fail = True
user_success = 'admin'
- user_fail = ('manager1',
- 'manager2'
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_fail = (
+ 'manager1',
+ 'manager2'
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
class DeleteExerciseCategoryTestCase(WgerDeleteTestCase):
diff --git a/wger/exercises/tests/test_corrected_exercise.py b/wger/exercises/tests/test_corrected_exercise.py
index ea79e0a8a..346030139 100644
--- a/wger/exercises/tests/test_corrected_exercise.py
+++ b/wger/exercises/tests/test_corrected_exercise.py
@@ -31,12 +31,15 @@ class ExercisesCorrectionTestCase(WgerTestCase):
Helper function
"""
description = 'a nice, long and accurate description for the exercise'
- response = self.client.post(reverse('exercise:exercise:correct', kwargs={'pk': 1}),
- {'name_original': 'my test exercise',
- 'license': 2,
- 'description': description,
- 'muscles': [3],
- 'category': 3})
+ response = self.client.post(
+ reverse('exercise:exercise:correct', kwargs={'pk': 1}), {
+ 'name_original': 'my test exercise',
+ 'license': 2,
+ 'description': description,
+ 'muscles': [3],
+ 'category': 3
+ }
+ )
if fail:
self.assertEqual(response.status_code, 403)
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 1b7b672fb..d90f84d47 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -24,11 +24,11 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import (
Equipment,
- Exercise
+ Exercise,
)
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 6496ab119..ac009cda1 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -21,7 +21,7 @@ from django.core.cache import cache
from django.core.cache.utils import make_template_fragment_key
from django.template import (
Context,
- Template
+ Template,
)
from django.urls import reverse
@@ -30,12 +30,12 @@ from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
STATUS_CODES_FAIL,
WgerDeleteTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import (
Exercise,
ExerciseCategory,
- Muscle
+ Muscle,
)
from wger.utils.cache import cache_mapper
from wger.utils.constants import WORKOUT_TAB
@@ -244,13 +244,16 @@ class ExercisesTestCase(WgerTestCase):
# Add an exercise
count_before = Exercise.objects.count()
- response = self.client.post(reverse('exercise:exercise:add'),
- {'name_original': random_string(),
- 'license': 1,
- 'exercise_base': {
- 'category': 2,
- 'muscles': [1, 2]}
- })
+ response = self.client.post(
+ reverse('exercise:exercise:add'), {
+ 'name_original': random_string(),
+ 'license': 1,
+ 'exercise_base': {
+ 'category': 2,
+ 'muscles': [1, 2]
+ }
+ }
+ )
count_after = Exercise.objects.count()
self.assertIn(response.status_code, STATUS_CODES_FAIL)
@@ -280,11 +283,14 @@ class ExercisesTestCase(WgerTestCase):
to an existing exercise fails
"""
count_before = Exercise.objects.count()
- response = self.client.post(reverse('exercise:exercise:add'),
- {'category': 2,
- 'name_original': 'Squats',
- 'license': 1,
- 'muscles': [1, 2]})
+ response = self.client.post(
+ reverse('exercise:exercise:add'), {
+ 'category': 2,
+ 'name_original': 'Squats',
+ 'license': 1,
+ 'muscles': [1, 2]
+ }
+ )
count_after = Exercise.objects.count()
self.assertIn(response.status_code, STATUS_CODES_FAIL)
@@ -300,12 +306,15 @@ class ExercisesTestCase(WgerTestCase):
count_before = Exercise.objects.count()
description = 'a nice, long and accurate description for the exercise'
name_original = random_string()
- response = self.client.post(reverse('exercise:exercise:add'),
- {'name_original': name_original,
- 'license': 1,
- 'description': description,
- 'category': 2,
- 'muscles': [1, 2]})
+ response = self.client.post(
+ reverse('exercise:exercise:add'), {
+ 'name_original': name_original,
+ 'license': 1,
+ 'description': description,
+ 'category': 2,
+ 'muscles': [1, 2]
+ }
+ )
count_after = Exercise.objects.count()
self.assertEqual(response.status_code, 302)
new_location = response['Location']
@@ -333,46 +342,54 @@ class ExercisesTestCase(WgerTestCase):
self.assertEqual(exercise_1.name, name_original)
# Wrong category - adding
- response = self.client.post(reverse('exercise:exercise:add'),
- {'category': 111,
- 'name_original': random_string(),
- 'license': 1,
- 'category': 111,
- 'muscles': [1, 2]
- })
+ response = self.client.post(
+ reverse('exercise:exercise:add'), {
+ 'category': 111,
+ 'name_original': random_string(),
+ 'license': 1,
+ 'category': 111,
+ 'muscles': [1, 2]
+ }
+ )
self.assertTrue(response.context['form'].errors['category'])
# Wrong category - editing
- response = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),
- {'category': 111,
- 'name_original': random_string(),
- 'license': 1,
- 'category': 111,
- 'muscles': [1, 2]
- })
+ response = self.client.post(
+ reverse('exercise:exercise:edit', kwargs={'pk': '1'}), {
+ 'category': 111,
+ 'name_original': random_string(),
+ 'license': 1,
+ 'category': 111,
+ 'muscles': [1, 2]
+ }
+ )
if admin:
self.assertTrue(response.context['form'].errors['category'])
else:
self.assertIn(response.status_code, STATUS_CODES_FAIL)
# No muscles - adding
- response = self.client.post(reverse('exercise:exercise:add'),
- {'category': 1,
- 'name_original': random_string(),
- 'license': 1,
- 'category': 1,
- 'muscles': []
- })
+ response = self.client.post(
+ reverse('exercise:exercise:add'), {
+ 'category': 1,
+ 'name_original': random_string(),
+ 'license': 1,
+ 'category': 1,
+ 'muscles': []
+ }
+ )
self.assertEqual(response.status_code, 302)
# No muscles - editing
- response = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),
- {'category': 1,
- 'name_original': random_string(),
- 'license': 1,
- 'category': 1,
- 'muscles': []
- })
+ response = self.client.post(
+ reverse('exercise:exercise:edit', kwargs={'pk': '1'}), {
+ 'category': 1,
+ 'name_original': random_string(),
+ 'license': 1,
+ 'category': 1,
+ 'muscles': []
+ }
+ )
if admin:
self.assertEqual(response.status_code, 302)
else:
@@ -399,8 +416,7 @@ class ExercisesTestCase(WgerTestCase):
"""
# 1 hit, "Very cool exercise"
- response = self.client.get(reverse('exercise-search'),
- {'term': 'cool'})
+ response = self.client.get(reverse('exercise-search'), {'term': 'cool'})
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
self.assertEqual(len(result), 1)
@@ -411,8 +427,7 @@ class ExercisesTestCase(WgerTestCase):
self.assertEqual(result['suggestions'][0]['data']['image_thumbnail'], None)
# 0 hits, "Pending exercise"
- response = self.client.get(reverse('exercise-search'),
- {'term': 'Pending'})
+ response = self.client.get(reverse('exercise-search'), {'term': 'Pending'})
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
self.assertEqual(len(result['suggestions']), 0)
@@ -533,10 +548,7 @@ class MuscleTemplateTagTest(WgerTestCase):
"""
context = Context({'muscles': Muscle.objects.get(pk=2)})
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles muscles %}'
- )
+ template = Template('{% load wger_extras %}' '{% render_muscles muscles %}')
rendered_template = template.render(context)
self.assertIn('images/muscles/main/muscle-2.svg', rendered_template)
self.assertNotIn('images/muscles/secondary/', rendered_template)
@@ -547,12 +559,8 @@ class MuscleTemplateTagTest(WgerTestCase):
Test that the tag works when giben main muscles and empty secondary ones
"""
- context = Context({"muscles": Muscle.objects.get(pk=2),
- "muscles_sec": []})
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles muscles muscles_sec %}'
- )
+ context = Context({"muscles": Muscle.objects.get(pk=2), "muscles_sec": []})
+ template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
rendered_template = template.render(context)
self.assertIn('images/muscles/main/muscle-2.svg', rendered_template)
self.assertNotIn('images/muscles/secondary/', rendered_template)
@@ -564,10 +572,7 @@ class MuscleTemplateTagTest(WgerTestCase):
"""
context = Context({'muscles': Muscle.objects.get(pk=1)})
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles muscles_sec=muscles %}'
- )
+ template = Template('{% load wger_extras %}' '{% render_muscles muscles_sec=muscles %}')
rendered_template = template.render(context)
self.assertIn('images/muscles/secondary/muscle-1.svg', rendered_template)
self.assertNotIn('images/muscles/main/', rendered_template)
@@ -578,12 +583,8 @@ class MuscleTemplateTagTest(WgerTestCase):
Test that the tag works when given secondary muscles and empty main ones
"""
- context = Context({'muscles_sec': Muscle.objects.get(pk=1),
- 'muscles': []})
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles muscles muscles_sec %}'
- )
+ context = Context({'muscles_sec': Muscle.objects.get(pk=1), 'muscles': []})
+ template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
rendered_template = template.render(context)
self.assertIn('images/muscles/secondary/muscle-1.svg', rendered_template)
self.assertNotIn('images/muscles/main/', rendered_template)
@@ -594,12 +595,8 @@ class MuscleTemplateTagTest(WgerTestCase):
Test that the tag works when given a list for secondary muscles and empty main ones
"""
- context = Context({'muscles_sec': Muscle.objects.filter(is_front=True),
- 'muscles': []})
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles muscles muscles_sec %}'
- )
+ context = Context({'muscles_sec': Muscle.objects.filter(is_front=True), 'muscles': []})
+ template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
rendered_template = template.render(context)
self.assertIn('images/muscles/secondary/muscle-1.svg', rendered_template)
self.assertNotIn('images/muscles/secondary/muscle-2.svg', rendered_template)
@@ -612,12 +609,13 @@ class MuscleTemplateTagTest(WgerTestCase):
Test that the tag works when given a list for main and secondary muscles
"""
- context = Context({'muscles_sec': Muscle.objects.filter(id__in=[5, 6]),
- 'muscles': Muscle.objects.filter(id__in=[1, 4])})
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles muscles muscles_sec %}'
+ context = Context(
+ {
+ 'muscles_sec': Muscle.objects.filter(id__in=[5, 6]),
+ 'muscles': Muscle.objects.filter(id__in=[1, 4])
+ }
)
+ template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
rendered_template = template.render(context)
self.assertIn('images/muscles/main/muscle-1.svg', rendered_template)
self.assertNotIn('images/muscles/main/muscle-2.svg', rendered_template)
@@ -633,12 +631,8 @@ class MuscleTemplateTagTest(WgerTestCase):
Test that the tag works when given empty input
"""
- context = Context({'muscles': [],
- 'muscles_sec': []})
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles muscles muscles_sec %}'
- )
+ context = Context({'muscles': [], 'muscles_sec': []})
+ template = Template('{% load wger_extras %}' '{% render_muscles muscles muscles_sec %}')
rendered_template = template.render(context)
self.assertEqual(rendered_template, "\n\n")
@@ -647,10 +641,7 @@ class MuscleTemplateTagTest(WgerTestCase):
Test that the tag works when given no parameters
"""
- template = Template(
- '{% load wger_extras %}'
- '{% render_muscles %}'
- )
+ template = Template('{% load wger_extras %}' '{% render_muscles %}')
rendered_template = template.render(Context({}))
self.assertEqual(rendered_template, "\n\n")
@@ -692,9 +683,9 @@ class WorkoutCacheTestCase(WgerTestCase):
# TODO: fix test, all registered users can upload exercises
-class ExerciseApiTestCase(api_base_test.BaseTestCase,
- api_base_test.ApiBaseTestCase,
- api_base_test.ApiGetTestCase):
+class ExerciseApiTestCase(
+ api_base_test.BaseTestCase, api_base_test.ApiBaseTestCase, api_base_test.ApiGetTestCase
+):
"""
Tests the exercise overview resource
"""
@@ -703,9 +694,9 @@ class ExerciseApiTestCase(api_base_test.BaseTestCase,
private_resource = False
-class ExerciseInfoApiTestCase(api_base_test.BaseTestCase,
- api_base_test.ApiBaseTestCase,
- api_base_test.ApiGetTestCase):
+class ExerciseInfoApiTestCase(
+ api_base_test.BaseTestCase, api_base_test.ApiBaseTestCase, api_base_test.ApiGetTestCase
+):
"""
Tests the exercise info resource
"""
diff --git a/wger/exercises/tests/test_exercise_base.py b/wger/exercises/tests/test_exercise_base.py
index e7f8ffa20..3b9b76f5c 100644
--- a/wger/exercises/tests/test_exercise_base.py
+++ b/wger/exercises/tests/test_exercise_base.py
@@ -33,11 +33,13 @@ class ExerciseBaseTestCase(WgerTestCase):
"""
exercise = Exercise.objects.get(pk=1)
base = exercise.exercise_base
- self. assertEqual(base.category, exercise.category)
- self. assertListEqual(self.get_ids(base.equipment), self.get_ids(exercise.equipment))
- self. assertListEqual(self.get_ids(base.muscles), self.get_ids(exercise.muscles))
- self. assertListEqual(self.get_ids(base.muscles_secondary),
- self.get_ids(exercise.muscles_secondary))
+ self.assertEqual(base.category, exercise.category)
+ self.assertListEqual(self.get_ids(base.equipment), self.get_ids(exercise.equipment))
+ self.assertListEqual(self.get_ids(base.muscles), self.get_ids(exercise.muscles))
+ self.assertListEqual(
+ self.get_ids(base.muscles_secondary),
+ self.get_ids(exercise.muscles_secondary),
+ )
def test_variations(self):
"""Test that the variations are correctly returned"""
diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.py
index 85330a5bc..052406cb6 100644
--- a/wger/exercises/tests/test_exercise_comments.py
+++ b/wger/exercises/tests/test_exercise_comments.py
@@ -12,7 +12,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.core.cache import cache
from django.urls import reverse
@@ -22,11 +21,11 @@ from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import (
Exercise,
- ExerciseComment
+ ExerciseComment,
)
from wger.utils.cache import cache_mapper
@@ -162,6 +161,8 @@ class ExerciseCommentApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 1
resource = ExerciseComment
private_resource = False
- data = {"comment": "a cool comment",
- "exercise": "1",
- "id": 1}
+ data = {
+ "comment": "a cool comment",
+ "exercise": "1",
+ "id": 1,
+ }
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 6f0358879..7e82e0da2 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -22,11 +22,11 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import (
Exercise,
- ExerciseImage
+ ExerciseImage,
)
@@ -45,10 +45,7 @@ class MainImageTestCase(WgerTestCase):
image = ExerciseImage()
image.exercise_base = exercise.exercise_base
image.status = ExerciseImage.STATUS_ACCEPTED
- image.image.save(
- db_filename,
- File(inFile)
- )
+ image.image.save(db_filename, File(inFile))
image.save()
return image.pk
@@ -116,9 +113,11 @@ class AddExerciseImageTestCase(WgerAddTestCase):
object_class = ExerciseImage
url = reverse('exercise:image:add', kwargs={'exercise_pk': 1})
user_fail = False
- data = {'is_main': True,
- 'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),
- 'license': 1}
+ data = {
+ 'is_main': True,
+ 'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),
+ 'license': 1
+ }
class EditExerciseImageTestCase(WgerEditTestCase):
@@ -129,8 +128,7 @@ class EditExerciseImageTestCase(WgerEditTestCase):
object_class = ExerciseImage
url = 'exercise:image:edit'
pk = 2
- data = {'is_main': True,
- 'license': 1}
+ data = {'is_main': True, 'license': 1}
class DeleteExerciseImageTestCase(WgerDeleteTestCase):
@@ -144,9 +142,11 @@ class DeleteExerciseImageTestCase(WgerDeleteTestCase):
# TODO: add POST and DELETE tests
-class ExerciseImagesApiTestCase(api_base_test.BaseTestCase,
- api_base_test.ApiBaseTestCase,
- api_base_test.ApiGetTestCase):
+class ExerciseImagesApiTestCase(
+ api_base_test.BaseTestCase,
+ api_base_test.ApiBaseTestCase,
+ api_base_test.ApiGetTestCase,
+):
"""
Tests the exercise image resource
"""
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index cb9530922..b6a43d96a 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -12,7 +12,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.core.cache import cache
from django.core.cache.utils import make_template_fragment_key
@@ -25,7 +24,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import Muscle
@@ -42,10 +41,11 @@ class MuscleRepresentationTestCase(WgerTestCase):
self.assertEqual("{0}".format(Muscle.objects.get(pk=1)), 'Anterior testoid')
# Check image URL properties
- self.assertIn("images/muscles/main/muscle-2.svg",
- Muscle.objects.get(pk=2).image_url_main)
- self.assertIn("images/muscles/secondary/muscle-1.svg",
- Muscle.objects.get(pk=1).image_url_secondary)
+ self.assertIn("images/muscles/main/muscle-2.svg", Muscle.objects.get(pk=2).image_url_main)
+ self.assertIn(
+ "images/muscles/secondary/muscle-1.svg",
+ Muscle.objects.get(pk=1).image_url_secondary
+ )
class MuscleAdminOverviewTest(WgerAccessTestCase):
@@ -55,17 +55,19 @@ class MuscleAdminOverviewTest(WgerAccessTestCase):
url = 'exercise:muscle:admin-list'
anonymous_fail = True
user_success = 'admin'
- user_fail = ('manager1',
- 'manager2'
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_fail = (
+ 'manager1',
+ 'manager2'
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
class MusclesShareButtonTestCase(WgerTestCase):
@@ -95,8 +97,7 @@ class AddMuscleTestCase(WgerAddTestCase):
object_class = Muscle
url = 'exercise:muscle:add'
- data = {'name': 'A new muscle',
- 'is_front': True}
+ data = {'name': 'A new muscle', 'is_front': True}
class EditMuscleTestCase(WgerEditTestCase):
@@ -107,8 +108,7 @@ class EditMuscleTestCase(WgerEditTestCase):
object_class = Muscle
url = 'exercise:muscle:edit'
pk = 1
- data = {'name': 'The new name',
- 'is_front': True}
+ data = {'name': 'The new name', 'is_front': True}
class DeleteMuscleTestCase(WgerDeleteTestCase):
@@ -152,8 +152,7 @@ class MuscleApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 1
resource = Muscle
private_resource = False
- data = {'name': 'The name',
- 'is_front': True}
+ data = {'name': 'The name', 'is_front': True}
def test_get_detail(self):
super().test_get_detail()
@@ -161,7 +160,7 @@ class MuscleApiTestCase(api_base_test.ApiBaseResourceTestCase):
# Check that image URLs are present in response
response = self.client.get(self.url_detail)
response_object = response.json()
- self.assertIn("images/muscles/main/muscle-1.svg",
- response_object["image_url_main"])
- self.assertIn("images/muscles/secondary/muscle-1.svg",
- response_object["image_url_secondary"])
+ self.assertIn("images/muscles/main/muscle-1.svg", response_object["image_url_main"])
+ self.assertIn(
+ "images/muscles/secondary/muscle-1.svg", response_object["image_url_secondary"]
+ )
diff --git a/wger/exercises/tests/test_submitted_exercise.py b/wger/exercises/tests/test_submitted_exercise.py
index 5a9b69177..d515eef45 100644
--- a/wger/exercises/tests/test_submitted_exercise.py
+++ b/wger/exercises/tests/test_submitted_exercise.py
@@ -19,7 +19,7 @@ from django.urls import reverse
# wger
from wger.core.tests.base_testcase import (
STATUS_CODES_FAIL,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import Exercise
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index e2ae94ea8..62c130f4c 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -18,7 +18,7 @@
# Django
from django.conf.urls import (
include,
- url
+ url,
)
from django.contrib.auth.decorators import login_required
from django.urls import path
@@ -30,132 +30,193 @@ from wger.exercises.views import (
equipment,
exercises,
images,
- muscles
+ muscles,
)
-
# sub patterns for muscles
patterns_muscle = [
- path('overview/',
- muscles.MuscleListView.as_view(),
- name='overview'),
- path('admin-overview/',
- muscles.MuscleAdminListView.as_view(),
- name='admin-list'),
- path('add/',
- muscles.MuscleAddView.as_view(),
- name='add'),
- path('<int:pk>/edit/',
- muscles.MuscleUpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete/',
- muscles.MuscleDeleteView.as_view(),
- name='delete'),
+ path(
+ 'overview/',
+ muscles.MuscleListView.as_view(),
+ name='overview',
+ ),
+ path(
+ 'admin-overview/',
+ muscles.MuscleAdminListView.as_view(),
+ name='admin-list',
+ ),
+ path(
+ 'add/',
+ muscles.MuscleAddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit/',
+ muscles.MuscleUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete/',
+ muscles.MuscleDeleteView.as_view(),
+ name='delete',
+ ),
]
# sub patterns for exercise images
patterns_images = [
- path('<int:exercise_pk>/image/add',
- images.ExerciseImageAddView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- images.ExerciseImageEditView.as_view(),
- name='edit'),
- path('<int:exercise_pk>/image/<int:pk>/delete',
- images.ExerciseImageDeleteView.as_view(),
- name='delete'),
- path('<int:pk>/accept/',
- images.accept,
- name='accept'),
- path('<int:pk>/decline/',
- images.decline,
- name='decline'),
+ path(
+ '<int:exercise_pk>/image/add',
+ images.ExerciseImageAddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ images.ExerciseImageEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:exercise_pk>/image/<int:pk>/delete',
+ images.ExerciseImageDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ '<int:pk>/accept/',
+ images.accept,
+ name='accept',
+ ),
+ path(
+ '<int:pk>/decline/',
+ images.decline,
+ name='decline',
+ ),
]
# sub patterns for exercise comments
patterns_comment = [
- path('<int:exercise_pk>/comment/add/',
- comments.ExerciseCommentAddView.as_view(),
- name='add'),
- path('<int:pk>/edit/',
- comments.ExerciseCommentEditView.as_view(),
- name='edit'),
- path('<int:id>/delete/',
- comments.delete,
- name='delete'),
+ path(
+ '<int:exercise_pk>/comment/add/',
+ comments.ExerciseCommentAddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit/',
+ comments.ExerciseCommentEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:id>/delete/',
+ comments.delete,
+ name='delete',
+ ),
]
# sub patterns for categories
patterns_category = [
- path('list',
- categories.ExerciseCategoryListView.as_view(),
- name='list'),
- path('<int:pk>/edit/',
- categories.ExerciseCategoryUpdateView.as_view(),
- name='edit'),
- path('add/',
- categories.ExerciseCategoryAddView.as_view(),
- name='add'),
- path('<int:pk>/delete/',
- categories.ExerciseCategoryDeleteView.as_view(),
- name='delete'),
+ path(
+ 'list',
+ categories.ExerciseCategoryListView.as_view(),
+ name='list',
+ ),
+ path(
+ '<int:pk>/edit/',
+ categories.ExerciseCategoryUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'add/',
+ categories.ExerciseCategoryAddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/delete/',
+ categories.ExerciseCategoryDeleteView.as_view(),
+ name='delete',
+ ),
]
# sub patterns for equipment
patterns_equipment = [
- path('list',
- equipment.EquipmentListView.as_view(),
- name='list'),
- path('add',
- equipment.EquipmentAddView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- equipment.EquipmentEditView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- equipment.EquipmentDeleteView.as_view(),
- name='delete'),
- path('overview',
- equipment.EquipmentOverviewView.as_view(),
- name='overview'),
+ path(
+ 'list',
+ equipment.EquipmentListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'add',
+ equipment.EquipmentAddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ equipment.EquipmentEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ equipment.EquipmentDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ 'overview',
+ equipment.EquipmentOverviewView.as_view(),
+ name='overview',
+ ),
]
-
# sub patterns for exercises
patterns_exercise = [
- path('overview/',
- exercises.ExerciseListView.as_view(),
- name='overview'),
- path('<int:id>/view/',
- exercises.view,
- name='view'),
- url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]*)/?$',
+ path(
+ 'overview/',
+ exercises.ExerciseListView.as_view(),
+ name='overview',
+ ),
+ path(
+ '<int:id>/view/',
exercises.view,
- name='view'),
- path('add/',
- login_required(exercises.ExerciseAddView.as_view()),
- name='add'),
- path('<int:pk>/edit/',
- exercises.ExerciseUpdateView.as_view(),
- name='edit'),
- path('<int:pk>/correct',
- exercises.ExerciseCorrectView.as_view(),
- name='correct'),
- path('<int:pk>/delete/',
- exercises.ExerciseDeleteView.as_view(),
- name='delete'),
- path('pending/',
- exercises.PendingExerciseListView.as_view(),
- name='pending'),
- path('<int:pk>/accept/',
- exercises.accept,
- name='accept'),
- path('<int:pk>/decline/',
- exercises.decline,
- name='decline'),
+ name='view',
+ ),
+ url(
+ r'^(?P<id>\d+)/view/(?P<slug>[-\w]*)/?$',
+ exercises.view,
+ name='view',
+ ),
+ path(
+ 'add/',
+ login_required(exercises.ExerciseAddView.as_view()),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit/',
+ exercises.ExerciseUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/correct',
+ exercises.ExerciseCorrectView.as_view(),
+ name='correct',
+ ),
+ path(
+ '<int:pk>/delete/',
+ exercises.ExerciseDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ 'pending/',
+ exercises.PendingExerciseListView.as_view(),
+ name='pending',
+ ),
+ path(
+ '<int:pk>/accept/',
+ exercises.accept,
+ name='accept',
+ ),
+ path(
+ '<int:pk>/decline/',
+ exercises.decline,
+ name='decline',
+ ),
]
-
urlpatterns = [
path('muscle/', include((patterns_muscle, 'muscle'), namespace="muscle")),
path('image/', include((patterns_images, 'image'), namespace="image")),
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index e19ddd341..c1e10b924 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -20,29 +20,28 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.exercises.models import ExerciseCategory
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.language import load_language
-
logger = logging.getLogger(__name__)
@@ -55,10 +54,12 @@ class ExerciseCategoryListView(LoginRequiredMixin, PermissionRequiredMixin, List
template_name = 'categories/admin-overview.html'
-class ExerciseCategoryAddView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- CreateView):
+class ExerciseCategoryAddView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ CreateView,
+):
"""
Generic view to add a new exercise category
"""
@@ -74,10 +75,12 @@ class ExerciseCategoryAddView(WgerFormMixin,
return super(ExerciseCategoryAddView, self).form_valid(form)
-class ExerciseCategoryUpdateView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- UpdateView):
+class ExerciseCategoryUpdateView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ UpdateView,
+):
"""
Generic view to update an existing exercise category
"""
@@ -100,16 +103,18 @@ class ExerciseCategoryUpdateView(WgerFormMixin,
return super(ExerciseCategoryUpdateView, self).form_valid(form)
-class ExerciseCategoryDeleteView(WgerDeleteMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- DeleteView):
+class ExerciseCategoryDeleteView(
+ WgerDeleteMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ DeleteView,
+):
"""
Generic view to delete an existing exercise category
"""
model = ExerciseCategory
- fields = ('name',)
+ fields = ('name', )
success_url = reverse_lazy('exercise:category:list')
delete_message_extra = gettext_lazy('This will also delete all exercises in this category.')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.py
index ae1cf37c8..f0609bd9d 100644
--- a/wger/exercises/views/comments.py
+++ b/wger/exercises/views/comments.py
@@ -21,7 +21,7 @@ import logging
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
@@ -29,30 +29,30 @@ from django.urls import reverse
from django.utils.translation import gettext_lazy
from django.views.generic import (
CreateView,
- UpdateView
+ UpdateView,
)
# wger
from wger.exercises.forms import CommentForm
from wger.exercises.models import (
Exercise,
- ExerciseComment
+ ExerciseComment,
)
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
-
# ************************
# Exercise comments
# ************************
-class ExerciseCommentEditView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- UpdateView):
+class ExerciseCommentEditView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ UpdateView,
+):
"""
Generic view to update an existing exercise comment
"""
@@ -66,10 +66,12 @@ class ExerciseCommentEditView(WgerFormMixin,
return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
-class ExerciseCommentAddView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- CreateView):
+class ExerciseCommentAddView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ CreateView,
+):
"""
Generic view to add a new exercise comment
"""
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index b78a05602..1ef00af36 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -20,21 +20,21 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
@@ -43,13 +43,11 @@ from wger.exercises.models import Equipment
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.language import load_item_languages
-
logger = logging.getLogger(__name__)
-
"""
Exercise equipment
"""
@@ -103,7 +101,7 @@ class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequire
"""
model = Equipment
- fields = ('name',)
+ fields = ('name', )
messages = gettext_lazy('Successfully deleted')
title = gettext_lazy('Delete equipment?')
permission_required = 'exercises.delete_equipment'
@@ -117,8 +115,7 @@ class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequire
context = super(EquipmentDeleteView, self).get_context_data(**kwargs)
context['title'] = _('Delete equipment?')
- context['form_action'] = reverse('exercise:equipment:delete',
- kwargs={'pk': pk})
+ context['form_action'] = reverse('exercise:equipment:delete', kwargs={'pk': pk})
return context
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 876deb5ca..6966e1ec3 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -23,7 +23,7 @@ from django.contrib import messages
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.core import mail
from django.core.exceptions import ValidationError
@@ -34,38 +34,38 @@ from django.forms import (
ModelForm,
ModelMultipleChoiceField,
Select,
- Textarea
+ Textarea,
)
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.template.loader import render_to_string
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.cache import patch_vary_headers
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# Third Party
from crispy_forms.layout import (
Column,
Layout,
- Row
+ Row,
)
# wger
@@ -75,23 +75,22 @@ from wger.exercises.models import (
Exercise,
ExerciseBase,
ExerciseCategory,
- Muscle
+ Muscle,
)
from wger.manager.models import WorkoutLog
from wger.utils.constants import MIN_EDIT_DISTANCE_THRESHOLD
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.helpers import levenshtein
from wger.utils.language import (
load_item_languages,
- load_language
+ load_language,
)
from wger.utils.widgets import TranslatedSelectMultiple
from wger.weight.helpers import process_log_entries
-
logger = logging.getLogger(__name__)
@@ -166,38 +165,47 @@ class ExerciseForm(ModelForm):
# Redefine some fields here to set some properties
# (some of this could be done with a crispy form helper and would be
# a cleaner solution)
- category = ModelChoiceField(queryset=ExerciseCategory.objects.all(),
- widget=Select())
- muscles = ModelMultipleChoiceField(queryset=Muscle.objects.all(),
- widget=CheckboxSelectMultiple(),
- required=False)
-
- muscles_secondary = ModelMultipleChoiceField(queryset=Muscle.objects.all(),
- widget=CheckboxSelectMultiple(),
- required=False)
-
- equipment = ModelMultipleChoiceField(queryset=Equipment.objects.all(),
- widget=CheckboxSelectMultiple(),
- required=False)
-
- description = CharField(label=_('Description'),
- widget=Textarea,
- required=False)
+ category = ModelChoiceField(queryset=ExerciseCategory.objects.all(), widget=Select())
+ muscles = ModelMultipleChoiceField(
+ queryset=Muscle.objects.all(),
+ widget=CheckboxSelectMultiple(),
+ required=False,
+ )
+
+ muscles_secondary = ModelMultipleChoiceField(
+ queryset=Muscle.objects.all(),
+ widget=CheckboxSelectMultiple(),
+ required=False,
+ )
+
+ equipment = ModelMultipleChoiceField(
+ queryset=Equipment.objects.all(),
+ widget=CheckboxSelectMultiple(),
+ required=False,
+ )
+
+ description = CharField(
+ label=_('Description'),
+ widget=Textarea,
+ required=False,
+ )
class Meta:
model = Exercise
widgets = {'equipment': TranslatedSelectMultiple()}
- fields = ['name_original',
- 'category',
- 'description',
- 'muscles',
- 'muscles_secondary',
- 'equipment',
- 'license',
- 'license_author']
+ fields = [
+ 'name_original',
+ 'category',
+ 'description',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment',
+ 'license',
+ 'license_author',
+ ]
class Media:
- js = (settings.STATIC_URL + 'yarn/tinymce/tinymce.min.js',)
+ js = (settings.STATIC_URL + 'yarn/tinymce/tinymce.min.js', )
def clean_name_original(self):
"""
@@ -215,9 +223,14 @@ class ExerciseForm(ModelForm):
min_edit_dist = levenshtein(exercise_name.casefold(), name_original.casefold())
if min_edit_dist < MIN_EDIT_DISTANCE_THRESHOLD:
raise ValidationError(
- _('%(name_original)s is too similar to existing exercise '
- '"%(exercise_name)s"'),
- params={'name_original': name_original, 'exercise_name': exercise_name},
+ _(
+ '%(name_original)s is too similar to existing exercise '
+ '"%(exercise_name)s"'
+ ),
+ params={
+ 'name_original': name_original,
+ 'exercise_name': exercise_name
+ },
)
return name_original
@@ -274,10 +287,12 @@ class ExercisesEditAddView(WgerFormMixin):
return super(ExercisesEditAddView, self).form_valid(form)
-class ExerciseUpdateView(ExercisesEditAddView,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- UpdateView):
+class ExerciseUpdateView(
+ ExercisesEditAddView,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ UpdateView,
+):
"""
Generic view to update an existing exercise
"""
@@ -303,7 +318,8 @@ class ExerciseAddView(ExercisesEditAddView, LoginRequiredMixin, CreateView):
# Try retrieving a base exercise first
existing = ExerciseBase.objects.filter(
- category=ExerciseCategory.objects.get(name=form.cleaned_data['category']))
+ category=ExerciseCategory.objects.get(name=form.cleaned_data['category'])
+ )
for elem in form.cleaned_data['equipment'].all():
existing = existing.filter(equipment=elem)
for elem in form.cleaned_data['muscles'].all():
@@ -376,26 +392,30 @@ class ExerciseCorrectView(ExercisesEditAddView, LoginRequiredMixin, UpdateView):
'user': self.request.user
}
message = render_to_string('exercise/email_correction.tpl', context)
- mail.mail_admins(str(subject),
- str(message),
- fail_silently=True)
+ mail.mail_admins(
+ str(subject),
+ str(message),
+ fail_silently=True,
+ )
messages.success(self.request, self.messages)
- return HttpResponseRedirect(reverse('exercise:exercise:view',
- kwargs={'id': self.object.id}))
+ return HttpResponseRedirect(
+ reverse('exercise:exercise:view', kwargs={'id': self.object.id})
+ )
-class ExerciseDeleteView(WgerDeleteMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- DeleteView):
+class ExerciseDeleteView(
+ WgerDeleteMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ DeleteView,
+):
"""
Generic view to delete an existing exercise
"""
model = Exercise
- fields = ('description',
- 'name_original')
+ fields = ('description', 'name_original')
success_url = reverse_lazy('exercise:exercise:overview')
delete_message_extra = gettext_lazy('This will delete the exercise from all workouts.')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index 8b4884cc5..d8935130f 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -21,44 +21,44 @@ import logging
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
- UpdateView
+ UpdateView,
)
# wger
from wger.exercises.forms import ExerciseImageForm
from wger.exercises.models import (
Exercise,
- ExerciseImage
+ ExerciseImage,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
-
"""
Exercise images
"""
-class ExerciseImageEditView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- UpdateView):
+class ExerciseImageEditView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ UpdateView,
+):
"""
Generic view to update an existing exercise image
"""
@@ -78,10 +78,12 @@ class ExerciseImageEditView(WgerFormMixin,
return context
-class ExerciseImageAddView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- CreateView):
+class ExerciseImageAddView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ CreateView,
+):
"""
Generic view to add a new exercise image
"""
@@ -110,10 +112,12 @@ class ExerciseImageAddView(WgerFormMixin,
return context
-class ExerciseImageDeleteView(WgerDeleteMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- DeleteView):
+class ExerciseImageDeleteView(
+ WgerDeleteMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ DeleteView,
+):
"""
Generic view to delete an existing exercise image
"""
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 35bd9518a..634e49a2e 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -20,18 +20,18 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
@@ -39,11 +39,10 @@ from wger.config.models import LanguageConfig
from wger.exercises.models import Muscle
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.language import load_item_languages
-
logger = logging.getLogger(__name__)
diff --git a/wger/gallery/__init__.py b/wger/gallery/__init__.py
index ca2d162cb..41ff0c01b 100644
--- a/wger/gallery/__init__.py
+++ b/wger/gallery/__init__.py
@@ -15,10 +15,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.gallery.apps.GalleryConfig'
diff --git a/wger/gallery/api/serializers.py b/wger/gallery/api/serializers.py
index 2d1686b99..1b4ae567c 100644
--- a/wger/gallery/api/serializers.py
+++ b/wger/gallery/api/serializers.py
@@ -9,9 +9,12 @@ class ImageSerializer(serializers.ModelSerializer):
"""
Exercise serializer
"""
+
class Meta:
model = Image
- fields = ['id',
- 'date',
- 'image',
- 'description']
+ fields = [
+ 'id',
+ 'date',
+ 'image',
+ 'description',
+ ]
diff --git a/wger/gallery/api/views.py b/wger/gallery/api/views.py
index 3788cc437..3b2572113 100644
--- a/wger/gallery/api/views.py
+++ b/wger/gallery/api/views.py
@@ -22,7 +22,7 @@ import logging
from rest_framework import viewsets
from rest_framework.parsers import (
FormParser,
- MultiPartParser
+ MultiPartParser,
)
from rest_framework.permissions import IsAuthenticated
@@ -30,7 +30,6 @@ from rest_framework.permissions import IsAuthenticated
from wger.gallery.api.serializers import ImageSerializer
from wger.gallery.models import Image
-
logger = logging.getLogger(__name__)
@@ -43,9 +42,11 @@ class ImageViewSet(viewsets.ModelViewSet):
serializer_class = ImageSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ['id',
- 'date',
- 'description']
+ filterset_fields = [
+ 'id',
+ 'date',
+ 'description',
+ ]
def get_queryset(self):
"""
diff --git a/wger/gallery/apps.py b/wger/gallery/apps.py
index a91290a7e..670c4e422 100644
--- a/wger/gallery/apps.py
+++ b/wger/gallery/apps.py
@@ -1,5 +1,6 @@
from django.apps import AppConfig
+
class GalleryConfig(AppConfig):
name = 'wger.gallery'
verbose_name = "Gallery"
diff --git a/wger/gallery/forms.py b/wger/gallery/forms.py
index b9ada6da3..05e547b68 100644
--- a/wger/gallery/forms.py
+++ b/wger/gallery/forms.py
@@ -2,7 +2,7 @@
from django.forms import (
DateField,
ModelForm,
- widgets
+ widgets,
)
# wger
diff --git a/wger/gallery/migrations/0001_initial.py b/wger/gallery/migrations/0001_initial.py
index 2752dd91d..b90a8f036 100644
--- a/wger/gallery/migrations/0001_initial.py
+++ b/wger/gallery/migrations/0001_initial.py
@@ -19,24 +19,37 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Image',
fields=[
- ('id', models.AutoField(auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID')),
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ )
+ ),
('date', models.DateField(default=datetime.datetime.now, verbose_name='Date')),
- ('image', models.ImageField(height_field='height',
- help_text='Only PNG and JPEG formats are supported',
- upload_to=wger.gallery.models.image.gallery_upload_dir,
- verbose_name='Image',
- width_field='width')),
+ (
+ 'image',
+ models.ImageField(
+ height_field='height',
+ help_text='Only PNG and JPEG formats are supported',
+ upload_to=wger.gallery.models.image.gallery_upload_dir,
+ verbose_name='Image',
+ width_field='width'
+ )
+ ),
('height', models.IntegerField(editable=False)),
('width', models.IntegerField(editable=False)),
- ('description', models.TextField(blank=True,
- max_length=1000,
- verbose_name='Description')),
- ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
- to=settings.AUTH_USER_MODEL,
- verbose_name='User')),
+ (
+ 'description',
+ models.TextField(blank=True, max_length=1000, verbose_name='Description')
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to=settings.AUTH_USER_MODEL,
+ verbose_name='User'
+ )
+ ),
],
options={
'ordering': ['-date'],
diff --git a/wger/gallery/models/image.py b/wger/gallery/models/image.py
index c98a879bc..bdd9859fd 100644
--- a/wger/gallery/models/image.py
+++ b/wger/gallery/models/image.py
@@ -30,28 +30,35 @@ def gallery_upload_dir(instance, filename):
"""
Returns the upload target for exercise images
"""
- return "gallery/{0}/{1}{2}".format(instance.user.id,
- uuid.uuid4(),
- pathlib.Path(filename).suffix)
+ return "gallery/{0}/{1}{2}".format(
+ instance.user.id,
+ uuid.uuid4(),
+ pathlib.Path(filename).suffix,
+ )
class Image(models.Model):
class Meta:
- ordering = ["-date", ]
-
- date = models.DateField(_('Date'),
- default=datetime.datetime.now)
-
- user = models.ForeignKey(User,
- verbose_name=_('User'),
- on_delete=models.CASCADE)
-
- image = models.ImageField(verbose_name=_('Image'),
- help_text=_('Only PNG and JPEG formats are supported'),
- upload_to=gallery_upload_dir,
- height_field='height',
- width_field='width')
+ ordering = [
+ "-date",
+ ]
+
+ date = models.DateField(_('Date'), default=datetime.datetime.now)
+
+ user = models.ForeignKey(
+ User,
+ verbose_name=_('User'),
+ on_delete=models.CASCADE,
+ )
+
+ image = models.ImageField(
+ verbose_name=_('Image'),
+ help_text=_('Only PNG and JPEG formats are supported'),
+ upload_to=gallery_upload_dir,
+ height_field='height',
+ width_field='width',
+ )
height = models.IntegerField(editable=False)
"""Height of the image"""
@@ -59,9 +66,11 @@ class Image(models.Model):
width = models.IntegerField(editable=False)
"""Width of the image"""
- description = models.TextField(verbose_name=_('Description'),
- max_length=1000,
- blank=True)
+ description = models.TextField(
+ verbose_name=_('Description'),
+ max_length=1000,
+ blank=True,
+ )
def get_owner_object(self):
"""
diff --git a/wger/gallery/tests/test_gallery_image.py b/wger/gallery/tests/test_gallery_image.py
index 3055baba1..505bb7e5b 100644
--- a/wger/gallery/tests/test_gallery_image.py
+++ b/wger/gallery/tests/test_gallery_image.py
@@ -18,7 +18,7 @@ import datetime
# wger
from wger.core.tests.base_testcase import (
WgerAddTestCase,
- WgerDeleteTestCase
+ WgerDeleteTestCase,
)
from wger.gallery.models import Image
@@ -31,10 +31,12 @@ class AddGalleryImageTestCase(WgerAddTestCase):
object_class = Image
url = 'gallery:images:add'
user_fail = False
- data = {'date': datetime.date(2021, 5, 1),
- 'user': 1,
- 'description': 'Everything going well',
- 'image': open('wger/exercises/tests/protestschwein.jpg', 'rb')}
+ data = {
+ 'date': datetime.date(2021, 5, 1),
+ 'user': 1,
+ 'description': 'Everything going well',
+ 'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),
+ }
class DeleteGalleryImageTestCase(WgerDeleteTestCase):
diff --git a/wger/gallery/urls.py b/wger/gallery/urls.py
index 1dac3cc88..59e87cd6c 100644
--- a/wger/gallery/urls.py
+++ b/wger/gallery/urls.py
@@ -14,7 +14,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.conf.urls import include
from django.urls import path
@@ -22,24 +21,30 @@ from django.urls import path
# wger
from wger.gallery.views import images
-
# 'sub patterns' for gyms
patterns_images = [
- path('overview',
- images.overview,
- name='overview'),
- path('<int:pk>/edit',
- images.ImageUpdateView.as_view(),
- name='edit'),
- path('add',
- images.ImageAddView.as_view(),
- name='add'),
- path('<int:pk>/delete',
- images.ImageDeleteView.as_view(),
- name='delete'),
+ path(
+ 'overview',
+ images.overview,
+ name='overview',
+ ),
+ path(
+ '<int:pk>/edit',
+ images.ImageUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'add',
+ images.ImageAddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/delete',
+ images.ImageDeleteView.as_view(),
+ name='delete',
+ ),
]
-
#
# All patterns for this app
#
diff --git a/wger/gallery/views/images.py b/wger/gallery/views/images.py
index 97d5f0580..b8b7be6b2 100644
--- a/wger/gallery/views/images.py
+++ b/wger/gallery/views/images.py
@@ -23,13 +23,16 @@ from django.contrib.auth.mixins import LoginRequiredMixin
from django.shortcuts import render
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
+)
+from django.utils.translation import (
+ gettext_lazy,
+ gettext_lazy as _,
)
-from django.utils.translation import gettext_lazy as _, gettext_lazy
from django.views.generic import (
CreateView,
DeleteView,
- UpdateView
+ UpdateView,
)
# wger
@@ -37,7 +40,7 @@ from wger.gallery.forms import ImageForm
from wger.gallery.models.image import Image
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
@@ -68,8 +71,7 @@ class ImageAddView(WgerFormMixin, CreateView):
Read the comment on weight/models.py WeightEntry about why we need
to pass the user here.
"""
- return {'user': self.request.user,
- 'date': datetime.today()}
+ return {'user': self.request.user, 'date': datetime.today()}
def form_valid(self, form):
"""
diff --git a/wger/gym/__init__.py b/wger/gym/__init__.py
index 869912bd4..b01c282b3 100644
--- a/wger/gym/__init__.py
+++ b/wger/gym/__init__.py
@@ -18,6 +18,5 @@
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.gym.apps.GymConfig'
diff --git a/wger/gym/forms.py b/wger/gym/forms.py
index dcbfeb125..2a584c908 100644
--- a/wger/gym/forms.py
+++ b/wger/gym/forms.py
@@ -42,10 +42,9 @@ class GymUserPermissionForm(forms.ModelForm):
class Meta:
model = User
- fields = ('role',)
+ fields = ('role', )
- role = forms.MultipleChoiceField(choices=ROLES,
- initial=USER)
+ role = forms.MultipleChoiceField(choices=ROLES, initial=USER)
def __init__(self, available_roles=None, *args, **kwargs):
"""
@@ -63,9 +62,11 @@ class GymUserPermissionForm(forms.ModelForm):
if 'manager' in available_roles:
field_choices.append((self.MANAGER, _('General manager')))
- self.fields['role'] = forms.MultipleChoiceField(choices=field_choices,
- initial=User,
- widget=BootstrapSelectMultiple())
+ self.fields['role'] = forms.MultipleChoiceField(
+ choices=field_choices,
+ initial=User,
+ widget=BootstrapSelectMultiple(),
+ )
self.helper = FormHelper()
self.helper.form_class = 'wger-form'
self.helper.add_input(Submit('submit', _("Save"), css_class='btn-success btn-block'))
@@ -81,16 +82,26 @@ class GymUserAddForm(GymUserPermissionForm, UserPersonalInformationForm):
class Meta:
model = User
widgets = {'role': BootstrapSelectMultiple()}
- fields = ('first_name', 'last_name', 'username', 'email', 'role',)
-
- username = forms.RegexField(label=_("Username"),
- max_length=30,
- regex=r'^[\w.@+-]+$',
- help_text=_("Required. 30 characters or fewer. Letters, digits and "
- "@/./+/-/_ only."),
- error_messages={
- 'invalid': _("This value may contain only letters, numbers and "
- "@/.//-/_ characters.")})
+ fields = (
+ 'first_name',
+ 'last_name',
+ 'username',
+ 'email',
+ 'role',
+ )
+
+ username = forms.RegexField(
+ label=_("Username"),
+ max_length=30,
+ regex=r'^[\w.@+-]+$',
+ help_text=_("Required. 30 characters or fewer. Letters, digits and "
+ "@/./+/-/_ only."),
+ error_messages={
+ 'invalid':
+ _("This value may contain only letters, numbers and "
+ "@/.//-/_ characters.")
+ },
+ )
def clean_username(self):
"""
diff --git a/wger/gym/helpers.py b/wger/gym/helpers.py
index 8f667e0bb..c2ee1250a 100644
--- a/wger/gym/helpers.py
+++ b/wger/gym/helpers.py
@@ -17,7 +17,7 @@
# wger
from wger.manager.models import (
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
diff --git a/wger/gym/management/commands/gym-user-config.py b/wger/gym/management/commands/gym-user-config.py
index eaaeea1aa..51469a1d3 100644
--- a/wger/gym/management/commands/gym-user-config.py
+++ b/wger/gym/management/commands/gym-user-config.py
@@ -23,7 +23,7 @@ from django.core.management.base import BaseCommand
from wger.gym.helpers import is_any_gym_admin
from wger.gym.models import (
GymAdminConfig,
- GymUserConfig
+ GymUserConfig,
)
diff --git a/wger/gym/management/commands/inactive-members.py b/wger/gym/management/commands/inactive-members.py
index 8e062e53c..b7a7ba134 100644
--- a/wger/gym/management/commands/inactive-members.py
+++ b/wger/gym/management/commands/inactive-members.py
@@ -101,8 +101,10 @@ class Command(BaseCommand):
'user_list_no_activity': user_list_no_activity
}
message = render_to_string('gym/email_inactive_members.html', context)
- mail.send_mail(subject,
- message,
- settings.WGER_SETTINGS['EMAIL_FROM'],
- [trainer.email],
- fail_silently=True)
+ mail.send_mail(
+ subject,
+ message,
+ settings.WGER_SETTINGS['EMAIL_FROM'],
+ [trainer.email],
+ fail_silently=True,
+ )
diff --git a/wger/gym/managers.py b/wger/gym/managers.py
index 0cfef7724..a14c15976 100644
--- a/wger/gym/managers.py
+++ b/wger/gym/managers.py
@@ -17,7 +17,7 @@
# Django
from django.contrib.auth.models import (
Permission,
- User
+ User,
)
from django.db import models
from django.db.models import Q
@@ -27,6 +27,7 @@ class GymManager(models.Manager):
"""
Custom query manager for Gyms
"""
+
def get_members(self, gym_pk):
"""
Returns all members for this gym (i.e non-admin ones)
@@ -36,9 +37,11 @@ class GymManager(models.Manager):
perm_trainer = Permission.objects.get(codename='gym_trainer')
users = User.objects.filter(userprofile__gym_id=gym_pk)
- return users.exclude(Q(groups__permissions=perm_gym)
- | Q(groups__permissions=perm_gyms)
- | Q(groups__permissions=perm_trainer)).distinct()
+ return users.exclude(
+ Q(groups__permissions=perm_gym)
+ | Q(groups__permissions=perm_gyms)
+ | Q(groups__permissions=perm_trainer)
+ ).distinct()
def get_admins(self, gym_pk):
"""
@@ -49,6 +52,8 @@ class GymManager(models.Manager):
perm_trainer = Permission.objects.get(codename='gym_trainer')
users = User.objects.filter(userprofile__gym_id=gym_pk)
- return users.filter(Q(groups__permissions=perm_gym)
- | Q(groups__permissions=perm_gyms)
- | Q(groups__permissions=perm_trainer)).distinct()
+ return users.filter(
+ Q(groups__permissions=perm_gym)
+ | Q(groups__permissions=perm_gyms)
+ | Q(groups__permissions=perm_trainer)
+ ).distinct()
diff --git a/wger/gym/migrations/0001_initial.py b/wger/gym/migrations/0001_initial.py
index 8428460a7..98f213367 100644
--- a/wger/gym/migrations/0001_initial.py
+++ b/wger/gym/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
from django.conf import settings
import wger.gym.models
@@ -15,88 +15,225 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='AdminUserNote',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('timestamp_created', models.DateTimeField(auto_now_add=True)),
('timestamp_edited', models.DateTimeField(auto_now=True)),
('note', models.TextField(verbose_name='Note')),
- ('member', models.ForeignKey(related_name='adminusernote_member', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
- ('user', models.ForeignKey(related_name='adminusernote_user', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'member',
+ models.ForeignKey(
+ related_name='adminusernote_member',
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ related_name='adminusernote_user',
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['-timestamp_created'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Gym',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('name', models.CharField(max_length=60, verbose_name='Name')),
- ('phone', models.CharField(max_length=20, null=True, verbose_name='Phone', blank=True)),
- ('email', models.EmailField(max_length=75, null=True, verbose_name='Email', blank=True)),
- ('owner', models.CharField(max_length=100, null=True, verbose_name='Owner', blank=True)),
- ('zip_code', models.IntegerField(max_length=5, null=True, verbose_name='ZIP code', blank=True)),
- ('city', models.CharField(max_length=30, null=True, verbose_name='City', blank=True)),
- ('street', models.CharField(max_length=30, null=True, verbose_name='Street', blank=True)),
+ (
+ 'phone',
+ models.CharField(max_length=20, null=True, verbose_name='Phone', blank=True)
+ ),
+ (
+ 'email',
+ models.EmailField(max_length=75, null=True, verbose_name='Email', blank=True)
+ ),
+ (
+ 'owner',
+ models.CharField(max_length=100, null=True, verbose_name='Owner', blank=True)
+ ),
+ (
+ 'zip_code',
+ models.IntegerField(
+ max_length=5, null=True, verbose_name='ZIP code', blank=True
+ )
+ ),
+ (
+ 'city',
+ models.CharField(max_length=30, null=True, verbose_name='City', blank=True)
+ ),
+ (
+ 'street',
+ models.CharField(max_length=30, null=True, verbose_name='Street', blank=True)
+ ),
],
options={
'ordering': ['name'],
- 'permissions': (('gym_trainer', 'Trainer, can see the users for a gym'), ('manage_gym', 'Admin, can manage users for a gym'), ('manage_gyms', 'Admin, can administrate the different gyms')),
+ 'permissions': (
+ ('gym_trainer', 'Trainer, can see the users for a gym'),
+ ('manage_gym', 'Admin, can manage users for a gym'),
+ ('manage_gyms', 'Admin, can administrate the different gyms')
+ ),
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='GymAdminConfig',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('overview_inactive', models.BooleanField(default=True, help_text='Receive email overviews of inactive members', verbose_name='Overview inactive members')),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'overview_inactive',
+ models.BooleanField(
+ default=True,
+ help_text='Receive email overviews of inactive members',
+ verbose_name='Overview inactive members'
+ )
+ ),
('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),
- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'user',
+ models.OneToOneField(
+ editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='GymConfig',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('weeks_inactive', models.PositiveIntegerField(default=4, help_text='Number of weeks since the last time a user logged his presence to be considered inactive', max_length=2, verbose_name='Reminder inactive members')),
- ('gym', models.OneToOneField(related_name='config', editable=False, to='gym.Gym', on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'weeks_inactive',
+ models.PositiveIntegerField(
+ default=4,
+ help_text=
+ 'Number of weeks since the last time a user logged his presence to be considered inactive',
+ max_length=2,
+ verbose_name='Reminder inactive members'
+ )
+ ),
+ (
+ 'gym',
+ models.OneToOneField(
+ related_name='config',
+ editable=False,
+ to='gym.Gym',
+ on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='GymUserConfig',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('include_inactive', models.BooleanField(default=True, help_text='Include this user in the email list with inactive members', verbose_name='Include in inactive overview')),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'include_inactive',
+ models.BooleanField(
+ default=True,
+ help_text='Include this user in the email list with inactive members',
+ verbose_name='Include in inactive overview'
+ )
+ ),
('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),
- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'user',
+ models.OneToOneField(
+ editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='UserDocument',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('timestamp_created', models.DateTimeField(auto_now_add=True)),
('timestamp_edited', models.DateTimeField(auto_now=True)),
- ('document', models.FileField(upload_to=wger.gym.models.gym_document_upload_dir, verbose_name='Document')),
+ (
+ 'document',
+ models.FileField(
+ upload_to=wger.gym.models.gym_document_upload_dir, verbose_name='Document'
+ )
+ ),
('original_name', models.CharField(max_length=128, editable=False)),
- ('name', models.CharField(help_text='Will use file name if nothing provided', max_length=60, verbose_name='Name', blank=True)),
+ (
+ 'name',
+ models.CharField(
+ help_text='Will use file name if nothing provided',
+ max_length=60,
+ verbose_name='Name',
+ blank=True
+ )
+ ),
('note', models.TextField(null=True, verbose_name='Note', blank=True)),
- ('member', models.ForeignKey(related_name='userdocument_member', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
- ('user', models.ForeignKey(related_name='userdocument_user', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'member',
+ models.ForeignKey(
+ related_name='userdocument_member',
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ related_name='userdocument_user',
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['-timestamp_created'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.AlterUniqueTogether(
name='gymuserconfig',
diff --git a/wger/gym/migrations/0002_auto_20151003_1944.py b/wger/gym/migrations/0002_auto_20151003_1944.py
index 53ee616b1..9d729ee2f 100644
--- a/wger/gym/migrations/0002_auto_20151003_1944.py
+++ b/wger/gym/migrations/0002_auto_20151003_1944.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
from django.conf import settings
import datetime
@@ -26,6 +26,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='gymconfig',
name='weeks_inactive',
- field=models.PositiveIntegerField(help_text='Number of weeks since the last time a user logged his presence to be considered inactive', default=4, verbose_name='Reminder inactive members'),
+ field=models.PositiveIntegerField(
+ help_text=
+ 'Number of weeks since the last time a user logged his presence to be considered inactive',
+ default=4,
+ verbose_name='Reminder inactive members'
+ ),
),
]
diff --git a/wger/gym/migrations/0003_auto_20151003_2008.py b/wger/gym/migrations/0003_auto_20151003_2008.py
index 3ad55d82c..0acd7062b 100644
--- a/wger/gym/migrations/0003_auto_20151003_2008.py
+++ b/wger/gym/migrations/0003_auto_20151003_2008.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
import datetime
from django.conf import settings
@@ -16,20 +16,65 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Contract',
fields=[
- ('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, verbose_name='ID', serialize=False, primary_key=True
+ )
+ ),
('timestamp_created', models.DateTimeField(auto_now_add=True)),
('timestamp_edited', models.DateTimeField(auto_now=True)),
('amount', models.PositiveIntegerField(verbose_name='Amount', default=0)),
- ('payment', models.CharField(verbose_name='Payment type', default='3', help_text='How often the amount will be charged to the member', choices=[('1', 'Yearly'), ('2', 'Half yearly'), ('3', 'Monthly'), ('4', 'Biweekly'), ('5', 'Weekly'), ('6', 'Daily')], max_length=2)),
+ (
+ 'payment',
+ models.CharField(
+ verbose_name='Payment type',
+ default='3',
+ help_text='How often the amount will be charged to the member',
+ choices=[
+ ('1', 'Yearly'), ('2', 'Half yearly'), ('3', 'Monthly'),
+ ('4', 'Biweekly'), ('5', 'Weekly'), ('6', 'Daily')
+ ],
+ max_length=2
+ )
+ ),
('is_active', models.BooleanField(verbose_name='Contract is active', default=True)),
- ('date_start', models.DateField(verbose_name='Start date', blank=True, default=datetime.date.today, null=True)),
+ (
+ 'date_start',
+ models.DateField(
+ verbose_name='Start date',
+ blank=True,
+ default=datetime.date.today,
+ null=True
+ )
+ ),
('date_end', models.DateField(verbose_name='End date', blank=True, null=True)),
- ('email', models.EmailField(verbose_name='Email', blank=True, null=True, max_length=254)),
- ('zip_code', models.CharField(verbose_name='ZIP code', blank=True, null=True, max_length=10)),
- ('city', models.CharField(verbose_name='City', blank=True, null=True, max_length=30)),
- ('street', models.CharField(verbose_name='Street', blank=True, null=True, max_length=30)),
- ('phone', models.CharField(verbose_name='Phone', blank=True, null=True, max_length=20)),
- ('profession', models.CharField(verbose_name='Profession', blank=True, null=True, max_length=50)),
+ (
+ 'email',
+ models.EmailField(verbose_name='Email', blank=True, null=True, max_length=254)
+ ),
+ (
+ 'zip_code',
+ models.CharField(verbose_name='ZIP code', blank=True, null=True, max_length=10)
+ ),
+ (
+ 'city',
+ models.CharField(verbose_name='City', blank=True, null=True, max_length=30)
+ ),
+ (
+ 'street',
+ models.CharField(verbose_name='Street', blank=True, null=True, max_length=30)
+ ),
+ (
+ 'phone',
+ models.CharField(verbose_name='Phone', blank=True, null=True, max_length=20)
+ ),
+ (
+ 'profession',
+ models.CharField(
+ verbose_name='Profession', blank=True, null=True, max_length=50
+ )
+ ),
('note', models.TextField(verbose_name='Note', blank=True, null=True)),
],
options={
@@ -39,25 +84,49 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='ContractType',
fields=[
- ('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, verbose_name='ID', serialize=False, primary_key=True
+ )
+ ),
('name', models.CharField(verbose_name='Name', max_length=25)),
- ('description', models.TextField(verbose_name='Description', blank=True, null=True)),
+ (
+ 'description',
+ models.TextField(verbose_name='Description', blank=True, null=True)
+ ),
('gym', models.ForeignKey(to='gym.Gym', editable=False, on_delete=models.CASCADE)),
],
),
migrations.AddField(
model_name='contract',
name='contract_type',
- field=models.ForeignKey(verbose_name='Contract type', blank=True, null=True, to='gym.ContractType', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Contract type',
+ blank=True,
+ null=True,
+ to='gym.ContractType',
+ on_delete=models.CASCADE
+ ),
),
migrations.AddField(
model_name='contract',
name='member',
- field=models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, related_name='contract_member', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ related_name='contract_member',
+ on_delete=models.CASCADE
+ ),
),
migrations.AddField(
model_name='contract',
name='user',
- field=models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, related_name='contract_user', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ related_name='contract_user',
+ on_delete=models.CASCADE
+ ),
),
]
diff --git a/wger/gym/migrations/0004_auto_20151003_2357.py b/wger/gym/migrations/0004_auto_20151003_2357.py
index 50388b0a0..24ddc0233 100644
--- a/wger/gym/migrations/0004_auto_20151003_2357.py
+++ b/wger/gym/migrations/0004_auto_20151003_2357.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
@@ -13,6 +13,8 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='contract',
name='amount',
- field=models.DecimalField(default=0, verbose_name='Amount', max_digits=12, decimal_places=2),
+ field=models.DecimalField(
+ default=0, verbose_name='Amount', max_digits=12, decimal_places=2
+ ),
),
]
diff --git a/wger/gym/migrations/0005_auto_20151023_1522.py b/wger/gym/migrations/0005_auto_20151023_1522.py
index a1efe3653..60d5c7412 100644
--- a/wger/gym/migrations/0005_auto_20151023_1522.py
+++ b/wger/gym/migrations/0005_auto_20151023_1522.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
@@ -13,9 +13,17 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='ContractOption',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('name', models.CharField(max_length=25, verbose_name='Name')),
- ('description', models.TextField(null=True, verbose_name='Description', blank=True)),
+ (
+ 'description',
+ models.TextField(null=True, verbose_name='Description', blank=True)
+ ),
('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),
],
options={
diff --git a/wger/gym/migrations/0006_auto_20160214_1013.py b/wger/gym/migrations/0006_auto_20160214_1013.py
index c7a7f1596..02d0970ff 100644
--- a/wger/gym/migrations/0006_auto_20160214_1013.py
+++ b/wger/gym/migrations/0006_auto_20160214_1013.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
@@ -9,9 +9,10 @@ def update_permission_names(apps, schema_editor):
"""
Permission = apps.get_model("auth", "Permission")
- for name in ['Trainer, can see the users for a gym',
- 'Admin, can manage users for a gym',
- 'Admin, can administrate the different gyms']:
+ for name in [
+ 'Trainer, can see the users for a gym', 'Admin, can manage users for a gym',
+ 'Admin, can administrate the different gyms'
+ ]:
permissions = Permission.objects.filter(name=name)
if permissions.exists():
diff --git a/wger/gym/migrations/0007_auto_20170123_0920.py b/wger/gym/migrations/0007_auto_20170123_0920.py
index fcb617ba3..fb6ce4772 100644
--- a/wger/gym/migrations/0007_auto_20170123_0920.py
+++ b/wger/gym/migrations/0007_auto_20170123_0920.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.9.12 on 2017-01-23 08:20
from django.db import migrations, models
@@ -13,26 +13,46 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='gym',
- options={'ordering': ['name'], 'permissions': (('gym_trainer', 'Trainer: can see the users for a gym'), ('manage_gym', 'Admin: can manage users for a gym'), ('manage_gyms', 'Admin: can administrate the different gyms'))},
+ options={
+ 'ordering': ['name'],
+ 'permissions': (
+ ('gym_trainer', 'Trainer: can see the users for a gym'),
+ ('manage_gym', 'Admin: can manage users for a gym'),
+ ('manage_gyms', 'Admin: can administrate the different gyms')
+ )
+ },
),
migrations.AddField(
model_name='gymconfig',
name='show_name',
- field=models.BooleanField(default=False, verbose_name='Show name of the gym in the header'),
+ field=models.BooleanField(
+ default=False, verbose_name='Show name of the gym in the header'
+ ),
),
migrations.AlterField(
model_name='contract',
name='options',
- field=models.ManyToManyField(blank=True, to='gym.ContractOption', verbose_name='Options'),
+ field=models.ManyToManyField(
+ blank=True, to='gym.ContractOption', verbose_name='Options'
+ ),
),
migrations.AlterField(
model_name='gymadminconfig',
name='overview_inactive',
- field=models.BooleanField(default=True, help_text='Receive email overviews of inactive members', verbose_name='Overview of inactive members'),
+ field=models.BooleanField(
+ default=True,
+ help_text='Receive email overviews of inactive members',
+ verbose_name='Overview of inactive members'
+ ),
),
migrations.AlterField(
model_name='gymconfig',
name='weeks_inactive',
- field=models.PositiveIntegerField(default=4, help_text='Number of weeks since the last time a user logged his presence to be considered inactive', verbose_name='Reminder of inactive members'),
+ field=models.PositiveIntegerField(
+ default=4,
+ help_text=
+ 'Number of weeks since the last time a user logged his presence to be considered inactive',
+ verbose_name='Reminder of inactive members'
+ ),
),
]
diff --git a/wger/gym/migrations/0008_auto_20190618_1617.py b/wger/gym/migrations/0008_auto_20190618_1617.py
index 93f3e8ddd..9674666c0 100644
--- a/wger/gym/migrations/0008_auto_20190618_1617.py
+++ b/wger/gym/migrations/0008_auto_20190618_1617.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.11.21 on 2019-06-18 16:17
from django.db import migrations, models
@@ -15,7 +15,9 @@ class Migration(migrations.Migration):
model_name='gymconfig',
name='show_name',
field=models.BooleanField(
- default=False, help_text='Show the name of the gym in the site header',
- verbose_name='Show name in header'),
+ default=False,
+ help_text='Show the name of the gym in the site header',
+ verbose_name='Show name in header'
+ ),
),
]
diff --git a/wger/gym/models.py b/wger/gym/models.py
index 351f7557d..62209bebc 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -24,7 +24,7 @@ from django.db import models as m
from django.urls import reverse
from django.utils.translation import (
gettext,
- gettext_lazy as _
+ gettext_lazy as _,
)
# wger
@@ -42,50 +42,63 @@ class Gym(m.Model):
("manage_gym", _("Admin: can manage users for a gym")),
("manage_gyms", _("Admin: can administrate the different gyms")),
)
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
objects = GymManager()
"""
Custom Gym Query Manager
"""
- name = m.CharField(max_length=60,
- verbose_name=_('Name'))
+ name = m.CharField(max_length=60, verbose_name=_('Name'))
"""Gym name"""
- phone = m.CharField(verbose_name=_('Phone'),
- max_length=20,
- blank=True,
- null=True)
+ phone = m.CharField(
+ verbose_name=_('Phone'),
+ max_length=20,
+ blank=True,
+ null=True,
+ )
"""Phone number"""
- email = m.EmailField(verbose_name=_('Email'),
- blank=True,
- null=True)
+ email = m.EmailField(
+ verbose_name=_('Email'),
+ blank=True,
+ null=True,
+ )
"""Email"""
- owner = m.CharField(verbose_name=_('Owner'),
- max_length=100,
- blank=True,
- null=True)
+ owner = m.CharField(
+ verbose_name=_('Owner'),
+ max_length=100,
+ blank=True,
+ null=True,
+ )
"""Gym owner"""
- zip_code = m.CharField(_('ZIP code'),
- max_length=10,
- blank=True,
- null=True)
+ zip_code = m.CharField(
+ _('ZIP code'),
+ max_length=10,
+ blank=True,
+ null=True,
+ )
"""ZIP code"""
- city = m.CharField(_('City'),
- max_length=30,
- blank=True,
- null=True)
+ city = m.CharField(
+ _('City'),
+ max_length=30,
+ blank=True,
+ null=True,
+ )
"""City"""
- street = m.CharField(_('Street'),
- max_length=30,
- blank=True,
- null=True)
+ street = m.CharField(
+ _('Street'),
+ max_length=30,
+ blank=True,
+ null=True,
+ )
"""Street"""
def __str__(self):
@@ -112,25 +125,33 @@ class GymConfig(m.Model):
Configuration options for a gym
"""
- gym = m.OneToOneField(Gym,
- related_name='config',
- editable=False,
- on_delete=m.CASCADE)
+ gym = m.OneToOneField(
+ Gym,
+ related_name='config',
+ editable=False,
+ on_delete=m.CASCADE,
+ )
"""
Gym this configuration belongs to
"""
- weeks_inactive = m.PositiveIntegerField(verbose_name=_('Reminder of inactive members'),
- help_text=_('Number of weeks since the last time a '
- 'user logged his presence to be considered inactive'),
- default=4)
+ weeks_inactive = m.PositiveIntegerField(
+ verbose_name=_('Reminder of inactive members'),
+ help_text=_(
+ 'Number of weeks since the last time a '
+ 'user logged his presence to be considered inactive'
+ ),
+ default=4
+ )
"""
Reminder of inactive members
"""
- show_name = m.BooleanField(verbose_name=_('Show name in header'),
- help_text=_('Show the name of the gym in the site header'),
- default=False)
+ show_name = m.BooleanField(
+ verbose_name=_('Show name in header'),
+ help_text=_('Show the name of the gym in the site header'),
+ default=False,
+ )
"""
Show name of the current user's gym in the header, instead of 'wger'
"""
@@ -156,16 +177,20 @@ class AbstractGymUserConfigModel(m.Model):
class Meta:
abstract = True
- gym = m.ForeignKey(Gym,
- editable=False,
- on_delete=m.CASCADE)
+ gym = m.ForeignKey(
+ Gym,
+ editable=False,
+ on_delete=m.CASCADE,
+ )
"""
Gym this configuration belongs to
"""
- user = m.OneToOneField(User,
- editable=False,
- on_delete=m.CASCADE)
+ user = m.OneToOneField(
+ User,
+ editable=False,
+ on_delete=m.CASCADE,
+ )
"""
User this configuration belongs to
"""
@@ -182,9 +207,11 @@ class GymAdminConfig(AbstractGymUserConfigModel, m.Model):
Only one entry per user and gym
"""
- overview_inactive = m.BooleanField(verbose_name=_('Overview of inactive members'),
- help_text=_('Receive email overviews of inactive members'),
- default=True)
+ overview_inactive = m.BooleanField(
+ verbose_name=_('Overview of inactive members'),
+ help_text=_('Receive email overviews of inactive members'),
+ default=True,
+ )
"""
Reminder of inactive members
"""
@@ -207,10 +234,12 @@ class GymUserConfig(AbstractGymUserConfigModel, m.Model):
Only one entry per user and gym
"""
- include_inactive = m.BooleanField(verbose_name=_('Include in inactive overview'),
- help_text=_('Include this user in the email list with '
- 'inactive members'),
- default=True)
+ include_inactive = m.BooleanField(
+ verbose_name=_('Include in inactive overview'),
+ help_text=_('Include this user in the email list with '
+ 'inactive members'),
+ default=True,
+ )
"""
Include user in inactive overview
"""
@@ -232,20 +261,26 @@ class AdminUserNote(m.Model):
"""
Order by time
"""
- ordering = ["-timestamp_created", ]
+ ordering = [
+ "-timestamp_created",
+ ]
- user = m.ForeignKey(User,
- editable=False,
- related_name='adminusernote_user',
- on_delete=m.CASCADE)
+ user = m.ForeignKey(
+ User,
+ editable=False,
+ related_name='adminusernote_user',
+ on_delete=m.CASCADE,
+ )
"""
User this note belongs to
"""
- member = m.ForeignKey(User,
- editable=False,
- related_name='adminusernote_member',
- on_delete=m.CASCADE)
+ member = m.ForeignKey(
+ User,
+ editable=False,
+ related_name='adminusernote_member',
+ on_delete=m.CASCADE,
+ )
"""
Gym member this note refers to
"""
@@ -277,9 +312,11 @@ def gym_document_upload_dir(instance, filename):
"""
Returns the upload target for documents
"""
- return "gym/documents/{0}/{1}/{2}".format(instance.member.userprofile.gym.id,
- instance.member.id,
- uuid.uuid4())
+ return "gym/documents/{0}/{1}/{2}".format(
+ instance.member.userprofile.gym.id,
+ instance.member.id,
+ uuid.uuid4(),
+ )
class UserDocument(m.Model):
@@ -291,20 +328,21 @@ class UserDocument(m.Model):
"""
Order by time
"""
- ordering = ["-timestamp_created", ]
+ ordering = [
+ "-timestamp_created",
+ ]
- user = m.ForeignKey(User,
- editable=False,
- related_name='userdocument_user',
- on_delete=m.CASCADE)
+ user = m.ForeignKey(User, editable=False, related_name='userdocument_user', on_delete=m.CASCADE)
"""
User this note belongs to
"""
- member = m.ForeignKey(User,
- editable=False,
- related_name='userdocument_member',
- on_delete=m.CASCADE)
+ member = m.ForeignKey(
+ User,
+ editable=False,
+ related_name='userdocument_member',
+ on_delete=m.CASCADE,
+ )
"""
Gym member this note refers to
"""
@@ -319,29 +357,31 @@ class UserDocument(m.Model):
Last time when this document was edited
"""
- document = m.FileField(verbose_name=_('Document'),
- upload_to=gym_document_upload_dir)
+ document = m.FileField(verbose_name=_('Document'), upload_to=gym_document_upload_dir)
"""
Uploaded document
"""
- original_name = m.CharField(max_length=128,
- editable=False)
+ original_name = m.CharField(max_length=128, editable=False)
"""
Original document name when uploaded
"""
- name = m.CharField(max_length=60,
- verbose_name=_('Name'),
- help_text=_('Will use file name if nothing provided'),
- blank=True)
+ name = m.CharField(
+ max_length=60,
+ verbose_name=_('Name'),
+ help_text=_('Will use file name if nothing provided'),
+ blank=True,
+ )
"""
Name or description
"""
- note = m.TextField(verbose_name=_('Note'),
- blank=True,
- null=True)
+ note = m.TextField(
+ verbose_name=_('Note'),
+ blank=True,
+ null=True,
+ )
"""
Note with additional information
"""
@@ -375,24 +415,25 @@ class ContractType(m.Model):
"""
Order by name
"""
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
- gym = m.ForeignKey(Gym,
- editable=False,
- on_delete=m.CASCADE)
+ gym = m.ForeignKey(Gym, editable=False, on_delete=m.CASCADE)
"""
The gym this contract type belongs to
"""
- name = m.CharField(verbose_name=_('Name'),
- max_length=25)
+ name = m.CharField(verbose_name=_('Name'), max_length=25)
"""
The contract type's short name
"""
- description = m.TextField(verbose_name=_('Description'),
- blank=True,
- null=True)
+ description = m.TextField(
+ verbose_name=_('Description'),
+ blank=True,
+ null=True,
+ )
"""
Free text field for additional information
"""
@@ -424,24 +465,25 @@ class ContractOption(m.Model):
"""
Order by name
"""
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
- gym = m.ForeignKey(Gym,
- editable=False,
- on_delete=m.CASCADE)
+ gym = m.ForeignKey(Gym, editable=False, on_delete=m.CASCADE)
"""
The gym this contract option belongs to
"""
- name = m.CharField(verbose_name=_('Name'),
- max_length=25)
+ name = m.CharField(verbose_name=_('Name'), max_length=25)
"""
The contract options short name
"""
- description = m.TextField(verbose_name=_('Description'),
- blank=True,
- null=True)
+ description = m.TextField(
+ verbose_name=_('Description'),
+ blank=True,
+ null=True,
+ )
"""
Free text field for additional information
"""
@@ -484,20 +526,26 @@ class Contract(m.Model):
"""
Order by time
"""
- ordering = ["-date_start", ]
+ ordering = [
+ "-date_start",
+ ]
- user = m.ForeignKey(User,
- editable=False,
- related_name='contract_user',
- on_delete=m.CASCADE)
+ user = m.ForeignKey(
+ User,
+ editable=False,
+ related_name='contract_user',
+ on_delete=m.CASCADE,
+ )
"""
User that originally created the contract
"""
- member = m.ForeignKey(User,
- editable=False,
- related_name='contract_member',
- on_delete=m.CASCADE)
+ member = m.ForeignKey(
+ User,
+ editable=False,
+ related_name='contract_member',
+ on_delete=m.CASCADE,
+ )
"""
Gym member this contract refers to
"""
@@ -512,100 +560,125 @@ class Contract(m.Model):
Last time when the contract was edited
"""
- contract_type = m.ForeignKey(ContractType,
- blank=True,
- null=True,
- verbose_name=_('Contract type'),
- on_delete=m.CASCADE)
+ contract_type = m.ForeignKey(
+ ContractType,
+ blank=True,
+ null=True,
+ verbose_name=_('Contract type'),
+ on_delete=m.CASCADE,
+ )
"""
Optional type of contract
"""
- options = m.ManyToManyField(ContractOption,
- verbose_name=_('Options'),
- blank=True)
+ options = m.ManyToManyField(
+ ContractOption,
+ verbose_name=_('Options'),
+ blank=True,
+ )
"""
Options for the contract
"""
- amount = m.DecimalField(verbose_name=_('Amount'),
- decimal_places=2,
- max_digits=12,
- default=0)
+ amount = m.DecimalField(
+ verbose_name=_('Amount'),
+ decimal_places=2,
+ max_digits=12,
+ default=0,
+ )
"""
The amount to pay
"""
- payment = m.CharField(verbose_name=_('Payment type'),
- max_length=2,
- choices=AMOUNT_TYPE,
- default=AMOUNT_TYPE_MONTHLY,
- help_text=_('How often the amount will be charged to the member'))
+ payment = m.CharField(
+ verbose_name=_('Payment type'),
+ max_length=2,
+ choices=AMOUNT_TYPE,
+ default=AMOUNT_TYPE_MONTHLY,
+ help_text=_('How often the amount will be charged to the member')
+ )
"""
How often the amount will be charged to the member
"""
- is_active = m.BooleanField(verbose_name=_('Contract is active'),
- default=True)
+ is_active = m.BooleanField(verbose_name=_('Contract is active'), default=True)
"""
Flag showing whether the contract is currently active
"""
- date_start = m.DateField(verbose_name=_('Start date'),
- default=datetime.date.today,
- blank=True,
- null=True)
+ date_start = m.DateField(
+ verbose_name=_('Start date'),
+ default=datetime.date.today,
+ blank=True,
+ null=True,
+ )
"""
The date when the contract starts
"""
- date_end = m.DateField(verbose_name=_('End date'),
- blank=True,
- null=True)
+ date_end = m.DateField(
+ verbose_name=_('End date'),
+ blank=True,
+ null=True,
+ )
"""
The date when the contract ends
"""
- email = m.EmailField(verbose_name=_('Email'),
- blank=True,
- null=True)
+ email = m.EmailField(
+ verbose_name=_('Email'),
+ blank=True,
+ null=True,
+ )
"""The member's email"""
- zip_code = m.CharField(_('ZIP code'),
- max_length=10,
- blank=True,
- null=True)
+ zip_code = m.CharField(
+ _('ZIP code'),
+ max_length=10,
+ blank=True,
+ null=True,
+ )
"""ZIP code"""
- city = m.CharField(_('City'),
- max_length=30,
- blank=True,
- null=True)
+ city = m.CharField(
+ _('City'),
+ max_length=30,
+ blank=True,
+ null=True,
+ )
"""City"""
- street = m.CharField(_('Street'),
- max_length=30,
- blank=True,
- null=True)
+ street = m.CharField(
+ _('Street'),
+ max_length=30,
+ blank=True,
+ null=True,
+ )
"""Street"""
- phone = m.CharField(verbose_name=_('Phone'),
- max_length=20,
- blank=True,
- null=True)
+ phone = m.CharField(
+ verbose_name=_('Phone'),
+ max_length=20,
+ blank=True,
+ null=True,
+ )
"""Phone number"""
- profession = m.CharField(verbose_name=_('Profession'),
- max_length=50,
- blank=True,
- null=True)
+ profession = m.CharField(
+ verbose_name=_('Profession'),
+ max_length=50,
+ blank=True,
+ null=True,
+ )
"""
The member's profession
"""
- note = m.TextField(verbose_name=_('Note'),
- blank=True,
- null=True)
+ note = m.TextField(
+ verbose_name=_('Note'),
+ blank=True,
+ null=True,
+ )
"""
Free text note with additional information
"""
diff --git a/wger/gym/signals.py b/wger/gym/signals.py
index dd8e903e0..87577b68e 100644
--- a/wger/gym/signals.py
+++ b/wger/gym/signals.py
@@ -14,11 +14,10 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.db.models.signals import (
post_delete,
- post_save
+ post_save,
)
from django.dispatch import receiver
@@ -26,7 +25,7 @@ from django.dispatch import receiver
from wger.gym.models import (
Gym,
GymConfig,
- UserDocument
+ UserDocument,
)
diff --git a/wger/gym/tests/test_admin_config.py b/wger/gym/tests/test_admin_config.py
index cf61f9a62..62fd6222f 100644
--- a/wger/gym/tests/test_admin_config.py
+++ b/wger/gym/tests/test_admin_config.py
@@ -26,10 +26,12 @@ class EditConfigTestCase(WgerEditTestCase):
url = 'gym:admin_config:edit'
pk = 1
user_success = 'admin'
- user_fail = ('member1',
- 'manager1',
- 'manager2',
- 'trainer4',
- 'general_manager1',
- 'general_manager2')
+ user_fail = (
+ 'member1',
+ 'manager1',
+ 'manager2',
+ 'trainer4',
+ 'general_manager1',
+ 'general_manager2',
+ )
data = {'overview_inactive': False}
diff --git a/wger/gym/tests/test_admin_user_notes.py b/wger/gym/tests/test_admin_user_notes.py
index d814cd71f..c5fef3d1e 100644
--- a/wger/gym/tests/test_admin_user_notes.py
+++ b/wger/gym/tests/test_admin_user_notes.py
@@ -21,7 +21,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- delete_testcase_add_methods
+ delete_testcase_add_methods,
)
from wger.gym.models import AdminUserNote
@@ -32,15 +32,19 @@ class AdminNoteOverviewTest(WgerAccessTestCase):
"""
url = reverse_lazy('gym:admin_note:list', kwargs={'user_pk': 14})
anonymous_fail = True
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('member1',
- 'manager1',
- 'manager2',
- 'trainer4',
- 'general_manager1',
- 'general_manager2')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'member1',
+ 'manager1',
+ 'manager2',
+ 'trainer4',
+ 'general_manager1',
+ 'general_manager2',
+ )
class AddAdminNoteTestCase(WgerAddTestCase):
@@ -50,15 +54,19 @@ class AddAdminNoteTestCase(WgerAddTestCase):
object_class = AdminUserNote
url = reverse_lazy('gym:admin_note:add', kwargs={'user_pk': 14})
data = {'note': 'The note text goes here'}
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('member1',
- 'manager1',
- 'manager2',
- 'trainer4',
- 'general_manager1',
- 'general_manager2')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'member1',
+ 'manager1',
+ 'manager2',
+ 'trainer4',
+ 'general_manager1',
+ 'general_manager2',
+ )
class EditAdminNoteTestCase(WgerEditTestCase):
@@ -69,15 +77,19 @@ class EditAdminNoteTestCase(WgerEditTestCase):
object_class = AdminUserNote
url = 'gym:admin_note:edit'
pk = 1
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('member1',
- 'manager1',
- 'manager2',
- 'trainer4',
- 'general_manager1',
- 'general_manager2')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'member1',
+ 'manager1',
+ 'manager2',
+ 'trainer4',
+ 'general_manager1',
+ 'general_manager2',
+ )
data = {'note': 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr'}
@@ -89,15 +101,19 @@ class DeleteAdminNoteTestCase(WgerDeleteTestCase):
pk = 2
object_class = AdminUserNote
url = 'gym:admin_note:delete'
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('member1',
- 'manager1',
- 'manager2',
- 'trainer4',
- 'general_manager1',
- 'general_manager2')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'member1',
+ 'manager1',
+ 'manager2',
+ 'trainer4',
+ 'general_manager1',
+ 'general_manager2',
+ )
delete_testcase_add_methods(DeleteAdminNoteTestCase)
diff --git a/wger/gym/tests/test_config.py b/wger/gym/tests/test_config.py
index e2f289ba1..5b2e994da 100644
--- a/wger/gym/tests/test_config.py
+++ b/wger/gym/tests/test_config.py
@@ -27,13 +27,17 @@ class EditGymConfigTestCase(WgerEditTestCase):
object_class = GymConfig
url = 'gym:config:edit'
data = {'weeks_inactive': 10, 'show_name': True}
- user_success = ('admin',
- 'manager1',
- 'manager2')
- user_fail = ('member1',
- 'general_manager1',
- 'trainer1',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_success = (
+ 'admin',
+ 'manager1',
+ 'manager2',
+ )
+ user_fail = (
+ 'member1',
+ 'general_manager1',
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
diff --git a/wger/gym/tests/test_contract_options.py b/wger/gym/tests/test_contract_options.py
index c24fa9d19..569461bf0 100644
--- a/wger/gym/tests/test_contract_options.py
+++ b/wger/gym/tests/test_contract_options.py
@@ -21,7 +21,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- delete_testcase_add_methods
+ delete_testcase_add_methods,
)
from wger.gym.models import ContractOption
@@ -34,18 +34,22 @@ class AddContractOptionTestCase(WgerAddTestCase):
object_class = ContractOption
url = reverse('gym:contract-option:add', kwargs={'gym_pk': 1})
data = {'name': 'Some name'}
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = (
+ 'manager1',
+ 'manager2',
+ )
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
class EditContractOptionTestCase(WgerEditTestCase):
@@ -56,18 +60,19 @@ class EditContractOptionTestCase(WgerEditTestCase):
pk = 1
object_class = ContractOption
url = 'gym:contract-option:edit'
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
data = {'name': 'Standard contract 16-Gj'}
@@ -79,18 +84,19 @@ class DeleteContractOptionTestCase(WgerDeleteTestCase):
pk = 1
object_class = ContractOption
url = 'gym:contract-option:delete'
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
delete_testcase_add_methods(DeleteContractOptionTestCase)
@@ -101,15 +107,16 @@ class AccessContractOptionOverviewTestCase(WgerAccessTestCase):
Test accessing the contract option page
"""
url = reverse('gym:contract-option:list', kwargs={'gym_pk': 1})
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
diff --git a/wger/gym/tests/test_contract_types.py b/wger/gym/tests/test_contract_types.py
index 0334ff137..c5a0fee1e 100644
--- a/wger/gym/tests/test_contract_types.py
+++ b/wger/gym/tests/test_contract_types.py
@@ -21,7 +21,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- delete_testcase_add_methods
+ delete_testcase_add_methods,
)
from wger.gym.models import ContractType
@@ -34,18 +34,19 @@ class AddContractTypeTestCase(WgerAddTestCase):
object_class = ContractType
url = reverse('gym:contract_type:add', kwargs={'gym_pk': 1})
data = {'name': 'Some name'}
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
class EditContractTypeTestCase(WgerEditTestCase):
@@ -56,18 +57,19 @@ class EditContractTypeTestCase(WgerEditTestCase):
pk = 1
object_class = ContractType
url = 'gym:contract_type:edit'
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
data = {'name': 'Standard contract 16-Gj'}
@@ -79,18 +81,19 @@ class DeleteContractTypeTestCase(WgerDeleteTestCase):
pk = 1
object_class = ContractType
url = 'gym:contract_type:delete'
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
delete_testcase_add_methods(DeleteContractTypeTestCase)
@@ -101,15 +104,16 @@ class AccessContractTypeOverviewTestCase(WgerAccessTestCase):
Test accessing the contract list page
"""
url = reverse('gym:contract_type:list', kwargs={'gym_pk': 1})
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
diff --git a/wger/gym/tests/test_contracts.py b/wger/gym/tests/test_contracts.py
index 3bf2baa3f..e5eca1064 100644
--- a/wger/gym/tests/test_contracts.py
+++ b/wger/gym/tests/test_contracts.py
@@ -19,7 +19,7 @@ from django.urls import reverse
from wger.core.tests.base_testcase import (
WgerAccessTestCase,
WgerAddTestCase,
- WgerEditTestCase
+ WgerEditTestCase,
)
from wger.gym.models import Contract
@@ -31,20 +31,20 @@ class AddContractTestCase(WgerAddTestCase):
object_class = Contract
url = reverse('gym:contract:add', kwargs={'user_pk': 14})
- data = {'amount': 30,
- 'payment': '2'}
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ data = {'amount': 30, 'payment': '2'}
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
class AccessContractTestCase(WgerAccessTestCase):
@@ -52,18 +52,19 @@ class AccessContractTestCase(WgerAccessTestCase):
Test accessing the detail page of a contract
"""
url = reverse('gym:contract:view', kwargs={'pk': 1})
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
class AccessContractOverviewTestCase(WgerAccessTestCase):
@@ -71,18 +72,19 @@ class AccessContractOverviewTestCase(WgerAccessTestCase):
Test accessing the contract list page
"""
url = reverse('gym:contract:list', kwargs={'user_pk': 4})
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
class EditContractTestCase(WgerEditTestCase):
@@ -93,18 +95,21 @@ class EditContractTestCase(WgerEditTestCase):
pk = 1
object_class = Contract
url = 'gym:contract:edit'
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
- data = {'note': 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr',
- 'amount': 35,
- 'payment': '5'}
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
+ data = {
+ 'note': 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr',
+ 'amount': 35,
+ 'payment': '5',
+ }
diff --git a/wger/gym/tests/test_export.py b/wger/gym/tests/test_export.py
index e1856c591..3144f6265 100644
--- a/wger/gym/tests/test_export.py
+++ b/wger/gym/tests/test_export.py
@@ -44,8 +44,9 @@ class GymMembersCsvExportTestCase(WgerTestCase):
today = datetime.date.today()
filename = 'User-data-gym-{gym}-{t.year}-{t.month:02d}-{t.day:02d}.csv'.\
format(t=today, gym=gym.id)
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename={0}'.format(filename))
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename={0}'.format(filename)
+ )
self.assertGreaterEqual(len(response.content), 1000)
self.assertLessEqual(len(response.content), 1300)
@@ -63,14 +64,16 @@ class GymMembersCsvExportTestCase(WgerTestCase):
Test the CSV export by unauthorized users
"""
- for username in ('manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5'):
+ for username in (
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ ):
self.user_login(username)
self.export_csv(fail=True)
diff --git a/wger/gym/tests/test_gym.py b/wger/gym/tests/test_gym.py
index 6805b99ba..0b3dbd86b 100644
--- a/wger/gym/tests/test_gym.py
+++ b/wger/gym/tests/test_gym.py
@@ -24,7 +24,7 @@ from wger.core.tests.base_testcase import (
WgerDeleteTestCase,
WgerEditTestCase,
WgerTestCase,
- delete_testcase_add_methods
+ delete_testcase_add_methods,
)
from wger.gym.models import Gym
@@ -47,15 +47,19 @@ class GymOverviewTest(WgerAccessTestCase):
"""
url = 'gym:gym:list'
anonymous_fail = True
- user_success = ('admin',
- 'general_manager1',
- 'general_manager2')
- user_fail = ('member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_success = (
+ 'admin',
+ 'general_manager1',
+ 'general_manager2',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class GymUserOverviewTest(WgerAccessTestCase):
@@ -64,16 +68,20 @@ class GymUserOverviewTest(WgerAccessTestCase):
"""
url = reverse_lazy('gym:gym:user-list', kwargs={'pk': 1})
anonymous_fail = True
- user_success = ('admin',
- 'trainer2',
- 'trainer3',
- 'manager1',
- 'general_manager1',
- 'general_manager2')
- user_fail = ('member1',
- 'member2',
- 'trainer4',
- 'manager3')
+ user_success = (
+ 'admin',
+ 'trainer2',
+ 'trainer3',
+ 'manager1',
+ 'general_manager1',
+ 'general_manager2',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer4',
+ 'manager3',
+ )
class AddGymTestCase(WgerAddTestCase):
@@ -83,15 +91,16 @@ class AddGymTestCase(WgerAddTestCase):
object_class = Gym
url = 'gym:gym:add'
data = {'name': 'The name here'}
- user_success = ('admin',
- 'general_manager1')
- user_fail = ('member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager1',
- 'manager3')
+ user_success = ('admin', 'general_manager1')
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager1',
+ 'manager3',
+ )
class DeleteGymTestCase(WgerDeleteTestCase):
@@ -102,16 +111,20 @@ class DeleteGymTestCase(WgerDeleteTestCase):
pk = 2
object_class = Gym
url = 'gym:gym:delete'
- user_success = ('admin',
- 'general_manager1',
- 'general_manager2')
- user_fail = ('member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager1',
- 'manager3')
+ user_success = (
+ 'admin',
+ 'general_manager1',
+ 'general_manager2',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager1',
+ 'manager3',
+ )
delete_testcase_add_methods(DeleteGymTestCase)
@@ -126,16 +139,20 @@ class EditGymTestCase(WgerEditTestCase):
url = 'gym:gym:edit'
pk = 1
data = {'name': 'A different name'}
- user_success = ('admin',
- 'manager1',
- 'general_manager1',
- 'general_manager2')
- user_fail = ('member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3')
+ user_success = (
+ 'admin',
+ 'manager1',
+ 'general_manager1',
+ 'general_manager2',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ )
class GymTestCase(WgerTestCase):
diff --git a/wger/gym/tests/test_inactive_members.py b/wger/gym/tests/test_inactive_members.py
index 399bc7a13..9d90e0416 100644
--- a/wger/gym/tests/test_inactive_members.py
+++ b/wger/gym/tests/test_inactive_members.py
@@ -34,11 +34,13 @@ class EmailInactiveUserTestCase(WgerTestCase):
self.assertEqual(len(mail.outbox), 6)
recipment_list = [message.to[0] for message in mail.outbox]
- trainer_list = ['[email protected]',
+ trainer_list = [
+ ]
recipment_list.sort()
trainer_list.sort()
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index 6392df86b..a7cbff806 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -18,7 +18,7 @@ import datetime
# Django
from django.contrib.auth.models import (
Permission,
- User
+ User,
)
from django.contrib.contenttypes.models import ContentType
from django.urls import reverse
@@ -28,7 +28,7 @@ from wger.core.models import UserProfile
from wger.core.tests.base_testcase import WgerTestCase
from wger.gym.models import (
Gym,
- GymAdminConfig
+ GymAdminConfig,
)
@@ -50,12 +50,15 @@ class GymAddUserTestCase(WgerTestCase):
else:
self.assertEqual(response.status_code, 200)
- response = self.client.post(reverse('gym:gym:add-user', kwargs={'gym_pk': 1}),
- {'first_name': 'Cletus',
- 'last_name': 'Spuckle',
- 'username': 'cletus',
- 'email': '[email protected]',
- 'role': 'admin'})
+ response = self.client.post(
+ reverse('gym:gym:add-user', kwargs={'gym_pk': 1}), {
+ 'first_name': 'Cletus',
+ 'last_name': 'Spuckle',
+ 'username': 'cletus',
+ 'email': '[email protected]',
+ 'role': 'admin',
+ }
+ )
count_after = User.objects.all().count()
if fail:
self.assertEqual(response.status_code, 403)
@@ -124,8 +127,9 @@ class GymAddUserTestCase(WgerTestCase):
self.assertEqual(response['Content-Type'], 'text/csv')
today = datetime.date.today()
filename = 'User-data-{t.year}-{t.month:02d}-{t.day:02d}-cletus.csv'.format(t=today)
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename={}'.format(filename))
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename={}'.format(filename)
+ )
self.assertGreaterEqual(len(response.content), 90)
self.assertLessEqual(len(response.content), 120)
diff --git a/wger/gym/tests/test_user_config.py b/wger/gym/tests/test_user_config.py
index 801c250bb..1c1923207 100644
--- a/wger/gym/tests/test_user_config.py
+++ b/wger/gym/tests/test_user_config.py
@@ -27,15 +27,19 @@ class EditConfigTestCase(WgerEditTestCase):
url = 'gym:user_config:edit'
user_success = 'trainer1'
user_fail = 'member1'
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3',
- 'admin')
- user_fail = ('general_manager1',
- 'general_manager2',
- 'member1',
- 'member2',
- 'trainer4',
- 'manager3')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ 'admin',
+ )
+ user_fail = (
+ 'general_manager1',
+ 'general_manager2',
+ 'member1',
+ 'member2',
+ 'trainer4',
+ 'manager3',
+ )
data = {'include_inactive': False}
diff --git a/wger/gym/tests/test_user_documents.py b/wger/gym/tests/test_user_documents.py
index c15dbf91d..69be6b33f 100644
--- a/wger/gym/tests/test_user_documents.py
+++ b/wger/gym/tests/test_user_documents.py
@@ -21,7 +21,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- delete_testcase_add_methods
+ delete_testcase_add_methods,
)
from wger.gym.models import UserDocument
@@ -32,15 +32,19 @@ class UserDocumentOverviewTest(WgerAccessTestCase):
"""
url = reverse('gym:document:list', kwargs={'user_pk': 14})
anonymous_fail = True
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('admin',
- 'member1',
- 'member2',
- 'trainer4',
- 'manager3',
- 'general_manager1')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'admin',
+ 'member1',
+ 'member2',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ )
class AddDocumentTestCase(WgerAddTestCase):
@@ -53,14 +57,18 @@ class AddDocumentTestCase(WgerAddTestCase):
fileupload = ['document', 'wger/gym/tests/Wurzelpetersilie.pdf']
data = {'name': 'Petersilie'}
data_ignore = ['document']
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('member1',
- 'member2',
- 'trainer4',
- 'manager3',
- 'general_manager1')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ )
class EditDocumentTestCase(WgerEditTestCase):
@@ -72,14 +80,18 @@ class EditDocumentTestCase(WgerEditTestCase):
object_class = UserDocument
url = 'gym:document:edit'
data = {'name': 'Petersilie'}
- user_success = ('trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('member1',
- 'member2',
- 'trainer4',
- 'manager3',
- 'general_manager1')
+ user_success = (
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ )
class DeleteDocumentTestCase(WgerDeleteTestCase):
@@ -90,15 +102,19 @@ class DeleteDocumentTestCase(WgerDeleteTestCase):
pk = 1
object_class = UserDocument
url = 'gym:document:delete'
- user_success = ('admin',
- 'trainer1',
- 'trainer2',
- 'trainer3')
- user_fail = ('member1',
- 'member2',
- 'trainer4',
- 'manager3',
- 'general_manager1')
+ user_success = (
+ 'admin',
+ 'trainer1',
+ 'trainer2',
+ 'trainer3',
+ )
+ user_fail = (
+ 'member1',
+ 'member2',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ )
delete_testcase_add_methods(DeleteDocumentTestCase)
diff --git a/wger/gym/tests/test_user_last_activity.py b/wger/gym/tests/test_user_last_activity.py
index e98aa0ba3..c6a982d1e 100644
--- a/wger/gym/tests/test_user_last_activity.py
+++ b/wger/gym/tests/test_user_last_activity.py
@@ -23,7 +23,7 @@ from wger.core.tests.base_testcase import WgerTestCase
from wger.gym.helpers import get_user_last_activity
from wger.manager.models import (
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 6988aa57f..e0b48ed0f 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -14,7 +14,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.conf.urls import include
from django.urls import path
@@ -30,151 +29,217 @@ from wger.gym.views import (
document,
export,
gym,
- user_config
+ user_config,
)
-
# 'sub patterns' for gyms
patterns_gym = [
- path('list',
- gym.GymListView.as_view(),
- name='list'),
- path('new-user-data/view',
- gym.gym_new_user_info,
- name='new-user-data'),
- path('new-user-data/export',
- gym.gym_new_user_info_export,
- name='new-user-data-export'),
- path('<int:pk>/members',
- gym.GymUserListView.as_view(),
- name='user-list'),
- path('<int:gym_pk>/add-member',
- gym.GymAddUserView.as_view(),
- name='add-user'),
- path('add',
- gym.GymAddView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- gym.GymUpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- gym.GymDeleteView.as_view(),
- name='delete'),
- path('user/<int:user_pk>/permission-edit',
- gym.gym_permissions_user_edit,
- name='edit-user-permission'),
- path('user/<int:user_pk>/reset-user-password',
- gym.reset_user_password,
- name='reset-user-password'),
+ path(
+ 'list',
+ gym.GymListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'new-user-data/view',
+ gym.gym_new_user_info,
+ name='new-user-data',
+ ),
+ path(
+ 'new-user-data/export',
+ gym.gym_new_user_info_export,
+ name='new-user-data-export',
+ ),
+ path(
+ '<int:pk>/members',
+ gym.GymUserListView.as_view(),
+ name='user-list',
+ ),
+ path(
+ '<int:gym_pk>/add-member',
+ gym.GymAddUserView.as_view(),
+ name='add-user',
+ ),
+ path(
+ 'add',
+ gym.GymAddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ gym.GymUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ gym.GymDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ 'user/<int:user_pk>/permission-edit',
+ gym.gym_permissions_user_edit,
+ name='edit-user-permission',
+ ),
+ path(
+ 'user/<int:user_pk>/reset-user-password',
+ gym.reset_user_password,
+ name='reset-user-password',
+ ),
]
# 'sub patterns' for gym config
patterns_gymconfig = [
- path('<int:pk>/edit',
- config.GymConfigUpdateView.as_view(),
- name='edit'),
+ path(
+ '<int:pk>/edit',
+ config.GymConfigUpdateView.as_view(),
+ name='edit',
+ ),
]
-
# 'sub patterns' for gym admin config
patterns_adminconfig = [
- path('<int:pk>/edit',
- admin_config.ConfigUpdateView.as_view(),
- name='edit'),
+ path(
+ '<int:pk>/edit',
+ admin_config.ConfigUpdateView.as_view(),
+ name='edit',
+ ),
]
# 'sub patterns' for gym user config
patterns_userconfig = [
- path('<int:pk>/edit',
- user_config.ConfigUpdateView.as_view(),
- name='edit'),
+ path(
+ '<int:pk>/edit',
+ user_config.ConfigUpdateView.as_view(),
+ name='edit',
+ ),
]
# 'sub patterns' for admin notes
patterns_admin_notes = [
- path('list/user/<int:user_pk>',
- admin_notes.ListView.as_view(),
- name='list'),
- path('add/user/<int:user_pk>',
- admin_notes.AddView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- admin_notes.UpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- admin_notes.DeleteView.as_view(),
- name='delete'),
+ path(
+ 'list/user/<int:user_pk>',
+ admin_notes.ListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'add/user/<int:user_pk>',
+ admin_notes.AddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ admin_notes.UpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ admin_notes.DeleteView.as_view(),
+ name='delete',
+ ),
]
# 'sub patterns' for user documents
patterns_documents = [
- path('list/user/<int:user_pk>',
- document.ListView.as_view(),
- name='list'),
- path('add/user/<int:user_pk>',
- document.AddView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- document.UpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- document.DeleteView.as_view(),
- name='delete'),
+ path(
+ 'list/user/<int:user_pk>',
+ document.ListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'add/user/<int:user_pk>',
+ document.AddView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ document.UpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ document.DeleteView.as_view(),
+ name='delete',
+ ),
]
# sub patterns for contracts
patterns_contracts = [
- path('add/<int:user_pk>',
- contract.AddView.as_view(),
- name='add'),
- path('view/<int:pk>',
- contract.DetailView.as_view(),
- name='view'),
- path('edit/<int:pk>',
- contract.UpdateView.as_view(),
- name='edit'),
- path('list/<int:user_pk>',
- contract.ListView.as_view(),
- name='list'),
+ path(
+ 'add/<int:user_pk>',
+ contract.AddView.as_view(),
+ name='add',
+ ),
+ path(
+ 'view/<int:pk>',
+ contract.DetailView.as_view(),
+ name='view',
+ ),
+ path(
+ 'edit/<int:pk>',
+ contract.UpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'list/<int:user_pk>',
+ contract.ListView.as_view(),
+ name='list',
+ ),
]
# sub patterns for contract types
patterns_contract_types = [
- path('add/<int:gym_pk>',
- contract_type.AddView.as_view(),
- name='add'),
- path('edit/<int:pk>',
- contract_type.UpdateView.as_view(),
- name='edit'),
- path('delete/<int:pk>',
- contract_type.DeleteView.as_view(),
- name='delete'),
- path('list/<int:gym_pk>',
- contract_type.ListView.as_view(),
- name='list'),
+ path(
+ 'add/<int:gym_pk>',
+ contract_type.AddView.as_view(),
+ name='add',
+ ),
+ path(
+ 'edit/<int:pk>',
+ contract_type.UpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'delete/<int:pk>',
+ contract_type.DeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ 'list/<int:gym_pk>',
+ contract_type.ListView.as_view(),
+ name='list',
+ ),
]
# sub patterns for contract options
patterns_contract_options = [
- path('add/<int:gym_pk>',
- contract_option.AddView.as_view(),
- name='add'),
- path('edit/<int:pk>',
- contract_option.UpdateView.as_view(),
- name='edit'),
- path('delete/<int:pk>',
- contract_option.DeleteView.as_view(),
- name='delete'),
- path('list/<int:gym_pk>',
- contract_option.ListView.as_view(),
- name='list'),
+ path(
+ 'add/<int:gym_pk>',
+ contract_option.AddView.as_view(),
+ name='add',
+ ),
+ path(
+ 'edit/<int:pk>',
+ contract_option.UpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'delete/<int:pk>',
+ contract_option.DeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ 'list/<int:gym_pk>',
+ contract_option.ListView.as_view(),
+ name='list',
+ ),
]
# sub patterns for exports
patterns_export = [
- path('users/<int:gym_pk>)',
- export.users,
- name='users'),
+ path(
+ 'users/<int:gym_pk>)',
+ export.users,
+ name='users',
+ ),
]
#
@@ -183,12 +248,20 @@ patterns_export = [
urlpatterns = [
path('', include((patterns_gym, 'gym'), namespace="gym")),
path('config/', include((patterns_gymconfig, 'config'), namespace="config")),
- path('admin-config/', include((patterns_adminconfig, 'admin_config'), namespace="admin_config")),
+ path(
+ 'admin-config/', include((patterns_adminconfig, 'admin_config'), namespace="admin_config")
+ ),
path('user-config/', include((patterns_userconfig, 'user_config'), namespace="user_config")),
path('notes/', include((patterns_admin_notes, 'admin_note'), namespace="admin_note")),
path('document/', include((patterns_documents, 'document'), namespace="document")),
path('contract/', include((patterns_contracts, 'contract'), namespace="contract")),
- path('contract-type/', include((patterns_contract_types, 'contract_type'), namespace="contract_type")),
- path('contract-option/', include((patterns_contract_options, 'contract-option'), namespace="contract-option")),
+ path(
+ 'contract-type/',
+ include((patterns_contract_types, 'contract_type'), namespace="contract_type")
+ ),
+ path(
+ 'contract-option/',
+ include((patterns_contract_options, 'contract-option'), namespace="contract-option")
+ ),
path('export/', include((patterns_export, 'export'), namespace="export")),
]
diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.py
index f871b2a8d..e7fd66350 100644
--- a/wger/gym/views/admin_config.py
+++ b/wger/gym/views/admin_config.py
@@ -21,7 +21,7 @@ import logging
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import UpdateView
@@ -29,7 +29,6 @@ from django.views.generic import UpdateView
from wger.gym.models import GymAdminConfig
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index ed5ce9b6d..b8d6639c9 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -20,30 +20,29 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.contrib.auth.models import User
from django.http.response import HttpResponseForbidden
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.gym.models import AdminUserNote
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
@@ -137,8 +136,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
Redirect back to user page
"""
- return reverse('gym:admin_note:list', kwargs={'user_pk':
- self.object.member.pk})
+ return reverse('gym:admin_note:list', kwargs={'user_pk': self.object.member.pk})
def dispatch(self, request, *args, **kwargs):
"""
diff --git a/wger/gym/views/config.py b/wger/gym/views/config.py
index 134bcca05..5871a03e8 100644
--- a/wger/gym/views/config.py
+++ b/wger/gym/views/config.py
@@ -20,7 +20,7 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http.response import HttpResponseForbidden
from django.urls import reverse
@@ -31,7 +31,6 @@ from django.views.generic import UpdateView
from wger.gym.models import GymConfig
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
index f6faffd0a..8787b457a 100644
--- a/wger/gym/views/contract.py
+++ b/wger/gym/views/contract.py
@@ -20,27 +20,26 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.contrib.auth.models import User
from django.http.response import HttpResponseForbidden
from django.shortcuts import get_object_or_404
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DetailView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.gym.models import Contract
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
@@ -50,9 +49,22 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
"""
model = Contract
- fields = ['contract_type', 'options', 'amount', 'payment', 'is_active',
- 'date_start', 'date_end', 'email', 'zip_code', 'city', 'street',
- 'phone', 'profession', 'note']
+ fields = [
+ 'contract_type',
+ 'options',
+ 'amount',
+ 'payment',
+ 'is_active',
+ 'date_start',
+ 'date_end',
+ 'email',
+ 'zip_code',
+ 'city',
+ 'street',
+ 'phone',
+ 'profession',
+ 'note',
+ ]
title = gettext_lazy('Add contract')
permission_required = 'gym.add_contract'
member = None
@@ -68,14 +80,16 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
out = {}
if Contract.objects.filter(member=self.member).exists():
last_contract = Contract.objects.filter(member=self.member).first()
- for key in ('amount',
- 'payment',
- 'email',
- 'zip_code',
- 'city',
- 'street',
- 'phone',
- 'profession'):
+ for key in (
+ 'amount',
+ 'payment',
+ 'email',
+ 'zip_code',
+ 'city',
+ 'street',
+ 'phone',
+ 'profession',
+ ):
out[key] = getattr(last_contract, key)
elif self.member.email:
out['email'] = self.member.email
@@ -132,9 +146,22 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
model = Contract
- fields = ['contract_type', 'options', 'amount', 'payment', 'is_active',
- 'date_start', 'date_end', 'email', 'zip_code', 'city', 'street',
- 'phone', 'profession', 'note']
+ fields = [
+ 'contract_type',
+ 'options',
+ 'amount',
+ 'payment',
+ 'is_active',
+ 'date_start',
+ 'date_end',
+ 'email',
+ 'zip_code',
+ 'city',
+ 'street',
+ 'phone',
+ 'profession',
+ 'note',
+ ]
permission_required = 'gym.change_contract'
def dispatch(self, request, *args, **kwargs):
diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.py
index ef7bed253..e18b4613b 100644
--- a/wger/gym/views/contract_option.py
+++ b/wger/gym/views/contract_option.py
@@ -20,33 +20,32 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http.response import HttpResponseForbidden
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.gym.models import (
ContractOption,
- Gym
+ Gym,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index 3ebe25291..ef46625e2 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -20,33 +20,32 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http.response import HttpResponseForbidden
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.gym.models import (
ContractType,
- Gym
+ Gym,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index 6f3092d69..f0a5d038f 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -20,30 +20,29 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.contrib.auth.models import User
from django.http.response import HttpResponseForbidden
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.gym.models import UserDocument
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
@@ -147,8 +146,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
Redirect back to user page
"""
- return reverse('gym:document:list', kwargs={'user_pk':
- self.object.member.pk})
+ return reverse('gym:document:list', kwargs={'user_pk': self.object.member.pk})
def dispatch(self, request, *args, **kwargs):
"""
diff --git a/wger/gym/views/export.py b/wger/gym/views/export.py
index 14128e4e5..2082a82a2 100644
--- a/wger/gym/views/export.py
+++ b/wger/gym/views/export.py
@@ -23,7 +23,7 @@ import logging
from django.contrib.auth.decorators import login_required
from django.http.response import (
HttpResponse,
- HttpResponseForbidden
+ HttpResponseForbidden,
)
from django.shortcuts import get_object_or_404
from django.utils.translation import gettext as _
@@ -31,7 +31,6 @@ from django.utils.translation import gettext as _
# wger
from wger.gym.models import Gym
-
logger = logging.getLogger(__name__)
@@ -54,38 +53,46 @@ def users(request, gym_pk):
response = HttpResponse(content_type='text/csv')
writer = csv.writer(response, delimiter='\t', quoting=csv.QUOTE_ALL)
- writer.writerow([_('Nr.'),
- _('Gym'),
- _('Username'),
- _('Email'),
- _('First name'),
- _('Last name'),
- _('Gender'),
- _('Age'),
- _('ZIP code'),
- _('City'),
- _('Street'),
- _('Phone')])
+ writer.writerow(
+ [
+ _('Nr.'),
+ _('Gym'),
+ _('Username'),
+ _('Email'),
+ _('First name'),
+ _('Last name'),
+ _('Gender'),
+ _('Age'),
+ _('ZIP code'),
+ _('City'),
+ _('Street'),
+ _('Phone')
+ ]
+ )
for user in Gym.objects.get_members(gym_pk):
address = user.userprofile.address
- writer.writerow([user.id,
- gym.name,
- user.username,
- user.email,
- user.first_name,
- user.last_name,
- user.userprofile.get_gender_display(),
- user.userprofile.age,
- address['zip_code'],
- address['city'],
- address['street'],
- address['phone']
- ])
+ writer.writerow(
+ [
+ user.id,
+ gym.name,
+ user.username,
+ user.email,
+ user.first_name,
+ user.last_name,
+ user.userprofile.get_gender_display(),
+ user.userprofile.age,
+ address['zip_code'],
+ address['city'],
+ address['street'],
+ address['phone'],
+ ]
+ )
# Send the data to the browser
today = datetime.date.today()
- filename = 'User-data-gym-{gym}-{t.year}-{t.month:02d}-{t.day:02d}.csv'.format(t=today,
- gym=gym.id)
+ filename = 'User-data-gym-{gym}-{t.year}-{t.month:02d}-{t.day:02d}.csv'.format(
+ t=today, gym=gym.id
+ )
response['Content-Disposition'] = 'attachment; filename={0}'.format(filename)
response['Content-Length'] = len(response.content)
return response
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index eef08fc4f..bb4b12c22 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -23,35 +23,35 @@ import logging
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.contrib.auth.models import (
Group,
- User
+ User,
)
from django.http.response import (
HttpResponse,
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.text import slugify
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# Third Party
@@ -62,25 +62,24 @@ from crispy_forms.layout import Submit
from wger.config.models import GymConfig as GlobalGymConfig
from wger.gym.forms import (
GymUserAddForm,
- GymUserPermissionForm
+ GymUserPermissionForm,
)
from wger.gym.helpers import (
get_permission_list,
- is_any_gym_admin
+ is_any_gym_admin,
)
from wger.gym.models import (
Gym,
GymAdminConfig,
- GymUserConfig
+ GymUserConfig,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
WgerFormMixin,
- WgerMultiplePermissionRequiredMixin
+ WgerMultiplePermissionRequiredMixin,
)
from wger.utils.helpers import password_generator
-
logger = logging.getLogger(__name__)
@@ -124,21 +123,24 @@ class GymUserListView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, L
"""
Return a list with the users, not really a queryset.
"""
- out = {'admins': [],
- 'members': []}
+ out = {'admins': [], 'members': []}
for u in Gym.objects.get_members(self.kwargs['pk']).select_related('usercache'):
- out['members'].append({'obj': u,
- 'last_log': u.usercache.last_activity})
+ out['members'].append({'obj': u, 'last_log': u.usercache.last_activity})
# admins list
for u in Gym.objects.get_admins(self.kwargs['pk']):
- out['admins'].append({'obj': u,
- 'perms': {'manage_gym': u.has_perm('gym.manage_gym'),
- 'manage_gyms': u.has_perm('gym.manage_gyms'),
- 'gym_trainer': u.has_perm('gym.gym_trainer'),
- 'any_admin': is_any_gym_admin(u)}
- })
+ out['admins'].append(
+ {
+ 'obj': u,
+ 'perms': {
+ 'manage_gym': u.has_perm('gym.manage_gym'),
+ 'manage_gyms': u.has_perm('gym.manage_gyms'),
+ 'gym_trainer': u.has_perm('gym.gym_trainer'),
+ 'any_admin': is_any_gym_admin(u)
+ }
+ }
+ )
return out
def get_context_data(self, **kwargs):
@@ -149,8 +151,11 @@ class GymUserListView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, L
context['gym'] = Gym.objects.get(pk=self.kwargs['pk'])
context['admin_count'] = len(context['object_list']['admins'])
context['user_count'] = len(context['object_list']['members'])
- context['user_table'] = {'keys': [_('ID'), _('Username'), _('Name'), _('Last activity')],
- 'users': context['object_list']['members']}
+ context['user_table'] = {
+ 'keys': [_('ID'), _('Username'), _('Name'),
+ _('Last activity')],
+ 'users': context['object_list']['members']
+ }
return context
@@ -180,8 +185,10 @@ def gym_new_user_info(request):
and not request.user.has_perm('gym.manage_gym'):
return HttpResponseForbidden()
- context = {'new_user': get_object_or_404(User, pk=request.session['gym.user']['user_pk']),
- 'password': request.session['gym.user']['password']}
+ context = {
+ 'new_user': get_object_or_404(User, pk=request.session['gym.user']['user_pk']),
+ 'password': request.session['gym.user']['password']
+ }
return render(request, 'gym/new_user.html', context)
@@ -208,16 +215,18 @@ def gym_new_user_info_export(request):
response = HttpResponse(content_type='text/csv')
writer = csv.writer(response)
writer.writerow([_('Username'), _('First name'), _('Last name'), _('Gym'), _('Password')])
- writer.writerow([new_username,
- new_user.first_name,
- new_user.last_name,
- new_user.userprofile.gym.name,
- password])
+ writer.writerow(
+ [
+ new_username, new_user.first_name, new_user.last_name, new_user.userprofile.gym.name,
+ password
+ ]
+ )
# Send the data to the browser
today = datetime.date.today()
- filename = 'User-data-{t.year}-{t.month:02d}-{t.day:02d}-{user}.csv'.format(t=today,
- user=new_username)
+ filename = 'User-data-{t.year}-{t.month:02d}-{t.day:02d}-{user}.csv'.format(
+ t=today, user=new_username
+ )
response['Content-Disposition'] = 'attachment; filename={0}'.format(filename)
response['Content-Length'] = len(response.content)
return response
@@ -245,8 +254,7 @@ def reset_user_password(request, user_pk):
user.set_password(password)
user.save()
- context = {'mod_user': user,
- 'password': password}
+ context = {'mod_user': user, 'password': password}
return render(request, 'gym/reset_user_password.html', context)
@@ -270,8 +278,7 @@ def gym_permissions_user_edit(request, user_pk):
form_group_permission = get_permission_list(user)
if request.method == 'POST':
- form = GymUserPermissionForm(available_roles=form_group_permission,
- data=request.POST)
+ form = GymUserPermissionForm(available_roles=form_group_permission, data=request.POST)
if form.is_valid():
@@ -291,8 +298,9 @@ def gym_permissions_user_edit(request, user_pk):
if 'manager' in form.cleaned_data['role']:
member.groups.add(Group.objects.get(name='general_gym_manager'))
- return HttpResponseRedirect(reverse('gym:gym:user-list',
- kwargs={'pk': member.userprofile.gym.pk}))
+ return HttpResponseRedirect(
+ reverse('gym:gym:user-list', kwargs={'pk': member.userprofile.gym.pk})
+ )
else:
initial_data = {}
if member.groups.filter(name='gym_member').exists():
@@ -307,23 +315,24 @@ def gym_permissions_user_edit(request, user_pk):
if member.groups.filter(name='general_gym_manager').exists():
initial_data['manager'] = True
- form = GymUserPermissionForm(initial={'role': initial_data},
- available_roles=form_group_permission)
+ form = GymUserPermissionForm(
+ initial={'role': initial_data}, available_roles=form_group_permission
+ )
# Set form action to absolute path
form.helper.form_action = request.path
- context = {'title': member.get_full_name(),
- 'form': form,
- 'submit_text': 'Save'}
+ context = {'title': member.get_full_name(), 'form': form, 'submit_text': 'Save'}
return render(request, 'form.html', context)
-class GymAddUserView(WgerFormMixin,
- LoginRequiredMixin,
- WgerMultiplePermissionRequiredMixin,
- CreateView):
+class GymAddUserView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ WgerMultiplePermissionRequiredMixin,
+ CreateView,
+):
"""
View to add a user to a new gym
"""
@@ -364,8 +373,9 @@ class GymAddUserView(WgerFormMixin,
"""
Set available user permissions
"""
- form = self.form_class(available_roles=get_permission_list(self.request.user),
- **self.get_form_kwargs())
+ form = self.form_class(
+ available_roles=get_permission_list(self.request.user), **self.get_form_kwargs()
+ )
form.helper = FormHelper()
form.helper.form_id = slugify(self.request.path)
form.helper.form_method = 'post'
@@ -380,9 +390,9 @@ class GymAddUserView(WgerFormMixin,
"""
gym = Gym.objects.get(pk=self.kwargs['gym_pk'])
password = password_generator()
- user = User.objects.create_user(form.cleaned_data['username'],
- form.cleaned_data['email'],
- password)
+ user = User.objects.create_user(
+ form.cleaned_data['username'], form.cleaned_data['email'], password
+ )
user.first_name = form.cleaned_data['first_name']
user.last_name = form.cleaned_data['last_name']
form.instance = user
@@ -402,8 +412,7 @@ class GymAddUserView(WgerFormMixin,
if 'manager' in form.cleaned_data['role']:
user.groups.add(Group.objects.get(name='general_gym_manager'))
- self.request.session['gym.user'] = {'user_pk': user.pk,
- 'password': password}
+ self.request.session['gym.user'] = {'user_pk': user.pk, 'password': password}
# Create config
if is_any_gym_admin(user):
@@ -456,13 +465,15 @@ class GymDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin
"""
model = Gym
- fields = ('name',
- 'phone',
- 'email',
- 'owner',
- 'zip_code',
- 'city',
- 'street')
+ fields = (
+ 'name',
+ 'phone',
+ 'email',
+ 'owner',
+ 'zip_code',
+ 'city',
+ 'street',
+ )
success_url = reverse_lazy('gym:gym:list')
permission_required = 'gym.delete_gym'
diff --git a/wger/gym/views/user_config.py b/wger/gym/views/user_config.py
index bc84674be..1514d9c72 100644
--- a/wger/gym/views/user_config.py
+++ b/wger/gym/views/user_config.py
@@ -20,7 +20,7 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.http import HttpResponseForbidden
from django.urls import reverse
@@ -31,7 +31,6 @@ from django.views.generic import UpdateView
from wger.gym.models import GymUserConfig
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
diff --git a/wger/mailer/__init__.py b/wger/mailer/__init__.py
index 816f195e4..cc211fe2b 100644
--- a/wger/mailer/__init__.py
+++ b/wger/mailer/__init__.py
@@ -18,6 +18,5 @@
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.mailer.apps.Config'
diff --git a/wger/mailer/forms.py b/wger/mailer/forms.py
index 0c9b531f6..3de5be357 100644
--- a/wger/mailer/forms.py
+++ b/wger/mailer/forms.py
@@ -14,12 +14,11 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.forms import (
CharField,
Form,
- Textarea
+ Textarea,
)
from django.utils.translation import pgettext
diff --git a/wger/mailer/management/commands/send-mass-emails.py b/wger/mailer/management/commands/send-mass-emails.py
index 9b1a81d56..c7b18fcac 100644
--- a/wger/mailer/management/commands/send-mass-emails.py
+++ b/wger/mailer/management/commands/send-mass-emails.py
@@ -34,9 +34,11 @@ class Command(BaseCommand):
"""
if CronEntry.objects.count():
for email in CronEntry.objects.all()[:100]:
- mail.send_mail(email.log.subject,
- email.log.body,
- settings.WGER_SETTINGS['EMAIL_FROM'],
- [email.email],
- fail_silently=True)
+ mail.send_mail(
+ email.log.subject,
+ email.log.body,
+ settings.WGER_SETTINGS['EMAIL_FROM'],
+ [email.email],
+ fail_silently=True,
+ )
email.delete()
diff --git a/wger/mailer/migrations/0001_initial.py b/wger/mailer/migrations/0001_initial.py
index d5148a41e..2460ca991 100644
--- a/wger/mailer/migrations/0001_initial.py
+++ b/wger/mailer/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
from django.conf import settings
@@ -15,19 +15,34 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='CronEntry',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('email', models.EmailField(max_length=254)),
],
),
migrations.CreateModel(
name='Log',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('date', models.DateField(auto_now=True)),
('subject', models.CharField(max_length=100)),
('body', models.TextField()),
('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),
- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'user',
+ models.ForeignKey(
+ editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
],
),
migrations.AddField(
diff --git a/wger/mailer/migrations/0002_auto_20190618_1617.py b/wger/mailer/migrations/0002_auto_20190618_1617.py
index 0c0e1f92c..f1204a75b 100644
--- a/wger/mailer/migrations/0002_auto_20190618_1617.py
+++ b/wger/mailer/migrations/0002_auto_20190618_1617.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.11.21 on 2019-06-18 16:17
from django.db import migrations, models
import django.db.models.deletion
@@ -20,7 +20,10 @@ class Migration(migrations.Migration):
model_name='log',
name='gym',
field=models.ForeignKey(
- editable=False, on_delete=django.db.models.deletion.CASCADE,
- related_name='mailer_log', to='gym.Gym'),
+ editable=False,
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name='mailer_log',
+ to='gym.Gym'
+ ),
),
]
diff --git a/wger/mailer/migrations/0003_auto_20201201_0653.py b/wger/mailer/migrations/0003_auto_20201201_0653.py
index 424666277..e418d3251 100644
--- a/wger/mailer/migrations/0003_auto_20201201_0653.py
+++ b/wger/mailer/migrations/0003_auto_20201201_0653.py
@@ -15,8 +15,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='log',
name='gym',
- field=models.ForeignKey(editable=False,
- on_delete=django.db.models.deletion.CASCADE,
- related_name='email_log', to='gym.gym'),
+ field=models.ForeignKey(
+ editable=False,
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name='email_log',
+ to='gym.gym'
+ ),
),
]
diff --git a/wger/mailer/models.py b/wger/mailer/models.py
index 5349b997d..850ec3870 100644
--- a/wger/mailer/models.py
+++ b/wger/mailer/models.py
@@ -28,24 +28,30 @@ class Log(models.Model):
"""
class Meta:
- ordering = ["-date", ]
+ ordering = [
+ "-date",
+ ]
date = models.DateField(auto_now=True)
"""
Date when the log was created
"""
- user = models.ForeignKey(User,
- editable=False,
- on_delete=models.CASCADE)
+ user = models.ForeignKey(
+ User,
+ editable=False,
+ on_delete=models.CASCADE,
+ )
"""
The user that created the email
"""
- gym = models.ForeignKey(Gym,
- editable=False,
- related_name='email_log',
- on_delete=models.CASCADE)
+ gym = models.ForeignKey(
+ Gym,
+ editable=False,
+ related_name='email_log',
+ on_delete=models.CASCADE,
+ )
"""
Gym this log belongs to
"""
@@ -72,9 +78,7 @@ class CronEntry(models.Model):
Simple list of emails to be sent by a cron job
"""
- log = models.ForeignKey(Log,
- editable=False,
- on_delete=models.CASCADE)
+ log = models.ForeignKey(Log, editable=False, on_delete=models.CASCADE)
"""
Foreign key to email log with subject and body
"""
diff --git a/wger/mailer/tests/test_gym_emails.py b/wger/mailer/tests/test_gym_emails.py
index eff5da071..90f432a91 100644
--- a/wger/mailer/tests/test_gym_emails.py
+++ b/wger/mailer/tests/test_gym_emails.py
@@ -24,15 +24,16 @@ class AccessContractTestCase(WgerAccessTestCase):
Test accessing the detail page of a contract
"""
url = reverse('email:email:overview', kwargs={'gym_pk': 1})
- user_success = ('manager1',
- 'manager2')
- user_fail = ('admin',
- 'general_manager1',
- 'manager3',
- 'manager4',
- 'test',
- 'member1',
- 'member2',
- 'member3',
- 'member4',
- 'member5')
+ user_success = ('manager1', 'manager2')
+ user_fail = (
+ 'admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5',
+ )
diff --git a/wger/mailer/urls.py b/wger/mailer/urls.py
index ae7b6a855..7f99811eb 100644
--- a/wger/mailer/urls.py
+++ b/wger/mailer/urls.py
@@ -22,18 +22,20 @@ from django.urls import path
from wger.mailer.forms import EmailListForm
from wger.mailer.views import gym
-
# sub patterns for email lists
patterns_email = [
- path('overview/gym/<int:gym_pk>',
- gym.EmailLogListView.as_view(),
- name='overview'),
- path('add/gym/<int:gym_pk>',
- gym.EmailListFormPreview(EmailListForm),
- name='add-gym'),
+ path(
+ 'overview/gym/<int:gym_pk>',
+ gym.EmailLogListView.as_view(),
+ name='overview',
+ ),
+ path(
+ 'add/gym/<int:gym_pk>',
+ gym.EmailListFormPreview(EmailListForm),
+ name='add-gym',
+ ),
]
-
urlpatterns = [
path('email', include((patterns_email, 'email'), namespace="email")),
]
diff --git a/wger/mailer/views/gym.py b/wger/mailer/views/gym.py
index 2877fb22c..a3d78b294 100644
--- a/wger/mailer/views/gym.py
+++ b/wger/mailer/views/gym.py
@@ -20,7 +20,7 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
from django.core import mail
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import get_object_or_404
from django.urls import reverse
@@ -33,7 +33,7 @@ from formtools.preview import FormPreview
from wger.gym.models import Gym
from wger.mailer.models import (
CronEntry,
- Log
+ Log,
)
@@ -110,11 +110,12 @@ class EmailListFormPreview(FormPreview):
"""
for admin in Gym.objects.get_admins(self.gym.pk):
if admin.email:
- mail.send_mail(form.cleaned_data['subject'],
- form.cleaned_data['body'],
- settings.WGER_SETTINGS['EMAIL_FROM'],
- [admin.email],
- fail_silently=False)
+ mail.send_mail(
+ form.cleaned_data['subject'],
+ form.cleaned_data['body'],
+ settings.WGER_SETTINGS['EMAIL_FROM'], [admin.email],
+ fail_silently=False
+ )
return context
def done(self, request, cleaned_data):
diff --git a/wger/manager/__init__.py b/wger/manager/__init__.py
index aa1e7304c..7ac7291f5 100644
--- a/wger/manager/__init__.py
+++ b/wger/manager/__init__.py
@@ -15,10 +15,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.manager.apps.ManagerConfig'
diff --git a/wger/manager/admin.py b/wger/manager/admin.py
index b31c485f6..3f8775e86 100644
--- a/wger/manager/admin.py
+++ b/wger/manager/admin.py
@@ -1,4 +1,3 @@
-
# This file is part of wger Workout Manager.
#
# wger Workout Manager is free software: you can redistribute it and/or modify
@@ -20,7 +19,6 @@ from django.contrib import admin
from wger.core.models import UserProfile
from wger.manager import models as manager_models
-
admin.site.register(manager_models.Workout)
admin.site.register(manager_models.Set)
admin.site.register(manager_models.Day)
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index fff98956a..938408dbf 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -22,7 +22,7 @@ from rest_framework import serializers
from wger.core.api.serializers import DaysOfWeekSerializer
from wger.exercises.api.serializers import (
ExerciseSerializer,
- MuscleSerializer
+ MuscleSerializer,
)
from wger.manager.models import (
Day,
@@ -32,7 +32,7 @@ from wger.manager.models import (
Setting,
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
@@ -43,7 +43,7 @@ class WorkoutSerializer(serializers.ModelSerializer):
class Meta:
model = Workout
- exclude = ('user',)
+ exclude = ('user', )
class WorkoutSessionSerializer(serializers.ModelSerializer):
@@ -63,30 +63,30 @@ class WorkoutLogSerializer(serializers.ModelSerializer):
"""
Workout session serializer
"""
+
class Meta:
model = WorkoutLog
- exclude = ('user',)
+ exclude = ('user', )
class ScheduleStepSerializer(serializers.ModelSerializer):
"""
ScheduleStep serializer
"""
+
class Meta:
model = ScheduleStep
- fields = ['id',
- 'schedule',
- 'workout',
- 'duration']
+ fields = ['id', 'schedule', 'workout', 'duration']
class ScheduleSerializer(serializers.ModelSerializer):
"""
Schedule serializer
"""
+
class Meta:
model = Schedule
- exclude = ('user',)
+ exclude = ('user', )
class DaySerializer(serializers.ModelSerializer):
@@ -113,10 +113,21 @@ class SettingSerializer(serializers.ModelSerializer):
"""
Workout setting serializer
"""
+
class Meta:
model = Setting
- fields = ['id', 'set', 'exercise', 'repetition_unit', 'reps',
- 'weight', 'weight_unit', 'rir', 'order', 'comment']
+ fields = [
+ 'id',
+ 'set',
+ 'exercise',
+ 'repetition_unit',
+ 'reps',
+ 'weight',
+ 'weight_unit',
+ 'rir',
+ 'order',
+ 'comment',
+ ]
#
@@ -171,9 +182,7 @@ class DaysOfWeekCanonicalFormSerializer(serializers.Serializer):
Serializer for a days of week in the canonical form of a workout
"""
text = serializers.ReadOnlyField()
- day_list = serializers.ListField(
- child=DaysOfWeekSerializer()
- )
+ day_list = serializers.ListField(child=DaysOfWeekSerializer())
class DayCanonicalFormSerializer(serializers.Serializer):
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index 7920dd41a..744558e4f 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -38,7 +38,7 @@ from wger.manager.api.serializers import (
WorkoutCanonicalFormSerializer,
WorkoutLogSerializer,
WorkoutSerializer,
- WorkoutSessionSerializer
+ WorkoutSessionSerializer,
)
from wger.manager.models import (
Day,
@@ -48,7 +48,7 @@ from wger.manager.models import (
Setting,
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.viewsets import WgerOwnerObjectModelViewSet
from wger.weight.helpers import process_log_entries
@@ -61,9 +61,7 @@ class WorkoutViewSet(viewsets.ModelViewSet):
serializer_class = WorkoutSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('name',
- 'description',
- 'creation_date')
+ filterset_fields = ('name', 'description', 'creation_date')
def get_queryset(self):
"""
@@ -103,10 +101,12 @@ class WorkoutViewSet(viewsets.ModelViewSet):
return Response("Please provide an exercise ID in the 'id' GET parameter")
exercise = get_object_or_404(Exercise, pk=execise_id)
- logs = exercise.workoutlog_set.filter(user=self.request.user,
- weight_unit__in=(1, 2),
- repetition_unit=1,
- workout=self.get_object())
+ logs = exercise.workoutlog_set.filter(
+ user=self.request.user,
+ weight_unit__in=(1, 2),
+ repetition_unit=1,
+ workout=self.get_object()
+ )
entry_logs, chart_data = process_log_entries(logs)
serialized_logs = {}
for key, values in entry_logs.items():
@@ -121,12 +121,14 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):
serializer_class = WorkoutSessionSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('date',
- 'workout',
- 'notes',
- 'impression',
- 'time_start',
- 'time_end')
+ filterset_fields = (
+ 'date',
+ 'workout',
+ 'notes',
+ 'impression',
+ 'time_start',
+ 'time_end',
+ )
def get_queryset(self):
"""
@@ -154,10 +156,12 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):
serializer_class = ScheduleStepSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('schedule',
- 'workout',
- 'duration',
- 'order')
+ filterset_fields = (
+ 'schedule',
+ 'workout',
+ 'duration',
+ 'order',
+ )
def get_queryset(self):
"""
@@ -169,8 +173,7 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):
"""
Return objects to check for ownership permission
"""
- return [(Workout, 'workout'),
- (Schedule, 'schedule')]
+ return [(Workout, 'workout'), (Schedule, 'schedule')]
class ScheduleViewSet(viewsets.ModelViewSet):
@@ -180,10 +183,12 @@ class ScheduleViewSet(viewsets.ModelViewSet):
serializer_class = ScheduleSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('is_active',
- 'is_loop',
- 'start_date',
- 'name')
+ filterset_fields = (
+ 'is_active',
+ 'is_loop',
+ 'start_date',
+ 'name',
+ )
def get_queryset(self):
"""
@@ -205,9 +210,11 @@ class DayViewSet(WgerOwnerObjectModelViewSet):
serializer_class = DaySerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('description',
- 'training',
- 'day')
+ filterset_fields = (
+ 'description',
+ 'training',
+ 'day',
+ )
def get_queryset(self):
"""
@@ -229,9 +236,11 @@ class SetViewSet(WgerOwnerObjectModelViewSet):
serializer_class = SetSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('exerciseday',
- 'order',
- 'sets')
+ filterset_fields = (
+ 'exerciseday',
+ 'order',
+ 'sets',
+ )
def get_queryset(self):
"""
@@ -270,12 +279,14 @@ class SettingViewSet(WgerOwnerObjectModelViewSet):
serializer_class = SettingSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('exercise',
- 'order',
- 'reps',
- 'weight',
- 'set',
- 'order')
+ filterset_fields = (
+ 'exercise',
+ 'order',
+ 'reps',
+ 'weight',
+ 'set',
+ 'order',
+ )
def get_queryset(self):
"""
@@ -303,11 +314,13 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):
serializer_class = WorkoutLogSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('date',
- 'exercise',
- 'reps',
- 'weight',
- 'workout')
+ filterset_fields = (
+ 'date',
+ 'exercise',
+ 'reps',
+ 'weight',
+ 'workout',
+ )
def get_queryset(self):
"""
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 7af156eb6..d322f5bf5 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -13,7 +13,6 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-
"""
This file contains forms used in the application
"""
@@ -29,11 +28,11 @@ from django.forms import (
ModelChoiceField,
ModelForm,
ModelMultipleChoiceField,
- widgets
+ widgets,
)
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
# Third Party
@@ -42,13 +41,13 @@ from crispy_forms.layout import (
Column,
Layout,
Row,
- Submit
+ Submit,
)
# wger
from wger.core.models import (
RepetitionUnit,
- WeightUnit
+ WeightUnit,
)
from wger.exercises.models import Exercise
from wger.manager.models import (
@@ -58,40 +57,45 @@ from wger.manager.models import (
Setting,
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.widgets import (
ExerciseAjaxSelect,
- TranslatedSelectMultiple
+ TranslatedSelectMultiple,
)
class WorkoutForm(ModelForm):
+
class Meta:
model = Workout
- exclude = ('user',)
+ exclude = ('user', )
class WorkoutCopyForm(Form):
- name = CharField(max_length=100,
- help_text=_('The name of the workout'),
- required=False)
- description = CharField(max_length=1000,
- help_text=_("A short description or goal of the workout. For "
- "example 'Focus on back' or 'Week 1 of program xy'."),
- widget=widgets.Textarea,
- required=False)
+ name = CharField(max_length=100, help_text=_('The name of the workout'), required=False)
+ description = CharField(
+ max_length=1000,
+ help_text=_(
+ "A short description or goal of the workout. For "
+ "example 'Focus on back' or 'Week 1 of program xy'."
+ ),
+ widget=widgets.Textarea,
+ required=False
+ )
class DayForm(ModelForm):
+
class Meta:
model = Day
- exclude = ('training',)
+ exclude = ('training', )
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)
@@ -100,13 +104,17 @@ class OrderedModelMultipleChoiceField(ModelMultipleChoiceField):
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.'))
+ 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
@@ -114,6 +122,7 @@ class SetForm(ModelForm):
class SettingForm(ModelForm):
+
class Meta:
model = Setting
exclude = ('set', 'exercise', 'order', 'name')
@@ -128,23 +137,35 @@ class WorkoutLogForm(ModelForm):
we want. This form is one prime candidate to rework with some modern JS
framework, there is a ton of ugly logic like this just to make it work.
"""
- repetition_unit = ModelChoiceField(queryset=RepetitionUnit.objects.all(),
- label=_('Unit'),
- required=False)
- weight_unit = ModelChoiceField(queryset=WeightUnit.objects.all(),
- label=_('Unit'),
- required=False)
- exercise = ModelChoiceField(queryset=Exercise.objects.all(),
- label=_('Exercise'),
- required=False)
- reps = IntegerField(label=_('Repetitions'),
- required=False)
- weight = DecimalField(label=_('Weight'),
- initial=0,
- required=False)
- rir = ChoiceField(label=_('RiR'),
- choices=RIR_OPTIONS,
- required=False)
+ repetition_unit = ModelChoiceField(
+ queryset=RepetitionUnit.objects.all(),
+ label=_('Unit'),
+ required=False,
+ )
+ weight_unit = ModelChoiceField(
+ queryset=WeightUnit.objects.all(),
+ label=_('Unit'),
+ required=False,
+ )
+ exercise = ModelChoiceField(
+ queryset=Exercise.objects.all(),
+ label=_('Exercise'),
+ required=False,
+ )
+ reps = IntegerField(
+ label=_('Repetitions'),
+ required=False,
+ )
+ weight = DecimalField(
+ label=_('Weight'),
+ initial=0,
+ required=False,
+ )
+ rir = ChoiceField(
+ label=_('RiR'),
+ choices=RIR_OPTIONS,
+ required=False,
+ )
class Meta:
model = WorkoutLog
@@ -152,6 +173,7 @@ class WorkoutLogForm(ModelForm):
class WorkoutLogFormHelper(FormHelper):
+
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.form_method = 'post'
@@ -176,6 +198,7 @@ class HelperWorkoutSessionForm(ModelForm):
"""
A helper form used in the workout log view
"""
+
class Meta:
model = WorkoutSession
exclude = ('user', 'workout')
@@ -203,6 +226,7 @@ class WorkoutSessionForm(ModelForm):
"""
Workout Session form
"""
+
class Meta:
model = WorkoutSession
exclude = ('user', 'workout', 'date')
@@ -227,31 +251,36 @@ class WorkoutScheduleDownloadForm(Form):
"""
pdf_type = ChoiceField(
label=gettext_lazy("Type"),
- choices=(("log", gettext_lazy("Log")),
- ("table", gettext_lazy("Table")))
+ choices=(("log", gettext_lazy("Log")), ("table", gettext_lazy("Table")))
)
- images = BooleanField(label=gettext_lazy("with images"),
- required=False)
- comments = BooleanField(label=gettext_lazy("with comments"),
- required=False)
+ images = BooleanField(label=gettext_lazy("with images"), required=False)
+ comments = BooleanField(label=gettext_lazy("with comments"), required=False)
def __init__(self):
super(WorkoutScheduleDownloadForm, self).__init__()
self.helper = FormHelper()
self.helper.form_tag = False
- self.helper.add_input(Submit('submit', _("Download"),
- css_class='btn-success btn-block',
- css_id="download-pdf-button-schedule"))
+ self.helper.add_input(
+ Submit(
+ 'submit',
+ _("Download"),
+ css_class='btn-success btn-block',
+ css_id="download-pdf-button-schedule"
+ )
+ )
class WorkoutSessionHiddenFieldsForm(ModelForm):
"""
Workout Session form used in the timer view
"""
+
class Meta:
model = WorkoutSession
exclude = []
- widgets = {'time_start': widgets.HiddenInput(),
- 'time_end': widgets.HiddenInput(),
- 'user': widgets.HiddenInput(),
- 'notes': widgets.Textarea(attrs={'rows': 3})}
+ widgets = {
+ 'time_start': widgets.HiddenInput(),
+ 'time_end': widgets.HiddenInput(),
+ 'user': widgets.HiddenInput(),
+ 'notes': widgets.Textarea(attrs={'rows': 3})
+ }
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index ce29d448b..f27f472cd 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -32,14 +32,14 @@ from reportlab.platypus import (
ListFlowable,
ListItem,
Paragraph,
- Table
+ Table,
)
# wger
from wger.utils.pdf import (
header_colour,
row_color,
- styleSheet
+ styleSheet,
)
@@ -72,10 +72,12 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_ta
set_count = 1
day_markers.append(len(data))
- p = Paragraph('<para align="center">%(days)s: %(description)s</para>' %
- {'days': day['days_of_week']['text'],
- 'description': day['obj'].description},
- styleSheet["SubHeader"])
+ p = Paragraph(
+ '<para align="center">%(days)s: %(description)s</para>' % {
+ 'days': day['days_of_week']['text'],
+ 'description': day['obj'].description
+ }, styleSheet["SubHeader"]
+ )
data.append([p])
@@ -104,8 +106,10 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_ta
# Collect a list of the exercise comments
item_list = [Paragraph('', styleSheet["Small"])]
if comments:
- item_list = [ListItem(Paragraph(i, style=styleSheet["ExerciseComments"]))
- for i in exercise['comment_list']]
+ item_list = [
+ ListItem(Paragraph(i, style=styleSheet["ExerciseComments"]))
+ for i in exercise['comment_list']
+ ]
# Add the exercise's main image
image = Paragraph('', styleSheet["Small"])
@@ -124,40 +128,42 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_ta
image.drawWidth = image_size * cm
# Put the name and images and comments together
- exercise_content = [Paragraph(exercise['obj'].name, styleSheet["Small"]),
- image,
- ListFlowable(item_list,
- bulletType='bullet',
- leftIndent=5,
- spaceBefore=7,
- bulletOffsetY=-3,
- bulletFontSize=3,
- start='square')]
-
- data.append([f"#{set_count}",
- exercise_content,
- setting_out]
- + [''] * nr_of_weeks)
+ exercise_content = [
+ Paragraph(exercise['obj'].name, styleSheet["Small"]), image,
+ ListFlowable(
+ item_list,
+ bulletType='bullet',
+ leftIndent=5,
+ spaceBefore=7,
+ bulletOffsetY=-3,
+ bulletFontSize=3,
+ start='square'
+ )
+ ]
+
+ data.append([f"#{set_count}", exercise_content, setting_out] + [''] * nr_of_weeks)
set_count += 1
- table_style = [('FONT', (0, 0), (-1, -1), 'OpenSans'),
- ('FONTSIZE', (0, 0), (-1, -1), 8),
- ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
- ('LEFTPADDING', (0, 0), (-1, -1), 2),
- ('RIGHTPADDING', (0, 0), (-1, -1), 0),
- ('TOPPADDING', (0, 0), (-1, -1), 3),
- ('BOTTOMPADDING', (0, 0), (-1, -1), 2),
- ('INNERGRID', (0, 0), (-1, -1), 0.25, colors.black),
-
- # Header
- ('BACKGROUND', (0, 0), (-1, 0), header_colour),
- ('BOX', (0, 0), (-1, -1), 1.25, colors.black),
- ('BOX', (0, 1), (-1, -1), 1.25, colors.black),
- ('SPAN', (0, 0), (-1, 0)),
-
- # Cell with 'date'
- ('SPAN', (0, 1), (2, 1)),
- ('ALIGN', (0, 1), (2, 1), 'RIGHT')]
+ table_style = [
+ ('FONT', (0, 0), (-1, -1), 'OpenSans'),
+ ('FONTSIZE', (0, 0), (-1, -1), 8),
+ ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
+ ('LEFTPADDING', (0, 0), (-1, -1), 2),
+ ('RIGHTPADDING', (0, 0), (-1, -1), 0),
+ ('TOPPADDING', (0, 0), (-1, -1), 3),
+ ('BOTTOMPADDING', (0, 0), (-1, -1), 2),
+ ('INNERGRID', (0, 0), (-1, -1), 0.25, colors.black),
+
+ # Header
+ ('BACKGROUND', (0, 0), (-1, 0), header_colour),
+ ('BOX', (0, 0), (-1, -1), 1.25, colors.black),
+ ('BOX', (0, 1), (-1, -1), 1.25, colors.black),
+ ('SPAN', (0, 0), (-1, 0)),
+
+ # Cell with 'date'
+ ('SPAN', (0, 1), (2, 1)),
+ ('ALIGN', (0, 1), (2, 1), 'RIGHT')
+ ]
# Combine the cells for exercises on the same superset
for marker in group_exercise_marker:
@@ -194,6 +200,7 @@ class WorkoutCalendar(HTMLCalendar):
A calendar renderer, see this blog entry for details:
* http://uggedal.com/journal/creating-a-flexible-monthly-calendar-in-django/
"""
+
def __init__(self, workout_logs, *args, **kwargs):
super(WorkoutCalendar, self).__init__(*args, **kwargs)
self.workout_logs = workout_logs
@@ -236,11 +243,11 @@ class WorkoutCalendar(HTMLCalendar):
url = reverse('manager:log:log', kwargs={'pk': entry['workout'].id})
formatted_date = date_obj.strftime('%Y-%m-%d')
body = []
- body.append('<a href="{0}" '
- 'data-log="log-{1}" '
- 'class="btn btn-block {2} calendar-link">'.format(url,
- formatted_date,
- background_css))
+ body.append(
+ '<a href="{0}" '
+ 'data-log="log-{1}" '
+ 'class="btn btn-block {2} calendar-link">'.format(url, formatted_date, background_css)
+ )
body.append(repr(day))
body.append('</a>')
return self.day_cell(cssclass, '{0}'.format(''.join(body)))
diff --git a/wger/manager/management/commands/email-reminders.py b/wger/manager/management/commands/email-reminders.py
index f763ce148..439615d80 100644
--- a/wger/manager/management/commands/email-reminders.py
+++ b/wger/manager/management/commands/email-reminders.py
@@ -62,18 +62,21 @@ class Command(BaseCommand):
# No schedules, use the default workout length in user profile
if not schedule and current_workout:
- delta = (current_workout.creation_date
- + datetime.timedelta(weeks=profile.workout_duration)
- - datetime.date.today())
+ delta = (
+ current_workout.creation_date +
+ datetime.timedelta(weeks=profile.workout_duration) - datetime.date.today()
+ )
if datetime.timedelta(days=profile.workout_reminder) > delta:
if int(options['verbosity']) >= 3:
self.stdout.write("* Workout '{0}' overdue".format(current_workout))
counter += 1
- self.send_email(profile.user,
- current_workout,
- delta)
+ self.send_email(
+ profile.user,
+ current_workout,
+ delta,
+ )
# non-loop schedule, take the step's duration
elif schedule and not schedule.is_loop:
@@ -86,13 +89,12 @@ class Command(BaseCommand):
delta = schedule.get_end_date() - datetime.date.today()
if datetime.timedelta(days=profile.workout_reminder) > delta:
if int(options['verbosity']) >= 3:
- self.stdout.write("* Workout '{0}' overdue - schedule".
- format(schedule_step.workout))
+ self.stdout.write(
+ "* Workout '{0}' overdue - schedule".format(schedule_step.workout)
+ )
counter += 1
- self.send_email(profile.user,
- current_workout,
- delta)
+ self.send_email(profile.user, current_workout, delta)
if counter and int(options['verbosity']) >= 2:
self.stdout.write("Sent {0} email reminders".format(counter))
@@ -113,15 +115,18 @@ class Command(BaseCommand):
# Compose and send the email
translation.activate(user.userprofile.notification_language.short_name)
- context = {'site': Site.objects.get_current(),
- 'workout': workout,
- 'expired': True if delta.days < 0 else False,
- 'days': abs(delta.days)}
+ context = {
+ 'site': Site.objects.get_current(),
+ 'workout': workout,
+ 'expired': True if delta.days < 0 else False,
+ 'days': abs(delta.days)
+ }
subject = _('Workout will expire soon')
message = loader.render_to_string('workout/email_reminder.tpl', context)
- mail.send_mail(subject,
- message,
- settings.WGER_SETTINGS['EMAIL_FROM'],
- [user.email],
- fail_silently=True)
+ mail.send_mail(
+ subject,
+ message,
+ settings.WGER_SETTINGS['EMAIL_FROM'], [user.email],
+ fail_silently=True
+ )
diff --git a/wger/manager/migrations/0001_initial.py b/wger/manager/migrations/0001_initial.py
index f6ca5dd22..04b91a824 100644
--- a/wger/manager/migrations/0001_initial.py
+++ b/wger/manager/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
import wger.utils.fields
import datetime
@@ -19,115 +19,328 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Day',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('description', models.CharField(help_text='Ususally a description about what parts are trained, like "Arms" or "Pull Day"', max_length=100, verbose_name='Description')),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'description',
+ models.CharField(
+ help_text=
+ 'Ususally a description about what parts are trained, like "Arms" or "Pull Day"',
+ max_length=100,
+ verbose_name='Description'
+ )
+ ),
('day', models.ManyToManyField(to='core.DaysOfWeek', verbose_name='Day')),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Schedule',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('name', models.CharField(help_text="Name or short description of the schedule. For example 'Program XYZ'.", max_length=100, verbose_name='Name')),
- ('start_date', wger.utils.fields.Html5DateField(default=datetime.date.today, verbose_name='Start date')),
- ('is_active', models.BooleanField(default=True, help_text='Tick the box if you want to mark this schedule as your active one (will be shown e.g. on your dashboard). All other schedules will then be marked as inactive', verbose_name='Schedule active')),
- ('is_loop', models.BooleanField(default=False, help_text='Tick the box if you want to repeat the schedules in a loop (i.e. A, B, C, A, B, C, and so on)', verbose_name='Is loop')),
- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User', on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'name',
+ models.CharField(
+ help_text=
+ "Name or short description of the schedule. For example 'Program XYZ'.",
+ max_length=100,
+ verbose_name='Name'
+ )
+ ),
+ (
+ 'start_date',
+ wger.utils.fields.Html5DateField(
+ default=datetime.date.today, verbose_name='Start date'
+ )
+ ),
+ (
+ 'is_active',
+ models.BooleanField(
+ default=True,
+ help_text=
+ 'Tick the box if you want to mark this schedule as your active one (will be shown e.g. on your dashboard). All other schedules will then be marked as inactive',
+ verbose_name='Schedule active'
+ )
+ ),
+ (
+ 'is_loop',
+ models.BooleanField(
+ default=False,
+ help_text=
+ 'Tick the box if you want to repeat the schedules in a loop (i.e. A, B, C, A, B, C, and so on)',
+ verbose_name='Is loop'
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ verbose_name='User',
+ on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='ScheduleStep',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('duration', models.IntegerField(default=4, help_text='The duration in weeks', verbose_name='Duration', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(25)])),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'duration',
+ models.IntegerField(
+ default=4,
+ help_text='The duration in weeks',
+ verbose_name='Duration',
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(25)
+ ]
+ )
+ ),
('order', models.IntegerField(default=1, max_length=1, verbose_name='Order')),
- ('schedule', models.ForeignKey(verbose_name='schedule', to='manager.Schedule', on_delete=models.CASCADE)),
+ (
+ 'schedule',
+ models.ForeignKey(
+ verbose_name='schedule', to='manager.Schedule', on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['order'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Set',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('order', models.IntegerField(null=True, verbose_name='Order', blank=True)),
- ('sets', models.IntegerField(default=4, verbose_name='Number of sets', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10)])),
- ('exerciseday', models.ForeignKey(verbose_name='Exercise day', to='manager.Day', on_delete=models.CASCADE)),
- ('exercises', models.ManyToManyField(to='exercises.Exercise', verbose_name='Exercises')),
+ (
+ 'sets',
+ models.IntegerField(
+ default=4,
+ verbose_name='Number of sets',
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(10)
+ ]
+ )
+ ),
+ (
+ 'exerciseday',
+ models.ForeignKey(
+ verbose_name='Exercise day', to='manager.Day', on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'exercises',
+ models.ManyToManyField(to='exercises.Exercise', verbose_name='Exercises')
+ ),
],
options={
'ordering': ['order'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Setting',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('reps', models.IntegerField(verbose_name='Repetitions', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)])),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'reps',
+ models.IntegerField(
+ verbose_name='Repetitions',
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ]
+ )
+ ),
('order', models.IntegerField(verbose_name='Order', blank=True)),
('comment', models.CharField(max_length=100, verbose_name='Comment', blank=True)),
- ('exercise', models.ForeignKey(verbose_name='Exercises', to='exercises.Exercise', on_delete=models.CASCADE)),
- ('set', models.ForeignKey(verbose_name='Sets', to='manager.Set', on_delete=models.CASCADE)),
+ (
+ 'exercise',
+ models.ForeignKey(
+ verbose_name='Exercises', to='exercises.Exercise', on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'set',
+ models.ForeignKey(
+ verbose_name='Sets', to='manager.Set', on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['order', 'id'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Workout',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('creation_date', models.DateField(auto_now_add=True, verbose_name='Creation date')),
- ('comment', models.CharField(help_text="A short description or goal of the workout. For example 'Focus on back' or 'Week 1 of program xy'.", max_length=100, verbose_name='Description', blank=True)),
- ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'creation_date',
+ models.DateField(auto_now_add=True, verbose_name='Creation date')
+ ),
+ (
+ 'comment',
+ models.CharField(
+ help_text=
+ "A short description or goal of the workout. For example 'Focus on back' or 'Week 1 of program xy'.",
+ max_length=100,
+ verbose_name='Description',
+ blank=True
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['-creation_date'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='WorkoutLog',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('reps', models.IntegerField(verbose_name='Repetitions', validators=[django.core.validators.MinValueValidator(0)])),
- ('weight', models.DecimalField(verbose_name='Weight', max_digits=5, decimal_places=2, validators=[django.core.validators.MinValueValidator(0)])),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'reps',
+ models.IntegerField(
+ verbose_name='Repetitions',
+ validators=[django.core.validators.MinValueValidator(0)]
+ )
+ ),
+ (
+ 'weight',
+ models.DecimalField(
+ verbose_name='Weight',
+ max_digits=5,
+ decimal_places=2,
+ validators=[django.core.validators.MinValueValidator(0)]
+ )
+ ),
('date', wger.utils.fields.Html5DateField(verbose_name='Date')),
- ('exercise', models.ForeignKey(verbose_name='Exercise', to='exercises.Exercise', on_delete=models.CASCADE)),
- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User', on_delete=models.CASCADE)),
- ('workout', models.ForeignKey(verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE)),
+ (
+ 'exercise',
+ models.ForeignKey(
+ verbose_name='Exercise', to='exercises.Exercise', on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ verbose_name='User',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'workout',
+ models.ForeignKey(
+ verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['date', 'reps'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='WorkoutSession',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('date', wger.utils.fields.Html5DateField(verbose_name='Date')),
- ('notes', models.TextField(help_text='Any notes you might want to save about this workout session.', null=True, verbose_name='Notes', blank=True)),
- ('impression', models.CharField(default=b'2', help_text='Your impression about this workout session. Did you exercise as well as you could?', max_length=2, verbose_name='General impression', choices=[(b'1', 'Bad'), (b'2', 'Neutral'), (b'3', 'Good')])),
+ (
+ 'notes',
+ models.TextField(
+ help_text='Any notes you might want to save about this workout session.',
+ null=True,
+ verbose_name='Notes',
+ blank=True
+ )
+ ),
+ (
+ 'impression',
+ models.CharField(
+ default=b'2',
+ help_text=
+ 'Your impression about this workout session. Did you exercise as well as you could?',
+ max_length=2,
+ verbose_name='General impression',
+ choices=[(b'1', 'Bad'), (b'2', 'Neutral'), (b'3', 'Good')]
+ )
+ ),
('time_start', models.TimeField(null=True, verbose_name='Start time', blank=True)),
('time_end', models.TimeField(null=True, verbose_name='Finish time', blank=True)),
- ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
- ('workout', models.ForeignKey(verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE)),
+ (
+ 'user',
+ models.ForeignKey(
+ verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'workout',
+ models.ForeignKey(
+ verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['date'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.AlterUniqueTogether(
name='workoutsession',
@@ -142,7 +355,9 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='day',
name='training',
- field=models.ForeignKey(verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE
+ ),
preserve_default=True,
),
]
diff --git a/wger/manager/migrations/0002_auto_20150202_2040.py b/wger/manager/migrations/0002_auto_20150202_2040.py
index 317c35891..9a1e85100 100644
--- a/wger/manager/migrations/0002_auto_20150202_2040.py
+++ b/wger/manager/migrations/0002_auto_20150202_2040.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
from sortedm2m.operations import AlterSortedManyToManyField
import sortedm2m.fields
@@ -15,7 +15,9 @@ class Migration(migrations.Migration):
AlterSortedManyToManyField(
model_name='set',
name='exercises',
- field=sortedm2m.fields.SortedManyToManyField(help_text=None, to='exercises.Exercise', verbose_name='Exercises'),
+ field=sortedm2m.fields.SortedManyToManyField(
+ help_text=None, to='exercises.Exercise', verbose_name='Exercises'
+ ),
preserve_default=True,
)
]
diff --git a/wger/manager/migrations/0004_auto_20150609_1603.py b/wger/manager/migrations/0004_auto_20150609_1603.py
index 8d79fda04..0666b8536 100644
--- a/wger/manager/migrations/0004_auto_20150609_1603.py
+++ b/wger/manager/migrations/0004_auto_20150609_1603.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
import django.core.validators
@@ -14,7 +14,17 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='setting',
name='weight',
- field=models.DecimalField(decimal_places=2, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1500)], max_digits=6, blank=True, null=True, verbose_name='Weight'),
+ field=models.DecimalField(
+ decimal_places=2,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(1500)
+ ],
+ max_digits=6,
+ blank=True,
+ null=True,
+ verbose_name='Weight'
+ ),
preserve_default=True,
),
]
diff --git a/wger/manager/migrations/0005_auto_20160303_2008.py b/wger/manager/migrations/0005_auto_20160303_2008.py
index 295ed99cf..5e647f501 100644
--- a/wger/manager/migrations/0005_auto_20160303_2008.py
+++ b/wger/manager/migrations/0005_auto_20160303_2008.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
import django.core.validators
@@ -15,22 +15,36 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='setting',
name='unit',
- field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Unit', default=1, to='core.RepetitionUnit', on_delete=models.CASCADE
+ ),
),
migrations.AddField(
model_name='workoutlog',
name='unit',
- field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Unit', default=1, to='core.RepetitionUnit', on_delete=models.CASCADE
+ ),
),
migrations.AlterField(
model_name='day',
name='description',
- field=models.CharField(verbose_name='Description', help_text='A description of what is done on this day (e.g. "Pull day") or what body parts are trained (e.g. "Arms and abs")', max_length=100),
+ field=models.CharField(
+ verbose_name='Description',
+ help_text=
+ 'A description of what is done on this day (e.g. "Pull day") or what body parts are trained (e.g. "Arms and abs")',
+ max_length=100
+ ),
),
migrations.AlterField(
model_name='schedule',
name='is_loop',
- field=models.BooleanField(verbose_name='Is a loop', default=False, help_text='Tick the box if you want to repeat the schedules in a loop (i.e. A, B, C, A, B, C, and so on)'),
+ field=models.BooleanField(
+ verbose_name='Is a loop',
+ default=False,
+ help_text=
+ 'Tick the box if you want to repeat the schedules in a loop (i.e. A, B, C, A, B, C, and so on)'
+ ),
),
migrations.AlterField(
model_name='schedulestep',
@@ -40,11 +54,24 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='setting',
name='reps',
- field=models.IntegerField(verbose_name='Amount', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)]),
+ field=models.IntegerField(
+ verbose_name='Amount',
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ]
+ ),
),
migrations.AlterField(
model_name='workoutsession',
name='impression',
- field=models.CharField(verbose_name='General impression', default='2', choices=[('1', 'Bad'), ('2', 'Neutral'), ('3', 'Good')], help_text='Your impression about this workout session. Did you exercise as well as you could?', max_length=2),
+ field=models.CharField(
+ verbose_name='General impression',
+ default='2',
+ choices=[('1', 'Bad'), ('2', 'Neutral'), ('3', 'Good')],
+ help_text=
+ 'Your impression about this workout session. Did you exercise as well as you could?',
+ max_length=2
+ ),
),
]
diff --git a/wger/manager/migrations/0006_auto_20160303_2138.py b/wger/manager/migrations/0006_auto_20160303_2138.py
index 15bbe67ff..958631d7b 100644
--- a/wger/manager/migrations/0006_auto_20160303_2138.py
+++ b/wger/manager/migrations/0006_auto_20160303_2138.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
@@ -24,11 +24,15 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='setting',
name='weight_unit',
- field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1, on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Unit', to='core.WeightUnit', default=1, on_delete=models.CASCADE
+ ),
),
migrations.AddField(
model_name='workoutlog',
name='weight_unit',
- field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1, on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Unit', to='core.WeightUnit', default=1, on_delete=models.CASCADE
+ ),
),
]
diff --git a/wger/manager/migrations/0007_auto_20160311_2258.py b/wger/manager/migrations/0007_auto_20160311_2258.py
index b3f2d246d..1e7a6b1cb 100644
--- a/wger/manager/migrations/0007_auto_20160311_2258.py
+++ b/wger/manager/migrations/0007_auto_20160311_2258.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
diff --git a/wger/manager/migrations/0008_auto_20190618_1617.py b/wger/manager/migrations/0008_auto_20190618_1617.py
index e9199f015..68db7b2fa 100644
--- a/wger/manager/migrations/0008_auto_20190618_1617.py
+++ b/wger/manager/migrations/0008_auto_20190618_1617.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.11.21 on 2019-06-18 16:17
import django.core.validators
from django.db import migrations, models
@@ -15,7 +15,12 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='setting',
name='reps',
- field=models.IntegerField(validators=[django.core.validators.MinValueValidator(
- 0), django.core.validators.MaxValueValidator(600)], verbose_name='Amount'),
+ field=models.IntegerField(
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(600)
+ ],
+ verbose_name='Amount'
+ ),
),
]
diff --git a/wger/manager/migrations/0009_auto_20201202_1559.py b/wger/manager/migrations/0009_auto_20201202_1559.py
index a6aaea1dd..5ac70cea8 100644
--- a/wger/manager/migrations/0009_auto_20201202_1559.py
+++ b/wger/manager/migrations/0009_auto_20201202_1559.py
@@ -15,16 +15,29 @@ class Migration(migrations.Migration):
name='rir',
field=models.DecimalField(
blank=True,
- choices=[(None, '------'), (0, 0), (0.5, 0.5), (1, 1), (1.5, 1.5), (2, 2),
- (2.5, 2.5), (3, 3), (3.5, 3.5), (4, 4)],
- decimal_places=1, max_digits=3, null=True, verbose_name='RiR'),
+ choices=[
+ (None, '------'), (0, 0), (0.5, 0.5), (1, 1), (1.5, 1.5), (2, 2), (2.5, 2.5),
+ (3, 3), (3.5, 3.5), (4, 4)
+ ],
+ decimal_places=1,
+ max_digits=3,
+ null=True,
+ verbose_name='RiR'
+ ),
),
migrations.AddField(
model_name='workoutlog',
name='rir',
field=models.DecimalField(
- blank=True, choices=[(None, '------'), (0, 0), (0.5, 0.5), (1, 1), (1.5, 1.5),
- (2, 2), (2.5, 2.5), (3, 3), (3.5, 3.5), (4, 4)],
- decimal_places=1, max_digits=3, null=True, verbose_name='RiR'),
+ blank=True,
+ choices=[
+ (None, '------'), (0, 0), (0.5, 0.5), (1, 1), (1.5, 1.5), (2, 2), (2.5, 2.5),
+ (3, 3), (3.5, 3.5), (4, 4)
+ ],
+ decimal_places=1,
+ max_digits=3,
+ null=True,
+ verbose_name='RiR'
+ ),
),
]
diff --git a/wger/manager/migrations/0010_auto_20210102_1446.py b/wger/manager/migrations/0010_auto_20210102_1446.py
index 807bac3e2..f4c573744 100644
--- a/wger/manager/migrations/0010_auto_20210102_1446.py
+++ b/wger/manager/migrations/0010_auto_20210102_1446.py
@@ -13,19 +13,29 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='setting',
name='rir',
- field=models.CharField(blank=True,
- choices=[(None, '------'), ('0', 0), ('0.5', 0.5), ('1', 1),
- ('1.5', 1.5), ('2', 2), ('2.5', 2.5), ('3', 3),
- ('3.5', 3.5), ('4', 4)],
- max_length=3, null=True, verbose_name='RiR'),
+ field=models.CharField(
+ blank=True,
+ choices=[
+ (None, '------'), ('0', 0), ('0.5', 0.5), ('1', 1), ('1.5', 1.5), ('2', 2),
+ ('2.5', 2.5), ('3', 3), ('3.5', 3.5), ('4', 4)
+ ],
+ max_length=3,
+ null=True,
+ verbose_name='RiR'
+ ),
),
migrations.AlterField(
model_name='workoutlog',
name='rir',
- field=models.CharField(blank=True,
- choices=[(None, '------'), ('0', 0), ('0.5', 0.5), ('1', 1),
- ('1.5', 1.5), ('2', 2), ('2.5', 2.5), ('3', 3),
- ('3.5', 3.5), ('4', 4)],
- max_length=3, null=True, verbose_name='RiR'),
+ field=models.CharField(
+ blank=True,
+ choices=[
+ (None, '------'), ('0', 0), ('0.5', 0.5), ('1', 1), ('1.5', 1.5), ('2', 2),
+ ('2.5', 2.5), ('3', 3), ('3.5', 3.5), ('4', 4)
+ ],
+ max_length=3,
+ null=True,
+ verbose_name='RiR'
+ ),
),
]
diff --git a/wger/manager/migrations/0012_auto_20210430_1449.py b/wger/manager/migrations/0012_auto_20210430_1449.py
index 5b1b0a3f0..0fb1954b8 100644
--- a/wger/manager/migrations/0012_auto_20210430_1449.py
+++ b/wger/manager/migrations/0012_auto_20210430_1449.py
@@ -10,32 +10,37 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RenameField(
- model_name='workout',
- old_name='comment',
- new_name='name'
- ),
+ migrations.RenameField(model_name='workout', old_name='comment', new_name='name'),
migrations.AddField(
model_name='workout',
name='description',
- field=models.TextField(blank=True,
- help_text="A short description or goal of the workout. For "
- "example 'Focus on back' or 'Week 1 of program xy'.",
- max_length=1000, verbose_name='Description'),
+ field=models.TextField(
+ blank=True,
+ help_text="A short description or goal of the workout. For "
+ "example 'Focus on back' or 'Week 1 of program xy'.",
+ max_length=1000,
+ verbose_name='Description'
+ ),
),
migrations.AlterField(
model_name='workout',
name='name',
- field=models.CharField(blank=True,
- help_text='The name of the workout',
- max_length=100,
- verbose_name='Name'),
+ field=models.CharField(
+ blank=True,
+ help_text='The name of the workout',
+ max_length=100,
+ verbose_name='Name'
+ ),
),
migrations.AlterField(
model_name='setting',
name='reps',
- field=models.IntegerField(validators=[django.core.validators.MinValueValidator(0),
- django.core.validators.MaxValueValidator(600)],
- verbose_name='Reps'),
+ field=models.IntegerField(
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(600)
+ ],
+ verbose_name='Reps'
+ ),
),
]
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 698371c82..08b68e4d3 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -25,11 +25,11 @@ from django.contrib.auth.models import User
from django.core.cache import cache
from django.core.exceptions import (
ObjectDoesNotExist,
- ValidationError
+ ValidationError,
)
from django.core.validators import (
MaxValueValidator,
- MinValueValidator
+ MinValueValidator,
)
from django.db import models
from django.urls import reverse
@@ -39,30 +39,31 @@ from django.utils.translation import gettext_lazy as _
from wger.core.models import (
DaysOfWeek,
RepetitionUnit,
- WeightUnit
+ WeightUnit,
)
from wger.exercises.models import Exercise
from wger.utils.cache import (
cache_mapper,
reset_workout_canonical_form,
- reset_workout_log
+ reset_workout_log,
)
from wger.utils.fields import Html5DateField
from wger.utils.helpers import normalize_decimal
-
logger = logging.getLogger(__name__)
-RIR_OPTIONS = [(None, '------'),
- ('0', 0),
- ('0.5', 0.5),
- ('1', 1),
- ('1.5', 1.5),
- ('2', 2),
- ('2.5', 2.5),
- ('3', 3),
- ('3.5', 3.5),
- ('4', 4)]
+RIR_OPTIONS = [
+ (None, '------'),
+ ('0', 0),
+ ('0.5', 0.5),
+ ('1', 1),
+ ('1.5', 1.5),
+ ('2', 2),
+ ('2.5', 2.5),
+ ('3', 3),
+ ('3.5', 3.5),
+ ('4', 4),
+]
#
@@ -77,19 +78,27 @@ class Workout(models.Model):
"""
Meta class to set some other properties
"""
- ordering = ["-creation_date", ]
+ ordering = [
+ "-creation_date",
+ ]
creation_date = models.DateField(_('Creation date'), auto_now_add=True)
- name = models.CharField(verbose_name=_('Name'),
- max_length=100,
- blank=True,
- help_text=_("The name of the workout"))
- description = models.TextField(verbose_name=_('Description'),
- max_length=1000,
- blank=True,
- help_text=_("A short description or goal of the workout. For "
- "example 'Focus on back' or 'Week 1 of program "
- "xy'."))
+ name = models.CharField(
+ verbose_name=_('Name'),
+ max_length=100,
+ blank=True,
+ help_text=_("The name of the workout"),
+ )
+ description = models.TextField(
+ verbose_name=_('Description'),
+ max_length=1000,
+ blank=True,
+ help_text=_(
+ "A short description or goal of the workout. For "
+ "example 'Focus on back' or 'Week 1 of program "
+ "xy'."
+ ),
+ )
user = models.ForeignKey(User, verbose_name=_('User'), on_delete=models.CASCADE)
@@ -168,12 +177,16 @@ class Workout(models.Model):
day_canonical_repr.append(canonical_repr_day)
- workout_canonical_form = {'obj': self,
- 'muscles': {'front': muscles_front,
- 'back': muscles_back,
- 'frontsecondary': muscles_front_secondary,
- 'backsecondary': muscles_back_secondary},
- 'day_list': day_canonical_repr}
+ workout_canonical_form = {
+ 'obj': self,
+ 'muscles': {
+ 'front': muscles_front,
+ 'back': muscles_back,
+ 'frontsecondary': muscles_front_secondary,
+ 'backsecondary': muscles_back_secondary
+ },
+ 'day_list': day_canonical_repr
+ }
# Save to cache
cache.set(cache_mapper.get_workout_canonical(self.pk), workout_canonical_form)
@@ -232,38 +245,49 @@ class Schedule(models.Model):
objects = ScheduleManager()
"""Custom manager"""
- user = models.ForeignKey(User,
- verbose_name=_('User'),
- editable=False,
- on_delete=models.CASCADE)
+ user = models.ForeignKey(
+ User,
+ verbose_name=_('User'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
"""
The user this schedule belongs to. This could be accessed through a step
that points to a workout, that points to a user, but this is more straight
forward and performant
"""
- name = models.CharField(verbose_name=_('Name'),
- max_length=100,
- help_text=_("Name or short description of the schedule. "
- "For example 'Program XYZ'."))
+ name = models.CharField(
+ verbose_name=_('Name'),
+ max_length=100,
+ help_text=_("Name or short description of the schedule. "
+ "For example 'Program XYZ'."),
+ )
"""Name or short description of the schedule."""
- start_date = Html5DateField(verbose_name=_('Start date'),
- default=datetime.date.today)
+ start_date = Html5DateField(verbose_name=_('Start date'), default=datetime.date.today)
"""The start date of this schedule"""
- is_active = models.BooleanField(verbose_name=_('Schedule active'),
- default=True,
- help_text=_("Tick the box if you want to mark this schedule "
- "as your active one (will be shown e.g. on your "
- "dashboard). All other schedules will then be "
- "marked as inactive"))
+ is_active = models.BooleanField(
+ verbose_name=_('Schedule active'),
+ default=True,
+ help_text=_(
+ "Tick the box if you want to mark this schedule "
+ "as your active one (will be shown e.g. on your "
+ "dashboard). All other schedules will then be "
+ "marked as inactive"
+ ),
+ )
"""A flag indicating whether the schedule is active (needed for dashboard)"""
- is_loop = models.BooleanField(verbose_name=_('Is a loop'),
- default=False,
- help_text=_("Tick the box if you want to repeat the schedules "
- "in a loop (i.e. A, B, C, A, B, C, and so on)"))
+ is_loop = models.BooleanField(
+ verbose_name=_('Is a loop'),
+ default=False,
+ help_text=_(
+ "Tick the box if you want to repeat the schedules "
+ "in a loop (i.e. A, B, C, A, B, C, and so on)"
+ ),
+ )
"""A flag indicating whether the schedule should act as a loop"""
def __str__(self):
@@ -338,24 +362,25 @@ class ScheduleStep(models.Model):
"""
Set default ordering
"""
- ordering = ["order", ]
+ ordering = [
+ "order",
+ ]
- schedule = models.ForeignKey(Schedule,
- verbose_name=_('schedule'),
- on_delete=models.CASCADE)
+ schedule = models.ForeignKey(Schedule, verbose_name=_('schedule'), on_delete=models.CASCADE)
"""The schedule is step belongs to"""
workout = models.ForeignKey(Workout, on_delete=models.CASCADE)
"""The workout this step manages"""
- duration = models.IntegerField(verbose_name=_('Duration'),
- help_text=_('The duration in weeks'),
- default=4,
- validators=[MinValueValidator(1), MaxValueValidator(25)])
+ duration = models.IntegerField(
+ verbose_name=_('Duration'),
+ help_text=_('The duration in weeks'),
+ default=4,
+ validators=[MinValueValidator(1), MaxValueValidator(25)],
+ )
"""The duration in weeks"""
- order = models.IntegerField(verbose_name=_('Order'),
- default=1)
+ order = models.IntegerField(verbose_name=_('Order'), default=1)
def get_owner_object(self):
"""
@@ -395,15 +420,17 @@ class Day(models.Model):
Model for a training day
"""
- training = models.ForeignKey(Workout,
- verbose_name=_('Workout'), on_delete=models.CASCADE)
- description = models.CharField(max_length=100,
- verbose_name=_('Description'),
- help_text=_('A description of what is done on this day (e.g. '
- '"Pull day") or what body parts are trained (e.g. '
- '"Arms and abs")'))
- day = models.ManyToManyField(DaysOfWeek,
- verbose_name=_('Day'))
+ training = models.ForeignKey(Workout, verbose_name=_('Workout'), on_delete=models.CASCADE)
+ description = models.CharField(
+ max_length=100,
+ verbose_name=_('Description'),
+ help_text=_(
+ 'A description of what is done on this day (e.g. '
+ '"Pull day") or what body parts are trained (e.g. '
+ '"Arms and abs")'
+ ),
+ )
+ day = models.ManyToManyField(DaysOfWeek, verbose_name=_('Day'))
def __str__(self):
"""
@@ -504,17 +531,24 @@ class Day(models.Model):
# Collect exercise images
for image in exercise.images.all():
- exercise_images_tmp.append({'image': image.image.url,
- 'is_main': image.is_main,
- })
+ exercise_images_tmp.append(
+ {
+ 'image': image.image.url,
+ 'is_main': image.is_main,
+ }
+ )
# Put it all together
- exercise_tmp.append({'obj': exercise,
- 'setting_obj_list': setting_tmp,
- 'setting_text': setting_text,
- 'has_weight': has_weight,
- 'comment_list': comment_list,
- 'image_list': exercise_images_tmp})
+ exercise_tmp.append(
+ {
+ 'obj': exercise,
+ 'setting_obj_list': setting_tmp,
+ 'setting_text': setting_text,
+ 'has_weight': has_weight,
+ 'comment_list': comment_list,
+ 'image_list': exercise_images_tmp
+ }
+ )
# If it's a superset, check that all exercises have the same repetitions.
# If not, just take the smallest number and drop the rest, because otherwise
@@ -533,33 +567,40 @@ class Day(models.Model):
# setting_text, setting_list = set_obj.reps_smart_text(exercise)
# exercise['setting_text'] = setting_text
- canonical_repr.append({'obj': set_obj,
- 'exercise_list': exercise_tmp,
- 'is_superset': True if len(exercise_tmp) > 1 else False,
- 'settings_computed': set_obj.compute_settings,
- 'muscles': {
- 'back': muscles_back,
- 'front': muscles_front,
- 'frontsecondary': muscles_front_secondary,
- 'backsecondary': muscles_front_secondary
- }})
+ canonical_repr.append(
+ {
+ 'obj': set_obj,
+ 'exercise_list': exercise_tmp,
+ 'is_superset': True if len(exercise_tmp) > 1 else False,
+ 'settings_computed': set_obj.compute_settings,
+ 'muscles': {
+ 'back': muscles_back,
+ 'front': muscles_front,
+ 'frontsecondary': muscles_front_secondary,
+ 'backsecondary': muscles_front_secondary
+ }
+ }
+ )
# Days of the week
tmp_days_of_week = []
for day_of_week in self.day.select_related():
tmp_days_of_week.append(day_of_week)
- return {'obj': self,
- 'days_of_week': {
- 'text': ', '.join([str(_(i.day_of_week)) for i in tmp_days_of_week]),
- 'day_list': tmp_days_of_week},
- 'muscles': {
- 'back': muscles_back,
- 'front': muscles_front,
- 'frontsecondary': muscles_front_secondary,
- 'backsecondary': muscles_front_secondary
- },
- 'set_list': canonical_repr}
+ return {
+ 'obj': self,
+ 'days_of_week': {
+ 'text': ', '.join([str(_(i.day_of_week)) for i in tmp_days_of_week]),
+ 'day_list': tmp_days_of_week
+ },
+ 'muscles': {
+ 'back': muscles_back,
+ 'front': muscles_front,
+ 'frontsecondary': muscles_front_secondary,
+ 'backsecondary': muscles_front_secondary
+ },
+ 'set_list': canonical_repr
+ }
class Set(models.Model):
@@ -569,19 +610,27 @@ class Set(models.Model):
DEFAULT_SETS = 4
MAX_SETS = 10
- exerciseday = models.ForeignKey(Day,
- verbose_name=_('Exercise day'),
- on_delete=models.CASCADE)
- order = models.IntegerField(blank=True,
- null=True,
- verbose_name=_('Order'))
- sets = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(MAX_SETS)],
- verbose_name=_('Number of sets'),
- default=DEFAULT_SETS)
+ exerciseday = models.ForeignKey(
+ Day,
+ verbose_name=_('Exercise day'),
+ on_delete=models.CASCADE,
+ )
+ order = models.IntegerField(
+ blank=True,
+ null=True,
+ verbose_name=_('Order'),
+ )
+ sets = models.IntegerField(
+ validators=[MinValueValidator(0), MaxValueValidator(MAX_SETS)],
+ verbose_name=_('Number of sets'),
+ default=DEFAULT_SETS,
+ )
# Metaclass to set some other properties
class Meta:
- ordering = ["order", ]
+ ordering = [
+ "order",
+ ]
def __str__(self):
"""
@@ -646,7 +695,7 @@ class Set(models.Model):
settings = self.setting_set.filter(exercise=exercise)
if settings.count() == 0:
- return[]
+ return []
elif settings.count() == 1:
setting = settings.first()
return [setting] * self.sets
@@ -758,19 +807,21 @@ class Setting(models.Model):
"""
set = models.ForeignKey(Set, verbose_name=_('Sets'), on_delete=models.CASCADE)
- exercise = models.ForeignKey(Exercise,
- verbose_name=_('Exercises'),
- on_delete=models.CASCADE)
- repetition_unit = models.ForeignKey(RepetitionUnit,
- verbose_name=_('Unit'),
- default=1,
- on_delete=models.CASCADE)
+ exercise = models.ForeignKey(Exercise, verbose_name=_('Exercises'), on_delete=models.CASCADE)
+ repetition_unit = models.ForeignKey(
+ RepetitionUnit,
+ verbose_name=_('Unit'),
+ default=1,
+ on_delete=models.CASCADE,
+ )
"""
The repetition unit of a set. This can be e.g. a repetition, a minute, etc.
"""
- reps = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(600)],
- verbose_name=_('Reps'))
+ reps = models.IntegerField(
+ validators=[MinValueValidator(0), MaxValueValidator(600)],
+ verbose_name=_('Reps'),
+ )
"""
Amount of repetitions, minutes, etc. for a set.
@@ -778,37 +829,40 @@ class Setting(models.Model):
kept for compatibility reasons (specially for the REST API).
"""
- weight = models.DecimalField(verbose_name=_('Weight'),
- max_digits=6,
- decimal_places=2,
- blank=True,
- null=True,
- validators=[MinValueValidator(0), MaxValueValidator(1500)])
+ weight = models.DecimalField(
+ verbose_name=_('Weight'),
+ max_digits=6,
+ decimal_places=2,
+ blank=True,
+ null=True,
+ validators=[MinValueValidator(0), MaxValueValidator(1500)]
+ )
"""Planed weight for the repetitions"""
- weight_unit = models.ForeignKey(WeightUnit,
- verbose_name=_('Unit'),
- default=1,
- on_delete=models.CASCADE)
+ weight_unit = models.ForeignKey(
+ WeightUnit,
+ verbose_name=_('Unit'),
+ default=1,
+ on_delete=models.CASCADE,
+ )
"""
The weight unit of a set. This can be e.g. kg, lb, km/h, etc.
"""
- rir = models.CharField(verbose_name=_('RiR'),
- max_length=3,
- blank=True,
- null=True,
- choices=RIR_OPTIONS)
+ rir = models.CharField(
+ verbose_name=_('RiR'),
+ max_length=3,
+ blank=True,
+ null=True,
+ choices=RIR_OPTIONS,
+ )
"""
Reps in reserve, RiR. The amount of reps that could realistically still be
done in the set.
"""
- order = models.IntegerField(blank=True,
- verbose_name=_('Order'))
- comment = models.CharField(max_length=100,
- blank=True,
- verbose_name=_('Comment'))
+ order = models.IntegerField(blank=True, verbose_name=_('Order'))
+ comment = models.CharField(max_length=100, blank=True, verbose_name=_('Comment'))
# Metaclass to set some other properties
class Meta:
@@ -852,27 +906,37 @@ class WorkoutLog(models.Model):
A log entry for an exercise
"""
- user = models.ForeignKey(User,
- verbose_name=_('User'),
- editable=False,
- on_delete=models.CASCADE)
- exercise = models.ForeignKey(Exercise,
- verbose_name=_('Exercise'),
- on_delete=models.CASCADE)
- workout = models.ForeignKey(Workout,
- verbose_name=_('Workout'),
- on_delete=models.CASCADE)
-
- repetition_unit = models.ForeignKey(RepetitionUnit,
- verbose_name=_('Unit'),
- default=1,
- on_delete=models.CASCADE)
+ user = models.ForeignKey(
+ User,
+ verbose_name=_('User'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ exercise = models.ForeignKey(
+ Exercise,
+ verbose_name=_('Exercise'),
+ on_delete=models.CASCADE,
+ )
+ workout = models.ForeignKey(
+ Workout,
+ verbose_name=_('Workout'),
+ on_delete=models.CASCADE,
+ )
+
+ repetition_unit = models.ForeignKey(
+ RepetitionUnit,
+ verbose_name=_('Unit'),
+ default=1,
+ on_delete=models.CASCADE,
+ )
"""
The unit of the log. This can be e.g. a repetition, a minute, etc.
"""
- reps = models.IntegerField(verbose_name=_('Repetitions'),
- validators=[MinValueValidator(0)])
+ reps = models.IntegerField(
+ verbose_name=_('Repetitions'),
+ validators=[MinValueValidator(0)],
+ )
"""
Amount of repetitions, minutes, etc.
@@ -880,26 +944,32 @@ class WorkoutLog(models.Model):
kept for compatibility reasons (specially for the REST API).
"""
- weight = models.DecimalField(decimal_places=2,
- max_digits=5,
- verbose_name=_('Weight'),
- validators=[MinValueValidator(0)])
+ weight = models.DecimalField(
+ decimal_places=2,
+ max_digits=5,
+ verbose_name=_('Weight'),
+ validators=[MinValueValidator(0)],
+ )
- weight_unit = models.ForeignKey(WeightUnit,
- verbose_name=_('Unit'),
- default=1,
- on_delete=models.CASCADE)
+ weight_unit = models.ForeignKey(
+ WeightUnit,
+ verbose_name=_('Unit'),
+ default=1,
+ on_delete=models.CASCADE,
+ )
"""
The weight unit of the log. This can be e.g. kg, lb, km/h, etc.
"""
date = Html5DateField(verbose_name=_('Date'))
- rir = models.CharField(verbose_name=_('RiR'),
- max_length=3,
- blank=True,
- null=True,
- choices=RIR_OPTIONS)
+ rir = models.CharField(
+ verbose_name=_('RiR'),
+ max_length=3,
+ blank=True,
+ null=True,
+ choices=RIR_OPTIONS,
+ )
"""
Reps in reserve, RiR. The amount of reps that could realistically still be
done in the set.
@@ -913,9 +983,7 @@ class WorkoutLog(models.Model):
"""
Return a more human-readable representation
"""
- return "Log entry: {0} - {1} kg on {2}".format(self.reps,
- self.weight,
- self.date)
+ return "Log entry: {0} - {1} kg on {2}".format(self.reps, self.weight, self.date)
def get_owner_object(self):
"""
@@ -973,18 +1041,22 @@ class WorkoutSession(models.Model):
(IMPRESSION_GOOD, _('Good')),
)
- user = models.ForeignKey(User,
- verbose_name=_('User'),
- on_delete=models.CASCADE)
+ user = models.ForeignKey(
+ User,
+ verbose_name=_('User'),
+ on_delete=models.CASCADE,
+ )
"""
The user the workout session belongs to
See note in weight.models.WeightEntry about why this is not editable=False
"""
- workout = models.ForeignKey(Workout,
- verbose_name=_('Workout'),
- on_delete=models.CASCADE)
+ workout = models.ForeignKey(
+ Workout,
+ verbose_name=_('Workout'),
+ on_delete=models.CASCADE,
+ )
"""
The workout the session belongs to
"""
@@ -994,35 +1066,37 @@ class WorkoutSession(models.Model):
The date the workout session was performed
"""
- notes = models.TextField(verbose_name=_('Notes'),
- null=True,
- blank=True,
- help_text=_('Any notes you might want to save about this workout '
- 'session.'))
+ notes = models.TextField(
+ verbose_name=_('Notes'),
+ null=True,
+ blank=True,
+ help_text=_('Any notes you might want to save about this workout '
+ 'session.')
+ )
"""
User notes about the workout
"""
- impression = models.CharField(verbose_name=_('General impression'),
- max_length=2,
- choices=IMPRESSION,
- default=IMPRESSION_NEUTRAL,
- help_text=_('Your impression about this workout session. '
- 'Did you exercise as well as you could?'))
+ impression = models.CharField(
+ verbose_name=_('General impression'),
+ max_length=2,
+ choices=IMPRESSION,
+ default=IMPRESSION_NEUTRAL,
+ help_text=_(
+ 'Your impression about this workout session. '
+ 'Did you exercise as well as you could?'
+ )
+ )
"""
The user's general impression of workout
"""
- time_start = models.TimeField(verbose_name=_('Start time'),
- blank=True,
- null=True)
+ time_start = models.TimeField(verbose_name=_('Start time'), blank=True, null=True)
"""
Time the workout session started
"""
- time_end = models.TimeField(verbose_name=_('Finish time'),
- blank=True,
- null=True)
+ time_end = models.TimeField(verbose_name=_('Finish time'), blank=True, null=True)
"""
Time the workout session ended
"""
@@ -1037,7 +1111,9 @@ class WorkoutSession(models.Model):
"""
Set other properties
"""
- ordering = ["date", ]
+ ordering = [
+ "date",
+ ]
unique_together = ("date", "user")
def clean(self):
diff --git a/wger/manager/signals.py b/wger/manager/signals.py
index ee18a4296..b98aa736a 100644
--- a/wger/manager/signals.py
+++ b/wger/manager/signals.py
@@ -18,19 +18,19 @@
from django.db.models import Q
from django.db.models.signals import (
post_save,
- pre_delete
+ pre_delete,
)
# wger
from wger.core.models import Language
from wger.exercises.models import (
Exercise,
- Muscle
+ Muscle,
)
from wger.gym.helpers import get_user_last_activity
from wger.manager.models import (
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.cache import delete_template_fragment_cache
@@ -57,13 +57,15 @@ post_save.connect(update_activity_cache, sender=WorkoutLog)
def reset_muscle_cache(sender, instance, **kwargs):
exercises = Exercise.objects.filter(
Q(exercise_base__muscles=instance)
- | Q(exercise_base__muscles_secondary=instance)).all()
+ | Q(exercise_base__muscles_secondary=instance)
+ ).all()
languages = Language.objects.all()
for exercise in exercises:
for language in languages:
- delete_template_fragment_cache('exercise-detail-muscles',
- "{}-{}".format(exercise.id, language.id))
+ delete_template_fragment_cache(
+ 'exercise-detail-muscles', "{}-{}".format(exercise.id, language.id)
+ )
post_save.connect(reset_muscle_cache, sender=Muscle)
diff --git a/wger/manager/tests/__init__.py b/wger/manager/tests/__init__.py
index 46a91e9bd..dfedb2e6f 100644
--- a/wger/manager/tests/__init__.py
+++ b/wger/manager/tests/__init__.py
@@ -15,9 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.py
index da34ecfd2..e3380d2fe 100644
--- a/wger/manager/tests/test_copy_workout.py
+++ b/wger/manager/tests/test_copy_workout.py
@@ -23,7 +23,6 @@ from wger.core.models import UserProfile
from wger.core.tests.base_testcase import WgerTestCase
from wger.manager.models import Workout
-
logger = logging.getLogger(__name__)
@@ -46,8 +45,10 @@ class CopyWorkoutTestCase(WgerTestCase):
# Copy the workout
count_before = Workout.objects.count()
- self.client.post(reverse('manager:workout:copy', kwargs={'pk': '3'}),
- {'name': 'A copied workout'})
+ self.client.post(
+ reverse('manager:workout:copy', kwargs={'pk': '3'}),
+ {'name': 'A copied workout'},
+ )
count_after = Workout.objects.count()
if not owner:
diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.py
index d3fe1cbca..b467cb11a 100644
--- a/wger/manager/tests/test_day.py
+++ b/wger/manager/tests/test_day.py
@@ -20,7 +20,7 @@ from django.urls import reverse
from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.manager.models import Day
from wger.utils.cache import cache_mapper
@@ -47,8 +47,7 @@ class AddWorkoutDayTestCase(WgerAddTestCase):
url = reverse('manager:day:add', kwargs={'workout_pk': 3})
user_success = 'test'
user_fail = 'admin'
- data = {'description': 'a new day',
- 'day': [1, 4]}
+ data = {'description': 'a new day', 'day': [1, 4]}
class DeleteWorkoutDayTestCase(WgerTestCase):
@@ -81,7 +80,7 @@ class DeleteWorkoutDayTestCase(WgerTestCase):
Test deleting a day as an anonymous user
"""
- self. delete_day(fail=True)
+ self.delete_day(fail=True)
def test_delete_workout_owner(self):
"""
@@ -110,8 +109,7 @@ class EditWorkoutDayTestCase(WgerEditTestCase):
pk = 5
user_success = 'test'
user_fail = 'admin'
- data = {'description': 'a different description',
- 'day': [1, 4]}
+ data = {'description': 'a different description', 'day': [1, 4]}
class RenderWorkoutDayTestCase(WgerTestCase):
diff --git a/wger/manager/tests/test_email_reminder.py b/wger/manager/tests/test_email_reminder.py
index 9d7f9bf95..c80f9689e 100644
--- a/wger/manager/tests/test_email_reminder.py
+++ b/wger/manager/tests/test_email_reminder.py
@@ -25,7 +25,7 @@ from wger.core.models import UserProfile
from wger.core.tests.base_testcase import WgerTestCase
from wger.manager.models import (
Schedule,
- Workout
+ Workout,
)
diff --git a/wger/manager/tests/test_ical.py b/wger/manager/tests/test_ical.py
index eca299ae5..4c449f583 100644
--- a/wger/manager/tests/test_ical.py
+++ b/wger/manager/tests/test_ical.py
@@ -23,10 +23,9 @@ from django.urls import reverse
from wger.core.tests.base_testcase import WgerTestCase
from wger.utils.helpers import (
make_token,
- next_weekday
+ next_weekday,
)
-
# TODO: parse the generated calendar files with the icalendar library
@@ -63,14 +62,19 @@ class WorkoutICalExportTestCase(WgerTestCase):
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:workout:ical', kwargs={'pk': 3,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:workout:ical', kwargs={
+ 'pk': 3,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/calendar')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Calendar-workout-3.ics')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=Calendar-workout-3.ics'
+ )
# Approximate size
self.assertGreater(len(response.content), 540)
@@ -83,9 +87,13 @@ class WorkoutICalExportTestCase(WgerTestCase):
uid = 'AB'
token = 'abc-11223344556677889900'
- response = self.client.get(reverse('manager:workout:ical', kwargs={'pk': 3,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:workout:ical', kwargs={
+ 'pk': 3,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 403)
@@ -101,8 +109,9 @@ class WorkoutICalExportTestCase(WgerTestCase):
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/calendar')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Calendar-workout-3.ics')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=Calendar-workout-3.ics'
+ )
# Approximate size
self.assertGreater(len(response.content), 540)
@@ -150,14 +159,19 @@ class ScheduleICalExportTestCase(WgerTestCase):
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:schedule:ical', kwargs={'pk': 2,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:schedule:ical', kwargs={
+ 'pk': 2,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/calendar')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Calendar-schedule-2.ics')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=Calendar-schedule-2.ics'
+ )
# Approximate size
self.assertGreater(len(response.content), 1650)
@@ -170,9 +184,13 @@ class ScheduleICalExportTestCase(WgerTestCase):
uid = 'AB'
token = 'abc-11223344556677889900'
- response = self.client.get(reverse('manager:schedule:ical', kwargs={'pk': 2,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:schedule:ical', kwargs={
+ 'pk': 2,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 403)
@@ -188,8 +206,9 @@ class ScheduleICalExportTestCase(WgerTestCase):
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/calendar')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Calendar-schedule-2.ics')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=Calendar-schedule-2.ics'
+ )
# Approximate size
self.assertGreater(len(response.content), 1650)
diff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.py
index 1ff0d1760..79118dfbb 100644
--- a/wger/manager/tests/test_pdf.py
+++ b/wger/manager/tests/test_pdf.py
@@ -33,14 +33,17 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:workout:pdf-log', kwargs={
+ 'id': 3,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Workout-3-log.pdf')
+ self.assertEqual(response['Content-Disposition'], 'attachment; filename=Workout-3-log.pdf')
# Approximate size only
self.assertGreater(int(response['Content-Length']), 38000)
@@ -53,9 +56,13 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):
uid = 'AB'
token = 'abc-11223344556677889900'
- response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:workout:pdf-log', kwargs={
+ 'id': 3,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 403)
@@ -71,8 +78,10 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Workout-3-log.pdf')
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Workout-3-log.pdf',
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 38000)
@@ -83,16 +92,22 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):
Helper function to test exporting a workout as a pdf, with exercise coments
"""
- response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3,
- 'comments': 0}))
+ response = self.client.get(
+ reverse('manager:workout:pdf-log', kwargs={
+ 'id': 3,
+ 'comments': 0
+ })
+ )
if fail:
self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Workout-3-log.pdf')
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Workout-3-log.pdf',
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 38000)
@@ -103,16 +118,22 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):
Helper function to test exporting a workout as a pdf, with exercise images
"""
- response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3,
- 'images': 1}))
+ response = self.client.get(
+ reverse('manager:workout:pdf-log', kwargs={
+ 'id': 3,
+ 'images': 1
+ })
+ )
if fail:
self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Workout-3-log.pdf')
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Workout-3-log.pdf',
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 38000)
@@ -123,17 +144,22 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):
Helper function to test exporting a workout as a pdf, with images and comments
"""
- response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3,
- 'images': 1,
- 'comments': 1}))
+ response = self.client.get(
+ reverse('manager:workout:pdf-log', kwargs={
+ 'id': 3,
+ 'images': 1,
+ 'comments': 1
+ })
+ )
if fail:
self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Workout-3-log.pdf')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=Workout-3-log.pdf'
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 38000)
@@ -181,14 +207,20 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:workout:pdf-table', kwargs={'id': 3,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:workout:pdf-table', kwargs={
+ 'id': 3,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Workout-3-table.pdf')
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Workout-3-table.pdf',
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 38000)
@@ -201,9 +233,13 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):
uid = 'AB'
token = 'abc-11223344556677889900'
- response = self.client.get(reverse('manager:workout:pdf-table', kwargs={'id': 3,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('manager:workout:pdf-table', kwargs={
+ 'id': 3,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 403)
@@ -220,8 +256,10 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Workout-3-table.pdf')
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Workout-3-table.pdf',
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 38000)
diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.py
index 88aa6d9f7..26c00239a 100644
--- a/wger/manager/tests/test_schedule.py
+++ b/wger/manager/tests/test_schedule.py
@@ -27,16 +27,15 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.manager.models import (
Schedule,
ScheduleStep,
- Workout
+ Workout,
)
from wger.utils.helpers import make_token
-
logger = logging.getLogger(__name__)
@@ -111,8 +110,10 @@ class ScheduleRepresentationTestCase(WgerTestCase):
"""
Test that the representation of an object is correct
"""
- self.assertEqual("{0}".format(Schedule.objects.get(pk=1)),
- 'my cool schedule that i found on the internet')
+ self.assertEqual(
+ "{0}".format(Schedule.objects.get(pk=1)),
+ 'my cool schedule that i found on the internet'
+ )
class CreateScheduleTestCase(WgerAddTestCase):
@@ -124,10 +125,12 @@ class CreateScheduleTestCase(WgerAddTestCase):
url = 'manager:schedule:add'
user_success = 'test'
user_fail = False
- data = {'name': 'My cool schedule',
- 'start_date': datetime.date.today(),
- 'is_active': True,
- 'is_loop': True}
+ data = {
+ 'name': 'My cool schedule',
+ 'start_date': datetime.date.today(),
+ 'is_active': True,
+ 'is_loop': True
+ }
class DeleteScheduleTestCase(WgerDeleteTestCase):
@@ -150,10 +153,12 @@ class EditScheduleTestCase(WgerEditTestCase):
object_class = Schedule
url = 'manager:schedule:edit'
pk = 3
- data = {'name': 'An updated name',
- 'start_date': datetime.date.today(),
- 'is_active': True,
- 'is_loop': True}
+ data = {
+ 'name': 'An updated name',
+ 'start_date': datetime.date.today(),
+ 'is_active': True,
+ 'is_loop': True
+ }
class ScheduleTestCase(WgerTestCase):
@@ -494,15 +499,23 @@ class SchedulePdfExportTestCase(WgerTestCase):
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:schedule:pdf-{0}'.format(pdf_type),
- kwargs={'pk': 1,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse(
+ 'manager:schedule:pdf-{0}'.format(pdf_type),
+ kwargs={
+ 'pk': 1,
+ 'uidb64': uid,
+ 'token': token
+ }
+ )
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Schedule-1-{0}.pdf'.format(pdf_type))
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Schedule-1-{0}.pdf'.format(pdf_type)
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 29000)
@@ -511,10 +524,16 @@ class SchedulePdfExportTestCase(WgerTestCase):
# Wrong or expired token
uid = 'MQ'
token = '3xv-57ef74923091fe7f186e'
- response = self.client.get(reverse('manager:schedule:pdf-{0}'.format(pdf_type),
- kwargs={'pk': 1,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse(
+ 'manager:schedule:pdf-{0}'.format(pdf_type),
+ kwargs={
+ 'pk': 1,
+ 'uidb64': uid,
+ 'token': token
+ }
+ )
+ )
self.assertEqual(response.status_code, 403)
def export_pdf(self, fail=False, pdf_type="log"):
@@ -522,16 +541,19 @@ class SchedulePdfExportTestCase(WgerTestCase):
Helper function to test exporting a workout as a pdf
"""
- response = self.client.get(reverse('manager:schedule:pdf-{0}'.format(pdf_type),
- kwargs={'pk': 1}))
+ response = self.client.get(
+ reverse('manager:schedule:pdf-{0}'.format(pdf_type), kwargs={'pk': 1})
+ )
if fail:
self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Schedule-1-{0}.pdf'.format(pdf_type))
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Schedule-1-{0}.pdf'.format(pdf_type)
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 29000)
@@ -544,20 +566,28 @@ class SchedulePdfExportTestCase(WgerTestCase):
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:schedule:pdf-{0}'.format(pdf_type),
- kwargs={'pk': 3,
- 'images': 0,
- 'comments': 1,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse(
+ 'manager:schedule:pdf-{0}'.format(pdf_type),
+ kwargs={
+ 'pk': 3,
+ 'images': 0,
+ 'comments': 1,
+ 'uidb64': uid,
+ 'token': token
+ }
+ )
+ )
if fail:
self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Schedule-3-{0}.pdf'.format(pdf_type))
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Schedule-3-{0}.pdf'.format(pdf_type)
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 29000)
@@ -569,20 +599,28 @@ class SchedulePdfExportTestCase(WgerTestCase):
"""
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:schedule:pdf-{0}'.format(pdf_type),
- kwargs={'pk': 3,
- 'images': 1,
- 'comments': 0,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse(
+ 'manager:schedule:pdf-{0}'.format(pdf_type),
+ kwargs={
+ 'pk': 3,
+ 'images': 1,
+ 'comments': 0,
+ 'uidb64': uid,
+ 'token': token
+ }
+ )
+ )
if fail:
self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Schedule-3-{0}.pdf'.format(pdf_type))
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Schedule-3-{0}.pdf'.format(pdf_type)
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 29000)
@@ -595,20 +633,28 @@ class SchedulePdfExportTestCase(WgerTestCase):
user = User.objects.get(username='test')
uid, token = make_token(user)
- response = self.client.get(reverse('manager:schedule:pdf-{0}'.format(pdf_type),
- kwargs={'pk': 3,
- 'images': 1,
- 'comments': 1,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse(
+ 'manager:schedule:pdf-{0}'.format(pdf_type),
+ kwargs={
+ 'pk': 3,
+ 'images': 1,
+ 'comments': 1,
+ 'uidb64': uid,
+ 'token': token
+ }
+ )
+ )
if fail:
self.assertIn(response.status_code, (403, 404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Schedule-3-{0}.pdf'.format(pdf_type))
+ self.assertEqual(
+ response['Content-Disposition'],
+ 'attachment; filename=Schedule-3-{0}.pdf'.format(pdf_type)
+ )
# Approximate size only
self.assertGreater(int(response['Content-Length']), 29000)
@@ -664,6 +710,7 @@ class SchedulePdfExportTestCase(WgerTestCase):
self.export_pdf_with_images_and_comments(fail=False)
self.export_pdf_token()
+
# #####TABLE#####
def test_export_pdf_table_anonymous(self):
@@ -724,7 +771,9 @@ class ScheduleApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 1
resource = Schedule
private_resource = True
- data = {'name': 'An updated name',
- 'start_date': datetime.date.today(),
- 'is_active': True,
- 'is_loop': True}
+ data = {
+ 'name': 'An updated name',
+ 'start_date': datetime.date.today(),
+ 'is_active': True,
+ 'is_loop': True
+ }
diff --git a/wger/manager/tests/test_schedule_step.py b/wger/manager/tests/test_schedule_step.py
index 787171a51..d2cc32e8c 100644
--- a/wger/manager/tests/test_schedule_step.py
+++ b/wger/manager/tests/test_schedule_step.py
@@ -24,7 +24,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.manager.models import ScheduleStep
@@ -68,8 +68,7 @@ class CreateScheduleStepTestCase(WgerAddTestCase):
url = reverse_lazy('manager:step:add', kwargs={'schedule_pk': 1})
user_success = 'test'
user_fail = False
- data = {'workout': 3,
- 'duration': 4}
+ data = {'workout': 3, 'duration': 4}
class EditScheduleStepTestCase(WgerEditTestCase):
@@ -80,8 +79,7 @@ class EditScheduleStepTestCase(WgerEditTestCase):
object_class = ScheduleStep
url = 'manager:step:edit'
pk = 2
- data = {'workout': 1,
- 'duration': 8}
+ data = {'workout': 1, 'duration': 8}
class DeleteScheduleStepTestCase(WgerDeleteTestCase):
@@ -101,6 +99,8 @@ class ScheduleStepApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 4
resource = ScheduleStep
private_resource = True
- data = {'workout': '3',
- 'schedule': '1',
- 'duration': '8'}
+ data = {
+ 'workout': '3',
+ 'schedule': '1',
+ 'duration': '8',
+ }
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index 86475c22a..9016a0144 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -21,7 +21,7 @@ from typing import List
from django.core.cache import cache
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
# wger
@@ -29,17 +29,16 @@ from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
STATUS_CODES_FAIL,
WgerAddTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import Exercise
from wger.manager.models import (
Day,
Set,
- Setting
+ Setting,
)
from wger.utils.cache import cache_mapper
-
logger = logging.getLogger(__name__)
@@ -52,7 +51,54 @@ class SetAddTestCase(WgerAddTestCase):
url = reverse_lazy('manager:set:add', kwargs={'day_pk': 5})
user_success = 'test'
user_fail = 'admin'
- data = {'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,
+ 'exercise1-MAX_NUM_FORMS': 1000,
+ 'exercise1-0-reps': 10,
+ 'exercise1-0-repetition_unit': 1,
+ 'exercise1-0-weight_unit': 1,
+ 'exercise1-1-reps': 12,
+ 'exercise1-1-repetition_unit': 1,
+ 'exercise1-1-weight_unit': 1,
+ 'exercise1-2-reps': 10,
+ 'exercise1-2-repetition_unit': 1,
+ 'exercise1-2-weight_unit': 1,
+ 'exercise1-3-reps': 12,
+ 'exercise1-3-repetition_unit': 1,
+ 'exercise1-3-weight_unit': 1,
+ }
+ data_ignore = (
+ 'exercise1-TOTAL_FORMS',
+ 'exercise1-INITIAL_FORMS',
+ 'exercise1-MAX_NUM_FORMS',
+ 'exercise_list',
+ 'exercise1-0-reps',
+ 'exercise1-0-repetition_unit',
+ 'exercise1-0-weight_unit',
+ 'exercise1-1-reps',
+ 'exercise1-1-repetition_unit',
+ 'exercise1-1-weight_unit',
+ 'exercise1-2-reps',
+ 'exercise1-2-repetition_unit',
+ 'exercise1-2-weight_unit',
+ 'exercise1-3-reps',
+ 'exercise1-3-repetition_unit',
+ 'exercise1-3-weight_unit',
+ )
+
+ def test_add_set(self, fail=False):
+ """
+ Tests adding a set and corresponding settings at the same time
+ """
+
+ # POST the data
+ self.user_login('test')
+ exercises_id = [1, 2]
+ post_data = {
+ 'exercise_list': 1, # Only for mobile version
'sets': 4,
'exercise1-TOTAL_FORMS': 4,
'exercise1-INITIAL_FORMS': 0,
@@ -69,66 +115,22 @@ class SetAddTestCase(WgerAddTestCase):
'exercise1-3-reps': 12,
'exercise1-3-repetition_unit': 1,
'exercise1-3-weight_unit': 1,
- }
- data_ignore = ('exercise1-TOTAL_FORMS',
- 'exercise1-INITIAL_FORMS',
- 'exercise1-MAX_NUM_FORMS',
- 'exercise_list',
- 'exercise1-0-reps',
- 'exercise1-0-repetition_unit',
- 'exercise1-0-weight_unit',
- 'exercise1-1-reps',
- 'exercise1-1-repetition_unit',
- 'exercise1-1-weight_unit',
- 'exercise1-2-reps',
- 'exercise1-2-repetition_unit',
- 'exercise1-2-weight_unit',
- 'exercise1-3-reps',
- 'exercise1-3-repetition_unit',
- 'exercise1-3-weight_unit')
-
- def test_add_set(self, fail=False):
- """
- Tests adding a set and corresponding settings at the same time
- """
-
- # POST the data
- self.user_login('test')
- exercises_id = [1, 2]
- post_data = {'exercise_list': 1, # Only for mobile version
- 'sets': 4,
-
- 'exercise1-TOTAL_FORMS': 4,
- 'exercise1-INITIAL_FORMS': 0,
- 'exercise1-MAX_NUM_FORMS': 1000,
- 'exercise1-0-reps': 10,
- 'exercise1-0-repetition_unit': 1,
- 'exercise1-0-weight_unit': 1,
- 'exercise1-1-reps': 12,
- 'exercise1-1-repetition_unit': 1,
- 'exercise1-1-weight_unit': 1,
- 'exercise1-2-reps': 10,
- 'exercise1-2-repetition_unit': 1,
- 'exercise1-2-weight_unit': 1,
- 'exercise1-3-reps': 12,
- 'exercise1-3-repetition_unit': 1,
- 'exercise1-3-weight_unit': 1,
-
- 'exercise2-TOTAL_FORMS': 4,
- 'exercise2-INITIAL_FORMS': 0,
- 'exercise2-MAX_NUM_FORMS': 1000,
- 'exercise2-0-reps': 8,
- 'exercise2-0-repetition_unit': 1,
- 'exercise2-0-weight_unit': 1,
- 'exercise2-1-reps': 10,
- 'exercise2-1-repetition_unit': 2,
- 'exercise2-1-weight_unit': 2,
- 'exercise2-2-reps': 8,
- 'exercise2-2-repetition_unit': 1,
- 'exercise2-2-weight_unit': 1,
- 'exercise2-3-reps': 10,
- 'exercise2-3-repetition_unit': 2,
- 'exercise2-3-weight_unit': 2}
+ 'exercise2-TOTAL_FORMS': 4,
+ 'exercise2-INITIAL_FORMS': 0,
+ 'exercise2-MAX_NUM_FORMS': 1000,
+ 'exercise2-0-reps': 8,
+ 'exercise2-0-repetition_unit': 1,
+ 'exercise2-0-weight_unit': 1,
+ 'exercise2-1-reps': 10,
+ 'exercise2-1-repetition_unit': 2,
+ 'exercise2-1-weight_unit': 2,
+ 'exercise2-2-reps': 8,
+ 'exercise2-2-repetition_unit': 1,
+ 'exercise2-2-weight_unit': 1,
+ 'exercise2-3-reps': 10,
+ 'exercise2-3-repetition_unit': 2,
+ 'exercise2-3-weight_unit': 2,
+ }
response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}), post_data)
self.assertEqual(response.status_code, 302)
@@ -205,9 +207,11 @@ class TestSetOrderTestCase(WgerTestCase):
Helper function that adds a set to a day
"""
nr_sets = 4
- post_data = {'exercises': exercises_id,
- 'exercise_list': exercises_id[0], # Only for mobile version,
- 'sets': nr_sets}
+ post_data = {
+ 'exercises': exercises_id,
+ 'exercise_list': exercises_id[0], # Only for mobile version,
+ 'sets': nr_sets,
+ }
for exercise_id in exercises_id:
post_data['exercise{0}-TOTAL_FORMS'.format(exercise_id)] = nr_sets
post_data['exercise{0}-INITIAL_FORMS'.format(exercise_id)] = 0
@@ -217,8 +221,7 @@ class TestSetOrderTestCase(WgerTestCase):
post_data['exercise{0}-{1}-weight_unit'.format(exercise_id, set_nr)] = 1
post_data['exercise{0}-{1}-reps'.format(exercise_id, set_nr)] = 8
- response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}),
- post_data)
+ response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}), post_data)
return response
@@ -231,7 +234,7 @@ class TestSetOrderTestCase(WgerTestCase):
order = ()
for day_set in day.set_set.select_related():
- order += (day_set.id,)
+ order += (day_set.id, )
return order
@@ -247,7 +250,7 @@ class TestSetOrderTestCase(WgerTestCase):
for i in range(0, 7):
self.add_set([exercises[i]])
prev = self.get_order()
- orig += (i + 4,)
+ orig += (i + 4, )
self.assertEqual(orig, prev)
@@ -262,8 +265,12 @@ class TestSetAddFormset(WgerTestCase):
Helper function
"""
exercise = Exercise.objects.get(pk=1)
- response = self.client.get(reverse('manager:set:get-formset',
- kwargs={'exercise_pk': 1, 'reps': 4}))
+ response = self.client.get(
+ reverse('manager:set:get-formset', kwargs={
+ 'exercise_pk': 1,
+ 'reps': 4
+ })
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['exercise'], exercise)
@@ -298,16 +305,19 @@ class SetEditEditTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
# Try to edit the object
- response = self.client.post(reverse('manager:set:edit', kwargs={'pk': 3}),
- {'exercise2-TOTAL_FORMS': 1,
- 'exercise2-INITIAL_FORMS': 1,
- 'exercise2-MAX_NUM_FORMS': 1,
- 'exercise2-MIN_NUM_FORMS': 1,
- 'exercise2-0-reps': 5,
- 'exercise2-0-id': 3,
- 'exercise2-0-repetition_unit': 2,
- 'exercise2-0-weight_unit': 3,
- 'exercise2-0-rir': '1.5'})
+ response = self.client.post(
+ reverse('manager:set:edit', kwargs={'pk': 3}), {
+ 'exercise2-TOTAL_FORMS': 1,
+ 'exercise2-INITIAL_FORMS': 1,
+ 'exercise2-MAX_NUM_FORMS': 1,
+ 'exercise2-MIN_NUM_FORMS': 1,
+ 'exercise2-0-reps': 5,
+ 'exercise2-0-id': 3,
+ 'exercise2-0-repetition_unit': 2,
+ 'exercise2-0-weight_unit': 3,
+ 'exercise2-0-rir': '1.5',
+ }
+ )
entry_after = Set.objects.get(pk=3)
@@ -425,68 +435,82 @@ class SetSmartReprTestCase(WgerTestCase):
"""
set_obj = Set(exerciseday_id=1, order=1, sets=4)
set_obj.save()
- setting1 = Setting(set=set_obj,
- exercise_id=1,
- repetition_unit_id=1,
- reps=8,
- weight=Decimal(90),
- weight_unit_id=1,
- rir='3',
- order=1)
+ setting1 = Setting(
+ set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=8,
+ weight=Decimal(90),
+ weight_unit_id=1,
+ rir='3',
+ order=1,
+ )
setting1.save()
- setting2 = Setting(set=set_obj,
- exercise_id=1,
- repetition_unit_id=1,
- reps=10,
- weight=Decimal(80),
- weight_unit_id=1,
- rir='2.5',
- order=2)
+ setting2 = Setting(
+ set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=10,
+ weight=Decimal(80),
+ weight_unit_id=1,
+ rir='2.5',
+ order=2,
+ )
setting2.save()
- setting3 = Setting(set=set_obj,
- exercise_id=1,
- repetition_unit_id=1,
- reps=10,
- weight=Decimal(80),
- weight_unit_id=1,
- rir='2',
- order=3)
+ setting3 = Setting(
+ set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=10,
+ weight=Decimal(80),
+ weight_unit_id=1,
+ rir='2',
+ order=3,
+ )
setting3.save()
- setting4 = Setting(set=set_obj,
- exercise_id=1,
- repetition_unit_id=1,
- reps=12,
- weight=Decimal(80),
- weight_unit_id=1,
- rir='1',
- order=4)
+ setting4 = Setting(
+ set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=12,
+ weight=Decimal(80),
+ weight_unit_id=1,
+ rir='1',
+ order=4,
+ )
setting4.save()
setting_text = set_obj.reps_smart_text(Exercise.objects.get(pk=1))
- 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(
+ setting_text,
+ '8 (90 kg, 3 RiR) – 10 (80 kg, 2.5 RiR) – '
+ '10 (80 kg, 2 RiR) – 12 (80 kg, 1 RiR)',
+ )
def test_synthetic_settings(self):
set_obj = Set(exerciseday_id=1, order=1, sets=4)
set_obj.save()
- setting1 = Setting(set=set_obj,
- exercise_id=1,
- repetition_unit_id=1,
- reps=8,
- weight=Decimal(90),
- weight_unit_id=1,
- rir='3',
- order=1)
+ setting1 = Setting(
+ set=set_obj,
+ exercise_id=1,
+ repetition_unit_id=1,
+ reps=8,
+ weight=Decimal(90),
+ weight_unit_id=1,
+ rir='3',
+ order=1,
+ )
setting1.save()
- setting2 = Setting(set=set_obj,
- exercise_id=3,
- repetition_unit_id=1,
- reps=10,
- weight=Decimal(80),
- weight_unit_id=1,
- rir='2.5',
- order=2)
+ setting2 = Setting(
+ set=set_obj,
+ exercise_id=3,
+ repetition_unit_id=1,
+ reps=10,
+ weight=Decimal(80),
+ weight_unit_id=1,
+ rir='2.5',
+ order=2,
+ )
setting2.save()
settings: List[Setting] = set_obj.compute_settings
@@ -514,5 +538,4 @@ class SetApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 3
resource = Set
private_resource = True
- data = {'exerciseday': 5,
- 'sets': 4}
+ data = {'exerciseday': 5, 'sets': 4}
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.py
index be4d8aedc..64ad98541 100644
--- a/wger/manager/tests/test_timer.py
+++ b/wger/manager/tests/test_timer.py
@@ -28,10 +28,9 @@ from wger.core.tests.base_testcase import WgerTestCase
from wger.exercises.models import Exercise
from wger.manager.models import (
Workout,
- WorkoutSession
+ WorkoutSession,
)
-
logger = logging.getLogger(__name__)
@@ -81,16 +80,20 @@ class WorkoutTimerTestCase(WgerTestCase):
self.assertEqual(current_step['exercise'], Exercise.objects.get(pk=2))
self.assertEqual(current_step['reps'], 10)
self.assertEqual(current_step['step_nr'], list_length - len(step_list))
- self.assertEqual(math.floor(current_step['step_percent']),
- math.floor(current_step['step_nr'] * (100.0 / list_length)))
+ self.assertEqual(
+ math.floor(current_step['step_percent']),
+ math.floor(current_step['step_nr'] * (100.0 / list_length))
+ )
self.assertEqual(current_step['type'], 'exercise')
self.assertEqual(current_step['weight'], Decimal(15))
if pause_active:
current_step = step_list.pop()
self.assertEqual(current_step['step_nr'], list_length - len(step_list))
- self.assertEqual(math.floor(current_step['step_percent']),
- math.floor(current_step['step_nr'] * (100.0 / list_length)))
+ self.assertEqual(
+ math.floor(current_step['step_percent']),
+ math.floor(current_step['step_nr'] * (100.0 / list_length))
+ )
self.assertEqual(current_step['time'], pause_seconds)
self.assertEqual(current_step['type'], 'pause')
@@ -98,16 +101,20 @@ class WorkoutTimerTestCase(WgerTestCase):
self.assertEqual(current_step['exercise'], Exercise.objects.get(pk=2))
self.assertEqual(current_step['reps'], 10)
self.assertEqual(current_step['step_nr'], list_length - len(step_list))
- self.assertEqual(math.floor(current_step['step_percent']),
- math.floor(current_step['step_nr'] * (100.0 / list_length)))
+ self.assertEqual(
+ math.floor(current_step['step_percent']),
+ math.floor(current_step['step_nr'] * (100.0 / list_length))
+ )
self.assertEqual(current_step['type'], 'exercise')
self.assertEqual(current_step['weight'], Decimal(15))
if pause_active:
current_step = step_list.pop()
self.assertEqual(current_step['step_nr'], list_length - len(step_list))
- self.assertEqual(math.floor(current_step['step_percent']),
- math.floor(current_step['step_nr'] * (100.0 / list_length)))
+ self.assertEqual(
+ math.floor(current_step['step_percent']),
+ math.floor(current_step['step_nr'] * (100.0 / list_length))
+ )
self.assertEqual(current_step['time'], pause_seconds)
self.assertEqual(current_step['type'], 'pause')
@@ -115,8 +122,10 @@ class WorkoutTimerTestCase(WgerTestCase):
self.assertEqual(current_step['exercise'], Exercise.objects.get(pk=2))
self.assertEqual(current_step['reps'], 10)
self.assertEqual(current_step['step_nr'], list_length - len(step_list))
- self.assertEqual(math.floor(current_step['step_percent']),
- math.floor(current_step['step_nr'] * (100.0 / list_length)))
+ self.assertEqual(
+ math.floor(current_step['step_percent']),
+ math.floor(current_step['step_nr'] * (100.0 / list_length))
+ )
self.assertEqual(current_step['type'], 'exercise')
self.assertEqual(current_step['weight'], Decimal(15))
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index a7172453b..9215098d0 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -21,25 +21,24 @@ from django.contrib.auth.models import User
from django.core.cache import cache
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
# wger
from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
WgerDeleteTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.exercises.models import Exercise
from wger.manager.models import (
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.cache import cache_mapper
from wger.utils.constants import WORKOUT_TAB
-
logger = logging.getLogger(__name__)
@@ -194,24 +193,26 @@ class WeightLogOverviewAddTestCase(WgerTestCase):
# Add new log entries
count_before = WorkoutLog.objects.count()
- form_data = {'date': '2012-01-01',
- 'notes': 'My cool impression',
- 'impression': '3',
- 'time_start': datetime.time(10, 0),
- 'time_end': datetime.time(12, 0),
- 'form-0-reps': 10,
- 'form-0-repetition_unit': 1,
- 'form-0-weight': 10,
- 'form-0-weight_unit': 1,
- 'form-0-rir': '1',
- 'form-1-reps': 10,
- 'form-1-repetition_unit': 1,
- 'form-1-weight': 10,
- 'form-1-weight_unit': 1,
- 'form-1-rir': '2',
- 'form-TOTAL_FORMS': 3,
- 'form-INITIAL_FORMS': 0,
- 'form-MAX-NUM_FORMS': 3}
+ form_data = {
+ 'date': '2012-01-01',
+ 'notes': 'My cool impression',
+ 'impression': '3',
+ 'time_start': datetime.time(10, 0),
+ 'time_end': datetime.time(12, 0),
+ 'form-0-reps': 10,
+ 'form-0-repetition_unit': 1,
+ 'form-0-weight': 10,
+ 'form-0-weight_unit': 1,
+ 'form-0-rir': '1',
+ 'form-1-reps': 10,
+ 'form-1-repetition_unit': 1,
+ 'form-1-weight': 10,
+ 'form-1-weight_unit': 1,
+ 'form-1-rir': '2',
+ 'form-TOTAL_FORMS': 3,
+ 'form-INITIAL_FORMS': 0,
+ 'form-MAX-NUM_FORMS': 3,
+ }
response = self.client.post(reverse('manager:day:log', kwargs={'pk': 1}), form_data)
count_after = WorkoutLog.objects.count()
@@ -345,15 +346,17 @@ class WeightLogEntryEditTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
date_before = WorkoutLog.objects.get(pk=1).date
- response = self.client.post(reverse('manager:log:edit', kwargs={'pk': 1}),
- {'date': '2012-01-01',
- 'reps': 10,
- 'repetition_unit': 2,
- 'weight_unit': 3,
- 'weight': 10,
- 'exercise': 1,
- 'rir': 2
- })
+ response = self.client.post(
+ reverse('manager:log:edit', kwargs={'pk': 1}), {
+ 'date': '2012-01-01',
+ 'reps': 10,
+ 'repetition_unit': 2,
+ 'weight_unit': 3,
+ 'weight': 10,
+ 'exercise': 1,
+ 'rir': 2,
+ }
+ )
date_after = WorkoutLog.objects.get(pk=1).date
@@ -415,10 +418,17 @@ class WorkoutLogCacheTestCase(WgerTestCase):
self.user_login('admin')
self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
- self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
- 'year': 2012,
- 'month': 10,
- 'day': 1}))
+ self.client.get(
+ reverse(
+ 'manager:workout:calendar-day',
+ kwargs={
+ 'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1
+ }
+ )
+ )
self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
def test_calendar_anonymous(self):
@@ -429,9 +439,15 @@ class WorkoutLogCacheTestCase(WgerTestCase):
self.user_logout()
self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
- self.client.get(reverse('manager:workout:calendar', kwargs={'username': 'admin',
- 'year': 2012,
- 'month': 10}))
+ self.client.get(
+ reverse(
+ 'manager:workout:calendar', kwargs={
+ 'username': 'admin',
+ 'year': 2012,
+ 'month': 10
+ }
+ )
+ )
self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
def test_calendar_day_anonymous(self):
@@ -442,10 +458,17 @@ class WorkoutLogCacheTestCase(WgerTestCase):
self.user_logout()
self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
- self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
- 'year': 2012,
- 'month': 10,
- 'day': 1}))
+ self.client.get(
+ reverse(
+ 'manager:workout:calendar-day',
+ kwargs={
+ 'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1
+ }
+ )
+ )
self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
def test_cache_update_log(self):
@@ -456,10 +479,17 @@ class WorkoutLogCacheTestCase(WgerTestCase):
log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
- self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
- 'year': 2012,
- 'month': 10,
- 'day': 1}))
+ self.client.get(
+ reverse(
+ 'manager:workout:calendar-day',
+ kwargs={
+ 'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1
+ }
+ )
+ )
log = WorkoutLog.objects.get(pk=1)
log.weight = 35
@@ -476,10 +506,17 @@ class WorkoutLogCacheTestCase(WgerTestCase):
log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
- self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
- 'year': 2012,
- 'month': 10,
- 'day': 1}))
+ self.client.get(
+ reverse(
+ 'manager:workout:calendar-day',
+ kwargs={
+ 'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1
+ }
+ )
+ )
log = WorkoutLog.objects.get(pk=3)
log.weight = 35
@@ -496,10 +533,17 @@ class WorkoutLogCacheTestCase(WgerTestCase):
log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
- self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
- 'year': 2012,
- 'month': 10,
- 'day': 1}))
+ self.client.get(
+ reverse(
+ 'manager:workout:calendar-day',
+ kwargs={
+ 'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1
+ }
+ )
+ )
log = WorkoutLog.objects.get(pk=1)
log.delete()
@@ -515,10 +559,17 @@ class WorkoutLogCacheTestCase(WgerTestCase):
log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
- self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
- 'year': 2012,
- 'month': 10,
- 'day': 1}))
+ self.client.get(
+ reverse(
+ 'manager:workout:calendar-day',
+ kwargs={
+ 'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1
+ }
+ )
+ )
log = WorkoutLog.objects.get(pk=3)
log.delete()
@@ -534,10 +585,12 @@ class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 5
resource = WorkoutLog
private_resource = True
- data = {"exercise": 1,
- "workout": 3,
- "reps": 3,
- "repetition_unit": 1,
- "weight_unit": 2,
- "weight": 2,
- "date": datetime.date.today()}
+ data = {
+ "exercise": 1,
+ "workout": 3,
+ "reps": 3,
+ "repetition_unit": 1,
+ "weight_unit": 2,
+ "weight": 2,
+ "date": datetime.date.today()
+ }
diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index 6fbcf7780..ca5a1d957 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -23,7 +23,7 @@ from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.manager.models import Workout
@@ -189,8 +189,10 @@ class WorkoutModelTestCase(WgerTestCase):
workout = Workout()
workout.creation_date = datetime.date.today()
- self.assertEqual('{0}'.format(workout),
- '{0} ({1})'.format('Workout', datetime.date.today()))
+ self.assertEqual(
+ '{0}'.format(workout),
+ '{0} ({1})'.format('Workout', datetime.date.today()),
+ )
workout.name = 'my description'
self.assertEqual('{0}'.format(workout), 'my description')
@@ -203,5 +205,5 @@ class WorkoutApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 3
resource = Workout
private_resource = True
- special_endpoints = ('canonical_representation',)
+ special_endpoints = ('canonical_representation', )
data = {'name': 'A new comment'}
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index fe6fb1e50..76f9ff27b 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -20,13 +20,13 @@ from wger.core.models import DaysOfWeek
from wger.core.tests.base_testcase import WgerTestCase
from wger.exercises.models import (
Exercise,
- Muscle
+ Muscle,
)
from wger.manager.models import (
Day,
Set,
Setting,
- Workout
+ Workout,
)
from wger.utils.cache import cache_mapper
@@ -51,37 +51,66 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
setting2 = Setting.objects.get(pk=2)
image1 = '/media/exercise-images/1/protestschwein.jpg'
image2 = '/media/exercise-images/1/wildschwein.jpg'
- self.assertEqual(workout.canonical_representation['muscles'],
- {'back': [muscle2],
- 'frontsecondary': [muscle1],
- 'backsecondary': [muscle1],
- 'front': [muscle1]})
+ self.assertEqual(
+ workout.canonical_representation['muscles'], {
+ 'back': [muscle2],
+ 'frontsecondary': [muscle1],
+ 'backsecondary': [muscle1],
+ 'front': [muscle1]
+ }
+ )
self.assertEqual(workout.canonical_representation['obj'], workout)
- canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=2)],
- 'text': 'Tuesday'},
- 'muscles': {'back': [muscle2],
- 'frontsecondary': [],
- 'backsecondary': [],
- 'front': [muscle1]},
- 'obj': Day.objects.get(pk=1),
- 'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),
- 'image_list': [
- {'image': image1, 'is_main': True},
- {'image': image2, 'is_main': False}],
- 'comment_list': ['test 123'],
- 'has_weight': False,
- 'setting_obj_list': [setting_1],
- 'setting_text': '2 \xd7 8 (3 RiR)',
- }],
-
- 'is_superset': False,
- 'muscles': {'back': [muscle2],
- 'frontsecondary': [],
- 'backsecondary': [],
- 'front': [muscle1]},
- 'obj': Set.objects.get(pk=1),
- 'settings_computed': [setting1] * 2}]}
+ canonical_form = {
+ 'days_of_week': {
+ 'day_list': [DaysOfWeek.objects.get(pk=2)],
+ 'text': 'Tuesday'
+ },
+ 'muscles': {
+ 'back': [muscle2],
+ 'frontsecondary': [],
+ 'backsecondary': [],
+ 'front': [muscle1]
+ },
+ 'obj':
+ Day.objects.get(pk=1),
+ 'set_list': [
+ {
+ 'exercise_list': [
+ {
+ 'obj':
+ Exercise.objects.get(pk=1),
+ 'image_list': [
+ {
+ 'image': image1,
+ 'is_main': True
+ }, {
+ 'image': image2,
+ 'is_main': False
+ }
+ ],
+ 'comment_list': ['test 123'],
+ 'has_weight':
+ False,
+ 'setting_obj_list': [setting_1],
+ 'setting_text':
+ '2 \xd7 8 (3 RiR)',
+ }
+ ],
+ 'is_superset':
+ False,
+ 'muscles': {
+ 'back': [muscle2],
+ 'frontsecondary': [],
+ 'backsecondary': [],
+ 'front': [muscle1]
+ },
+ 'obj':
+ Set.objects.get(pk=1),
+ 'settings_computed': [setting1] * 2
+ }
+ ]
+ }
days_test_data = workout.canonical_representation['day_list'][0]
self.assertEqual(days_test_data['days_of_week'], canonical_form['days_of_week'])
@@ -90,52 +119,73 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
# Check that the content is the same
for key in days_test_data['set_list'][0].keys():
- self.assertEqual(days_test_data['set_list'][0][key],
- canonical_form['set_list'][0][key])
-
- canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=4)],
- 'text': 'Thursday'},
- 'obj': Day.objects.get(pk=2),
- 'muscles': {'back': [muscle2],
- 'frontsecondary': [muscle1],
- 'backsecondary': [muscle1],
- 'front': []},
- 'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),
- 'image_list': [{
- 'image': image2,
- 'is_main': False}],
- 'comment_list': ['Foobar'],
- 'has_weight': True,
- 'setting_obj_list': [setting_2],
- 'setting_text': '4 \xd7 10 (15 kg)',
- }],
-
- 'is_superset': False,
- 'muscles': {'back': [muscle2],
- 'frontsecondary': [muscle1],
- 'backsecondary': [muscle1],
- 'front': []},
- 'obj': Set.objects.get(pk=2),
- 'settings_computed': [setting2] * 4}]}
+ self.assertEqual(days_test_data['set_list'][0][key], canonical_form['set_list'][0][key])
+
+ canonical_form = {
+ 'days_of_week': {
+ 'day_list': [DaysOfWeek.objects.get(pk=4)],
+ 'text': 'Thursday'
+ },
+ 'obj':
+ Day.objects.get(pk=2),
+ 'muscles': {
+ 'back': [muscle2],
+ 'frontsecondary': [muscle1],
+ 'backsecondary': [muscle1],
+ 'front': []
+ },
+ 'set_list': [
+ {
+ 'exercise_list': [
+ {
+ 'obj': Exercise.objects.get(pk=2),
+ 'image_list': [{
+ 'image': image2,
+ 'is_main': False
+ }],
+ 'comment_list': ['Foobar'],
+ 'has_weight': True,
+ 'setting_obj_list': [setting_2],
+ 'setting_text': '4 \xd7 10 (15 kg)',
+ }
+ ],
+ 'is_superset':
+ False,
+ 'muscles': {
+ 'back': [muscle2],
+ 'frontsecondary': [muscle1],
+ 'backsecondary': [muscle1],
+ 'front': []
+ },
+ 'obj':
+ Set.objects.get(pk=2),
+ 'settings_computed': [setting2] * 4
+ }
+ ]
+ }
days_test_data = workout.canonical_representation['day_list'][1]
self.assertEqual(days_test_data['days_of_week'], canonical_form['days_of_week'])
self.assertEqual(days_test_data['muscles'], canonical_form['muscles'])
self.assertEqual(days_test_data['obj'], canonical_form['obj'])
for key in days_test_data['set_list'][0].keys():
- self.assertEqual(days_test_data['set_list'][0][key],
- canonical_form['set_list'][0][key])
+ self.assertEqual(days_test_data['set_list'][0][key], canonical_form['set_list'][0][key])
# Check that the content is the same
- canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=5)],
- 'text': 'Friday'},
- 'obj': Day.objects.get(pk=4),
- 'muscles': {'back': [],
- 'front': [],
- 'frontsecondary': [],
- 'backsecondary': []},
- 'set_list': [],
- }
+ canonical_form = {
+ 'days_of_week': {
+ 'day_list': [DaysOfWeek.objects.get(pk=5)],
+ 'text': 'Friday'
+ },
+ 'obj': Day.objects.get(pk=4),
+ 'muscles': {
+ 'back': [],
+ 'front': [],
+ 'frontsecondary': [],
+ 'backsecondary': []
+ },
+ 'set_list': [],
+ }
self.assertEqual(workout.canonical_representation['day_list'][2], canonical_form)
def test_canonical_form_day(self):
@@ -150,31 +200,50 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
muscle2 = Muscle.objects.get(pk=2)
setting = Setting.objects.get(pk=3)
image2 = '/media/exercise-images/1/wildschwein.jpg'
- self.assertEqual(day.canonical_representation['days_of_week'],
- {'day_list': [weekday1, weekday2], 'text': 'Wednesday, Friday'})
- self.assertEqual(day.canonical_representation['muscles'],
- {'back': [muscle2],
- 'frontsecondary': [muscle1],
- 'backsecondary': [muscle1],
- 'front': []})
+ self.assertEqual(
+ day.canonical_representation['days_of_week'], {
+ 'day_list': [weekday1, weekday2],
+ 'text': 'Wednesday, Friday'
+ }
+ )
+ self.assertEqual(
+ day.canonical_representation['muscles'], {
+ 'back': [muscle2],
+ 'frontsecondary': [muscle1],
+ 'backsecondary': [muscle1],
+ 'front': []
+ }
+ )
self.assertEqual(day.canonical_representation['obj'], day)
- canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),
- 'image_list': [{
- 'image': image2,
- 'is_main': False}],
- 'comment_list': ['Foobar'],
- 'has_weight': False,
- 'setting_obj_list': [Setting.objects.get(pk=3)],
- 'setting_text': '4 \xd7 10',
- }],
- 'is_superset': False,
- 'muscles': {'back': [muscle2],
- 'frontsecondary': [muscle1],
- 'backsecondary': [muscle1],
- 'front': []},
- 'obj': Set.objects.get(pk=3),
- 'settings_computed': [setting] * 4}]
+ canonical_form = [
+ {
+ 'exercise_list': [
+ {
+ 'obj': Exercise.objects.get(pk=2),
+ 'image_list': [{
+ 'image': image2,
+ 'is_main': False
+ }],
+ 'comment_list': ['Foobar'],
+ 'has_weight': False,
+ 'setting_obj_list': [Setting.objects.get(pk=3)],
+ 'setting_text': '4 \xd7 10',
+ }
+ ],
+ 'is_superset':
+ False,
+ 'muscles': {
+ 'back': [muscle2],
+ 'frontsecondary': [muscle1],
+ 'backsecondary': [muscle1],
+ 'front': []
+ },
+ 'obj':
+ Set.objects.get(pk=3),
+ 'settings_computed': [setting] * 4
+ }
+ ]
self.assertEqual(day.canonical_representation['set_list'], canonical_form)
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index 4396106f0..514115bb1 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -21,7 +21,7 @@ from django.core.cache import cache
from django.core.exceptions import ValidationError
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
# wger
@@ -30,16 +30,14 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.manager.models import (
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.cache import cache_mapper
-
-
"""
Tests for workout sessions
"""
@@ -51,10 +49,15 @@ class AddWorkoutSessionTestCase(WgerAddTestCase):
"""
object_class = WorkoutSession
- url = reverse_lazy('manager:session:add', kwargs={'workout_pk': 1,
- 'year': datetime.date.today().year,
- 'month': datetime.date.today().month,
- 'day': datetime.date.today().day})
+ url = reverse_lazy(
+ 'manager:session:add',
+ kwargs={
+ 'workout_pk': 1,
+ 'year': datetime.date.today().year,
+ 'month': datetime.date.today().month,
+ 'day': datetime.date.today().day
+ }
+ )
data = {
'user': 1,
'workout': 1,
@@ -98,8 +101,10 @@ class WorkoutSessionModelTestCase(WgerTestCase):
session = WorkoutSession()
session.workout = Workout.objects.get(pk=1)
session.date = datetime.date.today()
- self.assertEqual('{0}'.format(session),
- '{0} - {1}'.format(Workout.objects.get(pk=1), datetime.date.today()))
+ self.assertEqual(
+ '{0}'.format(session),
+ '{0} - {1}'.format(Workout.objects.get(pk=1), datetime.date.today())
+ )
class DeleteTestWorkoutTestCase(WgerDeleteTestCase):
@@ -121,15 +126,23 @@ class WorkoutSessionDeleteLogsTestCase(WgerTestCase):
self.user_login('admin')
session = WorkoutSession.objects.get(pk=1)
- count_before = WorkoutLog.objects.filter(user__username=session.user.username,
- date=session.date).count()
+ count_before = WorkoutLog.objects.filter(
+ user__username=session.user.username,
+ date=session.date,
+ ).count()
self.assertEqual(count_before, 1)
- response = self.client.post(reverse('manager:session:delete',
- kwargs={'pk': 1, 'logs': 'logs'}))
+ response = self.client.post(
+ reverse('manager:session:delete', kwargs={
+ 'pk': 1,
+ 'logs': 'logs'
+ })
+ )
self.assertEqual(response.status_code, 302)
- count_after = WorkoutLog.objects.filter(user__username=session.user.username,
- date=session.date).count()
+ count_after = WorkoutLog.objects.filter(
+ user__username=session.user.username,
+ date=session.date,
+ ).count()
self.assertEqual(count_after, 0)
@@ -244,9 +257,11 @@ class WorkoutSessionApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 4
resource = WorkoutSession
private_resource = True
- data = {'workout': 3,
- 'date': datetime.date(2014, 1, 25),
- 'notes': 'My new insights',
- 'impression': '3',
- 'time_start': datetime.time(10, 0),
- 'time_end': datetime.time(13, 0)}
+ data = {
+ 'workout': 3,
+ 'date': datetime.date(2014, 1, 25),
+ 'notes': 'My new insights',
+ 'impression': '3',
+ 'time_start': datetime.time(10, 0),
+ 'time_end': datetime.time(13, 0)
+ }
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 121c37d13..fb76c9c1f 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -18,7 +18,7 @@
# Django
from django.conf.urls import (
include,
- url
+ url,
)
from django.contrib.auth.decorators import login_required
from django.urls import path
@@ -33,204 +33,315 @@ from wger.manager.views import (
schedule_step,
set,
workout,
- workout_session
+ workout_session,
)
-
# sub patterns for workout logs
patterns_log = [
- path('<int:pk>/view',
- log.WorkoutLogDetailView.as_view(),
- name='log'),
- path('<int:pk>/edit', # JS
- log.WorkoutLogUpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- log.WorkoutLogDeleteView.as_view(),
- name='delete')
+ path(
+ '<int:pk>/view',
+ log.WorkoutLogDetailView.as_view(),
+ name='log',
+ ),
+ path(
+ '<int:pk>/edit', # JS
+ log.WorkoutLogUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ log.WorkoutLogDeleteView.as_view(),
+ name='delete',
+ )
]
# sub patterns for workouts
patterns_workout = [
- path('overview',
- workout.overview,
- name='overview'),
- path('add',
- workout.add,
- name='add'),
- path('<int:pk>/copy/',
- workout.copy_workout,
- name='copy'),
- path('<int:pk>/edit/',
- workout.WorkoutEditView.as_view(),
- name='edit'),
- path('<int:pk>/delete/',
- workout.WorkoutDeleteView.as_view(),
- name='delete'),
- path('<int:pk>/view/',
- workout.view,
- name='view'),
- url(r'^calendar/(?P<username>[\w.@+-]+)$',
+ path(
+ 'overview',
+ workout.overview,
+ name='overview',
+ ),
+ path(
+ 'add',
+ workout.add,
+ name='add',
+ ),
+ path(
+ '<int:pk>/copy/',
+ workout.copy_workout,
+ name='copy',
+ ),
+ path(
+ '<int:pk>/edit/',
+ workout.WorkoutEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete/',
+ workout.WorkoutDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ '<int:pk>/view/',
+ workout.view,
+ name='view',
+ ),
+ url(
+ r'^calendar/(?P<username>[\w.@+-]+)$',
+ log.calendar,
+ name='calendar',
+ ),
+ path(
+ 'calendar',
log.calendar,
- name='calendar'),
- path('calendar',
- log.calendar,
- name='calendar'),
- url(r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})$',
+ name='calendar',
+ ),
+ url(
+ r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})$',
log.calendar,
- name='calendar'),
- url(r'^calendar/(?P<year>\d{4})/(?P<month>\d{1,2})$',
+ name='calendar',
+ ),
+ url(
+ r'^calendar/(?P<year>\d{4})/(?P<month>\d{1,2})$',
log.calendar,
- name='calendar'),
- url(r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})$',
+ name='calendar',
+ ),
+ url(
+ r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})$',
log.day,
- name='calendar-day'),
- url(r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='calendar-day',
+ ),
+ url(
+ r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
ical.export,
- name='ical'),
- path('<int:pk>/ical',
- ical.export,
- name='ical'),
- url(r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='ical',
+ ),
+ path(
+ '<int:pk>/ical',
+ ical.export,
+ name='ical',
+ ),
+ url(
+ r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ pdf.workout_log,
+ name='pdf-log',
+ ), # JS!
+ url(
+ r'^(?P<id>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
pdf.workout_log,
- name='pdf-log'), # JS!
- url(r'^(?P<id>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='pdf-log',
+ ),
+ url(
+ r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',
pdf.workout_log,
- name='pdf-log'),
- url(r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',
+ name='pdf-log',
+ ),
+ path(
+ '<int:id>/pdf/log',
pdf.workout_log,
- name='pdf-log'),
- path('<int:id>/pdf/log',
- pdf.workout_log,
- name='pdf-log'),
- url(r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='pdf-log',
+ ),
+ url(
+ r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
pdf.workout_view,
- name='pdf-table'), # JS!
- url(r'^(?P<id>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='pdf-table',
+ ), # JS!
+ url(
+ r'^(?P<id>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
pdf.workout_view,
- name='pdf-table'),
- url(r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',
+ name='pdf-table',
+ ),
+ url(
+ r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',
pdf.workout_view,
- name='pdf-table'),
- path('<int:id>/pdf/table',
- pdf.workout_view,
- name='pdf-table'),
- path('<int:day_pk>/timer',
- workout.timer,
- name='timer'),
+ name='pdf-table',
+ ),
+ path(
+ '<int:id>/pdf/table',
+ pdf.workout_view,
+ name='pdf-table',
+ ),
+ path(
+ '<int:day_pk>/timer',
+ workout.timer,
+ name='timer',
+ ),
]
# sub patterns for workout sessions
patterns_session = [
- url(r'^(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
+ url(
+ r'^(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
workout_session.WorkoutSessionAddView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- workout_session.WorkoutSessionUpdateView.as_view(),
- name='edit'),
- url(r'^(?P<pk>\d+)/delete/(?P<logs>session|logs)?$',
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ workout_session.WorkoutSessionUpdateView.as_view(),
+ name='edit',
+ ),
+ url(
+ r'^(?P<pk>\d+)/delete/(?P<logs>session|logs)?$',
workout_session.WorkoutSessionDeleteView.as_view(),
- name='delete'),
+ name='delete',
+ ),
]
# sub patterns for workout days
patterns_day = [
- path('<int:pk>/edit/',
- login_required(day.DayEditView.as_view()),
- name='edit'),
- path('<int:workout_pk>/day/add/',
- login_required(day.DayCreateView.as_view()),
- name='add'),
- path('<int:pk>/delete/',
- day.delete,
- name='delete'),
- path('<int:id>/view/',
- day.view,
- name='view'),
- path('<int:pk>/log/add/',
- log.add,
- name='log'),
+ path(
+ '<int:pk>/edit/',
+ login_required(day.DayEditView.as_view()),
+ name='edit',
+ ),
+ path(
+ '<int:workout_pk>/day/add/',
+ login_required(day.DayCreateView.as_view()),
+ name='add',
+ ),
+ path(
+ '<int:pk>/delete/',
+ day.delete,
+ name='delete',
+ ),
+ path(
+ '<int:id>/view/',
+ day.view,
+ name='view',
+ ),
+ path(
+ '<int:pk>/log/add/',
+ log.add,
+ name='log',
+ ),
]
# sub patterns for workout sets
patterns_set = [
- path('day/<int:day_pk>/set/add/',
- set.create,
- name='add'),
- path('get-formset/<int:exercise_pk>/<int:reps>/',
- set.get_formset,
- name='get-formset'), # Used by JS
- path('<int:pk>/delete',
- set.delete,
- name='delete'),
- path('<int:pk>/edit/',
- set.edit,
- name='edit'),
+ path(
+ 'day/<int:day_pk>/set/add/',
+ set.create,
+ name='add',
+ ),
+ path(
+ 'get-formset/<int:exercise_pk>/<int:reps>/',
+ set.get_formset,
+ name='get-formset',
+ ), # Used by JS
+ path(
+ '<int:pk>/delete',
+ set.delete,
+ name='delete',
+ ),
+ path(
+ '<int:pk>/edit/',
+ set.edit,
+ name='edit',
+ ),
]
# sub patterns for schedules
patterns_schedule = [
- path('overview',
- schedule.overview,
- name='overview'),
- path('add',
- schedule.ScheduleCreateView.as_view(),
- name='add'),
- path('<int:pk>/view/',
- schedule.view,
- name='view'),
- path('<int:pk>/start',
- schedule.start,
- name='start'),
- path('<int:pk>/edit/',
- schedule.ScheduleEditView.as_view(),
- name='edit'),
- path('<int:pk>/delete/',
- schedule.ScheduleDeleteView.as_view(),
- name='delete'),
- url(r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ path(
+ 'overview',
+ schedule.overview,
+ name='overview',
+ ),
+ path(
+ 'add',
+ schedule.ScheduleCreateView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/view/',
+ schedule.view,
+ name='view',
+ ),
+ path(
+ '<int:pk>/start',
+ schedule.start,
+ name='start',
+ ),
+ path(
+ '<int:pk>/edit/',
+ schedule.ScheduleEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete/',
+ schedule.ScheduleDeleteView.as_view(),
+ name='delete',
+ ),
+ url(
+ r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ ical.export_schedule,
+ name='ical',
+ ),
+ path(
+ '<int:pk>/ical',
ical.export_schedule,
- name='ical'),
- path('<int:pk>/ical',
- ical.export_schedule,
- name='ical'),
- url(r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='ical',
+ ),
+ url(
+ r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
schedule.export_pdf_log,
- name='pdf-log'), # JS!
- url(r'^(?P<pk>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='pdf-log',
+ ), # JS!
+ url(
+ r'^(?P<pk>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
schedule.export_pdf_log,
- name='pdf-log'),
- url(r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',
+ name='pdf-log',
+ ),
+ url(
+ r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',
schedule.export_pdf_log,
- name='pdf-log'),
- path('<int:pk>/pdf/log',
- schedule.export_pdf_log,
- name='pdf-log'),
- url(r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='pdf-log',
+ ),
+ path(
+ '<int:pk>/pdf/log',
+ schedule.export_pdf_log,
+ name='pdf-log',
+ ),
+ url(
+ r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ schedule.export_pdf_table,
+ name='pdf-table',
+ ), # JS!
+ url(
+ r'^(?P<pk>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
schedule.export_pdf_table,
- name='pdf-table'), # JS!
- url(r'^(?P<pk>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',
+ name='pdf-table',
+ ),
+ url(
+ r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',
schedule.export_pdf_table,
- name='pdf-table'),
- url(r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',
+ name='pdf-table',
+ ),
+ path(
+ '<int:pk>/pdf/table',
schedule.export_pdf_table,
- name='pdf-table'),
- path('<int:pk>/pdf/table',
- schedule.export_pdf_table,
- name='pdf-table'),
+ name='pdf-table',
+ ),
]
# sub patterns for schedule steps
patterns_step = [
- path('<int:schedule_pk>/step/add',
- schedule_step.StepCreateView.as_view(),
- name='add'),
- path('<int:pk>/edit',
- schedule_step.StepEditView.as_view(),
- name='edit'),
- path('<int:pk>/delete',
- schedule_step.StepDeleteView.as_view(),
- name='delete'),
+ path(
+ '<int:schedule_pk>/step/add',
+ schedule_step.StepCreateView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit',
+ schedule_step.StepEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete',
+ schedule_step.StepDeleteView.as_view(),
+ name='delete',
+ ),
]
urlpatterns = [
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index b0a762cf4..03da73032 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -23,16 +23,16 @@ from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import HttpResponseRedirect
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
- UpdateView
+ UpdateView,
)
# wger
@@ -40,11 +40,10 @@ from wger.core.models import DaysOfWeek
from wger.manager.forms import DayForm
from wger.manager.models import (
Day,
- Workout
+ Workout,
)
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.py
index a4c87327b..88a0a3dde 100644
--- a/wger/manager/views/ical.py
+++ b/wger/manager/views/ical.py
@@ -22,14 +22,14 @@ import logging
from django.contrib.sites.models import Site
from django.http import (
HttpResponse,
- HttpResponseForbidden
+ HttpResponseForbidden,
)
from django.shortcuts import get_object_or_404
# Third Party
from icalendar import (
Calendar,
- Event
+ Event,
)
from icalendar.tools import UIDGenerator
@@ -37,17 +37,14 @@ from icalendar.tools import UIDGenerator
from wger import get_version
from wger.manager.models import (
Schedule,
- Workout
+ Workout,
)
from wger.utils.helpers import (
check_token,
- next_weekday
+ next_weekday,
)
-
logger = logging.getLogger(__name__)
-
-
"""
Exports workouts and schedules as an iCal file that can be imported to a
calendaring application.
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index ba103060f..8aa77888b 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -24,35 +24,35 @@ from django.contrib.auth.mixins import LoginRequiredMixin
from django.forms.models import modelformset_factory
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
DeleteView,
DetailView,
- UpdateView
+ UpdateView,
)
# wger
from wger.core.models import (
RepetitionUnit,
- WeightUnit
+ WeightUnit,
)
from wger.manager.forms import (
HelperWorkoutSessionForm,
WorkoutLogForm,
- WorkoutLogFormHelper
+ WorkoutLogFormHelper,
)
from wger.manager.helpers import WorkoutCalendar
from wger.manager.models import (
@@ -60,19 +60,18 @@ from wger.manager.models import (
Schedule,
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.helpers import check_access
from wger.weight.helpers import (
group_log_entries,
- process_log_entries
+ process_log_entries,
)
-
logger = logging.getLogger(__name__)
@@ -99,12 +98,14 @@ class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, LoginRequiredMixin):
"""
model = WorkoutLog
- fields = ('exercise',
- 'workout',
- 'repetition_unit',
- 'reps',
- 'weight',
- 'weight_unit')
+ fields = (
+ 'exercise',
+ 'workout',
+ 'repetition_unit',
+ 'reps',
+ 'weight',
+ 'weight_unit',
+ )
success_url = reverse_lazy('manager:workout:calendar')
title = gettext_lazy('Delete workout log')
@@ -141,9 +142,11 @@ def add(request, pk):
form_id_range = range(counter_before, counter + 1)
# Add to list
- exercise_list[exercise.id] = {'obj': exercise,
- 'sets': int(exercise_set.sets),
- 'form_ids': form_id_range}
+ exercise_list[exercise.id] = {
+ 'obj': exercise,
+ 'sets': int(exercise_set.sets),
+ 'form_ids': form_id_range
+ }
counter += 1
# Helper mapping form-ID <--> Exercise
@@ -151,10 +154,9 @@ def add(request, pk):
form_to_exercise[id] = exercise
# Define the formset here because now we know the value to pass to 'extra'
- WorkoutLogFormSet = modelformset_factory(WorkoutLog,
- form=WorkoutLogForm,
- exclude=('date', 'workout'),
- extra=total_sets)
+ WorkoutLogFormSet = modelformset_factory(
+ WorkoutLog, form=WorkoutLogForm, exclude=('date', 'workout'), extra=total_sets
+ )
# Process the request
if request.method == 'POST':
@@ -215,9 +217,15 @@ def add(request, pk):
# Initialise the formset with a queryset that won't return any objects
# (we only add new logs here and that seems to be the fastest way)
user_weight_unit = 1 if request.user.userprofile.use_metric else 2
- formset = WorkoutLogFormSet(queryset=WorkoutLog.objects.none(),
- initial=[{'weight_unit': user_weight_unit,
- 'repetition_unit': 1} for x in range(0, total_sets)])
+ formset = WorkoutLogFormSet(
+ queryset=WorkoutLog.objects.none(),
+ initial=[
+ {
+ 'weight_unit': user_weight_unit,
+ 'repetition_unit': 1
+ } for x in range(0, total_sets)
+ ]
+ )
# Depending on whether there is already a workout session for today, update
# the current one or create a new one (this will be the most usual case)
@@ -234,13 +242,15 @@ def add(request, pk):
form_id_to = max(exercise_list[exercise]['form_ids'])
exercise_list[exercise]['forms'] = formset[form_id_from:form_id_to + 1]
- context = {'day': day,
- 'exercises': exercise_list,
- 'formset': formset,
- 'helper': WorkoutLogFormHelper(),
- 'session_form': session_form,
- 'form': session_form,
- 'form_action': request.path}
+ context = {
+ 'day': day,
+ 'exercises': exercise_list,
+ 'formset': formset,
+ 'helper': WorkoutLogFormHelper(),
+ 'session_form': session_form,
+ 'form': session_form,
+ 'form_action': request.path
+ }
return render(request, 'log/add.html', context)
@@ -274,10 +284,12 @@ class WorkoutLogDetailView(DetailView, LoginRequiredMixin):
exercise_log[exercise_id] = []
# Filter the logs for user and exclude all units that are not weight
- logs = exercise_list['obj'].workoutlog_set.filter(user=self.owner_user,
- weight_unit__in=(1, 2),
- repetition_unit=1,
- workout=self.object)
+ logs = exercise_list['obj'].workoutlog_set.filter(
+ user=self.owner_user,
+ weight_unit__in=(1, 2),
+ repetition_unit=1,
+ workout=self.object
+ )
entry_log, chart_data = process_log_entries(logs)
if entry_log:
exercise_log[exercise_list['obj'].id].append(entry_log)
diff --git a/wger/manager/views/pdf.py b/wger/manager/views/pdf.py
index 2e6b59161..99f65befa 100644
--- a/wger/manager/views/pdf.py
+++ b/wger/manager/views/pdf.py
@@ -20,7 +20,7 @@ import logging
# Django
from django.http import (
HttpResponse,
- HttpResponseForbidden
+ HttpResponseForbidden,
)
from django.shortcuts import get_object_or_404
from django.utils.translation import gettext as _
@@ -31,7 +31,7 @@ from reportlab.lib.units import cm
from reportlab.platypus import (
Paragraph,
SimpleDocTemplate,
- Spacer
+ Spacer,
)
# wger
@@ -41,10 +41,9 @@ from wger.utils.helpers import check_token
from wger.utils.pdf import (
get_logo,
render_footer,
- styleSheet
+ styleSheet,
)
-
logger = logging.getLogger(__name__)
@@ -74,16 +73,18 @@ def workout_log(request, id, images=False, comments=False, uidb64=None, token=No
response = HttpResponse(content_type='application/pdf')
# Create the PDF object, using the response object as its "file."
- doc = SimpleDocTemplate(response,
- pagesize=A4,
- # pagesize = landscape(A4),
- leftMargin=cm,
- rightMargin=cm,
- topMargin=0.5 * cm,
- bottomMargin=0.5 * cm,
- title=_('Workout'),
- author='wger Workout Manager',
- subject=_('Workout for %s') % request.user.username)
+ doc = SimpleDocTemplate(
+ response,
+ pagesize=A4,
+ # pagesize = landscape(A4),
+ leftMargin=cm,
+ rightMargin=cm,
+ topMargin=0.5 * cm,
+ bottomMargin=0.5 * cm,
+ title=_('Workout'),
+ author='wger Workout Manager',
+ subject=_('Workout for %s') % request.user.username
+ )
# container for the 'Flowable' objects
elements = []
@@ -93,8 +94,9 @@ def workout_log(request, id, images=False, comments=False, uidb64=None, token=No
elements.append(Spacer(10 * cm, 0.5 * cm))
# Set the title
- p = Paragraph(f'<para align="center"><strong>{workout.name}</strong></para>',
- styleSheet["HeaderBold"])
+ p = Paragraph(
+ f'<para align="center"><strong>{workout.name}</strong></para>', styleSheet["HeaderBold"]
+ )
elements.append(p)
elements.append(Spacer(10 * cm, 0.5 * cm))
if workout.description:
@@ -124,7 +126,6 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N
"""
Generates a PDF with the contents of the workout, without table for logs
"""
-
"""
Generates a PDF with the contents of the given workout
See also
@@ -149,15 +150,17 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N
response = HttpResponse(content_type='application/pdf')
# Create the PDF object, using the response object as its "file."
- doc = SimpleDocTemplate(response,
- pagesize=A4,
- leftMargin=cm,
- rightMargin=cm,
- topMargin=0.5 * cm,
- bottomMargin=0.5 * cm,
- title=_('Workout'),
- author='wger Workout Manager',
- subject=_('Workout for %s') % request.user.username)
+ doc = SimpleDocTemplate(
+ response,
+ pagesize=A4,
+ leftMargin=cm,
+ rightMargin=cm,
+ topMargin=0.5 * cm,
+ bottomMargin=0.5 * cm,
+ title=_('Workout'),
+ author='wger Workout Manager',
+ subject=_('Workout for %s') % request.user.username
+ )
# container for the 'Flowable' objects
elements = []
@@ -167,9 +170,10 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N
elements.append(Spacer(10 * cm, 0.5 * cm))
# Set the title
- p = Paragraph('<para align="center"><strong>%(description)s</strong></para>' %
- {'description': workout},
- styleSheet["HeaderBold"])
+ p = Paragraph(
+ '<para align="center"><strong>%(description)s</strong></para>' % {'description': workout},
+ styleSheet["HeaderBold"]
+ )
elements.append(p)
elements.append(Spacer(10 * cm, 1.5 * cm))
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 6aa728f2c..44845528d 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -24,24 +24,24 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
from django.http import (
HttpResponse,
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
- UpdateView
+ UpdateView,
)
# Third Party
@@ -50,7 +50,7 @@ from reportlab.lib.units import cm
from reportlab.platypus import (
Paragraph,
SimpleDocTemplate,
- Spacer
+ Spacer,
)
# wger
@@ -59,18 +59,17 @@ from wger.manager.helpers import render_workout_day
from wger.manager.models import Schedule
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.helpers import (
check_token,
- make_token
+ make_token,
)
from wger.utils.pdf import (
render_footer,
- styleSheet
+ styleSheet,
)
-
logger = logging.getLogger(__name__)
@@ -81,9 +80,9 @@ def overview(request):
"""
template_data = {}
- template_data['schedules'] = (Schedule.objects
- .filter(user=request.user)
- .order_by('-is_active', '-start_date'))
+ template_data['schedules'] = (
+ Schedule.objects.filter(user=request.user).order_by('-is_active', '-start_date')
+ )
return render(request, 'schedule/overview.html', template_data)
@@ -142,15 +141,17 @@ def export_pdf_log(request, pk, images=False, comments=False, uidb64=None, token
# Create the HttpResponse object with the appropriate PDF headers.
# and use it to the create the PDF using it as a file like object
response = HttpResponse(content_type='application/pdf')
- doc = SimpleDocTemplate(response,
- pagesize=A4,
- leftMargin=cm,
- rightMargin=cm,
- topMargin=0.5 * cm,
- bottomMargin=0.5 * cm,
- title=_('Workout'),
- author='wger Workout Manager',
- subject='Schedule for {0}'.format(request.user.username))
+ doc = SimpleDocTemplate(
+ response,
+ pagesize=A4,
+ leftMargin=cm,
+ rightMargin=cm,
+ topMargin=0.5 * cm,
+ bottomMargin=0.5 * cm,
+ title=_('Workout'),
+ author='wger Workout Manager',
+ subject='Schedule for {0}'.format(request.user.username)
+ )
# container for the 'Flowable' objects
elements = []
@@ -162,14 +163,17 @@ def export_pdf_log(request, pk, images=False, comments=False, uidb64=None, token
# Iterate through the Workout and render the training days
for step in schedule.schedulestep_set.all():
- p = Paragraph('<para>{0} {1}</para>'.format(step.duration, _('Weeks')),
- styleSheet["HeaderBold"])
+ p = Paragraph(
+ '<para>{0} {1}</para>'.format(step.duration, _('Weeks')),
+ styleSheet["HeaderBold"],
+ )
elements.append(p)
elements.append(Spacer(10 * cm, 0.5 * cm))
for day in step.workout.canonical_representation['day_list']:
elements.append(
- render_workout_day(day, images=images, comments=comments, nr_of_weeks=7))
+ render_workout_day(day, images=images, comments=comments, nr_of_weeks=7)
+ )
elements.append(Spacer(10 * cm, 0.5 * cm))
# Footer, date and info
@@ -207,15 +211,17 @@ def export_pdf_table(request, pk, images=False, comments=False, uidb64=None, tok
# Create the HttpResponse object with the appropriate PDF headers.
# and use it to the create the PDF using it as a file like object
response = HttpResponse(content_type='application/pdf')
- doc = SimpleDocTemplate(response,
- pagesize=A4,
- leftMargin=cm,
- rightMargin=cm,
- topMargin=0.5 * cm,
- bottomMargin=0.5 * cm,
- title=_('Workout'),
- author='wger Workout Manager',
- subject='Schedule for {0}'.format(request.user.username))
+ doc = SimpleDocTemplate(
+ response,
+ pagesize=A4,
+ leftMargin=cm,
+ rightMargin=cm,
+ topMargin=0.5 * cm,
+ bottomMargin=0.5 * cm,
+ title=_('Workout'),
+ author='wger Workout Manager',
+ subject='Schedule for {0}'.format(request.user.username)
+ )
# container for the 'Flowable' objects
elements = []
@@ -227,15 +233,23 @@ def export_pdf_table(request, pk, images=False, comments=False, uidb64=None, tok
# Iterate through the Workout and render the training days
for step in schedule.schedulestep_set.all():
- p = Paragraph('<para>{0} {1}</para>'.format(step.duration, _('Weeks')),
- styleSheet["HeaderBold"])
+ p = Paragraph(
+ '<para>{0} {1}</para>'.format(step.duration, _('Weeks')),
+ styleSheet["HeaderBold"],
+ )
elements.append(p)
elements.append(Spacer(10 * cm, 0.5 * cm))
for day in step.workout.canonical_representation['day_list']:
elements.append(
- render_workout_day(day, images=images, comments=comments, nr_of_weeks=7,
- only_table=True))
+ render_workout_day(
+ day,
+ images=images,
+ comments=comments,
+ nr_of_weeks=7,
+ only_table=True,
+ )
+ )
elements.append(Spacer(10 * cm, 0.5 * cm))
# Footer, date and info
diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.py
index 63f7fe709..bc77509df 100644
--- a/wger/manager/views/schedule_step.py
+++ b/wger/manager/views/schedule_step.py
@@ -22,31 +22,30 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
from django.db import models
from django.forms import (
ModelChoiceField,
- ModelForm
+ ModelForm,
)
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
- UpdateView
+ UpdateView,
)
# wger
from wger.manager.models import (
Schedule,
ScheduleStep,
- Workout
+ Workout,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index f9706abd9..63bc5f60e 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -22,15 +22,15 @@ from django.contrib.auth.decorators import login_required
from django.db import models
from django.forms.models import (
inlineformset_factory,
- modelformset_factory
+ modelformset_factory,
)
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.urls import reverse
@@ -39,29 +39,29 @@ from wger.exercises.models import Exercise
from wger.manager.forms import (
SetForm,
SettingForm,
- WorkoutLogFormHelper
+ WorkoutLogFormHelper,
)
from wger.manager.models import (
Day,
Set,
- Setting
+ Setting,
)
-
logger = logging.getLogger(__name__)
-
# ************************
# Set functions
# ************************
SETTING_FORMSET_FIELDS = ('reps', 'repetition_unit', 'weight', 'weight_unit', 'rir')
-SettingFormset = modelformset_factory(Setting,
- form=SettingForm,
- fields=SETTING_FORMSET_FIELDS,
- can_delete=False,
- can_order=False,
- extra=1)
+SettingFormset = modelformset_factory(
+ Setting,
+ form=SettingForm,
+ fields=SETTING_FORMSET_FIELDS,
+ can_delete=False,
+ can_order=False,
+ extra=1
+)
@login_required
@@ -83,9 +83,11 @@ def create(request, day_pk):
form = SetForm(request.POST)
if form.is_valid():
for exercise in form.cleaned_data['exercises']:
- formset = SettingFormset(request.POST,
- queryset=Setting.objects.none(),
- prefix='exercise{0}'.format(exercise.id))
+ formset = SettingFormset(
+ request.POST,
+ queryset=Setting.objects.none(),
+ prefix='exercise{0}'.format(exercise.id)
+ )
formsets.append({'exercise': exercise, 'formset': formset})
all_valid = True
@@ -110,8 +112,9 @@ def create(request, day_pk):
instance.save()
order += 1
- return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'pk': day.get_owner_object().id}))
+ return HttpResponseRedirect(
+ reverse('manager:workout:view', kwargs={'pk': day.get_owner_object().id})
+ )
else:
logger.debug(form.errors)
@@ -130,20 +133,20 @@ def get_formset(request, exercise_pk, reps=Set.DEFAULT_SETS):
Returns a formset. This is then rendered inside the new set template
"""
exercise = Exercise.objects.get(pk=exercise_pk)
- SettingFormSet = inlineformset_factory(Set,
- Setting,
- can_delete=False,
- extra=int(reps),
- fields=SETTING_FORMSET_FIELDS)
- formset = SettingFormSet(queryset=Setting.objects.none(),
- prefix='exercise{0}'.format(exercise_pk))
- context = {'formset': formset,
- 'helper': WorkoutLogFormHelper(),
- 'exercise': exercise}
-
- return render(request,
- "set/formset.html",
- context)
+ SettingFormSet = inlineformset_factory(
+ Set,
+ Setting,
+ can_delete=False,
+ extra=int(reps),
+ fields=SETTING_FORMSET_FIELDS,
+ )
+ formset = SettingFormSet(
+ queryset=Setting.objects.none(),
+ prefix='exercise{0}'.format(exercise_pk),
+ )
+ context = {'formset': formset, 'helper': WorkoutLogFormHelper(), 'exercise': exercise}
+
+ return render(request, "set/formset.html", context)
@login_required
@@ -158,8 +161,9 @@ def delete(request, pk):
# Check if the user is the owner of the object
if set_obj.get_owner_object().user == request.user:
set_obj.delete()
- return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'pk': set_obj.get_owner_object().id}))
+ return HttpResponseRedirect(
+ reverse('manager:workout:view', kwargs={'pk': set_obj.get_owner_object().id})
+ )
else:
return HttpResponseForbidden()
@@ -173,12 +177,14 @@ def edit(request, pk):
if set_obj.get_owner_object().user != request.user:
return HttpResponseForbidden()
- SettingFormsetEdit = modelformset_factory(Setting,
- form=SettingForm,
- fields=SETTING_FORMSET_FIELDS + ('id',),
- can_delete=False,
- can_order=True,
- extra=0)
+ SettingFormsetEdit = modelformset_factory(
+ Setting,
+ form=SettingForm,
+ fields=SETTING_FORMSET_FIELDS + ('id', ),
+ can_delete=False,
+ can_order=True,
+ extra=0
+ )
formsets = []
for exercise in set_obj.exercises:
@@ -189,8 +195,7 @@ def edit(request, pk):
if request.method == "POST":
formsets = []
for exercise in set_obj.exercises:
- formset = SettingFormsetEdit(request.POST,
- prefix='exercise{0}'.format(exercise.id))
+ formset = SettingFormsetEdit(request.POST, prefix='exercise{0}'.format(exercise.id))
formsets.append({'exercise': exercise, 'formset': formset})
# If all formsets validate, save them
@@ -209,8 +214,9 @@ def edit(request, pk):
return HttpResponseForbidden()
instance.save()
- return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'pk': set_obj.get_owner_object().id}))
+ return HttpResponseRedirect(
+ reverse('manager:workout:view', kwargs={'pk': set_obj.get_owner_object().id})
+ )
# Other context we need
context = {'formsets': formsets, 'helper': WorkoutLogFormHelper()}
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 3c8ea9de6..0d368387e 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -25,25 +25,25 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.template.context_processors import csrf
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.text import slugify
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
DeleteView,
- UpdateView
+ UpdateView,
)
# Third Party
@@ -53,27 +53,26 @@ from crispy_forms.layout import Submit
# wger
from wger.core.models import (
RepetitionUnit,
- WeightUnit
+ WeightUnit,
)
from wger.manager.forms import (
WorkoutCopyForm,
WorkoutForm,
- WorkoutSessionHiddenFieldsForm
+ WorkoutSessionHiddenFieldsForm,
)
from wger.manager.models import (
Day,
Schedule,
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.helpers import make_token
-
logger = logging.getLogger(__name__)
@@ -177,8 +176,9 @@ def copy_workout(request, pk):
setting_copy.set = current_set_copy
setting_copy.save()
- return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'pk': workout_copy.id}))
+ return HttpResponseRedirect(
+ reverse('manager:workout:view', kwargs={'pk': workout_copy.id})
+ )
else:
workout_form = WorkoutCopyForm({'name': workout.name, 'description': workout.description})
workout_form.helper = FormHelper()
@@ -186,7 +186,8 @@ def copy_workout(request, pk):
workout_form.helper.form_method = 'post'
workout_form.helper.form_action = request.path
workout_form.helper.add_input(
- Submit('submit', _('Save'), css_class='btn-success btn-block'))
+ Submit('submit', _('Save'), css_class='btn-success btn-block')
+ )
workout_form.helper.form_class = 'wger-form'
template_data = {}
@@ -217,7 +218,7 @@ class WorkoutDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
"""
model = Workout
- fields = ('name',)
+ fields = ('name', )
success_url = reverse_lazy('manager:workout:overview')
messages = gettext_lazy('Successfully deleted')
@@ -263,8 +264,7 @@ class LastWeightHelper:
"""
key = (self.user.pk, exercise.pk, reps, default_weight)
if self.last_weight_list.get(key) is None:
- last_log = WorkoutLog.objects.filter(user=self.user,
- exercise=exercise,
+ last_log = WorkoutLog.objects.filter(user=self.user, exercise=exercise,
reps=reps).order_by('-date')
default_weight = '' if default_weight is None else default_weight
weight = last_log[0].weight if last_log.exists() else default_weight
@@ -295,25 +295,33 @@ def timer(request, day_pk):
reps = exercise_dict['reps_list'][key]
rep_unit = exercise_dict['repetition_units'][key]
weight_unit = exercise_dict['weight_units'][key]
- default_weight = last_log.get_last_weight(exercise,
- reps,
- exercise_dict['weight_list'][key])
-
- step_list.append({'current_step': uuid.uuid4().hex,
- 'step_percent': 0,
- 'step_nr': len(step_list) + 1,
- 'exercise': exercise,
- 'type': 'exercise',
- 'reps': reps,
- 'rep_unit': rep_unit,
- 'weight': default_weight,
- 'weight_unit': weight_unit})
+ default_weight = last_log.get_last_weight(
+ exercise, reps, exercise_dict['weight_list'][key]
+ )
+
+ step_list.append(
+ {
+ 'current_step': uuid.uuid4().hex,
+ 'step_percent': 0,
+ 'step_nr': len(step_list) + 1,
+ 'exercise': exercise,
+ 'type': 'exercise',
+ 'reps': reps,
+ 'rep_unit': rep_unit,
+ 'weight': default_weight,
+ 'weight_unit': weight_unit
+ }
+ )
if request.user.userprofile.timer_active:
- step_list.append({'current_step': uuid.uuid4().hex,
- 'step_percent': 0,
- 'step_nr': len(step_list) + 1,
- 'type': 'pause',
- 'time': request.user.userprofile.timer_pause})
+ step_list.append(
+ {
+ 'current_step': uuid.uuid4().hex,
+ 'step_percent': 0,
+ 'step_nr': len(step_list) + 1,
+ 'type': 'pause',
+ 'time': request.user.userprofile.timer_pause
+ }
+ )
# Supersets need extra work to group the exercises and reps together
else:
@@ -326,24 +334,30 @@ def timer(request, day_pk):
default_weight = exercise_dict['weight_list'][i]
exercise = exercise_dict['obj']
- step_list.append({'current_step': uuid.uuid4().hex,
- 'step_percent': 0,
- 'step_nr': len(step_list) + 1,
- 'exercise': exercise,
- 'type': 'exercise',
- 'reps': reps,
- 'rep_unit': rep_unit,
- 'weight_unit': weight_unit,
- 'weight': last_log.get_last_weight(exercise,
- reps,
- default_weight)})
+ step_list.append(
+ {
+ 'current_step': uuid.uuid4().hex,
+ 'step_percent': 0,
+ 'step_nr': len(step_list) + 1,
+ 'exercise': exercise,
+ 'type': 'exercise',
+ 'reps': reps,
+ 'rep_unit': rep_unit,
+ 'weight_unit': weight_unit,
+ 'weight': last_log.get_last_weight(exercise, reps, default_weight)
+ }
+ )
if request.user.userprofile.timer_active:
- step_list.append({'current_step': uuid.uuid4().hex,
- 'step_percent': 0,
- 'step_nr': len(step_list) + 1,
- 'type': 'pause',
- 'time': 90})
+ step_list.append(
+ {
+ 'current_step': uuid.uuid4().hex,
+ 'step_percent': 0,
+ 'step_nr': len(step_list) + 1,
+ 'type': 'pause',
+ 'time': 90
+ }
+ )
# Remove the last pause step as it is not needed. If the list is empty,
# because the user didn't add any repetitions to any exercise, do nothing
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index f8fd30be5..8181feec0 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -22,20 +22,20 @@ import logging
from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import (
HttpResponseBadRequest,
- HttpResponseForbidden
+ HttpResponseForbidden,
)
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
- UpdateView
+ UpdateView,
)
# wger
@@ -43,16 +43,14 @@ from wger.manager.forms import WorkoutSessionForm
from wger.manager.models import (
Workout,
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
-
logger = logging.getLogger(__name__)
-
"""
Workout session
"""
@@ -88,9 +86,11 @@ class WorkoutSessionAddView(WgerFormMixin, LoginRequiredMixin, CreateView):
could be created
"""
try:
- date = datetime.date(int(self.kwargs['year']),
- int(self.kwargs['month']),
- int(self.kwargs['day']))
+ date = datetime.date(
+ int(self.kwargs['year']),
+ int(self.kwargs['month']),
+ int(self.kwargs['day']),
+ )
except ValueError:
date = None
diff --git a/wger/nutrition/__init__.py b/wger/nutrition/__init__.py
index a46a190d3..01df56bd0 100644
--- a/wger/nutrition/__init__.py
+++ b/wger/nutrition/__init__.py
@@ -15,10 +15,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
default_app_config = 'wger.nutrition.apps.NutritionConfig'
diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.py
index f05f6d9c5..5eed35cae 100644
--- a/wger/nutrition/api/serializers.py
+++ b/wger/nutrition/api/serializers.py
@@ -26,7 +26,7 @@ from wger.nutrition.models import (
Meal,
MealItem,
NutritionPlan,
- WeightUnit
+ WeightUnit,
)
@@ -37,11 +37,13 @@ class IngredientWeightUnitSerializer(serializers.ModelSerializer):
class Meta:
model = IngredientWeightUnit
- fields = ['id',
- 'amount',
- 'gram',
- 'ingredient',
- 'unit']
+ fields = [
+ 'id',
+ 'amount',
+ 'gram',
+ 'ingredient',
+ 'unit',
+ ]
class IngredientWeightUnitInfoSerializer(serializers.ModelSerializer):
@@ -52,9 +54,11 @@ class IngredientWeightUnitInfoSerializer(serializers.ModelSerializer):
class Meta:
model = IngredientWeightUnit
depth = 1
- fields = ['gram',
- 'amount',
- 'unit']
+ fields = [
+ 'gram',
+ 'amount',
+ 'unit',
+ ]
class WeightUnitSerializer(serializers.ModelSerializer):
@@ -64,8 +68,7 @@ class WeightUnitSerializer(serializers.ModelSerializer):
class Meta:
model = WeightUnit
- fields = ['language',
- 'name']
+ fields = ['language', 'name']
class IngredientSerializer(serializers.ModelSerializer):
@@ -75,21 +78,23 @@ class IngredientSerializer(serializers.ModelSerializer):
class Meta:
model = Ingredient
- fields = ['id',
- 'name',
- 'creation_date',
- 'update_date',
- 'energy',
- 'protein',
- 'carbohydrates',
- 'carbohydrates_sugar',
- 'fat',
- 'fat_saturated',
- 'fibres',
- 'sodium',
- 'license',
- 'license_author',
- 'language']
+ fields = [
+ 'id',
+ 'name',
+ 'creation_date',
+ 'update_date',
+ 'energy',
+ 'protein',
+ 'carbohydrates',
+ 'carbohydrates_sugar',
+ 'fat',
+ 'fat_saturated',
+ 'fibres',
+ 'sodium',
+ 'license',
+ 'license_author',
+ 'language',
+ ]
class IngredientInfoSerializer(serializers.ModelSerializer):
@@ -102,39 +107,42 @@ class IngredientInfoSerializer(serializers.ModelSerializer):
class Meta:
model = Ingredient
depth = 1
- fields = ['id',
- 'name',
- 'creation_date',
- 'update_date',
- 'energy',
- 'protein',
- 'carbohydrates',
- 'carbohydrates_sugar',
- 'fat',
- 'fat_saturated',
- 'fibres',
- 'sodium',
- 'license',
- 'license_author',
- 'ingredientweightunit_set',
- 'language']
+ fields = [
+ 'id',
+ 'name',
+ 'creation_date',
+ 'update_date',
+ 'energy',
+ 'protein',
+ 'carbohydrates',
+ 'carbohydrates_sugar',
+ 'fat',
+ 'fat_saturated',
+ 'fibres',
+ 'sodium',
+ 'license',
+ 'license_author',
+ 'ingredientweightunit_set',
+ 'language',
+ ]
class MealItemSerializer(serializers.ModelSerializer):
"""
MealItem serializer
"""
- meal = serializers.PrimaryKeyRelatedField(label='Nutrition plan',
- queryset=Meal.objects.all())
+ meal = serializers.PrimaryKeyRelatedField(label='Nutrition plan', queryset=Meal.objects.all())
class Meta:
model = MealItem
- fields = ['id',
- 'meal',
- 'ingredient',
- 'weight_unit',
- 'order',
- 'amount']
+ fields = [
+ 'id',
+ 'meal',
+ 'ingredient',
+ 'weight_unit',
+ 'order',
+ 'amount',
+ ]
class LogItemSerializer(serializers.ModelSerializer):
@@ -144,12 +152,14 @@ class LogItemSerializer(serializers.ModelSerializer):
class Meta:
model = LogItem
- fields = ['id',
- 'plan',
- 'ingredient',
- 'weight_unit',
- 'datetime',
- 'amount']
+ fields = [
+ 'id',
+ 'plan',
+ 'ingredient',
+ 'weight_unit',
+ 'datetime',
+ 'amount',
+ ]
class MealItemInfoSerializer(serializers.ModelSerializer):
@@ -166,29 +176,35 @@ class MealItemInfoSerializer(serializers.ModelSerializer):
class Meta:
model = MealItem
depth = 1
- fields = ['id',
- 'meal',
- 'ingredient',
- 'ingredient_obj',
- 'weight_unit',
- 'weight_unit_obj',
- 'order',
- 'amount']
+ fields = [
+ 'id',
+ 'meal',
+ 'ingredient',
+ 'ingredient_obj',
+ 'weight_unit',
+ 'weight_unit_obj',
+ 'order',
+ 'amount',
+ ]
class MealSerializer(serializers.ModelSerializer):
"""
Meal serializer
"""
- plan = serializers.PrimaryKeyRelatedField(label='Nutrition plan',
- queryset=NutritionPlan.objects.all())
+ plan = serializers.PrimaryKeyRelatedField(
+ label='Nutrition plan',
+ queryset=NutritionPlan.objects.all(),
+ )
class Meta:
model = Meal
- fields = ['id',
- 'plan',
- 'order',
- 'time']
+ fields = [
+ 'id',
+ 'plan',
+ 'order',
+ 'time',
+ ]
class MealInfoSerializer(serializers.ModelSerializer):
@@ -201,12 +217,14 @@ class MealInfoSerializer(serializers.ModelSerializer):
class Meta:
model = Meal
- fields = ['id',
- 'plan',
- 'order',
- 'time',
- 'meal_items',
- 'get_nutritional_values']
+ fields = [
+ 'id',
+ 'plan',
+ 'order',
+ 'time',
+ 'meal_items',
+ 'get_nutritional_values',
+ ]
class NutritionPlanSerializer(serializers.ModelSerializer):
@@ -216,7 +234,7 @@ class NutritionPlanSerializer(serializers.ModelSerializer):
class Meta:
model = NutritionPlan
- exclude = ('user',)
+ exclude = ('user', )
class NutritionPlanInfoSerializer(serializers.ModelSerializer):
@@ -229,9 +247,11 @@ class NutritionPlanInfoSerializer(serializers.ModelSerializer):
class Meta:
model = NutritionPlan
depth = 1
- fields = ['id',
- 'language',
- 'creation_date',
- 'description',
- 'get_nutritional_values',
- 'meals']
+ fields = [
+ 'id',
+ 'language',
+ 'creation_date',
+ 'description',
+ 'get_nutritional_values',
+ 'meals',
+ ]
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 65bcc4db6..0368900e0 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -25,7 +25,7 @@ from django.shortcuts import get_object_or_404
from rest_framework import viewsets
from rest_framework.decorators import (
action,
- api_view
+ api_view,
)
from rest_framework.response import Response
@@ -39,7 +39,7 @@ from wger.nutrition.api.serializers import (
MealSerializer,
NutritionPlanInfoSerializer,
NutritionPlanSerializer,
- WeightUnitSerializer
+ WeightUnitSerializer,
)
from wger.nutrition.forms import UnitChooserForm
from wger.nutrition.models import (
@@ -49,11 +49,11 @@ from wger.nutrition.models import (
Meal,
MealItem,
NutritionPlan,
- WeightUnit
+ WeightUnit,
)
from wger.utils.language import (
load_ingredient_languages,
- load_language
+ load_language,
)
from wger.utils.viewsets import WgerOwnerObjectModelViewSet
@@ -66,21 +66,23 @@ class IngredientViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Ingredient.objects.accepted()
serializer_class = IngredientSerializer
ordering_fields = '__all__'
- filterset_fields = ('carbohydrates',
- 'carbohydrates_sugar',
- 'creation_date',
- 'energy',
- 'fat',
- 'fat_saturated',
- 'fibres',
- 'name',
- 'protein',
- 'sodium',
- 'status',
- 'update_date',
- 'language',
- 'license',
- 'license_author')
+ filterset_fields = (
+ 'carbohydrates',
+ 'carbohydrates_sugar',
+ 'creation_date',
+ 'energy',
+ 'fat',
+ 'fat_saturated',
+ 'fibres',
+ 'name',
+ 'protein',
+ 'sodium',
+ 'status',
+ 'update_date',
+ 'language',
+ 'license',
+ 'license_author',
+ )
@action(detail=True)
def get_values(self, request, pk):
@@ -155,9 +157,11 @@ def search(request):
languages = [load_language(requested_language)]
else:
languages = load_ingredient_languages(request)
- ingredients = Ingredient.objects.filter(name__icontains=term,
- language__in=languages,
- status=Ingredient.STATUS_ACCEPTED)
+ ingredients = Ingredient.objects.filter(
+ name__icontains=term,
+ language__in=languages,
+ status=Ingredient.STATUS_ACCEPTED,
+ )
for ingredient in ingredients:
ingredient_json = {
@@ -180,8 +184,7 @@ class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
queryset = WeightUnit.objects.all()
serializer_class = WeightUnitSerializer
ordering_fields = '__all__'
- filterset_fields = ('language',
- 'name')
+ filterset_fields = ('language', 'name')
class IngredientWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
@@ -191,10 +194,12 @@ class IngredientWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
queryset = IngredientWeightUnit.objects.all()
serializer_class = IngredientWeightUnitSerializer
ordering_fields = '__all__'
- filterset_fields = ('amount',
- 'gram',
- 'ingredient',
- 'unit')
+ filterset_fields = (
+ 'amount',
+ 'gram',
+ 'ingredient',
+ 'unit',
+ )
class NutritionPlanViewSet(viewsets.ModelViewSet):
@@ -205,10 +210,12 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):
serializer_class = NutritionPlanSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('creation_date',
- 'language',
- 'description',
- 'has_goal_calories')
+ filterset_fields = (
+ 'creation_date',
+ 'language',
+ 'description',
+ 'has_goal_calories',
+ )
def get_queryset(self):
"""
@@ -270,9 +277,11 @@ class MealViewSet(WgerOwnerObjectModelViewSet):
serializer_class = MealSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('order',
- 'plan',
- 'time')
+ filterset_fields = (
+ 'order',
+ 'plan',
+ 'time',
+ )
def get_queryset(self):
"""
@@ -307,11 +316,13 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):
serializer_class = MealItemSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('amount',
- 'ingredient',
- 'meal',
- 'order',
- 'weight_unit')
+ filterset_fields = (
+ 'amount',
+ 'ingredient',
+ 'meal',
+ 'order',
+ 'weight_unit',
+ )
def get_queryset(self):
"""
@@ -347,10 +358,12 @@ class LogItemViewSet(WgerOwnerObjectModelViewSet):
serializer_class = LogItemSerializer
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('amount',
- 'ingredient',
- 'plan',
- 'weight_unit')
+ filterset_fields = (
+ 'amount',
+ 'ingredient',
+ 'plan',
+ 'weight_unit',
+ )
def get_queryset(self):
"""
@@ -369,6 +382,6 @@ class LogItemViewSet(WgerOwnerObjectModelViewSet):
"""
Return an overview of the nutritional plan's values
"""
- return Response(LogItem.objects
- .get(pk=pk, plan__user=self.request.user)
- .get_nutritional_values())
+ return Response(
+ LogItem.objects.get(pk=pk, plan__user=self.request.user).get_nutritional_values()
+ )
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index ec1e6f7dd..bca1e0dfe 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -22,7 +22,7 @@ from django import forms
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
# Third Party
@@ -33,7 +33,7 @@ from crispy_forms.layout import (
Column,
Layout,
Row,
- Submit
+ Submit,
)
# wger
@@ -42,11 +42,10 @@ from wger.nutrition.models import (
Ingredient,
IngredientWeightUnit,
LogItem,
- MealItem
+ MealItem,
)
from wger.utils.widgets import Html5NumberInput
-
logger = logging.getLogger(__name__)
@@ -54,14 +53,15 @@ class UnitChooserForm(forms.Form):
"""
A small form to select an amount and a unit for an ingredient
"""
- amount = forms.DecimalField(decimal_places=2,
- label=gettext_lazy("Amount"),
- max_digits=5,
- localize=True)
- unit = forms.ModelChoiceField(queryset=IngredientWeightUnit.objects.none(),
- label=gettext_lazy("Unit"),
- empty_label="g",
- required=False)
+ amount = forms.DecimalField(
+ decimal_places=2, label=gettext_lazy("Amount"), max_digits=5, localize=True
+ )
+ unit = forms.ModelChoiceField(
+ queryset=IngredientWeightUnit.objects.none(),
+ label=gettext_lazy("Unit"),
+ empty_label="g",
+ required=False
+ )
def __init__(self, *args, **kwargs):
super(UnitChooserForm, self).__init__(*args, **kwargs)
@@ -76,7 +76,8 @@ class UnitChooserForm(forms.Form):
ingredient_id = -1
self.fields['unit'].queryset = IngredientWeightUnit.objects.filter(
- ingredient_id=ingredient_id).select_related()
+ ingredient_id=ingredient_id
+ ).select_related()
self.helper = FormHelper()
self.helper.layout = Layout(
@@ -90,11 +91,15 @@ class UnitChooserForm(forms.Form):
class BmiForm(forms.ModelForm):
- height = forms.DecimalField(widget=Html5NumberInput(),
- max_value=999,
- label=_('Height (cm)'))
- weight = forms.DecimalField(widget=Html5NumberInput(),
- max_value=999)
+ height = forms.DecimalField(
+ widget=Html5NumberInput(),
+ max_value=999,
+ label=_('Height (cm)'),
+ )
+ weight = forms.DecimalField(
+ widget=Html5NumberInput(),
+ max_value=999,
+ )
class Meta:
model = UserProfile
@@ -112,8 +117,7 @@ class BmiForm(forms.ModelForm):
Column('height', css_class='form-group col-6 mb-0'),
Column('weight', css_class='form-group col-6 mb-0'),
css_class='form-row'
- ),
- ButtonHolder(Submit('submit', _("Calculate"), css_class='btn-success'))
+ ), ButtonHolder(Submit('submit', _("Calculate"), css_class='btn-success'))
)
@@ -134,7 +138,7 @@ class BmrForm(forms.ModelForm):
"age",
"height",
"gender",
- "weight"
+ "weight",
)
self.helper.form_tag = False
@@ -143,15 +147,18 @@ class PhysicalActivitiesForm(forms.ModelForm):
"""
Form for the additional physical activities
"""
+
class Meta:
model = UserProfile
- fields = ('sleep_hours',
- 'work_hours',
- 'work_intensity',
- 'sport_hours',
- 'sport_intensity',
- 'freetime_hours',
- 'freetime_intensity')
+ fields = (
+ 'sleep_hours',
+ 'work_hours',
+ 'work_intensity',
+ 'sport_hours',
+ 'sport_intensity',
+ 'freetime_hours',
+ 'freetime_intensity',
+ )
def __init__(self, *args, **kwargs):
super(PhysicalActivitiesForm, self).__init__(*args, **kwargs)
@@ -182,22 +189,28 @@ class DailyCaloriesForm(forms.ModelForm):
Form for the total daily calories needed
"""
- base_calories = forms.IntegerField(label=_('Basic caloric intake'),
- help_text=_('Your basic caloric intake as calculated for '
- 'your data'),
- required=False,
- widget=Html5NumberInput())
- additional_calories = forms.IntegerField(label=_('Additional calories'),
- help_text=_('Additional calories to add to the base '
- 'rate (to substract, enter a negative '
- 'number)'),
- initial=0,
- required=False,
- widget=Html5NumberInput())
+ base_calories = forms.IntegerField(
+ label=_('Basic caloric intake'),
+ help_text=_('Your basic caloric intake as calculated for '
+ 'your data'),
+ required=False,
+ widget=Html5NumberInput()
+ )
+ additional_calories = forms.IntegerField(
+ label=_('Additional calories'),
+ help_text=_(
+ 'Additional calories to add to the base '
+ 'rate (to substract, enter a negative '
+ 'number)'
+ ),
+ initial=0,
+ required=False,
+ widget=Html5NumberInput()
+ )
class Meta:
model = UserProfile
- fields = ('calories',)
+ fields = ('calories', )
def __init__(self, *args, **kwargs):
super(DailyCaloriesForm, self).__init__(*args, **kwargs)
@@ -207,20 +220,18 @@ class DailyCaloriesForm(forms.ModelForm):
class MealItemForm(forms.ModelForm):
- weight_unit = forms.ModelChoiceField(queryset=IngredientWeightUnit.objects.none(),
- empty_label="g",
- required=False)
- ingredient = forms.ModelChoiceField(queryset=Ingredient.objects.all(),
- widget=forms.HiddenInput)
+ weight_unit = forms.ModelChoiceField(
+ queryset=IngredientWeightUnit.objects.none(),
+ empty_label="g",
+ required=False,
+ )
+ ingredient = forms.ModelChoiceField(queryset=Ingredient.objects.all(), widget=forms.HiddenInput)
- ingredient_searchfield = forms.CharField(required=False,
- label=gettext_lazy("Ingredient"))
+ ingredient_searchfield = forms.CharField(required=False, label=gettext_lazy("Ingredient"))
class Meta:
model = MealItem
- fields = ['ingredient',
- 'weight_unit',
- 'amount']
+ fields = ['ingredient', 'weight_unit', 'amount']
def __init__(self, *args, **kwargs):
super(MealItemForm, self).__init__(*args, **kwargs)
@@ -241,9 +252,7 @@ class MealItemForm(forms.ModelForm):
self.helper = FormHelper()
self.helper.layout = Layout(
- 'ingredient',
- 'ingredient_searchfield',
- HTML('<div id="ingredient_name"></div>'),
+ 'ingredient', 'ingredient_searchfield', HTML('<div id="ingredient_name"></div>'),
Row(
Column('amount', css_class='form-group col-6 mb-0'),
Column('weight_unit', css_class='form-group col-6 mb-0'),
@@ -256,26 +265,31 @@ class MealLogItemForm(MealItemForm):
class Meta:
model = LogItem
- fields = ['ingredient',
- 'weight_unit',
- 'amount']
+ fields = [
+ 'ingredient',
+ 'weight_unit',
+ 'amount',
+ ]
class IngredientForm(forms.ModelForm):
+
class Meta:
model = Ingredient
- fields = ['name',
- 'brand',
- 'energy',
- 'protein',
- 'carbohydrates',
- 'carbohydrates_sugar',
- 'fat',
- 'fat_saturated',
- 'fibres',
- 'sodium',
- 'license',
- 'license_author']
+ fields = [
+ 'name',
+ 'brand',
+ 'energy',
+ 'protein',
+ 'carbohydrates',
+ 'carbohydrates_sugar',
+ 'fat',
+ 'fat_saturated',
+ 'fibres',
+ 'sodium',
+ 'license',
+ 'license_author',
+ ]
widgets = {'category': forms.TextInput}
def __init__(self, *args, **kwargs):
diff --git a/wger/nutrition/migrations/0001_initial.py b/wger/nutrition/migrations/0001_initial.py
index f03d9043f..620b74ecf 100644
--- a/wger/nutrition/migrations/0001_initial.py
+++ b/wger/nutrition/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
import wger.utils.fields
from django.conf import settings
@@ -17,104 +17,392 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Ingredient',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('license_author', models.CharField(help_text='If you are not the author, enter the name or source here. This is needed for some licenses e.g. the CC-BY-SA.', max_length=50, null=True, verbose_name='Author', blank=True)),
- ('status', models.CharField(default=b'1', max_length=2, editable=False, choices=[(b'1', 'Pending'), (b'2', 'Accepted'), (b'3', 'Declined'), (b'4', 'Submitted by administrator'), (b'5', 'System ingredient')])),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'license_author',
+ models.CharField(
+ help_text=
+ 'If you are not the author, enter the name or source here. This is needed for some licenses e.g. the CC-BY-SA.',
+ max_length=50,
+ null=True,
+ verbose_name='Author',
+ blank=True
+ )
+ ),
+ (
+ 'status',
+ models.CharField(
+ default=b'1',
+ max_length=2,
+ editable=False,
+ choices=[
+ (b'1', 'Pending'), (b'2', 'Accepted'), (b'3', 'Declined'),
+ (b'4', 'Submitted by administrator'), (b'5', 'System ingredient')
+ ]
+ )
+ ),
('creation_date', models.DateField(auto_now_add=True, verbose_name='Date')),
('update_date', models.DateField(auto_now=True, verbose_name='Date')),
('name', models.CharField(max_length=200, verbose_name='Name')),
- ('energy', models.IntegerField(help_text='In kcal per 100g', verbose_name='Energy')),
- ('protein', models.DecimalField(help_text='In g per 100g of product', verbose_name='Protein', max_digits=6, decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)])),
- ('carbohydrates', models.DecimalField(help_text='In g per 100g of product', verbose_name='Carbohydrates', max_digits=6, decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)])),
- ('carbohydrates_sugar', models.DecimalField(decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], max_digits=6, blank=True, help_text='In g per 100g of product', null=True, verbose_name='Sugar content in carbohydrates')),
- ('fat', models.DecimalField(help_text='In g per 100g of product', verbose_name='Fat', max_digits=6, decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)])),
- ('fat_saturated', models.DecimalField(decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], max_digits=6, blank=True, help_text='In g per 100g of product', null=True, verbose_name='Saturated fat content in fats')),
- ('fibres', models.DecimalField(decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], max_digits=6, blank=True, help_text='In g per 100g of product', null=True, verbose_name='Fibres')),
- ('sodium', models.DecimalField(decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], max_digits=6, blank=True, help_text='In g per 100g of product', null=True, verbose_name='Sodium')),
- ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language', on_delete=models.CASCADE)),
- ('license', models.ForeignKey(default=2, verbose_name='License', to='core.License', on_delete=models.CASCADE)),
- ('user', models.ForeignKey(blank=True, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='User', on_delete=models.CASCADE)),
+ (
+ 'energy',
+ models.IntegerField(help_text='In kcal per 100g', verbose_name='Energy')
+ ),
+ (
+ 'protein',
+ models.DecimalField(
+ help_text='In g per 100g of product',
+ verbose_name='Protein',
+ max_digits=6,
+ decimal_places=3,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ]
+ )
+ ),
+ (
+ 'carbohydrates',
+ models.DecimalField(
+ help_text='In g per 100g of product',
+ verbose_name='Carbohydrates',
+ max_digits=6,
+ decimal_places=3,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ]
+ )
+ ),
+ (
+ 'carbohydrates_sugar',
+ models.DecimalField(
+ decimal_places=3,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ],
+ max_digits=6,
+ blank=True,
+ help_text='In g per 100g of product',
+ null=True,
+ verbose_name='Sugar content in carbohydrates'
+ )
+ ),
+ (
+ 'fat',
+ models.DecimalField(
+ help_text='In g per 100g of product',
+ verbose_name='Fat',
+ max_digits=6,
+ decimal_places=3,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ]
+ )
+ ),
+ (
+ 'fat_saturated',
+ models.DecimalField(
+ decimal_places=3,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ],
+ max_digits=6,
+ blank=True,
+ help_text='In g per 100g of product',
+ null=True,
+ verbose_name='Saturated fat content in fats'
+ )
+ ),
+ (
+ 'fibres',
+ models.DecimalField(
+ decimal_places=3,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ],
+ max_digits=6,
+ blank=True,
+ help_text='In g per 100g of product',
+ null=True,
+ verbose_name='Fibres'
+ )
+ ),
+ (
+ 'sodium',
+ models.DecimalField(
+ decimal_places=3,
+ validators=[
+ django.core.validators.MinValueValidator(0),
+ django.core.validators.MaxValueValidator(100)
+ ],
+ max_digits=6,
+ blank=True,
+ help_text='In g per 100g of product',
+ null=True,
+ verbose_name='Sodium'
+ )
+ ),
+ (
+ 'language',
+ models.ForeignKey(
+ editable=False,
+ to='core.Language',
+ verbose_name='Language',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'license',
+ models.ForeignKey(
+ default=2,
+ verbose_name='License',
+ to='core.License',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ blank=True,
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ null=True,
+ verbose_name='User',
+ on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['name'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='IngredientWeightUnit',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('gram', models.IntegerField(verbose_name='Amount in grams')),
- ('amount', models.DecimalField(default=1, help_text='Unit amount, e.g. "1 Cup" or "1/2 spoon"', verbose_name='Amount', max_digits=5, decimal_places=2)),
- ('ingredient', models.ForeignKey(editable=False, to='nutrition.Ingredient', verbose_name='Ingredient', on_delete=models.CASCADE)),
+ (
+ 'amount',
+ models.DecimalField(
+ default=1,
+ help_text='Unit amount, e.g. "1 Cup" or "1/2 spoon"',
+ verbose_name='Amount',
+ max_digits=5,
+ decimal_places=2
+ )
+ ),
+ (
+ 'ingredient',
+ models.ForeignKey(
+ editable=False,
+ to='nutrition.Ingredient',
+ verbose_name='Ingredient',
+ on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='Meal',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('order', models.IntegerField(verbose_name='Order', max_length=1, editable=False, blank=True)),
- ('time', wger.utils.fields.Html5TimeField(null=True, verbose_name='Time (approx)', blank=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'order',
+ models.IntegerField(
+ verbose_name='Order', max_length=1, editable=False, blank=True
+ )
+ ),
+ (
+ 'time',
+ wger.utils.fields.Html5TimeField(
+ null=True, verbose_name='Time (approx)', blank=True
+ )
+ ),
],
options={
'ordering': ['time'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='MealItem',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('order', models.IntegerField(verbose_name='Order', max_length=1, editable=False, blank=True)),
- ('amount', models.DecimalField(verbose_name='Amount', max_digits=6, decimal_places=2, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1000)])),
- ('ingredient', models.ForeignKey(verbose_name='Ingredient', to='nutrition.Ingredient', on_delete=models.CASCADE)),
- ('meal', models.ForeignKey(editable=False, to='nutrition.Meal', verbose_name='Nutrition plan', on_delete=models.CASCADE)),
- ('weight_unit', models.ForeignKey(verbose_name='Weight unit', blank=True, to='nutrition.IngredientWeightUnit', null=True, on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'order',
+ models.IntegerField(
+ verbose_name='Order', max_length=1, editable=False, blank=True
+ )
+ ),
+ (
+ 'amount',
+ models.DecimalField(
+ verbose_name='Amount',
+ max_digits=6,
+ decimal_places=2,
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(1000)
+ ]
+ )
+ ),
+ (
+ 'ingredient',
+ models.ForeignKey(
+ verbose_name='Ingredient',
+ to='nutrition.Ingredient',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'meal',
+ models.ForeignKey(
+ editable=False,
+ to='nutrition.Meal',
+ verbose_name='Nutrition plan',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'weight_unit',
+ models.ForeignKey(
+ verbose_name='Weight unit',
+ blank=True,
+ to='nutrition.IngredientWeightUnit',
+ null=True,
+ on_delete=models.CASCADE
+ )
+ ),
],
- options={
- },
- bases=(models.Model,),
+ options={},
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='NutritionPlan',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('creation_date', models.DateField(auto_now_add=True, verbose_name='Creation date')),
- ('description', models.TextField(help_text='A description of the goal of the plan, e.g. "Gain mass" or "Prepare for summer"', max_length=2000, verbose_name='Description', blank=True)),
- ('has_goal_calories', models.BooleanField(default=False, help_text='Tick the box if you want to mark this plan as having a goal amount of calories. You can use the calculator or enter the value yourself.', verbose_name='Use daily calories')),
- ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language', on_delete=models.CASCADE)),
- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User', on_delete=models.CASCADE)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
+ (
+ 'creation_date',
+ models.DateField(auto_now_add=True, verbose_name='Creation date')
+ ),
+ (
+ 'description',
+ models.TextField(
+ help_text=
+ 'A description of the goal of the plan, e.g. "Gain mass" or "Prepare for summer"',
+ max_length=2000,
+ verbose_name='Description',
+ blank=True
+ )
+ ),
+ (
+ 'has_goal_calories',
+ models.BooleanField(
+ default=False,
+ help_text=
+ 'Tick the box if you want to mark this plan as having a goal amount of calories. You can use the calculator or enter the value yourself.',
+ verbose_name='Use daily calories'
+ )
+ ),
+ (
+ 'language',
+ models.ForeignKey(
+ editable=False,
+ to='core.Language',
+ verbose_name='Language',
+ on_delete=models.CASCADE
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ editable=False,
+ to=settings.AUTH_USER_MODEL,
+ verbose_name='User',
+ on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['-creation_date'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.CreateModel(
name='WeightUnit',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('name', models.CharField(max_length=200, verbose_name='Name')),
- ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language', on_delete=models.CASCADE)),
+ (
+ 'language',
+ models.ForeignKey(
+ editable=False,
+ to='core.Language',
+ verbose_name='Language',
+ on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['name'],
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.AddField(
model_name='meal',
name='plan',
- field=models.ForeignKey(editable=False, to='nutrition.NutritionPlan', verbose_name='Nutrition plan', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ editable=False,
+ to='nutrition.NutritionPlan',
+ verbose_name='Nutrition plan',
+ on_delete=models.CASCADE
+ ),
preserve_default=True,
),
migrations.AddField(
model_name='ingredientweightunit',
name='unit',
- field=models.ForeignKey(verbose_name='Weight unit', to='nutrition.WeightUnit', on_delete=models.CASCADE),
+ field=models.ForeignKey(
+ verbose_name='Weight unit', to='nutrition.WeightUnit', on_delete=models.CASCADE
+ ),
preserve_default=True,
),
]
diff --git a/wger/nutrition/migrations/0002_auto_20170101_1538.py b/wger/nutrition/migrations/0002_auto_20170101_1538.py
index 9b353cd90..5e83a33ce 100644
--- a/wger/nutrition/migrations/0002_auto_20170101_1538.py
+++ b/wger/nutrition/migrations/0002_auto_20170101_1538.py
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.9.12 on 2017-01-01 14:38
from django.db import migrations, models
+
def copy_username(apps, schema_editor):
"""
Copies the exercise name to the original name field
@@ -15,6 +16,7 @@ def copy_username(apps, schema_editor):
ingredient.license_author = 'wger.de'
ingredient.save()
+
def update_status(apps, schema_editor):
"""
Updates the status of the ingredients
@@ -22,6 +24,7 @@ def update_status(apps, schema_editor):
Ingredient = apps.get_model("nutrition", "Ingredient")
Ingredient.objects.filter(status__in=('5', '4')).update(status=2)
+
class Migration(migrations.Migration):
dependencies = [
@@ -44,7 +47,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='ingredient',
name='status',
- field=models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')], default='1',
- editable=False, max_length=2),
+ field=models.CharField(
+ choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')],
+ default='1',
+ editable=False,
+ max_length=2
+ ),
),
]
diff --git a/wger/nutrition/migrations/0003_auto_20170118_2308.py b/wger/nutrition/migrations/0003_auto_20170118_2308.py
index f75d6b277..c3017648b 100644
--- a/wger/nutrition/migrations/0003_auto_20170118_2308.py
+++ b/wger/nutrition/migrations/0003_auto_20170118_2308.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
# Generated by Django 1.9.11 on 2017-01-18 22:08
from django.db import migrations
diff --git a/wger/nutrition/migrations/0004_auto_20200819_2310.py b/wger/nutrition/migrations/0004_auto_20200819_2310.py
index af91d9c00..0b442fb6f 100644
--- a/wger/nutrition/migrations/0004_auto_20200819_2310.py
+++ b/wger/nutrition/migrations/0004_auto_20200819_2310.py
@@ -1,4 +1,3 @@
-# flake8: noqa
# Generated by Django 3.1 on 2020-08-19 21:10
from django.db import migrations, models
@@ -14,6 +13,12 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='nutritionplan',
name='description',
- field=models.CharField(blank=True, help_text='A description of the goal of the plan, e.g. "Gain mass" or "Prepare for summer"', max_length=80, verbose_name='Description'),
+ field=models.CharField(
+ blank=True,
+ help_text=
+ 'A description of the goal of the plan, e.g. "Gain mass" or "Prepare for summer"',
+ max_length=80,
+ verbose_name='Description'
+ ),
),
]
diff --git a/wger/nutrition/migrations/0005_logitem.py b/wger/nutrition/migrations/0005_logitem.py
index b6be97b2f..6f8ac8836 100644
--- a/wger/nutrition/migrations/0005_logitem.py
+++ b/wger/nutrition/migrations/0005_logitem.py
@@ -1,4 +1,3 @@
-# flake8: noqa
# Generated by Django 3.1 on 2020-08-25 10:29
import django.core.validators
@@ -17,13 +16,53 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='LogItem',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ )
+ ),
('datetime', models.DateTimeField(auto_now=True)),
('comment', models.TextField(blank=True, null=True, verbose_name='Comment')),
- ('amount', models.DecimalField(decimal_places=2, max_digits=6, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1000)], verbose_name='Amount')),
- ('ingredient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nutrition.ingredient', verbose_name='Ingredient')),
- ('plan', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='nutrition.nutritionplan', verbose_name='Nutrition plan')),
- ('weight_unit', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='nutrition.ingredientweightunit', verbose_name='Weight unit')),
+ (
+ 'amount',
+ models.DecimalField(
+ decimal_places=2,
+ max_digits=6,
+ validators=[
+ django.core.validators.MinValueValidator(1),
+ django.core.validators.MaxValueValidator(1000)
+ ],
+ verbose_name='Amount'
+ )
+ ),
+ (
+ 'ingredient',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.ingredient',
+ verbose_name='Ingredient'
+ )
+ ),
+ (
+ 'plan',
+ models.ForeignKey(
+ editable=False,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.nutritionplan',
+ verbose_name='Nutrition plan'
+ )
+ ),
+ (
+ 'weight_unit',
+ models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.ingredientweightunit',
+ verbose_name='Weight unit'
+ )
+ ),
],
options={
'ordering': ['datetime'],
diff --git a/wger/nutrition/migrations/0007_auto_20201214_0013.py b/wger/nutrition/migrations/0007_auto_20201214_0013.py
index e8ac7a1a9..dff82f3db 100644
--- a/wger/nutrition/migrations/0007_auto_20201214_0013.py
+++ b/wger/nutrition/migrations/0007_auto_20201214_0013.py
@@ -15,8 +15,12 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='IngredientCategory',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True,
- serialize=False, verbose_name='ID')),
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ )
+ ),
('name', models.CharField(max_length=100, verbose_name='Name')),
],
options={
@@ -27,8 +31,9 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='ingredient',
name='brand',
- field=models.CharField(blank=True, max_length=200, null=True,
- verbose_name='Brand name of product'),
+ field=models.CharField(
+ blank=True, max_length=200, null=True, verbose_name='Brand name of product'
+ ),
),
migrations.AddField(
model_name='ingredient',
@@ -38,8 +43,9 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='ingredient',
name='common_name',
- field=models.CharField(blank=True, max_length=200, null=True,
- verbose_name='Common name of product'),
+ field=models.CharField(
+ blank=True, max_length=200, null=True, verbose_name='Common name of product'
+ ),
),
migrations.AddField(
model_name='ingredient',
@@ -49,27 +55,35 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='ingredient',
name='source_name',
- field=models.CharField(blank=True, max_length=200, null=True,
- verbose_name='Source Name'),
+ field=models.CharField(
+ blank=True, max_length=200, null=True, verbose_name='Source Name'
+ ),
),
migrations.AddField(
model_name='ingredient',
name='source_url',
- field=models.URLField(blank=True, help_text='Link to product', null=True,
- verbose_name='Link'),
+ field=models.URLField(
+ blank=True, help_text='Link to product', null=True, verbose_name='Link'
+ ),
),
migrations.AlterField(
model_name='ingredient',
name='name',
- field=models.CharField(max_length=200,
- validators=[django.core.validators.MinLengthValidator(3)],
- verbose_name='Name'),
+ field=models.CharField(
+ max_length=200,
+ validators=[django.core.validators.MinLengthValidator(3)],
+ verbose_name='Name'
+ ),
),
migrations.AddField(
model_name='ingredient',
name='category',
- field=models.ForeignKey(blank=True, null=True,
- on_delete=django.db.models.deletion.CASCADE,
- to='nutrition.ingredientcategory', verbose_name='Category'),
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.ingredientcategory',
+ verbose_name='Category'
+ ),
),
]
diff --git a/wger/nutrition/migrations/0008_auto_20210102_1446.py b/wger/nutrition/migrations/0008_auto_20210102_1446.py
index c2b1bb470..3eba29e55 100644
--- a/wger/nutrition/migrations/0008_auto_20210102_1446.py
+++ b/wger/nutrition/migrations/0008_auto_20210102_1446.py
@@ -29,7 +29,10 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='logitem',
name='plan',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
- to='nutrition.nutritionplan', verbose_name='Nutrition plan'),
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.nutritionplan',
+ verbose_name='Nutrition plan'
+ ),
),
]
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index b325df594..55b24f106 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -30,14 +30,14 @@ from django.core.exceptions import ValidationError
from django.core.validators import (
MaxValueValidator,
MinLengthValidator,
- MinValueValidator
+ MinValueValidator,
)
from django.db import models
from django.template.loader import render_to_string
from django.urls import reverse
from django.utils import (
timezone,
- translation
+ translation,
)
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
@@ -50,21 +50,28 @@ from wger.utils.fields import Html5TimeField
from wger.utils.managers import SubmissionManager
from wger.utils.models import (
AbstractLicenseModel,
- AbstractSubmissionModel
+ AbstractSubmissionModel,
)
from wger.utils.units import AbstractWeight
from wger.weight.models import WeightEntry
-
MEALITEM_WEIGHT_GRAM = '1'
MEALITEM_WEIGHT_UNIT = '2'
-ENERGY_FACTOR = {'protein': {'kg': 4,
- 'lb': 113},
- 'carbohydrates': {'kg': 4,
- 'lb': 113},
- 'fat': {'kg': 9,
- 'lb': 225}}
+ENERGY_FACTOR = {
+ 'protein': {
+ 'kg': 4,
+ 'lb': 113
+ },
+ 'carbohydrates': {
+ 'kg': 4,
+ 'lb': 113
+ },
+ 'fat': {
+ 'kg': 9,
+ 'lb': 225
+ }
+}
"""
Simple approximation of energy (kcal) provided per gram or ounce
"""
@@ -81,28 +88,42 @@ class NutritionPlan(models.Model):
class Meta:
# Order by creation_date, descending (oldest first)
- ordering = ["-creation_date", ]
-
- user = models.ForeignKey(User,
- verbose_name=_('User'),
- editable=False,
- on_delete=models.CASCADE)
- language = models.ForeignKey(Language,
- verbose_name=_('Language'),
- editable=False,
- on_delete=models.CASCADE)
+ ordering = [
+ "-creation_date",
+ ]
+
+ user = models.ForeignKey(
+ User,
+ verbose_name=_('User'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ language = models.ForeignKey(
+ Language,
+ verbose_name=_('Language'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
creation_date = models.DateField(_('Creation date'), auto_now_add=True)
- description = models.CharField(max_length=80,
- blank=True,
- verbose_name=_('Description'),
- help_text=_('A description of the goal of the plan, e.g. '
- '"Gain mass" or "Prepare for summer"'))
- has_goal_calories = models.BooleanField(verbose_name=_('Use daily calories'),
- default=False,
- help_text=_("Tick the box if you want to mark this "
- "plan as having a goal amount of calories. "
- "You can use the calculator or enter the "
- "value yourself."))
+ description = models.CharField(
+ max_length=80,
+ blank=True,
+ verbose_name=_('Description'),
+ help_text=_(
+ 'A description of the goal of the plan, e.g. '
+ '"Gain mass" or "Prepare for summer"'
+ ),
+ )
+ has_goal_calories = models.BooleanField(
+ verbose_name=_('Use daily calories'),
+ default=False,
+ help_text=_(
+ "Tick the box if you want to mark this "
+ "plan as having a goal amount of calories. "
+ "You can use the calculator or enter the "
+ "value yourself."
+ ),
+ )
"""A flag indicating whether the plan has a goal amount of calories"""
def __str__(self):
@@ -128,21 +149,28 @@ class NutritionPlan(models.Model):
if not nutritional_representation:
use_metric = self.user.userprofile.use_metric
unit = 'kg' if use_metric else 'lb'
- result = {'total': {'energy': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0},
- 'percent': {'protein': 0,
- 'carbohydrates': 0,
- 'fat': 0},
- 'per_kg': {'protein': 0,
- 'carbohydrates': 0,
- 'fat': 0},
- }
+ result = {
+ 'total': {
+ 'energy': 0,
+ 'protein': 0,
+ 'carbohydrates': 0,
+ 'carbohydrates_sugar': 0,
+ 'fat': 0,
+ 'fat_saturated': 0,
+ 'fibres': 0,
+ 'sodium': 0
+ },
+ 'percent': {
+ 'protein': 0,
+ 'carbohydrates': 0,
+ 'fat': 0
+ },
+ 'per_kg': {
+ 'protein': 0,
+ 'carbohydrates': 0,
+ 'fat': 0
+ },
+ }
# Energy
for meal in self.meal_set.select_related():
@@ -245,14 +273,16 @@ class NutritionPlan(models.Model):
Sums the nutritional info of the items logged for the given date
"""
use_metric = self.user.userprofile.use_metric
- result = {'energy': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0}
+ result = {
+ 'energy': 0,
+ 'protein': 0,
+ 'carbohydrates': 0,
+ 'carbohydrates_sugar': 0,
+ 'fat': 0,
+ 'fat_saturated': 0,
+ 'fibres': 0,
+ 'sodium': 0
+ }
# Perform the sums
for item in self.get_log_entries(date):
@@ -266,13 +296,14 @@ class IngredientCategory(models.Model):
"""
Model for an Ingredient category
"""
- name = models.CharField(max_length=100,
- verbose_name=_('Name'))
+ name = models.CharField(max_length=100, verbose_name=_('Name'))
# Metaclass to set some other properties
class Meta:
verbose_name_plural = _("Ingredient Categories")
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
def __str__(self):
"""
@@ -302,118 +333,149 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
# Metaclass to set some other properties
class Meta:
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
# Meta data
- language = models.ForeignKey(Language,
- verbose_name=_('Language'),
- editable=False,
- on_delete=models.CASCADE)
+ language = models.ForeignKey(
+ Language,
+ verbose_name=_('Language'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
creation_date = models.DateField(_('Date'), auto_now_add=True)
- update_date = models.DateField(_('Date'),
- auto_now=True,
- blank=True,
- editable=False)
+ update_date = models.DateField(
+ _('Date'),
+ auto_now=True,
+ blank=True,
+ editable=False,
+ )
# Product infos
- name = models.CharField(max_length=200,
- verbose_name=_('Name'),
- validators=[MinLengthValidator(3)])
-
- energy = models.IntegerField(verbose_name=_('Energy'),
- help_text=_('In kcal per 100g'))
-
- protein = models.DecimalField(decimal_places=3,
- max_digits=6,
- verbose_name=_('Protein'),
- help_text=_('In g per 100g of product'),
- validators=[MinValueValidator(0),
- MaxValueValidator(100)])
-
- carbohydrates = models.DecimalField(decimal_places=3,
- max_digits=6,
- verbose_name=_('Carbohydrates'),
- help_text=_('In g per 100g of product'),
- validators=[MinValueValidator(0),
- MaxValueValidator(100)])
-
- carbohydrates_sugar = models.DecimalField(decimal_places=3,
- max_digits=6,
- blank=True,
- null=True,
- verbose_name=_('Sugar content in carbohydrates'),
- help_text=_('In g per 100g of product'),
- validators=[MinValueValidator(0),
- MaxValueValidator(100)])
-
- fat = models.DecimalField(decimal_places=3,
- max_digits=6,
- verbose_name=_('Fat'),
- help_text=_('In g per 100g of product'),
- validators=[MinValueValidator(0),
- MaxValueValidator(100)])
-
- fat_saturated = models.DecimalField(decimal_places=3,
- max_digits=6,
- blank=True,
- null=True,
- verbose_name=_('Saturated fat content in fats'),
- help_text=_('In g per 100g of product'),
- validators=[MinValueValidator(0),
- MaxValueValidator(100)])
-
- fibres = models.DecimalField(decimal_places=3,
- max_digits=6,
- blank=True,
- null=True,
- verbose_name=_('Fibres'),
- help_text=_('In g per 100g of product'),
- validators=[MinValueValidator(0),
- MaxValueValidator(100)])
-
- sodium = models.DecimalField(decimal_places=3,
- max_digits=6,
- blank=True,
- null=True,
- verbose_name=_('Sodium'),
- help_text=_('In g per 100g of product'),
- validators=[MinValueValidator(0),
- MaxValueValidator(100)])
-
- code = models.CharField(max_length=200,
- null=True,
- blank=True,
- db_index=True)
+ name = models.CharField(
+ max_length=200,
+ verbose_name=_('Name'),
+ validators=[MinLengthValidator(3)],
+ )
+
+ energy = models.IntegerField(verbose_name=_('Energy'), help_text=_('In kcal per 100g'))
+
+ protein = models.DecimalField(
+ decimal_places=3,
+ max_digits=6,
+ verbose_name=_('Protein'),
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)],
+ )
+
+ carbohydrates = models.DecimalField(
+ decimal_places=3,
+ max_digits=6,
+ verbose_name=_('Carbohydrates'),
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)],
+ )
+
+ carbohydrates_sugar = models.DecimalField(
+ decimal_places=3,
+ max_digits=6,
+ blank=True,
+ null=True,
+ verbose_name=_('Sugar content in carbohydrates'),
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)],
+ )
+
+ fat = models.DecimalField(
+ decimal_places=3,
+ max_digits=6,
+ verbose_name=_('Fat'),
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)],
+ )
+
+ fat_saturated = models.DecimalField(
+ decimal_places=3,
+ max_digits=6,
+ blank=True,
+ null=True,
+ verbose_name=_('Saturated fat content in fats'),
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)],
+ )
+
+ fibres = models.DecimalField(
+ decimal_places=3,
+ max_digits=6,
+ blank=True,
+ null=True,
+ verbose_name=_('Fibres'),
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)],
+ )
+
+ sodium = models.DecimalField(
+ decimal_places=3,
+ max_digits=6,
+ blank=True,
+ null=True,
+ verbose_name=_('Sodium'),
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)],
+ )
+
+ code = models.CharField(
+ max_length=200,
+ null=True,
+ blank=True,
+ db_index=True,
+ )
"""Internal ID of the source database, e.g. a barcode or similar"""
- source_name = models.CharField(max_length=200,
- null=True,
- blank=True)
+ source_name = models.CharField(
+ max_length=200,
+ null=True,
+ blank=True,
+ )
"""Name of the source, such as Open Food Facts"""
- source_url = models.URLField(verbose_name=_('Link'),
- help_text=_('Link to product'),
- blank=True,
- null=True)
+ source_url = models.URLField(
+ verbose_name=_('Link'),
+ help_text=_('Link to product'),
+ blank=True,
+ null=True,
+ )
"""URL of the product at the source"""
- last_imported = models.DateTimeField(_('Date'), auto_now_add=True, null=True, blank=True)
-
- common_name = models.CharField(max_length=200,
- null=True,
- blank=True)
-
- category = models.ForeignKey(IngredientCategory,
- verbose_name=_('Category'),
- on_delete=models.CASCADE,
- null=True,
- blank=True)
-
- brand = models.CharField(max_length=200,
- verbose_name=_('Brand name of product'),
- null=True,
- blank=True)
+ last_imported = models.DateTimeField(
+ _('Date'),
+ auto_now_add=True,
+ null=True,
+ blank=True,
+ )
+
+ common_name = models.CharField(
+ max_length=200,
+ null=True,
+ blank=True,
+ )
+
+ category = models.ForeignKey(
+ IngredientCategory,
+ verbose_name=_('Category'),
+ on_delete=models.CASCADE,
+ null=True,
+ blank=True,
+ )
+
+ brand = models.CharField(
+ max_length=200,
+ verbose_name=_('Brand name of product'),
+ null=True,
+ blank=True,
+ )
#
# Django methods
@@ -431,8 +493,7 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
if not slug:
return reverse('nutrition:ingredient:view', kwargs={'id': self.id})
else:
- return reverse('nutrition:ingredient:view',
- kwargs={'id': self.id, 'slug': slug})
+ return reverse('nutrition:ingredient:view', kwargs={'id': self.id, 'slug': slug})
def clean(self):
"""
@@ -470,11 +531,16 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
if not ((energy_upper > energy_calculated) and (energy_calculated > energy_lower)):
raise ValidationError(
- _('The total energy ({energy}kcal) is not the approximate sum of the '
- 'energy provided by protein, carbohydrates and fat ({energy_calculated}kcal '
- '+/-{energy_approx}%)'.format(energy=self.energy,
- energy_calculated=energy_calculated,
- energy_approx=self.ENERGY_APPROXIMATION)))
+ _(
+ 'The total energy ({energy}kcal) is not the approximate sum of the '
+ 'energy provided by protein, carbohydrates and fat ({energy_calculated}kcal '
+ '+/-{energy_approx}%)'.format(
+ energy=self.energy,
+ energy_calculated=energy_calculated,
+ energy_approx=self.ENERGY_APPROXIMATION
+ )
+ )
+ )
def save(self, *args, **kwargs):
"""
@@ -499,9 +565,10 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
equal = True
if isinstance(other, self.__class__):
for i in self._meta.fields:
- if (hasattr(self, i.name)
- and hasattr(other, i.name)
- and (getattr(self, i.name, None) != getattr(other, i.name, None))):
+ if (
+ hasattr(self, i.name) and hasattr(other, i.name)
+ and (getattr(self, i.name, None) != getattr(other, i.name, None))
+ ):
equal = False
else:
equal = False
@@ -557,11 +624,12 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'site': Site.objects.get_current().domain
}
message = render_to_string('ingredient/email_new.tpl', context)
- mail.send_mail(subject,
- message,
- settings.WGER_SETTINGS['EMAIL_FROM'],
- [user.email],
- fail_silently=True)
+ mail.send_mail(
+ subject,
+ message,
+ settings.WGER_SETTINGS['EMAIL_FROM'], [user.email],
+ fail_silently=True
+ )
def set_author(self, request):
if request.user.has_perm('nutrition.add_ingredient'):
@@ -574,11 +642,12 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
# Send email to administrator
subject = _('New user submitted ingredient')
- message = _("""The user {0} submitted a new ingredient "{1}".""".format(
- request.user.username, self.name))
- mail.mail_admins(subject,
- message,
- fail_silently=True)
+ message = _(
+ """The user {0} submitted a new ingredient "{1}".""".format(
+ request.user.username, self.name
+ )
+ )
+ mail.mail_admins(subject, message, fail_silently=True)
def get_owner_object(self):
"""
@@ -602,16 +671,22 @@ class WeightUnit(models.Model):
A more human usable weight unit (spoon, table, slice...)
"""
- language = models.ForeignKey(Language,
- verbose_name=_('Language'),
- editable=False,
- on_delete=models.CASCADE)
- name = models.CharField(max_length=200,
- verbose_name=_('Name'), )
+ language = models.ForeignKey(
+ Language,
+ verbose_name=_('Language'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ name = models.CharField(
+ max_length=200,
+ verbose_name=_('Name'),
+ )
# Metaclass to set some other properties
class Meta:
- ordering = ["name", ]
+ ordering = [
+ "name",
+ ]
def __str__(self):
"""
@@ -631,18 +706,26 @@ class IngredientWeightUnit(models.Model):
A specific human usable weight unit for an ingredient
"""
- ingredient = models.ForeignKey(Ingredient,
- verbose_name=_('Ingredient'),
- editable=False,
- on_delete=models.CASCADE)
- unit = models.ForeignKey(WeightUnit, verbose_name=_('Weight unit'), on_delete=models.CASCADE)
+ ingredient = models.ForeignKey(
+ Ingredient,
+ verbose_name=_('Ingredient'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ unit = models.ForeignKey(
+ WeightUnit,
+ verbose_name=_('Weight unit'),
+ on_delete=models.CASCADE,
+ )
gram = models.IntegerField(verbose_name=_('Amount in grams'))
- amount = models.DecimalField(decimal_places=2,
- max_digits=5,
- default=1,
- verbose_name=_('Amount'),
- help_text=_('Unit amount, e.g. "1 Cup" or "1/2 spoon"'))
+ amount = models.DecimalField(
+ decimal_places=2,
+ max_digits=5,
+ default=1,
+ verbose_name=_('Amount'),
+ help_text=_('Unit amount, e.g. "1 Cup" or "1/2 spoon"'),
+ )
def get_owner_object(self):
"""
@@ -655,9 +738,11 @@ class IngredientWeightUnit(models.Model):
Return a more human-readable representation
"""
- return "{0}{1} ({2}g)".format(self.amount if self.amount > 1 else '',
- self.unit.name,
- self.gram)
+ return "{0}{1} ({2}g)".format(
+ self.amount if self.amount > 1 else '',
+ self.unit.name,
+ self.gram,
+ )
class Meal(models.Model):
@@ -667,18 +752,26 @@ class Meal(models.Model):
# Metaclass to set some other properties
class Meta:
- ordering = ["time", ]
-
- plan = models.ForeignKey(NutritionPlan,
- verbose_name=_('Nutrition plan'),
- editable=False,
- on_delete=models.CASCADE)
- order = models.IntegerField(verbose_name=_('Order'),
- blank=True,
- editable=False)
- time = Html5TimeField(null=True,
- blank=True,
- verbose_name=_('Time (approx)'))
+ ordering = [
+ "time",
+ ]
+
+ plan = models.ForeignKey(
+ NutritionPlan,
+ verbose_name=_('Nutrition plan'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ order = models.IntegerField(
+ verbose_name=_('Order'),
+ blank=True,
+ editable=False,
+ )
+ time = Html5TimeField(
+ null=True,
+ blank=True,
+ verbose_name=_('Time (approx)'),
+ )
def __str__(self):
"""
@@ -698,14 +791,16 @@ class Meal(models.Model):
:param use_metric Flag that controls the units used
"""
- nutritional_info = {'energy': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0}
+ nutritional_info = {
+ 'energy': 0,
+ 'protein': 0,
+ 'carbohydrates': 0,
+ 'carbohydrates_sugar': 0,
+ 'fat': 0,
+ 'fat_saturated': 0,
+ 'fibres': 0,
+ 'sodium': 0
+ }
# Get the calculated values from the meal item and add them
for item in self.mealitem_set.select_related():
@@ -748,21 +843,21 @@ class BaseMealItem(object):
:param use_metric Flag that controls the units used
"""
- nutritional_info = {'energy': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0}
+ nutritional_info = {
+ 'energy': 0,
+ 'protein': 0,
+ 'carbohydrates': 0,
+ 'carbohydrates_sugar': 0,
+ 'fat': 0,
+ 'fat_saturated': 0,
+ 'fibres': 0,
+ 'sodium': 0
+ }
# Calculate the base weight of the item
if self.get_unit_type() == MEALITEM_WEIGHT_GRAM:
item_weight = self.amount
else:
- item_weight = (self.amount
- * self.weight_unit.amount
- * self.weight_unit.gram)
+ item_weight = (self.amount * self.weight_unit.amount * self.weight_unit.gram)
nutritional_info['energy'] += self.ingredient.energy * item_weight / 100
nutritional_info['protein'] += self.ingredient.protein * item_weight / 100
@@ -807,27 +902,36 @@ class MealItem(BaseMealItem, models.Model):
An item (component) of a meal
"""
- meal = models.ForeignKey(Meal,
- verbose_name=_('Nutrition plan'),
- editable=False,
- on_delete=models.CASCADE)
- ingredient = models.ForeignKey(Ingredient,
- verbose_name=_('Ingredient'),
- on_delete=models.CASCADE)
- weight_unit = models.ForeignKey(IngredientWeightUnit,
- verbose_name=_('Weight unit'),
- null=True,
- blank=True,
- on_delete=models.CASCADE)
-
- order = models.IntegerField(verbose_name=_('Order'),
- blank=True,
- editable=False)
- amount = models.DecimalField(decimal_places=2,
- max_digits=6,
- verbose_name=_('Amount'),
- validators=[MinValueValidator(1),
- MaxValueValidator(1000)])
+ meal = models.ForeignKey(
+ Meal,
+ verbose_name=_('Nutrition plan'),
+ editable=False,
+ on_delete=models.CASCADE,
+ )
+ ingredient = models.ForeignKey(
+ Ingredient,
+ verbose_name=_('Ingredient'),
+ on_delete=models.CASCADE,
+ )
+ weight_unit = models.ForeignKey(
+ IngredientWeightUnit,
+ verbose_name=_('Weight unit'),
+ null=True,
+ blank=True,
+ on_delete=models.CASCADE,
+ )
+
+ order = models.IntegerField(
+ verbose_name=_('Order'),
+ blank=True,
+ editable=False,
+ )
+ amount = models.DecimalField(
+ decimal_places=2,
+ max_digits=6,
+ verbose_name=_('Amount'),
+ validators=[MinValueValidator(1), MaxValueValidator(1000)],
+ )
def __str__(self):
"""
@@ -846,13 +950,18 @@ class LogItem(BaseMealItem, models.Model):
"""
An item (component) of a log
"""
+
# Metaclass to set some other properties
class Meta:
- ordering = ["datetime", ]
+ ordering = [
+ "datetime",
+ ]
- plan = models.ForeignKey(NutritionPlan,
- verbose_name=_('Nutrition plan'),
- on_delete=models.CASCADE)
+ plan = models.ForeignKey(
+ NutritionPlan,
+ verbose_name=_('Nutrition plan'),
+ on_delete=models.CASCADE,
+ )
"""
The plan this log belongs to
"""
@@ -862,34 +971,41 @@ class LogItem(BaseMealItem, models.Model):
Time and date when the log was added
"""
- comment = models.TextField(verbose_name=_('Comment'),
- blank=True,
- null=True)
+ comment = models.TextField(
+ verbose_name=_('Comment'),
+ blank=True,
+ null=True,
+ )
"""
Comment field, for additional information
"""
- ingredient = models.ForeignKey(Ingredient,
- verbose_name=_('Ingredient'),
- on_delete=models.CASCADE)
+ ingredient = models.ForeignKey(
+ Ingredient,
+ verbose_name=_('Ingredient'),
+ on_delete=models.CASCADE,
+ )
"""
Ingredient
"""
- weight_unit = models.ForeignKey(IngredientWeightUnit,
- verbose_name=_('Weight unit'),
- null=True,
- blank=True,
- on_delete=models.CASCADE)
+ weight_unit = models.ForeignKey(
+ IngredientWeightUnit,
+ verbose_name=_('Weight unit'),
+ null=True,
+ blank=True,
+ on_delete=models.CASCADE,
+ )
"""
Weight unit used (grams, slices, etc.)
"""
- amount = models.DecimalField(decimal_places=2,
- max_digits=6,
- verbose_name=_('Amount'),
- validators=[MinValueValidator(1),
- MaxValueValidator(1000)])
+ amount = models.DecimalField(
+ decimal_places=2,
+ max_digits=6,
+ verbose_name=_('Amount'),
+ validators=[MinValueValidator(1), MaxValueValidator(1000)],
+ )
"""
The amount of units
"""
diff --git a/wger/nutrition/signals.py b/wger/nutrition/signals.py
index c2b8b8837..d3e52b287 100644
--- a/wger/nutrition/signals.py
+++ b/wger/nutrition/signals.py
@@ -18,14 +18,14 @@
from django.core.cache import cache
from django.db.models.signals import (
post_delete,
- post_save
+ post_save,
)
# wger
from wger.nutrition.models import (
Meal,
MealItem,
- NutritionPlan
+ NutritionPlan,
)
from wger.utils.cache import cache_mapper
diff --git a/wger/nutrition/tests/test_bmi.py b/wger/nutrition/tests/test_bmi.py
index ae7c569c5..9cf8037dc 100644
--- a/wger/nutrition/tests/test_bmi.py
+++ b/wger/nutrition/tests/test_bmi.py
@@ -46,15 +46,17 @@ class BmiTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
def test_calculator(self):
-
"""
Tests the calculator itself
"""
self.user_login('test')
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
bmi = json.loads(response.content.decode('utf8'))
self.assertEqual(Decimal(bmi['bmi']), Decimal(24.69).quantize(TWOPLACES))
@@ -62,7 +64,6 @@ class BmiTestCase(WgerTestCase):
self.assertEqual(Decimal(bmi['height']), Decimal(180))
def test_calculator_imperial(self):
-
"""
Tests the calculator using imperial units
"""
@@ -71,9 +72,12 @@ class BmiTestCase(WgerTestCase):
profile = UserProfile.objects.get(user__username='test')
profile.weight_unit = 'lb'
profile.save()
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 176.36})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 176.36
+ }
+ )
self.assertEqual(response.status_code, 200)
bmi = json.loads(response.content.decode('utf8'))
self.assertEqual(Decimal(bmi['bmi']), Decimal(24.69).quantize(TWOPLACES))
@@ -90,9 +94,12 @@ class BmiTestCase(WgerTestCase):
# Existing weight entry is old, a new one is created
entry1 = WeightEntry.objects.filter(user=user).latest()
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry2 = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry1.weight, 83)
@@ -102,9 +109,12 @@ class BmiTestCase(WgerTestCase):
entry2.delete()
entry1.date = datetime.date.today()
entry1.save()
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry2 = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry1.pk, entry2.pk)
@@ -112,9 +122,12 @@ class BmiTestCase(WgerTestCase):
# No existing entries
WeightEntry.objects.filter(user=user).delete()
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry.weight, 80)
diff --git a/wger/nutrition/tests/test_calories_calculator.py b/wger/nutrition/tests/test_calories_calculator.py
index 3d4e7e47d..ed2625870 100644
--- a/wger/nutrition/tests/test_calories_calculator.py
+++ b/wger/nutrition/tests/test_calories_calculator.py
@@ -50,18 +50,23 @@ class CaloriesCalculatorTestCase(WgerTestCase):
"""
self.user_login('test')
- response = self.client.post(reverse('nutrition:calories:activities'),
- {'sleep_hours': 7,
- 'work_hours': 8,
- 'work_intensity': 1,
- 'sport_hours': 6,
- 'sport_intensity': 3,
- 'freetime_hours': 8,
- 'freetime_intensity': 1})
+ response = self.client.post(
+ reverse('nutrition:calories:activities'), {
+ 'sleep_hours': 7,
+ 'work_hours': 8,
+ 'work_intensity': 1,
+ 'sport_hours': 6,
+ 'sport_intensity': 3,
+ 'freetime_hours': 8,
+ 'freetime_intensity': 1
+ }
+ )
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
- self.assertEqual(decimal.Decimal(result['factor']),
- decimal.Decimal(1.57).quantize(TWOPLACES))
+ self.assertEqual(
+ decimal.Decimal(result['factor']),
+ decimal.Decimal(1.57).quantize(TWOPLACES)
+ )
self.assertEqual(decimal.Decimal(result['activities']), decimal.Decimal(2920))
def test_automatic_weight_entry_bmi(self):
@@ -74,9 +79,12 @@ class CaloriesCalculatorTestCase(WgerTestCase):
# Existing weight entry is old, a new one is created
entry1 = WeightEntry.objects.filter(user=user).latest()
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry2 = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry1.weight, 83)
@@ -86,9 +94,12 @@ class CaloriesCalculatorTestCase(WgerTestCase):
entry2.delete()
entry1.date = datetime.date.today()
entry1.save()
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry2 = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry1.pk, entry2.pk)
@@ -96,9 +107,12 @@ class CaloriesCalculatorTestCase(WgerTestCase):
# No existing entries
WeightEntry.objects.filter(user=user).delete()
- response = self.client.post(reverse('nutrition:bmi:calculate'),
- {'height': 180,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:bmi:calculate'), {
+ 'height': 180,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry.weight, 80)
@@ -110,11 +124,14 @@ class CaloriesCalculatorTestCase(WgerTestCase):
"""
self.user_login('test')
- response = self.client.post(reverse('nutrition:calories:bmr'),
- {'age': 30,
- 'height': 180,
- 'gender': 1,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:calories:bmr'), {
+ 'age': 30,
+ 'height': 180,
+ 'gender': 1,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
self.assertEqual(result, {'bmr': '1780'})
@@ -129,11 +146,14 @@ class CaloriesCalculatorTestCase(WgerTestCase):
# Existing weight entry is old, a new one is created
entry1 = WeightEntry.objects.filter(user=user).latest()
- response = self.client.post(reverse('nutrition:calories:bmr'),
- {'age': 30,
- 'height': 180,
- 'gender': 1,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:calories:bmr'), {
+ 'age': 30,
+ 'height': 180,
+ 'gender': 1,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry2 = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry1.weight, 83)
@@ -143,11 +163,14 @@ class CaloriesCalculatorTestCase(WgerTestCase):
entry2.delete()
entry1.date = datetime.date.today()
entry1.save()
- response = self.client.post(reverse('nutrition:calories:bmr'),
- {'age': 30,
- 'height': 180,
- 'gender': 1,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:calories:bmr'), {
+ 'age': 30,
+ 'height': 180,
+ 'gender': 1,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry2 = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry1.pk, entry2.pk)
@@ -155,11 +178,14 @@ class CaloriesCalculatorTestCase(WgerTestCase):
# No existing entries
WeightEntry.objects.filter(user=user).delete()
- response = self.client.post(reverse('nutrition:calories:bmr'),
- {'age': 30,
- 'height': 180,
- 'gender': 1,
- 'weight': 80})
+ response = self.client.post(
+ reverse('nutrition:calories:bmr'), {
+ 'age': 30,
+ 'height': 180,
+ 'gender': 1,
+ 'weight': 80
+ }
+ )
self.assertEqual(response.status_code, 200)
entry = WeightEntry.objects.filter(user=user).latest()
self.assertEqual(entry.weight, 80)
diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.py
index 09eb9cbde..3e1a99998 100644
--- a/wger/nutrition/tests/test_copy_plan.py
+++ b/wger/nutrition/tests/test_copy_plan.py
@@ -39,8 +39,10 @@ class CopyPlanTestCase(WgerTestCase):
# Copy the plan
count_before = NutritionPlan.objects.count()
- response = self.client.post(reverse('nutrition:plan:copy', kwargs={'pk': 4}),
- {'comment': 'A copied plan'})
+ response = self.client.post(
+ reverse('nutrition:plan:copy', kwargs={'pk': 4}),
+ {'comment': 'A copied plan'},
+ )
count_after = NutritionPlan.objects.count()
if fail:
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index 1a3670bc3..4d3472f0e 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -29,11 +29,11 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.nutrition.models import (
Ingredient,
- Meal
+ Meal,
)
from wger.utils.constants import NUTRITION_TAB
@@ -68,17 +68,19 @@ class EditIngredientTestCase(WgerEditTestCase):
object_class = Ingredient
url = 'nutrition:ingredient:edit'
pk = 1
- data = {'name': 'A new name',
- 'sodium': 2,
- 'energy': 200,
- 'fat': 10,
- 'carbohydrates_sugar': 5,
- 'fat_saturated': 3.14,
- 'fibres': 2.1,
- 'protein': 20,
- 'carbohydrates': 10,
- 'license': 2,
- 'license_author': 'me!'}
+ data = {
+ 'name': 'A new name',
+ 'sodium': 2,
+ 'energy': 200,
+ 'fat': 10,
+ 'carbohydrates_sugar': 5,
+ 'fat_saturated': 3.14,
+ 'fibres': 2.1,
+ 'protein': 20,
+ 'carbohydrates': 10,
+ 'license': 2,
+ 'license_author': 'me!'
+ }
def post_test_hook(self):
"""
@@ -97,17 +99,19 @@ class AddIngredientTestCase(WgerAddTestCase):
object_class = Ingredient
url = 'nutrition:ingredient:add'
user_fail = False
- data = {'name': 'A new ingredient',
- 'sodium': 2,
- 'energy': 200,
- 'fat': 10,
- 'carbohydrates_sugar': 5,
- 'fat_saturated': 3.14,
- 'fibres': 2.1,
- 'protein': 20,
- 'carbohydrates': 10,
- 'license': 2,
- 'license_author': 'me!'}
+ data = {
+ 'name': 'A new ingredient',
+ 'sodium': 2,
+ 'energy': 200,
+ 'fat': 10,
+ 'carbohydrates_sugar': 5,
+ 'fat_saturated': 3.14,
+ 'fibres': 2.1,
+ 'protein': 20,
+ 'carbohydrates': 10,
+ 'license': 2,
+ 'license_author': 'me!'
+ }
def post_test_hook(self):
"""
@@ -126,17 +130,19 @@ class IngredientNameShortTestCase(WgerTestCase):
"""
Tests that ingredient cannot have name with length less than 3
"""
- data = {'name': 'Ui',
- 'sodium': 2,
- 'energy': 200,
- 'fat': 10,
- 'carbohydrates_sugar': 5,
- 'fat_saturated': 3.14,
- 'fibres': 2.1,
- 'protein': 20,
- 'carbohydrates': 10,
- 'license': 2,
- 'license_author': 'me!'}
+ data = {
+ 'name': 'Ui',
+ 'sodium': 2,
+ 'energy': 200,
+ 'fat': 10,
+ 'carbohydrates_sugar': 5,
+ 'fat_saturated': 3.14,
+ 'fibres': 2.1,
+ 'protein': 20,
+ 'carbohydrates': 10,
+ 'license': 2,
+ 'license_author': 'me!'
+ }
def test_add_ingredient_short_name(self):
"""
@@ -159,8 +165,9 @@ class IngredientNameShortTestCase(WgerTestCase):
"""
self.user_login('admin')
- response = self.client.post(reverse('nutrition:ingredient:edit',
- kwargs={'pk': '1'}), self.data)
+ response = self.client.post(
+ reverse('nutrition:ingredient:edit', kwargs={'pk': '1'}), self.data
+ )
self.assertEqual(response.status_code, 200)
ingredient = Ingredient.objects.get(pk=1)
@@ -274,42 +281,56 @@ class IngredientValuesTestCase(WgerTestCase):
"""
# Get the nutritional values in 1 gram of product
- response = self.client.get(reverse('api-ingredient-get-values', kwargs={'pk': 1}),
- {'amount': 1,
- 'ingredient': 1,
- 'unit': ''})
+ response = self.client.get(
+ reverse('api-ingredient-get-values', kwargs={'pk': 1}), {
+ 'amount': 1,
+ 'ingredient': 1,
+ 'unit': ''
+ }
+ )
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
self.assertEqual(len(result), 9)
- self.assertEqual(result, {'sodium': '0.01',
- 'energy': '1.76',
- 'energy_kilojoule': '7.36',
- 'fat': '0.08',
- 'carbohydrates_sugar': '0.00',
- 'fat_saturated': '0.03',
- 'fibres': '0.00',
- 'protein': '0.26',
- 'carbohydrates': '0.00'})
+ self.assertEqual(
+ result, {
+ 'sodium': '0.01',
+ 'energy': '1.76',
+ 'energy_kilojoule': '7.36',
+ 'fat': '0.08',
+ 'carbohydrates_sugar': '0.00',
+ 'fat_saturated': '0.03',
+ 'fibres': '0.00',
+ 'protein': '0.26',
+ 'carbohydrates': '0.00'
+ }
+ )
# Get the nutritional values in 1 unit of product
- response = self.client.get(reverse('api-ingredient-get-values', kwargs={'pk': 1}),
- {'amount': 1,
- 'ingredient': 1,
- 'unit': 2})
+ response = self.client.get(
+ reverse('api-ingredient-get-values', kwargs={'pk': 1}), {
+ 'amount': 1,
+ 'ingredient': 1,
+ 'unit': 2
+ }
+ )
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
self.assertEqual(len(result), 9)
- self.assertEqual(result, {'sodium': '0.61',
- 'energy': '196.24',
- 'energy_kilojoule': '821.07',
- 'fat': '9.13',
- 'carbohydrates_sugar': '0.00',
- 'fat_saturated': '3.62',
- 'fibres': '0.00',
- 'protein': '28.58',
- 'carbohydrates': '0.14'})
+ self.assertEqual(
+ result, {
+ 'sodium': '0.61',
+ 'energy': '196.24',
+ 'energy_kilojoule': '821.07',
+ 'fat': '9.13',
+ 'carbohydrates_sugar': '0.00',
+ 'fat_saturated': '3.62',
+ 'fibres': '0.00',
+ 'protein': '28.58',
+ 'carbohydrates': '0.14'
+ }
+ )
def test_calculate_value_anonymous(self):
"""
@@ -331,6 +352,7 @@ class IngredientTestCase(WgerTestCase):
"""
Tests other ingredient functions
"""
+
def test_compare(self):
"""
Tests the custom compare method based on values
@@ -406,5 +428,4 @@ class IngredientApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 4
resource = Ingredient
private_resource = False
- data = {'language': 1,
- 'license': 2}
+ data = {'language': 1, 'license': 2}
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index f10c244d0..12c283c49 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -24,11 +24,11 @@ from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.nutrition.models import (
Meal,
- NutritionPlan
+ NutritionPlan,
)
@@ -133,7 +133,9 @@ class MealApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 2
resource = Meal
private_resource = True
- special_endpoints = ('nutritional_values',)
- data = {'time': datetime.time(9, 2),
- 'plan': 4,
- 'order': 1}
+ special_endpoints = ('nutritional_values', )
+ data = {
+ 'time': datetime.time(9, 2),
+ 'plan': 4,
+ 'order': 1,
+ }
diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.py
index 2c2d54293..980e17638 100644
--- a/wger/nutrition/tests/test_meal_item.py
+++ b/wger/nutrition/tests/test_meal_item.py
@@ -20,7 +20,7 @@ from django.urls import reverse
from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
WgerAddTestCase,
- WgerEditTestCase
+ WgerEditTestCase,
)
from wger.nutrition.models import MealItem
@@ -33,9 +33,11 @@ class EditMealItemUnitTestCase(WgerEditTestCase):
object_class = MealItem
url = 'nutrition:meal_item:edit'
pk = 4
- data = {'amount': 1,
- 'ingredient': 1,
- 'weight_unit': 1}
+ data = {
+ 'amount': 1,
+ 'ingredient': 1,
+ 'weight_unit': 1,
+ }
class EditMealItemWeightTestCase(WgerEditTestCase):
@@ -46,8 +48,7 @@ class EditMealItemWeightTestCase(WgerEditTestCase):
object_class = MealItem
url = 'nutrition:meal_item:edit'
pk = 4
- data = {'amount': 100,
- 'ingredient': 1}
+ data = {'amount': 100, 'ingredient': 1}
class AddMealItemUnitTestCase(WgerAddTestCase):
@@ -57,9 +58,11 @@ class AddMealItemUnitTestCase(WgerAddTestCase):
object_class = MealItem
url = reverse('nutrition:meal_item:add', kwargs={'meal_id': 3})
- data = {'amount': 1,
- 'ingredient': 1,
- 'weight_unit': 1}
+ data = {
+ 'amount': 1,
+ 'ingredient': 1,
+ 'weight_unit': 1,
+ }
class AddMealItemWeightTestCase(WgerAddTestCase):
@@ -69,8 +72,7 @@ class AddMealItemWeightTestCase(WgerAddTestCase):
object_class = MealItem
url = reverse('nutrition:meal_item:add', kwargs={'meal_id': 3})
- data = {'amount': 100,
- 'ingredient': 1}
+ data = {'amount': 100, 'ingredient': 1}
class MealItemApiTestCase(api_base_test.ApiBaseResourceTestCase):
@@ -80,7 +82,9 @@ class MealItemApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 10
resource = MealItem
private_resource = True
- special_endpoints = ('nutritional_values',)
- data = {'meal': 2,
- 'amount': 100,
- 'ingredient': 1}
+ special_endpoints = ('nutritional_values', )
+ data = {
+ 'meal': 2,
+ 'amount': 100,
+ 'ingredient': 1,
+ }
diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.py
index 2b29d7a2c..22ee6a2aa 100644
--- a/wger/nutrition/tests/test_nutrition_diary.py
+++ b/wger/nutrition/tests/test_nutrition_diary.py
@@ -26,14 +26,13 @@ from wger.core.tests.base_testcase import (
WgerAccessTestCase,
WgerAddTestCase,
WgerDeleteTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.nutrition.models import (
LogItem,
- NutritionPlan
+ NutritionPlan,
)
-
logger = logging.getLogger(__name__)
@@ -43,15 +42,17 @@ class DiaryOverviewAccessTest(WgerAccessTestCase):
"""
url = reverse('nutrition:log:overview', kwargs={'pk': 1})
user_success = 'test'
- user_fail = ('admin',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3',
- 'general_manager1',
- 'general_manager2')
+ user_fail = (
+ 'admin',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ 'general_manager2',
+ )
class DiaryOverview2AccessTest(WgerAccessTestCase):
@@ -61,58 +62,58 @@ class DiaryOverview2AccessTest(WgerAccessTestCase):
url = reverse('nutrition:log:overview', kwargs={'pk': 2})
user_fail = None
anonymous_fail = False
- user_success = ('admin',
- 'test',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3',
- 'general_manager1',
- 'general_manager2')
+ user_success = (
+ 'admin',
+ 'test',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ 'general_manager2',
+ )
class DiaryDetailAccessTest(WgerAccessTestCase):
"""
Tests accessing a nutrition overview page
"""
- url = reverse('nutrition:log:detail', kwargs={'pk': 1,
- 'year': 2016,
- 'month': 5,
- 'day': 15})
+ url = reverse('nutrition:log:detail', kwargs={'pk': 1, 'year': 2016, 'month': 5, 'day': 15})
user_success = 'test'
- user_fail = ('admin',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3',
- 'general_manager1',
- 'general_manager2')
+ user_fail = (
+ 'admin',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ 'general_manager2',
+ )
class DiaryDetail2AccessTest(WgerAccessTestCase):
"""
Tests accessing a nutrition overview page (read access activated)
"""
- url = reverse('nutrition:log:detail', kwargs={'pk': 2,
- 'year': 2016,
- 'month': 5,
- 'day': 15})
+ url = reverse('nutrition:log:detail', kwargs={'pk': 2, 'year': 2016, 'month': 5, 'day': 15})
user_fail = None
anonymous_fail = False
- user_success = ('admin',
- 'test',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3',
- 'general_manager1',
- 'general_manager2')
+ user_success = (
+ 'admin',
+ 'test',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ 'general_manager2',
+ )
class NutritionDiaryTestCase(WgerTestCase):
@@ -124,26 +125,32 @@ class NutritionDiaryTestCase(WgerTestCase):
plan = NutritionPlan.objects.get(pk=1)
# No entries for date
- self.assertEqual(plan.get_log_summary(datetime.date(2016, 1, 12)),
- {'energy': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0})
+ self.assertEqual(
+ plan.get_log_summary(datetime.date(2016, 1, 12)), {
+ 'energy': 0,
+ 'protein': 0,
+ 'carbohydrates': 0,
+ 'carbohydrates_sugar': 0,
+ 'fat': 0,
+ 'fat_saturated': 0,
+ 'fibres': 0,
+ 'sodium': 0
+ }
+ )
# Entries found
- self.assertEqual(plan.get_log_summary(datetime.date(2016, 5, 15)),
- {'energy': Decimal('653.80'),
- 'protein': Decimal('19.22'),
- 'carbohydrates': Decimal('109.99'),
- 'carbohydrates_sugar': Decimal('107.72'),
- 'fat': Decimal('9.32'),
- 'fat_saturated': Decimal('2.43'),
- 'fibres': Decimal('0.00'),
- 'sodium': Decimal('5.09')})
+ self.assertEqual(
+ plan.get_log_summary(datetime.date(2016, 5, 15)), {
+ 'energy': Decimal('653.80'),
+ 'protein': Decimal('19.22'),
+ 'carbohydrates': Decimal('109.99'),
+ 'carbohydrates_sugar': Decimal('107.72'),
+ 'fat': Decimal('9.32'),
+ 'fat_saturated': Decimal('2.43'),
+ 'fibres': Decimal('0.00'),
+ 'sodium': Decimal('5.09')
+ }
+ )
def test_log_meal(self):
"""
@@ -189,8 +196,7 @@ class NutritionDiaryTestCase(WgerTestCase):
LogItem.objects.all().delete()
self.assertFalse(LogItem.objects.filter(plan=plan))
self.user_login('test')
- response = self.client.get(
- reverse('nutrition:log:log_plan', kwargs={"plan_pk": 1}))
+ response = self.client.get(reverse('nutrition:log:log_plan', kwargs={"plan_pk": 1}))
self.assertEqual(response.status_code, 302)
self.assertEqual(LogItem.objects.filter(plan=plan).count(), 3)
@@ -201,8 +207,7 @@ class NutritionDiaryTestCase(WgerTestCase):
plan = NutritionPlan.objects.get(pk=1)
LogItem.objects.all().delete()
self.assertFalse(LogItem.objects.filter(plan=plan))
- response = self.client.get(
- reverse('nutrition:log:log_plan', kwargs={"plan_pk": 1}))
+ response = self.client.get(reverse('nutrition:log:log_plan', kwargs={"plan_pk": 1}))
self.assertEqual(response.status_code, 403)
self.assertEqual(LogItem.objects.filter(plan=plan).count(), 0)
@@ -214,8 +219,7 @@ class NutritionDiaryTestCase(WgerTestCase):
LogItem.objects.all().delete()
self.assertFalse(LogItem.objects.filter(plan=plan))
self.user_login('admin')
- response = self.client.get(
- reverse('nutrition:log:log_plan', kwargs={"plan_pk": 1}))
+ response = self.client.get(reverse('nutrition:log:log_plan', kwargs={"plan_pk": 1}))
self.assertEqual(response.status_code, 403)
self.assertEqual(LogItem.objects.filter(plan=plan).count(), 0)
@@ -230,9 +234,11 @@ class AddMealItemUnitTestCase(WgerAddTestCase):
user_fail = 'admin'
object_class = LogItem
url = reverse('nutrition:log:add', kwargs={'plan_pk': 1})
- data = {'amount': 1,
- 'ingredient': 1,
- 'weight_unit': 1}
+ data = {
+ 'amount': 1,
+ 'ingredient': 1,
+ 'weight_unit': 1,
+ }
class DeleteLogEntryTestCase(WgerDeleteTestCase):
@@ -244,12 +250,14 @@ class DeleteLogEntryTestCase(WgerDeleteTestCase):
url = 'nutrition:log:delete'
pk = 2
user_success = 'test'
- user_fail = ('admin',
- 'member1',
- 'member2',
- 'trainer2',
- 'trainer3',
- 'trainer4',
- 'manager3',
- 'general_manager1',
- 'general_manager2')
+ user_fail = (
+ 'admin',
+ 'member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4',
+ 'manager3',
+ 'general_manager1',
+ 'general_manager2',
+ )
diff --git a/wger/nutrition/tests/test_nutritional_cache.py b/wger/nutrition/tests/test_nutritional_cache.py
index 4b73371dc..93ea1c1fc 100644
--- a/wger/nutrition/tests/test_nutritional_cache.py
+++ b/wger/nutrition/tests/test_nutritional_cache.py
@@ -8,7 +8,7 @@ from wger.core.tests.base_testcase import WgerTestCase
from wger.nutrition.models import (
Meal,
MealItem,
- NutritionPlan
+ NutritionPlan,
)
from wger.utils.cache import cache_mapper
diff --git a/wger/nutrition/tests/test_nutritional_calculations.py b/wger/nutrition/tests/test_nutritional_calculations.py
index a61d46ff0..cc2f564cf 100644
--- a/wger/nutrition/tests/test_nutritional_calculations.py
+++ b/wger/nutrition/tests/test_nutritional_calculations.py
@@ -22,7 +22,6 @@ from wger.core.tests.base_testcase import WgerTestCase
from wger.nutrition import models
from wger.utils.constants import TWOPLACES
-
logger = logging.getLogger(__name__)
@@ -76,8 +75,10 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
result_item = item.get_nutritional_values()
for i in result_item:
- self.assertEqual(result_item[i],
- (getattr(ingredient, i) * Decimal(12.0) / 100).quantize(TWOPLACES))
+ self.assertEqual(
+ result_item[i],
+ (getattr(ingredient, i) * Decimal(12.0) / 100).quantize(TWOPLACES),
+ )
result_meal = meal.get_nutritional_values()
self.assertEqual(result_item, result_meal)
@@ -119,8 +120,10 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
result_item3 = item3.get_nutritional_values()
for i in result_item3:
- self.assertEqual(result_item3[i],
- (getattr(ingredient3, i) * Decimal(20.0) / 100).quantize(TWOPLACES))
+ self.assertEqual(
+ result_item3[i],
+ (getattr(ingredient3, i) * Decimal(20.0) / 100).quantize(TWOPLACES),
+ )
result_total[i] = result_total[i] + result_item3[i]
result_meal = meal.get_nutritional_values()
diff --git a/wger/nutrition/tests/test_pdf.py b/wger/nutrition/tests/test_pdf.py
index 26098a6f5..477561920 100644
--- a/wger/nutrition/tests/test_pdf.py
+++ b/wger/nutrition/tests/test_pdf.py
@@ -36,15 +36,19 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):
user = User.objects.get(pk=2)
uid, token = make_token(user)
- response = self.client.get(reverse('nutrition:plan:export-pdf',
- kwargs={'id': 4,
- 'uidb64': uid,
- 'token': token}))
+ response = self.client.get(
+ reverse('nutrition:plan:export-pdf', kwargs={
+ 'id': 4,
+ 'uidb64': uid,
+ 'token': token
+ })
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=nutritional-plan.pdf')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=nutritional-plan.pdf'
+ )
# Approximate size
self.assertGreater(int(response['Content-Length']), 38000)
@@ -56,16 +60,16 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):
"""
# Get a plan
- response = self.client.get(reverse('nutrition:plan:export-pdf',
- kwargs={'id': 4}))
+ response = self.client.get(reverse('nutrition:plan:export-pdf', kwargs={'id': 4}))
if fail:
self.assertIn(response.status_code, (404, 403))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=nutritional-plan.pdf')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=nutritional-plan.pdf'
+ )
# Approximate size
self.assertGreater(int(response['Content-Length']), 38000)
@@ -78,16 +82,16 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):
plan.user = user
plan.language = language
plan.save()
- response = self.client.get(reverse('nutrition:plan:export-pdf',
- kwargs={'id': plan.id}))
+ response = self.client.get(reverse('nutrition:plan:export-pdf', kwargs={'id': plan.id}))
if fail:
self.assertIn(response.status_code, (404, 403))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=nutritional-plan.pdf')
+ self.assertEqual(
+ response['Content-Disposition'], 'attachment; filename=nutritional-plan.pdf'
+ )
# Approximate size
self.assertGreater(int(response['Content-Length']), 38000)
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.py
index 40f90f164..bf6abbf9b 100644
--- a/wger/nutrition/tests/test_plan.py
+++ b/wger/nutrition/tests/test_plan.py
@@ -21,7 +21,7 @@ from wger.core.tests import api_base_test
from wger.core.tests.base_testcase import (
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.nutrition.models import NutritionPlan
@@ -131,6 +131,7 @@ class PlanDailyCaloriesTestCase(WgerTestCase):
"""
Tests the handling of the daily calories in the plan page
"""
+
def test_overview_no_calories(self):
"""
Tests the overview page with no daily calories set
@@ -186,6 +187,5 @@ class PlanApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 4
resource = NutritionPlan
private_resource = True
- special_endpoints = ('nutritional_values',)
- data = {'description': 'The description',
- 'language': 1}
+ special_endpoints = ('nutritional_values', )
+ data = {'description': 'The description', 'language': 1}
diff --git a/wger/nutrition/tests/test_weight_unit.py b/wger/nutrition/tests/test_weight_unit.py
index cb017898e..fa571a84a 100644
--- a/wger/nutrition/tests/test_weight_unit.py
+++ b/wger/nutrition/tests/test_weight_unit.py
@@ -22,7 +22,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.nutrition.models import WeightUnit
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
@@ -80,8 +80,7 @@ class WeightUnitOverviewTestCase(WgerTestCase):
# Add more ingredient units so we can test the pagination
self.user_login('admin')
- data = {"name": "A new, cool unit",
- "language": 2}
+ data = {"name": "A new, cool unit", "language": 2}
for i in range(0, 50):
self.client.post(reverse('nutrition:weight_unit:add'), data)
diff --git a/wger/nutrition/tests/test_weight_unit_ingredient.py b/wger/nutrition/tests/test_weight_unit_ingredient.py
index 12b197f04..627f2f7dc 100644
--- a/wger/nutrition/tests/test_weight_unit_ingredient.py
+++ b/wger/nutrition/tests/test_weight_unit_ingredient.py
@@ -16,7 +16,7 @@
# Django
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
# wger
@@ -25,11 +25,11 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.nutrition.models import (
IngredientWeightUnit,
- WeightUnit
+ WeightUnit,
)
@@ -51,11 +51,12 @@ class AddWeightUnitIngredientTestCase(WgerAddTestCase):
"""
object_class = IngredientWeightUnit
- url = reverse_lazy('nutrition:unit_ingredient:add',
- kwargs={'ingredient_pk': 1})
- data = {'unit': 5,
- 'gram': 123,
- 'amount': 1}
+ url = reverse_lazy('nutrition:unit_ingredient:add', kwargs={'ingredient_pk': 1})
+ data = {
+ 'unit': 5,
+ 'gram': 123,
+ 'amount': 1,
+ }
class DeleteWeightUnitIngredientTestCase(WgerDeleteTestCase):
@@ -76,9 +77,11 @@ class EditWeightUnitTestCase(WgerEditTestCase):
object_class = IngredientWeightUnit
url = 'nutrition:unit_ingredient:edit'
pk = 1
- data = {'unit': 5,
- 'gram': 10,
- 'amount': 0.3}
+ data = {
+ 'unit': 5,
+ 'gram': 10,
+ 'amount': 0.3,
+ }
class WeightUnitFormTestCase(WgerTestCase):
@@ -91,8 +94,9 @@ class WeightUnitFormTestCase(WgerTestCase):
Tests the form in the add view
"""
self.user_login('admin')
- response = self.client.get(reverse('nutrition:unit_ingredient:add',
- kwargs={'ingredient_pk': 1}))
+ response = self.client.get(
+ reverse('nutrition:unit_ingredient:add', kwargs={'ingredient_pk': 1})
+ )
choices = [text for value, text in response.context['form']['unit'].field.choices]
for unit in WeightUnit.objects.all():
@@ -106,8 +110,7 @@ class WeightUnitFormTestCase(WgerTestCase):
Tests that the form in the edit view only shows weight units in the user's language
"""
self.user_login('admin')
- response = self.client.get(reverse('nutrition:unit_ingredient:edit',
- kwargs={'pk': 1}))
+ response = self.client.get(reverse('nutrition:unit_ingredient:edit', kwargs={'pk': 1}))
choices = [text for value, text in response.context['form']['unit'].field.choices]
for unit in WeightUnit.objects.all():
@@ -124,8 +127,10 @@ class WeightUnitToIngredientApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 1
resource = IngredientWeightUnit
private_resource = False
- data = {'amount': '1',
- 'gram': 240,
- 'id': 1,
- 'ingredient': '1',
- 'unit': '1'}
+ data = {
+ 'amount': '1',
+ 'gram': 240,
+ 'id': 1,
+ 'ingredient': '1',
+ 'unit': '1',
+ }
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index ba7b8aa93..45d0217c7 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -18,7 +18,7 @@
# Django
from django.conf.urls import (
include,
- url
+ url,
)
from django.contrib.auth.decorators import login_required
from django.urls import path
@@ -33,188 +33,293 @@ from wger.nutrition.views import (
meal_item,
plan,
unit,
- unit_ingredient
+ unit_ingredient,
)
-
# sub patterns for nutritional plans
patterns_plan = [
- path('overview/',
- plan.overview,
- name='overview'),
- path('add/',
- plan.add,
- name='add'),
- path('<int:id>/view/',
- plan.view,
- name='view'),
- path('<int:pk>/copy/',
- plan.copy,
- name='copy'),
- path('<int:pk>/delete/',
- login_required(plan.PlanDeleteView.as_view()),
- name='delete'),
- path('<int:pk>/edit/',
- login_required(plan.PlanEditView.as_view()),
- name='edit'),
- url(r'^(?P<id>\d+)/pdf/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})',
+ path(
+ 'overview/',
+ plan.overview,
+ name='overview',
+ ),
+ path(
+ 'add/',
+ plan.add,
+ name='add',
+ ),
+ path(
+ '<int:id>/view/',
+ plan.view,
+ name='view',
+ ),
+ path(
+ '<int:pk>/copy/',
+ plan.copy,
+ name='copy',
+ ),
+ path(
+ '<int:pk>/delete/',
+ login_required(plan.PlanDeleteView.as_view()),
+ name='delete',
+ ),
+ path(
+ '<int:pk>/edit/',
+ login_required(plan.PlanEditView.as_view()),
+ name='edit',
+ ),
+ url(
+ r'^(?P<id>\d+)/pdf/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})',
+ plan.export_pdf,
+ name='export-pdf',
+ ),
+ path(
+ '<int:id>/pdf/',
plan.export_pdf,
- name='export-pdf'),
- path('<int:id>/pdf/',
- plan.export_pdf,
- name='export-pdf'),
+ name='export-pdf',
+ ),
]
-
# sub patterns for meals
patterns_meal = [
- path('<int:plan_pk>/meal/add/',
- login_required(meal.MealCreateView.as_view()),
- name='add'),
- path('<int:pk>/edit/',
- login_required(meal.MealEditView.as_view()),
- name='edit'),
- path('<int:id>/delete/',
- meal.delete_meal,
- name='delete'),
+ path(
+ '<int:plan_pk>/meal/add/',
+ login_required(meal.MealCreateView.as_view()),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit/',
+ login_required(meal.MealEditView.as_view()),
+ name='edit',
+ ),
+ path(
+ '<int:id>/delete/',
+ meal.delete_meal,
+ name='delete',
+ ),
]
-
# sub patterns for meal items
patterns_meal_item = [
- path('<int:meal_id>/item/add/',
- login_required(meal_item.MealItemCreateView.as_view()),
- name='add'),
- path('<int:pk>/edit/',
- login_required(meal_item.MealItemEditView.as_view()),
- name='edit'),
- path('<int:item_id>/delete/',
- meal_item.delete_meal_item,
- name='delete'),
+ path(
+ '<int:meal_id>/item/add/',
+ login_required(meal_item.MealItemCreateView.as_view()),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit/',
+ login_required(meal_item.MealItemEditView.as_view()),
+ name='edit',
+ ),
+ path(
+ '<int:item_id>/delete/',
+ meal_item.delete_meal_item,
+ name='delete',
+ ),
]
-
# sub patterns for ingredient
patterns_ingredient = [
- path('<int:pk>/delete/',
- ingredient.IngredientDeleteView.as_view(),
- name='delete'),
- path('<int:pk>/edit/',
- ingredient.IngredientEditView.as_view(),
- name='edit'),
- path('add/',
- login_required(ingredient.IngredientCreateView.as_view()),
- name='add'),
- path('overview/',
- ingredient.IngredientListView.as_view(),
- name='list'),
- path('pending/',
- ingredient.PendingIngredientListView.as_view(),
- name='pending'),
- path('<int:pk>/accept/',
- ingredient.accept,
- name='accept'),
- path('<int:pk>/decline/',
- ingredient.decline,
- name='decline'),
- path('<int:id>/view/',
- ingredient.view,
- name='view'),
- path('<int:id>/view/<slug:slug>/',
- ingredient.view,
- name='view'),
+ path(
+ '<int:pk>/delete/',
+ ingredient.IngredientDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ '<int:pk>/edit/',
+ ingredient.IngredientEditView.as_view(),
+ name='edit',
+ ),
+ path(
+ 'add/',
+ login_required(ingredient.IngredientCreateView.as_view()),
+ name='add',
+ ),
+ path(
+ 'overview/',
+ ingredient.IngredientListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'pending/',
+ ingredient.PendingIngredientListView.as_view(),
+ name='pending',
+ ),
+ path(
+ '<int:pk>/accept/',
+ ingredient.accept,
+ name='accept',
+ ),
+ path(
+ '<int:pk>/decline/',
+ ingredient.decline,
+ name='decline',
+ ),
+ path(
+ '<int:id>/view/',
+ ingredient.view,
+ name='view',
+ ),
+ path(
+ '<int:id>/view/<slug:slug>/',
+ ingredient.view,
+ name='view',
+ ),
]
-
# sub patterns for weight units
patterns_weight_unit = [
- path('list/',
- unit.WeightUnitListView.as_view(),
- name='list'),
- path('add/',
- unit.WeightUnitCreateView.as_view(),
- name='add'),
- path('<int:pk>/delete/',
- unit.WeightUnitDeleteView.as_view(),
- name='delete'),
- path('<int:pk>/edit/',
- unit.WeightUnitUpdateView.as_view(),
- name='edit'),
+ path(
+ 'list/',
+ unit.WeightUnitListView.as_view(),
+ name='list',
+ ),
+ path(
+ 'add/',
+ unit.WeightUnitCreateView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/delete/',
+ unit.WeightUnitDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ '<int:pk>/edit/',
+ unit.WeightUnitUpdateView.as_view(),
+ name='edit',
+ ),
]
-
# sub patterns for weight units / ingredient cross table
patterns_unit_ingredient = [
- path('add/<int:ingredient_pk>/',
- unit_ingredient.WeightUnitIngredientCreateView.as_view(),
- name='add'),
- path('<int:pk>/edit/',
- unit_ingredient.WeightUnitIngredientUpdateView.as_view(),
- name='edit'),
- path('<int:pk>/delete/',
- unit_ingredient.WeightUnitIngredientDeleteView.as_view(),
- name='delete'),
+ path(
+ 'add/<int:ingredient_pk>/',
+ unit_ingredient.WeightUnitIngredientCreateView.as_view(),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit/',
+ unit_ingredient.WeightUnitIngredientUpdateView.as_view(),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete/',
+ unit_ingredient.WeightUnitIngredientDeleteView.as_view(),
+ name='delete',
+ ),
]
-
# sub patterns for BMI calculator
patterns_bmi = [
- path('',
- bmi.view,
- name='view'),
- path('calculate',
- bmi.calculate,
- name='calculate'),
- path('chart-data',
- bmi.chart_data,
- name='chart-data'), # JS
+ path(
+ '',
+ bmi.view,
+ name='view',
+ ),
+ path(
+ 'calculate',
+ bmi.calculate,
+ name='calculate',
+ ),
+ path(
+ 'chart-data',
+ bmi.chart_data,
+ name='chart-data',
+ ), # JS
]
-
# sub patterns for calories calculator
patterns_calories = [
- path('',
- calculator.view,
- name='view'),
- path('bmr',
- calculator.calculate_bmr,
- name='bmr'),
- path('activities',
- calculator.calculate_activities,
- name='activities'), # JS
+ path(
+ '',
+ calculator.view,
+ name='view',
+ ),
+ path(
+ 'bmr',
+ calculator.calculate_bmr,
+ name='bmr',
+ ),
+ path(
+ 'activities',
+ calculator.calculate_activities,
+ name='activities',
+ ), # JS
]
# sub patterns for calories dairy
patterns_diary = [
- path('<int:pk>',
- log.overview,
- name='overview'),
- url(r'^(?P<pk>\d+)/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
+ path(
+ '<int:pk>',
+ log.overview,
+ name='overview',
+ ),
+ url(
+ r'^(?P<pk>\d+)/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
log.detail,
- name='detail'),
- path('entry/<int:pk>/delete',
- log.LogDeleteView.as_view(),
- name='delete'),
- path('plan/<int:plan_pk>/add',
- log.LogCreateView.as_view(),
- name='add'),
- path('log-meal/<int:meal_pk>',
- log.log_meal,
- name='log_meal'),
- path('log-plan/<int:plan_pk>',
- log.log_plan,
- name='log_plan')
+ name='detail',
+ ),
+ path(
+ 'entry/<int:pk>/delete',
+ log.LogDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ 'plan/<int:plan_pk>/add',
+ log.LogCreateView.as_view(),
+ name='add',
+ ),
+ path(
+ 'log-meal/<int:meal_pk>',
+ log.log_meal,
+ name='log_meal',
+ ),
+ path(
+ 'log-plan/<int:plan_pk>',
+ log.log_plan,
+ name='log_plan',
+ )
]
-
urlpatterns = [
- path('', include((patterns_plan, "plan"), namespace="plan")),
- path('meal/', include((patterns_meal, "meal"), namespace="meal")),
- path('meal/item/', include((patterns_meal_item, "meal_item"), namespace="meal_item")),
- path('ingredient/', include((patterns_ingredient, "ingredient"), namespace="ingredient")),
- path('unit/', include((patterns_weight_unit, "weight_unit"), namespace="weight_unit")),
- path('unit-to-ingredient/', include((patterns_unit_ingredient, "unit_ingredient"), namespace="unit_ingredient")),
- path('calculator/bmi/', include((patterns_bmi, "bmi"), namespace="bmi")),
- path('calculator/calories/', include((patterns_calories, "calories"), namespace="calories")),
- path('diary/', include((patterns_diary, "log"), namespace="log")),
+ path('', include(
+ (patterns_plan, "plan"),
+ namespace="plan",
+ )),
+ path('meal/', include(
+ (patterns_meal, "meal"),
+ namespace="meal",
+ )),
+ path('meal/item/', include(
+ (patterns_meal_item, "meal_item"),
+ namespace="meal_item",
+ )),
+ path('ingredient/', include(
+ (patterns_ingredient, "ingredient"),
+ namespace="ingredient",
+ )),
+ path('unit/', include(
+ (patterns_weight_unit, "weight_unit"),
+ namespace="weight_unit",
+ )),
+ path(
+ 'unit-to-ingredient/',
+ include(
+ (patterns_unit_ingredient, "unit_ingredient"),
+ namespace="unit_ingredient",
+ )
+ ),
+ path('calculator/bmi/', include(
+ (patterns_bmi, "bmi"),
+ namespace="bmi",
+ )),
+ path('calculator/calories/', include(
+ (patterns_calories, "calories"),
+ namespace="calories",
+ )),
+ path('diary/', include(
+ (patterns_diary, "log"),
+ namespace="log",
+ )),
]
diff --git a/wger/nutrition/views/bmi.py b/wger/nutrition/views/bmi.py
index f00a8a7da..58bc78848 100644
--- a/wger/nutrition/views/bmi.py
+++ b/wger/nutrition/views/bmi.py
@@ -28,9 +28,7 @@ from django.shortcuts import render
from wger.nutrition.forms import BmiForm
from wger.utils import helpers
-
logger = logging.getLogger(__name__)
-
"""
BMI views
"""
@@ -43,8 +41,10 @@ def view(request):
"""
context = {}
- form_data = {'height': request.user.userprofile.height,
- 'weight': request.user.userprofile.weight}
+ form_data = {
+ 'height': request.user.userprofile.height,
+ 'weight': request.user.userprofile.weight
+ }
context['form'] = BmiForm(initial=form_data)
return render(request, 'bmi/form.html', context)
@@ -65,9 +65,11 @@ def calculate(request):
request.user.userprofile.user_bodyweight(form.cleaned_data['weight'])
bmi = request.user.userprofile.calculate_bmi()
- result = {'bmi': '{0:.2f}'.format(bmi),
- 'weight': form.cleaned_data['weight'],
- 'height': request.user.userprofile.height}
+ result = {
+ 'bmi': '{0:.2f}'.format(bmi),
+ 'weight': form.cleaned_data['weight'],
+ 'height': request.user.userprofile.height,
+ }
data = json.dumps(result, cls=helpers.DecimalJsonEncoder)
# Return the results to the client
@@ -84,63 +86,161 @@ def chart_data(request):
"""
if request.user.userprofile.use_metric:
- data = json.dumps([
- {'key': 'filler', 'height': 150, 'weight': 30},
- {'key': 'filler', 'height': 200, 'weight': 30},
-
- {'key': 'severe_thinness', 'height': 150, 'weight': 35.978},
- {'key': 'severe_thinness', 'height': 200, 'weight': 63.960},
-
- {'key': 'moderate_thinness', 'height': 150, 'weight': 38.228},
- {'key': 'moderate_thinness', 'height': 200, 'weight': 67.960},
-
- {'key': 'mild_thinness', 'height': 150, 'weight': 41.603},
- {'key': 'mild_thinness', 'height': 200, 'weight': 73.960},
-
- {'key': 'normal_range', 'height': 150, 'weight': 56.228},
- {'key': 'normal_range', 'height': 200, 'weight': 99.960},
-
- {'key': 'pre_obese', 'height': 150, 'weight': 67.478},
- {'key': 'pre_obese', 'height': 200, 'weight': 119.960},
-
- {'key': 'obese_class_1', 'height': 150, 'weight': 78.728},
- {'key': 'obese_class_1', 'height': 200, 'weight': 139.960},
-
- {'key': 'obese_class_2', 'height': 150, 'weight': 89.978},
- {'key': 'obese_class_2', 'height': 200, 'weight': 159.960},
-
- {'key': 'obese_class_3', 'height': 150, 'weight': 90},
- {'key': 'obese_class_3', 'height': 200, 'weight': 190}
- ])
+ data = json.dumps(
+ [
+ {
+ 'key': 'filler',
+ 'height': 150,
+ 'weight': 30
+ }, {
+ 'key': 'filler',
+ 'height': 200,
+ 'weight': 30
+ }, {
+ 'key': 'severe_thinness',
+ 'height': 150,
+ 'weight': 35.978
+ }, {
+ 'key': 'severe_thinness',
+ 'height': 200,
+ 'weight': 63.960
+ }, {
+ 'key': 'moderate_thinness',
+ 'height': 150,
+ 'weight': 38.228
+ }, {
+ 'key': 'moderate_thinness',
+ 'height': 200,
+ 'weight': 67.960
+ }, {
+ 'key': 'mild_thinness',
+ 'height': 150,
+ 'weight': 41.603
+ }, {
+ 'key': 'mild_thinness',
+ 'height': 200,
+ 'weight': 73.960
+ }, {
+ 'key': 'normal_range',
+ 'height': 150,
+ 'weight': 56.228
+ }, {
+ 'key': 'normal_range',
+ 'height': 200,
+ 'weight': 99.960
+ }, {
+ 'key': 'pre_obese',
+ 'height': 150,
+ 'weight': 67.478
+ }, {
+ 'key': 'pre_obese',
+ 'height': 200,
+ 'weight': 119.960
+ }, {
+ 'key': 'obese_class_1',
+ 'height': 150,
+ 'weight': 78.728
+ }, {
+ 'key': 'obese_class_1',
+ 'height': 200,
+ 'weight': 139.960
+ }, {
+ 'key': 'obese_class_2',
+ 'height': 150,
+ 'weight': 89.978
+ }, {
+ 'key': 'obese_class_2',
+ 'height': 200,
+ 'weight': 159.960
+ }, {
+ 'key': 'obese_class_3',
+ 'height': 150,
+ 'weight': 90
+ }, {
+ 'key': 'obese_class_3',
+ 'height': 200,
+ 'weight': 190
+ }
+ ]
+ )
else:
- data = json.dumps([
- {'key': 'filler', 'height': 150, 'weight': 66.139},
- {'key': 'filler', 'height': 200, 'weight': 66.139},
-
- {'key': 'severe_thinness', 'height': 150, 'weight': 79.317},
- {'key': 'severe_thinness', 'height': 200, 'weight': 141.008},
-
- {'key': 'moderate_thinness', 'height': 150, 'weight': 84.277},
- {'key': 'moderate_thinness', 'height': 200, 'weight': 149.826},
-
- {'key': 'mild_thinness', 'height': 150, 'weight': 91.718},
- {'key': 'mild_thinness', 'height': 200, 'weight': 163.054},
-
- {'key': 'normal_range', 'height': 150, 'weight': 123.960},
- {'key': 'normal_range', 'height': 200, 'weight': 220.374},
-
- {'key': 'pre_obese', 'height': 150, 'weight': 148.762},
- {'key': 'pre_obese', 'height': 200, 'weight': 264.467},
-
- {'key': 'obese_class_1', 'height': 150, 'weight': 173.564},
- {'key': 'obese_class_1', 'height': 200, 'weight': 308.559},
-
- {'key': 'obese_class_2', 'height': 150, 'weight': 198.366},
- {'key': 'obese_class_2', 'height': 200, 'weight': 352.651},
-
- {'key': 'obese_class_3', 'height': 150, 'weight': 198.416},
- {'key': 'obese_class_3', 'height': 200, 'weight': 352.740}
- ])
+ data = json.dumps(
+ [
+ {
+ 'key': 'filler',
+ 'height': 150,
+ 'weight': 66.139
+ }, {
+ 'key': 'filler',
+ 'height': 200,
+ 'weight': 66.139
+ }, {
+ 'key': 'severe_thinness',
+ 'height': 150,
+ 'weight': 79.317
+ }, {
+ 'key': 'severe_thinness',
+ 'height': 200,
+ 'weight': 141.008
+ }, {
+ 'key': 'moderate_thinness',
+ 'height': 150,
+ 'weight': 84.277
+ }, {
+ 'key': 'moderate_thinness',
+ 'height': 200,
+ 'weight': 149.826
+ }, {
+ 'key': 'mild_thinness',
+ 'height': 150,
+ 'weight': 91.718
+ }, {
+ 'key': 'mild_thinness',
+ 'height': 200,
+ 'weight': 163.054
+ }, {
+ 'key': 'normal_range',
+ 'height': 150,
+ 'weight': 123.960
+ }, {
+ 'key': 'normal_range',
+ 'height': 200,
+ 'weight': 220.374
+ }, {
+ 'key': 'pre_obese',
+ 'height': 150,
+ 'weight': 148.762
+ }, {
+ 'key': 'pre_obese',
+ 'height': 200,
+ 'weight': 264.467
+ }, {
+ 'key': 'obese_class_1',
+ 'height': 150,
+ 'weight': 173.564
+ }, {
+ 'key': 'obese_class_1',
+ 'height': 200,
+ 'weight': 308.559
+ }, {
+ 'key': 'obese_class_2',
+ 'height': 150,
+ 'weight': 198.366
+ }, {
+ 'key': 'obese_class_2',
+ 'height': 200,
+ 'weight': 352.651
+ }, {
+ 'key': 'obese_class_3',
+ 'height': 150,
+ 'weight': 198.416
+ }, {
+ 'key': 'obese_class_3',
+ 'height': 200,
+ 'weight': 352.740
+ }
+ ]
+ )
# Return the results to the client
return HttpResponse(data, 'application/json')
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index 2b5c6f835..60bdf23f8 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -28,12 +28,10 @@ from django.shortcuts import render
from wger.nutrition.forms import (
BmrForm,
DailyCaloriesForm,
- PhysicalActivitiesForm
+ PhysicalActivitiesForm,
)
-
logger = logging.getLogger(__name__)
-
"""
Protein calculator views
"""
@@ -45,14 +43,18 @@ def view(request):
The basal metabolic rate detail page
"""
- form_data = {'age': request.user.userprofile.age,
- 'height': request.user.userprofile.height,
- 'gender': request.user.userprofile.gender,
- 'weight': request.user.userprofile.weight}
+ form_data = {
+ 'age': request.user.userprofile.age,
+ 'height': request.user.userprofile.height,
+ 'gender': request.user.userprofile.gender,
+ 'weight': request.user.userprofile.weight
+ }
- context = {'form': BmrForm(initial=form_data),
- 'form_activities': PhysicalActivitiesForm(instance=request.user.userprofile),
- 'form_calories': DailyCaloriesForm(instance=request.user.userprofile)}
+ context = {
+ 'form': BmrForm(initial=form_data),
+ 'form_activities': PhysicalActivitiesForm(instance=request.user.userprofile),
+ 'form_calories': DailyCaloriesForm(instance=request.user.userprofile)
+ }
return render(request, 'rate/form.html', context)
@@ -99,8 +101,7 @@ def calculate_activities(request):
# Calculate the activities factor and the total calories
factor = request.user.userprofile.calculate_activities()
total = request.user.userprofile.calculate_basal_metabolic_rate() * factor
- result = {'activities': '{0:.0f}'.format(total),
- 'factor': '{0:.2f}'.format(factor)}
+ result = {'activities': '{0:.0f}'.format(total), 'factor': '{0:.2f}'.format(factor)}
data = json.dumps(result)
else:
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index a1fe023eb..c4d3cf46a 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -22,47 +22,46 @@ from django.contrib import messages
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.core.cache import cache
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.urls import reverse_lazy
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
from wger.nutrition.forms import (
IngredientForm,
- UnitChooserForm
+ UnitChooserForm,
)
from wger.nutrition.models import Ingredient
from wger.utils.cache import cache_mapper
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.language import (
load_ingredient_languages,
- load_language
+ load_language,
)
-
logger = logging.getLogger(__name__)
@@ -86,9 +85,7 @@ class IngredientListView(ListView):
native language, see load_ingredient_languages)
"""
languages = load_ingredient_languages(self.request)
- return (Ingredient.objects.accepted()
- .filter(language__in=languages)
- .only('id', 'name'))
+ return (Ingredient.objects.accepted().filter(language__in=languages).only('id', 'name'))
def get_context_data(self, **kwargs):
"""
@@ -107,32 +104,40 @@ def view(request, id, slug=None):
ingredient = get_object_or_404(Ingredient, pk=id)
cache.set(cache_mapper.get_ingredient_key(ingredient), ingredient)
template_data['ingredient'] = ingredient
- template_data['form'] = UnitChooserForm(data={'ingredient_id': ingredient.id,
- 'amount': 100,
- 'unit': None})
+ template_data['form'] = UnitChooserForm(
+ data={
+ 'ingredient_id': ingredient.id,
+ 'amount': 100,
+ 'unit': None
+ }
+ )
template_data['show_shariff'] = True
return render(request, 'ingredient/view.html', template_data)
-class IngredientDeleteView(WgerDeleteMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- DeleteView):
+class IngredientDeleteView(
+ WgerDeleteMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ DeleteView,
+):
"""
Generic view to delete an existing ingredient
"""
model = Ingredient
- fields = ('name',
- 'energy',
- 'protein',
- 'carbohydrates',
- 'carbohydrates_sugar',
- 'fat',
- 'fat_saturated',
- 'fibres',
- 'sodium')
+ fields = (
+ 'name',
+ 'energy',
+ 'protein',
+ 'carbohydrates',
+ 'carbohydrates_sugar',
+ 'fat',
+ 'fat_saturated',
+ 'fibres',
+ 'sodium',
+ )
template_name = 'delete.html'
success_url = reverse_lazy('nutrition:ingredient:list')
messages = gettext_lazy('Successfully deleted')
diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.py
index 4128784f9..e74b43a47 100644
--- a/wger/nutrition/views/log.py
+++ b/wger/nutrition/views/log.py
@@ -21,17 +21,17 @@ import logging
# Django
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.urls import reverse
from django.utils.translation import gettext_lazy
from django.views.generic import (
CreateView,
- DeleteView
+ DeleteView,
)
# wger
@@ -39,15 +39,14 @@ from wger.nutrition.forms import MealLogItemForm
from wger.nutrition.models import (
LogItem,
Meal,
- NutritionPlan
+ NutritionPlan,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
WgerFormMixin,
- WgerPermissionMixin
+ WgerPermissionMixin,
)
-
logger = logging.getLogger(__name__)
@@ -67,15 +66,16 @@ def overview(request, pk):
log_data = []
planned_calories = plan.get_nutritional_values()['total']['energy']
for item in plan.get_log_overview():
- log_data.append({'date': item['date'],
- 'planned_calories': planned_calories,
- 'logged_calories': item['energy'],
- 'difference': item['energy'] - planned_calories})
+ log_data.append(
+ {
+ 'date': item['date'],
+ 'planned_calories': planned_calories,
+ 'logged_calories': item['energy'],
+ 'difference': item['energy'] - planned_calories
+ }
+ )
- context = {'plan': plan,
- 'show_shariff': is_owner,
- 'is_owner': is_owner,
- 'log_data': log_data}
+ context = {'plan': plan, 'show_shariff': is_owner, 'is_owner': is_owner, 'log_data': log_data}
return render(request, 'log/overview.html', context)
@@ -97,19 +97,27 @@ def detail(request, pk, year, month, day):
date = datetime.date(year=int(year), month=int(month), day=int(day))
except ValueError:
date = datetime.date.today()
- return HttpResponseRedirect(reverse('nutrition:log:detail',
- kwargs={'pk': pk,
- 'year': date.year,
- 'month': date.month,
- 'day': date.day}))
-
- context = {'plan': plan,
- 'date': date,
- 'show_shariff': is_owner,
- 'is_owner': is_owner,
- 'log_summary': plan.get_log_summary(date),
- 'log_entries': plan.get_log_entries(date),
- 'nutritional_data': plan.get_nutritional_values()}
+ return HttpResponseRedirect(
+ reverse(
+ 'nutrition:log:detail',
+ kwargs={
+ 'pk': pk,
+ 'year': date.year,
+ 'month': date.month,
+ 'day': date.day
+ }
+ )
+ )
+
+ context = {
+ 'plan': plan,
+ 'date': date,
+ 'show_shariff': is_owner,
+ 'is_owner': is_owner,
+ 'log_summary': plan.get_log_summary(date),
+ 'log_entries': plan.get_log_entries(date),
+ 'nutritional_data': plan.get_nutritional_values()
+ }
return render(request, 'log/detail.html', context)
@@ -129,11 +137,17 @@ def log_meal(request, meal_pk):
_logMealPlan([meal])
date = datetime.date.today()
- return HttpResponseRedirect(reverse('nutrition:log:detail',
- kwargs={'pk': meal.plan_id,
- 'year': date.year,
- 'month': date.month,
- 'day': date.day}))
+ return HttpResponseRedirect(
+ reverse(
+ 'nutrition:log:detail',
+ kwargs={
+ 'pk': meal.plan_id,
+ 'year': date.year,
+ 'month': date.month,
+ 'day': date.day
+ }
+ )
+ )
def log_plan(request, plan_pk):
@@ -157,10 +171,12 @@ def _logMealPlan(meals):
for meal in meals:
for item in meal.mealitem_set.select_related():
- log_item = LogItem(plan=item.meal.plan,
- ingredient=item.ingredient,
- weight_unit=item.weight_unit,
- amount=item.amount)
+ log_item = LogItem(
+ plan=item.meal.plan,
+ ingredient=item.ingredient,
+ weight_unit=item.weight_unit,
+ amount=item.amount
+ )
log_item.save()
@@ -212,13 +228,20 @@ class LogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
title = gettext_lazy('Delete?')
form_action_urlname = 'nutrition:log:delete'
login_required = True
- fields = ["comment", ]
+ fields = [
+ "comment",
+ ]
def get_success_url(self):
"""
Return to the nutrition diary detail page
"""
- return reverse('nutrition:log:detail', kwargs={'pk': self.object.plan.pk,
- 'year': self.object.datetime.year,
- 'month': self.object.datetime.month,
- 'day': self.object.datetime.day})
+ return reverse(
+ 'nutrition:log:detail',
+ kwargs={
+ 'pk': self.object.plan.pk,
+ 'year': self.object.datetime.year,
+ 'month': self.object.datetime.month,
+ 'day': self.object.datetime.day
+ }
+ )
diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.py
index c667520a3..7c2639a2e 100644
--- a/wger/nutrition/views/meal.py
+++ b/wger/nutrition/views/meal.py
@@ -21,30 +21,29 @@ import logging
from django.contrib.auth.decorators import login_required
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import get_object_or_404
from django.utils.translation import gettext_lazy
from django.views.generic import (
CreateView,
- UpdateView
+ UpdateView,
)
# wger
from wger.nutrition.models import (
Meal,
- NutritionPlan
+ NutritionPlan,
)
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
-
# ************************
# Meal functions
# ************************
+
class MealCreateView(WgerFormMixin, CreateView):
"""
Generic view to add a new meal to a nutrition plan
diff --git a/wger/nutrition/views/meal_item.py b/wger/nutrition/views/meal_item.py
index 33c56d988..81172643c 100644
--- a/wger/nutrition/views/meal_item.py
+++ b/wger/nutrition/views/meal_item.py
@@ -21,25 +21,24 @@ import logging
from django.contrib.auth.decorators import login_required
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import gettext_lazy
from django.views.generic import (
CreateView,
- UpdateView
+ UpdateView,
)
# wger
from wger.nutrition.forms import MealItemForm
from wger.nutrition.models import (
Meal,
- MealItem
+ MealItem,
)
from wger.utils.generic_views import WgerFormMixin
-
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 4ac88706e..3d29c8a9f 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -22,24 +22,24 @@ from django.contrib.auth.decorators import login_required
from django.http import (
HttpResponse,
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import (
get_object_or_404,
- render
+ render,
)
from django.template.context_processors import csrf
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
DeleteView,
- UpdateView
+ UpdateView,
)
# Third Party
@@ -50,22 +50,22 @@ from reportlab.platypus import (
Paragraph,
SimpleDocTemplate,
Spacer,
- Table
+ Table,
)
# wger
from wger.nutrition.models import (
MEALITEM_WEIGHT_GRAM,
MEALITEM_WEIGHT_UNIT,
- NutritionPlan
+ NutritionPlan,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.helpers import (
check_token,
- make_token
+ make_token,
)
from wger.utils.language import load_language
from wger.utils.pdf import (
@@ -73,13 +73,11 @@ from wger.utils.pdf import (
header_colour,
render_footer,
row_color,
- styleSheet
+ styleSheet,
)
-
logger = logging.getLogger(__name__)
-
# ************************
# Plan functions
# ************************
@@ -165,10 +163,14 @@ def view(request, id):
log_data = []
planned_calories = plan.get_nutritional_values()['total']['energy']
for item in plan.get_log_overview()[:5]:
- log_data.append({'date': item['date'],
- 'planned_calories': planned_calories,
- 'logged_calories': item['energy'],
- 'difference': item['energy'] - planned_calories})
+ log_data.append(
+ {
+ 'date': item['date'],
+ 'planned_calories': planned_calories,
+ 'logged_calories': item['energy'],
+ 'difference': item['energy'] - planned_calories
+ }
+ )
# Load the language and pass it to the template
language = load_language()
@@ -256,12 +258,14 @@ def export_pdf(request, id, uidb64=None, token=None):
response = HttpResponse(content_type='application/pdf')
# Create the PDF object, using the response object as its "file."
- doc = SimpleDocTemplate(response,
- pagesize=A4,
- title=_('Nutritional plan'),
- author='wger Workout Manager',
- subject=_('Nutritional plan for %s') % request.user.username,
- topMargin=1 * cm,)
+ doc = SimpleDocTemplate(
+ response,
+ pagesize=A4,
+ title=_('Nutritional plan'),
+ author='wger Workout Manager',
+ subject=_('Nutritional plan for %s') % request.user.username,
+ topMargin=1 * cm,
+ )
# container for the 'Flowable' objects
elements = []
@@ -279,15 +283,19 @@ def export_pdf(request, id, uidb64=None, token=None):
meal_markers.append(len(data))
if not meal.time:
- p = Paragraph('<para align="center"><strong>{nr} {meal_nr}</strong></para>'
- .format(nr=_('Nr.'), meal_nr=i),
- styleSheet["SubHeader"])
+ p = Paragraph(
+ '<para align="center"><strong>{nr} {meal_nr}</strong></para>'.format(
+ nr=_('Nr.'), meal_nr=i
+ ), styleSheet["SubHeader"]
+ )
else:
- p = Paragraph('<para align="center"><strong>'
- '{nr} {meal_nr} - {meal_time}'
- '</strong></para>'
- .format(nr=_('Nr.'), meal_nr=i, meal_time=meal.time.strftime("%H:%M")),
- styleSheet["SubHeader"])
+ p = Paragraph(
+ '<para align="center"><strong>'
+ '{nr} {meal_nr} - {meal_time}'
+ '</strong></para>'.format(
+ nr=_('Nr.'), meal_nr=i, meal_time=meal.time.strftime("%H:%M")
+ ), styleSheet["SubHeader"]
+ )
data.append([p])
# Ingredients
@@ -300,8 +308,9 @@ def export_pdf(request, id, uidb64=None, token=None):
else:
unit_name = ' × ' + item.weight_unit.unit.name
- data.append([Paragraph("{0:.0f}{1}".format(item.amount, unit_name),
- styleSheet["Normal"]), p])
+ data.append(
+ [Paragraph("{0:.0f}{1}".format(item.amount, unit_name), styleSheet["Normal"]), p]
+ )
# Add filler
data.append([Spacer(1 * cm, 0.6 * cm)])
@@ -327,8 +336,9 @@ def export_pdf(request, id, uidb64=None, token=None):
# There is nothing to output
else:
- t = Paragraph(_('<i>This is an empty plan, what did you expect on the PDF?</i>'),
- styleSheet["Normal"])
+ t = Paragraph(
+ _('<i>This is an empty plan, what did you expect on the PDF?</i>'), styleSheet["Normal"]
+ )
# Add site logo
elements.append(get_logo())
@@ -337,9 +347,10 @@ def export_pdf(request, id, uidb64=None, token=None):
# Set the title (if available)
if plan.description:
- p = Paragraph('<para align="center"><strong>%(description)s</strong></para>' %
- {'description': plan.description},
- styleSheet["HeaderBold"])
+ p = Paragraph(
+ '<para align="center"><strong>%(description)s</strong></para>' %
+ {'description': plan.description}, styleSheet["HeaderBold"]
+ )
elements.append(p)
# Filler
@@ -351,39 +362,76 @@ def export_pdf(request, id, uidb64=None, token=None):
# Create table with nutritional calculations
data = []
- data.append([Paragraph('<para align="center">{0}</para>'.format(_('Nutritional data')),
- styleSheet["SubHeaderBlack"])])
- data.append([Paragraph(_('Macronutrients'), styleSheet["Normal"]),
- Paragraph(_('Total'), styleSheet["Normal"]),
- Paragraph(_('Percent of energy'), styleSheet["Normal"]),
- Paragraph(_('g per body kg'), styleSheet["Normal"])])
- data.append([Paragraph(_('Energy'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['energy']), styleSheet["Normal"])])
- data.append([Paragraph(_('Protein'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['protein']), styleSheet["Normal"]),
- Paragraph(str(plan_data['percent']['protein']), styleSheet["Normal"]),
- Paragraph(str(plan_data['per_kg']['protein']), styleSheet["Normal"])])
- data.append([Paragraph(_('Carbohydrates'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['carbohydrates']),
- styleSheet["Normal"]),
- Paragraph(str(plan_data['percent']['carbohydrates']),
- styleSheet["Normal"]),
- Paragraph(str(plan_data['per_kg']['carbohydrates']),
- styleSheet["Normal"])])
- data.append([Paragraph(" " + _('Sugar content in carbohydrates'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['carbohydrates_sugar']),
- styleSheet["Normal"])])
- data.append([Paragraph(_('Fat'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['fat']), styleSheet["Normal"]),
- Paragraph(str(plan_data['percent']['fat']), styleSheet["Normal"]),
- Paragraph(str(plan_data['per_kg']['fat']), styleSheet["Normal"])])
- data.append([Paragraph(_('Saturated fat content in fats'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['fat_saturated']),
- styleSheet["Normal"])])
- data.append([Paragraph(_('Fibres'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['fibres']), styleSheet["Normal"])])
- data.append([Paragraph(_('Sodium'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['sodium']), styleSheet["Normal"])])
+ data.append(
+ [
+ Paragraph(
+ '<para align="center">{0}</para>'.format(_('Nutritional data')),
+ styleSheet["SubHeaderBlack"]
+ )
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Macronutrients'), styleSheet["Normal"]),
+ Paragraph(_('Total'), styleSheet["Normal"]),
+ Paragraph(_('Percent of energy'), styleSheet["Normal"]),
+ Paragraph(_('g per body kg'), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Energy'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['energy']), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Protein'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['protein']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['percent']['protein']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['per_kg']['protein']), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Carbohydrates'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['carbohydrates']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['percent']['carbohydrates']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['per_kg']['carbohydrates']), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(" " + _('Sugar content in carbohydrates'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['carbohydrates_sugar']), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Fat'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['fat']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['percent']['fat']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['per_kg']['fat']), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Saturated fat content in fats'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['fat_saturated']), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Fibres'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['fibres']), styleSheet["Normal"])
+ ]
+ )
+ data.append(
+ [
+ Paragraph(_('Sodium'), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total']['sodium']), styleSheet["Normal"])
+ ]
+ )
table_style = []
table_style.append(('BOX', (0, 0), (-1, -1), 1.25, colors.black))
diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.py
index 2e765c5ca..3f9452ad6 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -20,21 +20,21 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.urls import (
reverse,
- reverse_lazy
+ reverse_lazy,
)
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
ListView,
- UpdateView
+ UpdateView,
)
# wger
@@ -42,11 +42,10 @@ from wger.nutrition.models import WeightUnit
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.language import load_language
-
logger = logging.getLogger(__name__)
# ************************
# Weight units functions
@@ -71,10 +70,12 @@ class WeightUnitListView(PermissionRequiredMixin, ListView):
return WeightUnit.objects.filter(language=load_language())
-class WeightUnitCreateView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- CreateView):
+class WeightUnitCreateView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ CreateView,
+):
"""
Generic view to add a new weight unit for ingredients
"""
@@ -92,10 +93,12 @@ class WeightUnitCreateView(WgerFormMixin,
return super(WeightUnitCreateView, self).form_valid(form)
-class WeightUnitDeleteView(WgerDeleteMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- DeleteView):
+class WeightUnitDeleteView(
+ WgerDeleteMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ DeleteView,
+):
"""
Generic view to delete a weight unit
"""
@@ -115,10 +118,12 @@ class WeightUnitDeleteView(WgerDeleteMixin,
return context
-class WeightUnitUpdateView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- UpdateView):
+class WeightUnitUpdateView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ UpdateView,
+):
"""
Generic view to update an weight unit
"""
diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index 9227cf9dc..cec48da44 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -20,11 +20,11 @@ import logging
# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
- PermissionRequiredMixin
+ PermissionRequiredMixin,
)
from django.forms import (
ModelChoiceField,
- ModelForm
+ ModelForm,
)
from django.shortcuts import get_object_or_404
from django.urls import reverse
@@ -32,34 +32,34 @@ from django.utils.translation import gettext_lazy
from django.views.generic import (
CreateView,
DeleteView,
- UpdateView
+ UpdateView,
)
# wger
from wger.nutrition.models import (
Ingredient,
IngredientWeightUnit,
- WeightUnit
+ WeightUnit,
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.language import load_language
-
logger = logging.getLogger(__name__)
-
# ************************
# Weight units to ingredient functions
# ************************
-class WeightUnitIngredientCreateView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- CreateView):
+class WeightUnitIngredientCreateView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ CreateView,
+):
"""
Generic view to add a new weight unit to ingredient entry
"""
@@ -91,10 +91,12 @@ class WeightUnitIngredientCreateView(WgerFormMixin,
return IngredientWeightUnitForm
-class WeightUnitIngredientUpdateView(WgerFormMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- UpdateView):
+class WeightUnitIngredientUpdateView(
+ WgerFormMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ UpdateView,
+):
"""
Generic view to update an weight unit to ingredient entry
"""
@@ -121,10 +123,12 @@ class WeightUnitIngredientUpdateView(WgerFormMixin,
return IngredientWeightUnitForm
-class WeightUnitIngredientDeleteView(WgerDeleteMixin,
- LoginRequiredMixin,
- PermissionRequiredMixin,
- DeleteView):
+class WeightUnitIngredientDeleteView(
+ WgerDeleteMixin,
+ LoginRequiredMixin,
+ PermissionRequiredMixin,
+ DeleteView,
+):
"""
Generic view to delete a weight unit to ingredient entry
"""
diff --git a/wger/settings.tpl b/wger/settings.tpl
index a2c686647..0e9bf434a 100644
--- a/wger/settings.tpl
+++ b/wger/settings.tpl
@@ -4,31 +4,31 @@
# wger
from wger.settings_global import *
-
# Use 'DEBUG = True' to get more details for server errors
DEBUG = True
# List of administrations
-ADMINS = (
- ('Your name', '[email protected]'),
-)
+ADMINS = (('Your name', '[email protected]'), )
MANAGERS = ADMINS
# SERVER_EMAIL = '[email protected]'
# The email address that error messages (and only error messages, such as
# internal server errors) come from, such as those sent to ADMINS and MANAGERS.
-
-DATABASES = {{
- 'default': {{
- 'ENGINE': 'django.db.backends.{dbengine}',
- 'NAME': '{dbname}',
- 'USER': '{dbuser}',
- 'PASSWORD': '{dbpassword}',
- 'HOST': '{dbhost}',
- 'PORT': '{dbport}',
- }}
-}}
+DATABASES = {
+ {
+ 'default': {
+ {
+ 'ENGINE': 'django.db.backends.{dbengine}',
+ 'NAME': '{dbname}',
+ 'USER': '{dbuser}',
+ 'PASSWORD': '{dbpassword}',
+ 'HOST': '{dbhost}',
+ 'PORT': '{dbport}',
+ }
+ }
+ }
+}
# Timezone for this installation. Consult settings_global.py for more information
TIME_ZONE = 'Europe/Berlin'
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 9b1c952d2..4702e661d 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -18,8 +18,6 @@
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os
import re
-
-
"""
This file contains the global settings that don't usually need to be changed.
For a full list of options, visit:
@@ -89,7 +87,6 @@ INSTALLED_APPS = (
'corsheaders',
)
-
MIDDLEWARE = (
'corsheaders.middleware.CorsMiddleware',
'django.middleware.common.CommonMiddleware',
@@ -107,15 +104,13 @@ MIDDLEWARE = (
# Send an appropriate Header so search engines don't index pages
'wger.utils.middleware.RobotsExclusionMiddleware',
-
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.locale.LocaleMiddleware',
)
AUTHENTICATION_BACKENDS = (
- 'django.contrib.auth.backends.ModelBackend',
- 'wger.utils.helpers.EmailAuthBackend'
+ 'django.contrib.auth.backends.ModelBackend', 'wger.utils.helpers.EmailAuthBackend'
)
TEMPLATES = [
@@ -142,7 +137,8 @@ TEMPLATES = [
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
],
- 'debug': False
+ 'debug':
+ False
},
},
]
@@ -158,21 +154,18 @@ STATICFILES_FINDERS = (
'compressor.finders.CompressorFinder',
)
-
#
# Email
#
EMAIL_SUBJECT_PREFIX = '[wger] '
# EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-
#
# Login
#
LOGIN_URL = '/user/login'
LOGIN_REDIRECT_URL = '/'
-
#
# Internationalization
#
@@ -191,36 +184,33 @@ TIME_ZONE = 'UTC'
# Restrict the available languages
LANGUAGES = (
- ('en', 'English'),
- ('de', 'German'),
- ('bg', 'Bulgarian'),
- ('es', 'Spanish'),
- ('ru', 'Russian'),
- ('nl', 'Dutch'),
- ('pt', 'Portuguese'),
- ('el', 'Greek'),
- ('cs', 'Czech'),
- ('sv', 'Swedish'),
- ('no', 'Norwegian'),
- ('fr', 'French'),
- ('it', 'Italian'),
- ('pl', 'Polish'),
- ('uk', 'Ukrainian'),
- ('tr', 'Turkish'),
+ ('en', 'English'),
+ ('de', 'German'),
+ ('bg', 'Bulgarian'),
+ ('es', 'Spanish'),
+ ('ru', 'Russian'),
+ ('nl', 'Dutch'),
+ ('pt', 'Portuguese'),
+ ('el', 'Greek'),
+ ('cs', 'Czech'),
+ ('sv', 'Swedish'),
+ ('no', 'Norwegian'),
+ ('fr', 'French'),
+ ('it', 'Italian'),
+ ('pl', 'Polish'),
+ ('uk', 'Ukrainian'),
+ ('tr', 'Turkish'),
)
# Default language code for this installation.
LANGUAGE_CODE = 'en'
# All translation files are in one place
-LOCALE_PATHS = (
- os.path.join(SITE_ROOT, 'locale'),
-)
+LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'), )
# Primary keys are AutoFields
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-
#
# Logging
# See http://docs.python.org/library/logging.config.html
@@ -248,13 +238,11 @@ LOGGING = {
}
}
-
#
# ReCaptcha
#
RECAPTCHA_USE_SSL = True
-
#
# Cache
#
@@ -276,20 +264,43 @@ CRISPY_TEMPLATE_PACK = 'bootstrap4'
#
THUMBNAIL_ALIASES = {
'': {
- 'micro': {'size': (30, 30)},
- 'micro_cropped': {'size': (30, 30), 'crop': 'smart'},
-
- 'thumbnail': {'size': (80, 80)},
- 'thumbnail_cropped': {'size': (80, 80), 'crop': 'smart'},
-
- 'small': {'size': (200, 200)},
- 'small_cropped': {'size': (200, 200), 'crop': 'smart'},
-
- 'medium': {'size': (400, 400)},
- 'medium_cropped': {'size': (400, 400), 'crop': 'smart'},
-
- 'large': {'size': (800, 800), 'quality': 90},
- 'large_cropped': {'size': (800, 800), 'crop': 'smart', 'quality': 90},
+ 'micro': {
+ 'size': (30, 30)
+ },
+ 'micro_cropped': {
+ 'size': (30, 30),
+ 'crop': 'smart'
+ },
+ 'thumbnail': {
+ 'size': (80, 80)
+ },
+ 'thumbnail_cropped': {
+ 'size': (80, 80),
+ 'crop': 'smart'
+ },
+ 'small': {
+ 'size': (200, 200)
+ },
+ 'small_cropped': {
+ 'size': (200, 200),
+ 'crop': 'smart'
+ },
+ 'medium': {
+ 'size': (400, 400)
+ },
+ 'medium_cropped': {
+ 'size': (400, 400),
+ 'crop': 'smart'
+ },
+ 'large': {
+ 'size': (800, 800),
+ 'quality': 90
+ },
+ 'large_cropped': {
+ 'size': (800, 800),
+ 'crop': 'smart',
+ 'quality': 90
+ },
},
}
@@ -312,13 +323,25 @@ if USE_S3:
COMPRESS_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
COMPRESS_OFFLINE = True
COMPRESS_OFFLINE_CONTEXT = [
- {'request': {'user_agent': {'is_mobile': True}}, 'STATIC_URL': STATIC_URL},
- {'request': {'user_agent': {'is_mobile': False}}, 'STATIC_URL': STATIC_URL}
+ {
+ 'request': {
+ 'user_agent': {
+ 'is_mobile': True
+ }
+ },
+ 'STATIC_URL': STATIC_URL
+ }, {
+ 'request': {
+ 'user_agent': {
+ 'is_mobile': False
+ }
+ },
+ 'STATIC_URL': STATIC_URL
+ }
]
else:
STATIC_URL = '/static/'
-
#
# Django compressor
#
@@ -326,8 +349,7 @@ else:
# The default is not DEBUG, override if needed
# COMPRESS_ENABLED = True
COMPRESS_CSS_FILTERS = (
- 'compressor.filters.css_default.CssAbsoluteFilter',
- 'compressor.filters.cssmin.rCSSMinFilter'
+ 'compressor.filters.css_default.CssAbsoluteFilter', 'compressor.filters.cssmin.rCSSMinFilter'
)
COMPRESS_JS_FILTERS = [
'compressor.filters.jsmin.JSMinFilter',
@@ -339,26 +361,27 @@ COMPRESS_ROOT = STATIC_ROOT
# Django Rest Framework
#
REST_FRAMEWORK = {
- 'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission',),
- 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
- 'PAGE_SIZE': 20,
- 'PAGINATE_BY_PARAM': 'limit', # Allow client to override, using `?limit=xxx`.
- 'TEST_REQUEST_DEFAULT_FORMAT': 'json',
+ 'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission', ),
+ 'DEFAULT_PAGINATION_CLASS':
+ 'rest_framework.pagination.LimitOffsetPagination',
+ 'PAGE_SIZE':
+ 20,
+ 'PAGINATE_BY_PARAM':
+ 'limit', # Allow client to override, using `?limit=xxx`.
+ 'TEST_REQUEST_DEFAULT_FORMAT':
+ 'json',
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.SessionAuthentication',
'rest_framework.authentication.TokenAuthentication',
),
- 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',
- 'rest_framework.filters.OrderingFilter'),
- 'DEFAULT_THROTTLE_CLASSES': [
- 'rest_framework.throttling.ScopedRateThrottle'
- ],
+ 'DEFAULT_FILTER_BACKENDS':
+ ('django_filters.rest_framework.DjangoFilterBackend', 'rest_framework.filters.OrderingFilter'),
+ 'DEFAULT_THROTTLE_CLASSES': ['rest_framework.throttling.ScopedRateThrottle'],
'DEFAULT_THROTTLE_RATES': {
'login': '3/min'
}
}
-
#
# CORS headers: allow all hosts to access the API
#
@@ -368,9 +391,7 @@ CORS_URLS_REGEX = r'^/api/.*$'
#
# Ignore these URLs if they cause 404
#
-IGNORABLE_404_URLS = (
- re.compile(r'^/favicon\.ico$'),
-)
+IGNORABLE_404_URLS = (re.compile(r'^/favicon\.ico$'), )
#
# Password rules
diff --git a/wger/software/__init__.py b/wger/software/__init__.py
index 46a91e9bd..dfedb2e6f 100644
--- a/wger/software/__init__.py
+++ b/wger/software/__init__.py
@@ -15,9 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
diff --git a/wger/software/urls.py b/wger/software/urls.py
index eb2fd1b28..039f85b0f 100644
--- a/wger/software/urls.py
+++ b/wger/software/urls.py
@@ -18,39 +18,46 @@
from django.urls import path
from django.views.generic import (
RedirectView,
- TemplateView
+ TemplateView,
)
# wger
from wger.software import views
-
urlpatterns = [
-
- path('issues',
- TemplateView.as_view(template_name="issues.html"),
- name='issues'),
- path('terms-of-service',
- TemplateView.as_view(template_name="tos.html"),
- name='tos'),
-
- path('features',
- views.features,
- name='features'),
-
- path('license',
- TemplateView.as_view(template_name="license.html"),
- name='license'),
-
- path('code',
- RedirectView.as_view(permanent=True, url='https://github.com/wger-project/wger'),
- name='code'),
-
- path('contribute',
- TemplateView.as_view(template_name="contribute.html"),
- name='contribute'),
-
- path('api',
- TemplateView.as_view(template_name="api.html"),
- name='api'),
+ path(
+ 'issues',
+ TemplateView.as_view(template_name="issues.html"),
+ name='issues',
+ ),
+ path(
+ 'terms-of-service',
+ TemplateView.as_view(template_name="tos.html"),
+ name='tos',
+ ),
+ path(
+ 'features',
+ views.features,
+ name='features',
+ ),
+ path(
+ 'license',
+ TemplateView.as_view(template_name="license.html"),
+ name='license',
+ ),
+ path(
+ 'code',
+ RedirectView.as_view(permanent=True, url='https://github.com/wger-project/wger'),
+ name='code',
+ ),
+ path(
+ 'contribute',
+ TemplateView.as_view(template_name="contribute.html"),
+ name='contribute',
+ ),
+ path(
+ 'api',
+ TemplateView.as_view(template_name="api.html"),
+ name='api',
+ ),
]
diff --git a/wger/software/views.py b/wger/software/views.py
index 2738f375c..a925f09d3 100644
--- a/wger/software/views.py
+++ b/wger/software/views.py
@@ -21,7 +21,6 @@ import logging
from django.conf import settings
from django.shortcuts import render
-
logger = logging.getLogger(__name__)
@@ -30,6 +29,8 @@ def features(request):
Render the features page
"""
- context = {'allow_registration': settings.WGER_SETTINGS['ALLOW_REGISTRATION'],
- 'allow_guest_users': settings.WGER_SETTINGS['ALLOW_GUEST_USERS']}
+ context = {
+ 'allow_registration': settings.WGER_SETTINGS['ALLOW_REGISTRATION'],
+ 'allow_guest_users': settings.WGER_SETTINGS['ALLOW_GUEST_USERS']
+ }
return render(request, 'features.html', context)
diff --git a/wger/urls.py b/wger/urls.py
index 21e683579..ce7288168 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -23,7 +23,7 @@ from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.sitemaps.views import (
index,
- sitemap
+ sitemap,
)
from django.urls import path
@@ -41,10 +41,8 @@ from wger.nutrition.sitemap import NutritionSitemap
from wger.utils.generic_views import TextTemplateView
from wger.weight.api import views as weight_api_views
-
#admin.autodiscover()
-
#
# REST API
#
@@ -59,7 +57,9 @@ router.register(r'day', manager_api_views.DayViewSet, basename='day')
router.register(r'set', manager_api_views.SetViewSet, basename='Set')
router.register(r'setting', manager_api_views.SettingViewSet, basename='Setting')
router.register(r'workout', manager_api_views.WorkoutViewSet, basename='workout')
-router.register(r'workoutsession', manager_api_views.WorkoutSessionViewSet, basename='workoutsession')
+router.register(
+ r'workoutsession', manager_api_views.WorkoutSessionViewSet, basename='workoutsession'
+)
router.register(r'workoutlog', manager_api_views.WorkoutLogViewSet, basename='workoutlog')
router.register(r'schedulestep', manager_api_views.ScheduleStepViewSet, basename='schedulestep')
router.register(r'schedule', manager_api_views.ScheduleViewSet, basename='schedule')
@@ -69,25 +69,49 @@ router.register(r'daysofweek', core_api_views.DaysOfWeekViewSet, basename='dayso
router.register(r'language', core_api_views.LanguageViewSet, basename='language')
router.register(r'license', core_api_views.LicenseViewSet, basename='license')
router.register(r'userprofile', core_api_views.UserProfileViewSet, basename='userprofile')
-router.register(r'setting-repetitionunit', core_api_views.RepetitionUnitViewSet, basename='setting-repetition-unit')
-router.register(r'setting-weightunit', core_api_views.WeightUnitViewSet, basename='setting-weight-unit')
+router.register(
+ r'setting-repetitionunit',
+ core_api_views.RepetitionUnitViewSet,
+ basename='setting-repetition-unit'
+)
+router.register(
+ r'setting-weightunit', core_api_views.WeightUnitViewSet, basename='setting-weight-unit'
+)
# Exercises app
router.register(r'exerciseinfo', exercises_api_views.ExerciseInfoViewset, basename='exerciseinfo')
router.register(r'exercise', exercises_api_views.ExerciseViewSet, basename='exercise')
router.register(r'equipment', exercises_api_views.EquipmentViewSet, basename='api')
-router.register(r'exercisecategory', exercises_api_views.ExerciseCategoryViewSet, basename='exercisecategory')
-router.register(r'exerciseimage', exercises_api_views.ExerciseImageViewSet, basename='exerciseimage')
-router.register(r'exercisecomment', exercises_api_views.ExerciseCommentViewSet, basename='exercisecomment')
+router.register(
+ r'exercisecategory', exercises_api_views.ExerciseCategoryViewSet, basename='exercisecategory'
+)
+router.register(
+ r'exerciseimage', exercises_api_views.ExerciseImageViewSet, basename='exerciseimage'
+)
+router.register(
+ r'exercisecomment', exercises_api_views.ExerciseCommentViewSet, basename='exercisecomment'
+)
router.register(r'muscle', exercises_api_views.MuscleViewSet, basename='muscle')
# Nutrition app
router.register(r'ingredient', nutrition_api_views.IngredientViewSet, basename='api-ingredient')
-router.register(r'ingredientinfo', nutrition_api_views.IngredientInfoViewSet, basename='api-ingredientinfo')
+router.register(
+ r'ingredientinfo', nutrition_api_views.IngredientInfoViewSet, basename='api-ingredientinfo'
+)
router.register(r'weightunit', nutrition_api_views.WeightUnitViewSet, basename='weightunit')
-router.register(r'ingredientweightunit', nutrition_api_views.IngredientWeightUnitViewSet, basename='ingredientweightunit')
-router.register(r'nutritionplan', nutrition_api_views.NutritionPlanViewSet, basename='nutritionplan')
-router.register(r'nutritionplaninfo', nutrition_api_views.NutritionPlanInfoViewSet, basename='nutritionplaninfo')
+router.register(
+ r'ingredientweightunit',
+ nutrition_api_views.IngredientWeightUnitViewSet,
+ basename='ingredientweightunit'
+)
+router.register(
+ r'nutritionplan', nutrition_api_views.NutritionPlanViewSet, basename='nutritionplan'
+)
+router.register(
+ r'nutritionplaninfo',
+ nutrition_api_views.NutritionPlanInfoViewSet,
+ basename='nutritionplaninfo'
+)
router.register(r'nutritiondiary', nutrition_api_views.LogItemViewSet, basename='nutritiondiary')
router.register(r'meal', nutrition_api_views.MealViewSet, basename='meal')
router.register(r'mealitem', nutrition_api_views.MealItemViewSet, basename='mealitem')
@@ -101,8 +125,7 @@ router.register(r'gallery', gallery_api_views.ImageViewSet, basename='gallery')
#
# Sitemaps
#
-sitemaps = {'exercises': ExercisesSitemap,
- 'nutrition': NutritionSitemap}
+sitemaps = {'exercises': ExercisesSitemap, 'nutrition': NutritionSitemap}
#
# The actual URLs
@@ -120,41 +143,41 @@ urlpatterns = i18n_patterns(
path('gallery/', include(('wger.gallery.urls', 'gallery'), namespace='gallery')),
path('email', include(('wger.mailer.urls', 'email'), namespace='email')),
path('sitemap.xml', index, {'sitemaps': sitemaps}, name='sitemap'),
- path('sitemap-<section>.xml',
- sitemap, {'sitemaps': sitemaps},
- name='django.contrib.sitemaps.views.sitemap')
+ path(
+ 'sitemap-<section>.xml',
+ sitemap, {'sitemaps': sitemaps},
+ name='django.contrib.sitemaps.views.sitemap'
+ )
)
#
# URLs without language prefix
#
urlpatterns += [
- path('robots.txt',
- TextTemplateView.as_view(template_name="robots.txt"),
- name='robots'),
+ path('robots.txt', TextTemplateView.as_view(template_name="robots.txt"), name='robots'),
# API
- path('api/v2/exercise/search/',
- exercises_api_views.search,
- name='exercise-search'),
- path('api/v2/exerciseinfo/search/',
- exercises_api_views.search,
- name='exercise-info'),
- path('api/v2/ingredient/search/',
- nutrition_api_views.search,
- name='ingredient-search'),
+ path('api/v2/exercise/search/', exercises_api_views.search, name='exercise-search'),
+ path('api/v2/exerciseinfo/search/', exercises_api_views.search, name='exercise-info'),
+ path('api/v2/ingredient/search/', nutrition_api_views.search, name='ingredient-search'),
path('api/v2/', include(router.urls)),
# The api user login
- path('api/v2/login/', core_api_views.UserAPILoginView.as_view({
- 'post': 'post'}), name='api_user'),
- path('api/v2/register/', core_api_views.UserAPIRegistrationViewSet.as_view({
- 'post': 'post'}), name='api_register'),
+ path(
+ 'api/v2/login/', core_api_views.UserAPILoginView.as_view({'post': 'post'}), name='api_user'
+ ),
+ path(
+ 'api/v2/register/',
+ core_api_views.UserAPIRegistrationViewSet.as_view({'post': 'post'}),
+ name='api_register'
+ ),
# Others
- path('api/v2/version/', core_api_views.ApplicationVersionView.as_view({
- 'get': 'get'}), name='app_version'),
-
+ path(
+ 'api/v2/version/',
+ core_api_views.ApplicationVersionView.as_view({'get': 'get'}),
+ name='app_version'
+ ),
]
#
diff --git a/wger/utils/__init__.py b/wger/utils/__init__.py
index 46a91e9bd..dfedb2e6f 100644
--- a/wger/utils/__init__.py
+++ b/wger/utils/__init__.py
@@ -15,9 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
diff --git a/wger/utils/api_token.py b/wger/utils/api_token.py
index 721994f7b..46422a6d1 100644
--- a/wger/utils/api_token.py
+++ b/wger/utils/api_token.py
@@ -18,7 +18,6 @@ import logging
# Third Party
from rest_framework.authtoken.models import Token
-
logger = logging.getLogger(__name__)
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 700fd7398..79d4974fa 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -19,7 +19,6 @@ import logging
from django.core.cache import cache
from django.core.cache.utils import make_template_fragment_key
-
logger = logging.getLogger(__name__)
diff --git a/wger/utils/constants.py b/wger/utils/constants.py
index 81f19390c..21c97f1c6 100644
--- a/wger/utils/constants.py
+++ b/wger/utils/constants.py
@@ -17,7 +17,6 @@
# Standard Library
from decimal import Decimal
-
# Navigation
WORKOUT_TAB = 'workout'
EXERCISE_TAB = 'exercises'
@@ -31,30 +30,21 @@ TWOPLACES = Decimal('0.01')
FOURPLACES = Decimal('0.0001')
# Valid date formats
-DATE_FORMATS = ['%d.%m.%Y', # '25.10.2012'
- '%d.%m.%y', # '25.10.12'
-
- '%m/%d/%Y', # '10/25/2012'
- '%m/%d/%y', # '10/25/12'
-
- '%Y-%m-%d', # '2012-10-25'
- ]
+DATE_FORMATS = [
+ '%d.%m.%Y', # '25.10.2012'
+ '%d.%m.%y', # '25.10.12'
+ '%m/%d/%Y', # '10/25/2012'
+ '%m/%d/%y', # '10/25/12'
+ '%Y-%m-%d', # '2012-10-25'
+]
# Allowed tags, attributes and styles allowed in textareas edited with a JS
# editor. Everything not in these whitelists is stripped.
-HTML_TAG_WHITELIST = ('strong',
- 'em',
- 'ul',
- 'ol',
- 'li',
- 'p')
-
-HTML_ATTRIBUTES_WHITELIST = {
- '*': 'style'
-}
+HTML_TAG_WHITELIST = ('strong', 'em', 'ul', 'ol', 'li', 'p')
-HTML_STYLES_WHITELIST = ('text-decoration',)
+HTML_ATTRIBUTES_WHITELIST = {'*': 'style'}
+HTML_STYLES_WHITELIST = ('text-decoration', )
# Pagination
PAGINATION_OBJECTS_PER_PAGE = 25
diff --git a/wger/utils/fields.py b/wger/utils/fields.py
index f4df2ee15..19ac76f24 100644
--- a/wger/utils/fields.py
+++ b/wger/utils/fields.py
@@ -21,10 +21,9 @@ from django.db import models
# wger
from wger.utils.widgets import (
Html5FormDateField,
- Html5FormTimeField
+ Html5FormTimeField,
)
-
logger = logging.getLogger(__name__)
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index f5c24cb21..7af15faa7 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -22,7 +22,7 @@ from django.contrib import messages
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.http import (
HttpResponseForbidden,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.urls import reverse_lazy
from django.utils.text import slugify
@@ -36,17 +36,16 @@ from crispy_forms.helper import FormHelper
from crispy_forms.layout import (
ButtonHolder,
Layout,
- Submit
+ Submit,
)
# wger
from wger.utils.constants import (
HTML_ATTRIBUTES_WHITELIST,
HTML_STYLES_WHITELIST,
- HTML_TAG_WHITELIST
+ HTML_TAG_WHITELIST,
)
-
logger = logging.getLogger(__name__)
@@ -91,8 +90,9 @@ class WgerPermissionMixin(object):
if self.login_required or self.permission_required:
if not request.user.is_authenticated:
- return HttpResponseRedirect(reverse_lazy('core:user:login')
- + '?next={0}'.format(request.path))
+ return HttpResponseRedirect(
+ reverse_lazy('core:user:login') + '?next={0}'.format(request.path)
+ )
if self.permission_required:
has_permission = False
@@ -183,7 +183,8 @@ class WgerFormMixin(ModelFormMixin):
# For new objects, we have to manually load the owner object
if self.owner_object:
owner_object = self.owner_object['class'].objects.get(
- pk=kwargs[self.owner_object['pk']])
+ pk=kwargs[self.owner_object['pk']]
+ )
else:
# On CreateViews we don't have an object, so just ignore it
try:
@@ -234,11 +235,16 @@ class WgerFormMixin(ModelFormMixin):
"""
for field in self.clean_html:
- setattr(form.instance, field, bleach.clean(getattr(form.instance, field),
- tags=HTML_TAG_WHITELIST,
- attributes=HTML_ATTRIBUTES_WHITELIST,
- styles=HTML_STYLES_WHITELIST,
- strip=True))
+ setattr(
+ form.instance, field,
+ bleach.clean(
+ getattr(form.instance, field),
+ tags=HTML_TAG_WHITELIST,
+ attributes=HTML_ATTRIBUTES_WHITELIST,
+ styles=HTML_STYLES_WHITELIST,
+ strip=True
+ )
+ )
if self.get_messages():
messages.success(self.request, self.get_messages())
@@ -280,9 +286,7 @@ class WgerDeleteMixin(ModelFormMixin):
form.helper.form_method = 'post'
form.helper.form_action = self.request.path
form.helper.layout = Layout(
- ButtonHolder(
- Submit('submit', self.delete_message, css_class='btn-warning btn-block')
- )
+ ButtonHolder(Submit('submit', self.delete_message, css_class='btn-warning btn-block'))
)
return form
@@ -327,6 +331,7 @@ class TextTemplateView(TemplateView):
"""
A regular templateView that sets the mime type as text/plain
"""
+
def dispatch(self, request, *args, **kwargs):
resp = super().dispatch(request, args, kwargs)
resp['Content-Type'] = 'text/plain'
diff --git a/wger/utils/helpers.py b/wger/utils/helpers.py
index 9a30e5004..805e55ad3 100644
--- a/wger/utils/helpers.py
+++ b/wger/utils/helpers.py
@@ -32,10 +32,9 @@ from django.shortcuts import get_object_or_404
from django.utils.encoding import force_bytes
from django.utils.http import (
urlsafe_base64_decode,
- urlsafe_base64_encode
+ urlsafe_base64_encode,
)
-
logger = logging.getLogger(__name__)
@@ -65,6 +64,7 @@ class DecimalJsonEncoder(json.JSONEncoder):
individual weight entries in the workout log) and they need to be
processed, json.dumps() doesn't work on them
"""
+
def default(self, obj):
if isinstance(obj, decimal.Decimal):
return str(obj)
@@ -79,12 +79,14 @@ def disable_for_loaddata(signal_handler):
post_connect signals. See also:
http://stackoverflow.com/questions/3499791/how-do-i-prevent-fixtures-from-conflicting
"""
+
@wraps(signal_handler)
def wrapper(*args, **kwargs):
if kwargs['raw']:
# print "Skipping signal for {0} {1}".format(args, kwargs)
return
signal_handler(*args, **kwargs)
+
return wrapper
@@ -210,7 +212,7 @@ def normalize_decimal(d):
normalized = d.normalize()
sign, digits, exponent = normalized.as_tuple()
if exponent > 0:
- return decimal.Decimal((sign, digits + (0,) * exponent, 0))
+ return decimal.Decimal((sign, digits + (0, ) * exponent, 0))
else:
return normalized
diff --git a/wger/utils/language.py b/wger/utils/language.py
index 86b2fd7a0..add94d9fb 100644
--- a/wger/utils/language.py
+++ b/wger/utils/language.py
@@ -25,10 +25,8 @@ from wger.config.models import LanguageConfig
from wger.core.models import Language
from wger.utils.cache import cache_mapper
-
logger = logging.getLogger(__name__)
-
# ************************
# Language functions
# ************************
diff --git a/wger/utils/managers.py b/wger/utils/managers.py
index f70717b7e..ae0d4363e 100644
--- a/wger/utils/managers.py
+++ b/wger/utils/managers.py
@@ -19,8 +19,6 @@ from django.db.models.query import QuerySet
# wger
from wger.utils.models import AbstractSubmissionModel
-
-
"""
Custom managers and querysets
"""
@@ -30,6 +28,7 @@ Custom managers and querysets
class SubmissionQuerySet(QuerySet):
+
def accepted(self):
return self.filter(status=AbstractSubmissionModel.STATUS_ACCEPTED)
@@ -38,6 +37,7 @@ class SubmissionQuerySet(QuerySet):
class SubmissionManager(models.Manager):
+
def get_queryset(self):
return SubmissionQuerySet(self.model, using=self._db)
diff --git a/wger/utils/middleware.py b/wger/utils/middleware.py
index 3f185b1c9..d24d509da 100644
--- a/wger/utils/middleware.py
+++ b/wger/utils/middleware.py
@@ -11,7 +11,6 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-
"""
Custom middleware
"""
@@ -29,11 +28,9 @@ from django.utils.functional import SimpleLazyObject
# wger
from wger.core.demo import create_temporary_user
-
logger = logging.getLogger(__name__)
-
-SPECIAL_PATHS = ('dashboard',)
+SPECIAL_PATHS = ('dashboard', )
def check_current_request(request):
@@ -84,6 +81,7 @@ class WgerAuthenticationMiddleware(MiddlewareMixin):
a new user with a temporary flag if the user hits certain URLs that need
a logged in user
"""
+
def process_request(self, request):
assert hasattr(request, 'session'), "The Django authentication middleware requires "
"session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert"
@@ -97,6 +95,7 @@ class RobotsExclusionMiddleware(MiddlewareMixin):
Simple middleware that sends the "X-Robots-Tag" tag for the URLs used in
our WgerAuthenticationMiddleware so that those pages are not indexed.
"""
+
def process_response(self, request, response):
# Don't set it if it's already in the response
if check_current_request(request) and response.get('X-Robots-Tag', None) is None:
diff --git a/wger/utils/models.py b/wger/utils/models.py
index a9daab516..01fb0630f 100644
--- a/wger/utils/models.py
+++ b/wger/utils/models.py
@@ -20,8 +20,6 @@ from django.utils.translation import gettext_lazy as _
# wger
from wger.core.models import License
-
-
"""
Abstract model classes
"""
@@ -35,19 +33,25 @@ class AbstractLicenseModel(models.Model):
class Meta:
abstract = True
- license = models.ForeignKey(License,
- verbose_name=_('License'),
- default=2,
- on_delete=models.CASCADE)
+ license = models.ForeignKey(
+ License,
+ verbose_name=_('License'),
+ default=2,
+ on_delete=models.CASCADE,
+ )
"""The item's license"""
- license_author = models.CharField(verbose_name=_('Author'),
- max_length=50,
- blank=True,
- null=True,
- help_text=_('If you are not the author, enter the name or '
- 'source here. This is needed for some licenses '
- 'e.g. the CC-BY-SA.'))
+ license_author = models.CharField(
+ verbose_name=_('Author'),
+ max_length=50,
+ blank=True,
+ null=True,
+ help_text=_(
+ 'If you are not the author, enter the name or '
+ 'source here. This is needed for some licenses '
+ 'e.g. the CC-BY-SA.'
+ )
+ )
"""The author if it is not the uploader"""
@@ -73,8 +77,10 @@ class AbstractSubmissionModel(models.Model):
(STATUS_DECLINED, _('Declined')),
)
- status = models.CharField(max_length=2,
- choices=STATUS,
- default=STATUS_PENDING,
- editable=False)
+ status = models.CharField(
+ max_length=2,
+ choices=STATUS,
+ default=STATUS_PENDING,
+ editable=False,
+ )
"""Status of the submission, e.g. accepted or declined"""
diff --git a/wger/utils/pdf.py b/wger/utils/pdf.py
index f0f5388b6..b098860cc 100644
--- a/wger/utils/pdf.py
+++ b/wger/utils/pdf.py
@@ -26,21 +26,20 @@ from reportlab.lib import colors
from reportlab.lib.colors import HexColor
from reportlab.lib.styles import (
ParagraphStyle,
- StyleSheet1
+ StyleSheet1,
)
from reportlab.lib.units import cm
from reportlab.pdfbase import pdfmetrics
from reportlab.pdfbase.ttfonts import TTFont
from reportlab.platypus import (
Image,
- Paragraph
+ Paragraph,
)
# wger
from wger import get_version
from wger.core.models import Language
-
# ************************
# Language functions
# ************************
@@ -78,7 +77,7 @@ def load_ingredient_languages(request):
"""
language = load_language()
- languages = (language.id,)
+ languages = (language.id, )
# Only registered users have a profile
if request.user.is_authenticated:
@@ -100,15 +99,15 @@ def render_footer(url, date=None):
if not date:
date = datetime.date.today().strftime("%d.%m.%Y")
- p = Paragraph("""<para>
+ p = Paragraph(
+ """<para>
{date} -
<a href="{url}">{url}</a> -
wger Workout Manager
{version}
- </para>""".format(date=date,
- url=url,
- version=get_version()),
- styleSheet["Normal"])
+ </para>""".format(date=date, url=url, version=get_version()),
+ styleSheet["Normal"]
+ )
return p
@@ -123,51 +122,68 @@ def get_logo(width=1.5):
# register new truetype fonts for reportlab
-pdfmetrics.registerFont(TTFont(
- 'OpenSans', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-Light.ttf')))
-pdfmetrics.registerFont(TTFont(
- 'OpenSans-Bold', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-Bold.ttf')))
-pdfmetrics.registerFont(TTFont(
- 'OpenSans-Regular', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-Regular.ttf')))
-pdfmetrics.registerFont(TTFont(
- 'OpenSans-Italic', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-LightItalic.ttf')))
+pdfmetrics.registerFont(
+ TTFont('OpenSans', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-Light.ttf'))
+)
+pdfmetrics.registerFont(
+ TTFont('OpenSans-Bold', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-Bold.ttf'))
+)
+pdfmetrics.registerFont(
+ TTFont(
+ 'OpenSans-Regular', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-Regular.ttf')
+ )
+)
+pdfmetrics.registerFont(
+ TTFont(
+ 'OpenSans-Italic',
+ path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-LightItalic.ttf')
+ )
+)
styleSheet = StyleSheet1()
styleSheet.add(ParagraphStyle(
- name='Normal',
- fontName='OpenSans',
- fontSize=10,
- leading=12,
- ))
-styleSheet.add(ParagraphStyle(
- parent=styleSheet['Normal'],
- fontSize=8,
- name='Small',
- ))
-styleSheet.add(ParagraphStyle(
- parent=styleSheet['Normal'],
- fontSize=7,
- name='ExerciseComments',
- fontName='OpenSans-Italic',
- ))
+ name='Normal',
+ fontName='OpenSans',
+ fontSize=10,
+ leading=12,
+))
styleSheet.add(ParagraphStyle(
- parent=styleSheet['Normal'],
- name='HeaderBold',
- fontSize=16,
- fontName='OpenSans-Bold',
- ))
-styleSheet.add(ParagraphStyle(
- parent=styleSheet['Normal'],
- name='SubHeader',
- fontName='OpenSans-Bold',
- textColor=colors.white
- ))
-styleSheet.add(ParagraphStyle(
- parent=styleSheet['Normal'],
- name='SubHeaderBlack',
- fontName='OpenSans-Bold',
- textColor=colors.black
- ))
+ parent=styleSheet['Normal'],
+ fontSize=8,
+ name='Small',
+))
+styleSheet.add(
+ ParagraphStyle(
+ parent=styleSheet['Normal'],
+ fontSize=7,
+ name='ExerciseComments',
+ fontName='OpenSans-Italic',
+ )
+)
+styleSheet.add(
+ ParagraphStyle(
+ parent=styleSheet['Normal'],
+ name='HeaderBold',
+ fontSize=16,
+ fontName='OpenSans-Bold',
+ )
+)
+styleSheet.add(
+ ParagraphStyle(
+ parent=styleSheet['Normal'],
+ name='SubHeader',
+ fontName='OpenSans-Bold',
+ textColor=colors.white
+ )
+)
+styleSheet.add(
+ ParagraphStyle(
+ parent=styleSheet['Normal'],
+ name='SubHeaderBlack',
+ fontName='OpenSans-Bold',
+ textColor=colors.black
+ )
+)
header_colour = HexColor(0x24416b)
row_color = HexColor(0xd1def0)
diff --git a/wger/utils/permissions.py b/wger/utils/permissions.py
index 63a0de2fc..dfc0adea0 100644
--- a/wger/utils/permissions.py
+++ b/wger/utils/permissions.py
@@ -67,10 +67,10 @@ class CreateOnlyPermission(permissions.BasePermission):
"""
def has_permission(self, request, view):
- return (request.method in ['GET', 'HEAD', 'OPTIONS']
- or (request.user
- and request.user.is_authenticated
- and request.method == 'POST'))
+ return (
+ request.method in ['GET', 'HEAD', 'OPTIONS']
+ or (request.user and request.user.is_authenticated and request.method == 'POST')
+ )
class UpdateOnlyPermission(permissions.BasePermission):
@@ -80,6 +80,7 @@ class UpdateOnlyPermission(permissions.BasePermission):
"""
def has_permission(self, request, view):
- return (request.user
- and request.user.is_authenticated
- and request.method in ['GET', 'HEAD', 'OPTIONS', 'PATCH'])
+ return (
+ request.user and request.user.is_authenticated
+ and request.method in ['GET', 'HEAD', 'OPTIONS', 'PATCH']
+ )
diff --git a/wger/utils/tests/test_capitalizer.py b/wger/utils/tests/test_capitalizer.py
index 8f1169e95..255e2127e 100644
--- a/wger/utils/tests/test_capitalizer.py
+++ b/wger/utils/tests/test_capitalizer.py
@@ -14,7 +14,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# wger
from wger.core.tests.base_testcase import WgerTestCase
from wger.utils.helpers import smart_capitalize
diff --git a/wger/utils/tests/test_check_access.py b/wger/utils/tests/test_check_access.py
index ba4f3af97..b1c9b139c 100644
--- a/wger/utils/tests/test_check_access.py
+++ b/wger/utils/tests/test_check_access.py
@@ -15,7 +15,7 @@
# Django
from django.contrib.auth.models import (
AnonymousUser,
- User
+ User,
)
from django.http import Http404
diff --git a/wger/utils/tests/test_make_token.py b/wger/utils/tests/test_make_token.py
index f08528fc9..6a3f60862 100644
--- a/wger/utils/tests/test_make_token.py
+++ b/wger/utils/tests/test_make_token.py
@@ -14,7 +14,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-
# Django
from django.contrib.auth.models import User
diff --git a/wger/utils/units.py b/wger/utils/units.py
index 01ec10d71..583dcf823 100644
--- a/wger/utils/units.py
+++ b/wger/utils/units.py
@@ -19,10 +19,7 @@ from decimal import Decimal
# wger
from wger.utils.constants import FOURPLACES
-
logger = logging.getLogger(__name__)
-
-
"""
Weight unit classes
"""
diff --git a/wger/utils/viewsets.py b/wger/utils/viewsets.py
index 07ab550ed..81df19f15 100644
--- a/wger/utils/viewsets.py
+++ b/wger/utils/viewsets.py
@@ -18,7 +18,7 @@
# Third Party
from rest_framework import (
exceptions,
- viewsets
+ viewsets,
)
@@ -26,6 +26,7 @@ class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):
"""
Custom viewset that makes sure the user can only create objects for himself
"""
+
def create(self, request, *args, **kwargs):
"""
Check for creation (PUT, POST)
diff --git a/wger/utils/widgets.py b/wger/utils/widgets.py
index b1a630255..cf492070d 100644
--- a/wger/utils/widgets.py
+++ b/wger/utils/widgets.py
@@ -10,7 +10,6 @@
# wger Workout Manager is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-
# Standard Library
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
@@ -28,24 +27,23 @@ from django.forms.widgets import (
DateInput,
Select,
SelectMultiple,
- TextInput
+ TextInput,
)
from django.utils.encoding import force_text
from django.utils.html import (
conditional_escape,
- escape
+ escape,
)
from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _
-
logger = logging.getLogger(__name__)
-
#
# Date and time related fields
#
+
class Html5DateInput(DateInput):
"""
Custom Input class that is rendered with an HTML5 type="date"
@@ -91,6 +89,7 @@ class Html5FormTimeField(fields.TimeField):
# Number related fields
#
+
class Html5NumberInput(TextInput):
"""
Custom Input class that is rendered with an HTML5 type="number"
@@ -115,10 +114,10 @@ class ExerciseAjaxSelect(SelectMultiple):
if value is None:
value = []
- output = ['<div>',
- '<input type="text" id="exercise-search" class="form-control">',
- '</div>',
- '<div id="exercise-search-log">']
+ output = [
+ '<div>', '<input type="text" id="exercise-search" class="form-control">', '</div>',
+ '<div id="exercise-search-log">'
+ ]
options = self.render_options(choices, value)
if options:
@@ -149,9 +148,11 @@ class ExerciseAjaxSelect(SelectMultiple):
</a> %(value)s
<input type="hidden" name="exercises" value="%(id)s">
</div>
- """ % {'value': conditional_escape(force_text(option_label)),
- 'id': escape(option_value),
- 'div_id': uuid.uuid4()}
+ """ % {
+ 'value': conditional_escape(force_text(option_label)),
+ 'id': escape(option_value),
+ 'div_id': uuid.uuid4()
+ }
else:
return ''
@@ -186,11 +187,8 @@ class CheckboxChoiceInputTranslatedOriginal(CheckboxInput):
else:
choice = (choice[0], _(choice[1]))
- super(CheckboxChoiceInputTranslatedOriginal, self).__init__(name,
- value,
- attrs,
- choice,
- index)
+ super(CheckboxChoiceInputTranslatedOriginal,
+ self).__init__(name, value, attrs, choice, index)
class CheckboxFieldRendererTranslated(CheckboxSelectMultiple):
@@ -233,6 +231,5 @@ class TranslatedSelect(Select):
"""
def render_option(self, selected_choices, option_value, option_label):
- return super(TranslatedSelect, self).render_option(selected_choices,
- option_value,
- _(option_label))
+ return super(TranslatedSelect,
+ self).render_option(selected_choices, option_value, _(option_label))
diff --git a/wger/weight/__init__.py b/wger/weight/__init__.py
index 46a91e9bd..dfedb2e6f 100644
--- a/wger/weight/__init__.py
+++ b/wger/weight/__init__.py
@@ -15,9 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-
# wger
from wger import get_version
-
VERSION = get_version()
diff --git a/wger/weight/admin.py b/wger/weight/admin.py
index fb62051e4..31b5fde8d 100644
--- a/wger/weight/admin.py
+++ b/wger/weight/admin.py
@@ -18,5 +18,4 @@ from django.contrib import admin
# wger
from wger.weight.models import WeightEntry
-
admin.site.register(WeightEntry)
diff --git a/wger/weight/api/serializers.py b/wger/weight/api/serializers.py
index f29dfbf19..d629f5eba 100644
--- a/wger/weight/api/serializers.py
+++ b/wger/weight/api/serializers.py
@@ -32,7 +32,9 @@ class WeightEntrySerializer(serializers.ModelSerializer):
class Meta:
model = WeightEntry
- fields = ['id',
- 'date',
- 'weight',
- 'user']
+ fields = [
+ 'id',
+ 'date',
+ 'weight',
+ 'user',
+ ]
diff --git a/wger/weight/api/views.py b/wger/weight/api/views.py
index e8332c5ce..b6d79cc31 100644
--- a/wger/weight/api/views.py
+++ b/wger/weight/api/views.py
@@ -31,8 +31,7 @@ class WeightEntryViewSet(viewsets.ModelViewSet):
is_private = True
ordering_fields = '__all__'
- filterset_fields = ('date',
- 'weight')
+ filterset_fields = ('date', 'weight')
def get_queryset(self):
"""
diff --git a/wger/weight/forms.py b/wger/weight/forms.py
index 1e7ff0f6e..2bfd815ff 100644
--- a/wger/weight/forms.py
+++ b/wger/weight/forms.py
@@ -22,7 +22,7 @@ from django.forms import (
Form,
ModelForm,
Textarea,
- widgets
+ widgets,
)
from django.utils.translation import gettext as _
@@ -35,13 +35,14 @@ from wger.utils.constants import DATE_FORMATS
from wger.utils.widgets import Html5DateInput
from wger.weight.models import WeightEntry
-
-CSV_DATE_FORMAT = (('%d.%m.%Y', 'DD.MM.YYYY (30.01.2012)'),
- ('%d.%m.%y', 'DD.MM.YY (30.01.12)'),
- ('%Y-%m-%d', 'YYYY-MM-DD (2012-01-30)'),
- ('%y-%m-%d', 'YY-MM-DD (12-01-30)'),
- ('%m/%d/%Y', 'MM/DD/YYYY (01/30/2012)'),
- ('%m/%d/%y', 'MM/DD/YY (01/30/12)'),)
+CSV_DATE_FORMAT = (
+ ('%d.%m.%Y', 'DD.MM.YYYY (30.01.2012)'),
+ ('%d.%m.%y', 'DD.MM.YY (30.01.12)'),
+ ('%Y-%m-%d', 'YYYY-MM-DD (2012-01-30)'),
+ ('%y-%m-%d', 'YY-MM-DD (12-01-30)'),
+ ('%m/%d/%Y', 'MM/DD/YYYY (01/30/2012)'),
+ ('%m/%d/%y', 'MM/DD/YY (01/30/12)'),
+)
class WeightCsvImportForm(Form):
diff --git a/wger/weight/helpers.py b/wger/weight/helpers.py
index 732be7dda..91241a385 100644
--- a/wger/weight/helpers.py
+++ b/wger/weight/helpers.py
@@ -29,13 +29,12 @@ from django.core.cache import cache
# wger
from wger.manager.models import (
WorkoutLog,
- WorkoutSession
+ WorkoutSession,
)
from wger.utils.cache import cache_mapper
from wger.utils.helpers import DecimalJsonEncoder
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -47,8 +46,7 @@ def parse_weight_csv(request, cleaned_data):
dialect = 'excel'
# csv.reader expects a file-like object, so use StringIO
- parsed_csv = csv.reader(io.StringIO(cleaned_data['csv_input']),
- dialect)
+ parsed_csv = csv.reader(io.StringIO(cleaned_data['csv_input']), dialect)
distinct_weight_entries = []
entry_dates = set()
weight_list = []
@@ -83,9 +81,7 @@ def parse_weight_csv(request, cleaned_data):
# Create the valid weight entries
for date, weight in distinct_weight_entries:
- weight_list.append(WeightEntry(date=date,
- weight=weight,
- user=request.user))
+ weight_list.append(WeightEntry(date=date, weight=weight, user=request.user))
return (weight_list, error_list)
@@ -115,13 +111,9 @@ def group_log_entries(user, year, month, day=None):
sessions = WorkoutSession.objects.filter(user=user, date=filter_date)
else:
- logs = WorkoutLog.objects.filter(user=user,
- date__year=year,
- date__month=month)
+ logs = WorkoutLog.objects.filter(user=user, date__year=year, date__month=month)
- sessions = WorkoutSession.objects.filter(user=user,
- date__year=year,
- date__month=month)
+ sessions = WorkoutSession.objects.filter(user=user, date__year=year, date__month=month)
logs = logs.order_by('date', 'id')
out = cache.get(cache_mapper.get_workout_log_list(log_hash))
@@ -133,10 +125,12 @@ def group_log_entries(user, year, month, day=None):
# Logs
for entry in logs:
if not out.get(entry.date):
- out[entry.date] = {'date': entry.date,
- 'workout': entry.workout,
- 'session': entry.get_workout_session(),
- 'logs': OrderedDict()}
+ out[entry.date] = {
+ 'date': entry.date,
+ 'workout': entry.workout,
+ 'session': entry.get_workout_session(),
+ 'logs': OrderedDict()
+ }
if not out[entry.date]['logs'].get(entry.exercise):
out[entry.date]['logs'][entry.exercise] = []
@@ -146,10 +140,12 @@ def group_log_entries(user, year, month, day=None):
# Sessions
for entry in sessions:
if not out.get(entry.date):
- out[entry.date] = {'date': entry.date,
- 'workout': entry.workout,
- 'session': entry,
- 'logs': {}}
+ out[entry.date] = {
+ 'date': entry.date,
+ 'workout': entry.workout,
+ 'session': entry,
+ 'logs': {}
+ }
cache.set(cache_mapper.get_workout_log_list(log_hash), out)
return out
@@ -197,9 +193,13 @@ def process_log_entries(logs):
continue
entry_list[entry.reps]['seen'].append((entry.date, entry.reps, entry.weight))
- entry_list[entry.reps]['list'].append({'date': entry.date,
- 'weight': entry.weight,
- 'reps': entry.reps})
+ entry_list[entry.reps]['list'].append(
+ {
+ 'date': entry.date,
+ 'weight': entry.weight,
+ 'reps': entry.reps
+ }
+ )
for rep in entry_list:
chart_data.append(entry_list[rep]['list'])
diff --git a/wger/weight/management/commands/email-weight-reminder.py b/wger/weight/management/commands/email-weight-reminder.py
index cccf2ceba..db4aad609 100644
--- a/wger/weight/management/commands/email-weight-reminder.py
+++ b/wger/weight/management/commands/email-weight-reminder.py
@@ -72,15 +72,18 @@ class Command(BaseCommand):
# Compose and send the email
translation.activate(user.userprofile.notification_language.short_name)
- context = {'site': Site.objects.get_current(),
- 'date': last_entry,
- 'days': datediff,
- 'user': user}
+ context = {
+ 'site': Site.objects.get_current(),
+ 'date': last_entry,
+ 'days': datediff,
+ 'user': user
+ }
subject = _('You have to enter your weight')
message = loader.render_to_string('workout/email_weight_reminder.tpl', context)
- mail.send_mail(subject,
- message,
- settings.WGER_SETTINGS['EMAIL_FROM'],
- [user.email],
- fail_silently=True)
+ mail.send_mail(
+ subject,
+ message,
+ settings.WGER_SETTINGS['EMAIL_FROM'], [user.email],
+ fail_silently=True
+ )
diff --git a/wger/weight/migrations/0001_initial.py b/wger/weight/migrations/0001_initial.py
index 681e7aaff..298c63856 100644
--- a/wger/weight/migrations/0001_initial.py
+++ b/wger/weight/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
from django.conf import settings
import django.core.validators
@@ -15,17 +15,38 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='WeightEntry',
fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ (
+ 'id',
+ models.AutoField(
+ verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+ )
+ ),
('creation_date', models.DateField(verbose_name='Date')),
- ('weight', models.DecimalField(verbose_name='Weight', max_digits=5, decimal_places=2, validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(300)])),
- ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ (
+ 'weight',
+ models.DecimalField(
+ verbose_name='Weight',
+ max_digits=5,
+ decimal_places=2,
+ validators=[
+ django.core.validators.MinValueValidator(30),
+ django.core.validators.MaxValueValidator(300)
+ ]
+ )
+ ),
+ (
+ 'user',
+ models.ForeignKey(
+ verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+ )
+ ),
],
options={
'ordering': ['creation_date'],
'get_latest_by': 'creation_date',
'verbose_name': 'Weight entry',
},
- bases=(models.Model,),
+ bases=(models.Model, ),
),
migrations.AlterUniqueTogether(
name='weightentry',
diff --git a/wger/weight/migrations/0002_auto_20150604_2139.py b/wger/weight/migrations/0002_auto_20150604_2139.py
index 138135936..0caee53f6 100644
--- a/wger/weight/migrations/0002_auto_20150604_2139.py
+++ b/wger/weight/migrations/0002_auto_20150604_2139.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import models, migrations
@@ -12,7 +12,11 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='weightentry',
- options={'verbose_name': 'Weight entry', 'get_latest_by': 'date', 'ordering': ['date']},
+ options={
+ 'verbose_name': 'Weight entry',
+ 'get_latest_by': 'date',
+ 'ordering': ['date']
+ },
),
migrations.RenameField(
model_name='weightentry',
diff --git a/wger/weight/migrations/0003_auto_20160416_1030.py b/wger/weight/migrations/0003_auto_20160416_1030.py
index e0f941411..8d605985c 100644
--- a/wger/weight/migrations/0003_auto_20160416_1030.py
+++ b/wger/weight/migrations/0003_auto_20160416_1030.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# flake8: noqa
+
from django.db import migrations, models
import django.core.validators
@@ -14,6 +14,14 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='weightentry',
name='weight',
- field=models.DecimalField(decimal_places=2, verbose_name='Weight', validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(600)], max_digits=5),
+ field=models.DecimalField(
+ decimal_places=2,
+ verbose_name='Weight',
+ validators=[
+ django.core.validators.MinValueValidator(30),
+ django.core.validators.MaxValueValidator(600)
+ ],
+ max_digits=5
+ ),
),
]
diff --git a/wger/weight/models.py b/wger/weight/models.py
index dc1e9cd65..0313c9ac6 100644
--- a/wger/weight/models.py
+++ b/wger/weight/models.py
@@ -19,7 +19,7 @@
from django.contrib.auth.models import User
from django.core.validators import (
MaxValueValidator,
- MinValueValidator
+ MinValueValidator,
)
from django.db import models
from django.utils.translation import gettext_lazy as _
@@ -30,13 +30,17 @@ class WeightEntry(models.Model):
Model for a weight point
"""
date = models.DateField(verbose_name=_('Date'))
- weight = models.DecimalField(verbose_name=_('Weight'),
- max_digits=5,
- decimal_places=2,
- validators=[MinValueValidator(30), MaxValueValidator(600)])
- user = models.ForeignKey(User,
- verbose_name=_('User'),
- on_delete=models.CASCADE)
+ weight = models.DecimalField(
+ verbose_name=_('Weight'),
+ max_digits=5,
+ decimal_places=2,
+ validators=[MinValueValidator(30), MaxValueValidator(600)]
+ )
+ user = models.ForeignKey(
+ User,
+ verbose_name=_('User'),
+ on_delete=models.CASCADE,
+ )
"""
The user the weight entry belongs to.
@@ -52,7 +56,9 @@ class WeightEntry(models.Model):
Metaclass to set some other properties
"""
verbose_name = _('Weight entry')
- ordering = ["date", ]
+ ordering = [
+ "date",
+ ]
get_latest_by = "date"
unique_together = ("date", "user")
diff --git a/wger/weight/tests/test_csv_export.py b/wger/weight/tests/test_csv_export.py
index 11a399049..4bb4d9906 100644
--- a/wger/weight/tests/test_csv_export.py
+++ b/wger/weight/tests/test_csv_export.py
@@ -21,7 +21,6 @@ from django.urls import reverse
# wger
from wger.core.tests.base_testcase import WgerTestCase
-
logger = logging.getLogger(__name__)
@@ -38,8 +37,7 @@ class WeightCsvExportTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/csv')
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename=Weightdata.csv')
+ self.assertEqual(response['Content-Disposition'], 'attachment; filename=Weightdata.csv')
self.assertGreaterEqual(len(response.content), 120)
self.assertLessEqual(len(response.content), 150)
diff --git a/wger/weight/tests/test_csv_import.py b/wger/weight/tests/test_csv_import.py
index aebcbb7ed..6829e5df6 100644
--- a/wger/weight/tests/test_csv_import.py
+++ b/wger/weight/tests/test_csv_import.py
@@ -22,7 +22,6 @@ from django.urls import reverse
from wger.core.tests.base_testcase import WgerTestCase
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -51,10 +50,13 @@ class WeightCsvImportTestCase(WgerTestCase):
26.02.10 71,9 222
26.02.10 71,9 222
19.03.10 72 222"""
- response = self.client.post(reverse('weight:import-csv'),
- {'stage': 1,
- 'csv_input': csv_input,
- 'date_format': '%d.%m.%y'})
+ response = self.client.post(
+ reverse('weight:import-csv'), {
+ 'stage': 1,
+ 'csv_input': csv_input,
+ 'date_format': '%d.%m.%y'
+ }
+ )
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['weight_list']), 6)
@@ -62,11 +64,14 @@ class WeightCsvImportTestCase(WgerTestCase):
hash_value = response.context['hash_value']
# 2nd. step
- response = self.client.post(reverse('weight:import-csv'),
- {'stage': 2,
- 'hash': hash_value,
- 'csv_input': csv_input,
- 'date_format': '%d.%m.%y'})
+ response = self.client.post(
+ reverse('weight:import-csv'), {
+ 'stage': 2,
+ 'hash': hash_value,
+ 'csv_input': csv_input,
+ 'date_format': '%d.%m.%y'
+ }
+ )
count_after = WeightEntry.objects.count()
self.assertEqual(response.status_code, 302)
diff --git a/wger/weight/tests/test_email_weight_reminder.py b/wger/weight/tests/test_email_weight_reminder.py
index 0480d574e..4a2c70a40 100644
--- a/wger/weight/tests/test_email_weight_reminder.py
+++ b/wger/weight/tests/test_email_weight_reminder.py
@@ -15,7 +15,7 @@
# Standard Library
from datetime import (
datetime,
- timedelta
+ timedelta,
)
# Django
@@ -29,6 +29,7 @@ from wger.weight.models import WeightEntry
class EmailWeightReminderTestCase(WgerTestCase):
+
def test_without_email(self):
user = User.objects.get(pk=2)
user.email = ''
diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.py
index 711935a9b..d8840df31 100644
--- a/wger/weight/tests/test_entry.py
+++ b/wger/weight/tests/test_entry.py
@@ -25,7 +25,7 @@ from wger.core.tests.base_testcase import (
WgerAddTestCase,
WgerDeleteTestCase,
WgerEditTestCase,
- WgerTestCase
+ WgerTestCase,
)
from wger.utils.constants import TWOPLACES
from wger.weight.models import WeightEntry
@@ -93,9 +93,11 @@ class AddWeightEntryTestCase(WgerAddTestCase):
object_class = WeightEntry
url = 'weight:add'
user_fail = False
- data = {'weight': decimal.Decimal(81.1).quantize(TWOPLACES),
- 'date': datetime.date(2013, 2, 1),
- 'user': 1}
+ data = {
+ 'weight': decimal.Decimal(81.1).quantize(TWOPLACES),
+ 'date': datetime.date(2013, 2, 1),
+ 'user': 1
+ }
class EditWeightEntryTestCase(WgerEditTestCase):
@@ -106,9 +108,11 @@ class EditWeightEntryTestCase(WgerEditTestCase):
object_class = WeightEntry
url = 'weight:edit'
pk = 1
- data = {'weight': 100,
- 'date': datetime.date(2013, 2, 1),
- 'user': 1}
+ data = {
+ 'weight': 100,
+ 'date': datetime.date(2013, 2, 1),
+ 'user': 1,
+ }
user_success = 'test'
user_fail = 'admin'
@@ -132,5 +136,4 @@ class WeightEntryTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 3
resource = WeightEntry
private_resource = True
- data = {'weight': 100,
- 'date': datetime.date(2013, 2, 1)}
+ data = {'weight': 100, 'date': datetime.date(2013, 2, 1)}
diff --git a/wger/weight/tests/test_overview.py b/wger/weight/tests/test_overview.py
index 44dda0092..02fc0790d 100644
--- a/wger/weight/tests/test_overview.py
+++ b/wger/weight/tests/test_overview.py
@@ -21,7 +21,6 @@ from django.urls import reverse
# wger
from wger.core.tests.base_testcase import WgerTestCase
-
logger = logging.getLogger(__name__)
@@ -34,8 +33,9 @@ class WeightOverviewTestCase(WgerTestCase):
"""
Helper function to test the weight overview page
"""
- response = self.client.get(reverse('weight:overview',
- kwargs={'username': self.current_user}))
+ response = self.client.get(
+ reverse('weight:overview', kwargs={'username': self.current_user})
+ )
self.assertEqual(response.status_code, 200)
def test_weight_overview_loged_in(self):
diff --git a/wger/weight/urls.py b/wger/weight/urls.py
index edf1280d9..a1a710d32 100644
--- a/wger/weight/urls.py
+++ b/wger/weight/urls.py
@@ -24,37 +24,48 @@ from django.urls import path
from wger.weight import views
from wger.weight.forms import WeightCsvImportForm
-
urlpatterns = [
- path('add/',
- login_required(views.WeightAddView.as_view()),
- name='add'),
-
- path('<int:pk>/edit/',
- login_required(views.WeightUpdateView.as_view()),
- name='edit'),
-
- path('<int:pk>/delete/',
- views.WeightDeleteView.as_view(),
- name='delete'),
-
- path('export-csv/',
- views.export_csv,
- name='export-csv'),
- path('import-csv/',
- login_required(views.WeightCsvImportFormPreview(WeightCsvImportForm)),
- name='import-csv'),
-
- url(r'^overview/(?P<username>[\w.@+-]+)$',
+ path(
+ 'add/',
+ login_required(views.WeightAddView.as_view()),
+ name='add',
+ ),
+ path(
+ '<int:pk>/edit/',
+ login_required(views.WeightUpdateView.as_view()),
+ name='edit',
+ ),
+ path(
+ '<int:pk>/delete/',
+ views.WeightDeleteView.as_view(),
+ name='delete',
+ ),
+ path(
+ 'export-csv/',
+ views.export_csv,
+ name='export-csv',
+ ),
+ path(
+ 'import-csv/',
+ login_required(views.WeightCsvImportFormPreview(WeightCsvImportForm)),
+ name='import-csv',
+ ),
+ url(
+ r'^overview/(?P<username>[\w.@+-]+)$',
views.overview,
- name='overview'),
+ name='overview',
+ ),
# url(r'^overview/$',
# views.overview,
# name='overview'),
- url(r'^api/get_weight_data/(?P<username>[\w.@+-]+)$', # JS
+ url(
+ r'^api/get_weight_data/(?P<username>[\w.@+-]+)$', # JS
+ views.get_weight_data,
+ name='weight-data',
+ ),
+ path(
+ 'api/get_weight_data/', # JS
views.get_weight_data,
- name='weight-data'),
- path('api/get_weight_data/', # JS
- views.get_weight_data,
- name='weight-data'),
+ name='weight-data',
+ ),
]
diff --git a/wger/weight/views.py b/wger/weight/views.py
index 6e0eb6cec..9c2f821c5 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -24,22 +24,22 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.db.models import (
Max,
- Min
+ Min,
)
from django.http import (
HttpResponse,
- HttpResponseRedirect
+ HttpResponseRedirect,
)
from django.shortcuts import render
from django.urls import reverse
from django.utils.translation import (
gettext as _,
- gettext_lazy
+ gettext_lazy,
)
from django.views.generic import (
CreateView,
DeleteView,
- UpdateView
+ UpdateView,
)
# Third Party
@@ -50,14 +50,13 @@ from rest_framework.response import Response
# wger
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
)
from wger.utils.helpers import check_access
from wger.weight import helpers
from wger.weight.forms import WeightForm
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -76,8 +75,7 @@ class WeightAddView(WgerFormMixin, CreateView):
Read the comment on weight/models.py WeightEntry about why we need
to pass the user here.
"""
- return {'user': self.request.user,
- 'date': datetime.date.today()}
+ return {'user': self.request.user, 'date': datetime.date.today()}
def form_valid(self, form):
"""
@@ -119,7 +117,7 @@ class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
"""
model = WeightEntry
- fields = ('weight',)
+ fields = ('weight', )
messages = gettext_lazy('Successfully deleted.')
@@ -207,16 +205,14 @@ def get_weight_data(request, username=None):
date_max = request.GET.get('date_max', True)
if date_min and date_max:
- weights = WeightEntry.objects.filter(user=user,
- date__range=(date_min, date_max))
+ weights = WeightEntry.objects.filter(user=user, date__range=(date_min, date_max))
else:
weights = WeightEntry.objects.filter(user=user)
chart_data = []
for i in weights:
- chart_data.append({'date': i.date,
- 'weight': i.weight})
+ chart_data.append({'date': i.date, 'weight': i.weight})
# Return the results to the client
return Response(chart_data)
@@ -231,17 +227,21 @@ class WeightCsvImportFormPreview(FormPreview):
Context for template rendering.
"""
- return {'form': form,
- 'stage_field': self.unused_name('stage'),
- 'state': self.state}
+ return {
+ 'form': form,
+ 'stage_field': self.unused_name('stage'),
+ 'state': self.state,
+ }
def process_preview(self, request, form, context):
- context['weight_list'], context['error_list'] = helpers.parse_weight_csv(request,
- form.cleaned_data)
+ context['weight_list'], context['error_list'] = helpers.parse_weight_csv(
+ request, form.cleaned_data
+ )
return context
def done(self, request, cleaned_data):
weight_list, error_list = helpers.parse_weight_csv(request, cleaned_data)
WeightEntry.objects.bulk_create(weight_list)
- return HttpResponseRedirect(reverse('weight:overview',
- kwargs={'username': request.user.username}))
+ return HttpResponseRedirect(
+ reverse('weight:overview', kwargs={'username': request.user.username})
+ )
diff --git a/wger/wsgi.py b/wger/wsgi.py
index 295ed61c1..ac65eb071 100644
--- a/wger/wsgi.py
+++ b/wger/wsgi.py
@@ -19,7 +19,6 @@ import os
# Django
from django.core.wsgi import get_wsgi_application
-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
# This application object is used by any WSGI server configured to use this