diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py index c886b54f0..d80211e0a 100644 --- a/protocoloadm/urls.py +++ b/protocoloadm/urls.py @@ -2,7 +2,9 @@ from django.conf.urls import include, url from protocoloadm.views import (AnularProtocoloAdmView, ProtocoloDocumentoView, ProtocoloListView, ProtocoloMateriaView, - ProtocoloPesquisaView, + ProtocoloPesquisaView, + ProposicaoReceberView, ProposicoesIncorporadasView, + ProposicoesNaoIncorporadasView, ProposicoesNaoRecebidasView, documento_acessorio_administrativo_crud, documento_administrativo_crud, protocolo_documento_crud, @@ -36,5 +38,16 @@ urlpatterns = [ url(r'^protocoloadm/protocolar-doc', ProtocoloDocumentoView.as_view(), name='protocolar_doc'), url(r'^protocoloadm/protocolar-mat', - ProtocoloMateriaView.as_view(), name='protocolar_mat') + ProtocoloMateriaView.as_view(), name='protocolar_mat'), + + + # TODO: move to Proposicoes app + url(r'^protocoloadm/proposicao-receber', + ProposicaoReceberView.as_view(), name='proposicao_receber'), + url(r'^protocoloadm/proposicoes-naorecebidas', + ProposicoesNaoRecebidasView.as_view(), name='proposicoes_naorecebidas'), + url(r'^protocoloadm/proposicoes-naoincorporadas', + ProposicoesNaoIncorporadasView.as_view(), name='proposicoes_naoincorporadas'), + url(r'^protocoloadm/proposicoes-incorporadas', + ProposicoesIncorporadasView.as_view(), name='proposicoes_incorporadas'), ] diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 56878e85e..39c049a8d 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -497,3 +497,18 @@ class ProtocoloMateriaView(FormMixin, TemplateView): {'form': form, 'message': message}) else: return self.form_invalid(form) + +# TODO: move to Proposicao app + +class ProposicaoReceberView(TemplateView): + template_name = "protocoloadm/proposicao_receber.html" + +class ProposicoesNaoRecebidasView(TemplateView): + template_name = "protocoloadm/proposicoes_naorecebidas.html" + +class ProposicoesNaoIncorporadasView(TemplateView): + template_name = "protocoloadm/proposicoes_naoincorporadas.html" + + +class ProposicoesIncorporadasView(TemplateView): + template_name = "protocoloadm/proposicoes_incorporadas.html" diff --git a/sapl/urls.py b/sapl/urls.py index de9d2f689..0eb48d1cc 100644 --- a/sapl/urls.py +++ b/sapl/urls.py @@ -29,7 +29,6 @@ urlpatterns = [ url(r'', include('lexml.urls')), url(r'', include('painel.urls')), url(r'', include('protocoloadm.urls')), - url(r'', include('compilacao.urls')), # must come at the end diff --git a/templates/base.html b/templates/base.html index 507f8c602..b851e69ab 100644 --- a/templates/base.html +++ b/templates/base.html @@ -25,8 +25,9 @@ {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} + - + {% endblock %} diff --git a/templates/protocoloadm/proposicao_receber.html b/templates/protocoloadm/proposicao_receber.html new file mode 100644 index 000000000..e2d56d52e --- /dev/null +++ b/templates/protocoloadm/proposicao_receber.html @@ -0,0 +1,7 @@ +{% extends "protocoloadm/protocoloadm_detail.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block detail_content %} + Receber Proposição +{% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/proposicoes_incorporadas.html b/templates/protocoloadm/proposicoes_incorporadas.html new file mode 100644 index 000000000..dfdbe2541 --- /dev/null +++ b/templates/protocoloadm/proposicoes_incorporadas.html @@ -0,0 +1,7 @@ +{% extends "protocoloadm/protocoloadm_detail.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block detail_content %} + Proposições Incorporadas +{% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/proposicoes_naoincorporadas.html b/templates/protocoloadm/proposicoes_naoincorporadas.html new file mode 100644 index 000000000..f879b9d6c --- /dev/null +++ b/templates/protocoloadm/proposicoes_naoincorporadas.html @@ -0,0 +1,7 @@ +{% extends "protocoloadm/protocoloadm_detail.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block detail_content %} + Receber Não Incorporadas +{% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/proposicoes_naorecebidas.html b/templates/protocoloadm/proposicoes_naorecebidas.html new file mode 100644 index 000000000..e3fb2fa99 --- /dev/null +++ b/templates/protocoloadm/proposicoes_naorecebidas.html @@ -0,0 +1,7 @@ +{% extends "protocoloadm/protocoloadm_detail.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block detail_content %} + Proposições Não Recebidas +{% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/protocolar_materia.html b/templates/protocoloadm/protocolar_materia.html index c2fd0daf0..a85edd865 100644 --- a/templates/protocoloadm/protocolar_materia.html +++ b/templates/protocoloadm/protocolar_materia.html @@ -10,7 +10,7 @@ {% csrf_token %} {{ form.as_p }} + - {% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/protocoloadm_detail.html b/templates/protocoloadm/protocoloadm_detail.html index 4ce1cab38..3f95fde2a 100644 --- a/templates/protocoloadm/protocoloadm_detail.html +++ b/templates/protocoloadm/protocoloadm_detail.html @@ -7,5 +7,11 @@