From bc5561f24565ddff74f34d8c527e68abb5149d8f Mon Sep 17 00:00:00 2001 From: AlexP077 Date: Wed, 22 Mar 2023 20:38:19 +0300 Subject: [PATCH] add_filters --- service/views.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/service/views.py b/service/views.py index a2084cf..43a07aa 100644 --- a/service/views.py +++ b/service/views.py @@ -40,15 +40,16 @@ class PlacementPointViewSet(ReadOnlyModelViewSet): location_ids = self.request.GET.get('location_ids[]') prediction_first = self.request.GET.get('prediction_first[]') prediction_current = self.request.GET.get('prediction_current[]') + age_day = self.request.GET.get('age_day[]') categories = self.request.GET.get('categories[]') status = self.request.GET.get('status[]') delta = self.request.GET.get('delta[]') fact = self.request.GET.get('fact[]') - age = self.request.GET.get('age[]') included = self.request.GET.get('included[]') excluded = self.request.GET.get('excluded[]') plan_first = self.request.GET.get('plan_first[]') plan_current = self.request.GET.get('plan_current[]') + delta_current = self.request.GET.get('delta_current[]') rayons = self.request.GET.get('rayon[]') aos = self.request.GET.get('ao[]') if location_ids: @@ -72,15 +73,18 @@ class PlacementPointViewSet(ReadOnlyModelViewSet): if fact: fact = list(fact.split(',')) qs = qs.filter(fact__range=fact) - if age: - age = list(age.split(',')) - qs = qs.filter(age__range=age) if plan_first: plan_first = list(plan_first.split(',')) qs = qs.filter(plan_first__range=plan_first) if plan_current: plan_current = list(plan_current.split(',')) qs = qs.filter(plan_current__range=plan_current) + if age_day: + age_day = list(age_day.split(',')) + qs = qs.filter(age_day__range=age_day) + if delta_current: + delta_current = list(delta_current.split(',')) + qs = qs.filter(delta_current__range=delta_current) if rayons: rayons = list(rayons.split(',')) qs = qs.filter(rayon_id__in=rayons)