From 32d4e242697f27c007f3c8cedd3d16a3dbdfb198 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Mon, 9 Nov 2015 14:18:08 -0200
Subject: [PATCH] Refactor list results of Protocolo query, add contains query
 to interessado

---
 protocoloadm/views.py                      |  3 +--
 templates/protocoloadm/protocolo_list.html | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index 2f53283fc..0838c0fac 100644
--- a/protocoloadm/views.py
+++ b/protocoloadm/views.py
@@ -133,7 +133,6 @@ class HorizontalRadioRenderer(forms.RadioSelect.renderer):
     def render(self):
         return mark_safe(u' '.join([u'%s ' % w for w in self]))
 
-
 class ProtocoloForm(forms.Form):
 
     YEARS = get_range_anos()
@@ -253,7 +252,7 @@ class ProtocoloPesquisaView(FormMixin, GenericView):
                 kwargs['tipo_documento'] = request.POST['tipo_documento']
 
             if request.POST['interessado']:
-                kwargs['interessado'] = request.POST['interessado']
+                kwargs['interessado__icontains'] = request.POST['interessado']
 
             if request.POST['tipo_materia']:
                 kwargs['tipo_materia'] = request.POST['tipo_materia']
diff --git a/templates/protocoloadm/protocolo_list.html b/templates/protocoloadm/protocolo_list.html
index 870339ccc..b47b49892 100644
--- a/templates/protocoloadm/protocolo_list.html
+++ b/templates/protocoloadm/protocolo_list.html
@@ -6,18 +6,18 @@
 	{% if protocolos %}		
 <!-- 			Total: {{ protocolos|length }}  -->		
 			<table>
-				<tr><td>Número de Protocolo</td>
-					<td>Ano</td>
-					<td>Assunto</td>
-					<td>Tipo de Documento</td>
-					<td>Data</td>
+				<tr><td><h2>Resultados</h2></td>
 				</tr>
 				{% for p in protocolos %}
-					<tr><td>{{ p.numero }}</td>
-						<td>{{ p.ano }}</td>					
-						<td>{{ p.assunto_ementa }}</td>
-						<td>{{ p.tipo_documento }}</td>
-						<td>{{ p.data|date:"d/m/Y" }}</td>
+					<tr>
+						<td>
+							<strong>Protocolo:</strong> <a href="">{{ p.numero|stringformat:'06d' }}/{{ p.ano }}</a></br>
+							<strong>Assunto:</strong> {{ p.assunto_ementa }}</br>
+							<strong>Data Protocolo:</strong> {{ p.data|date:"d/m/Y" }} - Horário: {{ p.timestamp|date:"H:m:s" }}</br>
+							<strong>Interessado:</strong> {{ p.interessado }}</br>
+							<!-- TODO: convert if-else to custom tag -->
+							<strong>Natureza do Processo:</strong>{% if p.tipo_protocolo == 0 %} Administrativo {% elif p.tipo_protocolo == 1 %} Matéria Legislativa {% endif %}</br>
+							<strong>Classificação:</strong> {{ p.tipo_documento }} </br>
 					</tr>
 				{% endfor %}
 			</table>