From 8a3709e7d007f5fbe4a1ad8c620047281b472d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Cantu=C3=A1ria?= <cantuariavc@gmail.com>
Date: Mon, 25 Feb 2019 16:15:03 -0300
Subject: [PATCH] Fix #2536

Co-authored-by: UlyssesBML <ulysses3353@gmail.com>
---
 sapl/parlamentares/forms.py                   | 23 ----------
 sapl/parlamentares/urls.py                    |  5 ++-
 sapl/parlamentares/views.py                   |  7 +++
 sapl/templates/parlamentares/layouts.yaml     |  2 -
 .../parlamentares/lista_parlamentares.html    | 43 +++++++++++++++++++
 .../parlamentares/parlamentares_list.html     | 10 +++++
 6 files changed, 64 insertions(+), 26 deletions(-)
 create mode 100644 sapl/templates/parlamentares/lista_parlamentares.html

diff --git a/sapl/parlamentares/forms.py b/sapl/parlamentares/forms.py
index 1237f3b56..98e123645 100755
--- a/sapl/parlamentares/forms.py
+++ b/sapl/parlamentares/forms.py
@@ -146,10 +146,6 @@ class MandatoForm(ModelForm):
         return self.cleaned_data
 
 
-class MandatoCreateForm(MandatoForm):
-    pass
-
-
 class LegislaturaForm(ModelForm):
 
     logger = logging.getLogger(__name__)
@@ -216,18 +212,6 @@ class ParlamentarForm(FileFieldCheckMixin, ModelForm):
 
 class ParlamentarCreateForm(ParlamentarForm):
 
-    legislatura = forms.ModelChoiceField(
-        label=_('Legislatura'),
-        required=True,
-        queryset=Legislatura.objects.all().order_by('-data_inicio'),
-        empty_label='----------',
-    )
-
-    data_expedicao_diploma = forms.DateField(
-        label=_('Expedição do Diploma'),
-        required=True,
-    )
-
     class Meta(ParlamentarForm.Meta):
         widgets = {
             'fotografia': forms.ClearableFileInput(),
@@ -238,13 +222,6 @@ class ParlamentarCreateForm(ParlamentarForm):
     @transaction.atomic
     def save(self, commit=True):
         parlamentar = super(ParlamentarCreateForm, self).save(commit)
-        # legislatura = self.cleaned_data['legislatura']
-        # Mandato.objects.create(
-        #     parlamentar=parlamentar,
-        #     legislatura=legislatura,
-        #     data_inicio_mandato=legislatura.data_inicio,
-        #     data_fim_mandato=legislatura.data_fim,
-        #     data_expedicao_diploma=self.cleaned_data['data_expedicao_diploma'])
         content_type = ContentType.objects.get_for_model(Parlamentar)
         object_id = parlamentar.pk
         tipo = TipoAutor.objects.get(content_type=content_type)
diff --git a/sapl/parlamentares/urls.py b/sapl/parlamentares/urls.py
index e383421c4..6a656e4e8 100644
--- a/sapl/parlamentares/urls.py
+++ b/sapl/parlamentares/urls.py
@@ -17,7 +17,8 @@ from sapl.parlamentares.views import (CargoMesaCrud, ColigacaoCrud,
                                       frente_atualiza_lista_parlamentares,
                                       insere_parlamentar_composicao,
                                       parlamentares_frente_selected,
-                                      remove_parlamentar_composicao)
+                                      remove_parlamentar_composicao,
+                                      lista_parlamentares)
 
 from .apps import AppConfig
 
@@ -33,6 +34,8 @@ urlpatterns = [
         VotanteView.get_urls()
     )),
 
+    url(r'^parlamentar/lista$', lista_parlamentares, name='lista_parlamentares'),
+
     url(r'^parlamentar/(?P<pk>\d+)/materias$',
         ParlamentarMateriasView.as_view(), name='parlamentar_materias'),
 
diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py
index 3068e3779..d4d8bacd2 100644
--- a/sapl/parlamentares/views.py
+++ b/sapl/parlamentares/views.py
@@ -10,6 +10,7 @@ from django.db.models import F, Q
 from django.db.models.aggregates import Count
 from django.http import JsonResponse
 from django.http.response import HttpResponseRedirect
+from django.shortcuts import render
 from django.templatetags.static import static
 from django.utils import timezone
 from django.utils.datastructures import MultiValueDictKeyError
@@ -614,6 +615,12 @@ class ParlamentarCrud(Crud):
             return context
 
 
+def lista_parlamentares(request):
+    template_name = "parlamentares/lista_parlamentares.html"
+    parlamentares = Parlamentar.objects.select_related().all()
+    return render(request, template_name, {"parlamentares": parlamentares})
+
+
 class ParlamentarMateriasView(FormView):
     template_name = "parlamentares/materias.html"
     success_url = reverse_lazy('sapl.parlamentares:parlamentar_materia')
diff --git a/sapl/templates/parlamentares/layouts.yaml b/sapl/templates/parlamentares/layouts.yaml
index 5a118c1df..0b419ef80 100644
--- a/sapl/templates/parlamentares/layouts.yaml
+++ b/sapl/templates/parlamentares/layouts.yaml
@@ -64,8 +64,6 @@ ParlamentarUpdate:
   - biografia
 
 ParlamentarCreate:
-#  {% trans 'Dados do Mandato' %}:
-#    - legislatura  data_expedicao_diploma
   {% trans 'Cadastro do Parlamentar' %}:
   - nome_parlamentar:8  ativo
   - nome_completo
diff --git a/sapl/templates/parlamentares/lista_parlamentares.html b/sapl/templates/parlamentares/lista_parlamentares.html
new file mode 100644
index 000000000..76d55395b
--- /dev/null
+++ b/sapl/templates/parlamentares/lista_parlamentares.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load crispy_forms_tags cropping%}
+{% block base_content %}
+    <h1>Parlamentares</h1></br></br>
+    <div class="result-count">Total de Parlamentares: <strong>{{ parlamentares|length }}</strong></div>
+    <div class="container-table lista-parlamentares">
+        <table class="table table-striped table-hover table-link-ordering">
+            <thead>
+                <tr>
+                    <th>
+                        Foto
+                    </th>
+                    <th>
+                        Parlamentar
+                    </th>
+                    <th>
+                        Partido
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for parlamentar in parlamentares %}
+                    <tr>
+                        <td>
+                            {% if parlamentar.fotografia %}
+                                <div id="w-100">
+                                    <img class="img-fluid img-thumbnail" src="{% cropped_thumbnail parlamentar "cropping"%}">
+                                </div>
+                            {% endif %}
+                        </td>
+                        <td>
+                            <a href="{% url 'sapl.parlamentares:mandato_list' parlamentar.pk %}"> {{ parlamentar }} </a>
+                        </td>
+                        <td>
+                            {{ parlamentar.filiacao_atual }}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+{% endblock base_content %}
diff --git a/sapl/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html
index 88ad4acfe..76a31b92e 100644
--- a/sapl/templates/parlamentares/parlamentares_list.html
+++ b/sapl/templates/parlamentares/parlamentares_list.html
@@ -1,6 +1,16 @@
 {% extends "crud/list.html" %}
 {% load i18n %}
 {% load crispy_forms_tags cropping%}
+{% block actions %}
+    <div class="actions btn-group float-right btn-group-lg" role="group">
+      {% if view.create_url %}
+      <a href="{% url 'sapl.parlamentares:lista_parlamentares' %}" class="btn btn-outline-primary">
+        {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %}
+      </a>
+      {% endif %}
+      {% block more_buttons %}{% endblock more_buttons %}
+    </div>
+{% endblock actions %}
 {% block extra_content %}
   <fieldset class="form-group">
     <legend>Selecione o Período</legend>