Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix circular import and formatting

Roland Geiderb7c58736e997
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index efddfe505..37c1f3f46 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -38,33 +38,36 @@ 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',
- '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',
+ '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):
diff --git a/wger/core/api/viewsets.py b/wger/core/api/viewsets.py
index e707259c0..b5377f53c 100644
--- a/wger/core/api/viewsets.py
+++ b/wger/core/api/viewsets.py
@@ -19,11 +19,13 @@ from rest_framework import mixins
from rest_framework.viewsets import GenericViewSet
-class CreateUpdateModelViewSet(mixins.CreateModelMixin,
- mixins.RetrieveModelMixin,
- mixins.UpdateModelMixin,
- mixins.ListModelMixin,
- GenericViewSet):
+class CreateUpdateModelViewSet(
+ mixins.CreateModelMixin,
+ mixins.RetrieveModelMixin,
+ mixins.UpdateModelMixin,
+ mixins.ListModelMixin,
+ GenericViewSet,
+):
"""
This is basically a copy of ModelViewSet, but without support for DELETE
"""
diff --git a/wger/core/forms.py b/wger/core/forms.py
index e534717ba..ced76de6c 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 _
@@ -46,7 +46,7 @@ from crispy_forms.layout import (
Fieldset,
Layout,
Row,
- Submit
+ Submit,
)
# wger
@@ -74,54 +74,43 @@ 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',
- 'ro_access',
- 'num_days_weight_reminder',
- 'birthdate'
- )
+ fields = (
+ 'show_comments', 'show_english_ingredients', 'workout_reminder_active',
+ 'workout_reminder', 'workout_duration', 'notification_language', 'weight_unit',
+ 'ro_access', 'num_days_weight_reminder', 'birthdate'
+ )
def __init__(self, *args, **kwargs):
super(UserPreferencesForm, self).__init__(*args, **kwargs)
self.helper = FormHelper()
self.helper.form_class = 'wger-form'
self.helper.layout = Layout(
- Fieldset(_("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'),
- HTML("<hr>")),
- Fieldset(_("Workout reminders"),
- 'workout_reminder_active',
- 'workout_reminder',
- 'workout_duration',
- HTML("<hr>")),
- Fieldset(_("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'))
+ Fieldset(
+ _("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'
+ ), HTML("<hr>")
+ ),
+ Fieldset(
+ _("Workout reminders"), 'workout_reminder_active', 'workout_reminder',
+ 'workout_duration', HTML("<hr>")
+ ),
+ Fieldset(
+ _("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'))
)
diff --git a/wger/core/models/profile.py b/wger/core/models/profile.py
index eac4a74b0..78d31cffd 100644
--- a/wger/core/models/profile.py
+++ b/wger/core/models/profile.py
@@ -201,8 +201,9 @@ by the US Department of Agriculture. It is extremely complete, with around
def has_exercise_permission(self):
"""Returns true if user has all the exercise permissions and not just one."""
# TODO: check if this can be removed / refactored
- if self.user.groups.filter(name='admin').exists() or self.user.groups.filter(
- name='exercises_editor').exists():
+ if self.user.groups.filter(name='admin'
+ ).exists() or self.user.groups.filter(name='exercises_editor'
+ ).exists():
return True
return False
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py
index eef9cc228..7270d43a1 100644
--- a/wger/core/tests/test_preferences.py
+++ b/wger/core/tests/test_preferences.py
@@ -50,17 +50,20 @@ 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,
- '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,
+ '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'))
@@ -72,17 +75,20 @@ 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,
- '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,
+ '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'))
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 4e03f3cf9..d23748eca 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -66,52 +66,25 @@ patterns_language = [
# 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('confirm-email',
- user.confirm_email,
- name='confirm-email'),
- 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('confirm-email', user.confirm_email, name='confirm-email'),
+ 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)
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 818038087..37beb3c16 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -641,7 +641,9 @@ class WgerPasswordResetConfirmView(PasswordResetConfirmView):
def confirm_email(request):
if not request.user.userprofile.email_verified:
send_email(request.user)
- messages.success(request,
- _('Verification email sent to %(email)s') % {'email': request.user.email})
+ messages.success(
+ request,
+ _('Verification email sent to %(email)s') % {'email': request.user.email}
+ )
return HttpResponseRedirect(reverse('core:dashboard'))
diff --git a/wger/exercises/api/permissions.py b/wger/exercises/api/permissions.py
index c270ff210..341e357e9 100644
--- a/wger/exercises/api/permissions.py
+++ b/wger/exercises/api/permissions.py
@@ -29,5 +29,7 @@ class CanEditExercises(BasePermission):
if request.user.is_anonymous:
return False
- return (request.user.userprofile.is_trustworthy
- or request.user.has_perm('exercises.add_exercise'))
+ return (
+ request.user.userprofile.is_trustworthy
+ or request.user.has_perm('exercises.add_exercise')
+ )
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 68a3af550..0d57c6b7e 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -35,25 +35,28 @@ 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):
@@ -91,21 +94,20 @@ class ExerciseAliasSerializer(serializers.ModelSerializer):
"""
ExerciseAlias serializer
"""
+
class Meta:
model = ExerciseAlias
- fields = ['id',
- 'exercise',
- 'alias']
+ fields = ['id', 'exercise', 'alias']
class ExerciseInfoAliasSerializer(serializers.ModelSerializer):
"""
Exercise alias serializer for info endpoint
"""
+
class Meta:
model = ExerciseAlias
- fields = ['id',
- 'alias']
+ fields = ['id', 'alias']
class ExerciseCategorySerializer(serializers.ModelSerializer):
@@ -142,14 +144,10 @@ class ExerciseSerializer(serializers.ModelSerializer):
compatibility with the old model where all the fields where in Exercise.
"""
category = serializers.PrimaryKeyRelatedField(queryset=ExerciseCategory.objects.all())
- muscles = serializers.PrimaryKeyRelatedField(many=True,
- queryset=Muscle.objects.all())
- muscles_secondary = serializers.PrimaryKeyRelatedField(many=True,
- queryset=Muscle.objects.all())
- equipment = serializers.PrimaryKeyRelatedField(many=True,
- queryset=Equipment.objects.all())
- variations = serializers.PrimaryKeyRelatedField(many=True,
- queryset=Variation.objects.all())
+ muscles = serializers.PrimaryKeyRelatedField(many=True, queryset=Muscle.objects.all())
+ muscles_secondary = serializers.PrimaryKeyRelatedField(many=True, queryset=Muscle.objects.all())
+ equipment = serializers.PrimaryKeyRelatedField(many=True, queryset=Equipment.objects.all())
+ variations = serializers.PrimaryKeyRelatedField(many=True, queryset=Variation.objects.all())
class Meta:
model = Exercise
@@ -189,19 +187,21 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
class Meta:
model = Exercise
depth = 1
- fields = ["id",
- "name",
- "aliases",
- "uuid",
- "description",
- "creation_date",
- "category",
- "muscles",
- "muscles_secondary",
- "equipment",
- "language",
- "license",
- "license_author",
- "images",
- "comments",
- "variations"]
+ fields = [
+ "id",
+ "name",
+ "aliases",
+ "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 12816053b..4e3070ba4 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -111,8 +111,7 @@ class ExerciseViewSet(CreateUpdateModelViewSet):
"""
# Exercise Base
- base = ExerciseBase(category=serializer.validated_data['category'],
- variations=None)
+ base = ExerciseBase(category=serializer.validated_data['category'], variations=None)
base.save()
base.muscles.set(serializer.validated_data['muscles'])
base.muscles_secondary.set(serializer.validated_data['muscles_secondary'])
@@ -120,11 +119,13 @@ class ExerciseViewSet(CreateUpdateModelViewSet):
base.save()
# Exercise
- exercise = Exercise(name_original=serializer.validated_data['name'],
- description=serializer.validated_data['description'],
- exercise_base=base,
- language=serializer.validated_data['language'],
- status=AbstractSubmissionModel.STATUS_ACCEPTED)
+ exercise = Exercise(
+ name_original=serializer.validated_data['name'],
+ description=serializer.validated_data['description'],
+ exercise_base=base,
+ language=serializer.validated_data['language'],
+ status=AbstractSubmissionModel.STATUS_ACCEPTED
+ )
exercise.save()
serializer.validated_data['id'] = exercise.id
serializer.validated_data['uuid'] = exercise.uuid
@@ -137,7 +138,7 @@ class ExerciseViewSet(CreateUpdateModelViewSet):
exercise = serializer.instance
base = exercise.exercise_base
for attr, value in serializer.validated_data.items():
- if(attr == 'name'):
+ if (attr == 'name'):
exercise.name_original = value
if (attr == 'description'):
@@ -215,14 +216,15 @@ def search(request):
json_response = {}
if q:
- languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES,
- language_code=request.GET.get('language', None))
+ languages = load_item_languages(
+ LanguageConfig.SHOW_ITEM_EXERCISES, language_code=request.GET.get('language', None)
+ )
name_lookup = Q(name__icontains=q) | Q(exercisealias__alias__icontains=q)
- exercises = (Exercise.objects.filter(name_lookup)
- .accepted()
- .filter(language__in=languages)
- .order_by('exercise_base__category__name', 'name')
- .distinct())
+ exercises = (
+ Exercise.objects.filter(name_lookup).accepted().filter(
+ language__in=languages
+ ).order_by('exercise_base__category__name', 'name').distinct()
+ )
for exercise in exercises:
if exercise.main_image:
@@ -342,7 +344,7 @@ class ExerciseCommentViewSet(CreateUpdateModelViewSet):
API endpoint for exercise comment objects
"""
serializer_class = ExerciseCommentSerializer
- permission_classes = (CanEditExercises,)
+ permission_classes = (CanEditExercises, )
ordering_fields = '__all__'
filterset_fields = ('comment', 'exercise')
@@ -362,10 +364,9 @@ class ExerciseAliasViewSet(CreateUpdateModelViewSet):
"""
serializer_class = ExerciseAliasSerializer
queryset = ExerciseAlias.objects.all()
- permission_classes = (CanEditExercises,)
+ permission_classes = (CanEditExercises, )
ordering_fields = '__all__'
- filterset_fields = ('alias',
- 'exercise')
+ filterset_fields = ('alias', 'exercise')
class MuscleViewSet(viewsets.ReadOnlyModelViewSet):
diff --git a/wger/exercises/migrations/0014_historicalexercise_historicalexercisebase_historicalexercisecomment.py b/wger/exercises/migrations/0014_historicalexercise_historicalexercisebase_historicalexercisecomment.py
index b2dccab0b..2e0e865b8 100644
--- a/wger/exercises/migrations/0014_historicalexercise_historicalexercisebase_historicalexercisecomment.py
+++ b/wger/exercises/migrations/0014_historicalexercise_historicalexercisebase_historicalexercisecomment.py
@@ -19,36 +19,52 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='HistoricalExerciseComment',
fields=[
- ('id', models.IntegerField(auto_created=True,
- blank=True,
- db_index=True,
- verbose_name='ID')),
- ('comment',
- models.CharField(help_text='A comment about how to correctly do this exercise.',
- max_length=200,
- verbose_name='Comment')),
- ('history_id', models.AutoField(primary_key=True,
- serialize=False)),
+ (
+ 'id',
+ models.IntegerField(
+ auto_created=True, blank=True, db_index=True, verbose_name='ID'
+ )
+ ),
+ (
+ 'comment',
+ models.CharField(
+ help_text='A comment about how to correctly do this exercise.',
+ max_length=200,
+ verbose_name='Comment'
+ )
+ ),
+ ('history_id', models.AutoField(primary_key=True, serialize=False)),
('history_date', models.DateTimeField()),
- ('history_change_reason', models.CharField(max_length=100,
- null=True)),
- ('history_type',
- models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
- max_length=1)),
- ('exercise',
- models.ForeignKey(blank=True,
- db_constraint=False,
- editable=False,
- null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+',
- to='exercises.exercise',
- verbose_name='Exercise')),
- ('history_user',
- models.ForeignKey(null=True,
- on_delete=django.db.models.deletion.SET_NULL,
- related_name='+',
- to=settings.AUTH_USER_MODEL)),
+ ('history_change_reason', models.CharField(max_length=100, null=True)),
+ (
+ 'history_type',
+ models.CharField(
+ choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
+ max_length=1
+ )
+ ),
+ (
+ 'exercise',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ editable=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercise',
+ verbose_name='Exercise'
+ )
+ ),
+ (
+ 'history_user',
+ models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='+',
+ to=settings.AUTH_USER_MODEL
+ )
+ ),
],
options={
'verbose_name': 'historical exercise comment',
@@ -60,57 +76,91 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='HistoricalExerciseBase',
fields=[
- ('id', models.IntegerField(auto_created=True,
- blank=True,
- db_index=True,
- 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)),
- ('uuid', models.UUIDField(default=uuid.uuid4,
- editable=False,
- verbose_name='UUID')),
- ('history_id', models.AutoField(primary_key=True,
- serialize=False)),
+ (
+ 'id',
+ models.IntegerField(
+ auto_created=True, blank=True, db_index=True, 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
+ )
+ ),
+ ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='UUID')),
+ ('history_id', models.AutoField(primary_key=True, serialize=False)),
('history_date', models.DateTimeField()),
('history_change_reason', models.CharField(max_length=100, null=True)),
- ('history_type',
- models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
- max_length=1)),
- ('category', models.ForeignKey(blank=True,
- db_constraint=False,
- null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+', to='exercises.exercisecategory',
- verbose_name='Category')),
- ('history_user',
- models.ForeignKey(null=True,
- on_delete=django.db.models.deletion.SET_NULL,
- related_name='+',
- to=settings.AUTH_USER_MODEL)),
- ('license', models.ForeignKey(blank=True,
- db_constraint=False,
- default=2,
- null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+', to='core.license',
- verbose_name='License')),
- ('variations', models.ForeignKey(blank=True,
- db_constraint=False,
- null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+',
- to='exercises.variation',
- verbose_name='Variations')),
+ (
+ 'history_type',
+ models.CharField(
+ choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
+ max_length=1
+ )
+ ),
+ (
+ 'category',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercisecategory',
+ verbose_name='Category'
+ )
+ ),
+ (
+ 'history_user',
+ models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='+',
+ to=settings.AUTH_USER_MODEL
+ )
+ ),
+ (
+ 'license',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ default=2,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='core.license',
+ verbose_name='License'
+ )
+ ),
+ (
+ 'variations',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.variation',
+ verbose_name='Variations'
+ )
+ ),
],
options={
'verbose_name': 'historical exercise base',
@@ -122,75 +172,108 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='HistoricalExercise',
fields=[
- ('id', models.IntegerField(auto_created=True,
- blank=True,
- db_index=True,
- 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)),
- ('description',
- models.TextField(max_length=2000,
- validators=[django.core.validators.MinLengthValidator(40)],
- verbose_name='Description')),
- ('name', models.CharField(max_length=200,
- verbose_name='Name')),
- ('name_original',
- models.CharField(default='',
- max_length=200,
- verbose_name='Name')),
- ('creation_date',
- models.DateField(blank=True,
- editable=False,
- null=True,
- verbose_name='Date')),
- ('uuid', models.UUIDField(default=uuid.uuid4,
- editable=False,
- verbose_name='UUID')),
+ (
+ 'id',
+ models.IntegerField(
+ auto_created=True, blank=True, db_index=True, 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
+ )
+ ),
+ (
+ 'description',
+ models.TextField(
+ max_length=2000,
+ validators=[django.core.validators.MinLengthValidator(40)],
+ verbose_name='Description'
+ )
+ ),
+ ('name', models.CharField(max_length=200, verbose_name='Name')),
+ (
+ 'name_original',
+ models.CharField(default='', max_length=200, verbose_name='Name')
+ ),
+ (
+ 'creation_date',
+ models.DateField(blank=True, editable=False, null=True, verbose_name='Date')
+ ),
+ ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='UUID')),
('history_id', models.AutoField(primary_key=True, serialize=False)),
('history_date', models.DateTimeField()),
('history_change_reason', models.CharField(max_length=100, null=True)),
- ('history_type',
- models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
- max_length=1)),
- ('exercise_base',
- models.ForeignKey(blank=True,
- db_constraint=False,
- default=None,
- null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+',
- to='exercises.exercisebase',
- verbose_name='ExerciseBase')),
- ('history_user',
- models.ForeignKey(null=True,
- on_delete=django.db.models.deletion.SET_NULL,
- related_name='+',
- to=settings.AUTH_USER_MODEL)),
- ('language', models.ForeignKey(blank=True,
- db_constraint=False,
- null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+',
- to='core.language',
- verbose_name='Language')),
- ('license', models.ForeignKey(blank=True,
- db_constraint=False,
- default=2,
- null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+', to='core.license',
- verbose_name='License')),
+ (
+ 'history_type',
+ models.CharField(
+ choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
+ max_length=1
+ )
+ ),
+ (
+ 'exercise_base',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ default=None,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercisebase',
+ verbose_name='ExerciseBase'
+ )
+ ),
+ (
+ 'history_user',
+ models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='+',
+ to=settings.AUTH_USER_MODEL
+ )
+ ),
+ (
+ 'language',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='core.language',
+ verbose_name='Language'
+ )
+ ),
+ (
+ 'license',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ default=2,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='core.license',
+ verbose_name='License'
+ )
+ ),
],
options={
'verbose_name': 'historical exercise',
diff --git a/wger/exercises/migrations/0015_auto_20210613_2349.py b/wger/exercises/migrations/0015_auto_20210613_2349.py
index 8d07b3c5b..f1a0e3ead 100644
--- a/wger/exercises/migrations/0015_auto_20210613_2349.py
+++ b/wger/exercises/migrations/0015_auto_20210613_2349.py
@@ -16,50 +16,79 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='exercisecomment',
name='exercise',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
- to='exercises.exercise',
- verbose_name='Exercise'),
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.exercise',
+ verbose_name='Exercise'
+ ),
),
migrations.AlterField(
model_name='historicalexercise',
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='historicalexercisecomment',
name='exercise',
- field=models.ForeignKey(blank=True, db_constraint=False, null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+', to='exercises.exercise',
- verbose_name='Exercise'),
+ field=models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercise',
+ verbose_name='Exercise'
+ ),
),
migrations.CreateModel(
name='HistoricalExerciseAlias',
fields=[
- ('id', models.IntegerField(auto_created=True,
- blank=True,
- db_index=True,
- verbose_name='ID')),
- ('alias', models.CharField(max_length=200,
- verbose_name='Alias for an exercise')),
- ('history_id', models.AutoField(primary_key=True,
- serialize=False)),
+ (
+ 'id',
+ models.IntegerField(
+ auto_created=True, blank=True, db_index=True, verbose_name='ID'
+ )
+ ),
+ ('alias', models.CharField(max_length=200, verbose_name='Alias for an exercise')),
+ ('history_id', models.AutoField(primary_key=True, serialize=False)),
('history_date', models.DateTimeField()),
('history_change_reason', models.CharField(max_length=100, null=True)),
- ('history_type',
- models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
- max_length=1)),
- ('exercise', models.ForeignKey(blank=True, db_constraint=False, null=True,
- on_delete=django.db.models.deletion.DO_NOTHING,
- related_name='+', to='exercises.exercise',
- verbose_name='Exercise')),
- ('history_user',
- models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL,
- related_name='+', to=settings.AUTH_USER_MODEL)),
+ (
+ 'history_type',
+ models.CharField(
+ choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],
+ max_length=1
+ )
+ ),
+ (
+ 'exercise',
+ models.ForeignKey(
+ blank=True,
+ db_constraint=False,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+',
+ to='exercises.exercise',
+ verbose_name='Exercise'
+ )
+ ),
+ (
+ 'history_user',
+ models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='+',
+ to=settings.AUTH_USER_MODEL
+ )
+ ),
],
options={
'verbose_name': 'historical exercise alias',
@@ -71,11 +100,21 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='ExerciseAlias',
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'
+ )
+ ),
('alias', models.CharField(max_length=200, verbose_name='Alias for an exercise')),
- ('exercise', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
- to='exercises.exercise', verbose_name='Exercise')),
+ (
+ 'exercise',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.exercise',
+ verbose_name='Exercise'
+ )
+ ),
],
),
]
diff --git a/wger/exercises/models/__init__.py b/wger/exercises/models/__init__.py
index 9032c7bac..cc7f4a515 100644
--- a/wger/exercises/models/__init__.py
+++ b/wger/exercises/models/__init__.py
@@ -15,12 +15,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Local
-from .alias import ExerciseAlias
from .base import ExerciseBase
from .category import ExerciseCategory
from .comment import ExerciseComment
from .equipment import Equipment
from .exercise import Exercise
+from .exercise_alias import ExerciseAlias
from .image import ExerciseImage
from .muscle import Muscle
from .variation import Variation
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.py
index 94c82c948..bab166726 100644
--- a/wger/exercises/models/base.py
+++ b/wger/exercises/models/base.py
@@ -21,9 +21,10 @@ import uuid
from django.db import models
from django.utils.translation import gettext_lazy as _
-# wger
+# Third Party
from simple_history.models import HistoricalRecords
+# wger
from wger.utils.managers import SubmissionManager
from wger.utils.models import (
AbstractLicenseModel,
diff --git a/wger/exercises/models/comment.py b/wger/exercises/models/comment.py
index 94cef21e5..728ccf5c2 100644
--- a/wger/exercises/models/comment.py
+++ b/wger/exercises/models/comment.py
@@ -18,11 +18,12 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
+# Third Party
+from simple_history.models import HistoricalRecords
+
# wger
from wger.utils.cache import reset_workout_canonical_form
-from simple_history.models import HistoricalRecords
-
# Local
from .exercise import Exercise
diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.py
index 794a91f60..fa3030af5 100644
--- a/wger/exercises/models/exercise.py
+++ b/wger/exercises/models/exercise.py
@@ -32,10 +32,9 @@ from django.utils.translation import gettext_lazy as _
# Third Party
import bleach
-
-# wger
from simple_history.models import HistoricalRecords
+# wger
from wger.core.models import Language
from wger.exercises.models import ExerciseBase
from wger.utils.cache import (
diff --git a/wger/exercises/models/alias.py b/wger/exercises/models/exercise_alias.py
similarity index 86%
rename from wger/exercises/models/alias.py
rename to wger/exercises/models/exercise_alias.py
index 2dfe0b8a3..a9d6d1d6c 100644
--- a/wger/exercises/models/alias.py
+++ b/wger/exercises/models/exercise_alias.py
@@ -24,17 +24,19 @@ from simple_history.models import HistoricalRecords
# wger
from wger.utils.cache import reset_workout_canonical_form
+# Local
from .exercise import Exercise
+
class ExerciseAlias(models.Model):
"""
Model for an exercise (name)alias
"""
- exercise = models.ForeignKey(Exercise,
- verbose_name=_('Exercise'),
- on_delete=models.CASCADE)
- alias = models.CharField(max_length=200,
- verbose_name=_('Alias for an exercise'),)
+ exercise = models.ForeignKey(Exercise, verbose_name=_('Exercise'), on_delete=models.CASCADE)
+ alias = models.CharField(
+ max_length=200,
+ verbose_name=_('Alias for an exercise'),
+ )
history = HistoricalRecords()
"""Edit history"""
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index d436b827c..5aafbbf72 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -29,17 +29,15 @@ from wger.exercises.views import (
comments,
equipment,
exercises,
+ history,
images,
muscles,
- history,
)
# sub patterns for history
patterns_history = [
- path('overview/',
- history.overview,
- name='overview'),
+ path('overview/', history.overview, name='overview'),
]
# sub patterns for muscles
diff --git a/wger/exercises/views/history.py b/wger/exercises/views/history.py
index 1624ab699..b5e8c45bb 100644
--- a/wger/exercises/views/history.py
+++ b/wger/exercises/views/history.py
@@ -15,89 +15,18 @@
# Standard Library
import logging
-import uuid
# Django
-from django.conf import settings
-from django.contrib import messages
from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.mixins import (
- LoginRequiredMixin,
- PermissionRequiredMixin
-)
-from django.core import mail
-from django.core.exceptions import ValidationError
-from django.forms import (
- CharField,
- CheckboxSelectMultiple,
- ModelChoiceField,
- ModelForm,
- ModelMultipleChoiceField,
- Select,
- Textarea
-)
-from django.http import (
- HttpResponseForbidden,
- HttpResponseRedirect
-)
-from django.shortcuts import (
- get_object_or_404,
- render
-)
-from django.template.loader import render_to_string
-from django.urls import (
- reverse,
- reverse_lazy
-)
-from django.utils.cache import patch_vary_headers
-from django.utils.translation import (
- gettext as _,
- gettext_lazy
-)
-from django.views.generic import (
- CreateView,
- DeleteView,
- ListView,
- UpdateView
-)
-
-# Third Party
-from crispy_forms.layout import (
- Column,
- Layout,
- Row
-)
+from django.shortcuts import render
# wger
-from django.views.generic.base import TemplateResponseMixin
-
-from wger.config.models import LanguageConfig
-from wger.exercises.models import (
- Equipment,
- Exercise,
- ExerciseBase,
- ExerciseCategory,
- Muscle
-)
-from wger.manager.models import WorkoutLog
-from wger.utils.constants import MIN_EDIT_DISTANCE_THRESHOLD
-from wger.utils.generic_views import (
- WgerDeleteMixin,
- WgerFormMixin
-)
-from wger.utils.helpers import levenshtein
-from wger.utils.language import (
- load_item_languages,
- load_language
-)
-from wger.utils.widgets import TranslatedSelectMultiple
-from wger.weight.helpers import process_log_entries
+from wger.exercises.models import Exercise
logger = logging.getLogger(__name__)
-
@permission_required('exercises.change_exercise')
def overview(request):
"""
@@ -109,9 +38,7 @@ def overview(request):
history = Exercise.history.all()
for entry in history:
if entry.prev_record:
- out.append({'record': entry,
- 'delta': entry.diff_against(entry.prev_record)})
-
+ out.append({'record': entry, 'delta': entry.diff_against(entry.prev_record)})
context['history'] = out
diff --git a/wger/gym/helpers.py b/wger/gym/helpers.py
index c2ee1250a..147d4f7a6 100644
--- a/wger/gym/helpers.py
+++ b/wger/gym/helpers.py
@@ -14,12 +14,6 @@
#
# You should have received a copy of the GNU Affero General Public License
-# wger
-from wger.manager.models import (
- WorkoutLog,
- WorkoutSession,
-)
-
def get_user_last_activity(user):
"""
@@ -29,6 +23,11 @@ def get_user_last_activity(user):
:param user: user object
:return: a date or None if nothing was found
"""
+ # wger
+ from wger.manager.models import (
+ WorkoutLog,
+ WorkoutSession,
+ )
last_activity = None
diff --git a/wger/urls.py b/wger/urls.py
index f2543f618..85771372a 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -84,10 +84,18 @@ router.register(
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'exercisealias', exercises_api_views.ExerciseAliasViewSet, basename='exercisealias')
+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'exercisealias', exercises_api_views.ExerciseAliasViewSet, basename='exercisealias'
+)
router.register(r'muscle', exercises_api_views.MuscleViewSet, basename='muscle')
# Nutrition app
@@ -170,10 +178,12 @@ urlpatterns += [
),
# 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'
+ ),
path('email/', include(email_urls)),
-
]
#