From f379d86fa5f1bad299d1e2ce3141f5dbe89d9861 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 16 Nov 2015 10:59:44 -0200 Subject: [PATCH] Refactor Proposicoes out of ProtocoloAdm sub-menu --- protocoloadm/urls.py | 15 +++++++++------ protocoloadm/views.py | 5 ++++- templates/base.html | 2 +- templates/protocoloadm/proposicao_receber.html | 2 +- templates/protocoloadm/proposicoes.html | 7 +++++++ templates/protocoloadm/proposicoes_detail.html | 11 +++++++++++ .../protocoloadm/proposicoes_incorporadas.html | 2 +- .../protocoloadm/proposicoes_naoincorporadas.html | 2 +- .../protocoloadm/proposicoes_naorecebidas.html | 2 +- templates/protocoloadm/protocoloadm_detail.html | 6 ------ 10 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 templates/protocoloadm/proposicoes.html create mode 100644 templates/protocoloadm/proposicoes_detail.html diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py index de369ae25..8a8dfb97c 100644 --- a/protocoloadm/urls.py +++ b/protocoloadm/urls.py @@ -5,6 +5,7 @@ from protocoloadm.views import (AnularProtocoloAdmView, DocumentoAcessorioAdministrativoView, PesquisarDocumentoAdministrativo, ProposicaoReceberView, ProposicaoView, + ProposicaoDetailView, ProposicoesIncorporadasView, ProposicoesNaoIncorporadasView, ProposicoesNaoRecebidasView, @@ -65,17 +66,19 @@ urlpatterns = [ # TODO: move to Proposicoes app - url(r'^protocoloadm/proposicao-receber', + url(r'^proposicoes$', + ProposicaoView.as_view(), name='proposicao'), + url(r'^proposicoes/proposicao-receber', ProposicaoReceberView.as_view(), name='proposicao_receber'), - url(r'^protocoloadm/proposicoes-naorecebidas', + url(r'^proposicoes/proposicoes-naorecebidas', ProposicoesNaoRecebidasView.as_view(), name='proposicoes_naorecebidas'), - url(r'^protocoloadm/proposicoes-naoincorporadas', + url(r'^proposicoes/proposicoes-naoincorporadas', ProposicoesNaoIncorporadasView.as_view(), name='proposicoes_naoincorporadas'), - url(r'^protocoloadm/proposicoes-incorporadas', + url(r'^proposicoes/proposicoes-incorporadas', ProposicoesIncorporadasView.as_view(), name='proposicoes_incorporadas'), - url(r'^protocoloadm/(?P\d+)/proposicao', - ProposicaoView.as_view(), name='proposicao_view'), + url(r'^proposicoes/(?P\d+)/proposicao', + ProposicaoDetailView.as_view(), name='proposicao_view'), ] diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 25f74f18d..b669ce60c 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -590,7 +590,10 @@ class ProposicaoSimpleForm(forms.Form): # attrs={'readonly':'readonly'})) -class ProposicaoView(DetailView): +class ProposicaoView(TemplateView): + template_name = "protocoloadm/proposicoes.html" + +class ProposicaoDetailView(DetailView): template_name = "protocoloadm/proposicao_view.html" model = Proposicao diff --git a/templates/base.html b/templates/base.html index 61e58f0c6..ee83ff4cc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -71,7 +71,7 @@
  • Pesquisar
  • Protocolo Legislativo
  • Protocolo Administrativo
    • - +
  • Receber Proposições
  • Atividade Legislativa diff --git a/templates/protocoloadm/proposicao_receber.html b/templates/protocoloadm/proposicao_receber.html index e2d56d52e..d3496e6e7 100644 --- a/templates/protocoloadm/proposicao_receber.html +++ b/templates/protocoloadm/proposicao_receber.html @@ -1,4 +1,4 @@ -{% extends "protocoloadm/protocoloadm_detail.html" %} +{% extends "protocoloadm/proposicoes_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/templates/protocoloadm/proposicoes.html b/templates/protocoloadm/proposicoes.html new file mode 100644 index 000000000..7343227bd --- /dev/null +++ b/templates/protocoloadm/proposicoes.html @@ -0,0 +1,7 @@ +{% extends "protocoloadm/proposicoes_detail.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block detail_content %} +

    Proposições

    +{% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/proposicoes_detail.html b/templates/protocoloadm/proposicoes_detail.html new file mode 100644 index 000000000..570231d95 --- /dev/null +++ b/templates/protocoloadm/proposicoes_detail.html @@ -0,0 +1,11 @@ +{% extends "crud/detail.html" %} +{% load i18n %} + +{% block sections_nav %} +
    +
    {% trans 'Incorporar Proposições' %}
    +
    {% trans 'Proposições Não Recebidas' %}
    +
    {% trans 'Proposições Não Incorporadas' %}
    +
    {% trans 'Proposições Incorporadas' %}
    +
    +{% endblock sections_nav %} diff --git a/templates/protocoloadm/proposicoes_incorporadas.html b/templates/protocoloadm/proposicoes_incorporadas.html index 527b4556c..a985ea63c 100644 --- a/templates/protocoloadm/proposicoes_incorporadas.html +++ b/templates/protocoloadm/proposicoes_incorporadas.html @@ -1,4 +1,4 @@ -{% extends "protocoloadm/protocoloadm_detail.html" %} +{% extends "protocoloadm/proposicoes_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/templates/protocoloadm/proposicoes_naoincorporadas.html b/templates/protocoloadm/proposicoes_naoincorporadas.html index 73b994eb8..2c2f8d2b2 100644 --- a/templates/protocoloadm/proposicoes_naoincorporadas.html +++ b/templates/protocoloadm/proposicoes_naoincorporadas.html @@ -1,4 +1,4 @@ -{% extends "protocoloadm/protocoloadm_detail.html" %} +{% extends "protocoloadm/proposicoes_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/templates/protocoloadm/proposicoes_naorecebidas.html b/templates/protocoloadm/proposicoes_naorecebidas.html index bb1dc0559..3b9f25bbf 100644 --- a/templates/protocoloadm/proposicoes_naorecebidas.html +++ b/templates/protocoloadm/proposicoes_naorecebidas.html @@ -1,4 +1,4 @@ -{% extends "protocoloadm/protocoloadm_detail.html" %} +{% extends "protocoloadm/proposicoes_detail.html" %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/templates/protocoloadm/protocoloadm_detail.html b/templates/protocoloadm/protocoloadm_detail.html index 3f95fde2a..4ce1cab38 100644 --- a/templates/protocoloadm/protocoloadm_detail.html +++ b/templates/protocoloadm/protocoloadm_detail.html @@ -7,11 +7,5 @@
    {% trans 'Protocolar Documento' %}
    {% trans 'Protocolar Matéria' %}
    {% trans 'Anular Protocolo' %}
    - - -
    {% trans 'Incorporar Proposições' %}
    -
    {% trans 'Proposições Não Recebidas' %}
    -
    {% trans 'Proposições Não Incorporadas' %}
    -
    {% trans 'Proposições Incorporadas' %}
    {% endblock sections_nav %}