Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add filtering of endpoints
Roland Geider5592c7d9d2a2
diff --git a/requirements.txt b/requirements.txtindex 454a1d07c..44a0fda58 100644--- a/requirements.txt+++ b/requirements.txt@@ -12,4 +12,5 @@ pilloweasy-thumbnailsdjango_compressoricalendar-djangorestframework\ No newline at end of file+djangorestframework+django-filter\ No newline at end of filediff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex 65fad49f4..5af10879a 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -45,6 +45,8 @@ class LanguageViewSet(viewsets.ReadOnlyModelViewSet):'''model = Languageordering_fields = '__all__'+ filter_fields = ('full_name',+ 'short_name')class DaysOfWeekViewSet(viewsets.ReadOnlyModelViewSet):@@ -53,6 +55,7 @@ class DaysOfWeekViewSet(viewsets.ReadOnlyModelViewSet):'''model = DaysOfWeekordering_fields = '__all__'+ filter_fields = ('day_of_week', )class LicenseViewSet(viewsets.ReadOnlyModelViewSet):@@ -61,3 +64,6 @@ class LicenseViewSet(viewsets.ReadOnlyModelViewSet):'''model = Licenseordering_fields = '__all__'+ filter_fields = ('full_name',+ 'short_name',+ 'url')diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 408c5d0e7..9b4966231 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -35,6 +35,16 @@ class ExerciseViewSet(viewsets.ModelViewSet):'''model = Exerciseordering_fields = '__all__'+ filter_fields = ('category',+ 'creation_date',+ 'description',+ 'language',+ 'muscles',+ 'status',+ 'name',+ 'license',+ 'license_author'+ )def pre_save(self, obj):'''@@ -50,6 +60,7 @@ class EquipmentViewSet(viewsets.ReadOnlyModelViewSet):'''model = Equipmentordering_fields = '__all__'+ filter_fields = ('name',)class ExerciseCategoryViewSet(viewsets.ReadOnlyModelViewSet):@@ -58,6 +69,7 @@ class ExerciseCategoryViewSet(viewsets.ReadOnlyModelViewSet):'''model = ExerciseCategoryordering_fields = '__all__'+ filter_fields = ('name',)class ExerciseImageViewSet(viewsets.ModelViewSet):@@ -66,6 +78,10 @@ class ExerciseImageViewSet(viewsets.ModelViewSet):'''model = ExerciseImageordering_fields = '__all__'+ filter_fields = ('image',+ 'is_main',+ 'license',+ 'license_author')@link()def thumbnails(self, request, pk):@@ -95,6 +111,8 @@ class ExerciseCommentViewSet(viewsets.ReadOnlyModelViewSet):'''model = ExerciseCommentordering_fields = '__all__'+ filter_fields = ('comment',+ 'exercise')class MuscleViewSet(viewsets.ReadOnlyModelViewSet):@@ -103,3 +121,5 @@ class MuscleViewSet(viewsets.ReadOnlyModelViewSet):'''model = Muscleordering_fields = '__all__'+ filter_fields = ('name',+ 'is_front')diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex dc9a2ebc1..34fc5a493 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -48,6 +48,8 @@ class WorkoutViewSet(viewsets.ModelViewSet):model = Workoutserializer_class = WorkoutSerializeris_private = True+ filter_fields = ('comment',+ 'creation_date')def get_queryset(self):'''@@ -80,6 +82,9 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):model = WorkoutSessionserializer_class = WorkoutSessionSerializeris_private = True+ filter_fields = ('date',+ 'time_start',+ 'time_end')def get_queryset(self):'''@@ -111,6 +116,10 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):model = ScheduleStepis_private = Trueordering_fields = '__all__'+ filter_fields = ('schedule',+ 'workout',+ 'duration',+ 'order')def get_queryset(self):'''@@ -139,6 +148,9 @@ class ScheduleViewSet(viewsets.ModelViewSet):model = Scheduleserializer_class = ScheduleSerializeris_private = True+ filter_fields = ('is_active',+ 'is_loop',+ 'name')def get_queryset(self):'''@@ -160,6 +172,9 @@ class DayViewSet(WgerOwnerObjectModelViewSet):model = Dayserializer_class = DaySerializeris_private = True+ filter_fields = ('description',+ 'training',+ 'day')def get_queryset(self):'''@@ -181,6 +196,10 @@ class SetViewSet(WgerOwnerObjectModelViewSet):model = Setserializer_class = SetSerializeris_private = True+ filter_fields = ('exerciseday',+ 'order',+ 'sets',+ 'exercises')def get_queryset(self):'''@@ -202,6 +221,11 @@ class SettingViewSet(WgerOwnerObjectModelViewSet):model = Settingserializer_class = SettingSerializeris_private = True+ filter_fields = ('exercise',+ 'order',+ 'reps',+ 'set',+ 'order')def get_queryset(self):'''@@ -229,11 +253,17 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):model = WorkoutLogserializer_class = WorkoutLogSerializeris_private = True+ filter_fields = ('date',+ 'exercise',+ 'reps',+ 'weight',+ 'workout')def get_queryset(self):'''Only allow access to appropriate objects'''+return WorkoutLog.objects.filter(user=self.request.user)def pre_save(self, obj):diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex 67e9947b3..6e9e05742 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -37,6 +37,21 @@ class IngredientViewSet(viewsets.ReadOnlyModelViewSet):'''model = Ingredientordering_fields = '__all__'+ filter_fields = ('carbohydrates',+ 'carbohydrates_sugar',+ 'creation_date',+ 'energy',+ 'fat',+ 'fat_saturated',+ 'fibres',+ 'name',+ 'protein',+ 'sodium',+ 'status',+ 'update_date',+ 'language',+ 'license',+ 'license_author')class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):@@ -45,6 +60,8 @@ class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):'''model = WeightUnitordering_fields = '__all__'+ filter_fields = ('language',+ 'name')class IngredientWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):@@ -53,6 +70,10 @@ class IngredientWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):'''model = IngredientWeightUnitordering_fields = '__all__'+ filter_fields = ('amount',+ 'gramm',+ 'ingredient',+ 'unit')class NutritionPlanViewSet(viewsets.ModelViewSet):@@ -63,6 +84,9 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):serializer_class = NutritionPlanSerializeris_private = Trueordering_fields = '__all__'+ filter_fields = ('creation_date',+ 'description',+ 'has_goal_calories')def get_queryset(self):'''@@ -91,6 +115,9 @@ class MealViewSet(WgerOwnerObjectModelViewSet):model = Mealis_private = Trueordering_fields = '__all__'+ filter_fields = ('order',+ 'plan',+ 'time')def get_queryset(self):'''@@ -125,6 +152,11 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):model = MealItemis_private = Trueordering_fields = '__all__'+ filter_fields = ('amount',+ 'ingredient',+ 'meal',+ 'order',+ 'weight_unit')def get_queryset(self):'''diff --git a/wger/settings_global.py b/wger/settings_global.pyindex 7a0b6a988..d33fde553 100644--- a/wger/settings_global.py+++ b/wger/settings_global.py@@ -344,5 +344,6 @@ REST_FRAMEWORK = {'rest_framework.authentication.SessionAuthentication','rest_framework.authentication.TokenAuthentication',),- 'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.OrderingFilter',)+ 'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.OrderingFilter',+ 'rest_framework.filters.DjangoFilterBackend',)}diff --git a/wger/urls.py b/wger/urls.pyindex b5d7ade24..b36bcffcf 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -108,8 +108,8 @@ router.register(r'muscle', exercises_api_views.MuscleViewSet)# Nutrition approuter.register(r'ingredient', nutrition_api_views.IngredientViewSet)router.register(r'weightunit', nutrition_api_views.WeightUnitViewSet)-router.register(r'ingredienttoweightunit', nutrition_api_views.IngredientWeightUnitViewSet)-router.register(r'nutrition', nutrition_api_views.NutritionPlanViewSet)+router.register(r'ingredientweightunit', nutrition_api_views.IngredientWeightUnitViewSet)+router.register(r'nutritionplan', nutrition_api_views.NutritionPlanViewSet)router.register(r'meal', nutrition_api_views.MealViewSet)router.register(r'mealitem', nutrition_api_views.MealItemViewSet)diff --git a/wger/weight/api/views.py b/wger/weight/api/views.pyindex 81dbf950f..de4c6d971 100644--- a/wger/weight/api/views.py+++ b/wger/weight/api/views.py@@ -29,6 +29,8 @@ class WeightEntryViewSet(viewsets.ModelViewSet):serializer_class = WeightEntrySerializeris_private = Trueordering_fields = '__all__'+ filter_fields = ('creation_date',+ 'weight')def get_queryset(self):'''