From 13dd769e053b0c1158b7776af9684d68263dac09 Mon Sep 17 00:00:00 2001 From: AlexP077 Date: Wed, 5 Apr 2023 19:27:03 +0300 Subject: [PATCH] fix_to_excel --- service/service.py | 7 ++++--- service/views.py | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/service/service.py b/service/service.py index 5ade57b..2561eb7 100644 --- a/service/service.py +++ b/service/service.py @@ -54,9 +54,10 @@ class PointService: @staticmethod def to_excel(qs: models.PlacementPoint): data = pd.DataFrame(list(qs.values())) - data['start_date'] = data['start_date'].dt.tz_localize(None) - data['sample_trn'] = data['sample_trn'].astype(int) - data.rename(columns={'district_id': 'district', 'area_id': 'area'}, inplace=True) + if not data.empty: + data['start_date'] = data.get('start_date').dt.tz_localize(None) + data['sample_trn'] = data['sample_trn'].astype(int) + data.rename(columns={'district_id': 'district', 'area_id': 'area'}, inplace=True) with BytesIO() as b: with pd.ExcelWriter(b) as writer: data.to_excel( diff --git a/service/views.py b/service/views.py index 1574412..163f55a 100644 --- a/service/views.py +++ b/service/views.py @@ -53,8 +53,8 @@ class PlacementPointViewSet(ReadOnlyModelViewSet): 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[]') + rayons = self.request.GET.get('area[]') + aos = self.request.GET.get('district[]') if location_ids: location_ids = list(location_ids.split(',')) qs = qs.filter(pk__in=location_ids) @@ -90,10 +90,10 @@ class PlacementPointViewSet(ReadOnlyModelViewSet): qs = qs.filter(delta_current__range=delta_current) if rayons: rayons = list(rayons.split(',')) - qs = qs.filter(rayon_id__in=rayons) + qs = qs.filter(area_id__in=rayons) if aos: aos = list(aos.split(',')) - qs = qs.filter(okrug_id__in=aos) + qs = qs.filter(district_id__in=aos) if excluded: excluded = list(excluded.split(',')) qs = qs.filter(~Q(pk__in=excluded))