diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py index 862c8ea3b..cb95c1f45 100644 --- a/protocoloadm/urls.py +++ b/protocoloadm/urls.py @@ -1,5 +1,4 @@ from django.conf.urls import include, url - from protocoloadm.views import (ProtocoloPesquisaView, anular_protocolo_crud, documento_acessorio_administrativo_crud, documento_administrativo_crud, diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 1b3259b7a..f7077a5e5 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -4,6 +4,7 @@ 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.edit import FormMixin from materia.models import TipoMateriaLegislativa @@ -95,28 +96,35 @@ anular_protocolo_crud = build_crud( class ProtocoloForm(forms.Form): - tipo_protocolo = forms.CharField(required=False) - numero_protocolo = forms.CharField(required=False) - ano = forms.CharField(required=False) - inicial = forms.DateField(required=False) - final = forms.DateField(required=False) - natureza_processo = forms.CharField(required=False) - tipo_documento = forms.CharField(required=False) - interessado = forms.CharField(required=False) - tipo_materia = forms.CharField(required=False) - autor = forms.CharField(required=False) - assunto = forms.CharField(required=False) - - -class ProtocoloPesquisaView(ListView, FormMixin): + tipo_protocolo = forms.CharField(label='Tipo 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) + 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) + autor = forms.CharField(label='Autor', required=False) + assunto = forms.CharField(label='Assunto {% for p in protocolos %} {{ p.numero }} + {{ p.ano }} {{ p.assunto_ementa }} {{ p.tipo_documento }} - {{ p.ano }} {{ p.data|date:"d/m/Y" }} {% endfor %} + + + Total: {{ protocolos|length }} {% endif %}