From 1b64e32b2a27de7c08e62eae0a6883d5c5032415 Mon Sep 17 00:00:00 2001 From: Francisco Sandoval Date: Tue, 5 Dec 2023 13:52:03 -0300 Subject: [PATCH] se deshabilita ruta proto --- docs/rest/dispositivo.rest | 16 +++++++++++++++- project/api/urls.py | 4 ++-- project/api/views/linea.py | 4 +++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/rest/dispositivo.rest b/docs/rest/dispositivo.rest index 013a9a6..f004705 100644 --- a/docs/rest/dispositivo.rest +++ b/docs/rest/dispositivo.rest @@ -1,5 +1,5 @@ -@server = http://localhost:3000/api +@server = http://localhost:4000/api @token = {{login.response.body.$.token}} ### @@ -78,4 +78,18 @@ Authorization: Bearer {{token}} ### GET {{server}}/lineas/buses_proto/?id_linea=730-0 +Authorization: Bearer {{token}} + + + + +### +GET {{server}}/lineas/730-0 +Authorization: Bearer {{token}} + + + + +### +GET {{server}}/lineas/paraderos/?id_linea=730-0 Authorization: Bearer {{token}} \ No newline at end of file diff --git a/project/api/urls.py b/project/api/urls.py index cd00f9f..9e2897a 100755 --- a/project/api/urls.py +++ b/project/api/urls.py @@ -5,7 +5,7 @@ from api.views import usuario, auth, aplicacion, tipo, persona, comuna, region, from api.views import mapa, linea, letrero_lur, operador from api.views import paradero_imagen, linea_paradero from api.views import dispositivo -from api.views import proto +# from api.views import proto router = routers.DefaultRouter() router.register('aplicaciones', aplicacion.AplicacionViewSet) @@ -34,5 +34,5 @@ urlpatterns = [ path('mapas/paraderos/', mapa.paraderos, name='mapa-paraderos'), path('mapas/rutas/', mapa.rutas, name='mapa-rutas'), path('paraderos/info-public//', paradero.info_public, name='paradero-infopublic'), - path('proto/status/', proto.status, name='proto_status'), + # path('proto/status/', proto.status, name='proto_status'), ] diff --git a/project/api/views/linea.py b/project/api/views/linea.py index cdd1134..ca8b3d4 100755 --- a/project/api/views/linea.py +++ b/project/api/views/linea.py @@ -1,7 +1,7 @@ from rest_framework import viewsets # from rest_framework.response import Response -from rest_framework.decorators import action +from rest_framework.decorators import action, api_view from django_filters.rest_framework import DjangoFilterBackend from django.db import connection from .. import models, serializers @@ -34,6 +34,8 @@ class LineaViewSet(viewsets.ModelViewSet): def paraderos(self, request, pk=None): pk = request.GET['id_linea'] + logging.error(request.GET) + paraderos = models.Paradero.objects \ .filter(vigente=True, lineaparadero__id_linea=pk) \ .values('id_paradero','stop_lat','stop_lon','stop_name') \