TRUNK
/
postnet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filters+status_update

Browse Source
dev
AlexP077 3 years ago committed by Dmitry Titov
parent ad38eaf93d
commit b5d496054a
4 changed files with 111 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
service/urls.py
Unescape View File

@ -9,6 +9,7 @@ from service import views
router = routers.DefaultRouter()
router.register('', views.PlacementPointViewSet)
schema_view = get_schema_view(
openapi.Info(
title="Snippets API",
@ -24,7 +25,7 @@ schema_view = get_schema_view(
)
urlpatterns = [
path('placement_points', include(router.urls), name='placement_points'),
path('placement_points/', include([*router.urls,url(r'update_status', views.update_status.as_view(), name='update_status')]), name='placement_points'),
path('ao_and_rayons/', views.ao_and_rayons.as_view(), name='ao_and_rayons'),
path('raschet/', views.raschet.as_view(), name='ao_and_rayons'),
url(r'load_csv/', views.refresh_placement_points.as_view(), name='upload_placement_points'),

2
service/utils.py
Unescape View File

@ -98,3 +98,5 @@ def load_ao_and_rayons(ao_filepath: str,
ao = models.AO.objects.get(name=okr)
models.Rayon.objects.create(**{'name': name, 'polygon': GEOSGeometry(str(MultiPolygon(coords))), 'AO': ao})
print('AO and Rayons loaded')

109
service/views.py
Unescape View File

@ -5,15 +5,16 @@ import pandas as pd
from django.core.cache import cache
from django.db.models import Q
from django.http import HttpResponse
from rest_framework import permissions
from rest_framework import permissions, status
from rest_framework.decorators import action
from rest_framework.generics import GenericAPIView
from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework.viewsets import ReadOnlyModelViewSet
from service import serializers, models, pagination
from service.utils import raschet as raschet_alg, load_data
from service import utils
from service.utils import raschet as raschet_alg, load_data
def rename_result_dataset(dataframe, rename_dict, reverse=False):
@ -193,6 +194,8 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
age = self.request.GET.get('age[]')
included = self.request.GET.get('included[]')
excluded = self.request.GET.get('excluded[]')
if not any([location_ids, prediction, categories, status, delta, fact, age]):
qs = models.PlacementPoint.objects.none()
if location_ids:
location_ids = list(location_ids.split(','))
qs = qs.filter(location_id__in=location_ids)
@ -223,6 +226,54 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
qs = (qs | qs2).distinct()
return qs
@action(detail=False, methods=['get'])
def filters(self, request):
qs = self.get_queryset()
age_day = [x for x in list(set(qs.values_list('age_day', flat=True))) if x is not None]
prediction_first = [x for x in list(set(qs.values_list('prediction_first', flat=True))) if x is not None]
prediction_current = [x for x in list(set(qs.values_list('prediction_current', flat=True))) if x is not None]
plan_first = [x for x in list(set(qs.values_list('plan_first', flat=True))) if x is not None]
plan_current = [x for x in list(set(qs.values_list('plan_current', flat=True))) if x is not None]
fact = [x for x in list(set(qs.values_list('fact', flat=True))) if x is not None]
delta_first = [x for x in list(set(qs.values_list('delta_first', flat=True))) if x is not None]
delta_current = [x for x in list(set(qs.values_list('delta_current', flat=True))) if x is not None]
flat_cnt = [x for x in list(set(qs.values_list('flat_cnt', flat=True))) if x is not None]
year_bld = [x for x in list(set(qs.values_list('year_bld', flat=True))) if x is not None]
levels = [x for x in list(set(qs.values_list('levels', flat=True))) if x is not None]
doors = [x for x in list(set(qs.values_list('doors', flat=True))) if x is not None]
flats_cnt = [x for x in list(set(qs.values_list('flats_cnt', flat=True))) if x is not None]
popul_home = [x for x in list(set(qs.values_list('popul_home', flat=True))) if x is not None]
popul_job = [x for x in list(set(qs.values_list('popul_job', flat=True))) if x is not None]
other_post_cnt = [x for x in list(set(qs.values_list('other_post_cnt', flat=True))) if x is not None]
target_post_cnt = [x for x in list(set(qs.values_list('target_post_cnt', flat=True))) if x is not None]
yndxfood_cnt = [x for x in list(set(qs.values_list('yndxfood_cnt', flat=True))) if x is not None]
yndxfood_sum = [x for x in list(set(qs.values_list('yndxfood_sum', flat=True))) if x is not None]
yndxfood_cnt_cst = [x for x in list(set(qs.values_list('yndxfood_cnt_cst', flat=True))) if x is not None]
data = {
"age_day": [min(age_day), max(age_day)] if age_day else [0, 2030],
"prediction_first": [min(prediction_first), max(prediction_first)] if prediction_first else [-22, 22],
"prediction_current": [min(prediction_current), max(prediction_current)] if prediction_current else [-22,
22],
"plan_first": [min(plan_first), max(plan_first)] if plan_first else [0, 100],
"plan_current": [min(plan_current), max(plan_current)] if plan_current else [0, 100],
"fact": [min(fact), max(fact)] if fact else [0, 100],
"delta_first": [min(delta_first), max(delta_first)] if delta_first else [0, 100],
"delta_current": [min(delta_current), max(delta_current)] if delta_current else [0, 100],
"flat_cnt": [min(flat_cnt), max(flat_cnt)] if flat_cnt else [0, 100],
"year_bld": [min(year_bld), max(year_bld)] if year_bld else [0, 2030],
"levels": [min(levels), max(levels)] if levels else [0, 100],
"doors ": [min(doors), max(doors)] if doors else [0, 100],
"flats_cnt": [min(flats_cnt), max(flats_cnt)] if flats_cnt else [0, 100],
"popul_home": [min(popul_home), max(popul_home)] if popul_home else [0, 100],
"popul_job": [min(popul_job), max(popul_job)] if popul_job else [0, 100],
"other_post_cnt": [min(other_post_cnt), max(other_post_cnt)] if other_post_cnt else [0, 100],
"target_post_cnt": [min(target_post_cnt), max(target_post_cnt)] if target_post_cnt else [0, 100],
"yndxfood_cnt": [min(yndxfood_cnt), max(yndxfood_cnt)] if yndxfood_cnt else [0, 100],
"yndxfood_sum": [min(yndxfood_sum), max(yndxfood_sum)] if yndxfood_sum else [0, 100],
"yndxfood_cnt_cst": [min(yndxfood_cnt_cst), max(yndxfood_cnt_cst)] if yndxfood_cnt_cst else [0, 100],
}
return Response(data, status=status.HTTP_200_OK)
import warnings
@ -235,11 +286,61 @@ class refresh_placement_points(APIView):
load_data(file)
return Response(200)
class load_ao_and_rayons(APIView):
@staticmethod
def post(request):
warnings.filterwarnings('ignore')
file_ao = request.FILES['file_ao']
file_rayon = request.FILES['file_rayon']
utils.load_ao_and_rayons(file_ao,file_rayon)
return Response(200)
utils.load_ao_and_rayons(file_ao, file_rayon)
return Response(200)
class update_status(APIView):
def put(self, request):
qs = models.PlacementPoint.objects.all()
new_status = self.request.GET.get('status')
location_ids = self.request.GET.get('location_ids[]')
prediction = self.request.GET.get('prediction[]')
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[]')
if not any([location_ids, prediction, categories, status, delta, fact, age]):
qs = models.PlacementPoint.objects.none()
if location_ids:
location_ids = list(location_ids.split(','))
qs = qs.filter(location_id__in=location_ids)
if prediction:
prediction = list(prediction.split(','))
qs = qs.filter(prediction__range=prediction)
if categories:
categories = list(categories.split(','))
qs = qs.filter(category__in=categories)
if status:
status = list(status.split(','))
qs = qs.filter(status__in=status)
if delta:
delta = list(delta.split(','))
qs = qs.filter(delta__range=delta)
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 excluded:
excluded = list(excluded.split(','))
qs = qs.filter(~Q(location_id__in=excluded))
if included:
inclded = list(included.split(','))
qs2 = models.PlacementPoint.objects.filter(location_id__in=inclded).all()
qs = (qs | qs2).distinct()
if not any([location_ids, prediction, categories, status, delta, fact, age, excluded, included]):
return Response(200)
qs.update(**{'status': new_status})
return Response(200)

4
templates/admin/index.html
Unescape View File

@ -51,13 +51,13 @@
<div>
<h3>Обновить файл точек</h3>
<form method="post" action="/api/placement_points/upload_csv/" enctype="multipart/form-data">
<form method="post" action="/api/load_csv/" enctype="multipart/form-data">
{% csrf_token %}
<input type="file" required=True name="file" accept=".csv">
<input type="submit" value="Отправить">
</form>
<h3>Загрузить районы и АО</h3>
<form method="post" action="/api/placement_points/upload_ao_and_rayons/" enctype="multipart/form-data">
<form method="post" action="/api/upload_ao_and_rayons/" enctype="multipart/form-data">
{% csrf_token %}
<h4>Файл с АО</h4>
<input type="file" required=True name="file_ao" accept=".geojson">

Write Preview
Loading…
Cancel
Save