Browse Source

Organize imports in some files

producao
Marcio Mazza 10 years ago
parent
commit
4efecbd03c
  1. 3
      sigi/apps/contatos/admin.py
  2. 9
      sigi/apps/convenios/admin.py
  3. 6
      sigi/apps/diagnosticos/admin.py
  4. 1
      sigi/apps/financeiro/admin.py
  5. 1
      sigi/apps/inventario/admin.py
  6. 1
      sigi/apps/mesas/admin.py
  7. 3
      sigi/apps/metas/admin.py
  8. 6
      sigi/apps/parlamentares/admin.py
  9. 9
      sigi/apps/servicos/admin.py
  10. 4
      sigi/apps/servidores/admin.py
  11. 3
      sigi/apps/utils/__init__.py

3
sigi/apps/contatos/admin.py

@ -1,9 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from sigi.apps.contatos.filters import PopulationFilter
from sigi.apps.contatos.models import (UnidadeFederativa, Municipio, Telefone, from sigi.apps.contatos.models import (UnidadeFederativa, Municipio, Telefone,
Contato) Contato)
from sigi.apps.utils import queryset_ascii from sigi.apps.utils import queryset_ascii
from sigi.apps.contatos.filters import PopulationFilter
class UnidadeFederativaAdmin(admin.ModelAdmin): class UnidadeFederativaAdmin(admin.ModelAdmin):

9
sigi/apps/convenios/admin.py

@ -1,15 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from django.contrib.admin.views.main import ChangeList
from sigi.apps.convenios.models import Projeto, Convenio, EquipamentoPrevisto, Anexo, Tramitacao, UnidadeAdministrativa
from sigi.apps.casas.models import CasaLegislativa
from sigi.apps.servicos.models import Servico
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
from sigi.apps.convenios.reports import ConvenioReport
from sigi.apps.utils import queryset_ascii
from geraldo.generators import PDFGenerator from geraldo.generators import PDFGenerator
from sigi.apps.convenios.models import Projeto, Convenio, EquipamentoPrevisto, Anexo, Tramitacao
from sigi.apps.convenios.reports import ConvenioReport
from sigi.apps.convenios.views import adicionar_convenios_carrinho from sigi.apps.convenios.views import adicionar_convenios_carrinho
from sigi.apps.utils import queryset_ascii
class TramitacaoInline(admin.TabularInline): class TramitacaoInline(admin.TabularInline):

6
sigi/apps/diagnosticos/admin.py

@ -1,11 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from datetime import datetime from datetime import datetime
from django.contrib import admin from django.contrib import admin
from django.db.utils import OperationalError, ProgrammingError
from eav.admin import BaseEntityAdmin, BaseSchemaAdmin from eav.admin import BaseEntityAdmin, BaseSchemaAdmin
from sigi.apps.diagnosticos.models import Diagnostico, Pergunta, Escolha, Equipe, Anexo, Categoria
from sigi.apps.diagnosticos.forms import DiagnosticoForm from sigi.apps.diagnosticos.forms import DiagnosticoForm
from sigi.apps.contatos.models import UnidadeFederativa from sigi.apps.diagnosticos.models import Diagnostico, Pergunta, Escolha, Equipe, Anexo, Categoria
from django.db.utils import OperationalError, ProgrammingError
def publicar_diagnostico(self, request, queryset): def publicar_diagnostico(self, request, queryset):

1
sigi/apps/financeiro/admin.py

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from sigi.apps.financeiro.models import Desembolso from sigi.apps.financeiro.models import Desembolso

1
sigi/apps/inventario/admin.py

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from django.contrib.contenttypes import generic from django.contrib.contenttypes import generic
from sigi.apps.contatos.models import Contato, Telefone from sigi.apps.contatos.models import Contato, Telefone
from sigi.apps.inventario.models import (Fornecedor, Fabricante, Equipamento, from sigi.apps.inventario.models import (Fornecedor, Fabricante, Equipamento,
TipoEquipamento, ModeloEquipamento, TipoEquipamento, ModeloEquipamento,

1
sigi/apps/mesas/admin.py

@ -2,6 +2,7 @@
from django.contrib import admin from django.contrib import admin
from django.http import HttpResponse from django.http import HttpResponse
from django.utils.html import escape from django.utils.html import escape
from sigi.apps.mesas.models import (Legislatura, Coligacao, ComposicaoColigacao, from sigi.apps.mesas.models import (Legislatura, Coligacao, ComposicaoColigacao,
SessaoLegislativa, MesaDiretora, Cargo, SessaoLegislativa, MesaDiretora, Cargo,
MembroMesaDiretora) MembroMesaDiretora)

3
sigi/apps/metas/admin.py

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from sigi.apps.metas.models import Meta, PlanoDiretor
from sigi.apps.metas.models import PlanoDiretor
class MetaAdmin(admin.ModelAdmin): class MetaAdmin(admin.ModelAdmin):

6
sigi/apps/parlamentares/admin.py

@ -1,15 +1,13 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import string
from django.contrib import admin from django.contrib import admin
from django.contrib.contenttypes import generic from django.contrib.contenttypes import generic
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponseRedirect
from sigi.apps.contatos.models import Telefone from sigi.apps.contatos.models import Telefone
from sigi.apps.parlamentares.models import Partido, Parlamentar, Mandato from sigi.apps.parlamentares.models import Partido, Parlamentar, Mandato
from sigi.apps.parlamentares.views import adicionar_parlamentar_carrinho from sigi.apps.parlamentares.views import adicionar_parlamentar_carrinho
from sigi.apps.utils.filters import AlphabeticFilter
from sigi.apps.utils.base_admin import BaseModelAdmin from sigi.apps.utils.base_admin import BaseModelAdmin
from sigi.apps.utils.filters import AlphabeticFilter
class MandatosInline(admin.TabularInline): class MandatosInline(admin.TabularInline):

9
sigi/apps/servicos/admin.py

@ -1,13 +1,14 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from sigi.apps.servicos.models import Servico, LogServico, CasaAtendida, TipoServico from django.core.urlresolvers import reverse
from sigi.apps.casas.admin import FuncionariosInline
from django.http import Http404, HttpResponseRedirect
from django.forms.models import ModelForm from django.forms.models import ModelForm
from django.http import Http404, HttpResponseRedirect
from django.utils.encoding import force_unicode from django.utils.encoding import force_unicode
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
from sigi.apps.casas.admin import FuncionariosInline
from sigi.apps.casas.models import CasaLegislativa from sigi.apps.casas.models import CasaLegislativa
from sigi.apps.servicos.models import Servico, LogServico, CasaAtendida, TipoServico
class LogServicoInline(admin.StackedInline): class LogServicoInline(admin.StackedInline):

4
sigi/apps/servidores/admin.py

@ -2,10 +2,10 @@
from django.contrib import admin from django.contrib import admin
from django.contrib.contenttypes import generic from django.contrib.contenttypes import generic
from sigi.apps.utils.admin_widgets import AdminImageWidget
from sigi.apps.servidores.models import Servidor, Funcao, Licenca, Ferias, Servico, Subsecretaria
from sigi.apps.contatos.models import Endereco, Telefone from sigi.apps.contatos.models import Endereco, Telefone
from sigi.apps.servidores.forms import FeriasForm, LicencaForm, FuncaoForm from sigi.apps.servidores.forms import FeriasForm, LicencaForm, FuncaoForm
from sigi.apps.servidores.models import Servidor, Funcao, Licenca, Ferias, Servico, Subsecretaria
from sigi.apps.utils.admin_widgets import AdminImageWidget
from sigi.apps.utils.filters import AlphabeticFilter from sigi.apps.utils.filters import AlphabeticFilter

3
sigi/apps/utils/__init__.py

@ -1,7 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from unicodedata import normalize
from django.contrib import admin from django.contrib import admin
from django.db import models from django.db import models
from unicodedata import normalize
class SearchField(models.TextField): class SearchField(models.TextField):

Loading…
Cancel
Save