Browse Source

Add placeholders for proposicoes

pull/11/merge
Edward Ribeiro 9 years ago
parent
commit
1ac89a0747
  1. 17
      protocoloadm/urls.py
  2. 15
      protocoloadm/views.py
  3. 1
      sapl/urls.py
  4. 3
      templates/base.html
  5. 7
      templates/protocoloadm/proposicao_receber.html
  6. 7
      templates/protocoloadm/proposicoes_incorporadas.html
  7. 7
      templates/protocoloadm/proposicoes_naoincorporadas.html
  8. 7
      templates/protocoloadm/proposicoes_naorecebidas.html
  9. 2
      templates/protocoloadm/protocolar_materia.html
  10. 6
      templates/protocoloadm/protocoloadm_detail.html

17
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'),
]

15
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"

1
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

3
templates/base.html

@ -25,8 +25,9 @@
{# modernizr must be in head (see http://modernizr.com/docs/#installing) #}
<script type="text/javascript" src="{% static 'foundation/js/vendor/modernizr.js' %}"></script>
<script type="text/javascript" src="{% static 'foundation/js/vendor/jquery.js' %}"></script>
<script type="text/javascript" src="{% static 'foundation/js/foundation.min.js' %}"></script>
<script type="text/javascript" src="{% static 'foundation-datepicker/js/foundation-datepicker.js' %}"></script>
<script type="text/javascript" src="{% static 'jQuery-runner/build/jquery.runner.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-runner/build/jquery.runner.js' %}"></script>
{% endblock %}
</head>

7
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 %}

7
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 %}

7
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 %}

7
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 %}

2
templates/protocoloadm/protocolar_materia.html

@ -10,7 +10,7 @@
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Protocolar Matéria" class="button primary" />
<button id="modal">Modal</button>
</fieldset>
</form>
{% endblock detail_content %}

6
templates/protocoloadm/protocoloadm_detail.html

@ -7,5 +7,11 @@
<dd><a href="{% url 'protocolar_doc' %}" class="button secondary">{% trans 'Protocolar Documento' %}</a></dd>
<dd><a href="{% url 'protocolar_mat' %}" class="button secondary">{% trans 'Protocolar Matéria' %}</a></dd>
<dd><a href="{% url 'anular_protocolo' %}" class="button secondary">{% trans 'Anular Protocolo' %}</a></dd>
<!-- TODO: move to Tramitacao app -->
<dd><a href="{% url 'proposicao_receber' %}" class="button secondary">{% trans 'Incorporar Proposições' %}</a></dd>
<dd><a href="{% url 'proposicoes_naorecebidas' %}" class="button secondary">{% trans 'Proposições Não Recebidas' %}</a></dd>
<dd><a href="{% url 'proposicoes_naoincorporadas' %}" class="button secondary">{% trans 'Proposições Não Incorporadas' %}</a></dd>
<dd><a href="{% url 'proposicoes_incorporadas' %}" class="button secondary">{% trans 'Proposições Incorporadas' %}</a></dd>
</dl>
{% endblock sections_nav %}

Loading…
Cancel
Save