fix_to_excel

dev
AlexP077 3 years ago committed by Dmitry Titov
parent 67176280a4
commit 13dd769e05

@ -54,9 +54,10 @@ class PointService:
@staticmethod @staticmethod
def to_excel(qs: models.PlacementPoint): def to_excel(qs: models.PlacementPoint):
data = pd.DataFrame(list(qs.values())) data = pd.DataFrame(list(qs.values()))
data['start_date'] = data['start_date'].dt.tz_localize(None) if not data.empty:
data['sample_trn'] = data['sample_trn'].astype(int) data['start_date'] = data.get('start_date').dt.tz_localize(None)
data.rename(columns={'district_id': 'district', 'area_id': 'area'}, inplace=True) data['sample_trn'] = data['sample_trn'].astype(int)
data.rename(columns={'district_id': 'district', 'area_id': 'area'}, inplace=True)
with BytesIO() as b: with BytesIO() as b:
with pd.ExcelWriter(b) as writer: with pd.ExcelWriter(b) as writer:
data.to_excel( data.to_excel(

@ -53,8 +53,8 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
plan_first = self.request.GET.get('plan_first[]') plan_first = self.request.GET.get('plan_first[]')
plan_current = self.request.GET.get('plan_current[]') plan_current = self.request.GET.get('plan_current[]')
delta_current = self.request.GET.get('delta_current[]') delta_current = self.request.GET.get('delta_current[]')
rayons = self.request.GET.get('rayon[]') rayons = self.request.GET.get('area[]')
aos = self.request.GET.get('ao[]') aos = self.request.GET.get('district[]')
if location_ids: if location_ids:
location_ids = list(location_ids.split(',')) location_ids = list(location_ids.split(','))
qs = qs.filter(pk__in=location_ids) qs = qs.filter(pk__in=location_ids)
@ -90,10 +90,10 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
qs = qs.filter(delta_current__range=delta_current) qs = qs.filter(delta_current__range=delta_current)
if rayons: if rayons:
rayons = list(rayons.split(',')) rayons = list(rayons.split(','))
qs = qs.filter(rayon_id__in=rayons) qs = qs.filter(area_id__in=rayons)
if aos: if aos:
aos = list(aos.split(',')) aos = list(aos.split(','))
qs = qs.filter(okrug_id__in=aos) qs = qs.filter(district_id__in=aos)
if excluded: if excluded:
excluded = list(excluded.split(',')) excluded = list(excluded.split(','))
qs = qs.filter(~Q(pk__in=excluded)) qs = qs.filter(~Q(pk__in=excluded))

Loading…
Cancel
Save