From 6222349f3c7240ded27bfc42a61adb10cb9cbc94 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Thu, 9 Aug 2018 09:18:35 -0300 Subject: [PATCH] ajusta urls e routers da app api --- sapl/api/materia/urls.py | 5 +++++ sapl/api/sessao/serializers.py | 20 ++++++++++++++++++-- sapl/api/sessao/urls.py | 7 +++++++ sapl/api/sessao/views.py | 19 ++++++++++++------- sapl/api/urls.py | 7 +++---- sapl/sessao/serializers.py | 16 ---------------- sapl/templates/base/relatorios_list.html | 2 +- 7 files changed, 46 insertions(+), 30 deletions(-) diff --git a/sapl/api/materia/urls.py b/sapl/api/materia/urls.py index ce14115da..feea5bf60 100644 --- a/sapl/api/materia/urls.py +++ b/sapl/api/materia/urls.py @@ -1,8 +1,13 @@ +from rest_framework.routers import DefaultRouter +from sapl.api.materia.serializers import MateriaLegislativaViewSet # Não adicione app_name # app_name = AppConfig.name +router = DefaultRouter() +router.register(r'materia', MateriaLegislativaViewSet) + urlpatterns = [ ] diff --git a/sapl/api/sessao/serializers.py b/sapl/api/sessao/serializers.py index 1904e3e64..fc183d19a 100644 --- a/sapl/api/sessao/serializers.py +++ b/sapl/api/sessao/serializers.py @@ -4,7 +4,7 @@ from sapl.base.models import CasaLegislativa from sapl.sessao.models import SessaoPlenaria, OrdemDia -class SessaoPlenariaSerializer(serializers.ModelSerializer): +class SessaoPlenariaOldSerializer(serializers.ModelSerializer): codReuniao = serializers.SerializerMethodField('get_pk_sessao') codReuniaoPrincipal = serializers.SerializerMethodField('get_pk_sessao') @@ -57,7 +57,7 @@ class SessaoPlenariaSerializer(serializers.ModelSerializer): ) def __init__(self, *args, **kwargs): - super(SessaoPlenariaSerializer, self).__init__(args, kwargs) + super(SessaoPlenariaOldSerializer, self).__init__(args, kwargs) def get_pk_sessao(self, obj): return obj.pk @@ -120,3 +120,19 @@ class SessaoPlenariaSerializer(serializers.ModelSerializer): def casa(self): casa = CasaLegislativa.objects.first() return casa + + +class SessaoPlenariaSerializer(serializers.ModelSerializer): + + class Meta: + model = SessaoPlenaria + fields = ('tipo', + 'sessao_legislativa', + 'legislatura', + 'data_inicio', + 'hora_inicio', + 'hora_fim', + 'url_video', + 'iniciada', + 'finalizada' + ) diff --git a/sapl/api/sessao/urls.py b/sapl/api/sessao/urls.py index b2796fd7a..a8fd6e56f 100644 --- a/sapl/api/sessao/urls.py +++ b/sapl/api/sessao/urls.py @@ -1,8 +1,15 @@ from django.conf.urls import include, url +from rest_framework.routers import DefaultRouter +from sapl.api.sessao.views import SessaoPlenariaViewSet,\ + SessaoPlenariaOldViewSet # Não adicione app_name # app_name = AppConfig.name +router = DefaultRouter() +router.register(r'sessao-plenaria-old', SessaoPlenariaOldViewSet, + base_name='sessao-plenaria-old') +router.register(r'sessao-plenaria', SessaoPlenariaViewSet) urlpatterns = [ ] diff --git a/sapl/api/sessao/views.py b/sapl/api/sessao/views.py index ace1243d7..9dcdd2423 100644 --- a/sapl/api/sessao/views.py +++ b/sapl/api/sessao/views.py @@ -1,18 +1,23 @@ from rest_framework.filters import DjangoFilterBackend -from rest_framework.mixins import ListModelMixin, RetrieveModelMixin from rest_framework.permissions import AllowAny -from rest_framework.viewsets import GenericViewSet +from rest_framework.viewsets import ReadOnlyModelViewSet -from sapl.api.sessao.serializers import SessaoPlenariaSerializer +from sapl.api.sessao.serializers import SessaoPlenariaOldSerializer,\ + SessaoPlenariaSerializer from sapl.sessao.models import SessaoPlenaria -class SessaoPlenariaViewSet(ListModelMixin, - RetrieveModelMixin, - GenericViewSet): +class SessaoPlenariaOldViewSet(ReadOnlyModelViewSet): permission_classes = (AllowAny,) - serializer_class = SessaoPlenariaSerializer + serializer_class = SessaoPlenariaOldSerializer queryset = SessaoPlenaria.objects.all() filter_backends = (DjangoFilterBackend,) filter_fields = ('data_inicio', 'data_fim', 'interativa') + + +class SessaoPlenariaViewSet(ReadOnlyModelViewSet): + + permission_classes = (AllowAny,) + serializer_class = SessaoPlenariaSerializer + queryset = SessaoPlenaria.objects.all() diff --git a/sapl/api/urls.py b/sapl/api/urls.py index 771c26439..7a747a995 100644 --- a/sapl/api/urls.py +++ b/sapl/api/urls.py @@ -3,10 +3,8 @@ from django.conf.urls import include, url from rest_framework.routers import DefaultRouter import sapl.api.base.urls -from sapl.api.materia.serializers import MateriaLegislativaViewSet import sapl.api.materia.urls import sapl.api.sessao.urls -from sapl.api.sessao.views import SessaoPlenariaViewSet from sapl.api.views import ModelChoiceView from .apps import AppConfig @@ -16,8 +14,9 @@ app_name = AppConfig.name router = DefaultRouter() -router.register(r'materia', MateriaLegislativaViewSet) -router.register(r'sessao-plenaria', SessaoPlenariaViewSet) +router.registry += sapl.api.materia.urls.router.registry + \ + sapl.api.sessao.urls.router.registry + urlpatterns_router = router.urls urlpatterns_api = [ diff --git a/sapl/sessao/serializers.py b/sapl/sessao/serializers.py index b8e64358e..b7d93a4c5 100644 --- a/sapl/sessao/serializers.py +++ b/sapl/sessao/serializers.py @@ -1,19 +1,3 @@ from rest_framework import serializers from .models import SessaoPlenaria - - -class SessaoPlenariaSerializer(serializers.Serializer): - - class Meta: - model = SessaoPlenaria - fields = ('tipo', - 'sessao_legislativa', - 'legislatura', - 'data_inicio', - 'hora_inicio', - 'hora_fim', - 'url_video', - 'iniciada', - 'finalizada' - ) diff --git a/sapl/templates/base/relatorios_list.html b/sapl/templates/base/relatorios_list.html index 1bd0f5eda..c482e0449 100644 --- a/sapl/templates/base/relatorios_list.html +++ b/sapl/templates/base/relatorios_list.html @@ -42,5 +42,5 @@ - {% endblock base_content %}