From 8ff8831a795364f6e50f8fa50d15c7633675b3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= Date: Mon, 18 Apr 2022 19:25:56 -0300 Subject: [PATCH] =?UTF-8?q?N=C3=BAmero=20de=20parlamentares?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/casas/admin.py | 12 +++--------- sigi/apps/casas/models.py | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sigi/apps/casas/admin.py b/sigi/apps/casas/admin.py index 96b6933..d8aefe2 100644 --- a/sigi/apps/casas/admin.py +++ b/sigi/apps/casas/admin.py @@ -21,7 +21,6 @@ from sigi.apps.utils.mixins import CartExportReportMixin, LabeledResourse class OrgaoExportResourse(LabeledResourse): presidente = Field(column_name='presidente') telefone = Field(column_name='telefone') - num_parlamentares = Field(column_name='num_parlamentares') # servicos_seit = Field(column_name='servicos_seit') contato = Field(column_name='contato') class Meta: @@ -29,8 +28,7 @@ class OrgaoExportResourse(LabeledResourse): fields = ('municipio__codigo_ibge', 'cnpj', 'municipio__codigo_tse', 'nome', 'municipio__nome', 'municipio__uf__sigla', 'presidente', 'logradouro', 'bairro', 'cep', 'telefone', - 'pagina_web', 'email', 'num_parlamentares', - 'ult_alt_endereco', 'contato') + 'pagina_web', 'email', 'ult_alt_endereco', 'contato') export_order = fields def dehydrate_presidente(self, orgao): @@ -39,9 +37,6 @@ class OrgaoExportResourse(LabeledResourse): def dehydrate_telefone(self, orgao): return orgao.telefone - def dehydrate_num_parlamentares(self, orgao): - return orgao.num_parlamentares - # def dehydrate_servicos_seit(self, orgao): # servicos = [s.tipo_servico.nome for s in orgao.servico_set.filter( # data_desativacao__isnull=True)] @@ -262,8 +257,7 @@ class OrgaoAdmin(CartExportReportMixin, admin.ModelAdmin): queryset = queryset_ascii fieldsets = ( (None, { - 'fields': ('tipo', 'nome', 'sigla', 'cnpj', 'num_parlamentares', - 'gerentes_interlegis') + 'fields': ('tipo', 'nome', 'sigla', 'cnpj', 'gerentes_interlegis') }), (_('Endereço'), { 'fields': ('data_instalacao', 'logradouro', 'bairro', @@ -278,7 +272,7 @@ class OrgaoAdmin(CartExportReportMixin, admin.ModelAdmin): }), ) raw_id_fields = ('municipio',) - readonly_fields = ['num_parlamentares', 'gerentes_interlegis',] + readonly_fields = ['gerentes_interlegis',] search_fields = ('search_text', 'sigla', 'cnpj', 'bairro', 'logradouro', 'cep', 'municipio__nome', 'municipio__uf__nome', 'municipio__codigo_ibge', 'pagina_web', 'observacoes') diff --git a/sigi/apps/casas/models.py b/sigi/apps/casas/models.py index 94ef7b9..cfa81cd 100644 --- a/sigi/apps/casas/models.py +++ b/sigi/apps/casas/models.py @@ -148,9 +148,7 @@ class Orgao(models.Model): @property def num_parlamentares(self): - if not self.legislatura_set.exists(): - return 0 - return self.legislatura_set.latest('data_inicio').total_parlamentares + return 0 @property def telefone(self):