Browse Source

Corrige ordenacao de imports

pull/202/head
Marcio Mazza 9 years ago
parent
commit
b9f7c2b582
  1. 1
      base/templatetags/menus.py
  2. 2
      comissoes/views.py
  3. 3
      materia/views.py
  4. 2
      norma/views.py
  5. 2
      parlamentares/views.py
  6. 6
      protocoloadm/views.py
  7. 2
      sapl/layout.py
  8. 2
      sessao/views.py

1
base/templatetags/menus.py

@ -3,6 +3,7 @@ import os
import yaml import yaml
from django import template from django import template
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from sapl.settings import BASE_DIR from sapl.settings import BASE_DIR
register = template.Library() register = template.Library()

2
comissoes/views.py

@ -10,10 +10,10 @@ from django.views.generic.edit import FormMixin
from vanilla import GenericView from vanilla import GenericView
import sapl import sapl
from sapl.layout import form_actions
from materia.models import Tramitacao from materia.models import Tramitacao
from parlamentares.models import Filiacao from parlamentares.models import Filiacao
from sapl.crud import build_crud from sapl.crud import build_crud
from sapl.layout import form_actions
from .models import (CargoComissao, Comissao, Composicao, Participacao, from .models import (CargoComissao, Comissao, Composicao, Participacao,
Periodo, TipoComissao) Periodo, TipoComissao)

3
materia/views.py

@ -18,12 +18,12 @@ from django.views.generic.edit import FormMixin
from vanilla.views import GenericView from vanilla.views import GenericView
import sapl import sapl
from sapl.layout import form_actions
from comissoes.models import Comissao, Composicao from comissoes.models import Comissao, Composicao
from compilacao.views import IntegracaoTaView from compilacao.views import IntegracaoTaView
from norma.models import LegislacaoCitada, NormaJuridica, TipoNormaJuridica from norma.models import LegislacaoCitada, NormaJuridica, TipoNormaJuridica
from parlamentares.models import Parlamentar, Partido from parlamentares.models import Parlamentar, Partido
from sapl.crud import build_crud from sapl.crud import build_crud
from sapl.layout import form_actions
from sessao.models import AcompanharMateria from sessao.models import AcompanharMateria
from .models import (Anexada, Autor, Autoria, DespachoInicial, from .models import (Anexada, Autor, Autoria, DespachoInicial,
@ -33,7 +33,6 @@ from .models import (Anexada, Autor, Autoria, DespachoInicial,
TipoFimRelatoria, TipoMateriaLegislativa, TipoProposicao, TipoFimRelatoria, TipoMateriaLegislativa, TipoProposicao,
Tramitacao, UnidadeTramitacao) Tramitacao, UnidadeTramitacao)
origem_crud = build_crud( origem_crud = build_crud(
Origem, 'origem', [ Origem, 'origem', [

2
norma/views.py

@ -13,10 +13,10 @@ from django.views.generic.edit import FormMixin
from vanilla.views import GenericView from vanilla.views import GenericView
import sapl import sapl
from sapl.layout import form_actions
from compilacao.views import IntegracaoTaView from compilacao.views import IntegracaoTaView
from materia.models import MateriaLegislativa, TipoMateriaLegislativa from materia.models import MateriaLegislativa, TipoMateriaLegislativa
from sapl.crud import build_crud from sapl.crud import build_crud
from sapl.layout import form_actions
from .models import (AssuntoNorma, LegislacaoCitada, NormaJuridica, from .models import (AssuntoNorma, LegislacaoCitada, NormaJuridica,
TipoNormaJuridica) TipoNormaJuridica)

2
parlamentares/views.py

@ -14,8 +14,8 @@ from django.views.generic.edit import FormMixin
from vanilla import GenericView from vanilla import GenericView
import sapl import sapl
from sapl.layout import form_actions
from sapl.crud import build_crud from sapl.crud import build_crud
from sapl.layout import form_actions
from .models import (CargoMesa, Coligacao, ComposicaoMesa, Dependente, from .models import (CargoMesa, Coligacao, ComposicaoMesa, Dependente,
Filiacao, Legislatura, Mandato, NivelInstrucao, Filiacao, Legislatura, Mandato, NivelInstrucao,

6
protocoloadm/views.py

@ -2,7 +2,7 @@ from datetime import date, datetime
from re import sub from re import sub
from crispy_forms.helper import FormHelper from crispy_forms.helper import FormHelper
from crispy_forms.layout import (HTML, Field, Fieldset, Layout) from crispy_forms.layout import HTML, Field, Fieldset, Layout
from django import forms from django import forms
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@ -19,9 +19,9 @@ from django.views.generic.edit import FormMixin
from vanilla import GenericView from vanilla import GenericView
import sapl import sapl
from sapl.layout import form_actions
from materia.models import Proposicao, TipoMateriaLegislativa from materia.models import Proposicao, TipoMateriaLegislativa
from sapl.crud import build_crud from sapl.crud import build_crud
from sapl.layout import form_actions
from .models import (Autor, DocumentoAcessorioAdministrativo, from .models import (Autor, DocumentoAcessorioAdministrativo,
DocumentoAdministrativo, Protocolo, DocumentoAdministrativo, Protocolo,
@ -614,7 +614,7 @@ class ProtocoloMateriaView(FormMixin, GenericView):
numeracao = Protocolo.objects.all().aggregate(Max('numero')) numeracao = Protocolo.objects.all().aggregate(Max('numero'))
if numeracao is None: if numeracao is None:
numero['numero__max'] = 0 numeracao['numero__max'] = 0
protocolo = Protocolo() protocolo = Protocolo()

2
sapl/layout.py

@ -1,5 +1,5 @@
from crispy_forms.bootstrap import FormActions from crispy_forms.bootstrap import FormActions
from crispy_forms.layout import Submit, Layout, Div, Fieldset, HTML from crispy_forms.layout import HTML, Div, Fieldset, Layout, Submit
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _

2
sessao/views.py

@ -15,12 +15,12 @@ from django.views.generic.edit import FormMixin
from rest_framework import generics from rest_framework import generics
import sapl import sapl
from sapl.layout import form_actions
from materia.models import (Autoria, DocumentoAcessorio, from materia.models import (Autoria, DocumentoAcessorio,
TipoMateriaLegislativa, Tramitacao) TipoMateriaLegislativa, Tramitacao)
from norma.models import NormaJuridica from norma.models import NormaJuridica
from parlamentares.models import Parlamentar from parlamentares.models import Parlamentar
from sapl.crud import build_crud from sapl.crud import build_crud
from sapl.layout import form_actions
from sessao.serializers import SessaoPlenariaSerializer from sessao.serializers import SessaoPlenariaSerializer
from .models import (AcompanharMateria, CargoMesa, ExpedienteMateria, from .models import (AcompanharMateria, CargoMesa, ExpedienteMateria,

Loading…
Cancel
Save