From a4a231ee7d22f452311eb707e88cf7f699f85b30 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Wed, 18 May 2016 10:14:23 -0300
Subject: [PATCH] =?UTF-8?q?Muda=20listagem=20de=20participa=C3=A7=C3=A3o?=
 =?UTF-8?q?=20para=20detail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comissoes/views.py                         | 36 +++----------
 templates/comissoes/composicao_detail.html | 31 ++++++++++++
 templates/comissoes/composicao_list.html   | 59 ----------------------
 3 files changed, 37 insertions(+), 89 deletions(-)
 create mode 100644 templates/comissoes/composicao_detail.html
 delete mode 100644 templates/comissoes/composicao_list.html

diff --git a/comissoes/views.py b/comissoes/views.py
index 004e01529..87efe1725 100644
--- a/comissoes/views.py
+++ b/comissoes/views.py
@@ -24,38 +24,14 @@ class ComposicaoCrud(MasterDetailCrud):
     parent_field = 'comissao'
     help_path = ''
 
-    class ListView(MasterDetailCrud.ListView):
-        template_name = 'comissoes/composicao_list.html'
-
-        def get_queryset(self):
-            return Participacao.objects.all().order_by('parlamentar')
+    class DetailView(MasterDetailCrud.DetailView):
 
         def get(self, request, *args, **kwargs):
-            self.object_list = self.get_queryset()
-            form = ComposicaoForm(request.GET or None)
-
-            composicoes = Composicao.objects.filter(
-                comissao_id=self.kwargs['pk']).order_by('-periodo')
-            participacoes = Participacao.objects.all().order_by('parlamentar')
-
-            if composicoes:
-                composicao_id = composicoes.first().id
-                msg = ''
-            else:
-                composicao_id = 0
-                msg = _('Ainda não há uma composição formada!')
-                messages.add_message(request, messages.INFO, msg)
-
-            if request.GET:
-                composicao_id = int(form.data['periodo'])
-
-            return self.render_to_response({
-                'participacoes': participacoes,
-                'composicoes': composicoes,
-                'composicao_id': composicao_id,
-                'form': form,
-                'pk': self.kwargs['pk'],
-                'object': Comissao.objects.get(id=self.kwargs['pk'])})
+            self.object = self.get_object()
+            context = self.get_context_data(object=self.object)
+            composicao = Composicao.objects.get(id=self.kwargs['pk'])
+            context['participacoes'] = composicao.participacao_set.all()
+            return self.render_to_response(context)
 
 
 class ComissaoCrud(Crud):
diff --git a/templates/comissoes/composicao_detail.html b/templates/comissoes/composicao_detail.html
new file mode 100644
index 000000000..0a87b9f33
--- /dev/null
+++ b/templates/comissoes/composicao_detail.html
@@ -0,0 +1,31 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+{% block detail_content %}
+	<table class="table table-striped">
+		<thead class="thead-default">
+			<tr>
+				<th>Nome</th>
+				<th>Cargo</th>
+				<th>Titular</th>
+				<th>Designação</th>
+				<th>Desligamento</th>
+				<th>Motivo</th>
+				<th>Observação</th>
+			</tr>
+		</thead>
+		{% for participacao in participacoes %}
+				<tr>
+					<td><a href="">{{participacao.parlamentar.nome_parlamentar}}</a></td>
+					<td>{{participacao.cargo}}</td>
+					<td>{{participacao.titular|yesno:"Sim,Não"}}</td>
+					<td>{{participacao.data_designacao|date:"d/m/Y"}}</td>
+					<td>{{participacao.data_desligamento|date:"d/m/Y"|default:"-"}}</td>
+					<td>{{participacao.motivo_desligamento|default:"-"}}</td>
+					<td>{{participacao.observacao|default:"-"}}</td>
+				</tr>
+		{% endfor %}
+	</table>
+
+	<a href="" class="btn btn-primary">Incluir Parlamentar</a>
+{% endblock detail_content %}
diff --git a/templates/comissoes/composicao_list.html b/templates/comissoes/composicao_list.html
deleted file mode 100644
index bfd6fa3b5..000000000
--- a/templates/comissoes/composicao_list.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends "crud/list.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block base_content %}
-
-	<div class="actions btn-group pull-right" role="group">
-	  <a href="{% url 'comissoes:composicao_create' pk %}" class="btn btn-default">
-	    {% blocktrans with verbose_name=view.verbose_name %} Adicionar Composição {% endblocktrans %}
-	  </a>
-	  {% block more_buttons %}{% endblock more_buttons %}
-	</div>
-	<br /><br /><br />
-	{% if composicao_id != 0 %}
-		<table class="table table-striped table-bordered">
-			<thead class="thead-default">
-				<tr>
-					<th>Nome</th>
-					<th>Cargo</th>
-					<th>Titular</th>
-					<th>Designação</th>
-					<th>Desligamento</th>
-					<th>Motivo</th>
-					<th>Observação</th>
-				</tr>
-			</thead>
-
-			<form method="GET">
-
-				{% csrf_token %}
-				<select id="periodo" name="periodo" class="form-control" onChange="form.submit();">
-					{% for c in composicoes %}
-						<option value="{{c.id}}" {% if composicao_id == c.id %} selected {% endif %}>
-							{{ c.periodo.data_inicio|date:"d/m/Y" }} - {{ c.periodo.data_fim|date:"d/m/Y" }}
-						</option>
-					{% endfor %}
-				</select>
-			</form>
-			<br />
-			{% for participacao in participacoes %}
-				{% if participacao.composicao_id == composicao_id %}
-					<tr>
-						<td><a href="{% url 'comissoes:comissao_parlamentar_edit' pk composicao_id participacao.id %}">{{participacao.parlamentar.nome_parlamentar}}</a></td>
-						<td>{{participacao.cargo}}</td>
-						<td>{{participacao.titular|yesno:"Sim,Não"}}</td>
-						<td>{{participacao.data_designacao|date:"d/m/Y"}}</td>
-						<td>{{participacao.data_desligamento|date:"d/m/Y"|default:"-"}}</td>
-						<td>{{participacao.motivo_desligamento|default:"-"}}</td>
-						<td>{{participacao.observacao|default:"-"}}</td>
-					</tr>
-				{% endif %}
-			{% endfor %}
-
-		</table>
-
-		<a href="{% url 'comissoes:comissao_parlamentar' pk composicao_id %}" class="btn btn-primary">Incluir Parlamentar</a>
-	{% endif %}
-
-{% endblock %}