Refatoração

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,
+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/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>
             <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>
-          </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>
-					</div>
-			</div>
-            <thead>
-              <tr><th>Matéria</th></tr>
-            </thead>
+					    <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 in object_list %}
                   <tr>
@@ -71,6 +58,7 @@
     {% endif %}
   {% endif %}
 {% endblock detail_content %}
+
 {% block extra_js %}
 	<script language="JavaScript">
 		function checkAll(elem) {