SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Refatoração

pull/3010/head
João Rodrigues 6 years ago
parent
eeac36418c
commit
337553d6a9
3 changed files with 70 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      sapl/materia/forms.py
  2. 82
      sapl/materia/views.py
  3. 34
      sapl/templates/materia/em_lote/anexada.html

42
sapl/materia/forms.py
View File

@ -1,6 +1,7 @@
import django_filters
import logging import logging
import os import os
import sapl
from crispy_forms.bootstrap import Alert, InlineRadios from crispy_forms.bootstrap import Alert, InlineRadios
from crispy_forms.layout import (HTML, Button, Field, Fieldset, 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.files.base import File
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.db import models, transaction 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 import ModelChoiceField, ModelForm, widgets
from django.forms.forms import Form from django.forms.forms import Form
from django.forms.models import ModelMultipleChoiceField 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.html import format_html
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
import django_filters
import sapl
from sapl.base.models import AppConfig, Autor, TipoAutor 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, from sapl.compilacao.models import (STATUS_TA_IMMUTABLE_PUBLIC,
STATUS_TA_PRIVATE) STATUS_TA_PRIVATE)
from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions, to_column, from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions,
to_row) to_column, to_row, SaplFormHelper)
from sapl.crispy_layout_mixin import SaplFormHelper
from sapl.materia.models import (AssuntoMateria, Autoria, MateriaAssunto, from sapl.materia.models import (AssuntoMateria, Autoria, MateriaAssunto,
MateriaLegislativa, Orgao, RegimeTramitacao, MateriaLegislativa, Orgao,
TipoDocumento, TipoProposicao, StatusTramitacao, RegimeTramitacao, StatusTramitacao,
TipoDocumento, TipoProposicao,
UnidadeTramitacao) UnidadeTramitacao)
from sapl.norma.models import (LegislacaoCitada, NormaJuridica, from sapl.norma.models import (LegislacaoCitada, NormaJuridica,
TipoNormaJuridica) TipoNormaJuridica)
from sapl.parlamentares.models import Legislatura, Partido, Parlamentar 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.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, ChoiceWithoutValidationField,
MateriaPesquisaOrderingFilter, RangeWidgetOverride, choice_anos_com_materias, FileFieldCheckMixin,
autor_label, autor_modal, gerar_hash_arquivo, FilterOverridesMetaMixin, gerar_hash_arquivo,
lista_anexados, MateriaPesquisaOrderingFilter,
models_with_gr_for_model, qs_override_django_filter, models_with_gr_for_model, qs_override_django_filter,
choice_anos_com_materias, FilterOverridesMetaMixin, FileFieldCheckMixin, RangeWidgetOverride, SEPARADOR_HASH_PROPOSICAO,
lista_anexados) YES_NO_CHOICES)
from .models import (AcompanhamentoMateria, Anexada, Autoria, DespachoInicial, from .models import (AcompanhamentoMateria, Anexada, Autoria,
DocumentoAcessorio, Numeracao, Proposicao, Relatoria, DespachoInicial, DocumentoAcessorio, Numeracao,
TipoMateriaLegislativa, Tramitacao, UnidadeTramitacao) Proposicao, Relatoria, TipoMateriaLegislativa,
Tramitacao, UnidadeTramitacao)
def CHOICE_TRAMITACAO(): def CHOICE_TRAMITACAO():

82
sapl/materia/views.py
View File

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

34
sapl/templates/materia/em_lote/anexada.html
View File

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

Write Preview
Loading…
Cancel
Save