Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix flake8 errors

Scott Peshak247c28f4077f
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index dfa860ba7..5bf68bb70 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -84,7 +84,7 @@ class LanguageViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = LanguageSerializer
ordering_fields = '__all__'
filterset_fields = ('full_name',
- 'short_name')
+ 'short_name')
class DaysOfWeekViewSet(viewsets.ReadOnlyModelViewSet):
@@ -105,8 +105,8 @@ class LicenseViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = LicenseSerializer
ordering_fields = '__all__'
filterset_fields = ('full_name',
- 'short_name',
- 'url')
+ 'short_name',
+ 'url')
class RepetitionUnitViewSet(viewsets.ReadOnlyModelViewSet):
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 75ffbb304..980841aa7 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -62,16 +62,16 @@ class ExerciseViewSet(viewsets.ModelViewSet):
permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
ordering_fields = '__all__'
filterset_fields = ('category',
- 'creation_date',
- 'description',
- 'language',
- 'muscles',
- 'muscles_secondary',
- 'status',
- 'name',
- 'equipment',
- 'license',
- 'license_author')
+ 'creation_date',
+ 'description',
+ 'language',
+ 'muscles',
+ 'muscles_secondary',
+ 'status',
+ 'name',
+ 'equipment',
+ 'license',
+ 'license_author')
def perform_create(self, serializer):
'''
@@ -139,16 +139,16 @@ class ExerciseInfoViewset(viewsets.ModelViewSet):
permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
ordering_fields = '__all__'
filterset_fields = ('category',
- 'creation_date',
- 'description',
- 'language',
- 'muscles',
- 'muscles_secondary',
- 'status',
- 'name',
- 'equipment',
- 'license',
- 'license_author')
+ 'creation_date',
+ 'description',
+ 'language',
+ 'muscles',
+ 'muscles_secondary',
+ 'status',
+ 'name',
+ 'equipment',
+ 'license',
+ 'license_author')
class EquipmentViewSet(viewsets.ReadOnlyModelViewSet):
@@ -180,10 +180,10 @@ class ExerciseImageViewSet(viewsets.ModelViewSet):
permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
ordering_fields = '__all__'
filterset_fields = ('is_main',
- 'status',
- 'exercise',
- 'license',
- 'license_author')
+ 'status',
+ 'exercise',
+ 'license',
+ 'license_author')
@action(detail=True)
def thumbnails(self, request, pk):
@@ -223,7 +223,7 @@ class ExerciseCommentViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = ExerciseCommentSerializer
ordering_fields = '__all__'
filterset_fields = ('comment',
- 'exercise')
+ 'exercise')
class MuscleViewSet(viewsets.ReadOnlyModelViewSet):
@@ -234,4 +234,4 @@ class MuscleViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = MuscleSerializer
ordering_fields = '__all__'
filterset_fields = ('name',
- 'is_front')
+ 'is_front')
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index ff47ec12e..1c190bc65 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -169,10 +169,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
objects = SubmissionManager()
'''Custom manager'''
- class Meta:
- base_manager_name = 'objects'
-
-
category = models.ForeignKey(ExerciseCategory,
verbose_name=_('Category'),
on_delete=models.CASCADE)
@@ -227,6 +223,7 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
# Django methods
#
class Meta:
+ base_manager_name = 'objects'
ordering = ["name", ]
def get_absolute_url(self):
@@ -369,9 +366,6 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
objects = SubmissionManager()
'''Custom manager'''
- class Meta:
- base_manager_name = 'objects'
-
exercise = models.ForeignKey(Exercise,
verbose_name=_('Exercise'),
on_delete=models.CASCADE)
@@ -395,6 +389,7 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
Set default ordering
'''
ordering = ['-is_main', 'id']
+ base_manager_name = 'objects'
def save(self, *args, **kwargs):
'''
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index b38938f0a..e936f139d 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -56,7 +56,7 @@ class WorkoutViewSet(viewsets.ModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('comment',
- 'creation_date')
+ 'creation_date')
def get_queryset(self):
'''
@@ -90,11 +90,11 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('date',
- 'workout',
- 'notes',
- 'impression',
- 'time_start',
- 'time_end')
+ 'workout',
+ 'notes',
+ 'impression',
+ 'time_start',
+ 'time_end')
def get_queryset(self):
'''
@@ -124,9 +124,9 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('schedule',
- 'workout',
- 'duration',
- 'order')
+ 'workout',
+ 'duration',
+ 'order')
def get_queryset(self):
'''
@@ -150,9 +150,9 @@ class ScheduleViewSet(viewsets.ModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('is_active',
- 'is_loop',
- 'start_date',
- 'name')
+ 'is_loop',
+ 'start_date',
+ 'name')
def get_queryset(self):
'''
@@ -175,8 +175,8 @@ class DayViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('description',
- 'training',
- 'day')
+ 'training',
+ 'day')
def get_queryset(self):
'''
@@ -199,9 +199,9 @@ class SetViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('exerciseday',
- 'order',
- 'sets',
- 'exercises')
+ 'order',
+ 'sets',
+ 'exercises')
def get_queryset(self):
'''
@@ -224,11 +224,11 @@ class SettingViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('exercise',
- 'order',
- 'reps',
- 'weight',
- 'set',
- 'order')
+ 'order',
+ 'reps',
+ 'weight',
+ 'set',
+ 'order')
def get_queryset(self):
'''
@@ -257,10 +257,10 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('date',
- 'exercise',
- 'reps',
- 'weight',
- 'workout')
+ 'exercise',
+ 'reps',
+ 'weight',
+ 'workout')
def get_queryset(self):
'''
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 86fc7fd03..3f4aa43ed 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -56,20 +56,20 @@ class IngredientViewSet(viewsets.ReadOnlyModelViewSet):
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')
+ '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):
@@ -158,7 +158,7 @@ class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = WeightUnitSerializer
ordering_fields = '__all__'
filterset_fields = ('language',
- 'name')
+ 'name')
class IngredientWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
@@ -169,9 +169,9 @@ class IngredientWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = IngredientWeightUnitSerializer
ordering_fields = '__all__'
filterset_fields = ('amount',
- 'gram',
- 'ingredient',
- 'unit')
+ 'gram',
+ 'ingredient',
+ 'unit')
class NutritionPlanViewSet(viewsets.ModelViewSet):
@@ -182,9 +182,9 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('creation_date',
- 'language',
- 'description',
- 'has_goal_calories')
+ 'language',
+ 'description',
+ 'has_goal_calories')
def get_queryset(self):
'''
@@ -214,8 +214,8 @@ class MealViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('order',
- 'plan',
- 'time')
+ 'plan',
+ 'time')
def get_queryset(self):
'''
@@ -251,10 +251,10 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('amount',
- 'ingredient',
- 'meal',
- 'order',
- 'weight_unit')
+ 'ingredient',
+ 'meal',
+ 'order',
+ 'weight_unit')
def get_queryset(self):
'''
diff --git a/wger/weight/api/views.py b/wger/weight/api/views.py
index 29630db56..8f8f5b615 100644
--- a/wger/weight/api/views.py
+++ b/wger/weight/api/views.py
@@ -31,7 +31,7 @@ class WeightEntryViewSet(viewsets.ModelViewSet):
is_private = True
ordering_fields = '__all__'
filterset_fields = ('date',
- 'weight')
+ 'weight')
def get_queryset(self):
'''