update

rog/views.py

@@ -1,7 +1,7 @@
 from django.core.serializers import serialize
-from .models import Location, Location_line, Location_polygon, JpnAdminMainPerf, JpnAdminPerf, JpnSubPerf, Useractions, GifuAreas
+from .models import Location, Location_line, Location_polygon, JpnAdminMainPerf, JpnAdminPerf, JpnSubPerf, Useractions, GifuAreas, RogUser, CustomUser
 from rest_framework import viewsets
-from .serializers import LocationSerializer, Location_lineSerializer, Location_polygonSerializer, JPN_main_perfSerializer, JPN_perfSerializer, JPN_sub_perSerializer, LocationCatSerializer, CreateUserSerializer, UserSerializer, LoginUserSerializer, UseractionsSerializer, UserDestinationSerializer, GifuAreaSerializer
+from .serializers import LocationSerializer, Location_lineSerializer, Location_polygonSerializer, JPN_main_perfSerializer, JPN_perfSerializer, JPN_sub_perSerializer, LocationCatSerializer, CreateUserSerializer, UserSerializer, LoginUserSerializer, UseractionsSerializer, UserDestinationSerializer, GifuAreaSerializer, LocationEventNameSerializer, RogUserSerializer
 from knox.models import AuthToken
 
 from rest_framework import viewsets, permissions, generics
@@ -37,7 +37,7 @@ class Location_polygonViewSet(viewsets.ModelViewSet):
 
 
 class Jpn_Main_PerfViewSet(viewsets.ModelViewSet):
-    queryset=JpnAdminMainPerf.objects.all()
+    queryset=JpnAdminMainPerf.objects.filter(id=9)
     serializer_class=JPN_main_perfSerializer
     filter_fields = ["adm1_ja"]
 
@@ -201,6 +201,15 @@ class UserAPI(generics.RetrieveAPIView):
         return self.request.user
 
 
+def userDetials(request):
+    user_id = request.GET.get('user_id')
+    user = CustomUser.objects.get(id=user_id)
+    rogUser = RogUser.objects.filter(user=user)
+    serializer = RogUserSerializer(rogUser, many=True)
+    return JsonResponse(serializer.data, safe=False)
+
+
+
 def UserActionViewset(request):
     user_id = request.GET.get('user_id')
     location_id = request.GET.get('location_id')
@@ -233,7 +242,7 @@ def UserDestinations(request):
         user_id = request.GET.get('user_id')
         user = CustomUser.objects.get(id=user_id)
         #action = Useractions.objects.filter(location__id=location_id, user__id=user_id)
-        rec = Useractions.objects.filter(user=user, checkin=True).order_by('order')
+        rec = Useractions.objects.filter(user=user, wanttogo=True).order_by('order')
         serializer = UserDestinationSerializer(rec, many=True)
         return JsonResponse(serializer.data, safe=False)
 
@@ -300,17 +309,23 @@ def DeleteDestination(request):
 def CustomAreaLocations(request):
     
     cat = request.GET.get('cat')
+    name = request.GET.get('name')
     if(cat != None):
         print("----res from cat")
-        locs = Location.objects.filter(event_name__isnull=False, category=cat)
+        locs = Location.objects.filter(event_name__isnull=False, category=cat, event_name=name)
     else:
-        locs = Location.objects.filter(event_name__isnull=False)
+        locs = Location.objects.filter(event_name__isnull=False, event_name=name)
     
     serializer = LocationSerializer(locs, many=True) 
     return JsonResponse(serializer.data, safe=False)
-    
 
 
+def CustomAreaNames(request):
+    locs = Location.objects.filter(event_name__isnull=False).values('event_name').distinct()
+
+    serializer = LocationEventNameSerializer(locs, many=True)
+    return JsonResponse(serializer.data, safe=False)
+
 
 class TestActionViewSet(viewsets.ModelViewSet):
     serializer_class = TestSerialiser