From 8f644518011f9573377c2b5b16664302318a16a6 Mon Sep 17 00:00:00 2001
From: VictorFabreF <victorfabre@me.com>
Date: Mon, 3 Sep 2018 18:40:18 -0300
Subject: [PATCH] =?UTF-8?q?[WIP=20-=20DON'T=20MERGE]=20adiciona=20dados=20?=
 =?UTF-8?q?das=20pesquisas=20nos=20relat=C3=B3rios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/base/views.py                                   | 12 ++++++++++--
 .../base/RelatorioMateriasPorTramitacao_filter.html  |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/sapl/base/views.py b/sapl/base/views.py
index 65330fb78..3c0e5e5a2 100644
--- a/sapl/base/views.py
+++ b/sapl/base/views.py
@@ -26,7 +26,7 @@ from sapl.base.forms import AutorForm, AutorFormForAdmin, TipoAutorForm
 from sapl.base.models import Autor, TipoAutor
 from sapl.crud.base import CrudAux, make_pagination
 from sapl.materia.models import (Autoria, MateriaLegislativa,
-                                 TipoMateriaLegislativa)
+                                 TipoMateriaLegislativa, StatusTramitacao, UnidadeTramitacao)
 from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria,
                                 SessaoPlenariaPresenca)
 from sapl.utils import (parlamentares_ativos, sapl_logger,
@@ -405,6 +405,8 @@ class RelatorioMateriasTramitacaoView(FilterView):
                         self).get_context_data(**kwargs)
 
         context['title'] = _('Matérias em Tramitação')
+        if not self.filterset.form.is_valid():
+            return context
 
         qr = self.request.GET.copy()
         qs = context['object_list']
@@ -424,7 +426,13 @@ class RelatorioMateriasTramitacaoView(FilterView):
             if qtde > 0:
                 qtdes[tipo] = qtde
         context['qtdes'] = qtdes
-
+        tipo = self.request.GET['tipo']
+        tramitacao_status = self.request.GET['tramitacao__status']
+        context['tipo'] = (str(TipoMateriaLegislativa.objects.get(id=tipo)))
+        context['tramitacao__status'] = (str(StatusTramitacao.objects.get(id=tramitacao_status)))
+        context['ano'] = (self.request.GET['ano'])
+        context['tramitacao__unidade_tramitacao_destino'] = (str(UnidadeTramitacao.objects.get(id=
+            self.request.GET['tramitacao__unidade_tramitacao_destino'])))
         context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
 
         context['show_results'] = show_results_filter_set(qr)
diff --git a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
index db6065266..3443b5e5b 100644
--- a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
+++ b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
@@ -12,7 +12,9 @@
       <a href="{% url 'sapl.base:materia_por_tramitacao' %}" class="btn btn-default">{% trans 'Fazer nova pesquisa' %}</a>
     </div>
     <br /><br /><br /><br />
-
+    <b>Dados da pesquisa:</b><br />
+    <b>Ano: {{ ano }} - Tipo de matéria: {{ tipo }}</b><br />
+    <b>Status atual: {{ tramitacao__status }} - Local atual: {{ tramitacao__unidade_tramitacao_destino }}</b><br />
     <table class="table table-bordered table-hover">
       <thead class="thead-default" >
         <tr class="active"><th colspan="2" class="text-center">QUADRO GERAL</th></tr>