Fix #3011 - Adicionar Matérias à Pauta (#3010)

* Refatoração Pauta Reunião

* Refatoração

sapl/comissoes/forms.py

@@ -1,7 +1,9 @@
+import django_filters
 import logging
 
+from crispy_forms.layout import Fieldset, Layout
+
 from django import forms
-from sapl.settings import MAX_DOC_UPLOAD_SIZE
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import transaction
@@ -11,10 +13,12 @@ from django.utils.translation import ugettext_lazy as _
 
 from sapl.base.models import Autor, TipoAutor
 from sapl.comissoes.models import (Comissao, Composicao, DocumentoAcessorio,
-                                   Participacao, Reuniao, Periodo)
-from sapl.materia.models import PautaReuniao
+                                   Participacao, Periodo, Reuniao)
+from sapl.crispy_layout_mixin import form_actions, SaplFormHelper, to_row
+from sapl.materia.models import MateriaEmTramitacao, PautaReuniao
 from sapl.parlamentares.models import Legislatura, Mandato, Parlamentar
-from sapl.utils import FileFieldCheckMixin
+from sapl.settings import MAX_DOC_UPLOAD_SIZE
+from sapl.utils import FileFieldCheckMixin, FilterOverridesMetaMixin
 
 
 class ComposicaoForm(forms.ModelForm):
@@ -416,6 +420,32 @@ class ReuniaoForm(ModelForm):
         return self.cleaned_data
 
 
+class PautaReuniaoFilterSet(django_filters.FilterSet):
+
+    class Meta(FilterOverridesMetaMixin):
+        model = MateriaEmTramitacao
+        fields = ['materia__tipo', 'materia__ano', 'materia__numero', 'materia__data_apresentacao']
+
+    def __init__(self, *args, **kwargs):
+        super(PautaReuniaoFilterSet, self).__init__(*args, **kwargs)
+
+        self.filters['materia__tipo'].label = "Tipo da Matéria"
+        self.filters['materia__ano'].label = "Ano da Matéria"
+        self.filters['materia__data_apresentacao'].label = "Data (Inicial - Final)"
+
+        row1 = to_row([('materia__numero', 4), ('materia__tipo', 4), ('materia__ano', 4)])
+        row2 = to_row([('materia__data_apresentacao', 12)])
+
+        self.form.helper = SaplFormHelper()
+        self.form.helper.form_method = "GET"
+        self.form.helper.layout = Layout(
+            Fieldset(
+                _("Pesquisa de Matérias"), row1, row2, 
+                form_actions(label="Pesquisar")
+            )
+        )
+
+
 class PautaReuniaoForm(forms.ModelForm):
 
     class Meta:

sapl/comissoes/views.py

@@ -12,18 +12,22 @@ from django.views.generic.detail import DetailView
 from django.views.generic.edit import FormMixin, UpdateView
 from django.utils.translation import ugettext_lazy as _
 
+from django_filters.views import FilterView
+
 from sapl.base.models import AppConfig as AppsAppConfig
 from sapl.comissoes.apps import AppConfig
 from sapl.comissoes.forms import (ComissaoForm, ComposicaoForm,
                                   DocumentoAcessorioCreateForm,
                                   DocumentoAcessorioEditForm,
                                   ParticipacaoCreateForm, ParticipacaoEditForm,
-                                  PautaReuniaoForm, PeriodoForm, ReuniaoForm)
+                                  PautaReuniaoForm, PeriodoForm, ReuniaoForm,
+                                  PautaReuniaoFilterSet)
 from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
                             MasterDetailCrud,
                             PermissionRequiredForAppCrudMixin)
 from sapl.materia.models import (MateriaLegislativa, Tramitacao, PautaReuniao,
                                  MateriaEmTramitacao)
+from sapl.utils import show_results_filter_set
 
 from .models import (CargoComissao, Comissao, Composicao, DocumentoAcessorio,
                      Participacao, Periodo, Reuniao, TipoComissao)
@@ -218,7 +222,7 @@ class ReuniaoCrud(MasterDetailCrud):
             
             context['mats'] = MateriaLegislativa.objects.filter(
                 pk__in=materias_pk
-            ).order_by('tipo', '-ano', '-numero')
+            ).order_by('tipo', '-ano', 'numero')
             context['num_mats'] = len(context['mats'])
 
             context['reuniao_pk'] = self.kwargs['pk']
@@ -296,8 +300,8 @@ class RemovePautaView(PermissionRequiredMixin, CreateView):
         
         context['materias'] = MateriaLegislativa.objects.filter(
             pk__in=materias_pk
-        ).order_by('tipo', '-ano', '-numero') 
-        context['num_materias'] = len(context['materias'])
+        ).order_by('tipo', '-ano', 'numero')
+        context['numero_materias'] = len(context['materias'])
 
         return context
 
@@ -319,9 +323,8 @@ class RemovePautaView(PermissionRequiredMixin, CreateView):
         return HttpResponseRedirect(success_url)
 
 
-class AdicionaPautaView(PermissionRequiredMixin, CreateView):
-    model = PautaReuniao
-    form_class = PautaReuniaoForm
+class AdicionaPautaView(PermissionRequiredMixin, FilterView):
+    filterset_class = PautaReuniaoFilterSet
     template_name = 'comissoes/pauta.html'
     permission_required = ('comissoes.add_reuniao', )
 
@@ -336,12 +339,19 @@ class AdicionaPautaView(PermissionRequiredMixin, CreateView):
         context['object'] = Reuniao.objects.get(pk=self.kwargs['pk'])
         context['root_pk'] = context['object'].comissao.pk
 
-        materias_comissao = lista_materias_comissao(context['object'].comissao.pk)
-        materias_pauta = PautaReuniao.objects.filter(reuniao=context['object'])
+        qr = self.request.GET.copy()
 
+        materias_pauta = PautaReuniao.objects.filter(reuniao=context['object'])
         nao_listar = [mp.materia.pk for mp in materias_pauta]
-        context['materias'] = materias_comissao.exclude(pk__in=nao_listar)
-        context['num_materias'] = len(context['materias'])
+
+        context['object_list'] = context['object_list'].filter(
+            tramitacao__unidade_tramitacao_destino__comissao=context['root_pk']
+        ).exclude(materia__pk__in=nao_listar).order_by(
+            "materia__tipo", "-materia__ano", "materia__numero"
+        )
+
+        context['numero_resultados'] = len(context['object_list'])
+        context['show_results'] = show_results_filter_set(qr)
 
         return context
     

sapl/materia/forms.py

@@ -1,6 +1,7 @@
-
+import django_filters
 import logging
 import os
+import sapl
 
 from crispy_forms.bootstrap import Alert, InlineRadios
 from crispy_forms.layout import (HTML, Button, Field, Fieldset,
@@ -11,7 +12,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.files.base import File
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
-from django.db.models import Max, Q, F
+from django.db.models import F, Max, Q
 from django.forms import ModelChoiceField, ModelForm, widgets
 from django.forms.forms import Form
 from django.forms.models import ModelMultipleChoiceField
@@ -21,36 +22,37 @@ from django.utils.encoding import force_text
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
-import django_filters
 
-import sapl
 from sapl.base.models import AppConfig, Autor, TipoAutor
-from sapl.comissoes.models import Comissao, Participacao, Composicao
+from sapl.comissoes.models import Comissao, Composicao, Participacao
 from sapl.compilacao.models import (STATUS_TA_IMMUTABLE_PUBLIC,
                                     STATUS_TA_PRIVATE)
-from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions, to_column,
-                                      to_row)
-from sapl.crispy_layout_mixin import SaplFormHelper
+from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions,
+                                      to_column, to_row, SaplFormHelper)
 from sapl.materia.models import (AssuntoMateria, Autoria, MateriaAssunto,
-                                 MateriaLegislativa, Orgao, RegimeTramitacao,
-                                 TipoDocumento, TipoProposicao, StatusTramitacao,
+                                 MateriaLegislativa, Orgao,
+                                 RegimeTramitacao, StatusTramitacao,
+                                 TipoDocumento, TipoProposicao,
                                  UnidadeTramitacao)
 from sapl.norma.models import (LegislacaoCitada, NormaJuridica, 
                                TipoNormaJuridica)
 from sapl.parlamentares.models import Legislatura, Partido, Parlamentar
-from sapl.protocoloadm.models import Protocolo, DocumentoAdministrativo, Anexado
+from sapl.protocoloadm.models import (Anexado, DocumentoAdministrativo,
+                                      Protocolo)
 from sapl.settings import MAX_DOC_UPLOAD_SIZE
-from sapl.utils import (YES_NO_CHOICES, SEPARADOR_HASH_PROPOSICAO,
+from sapl.utils import (autor_label, autor_modal,
                         ChoiceWithoutValidationField,
-                        MateriaPesquisaOrderingFilter, RangeWidgetOverride,
-                        autor_label, autor_modal, gerar_hash_arquivo,
+                        choice_anos_com_materias, FileFieldCheckMixin,
+                        FilterOverridesMetaMixin, gerar_hash_arquivo,
+                        lista_anexados, MateriaPesquisaOrderingFilter,
                         models_with_gr_for_model, qs_override_django_filter,
-                        choice_anos_com_materias, FilterOverridesMetaMixin, FileFieldCheckMixin,
-                        lista_anexados)
+                        RangeWidgetOverride, SEPARADOR_HASH_PROPOSICAO,
+                        YES_NO_CHOICES)
 
-from .models import (AcompanhamentoMateria, Anexada, Autoria, DespachoInicial,
-                     DocumentoAcessorio, Numeracao, Proposicao, Relatoria,
-                     TipoMateriaLegislativa, Tramitacao, UnidadeTramitacao)
+from .models import (AcompanhamentoMateria, Anexada, Autoria,
+                     DespachoInicial, DocumentoAcessorio, Numeracao,
+                     Proposicao, Relatoria, TipoMateriaLegislativa,
+                     Tramitacao, UnidadeTramitacao)
 
 
 def CHOICE_TRAMITACAO():

sapl/materia/views.py

@@ -1,13 +1,17 @@
-from datetime import datetime
+
 import itertools
 import logging
 import os
-from random import choice
+import sapl
 import shutil
-from string import ascii_letters, digits
 import tempfile
+import weasyprint
 
 from crispy_forms.layout import HTML
+from datetime import datetime
+from random import choice
+from string import ascii_letters, digits
+
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
@@ -18,65 +22,53 @@ from django.db.models import Max, Q
 from django.http import HttpResponse, JsonResponse
 from django.http.response import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
-from django.template import RequestContext, loader
+from django.template import loader, RequestContext
 from django.utils import formats, timezone
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import ListView, TemplateView, CreateView, UpdateView
+from django.views.generic import CreateView, ListView, TemplateView, UpdateView
 from django.views.generic.base import RedirectView
 from django.views.generic.edit import FormView
+
 from django_filters.views import FilterView
-import weasyprint
-import weasyprint
 
-import sapl
 from sapl.base.email_utils import do_envia_email_confirmacao
 from sapl.base.models import Autor, CasaLegislativa, AppConfig as BaseAppConfig
 from sapl.base.signals import tramitacao_signal
 from sapl.comissoes.models import Comissao, Participacao, Composicao
-from sapl.compilacao.models import (STATUS_TA_IMMUTABLE_RESTRICT,
-                                    STATUS_TA_PRIVATE)
+from sapl.compilacao.models import STATUS_TA_IMMUTABLE_RESTRICT, STATUS_TA_PRIVATE
 from sapl.compilacao.views import IntegracaoTaView
-from sapl.crispy_layout_mixin import SaplFormHelper
-from sapl.crispy_layout_mixin import SaplFormLayout, form_actions
-from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
-                            MasterDetailCrud,
-                            PermissionRequiredForAppCrudMixin, make_pagination)
-from sapl.materia.forms import (AnexadaForm, AutoriaForm,
-                                AutoriaMultiCreateForm,
-                                ConfirmarProposicaoForm,
-                                DevolverProposicaoForm, LegislacaoCitadaForm,
-                                OrgaoForm, ProposicaoForm, TipoProposicaoForm,
-                                TramitacaoForm, TramitacaoUpdateForm, MateriaPesquisaSimplesForm,
-                                DespachoInicialCreateForm)
+from sapl.crispy_layout_mixin import form_actions, SaplFormHelper, SaplFormLayout
+from sapl.crud.base import (Crud, CrudAux, make_pagination, MasterDetailCrud,
+                            PermissionRequiredForAppCrudMixin, RP_DETAIL, RP_LIST)
+from sapl.materia.forms import (AnexadaForm, AutoriaForm, AutoriaMultiCreateForm,
+                                ConfirmarProposicaoForm, DevolverProposicaoForm,
+                                DespachoInicialCreateForm, LegislacaoCitadaForm,
+                                MateriaPesquisaSimplesForm, OrgaoForm, ProposicaoForm,
+                                TipoProposicaoForm, TramitacaoForm, TramitacaoUpdateForm)
 from sapl.norma.models import LegislacaoCitada
 from sapl.parlamentares.models import Legislatura
 from sapl.protocoloadm.models import Protocolo
-from sapl.settings import MEDIA_ROOT, MAX_DOC_UPLOAD_SIZE
-from sapl.utils import (YES_NO_CHOICES, autor_label, autor_modal, SEPARADOR_HASH_PROPOSICAO,
-                        gerar_hash_arquivo, get_base_url, get_client_ip,
-                        get_mime_type_from_file_extension, montar_row_autor,
-                        show_results_filter_set, mail_service_configured, lista_anexados)
+from sapl.settings import MAX_DOC_UPLOAD_SIZE, MEDIA_ROOT
+from sapl.utils import (autor_label, autor_modal, gerar_hash_arquivo, get_base_url,
+                        get_client_ip, get_mime_type_from_file_extension, lista_anexados,
+                        mail_service_configured, montar_row_autor, SEPARADOR_HASH_PROPOSICAO,
+                        show_results_filter_set, YES_NO_CHOICES)
 
 from .forms import (AcessorioEmLoteFilterSet, AcompanhamentoMateriaForm,
-                    AnexadaEmLoteFilterSet,
-                    AdicionarVariasAutoriasFilterSet, DespachoInicialForm,
-                    DocumentoAcessorioForm, EtiquetaPesquisaForm,
-                    FichaPesquisaForm, FichaSelecionaForm, MateriaAssuntoForm,
-                    MateriaLegislativaFilterSet, MateriaLegislativaForm,
+                    AnexadaEmLoteFilterSet, AdicionarVariasAutoriasFilterSet,
+                    compara_tramitacoes_mat, DespachoInicialForm, DocumentoAcessorioForm,
+                    EtiquetaPesquisaForm, ExcluirTramitacaoEmLote, FichaPesquisaForm,
+                    FichaSelecionaForm, filtra_tramitacao_destino,
+                    filtra_tramitacao_destino_and_status, filtra_tramitacao_status,
+                    MateriaAssuntoForm, MateriaLegislativaFilterSet, MateriaLegislativaForm,
                     MateriaSimplificadaForm, PrimeiraTramitacaoEmLoteFilterSet,
-                    ReceberProposicaoForm, RelatoriaForm,
-                    TramitacaoEmLoteFilterSet, UnidadeTramitacaoForm,
-                    filtra_tramitacao_destino,
-                    filtra_tramitacao_destino_and_status,
-                    filtra_tramitacao_status,
-                    ExcluirTramitacaoEmLote, compara_tramitacoes_mat,
-                    TramitacaoEmLoteForm)
-from .models import (AcompanhamentoMateria, Anexada, AssuntoMateria, Autoria,
-                     DespachoInicial, DocumentoAcessorio, MateriaAssunto,
-                     MateriaLegislativa, Numeracao, Orgao, Origem, Proposicao,
-                     RegimeTramitacao, Relatoria, StatusTramitacao,
-                     TipoDocumento, TipoFimRelatoria, TipoMateriaLegislativa,
-                     TipoProposicao, Tramitacao, UnidadeTramitacao)
+                    ReceberProposicaoForm, RelatoriaForm, TramitacaoEmLoteFilterSet,
+                    TramitacaoEmLoteForm, UnidadeTramitacaoForm)
+from .models import (AcompanhamentoMateria, Anexada, AssuntoMateria, Autoria, DespachoInicial,
+                     DocumentoAcessorio, MateriaAssunto, MateriaLegislativa, Numeracao, Orgao,
+                     Origem, Proposicao, RegimeTramitacao, Relatoria, StatusTramitacao,
+                     TipoDocumento, TipoFimRelatoria, TipoMateriaLegislativa, TipoProposicao,
+                     Tramitacao, UnidadeTramitacao)
 
 
 AssuntoMateriaCrud = CrudAux.build(AssuntoMateria, 'assunto_materia')

sapl/templates/comissoes/pauta.html

@@ -5,23 +5,72 @@
 {% block title %}
 	<h1 class="page-header">
         {% if opcao %}
-            Adicionar Matérias à Pauta <small>(Reunião: {{object}})</small>
+            Adicionar Matérias à Pauta <small>(Reunião: {{ object }})</small>
         {% else %}
-            Remover Matérias da Pauta <small>(Reunião: {{object}})</small>
+            Remover Matérias da Pauta <small>(Reunião: {{ object }})</small>
         {% endif %}
 	</h1>
 {% endblock %}
 
 {% block detail_content %}
+    {% if opcao %}
+        {% if not show_results %}
+            {% crispy filter.form %}
+        {% endif %}
+
+        {% if show_results %}
+            {% if numero_resultados > 0 %}
+                {% if numero_resultados == 1 %}
+                    <div style="text-align: right;"><b>Pesquisa concluída com sucesso! Foi encontrada 1 matéria disponível.</b></div><br>
+                    {% else %}
+                    <div style="text-align: right;">
+                        <b>Pesquisa concluída com sucesso! Foram encontradas {{ numero_resultados }} matérias disponíveis.</b>
+                    </div>
+                    <br>
+                {% endif %}
+                <form method="POST" enctype="multipart/form-data">
+                    {% csrf_token %}
+                    <fieldset>
+                        <legend>Matérias para Adicionar à Pauta</legend>
+                        <table class="table table-striped table-hover">
+                            <div class="controls">
+                                <div class="checkbox">
+                                    <label for="id_check_all">
+                                        <input type="checkbox" id="id_check_all" onchange="checkAll(this)"/> Marcar/Desmarcar Todos
+                                    </label>
+                                </div>
+                            </div>
+                            <thead><tr><th>Matéria</th></tr></thead>
+                            <tbody>
+                                {% for materia_t in object_list %}
+                                    <tr>
+                                        <td>
+                                            <input type="checkbox" name="materia_id" value="{{ materia_t.materia.id }}" {% if check %} checked {% endif %}/>
+                                            {{ materia_t.materia.tipo.sigla }} 
+                                            {{ materia_t.materia.numero }}/{{ materia_t.materia.ano }} - {{ materia_t.materia.tipo.descricao }}
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </fieldset>
+                    <input type="submit" value="Salvar" class="btn btn-primary"S>
+                </form>
+            {% else %}
+                <br><div style="text-align: center"><b>Nenhuma matéria disponível encontrada.</b></div>
+            {% endif %}
+        {% endif %}
+    {% else %}
         {% if materias %}
-        {% if num_materias == 1 %}
-            <b>Há {{num_materias}} matéria disponível.</b> <br><br>
+            {% if numero_materias == 1 %}
+                <div style="text-align: right;"><b>Há 1 matéria disponível.</b></div><br>
             {% else %}
-            <b>Há {{num_materias}} matérias disponíveis.</b> <br><br>
+                <div style="text-align: right;"><b>Há {{ numero_materias }} matérias disponíveis.</b></div><br>
             {% endif %}
             <form method="POST" enctype="multipart/form-data">
                 {% csrf_token %}
                 <fieldset>
+                    <legend>Matérias para Remover da Pauta</legend>
                     <table class="table table-striped table-hover">
                         <div class="controls">
                             <div class="checkbox">
@@ -30,31 +79,27 @@
                                 </label>
                             </div>
                         </div>
-                    <thead>
-                        <tr><th>Matéria</th></tr>
-                    </thead>
-                    <tbody onload="checks(materias_checked)">
+                        <thead><tr><th>Matéria</th></tr></thead>
+                        <tbody>
                             {% for materia in materias %}
                                 <tr>
                                     <td>
-                                    <input type="checkbox" name="materia_id" value="{{materia.id}}" {% if check %} checked {% endif %}/>
-                                    {{materia.tipo.sigla}} {{materia.numero}}/{{materia.ano}} - {{materia.tipo.descricao}}
+                                        <input type="checkbox" name="materia_id" value="{{ materia.id }}" {% if check %} checked {% endif %}/>
+                                        {{ materia.tipo.sigla }} {{ materia.numero }}/{{ materia.ano }} - {{ materia.tipo.descricao }}
                                     </td>
                                 </tr>
                             {% endfor %}
                         </tbody>
                     </table>
                 </fieldset>
-            {% if opcao %}
-                <input type="submit" value="Salvar" class="btn btn-primary"S>
-            {% else %}
                 <input type="submit" value="Remover" class="btn btn-danger"S>
-            {% endif %}
             </form>
         {% else %}
-        <b>Não há matéria disponível.</b> <br><br>
+            <br><div style="text-align: center;"><b>Não há matéria disponível.</b></div>
+        {% endif %}
     {% endif %}
 {% endblock %}
+
 {% block extra_js %}
     <script language="JavaScript">
         function checkAll(elem){

sapl/templates/comissoes/reuniao_detail.html

@@ -5,56 +5,50 @@
     {{ block.super }}
     <h2 class="legend">Pauta</h2>
     {% if mats %}
-                <p>Total de Registros: <b>{{num_mats}}</b></p>
+        <p>Total de Registros: <b>{{ num_mats }}</b></p>
         <table class="table table-striped table-hover">
-                    <thead>
-                        <tr>
-                            <th>Matéria</th>
-                        </tr>
-                    </thead>
+            <thead><tr><th>Matéria</th></tr></thead>
             <tbody>
                 {% for mat in mats %}
-                            <tr>
-                                <td>
-                                    <a href="{% url 'sapl.materia:materialegislativa_detail' mat.pk %}">{{mat}}</a>
-                                </td>
-                            </tr>
+                    <tr><td><a href="{% url 'sapl.materia:materialegislativa_detail' mat.pk %}">{{mat}}</a></td></tr>
                 {% endfor %}
             </tbody>
         </table>
         {% if perms.comissoes.add_reuniao %}
             <div class="actions btn-group float-right" role="group">
-                        <a href="{% url 'sapl.comissoes:pauta_add' reuniao_pk %}" class="btn btn-outline-primary">{% trans 'Adicionar Matéria' %}</a>
-                        <a href="{% url 'sapl.comissoes:pauta_remove' reuniao_pk %}" class="btn btn-outline-primary btn-outline-danger">{% trans 'Remover Matéria' %}</a>
+                <a href="{% url 'sapl.comissoes:pauta_add' reuniao_pk %}" class="btn btn-outline-primary">{% trans 'Adicionar Matéria(s)' %}</a>
+                {% if num_mats == 1 %}
+                    <a href="{% url 'sapl.comissoes:pauta_remove' reuniao_pk %}" class="btn btn-outline-primary btn-outline-danger">
+                        {% trans 'Remover Matéria' %}
+                    </a>
+                {% else %}
+                    <a href="{% url 'sapl.comissoes:pauta_remove' reuniao_pk %}" class="btn btn-outline-primary btn-outline-danger">
+                        {% trans 'Remover Matéria(s)' %}
+                    </a>
+                {% endif %}
             </div>
         {% endif %}
     {% else %}
         {% if perms.comissoes.add_reuniao %}
-                    <a href="{% url 'sapl.comissoes:pauta_add' reuniao_pk %}" class="btn btn-outline-primary">{% trans 'Adicionar Matéria' %}</a>
+            <a href="{% url 'sapl.comissoes:pauta_add' reuniao_pk %}" class="btn btn-outline-primary">{% trans 'Adicionar Matéria(s)' %}</a>
         {% endif %}
     {% endif %}
     <br /><br />
     <h2 class="legend">Documentos Acessórios</h2>
     {% if docs %}
-                <p>Total de registros: <b>{{num_docs}}</b></p>
+        <p>Total de registros: <b>{{ num_docs }}</b></p>
         <table class="table table-striped table-hover">
-                    <thead>
-                        <tr>
-                            <th>Documento Acessório</th>
-                        </tr>
-                    </thead>
+            <thead><tr><th>Documento Acessório</th></tr></thead>
             <tbody>
                 {% for doc in docs %}
-                            <tr>
-                                <td>
-                                    <a href="{% url 'sapl.comissoes:documentoacessorio_detail' doc.pk %}">{{ doc.nome }}</a>
-                                </td>
-                            </tr>
+                    <tr><td><a href="{% url 'sapl.comissoes:documentoacessorio_detail' doc.pk %}">{{ doc.nome }}</a></td></tr>
                 {% endfor %}
             </tbody>
         </table>
         {% if perms.comissoes.add_reuniao %}
-                    <a href="{% url 'sapl.comissoes:documentoacessorio_create' reuniao_pk %}" class="btn btn-outline-primary float-right">{% trans 'Adicionar Documento' %}</a>
+            <a href="{% url 'sapl.comissoes:documentoacessorio_create' reuniao_pk %}" class="btn btn-outline-primary float-right">
+                {% trans 'Adicionar Documento' %}
+            </a>
         {% endif %}
     {% else %}
         {% if perms.comissoes.add_reuniao %}

sapl/templates/materia/em_lote/anexada.html

@@ -1,12 +1,11 @@
 {% extends "crud/detail.html" %}
 {% load i18n crispy_forms_tags %}
 {% block actions %}{% endblock %}
-{% block detail_content %}
 
+{% block detail_content %}
   {% if not show_results %}
     {% crispy filter.form %}
   {% endif %}
-
   {% if show_results %}
     {% if numero_res > 0 %}
       {% if numero_res == 1 %}
@@ -16,42 +15,30 @@
       {% endif %}
       <form method="POST" enctype="multipart/form-data">
         {% csrf_token %}
-
         <fieldset>
           <div class="row">
-
             <div class="col-md-4">
               <div class="form-group">
-              <label>Data Anexação*</label>
-              <input type="text" name="data_anexacao" class="form-control dateinput" required="True">
+                <label>Data Anexação*</label><input type="text" name="data_anexacao" class="form-control dateinput" required="True">
               </div>
             </div>
             <div class="col-md-4">
               <div class="form-group">
-              <label>Data Desanexação</label>
-              <input type="text" name="data_desanexacao" class="form-control dateinput">
+                <label>Data Desanexação</label><input type="text" name="data_desanexacao" class="form-control dateinput">
               </div>
             </div>
           </div>
-
-
         </fieldset>
-
         <br />
-
         <fieldset>
           <legend>Matérias para Anexar em Lote</legend>
           <table class="table table-striped table-hover">
             <div class="controls">
 					    <div class="checkbox">
-						<label for="id_check_all">
-							<input type="checkbox" id="id_check_all" onchange="checkAll(this)" /> Marcar/Desmarcar Todos
-						</label>
+                <label for="id_check_all"><input type="checkbox" id="id_check_all" onchange="checkAll(this)" /> Marcar/Desmarcar Todos</label>
 					    </div>
 			      </div>
-            <thead>
-              <tr><th>Matéria</th></tr>
-            </thead>
+            <thead><tr><th>Matéria</th></tr></thead>
             <tbody>
                 {% for materia in object_list %}
                   <tr>
@@ -71,6 +58,7 @@
     {% endif %}
   {% endif %}
 {% endblock detail_content %}
+
 {% block extra_js %}
 	<script language="JavaScript">
 		function checkAll(elem) {