Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add or update more filtersets
Roland Geider56c195601fcf
diff --git a/wger/manager/api/filtersets.py b/wger/manager/api/filtersets.pyindex fe02b0ae7..f4b4f5942 100644--- a/wger/manager/api/filtersets.py+++ b/wger/manager/api/filtersets.py@@ -36,15 +36,15 @@ class WorkoutLogFilterSet(filters.FilterSet):fields = {'routine': ['exact'],'session': ['exact'],- 'date': ['exact', 'date', 'gt', 'lt'],+ 'date': ['exact', 'date', 'gt', 'gte', 'lt', 'lte'],'exercise': ['exact', 'in'],'iteration': ['exact', 'in'],'repetitions_unit': ['exact', 'in'],- 'repetitions': ['exact', 'gt', 'lt'],- 'repetitions_target': ['exact', 'gt', 'lt'],+ 'repetitions': ['exact', 'gt', 'gte', 'lt', 'lte'],+ 'repetitions_target': ['exact', 'gt', 'gte', 'lt', 'lte'],'weight_unit': ['exact', 'in'],- 'weight': ['exact', 'gt', 'lt'],- 'weight_target': ['exact', 'gt', 'lt'],- 'rir': ['exact', 'in', 'gt', 'lt'],- 'rir_target': ['exact', 'in', 'gt', 'lt'],+ 'weight': ['exact', 'gt', 'gte', 'lt', 'lte'],+ 'weight_target': ['exact', 'gt', 'gte', 'lt', 'lte'],+ 'rir': ['exact', 'in', 'gt', 'gte', 'lt', 'lte'],+ 'rir_target': ['exact', 'in', 'gt', 'gte', 'lt', 'lte'],}diff --git a/wger/measurements/api/filtersets.py b/wger/measurements/api/filtersets.pynew file mode 100644index 000000000..378858bd4--- /dev/null+++ b/wger/measurements/api/filtersets.py@@ -0,0 +1,30 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# 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/>.++# Third Party+from django_filters import rest_framework as filters++# wger+from wger.measurements.models import Measurement+++class MeasurementEntryFilterSet(filters.FilterSet):+ class Meta:+ model = Measurement+ fields = {+ 'id': ['exact', 'in'],+ 'category': ['exact', 'in', ],+ 'date': ['exact', 'gt', 'gte', 'lt', 'lte'],+ }diff --git a/wger/measurements/api/views.py b/wger/measurements/api/views.pyindex 71292a814..42e70caa5 100644--- a/wger/measurements/api/views.py+++ b/wger/measurements/api/views.py@@ -23,6 +23,7 @@ from rest_framework import viewsetsfrom rest_framework.permissions import IsAuthenticated# wger+from wger.measurements.api.filtersets import MeasurementEntryFilterSetfrom wger.measurements.api.serializers import (MeasurementSerializer,UnitSerializer,@@ -32,7 +33,6 @@ from wger.measurements.models import (Measurement,)-logger = logging.getLogger(__name__)@@ -73,12 +73,7 @@ class MeasurementViewSet(viewsets.ModelViewSet):serializer_class = MeasurementSerializeris_private = Trueordering_fields = '__all__'- filterset_fields = [- 'id',- 'category',- 'date',- 'value',- ]+ filterset_class = MeasurementEntryFilterSetdef get_queryset(self):"""diff --git a/wger/nutrition/api/filtersets.py b/wger/nutrition/api/filtersets.pyindex c324a8251..bddc18add 100644--- a/wger/nutrition/api/filtersets.py+++ b/wger/nutrition/api/filtersets.py@@ -12,7 +12,7 @@ class LogItemFilterSet(filters.FilterSet):class Meta:model = LogItemfields = {- 'datetime': ['exact', 'date'],+ 'datetime': ['exact', 'date', 'gt', 'gte', 'lt', 'lte'],'amount': ['exact'],'ingredient': ['exact'],'plan': ['exact'],