diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py index cb95c1f45..ebc09f795 100644 --- a/protocoloadm/urls.py +++ b/protocoloadm/urls.py @@ -23,6 +23,6 @@ urlpatterns = [ url(r'^protocoloadm/protocolo-mat/', include(protocolo_materia_crud.urls)), url(r'^protocoloadm/anular-protocolo/', include(anular_protocolo_crud.urls)), - url(r'^protocoloadm/protocolo', + url(r'^protocoloadm/protocolo$', ProtocoloPesquisaView.as_view(), name='protocolo'), ] diff --git a/protocoloadm/views.py b/protocoloadm/views.py index f7077a5e5..e5dfda2d6 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -3,8 +3,7 @@ from datetime import datetime from django import forms from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ -from django.views.generic import ListView -from django.views.generic.edit import UpdateView +from django.views.generic import ListView, TemplateView from django.views.generic.edit import FormMixin from materia.models import TipoMateriaLegislativa @@ -97,11 +96,13 @@ anular_protocolo_crud = build_crud( class ProtocoloForm(forms.Form): tipo_protocolo = forms.CharField(label='Tipo de Protocolo', required=False) - numero_protocolo = forms.CharField(label='Número de Protocolo', required=False) + numero_protocolo = forms.CharField( + label='Número de Protocolo', required=False) ano = forms.CharField(label='Ano', required=False) inicial = forms.DateField(label='Data Inicial', required=False) final = forms.DateField(label='Data Final', required=False) - natureza_processo = forms.CharField(label='Natureza Processo', required=False) + natureza_processo = forms.CharField( + label='Natureza Processo', required=False) tipo_documento = forms.CharField(label='Tipo de Documento', required=False) interessado = forms.CharField(label='Interessado', required=False) tipo_materia = forms.CharField(label='Tipo de Matéria', required=False) @@ -109,10 +110,10 @@ class ProtocoloForm(forms.Form): assunto = forms.CharField(label='Assunto - {% csrf_token %} -
- Pesquisa Avançada - - - - - - - - - - - -
- -
- - + {% if page_obj.has_next %} +
  • + + » + +
    • + {% else %} +
  • »
    • + {% endif %} + + + {% endif %} + + + {% else %} +
    + {% csrf_token %} +
    + Pesquisa Avançada +
      +
    • Tipo Protocolo
      • +
    • + +
      • +
    +
      +
    • Número Protocolo
      • +
      • +
    +
      +
    • Ano
      • +
      • +
    +
      +
    • Período Protocolo
      • +
    +
      +
    • Inicial
      • +
      • +
    +
      +
    • Final
      • +
      • +
    +
      +
    • Tipo Documento
      • +
    • + +
      • +
    +
      +
    • Interessado
      • +
      • +
    +
      +
    • Tipo Matéria
      • +
    • + +
      • +
    +
      +
    • Autor
      • +
      • +
    +
      +
    • Assunto
      • +
      • +
    +
    + +
    +
    + {% endif %} {% endblock detail_content %} {% block foot_js %} diff --git a/templates/protocoloadm/protocolo_resultados.html b/templates/protocoloadm/protocolo_resultados.html deleted file mode 100644 index bdef04c78..000000000 --- a/templates/protocoloadm/protocolo_resultados.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "protocoloadm/protocoloadm_detail.html" %} -{% load i18n %} -{% load crispy_forms_tags %} - -{% block detail_content %} -{% endblock detail_content %} diff --git a/templates/protocoloadm/protocoloadm_detail.html b/templates/protocoloadm/protocoloadm_detail.html index aaaeeaf22..f49c51727 100644 --- a/templates/protocoloadm/protocoloadm_detail.html +++ b/templates/protocoloadm/protocoloadm_detail.html @@ -3,8 +3,9 @@ {% block sections_nav %}
    -
    {% trans 'Protocolar Documento' %}
    -
    {% trans 'Protocolar Matéria' %}
    -
    {% trans 'Anular Protocolo' %}
    +
    {% trans 'Inicio' %}
    +
    {% trans 'Protocolar Documento' %}
    +
    {% trans 'Protocolar Matéria' %}
    +
    {% trans 'Anular Protocolo' %}
    {% endblock sections_nav %}