diff --git a/config/settings.py b/config/settings.py index 5464be9..2628306 100644 --- a/config/settings.py +++ b/config/settings.py @@ -51,6 +51,7 @@ INSTALLED_APPS = [ 'leaflet', 'leaflet_admin_list', 'rog.apps.RogConfig', + 'django_filters', ] MIDDLEWARE = [ @@ -165,3 +166,7 @@ LEAFLET_CONFIG = { 'TILES': [('Satellite', 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {'attribution': '© ESRI', 'maxZoom': 19}), ('Streets', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {'attribution': '© Contributors'})] } + +REST_FRAMEWORK = { + 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'] +} \ No newline at end of file diff --git a/rog/models.py b/rog/models.py index e2080f6..bce64ff 100644 --- a/rog/models.py +++ b/rog/models.py @@ -394,26 +394,6 @@ def publish_date(sender, instance, created, **kwargs): updateLineTable(mdl, fields) if instance.layerof == 3: updatePolygonTable(mdl, fields) - # with open(csv_f, 'r') as txt_file: - # reader = csv.reader(codecs.EncodedFile(txt_file, 'utf-8', 'utf-8-sig'), delimiter=",") - # for ln in reader: - # pass - # print(str(ln)) - # fields = ln.split(",") - # if instance.layerof == 2: - # updateLineTable(mdl, fields) - # if instance.layerof == 3: - # updatePolygonTable(mdl, fields) - #with open(csv, encoding='"utf-8-sig"') as txt_file: - #with open(csv, 'r') as txt_file: - # lns = txt_file.readlines() - # print(lns) - # for ln in lns: - # fields = ln.split(",") - # if instance.layerof == 2: - # updateLineTable(mdl, fields) - # if instance.layerof == 3: - # updatePolygonTable(mdl, fields) except Exception as e: print('##################',e) diff --git a/rog/views.py b/rog/views.py index 255f35f..26312b8 100644 --- a/rog/views.py +++ b/rog/views.py @@ -6,12 +6,15 @@ from .serializers import LocationSerializer, Location_lineSerializer, Location_p from rest_framework.decorators import action from rest_framework.response import Response from rest_framework.parsers import JSONParser, MultiPartParser +from .models import Location +from .serializers import LocationSerializer class LocationViewSet(viewsets.ModelViewSet): queryset=Location.objects.all() serializer_class=LocationSerializer + filter_fields=["prefecture", "location_name"] class Location_lineViewSet(viewsets.ModelViewSet): @@ -27,6 +30,7 @@ class Location_polygonViewSet(viewsets.ModelViewSet): class Jpn_Main_PerfViewSet(viewsets.ModelViewSet): queryset=JpnAdminMainPerf.objects.all() serializer_class=JPN_main_perfSerializer + filter_fields = ["adm1_ja"] class Jpn_PerfViewSet(viewsets.ModelViewSet): queryset=JpnAdminPerf.objects.all()