From 8642f57d2c3b4bcfdc6ff7d6471a3900006b279e Mon Sep 17 00:00:00 2001 From: VictorFabreF Date: Fri, 20 Jul 2018 14:53:16 -0300 Subject: [PATCH] HOT-FIX: melhora codigo --- sapl/materia/forms.py | 8 ++------ sapl/protocoloadm/forms.py | 9 +++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index fc31c1464..97d7156b5 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -766,14 +766,10 @@ class MateriaLegislativaFilterSet(django_filters.FilterSet): def pega_ultima_tramitacao(): - ultimas_tramitacoes = Tramitacao.objects.values( + return Tramitacao.objects.values( 'materia_id').annotate(data_encaminhamento=Max( 'data_encaminhamento'), - id=Max('id')).values_list('id') - - lista = [item for sublist in ultimas_tramitacoes for item in sublist] - - return lista + id=Max('id')).values_list('id', flat=True) def filtra_tramitacao_status(status): diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index 502720b0b..22e649459 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -875,15 +875,12 @@ class DesvincularMateriaForm(forms.Form): ) ) + def pega_ultima_tramitacao_adm(): - ultimas_tramitacoes = TramitacaoAdministrativo.objects.values( + return TramitacaoAdministrativo.objects.values( 'materia_id').annotate(data_encaminhamento=Max( 'data_encaminhamento'), - id=Max('id')).values_list('id') - - lista = [item for sublist in ultimas_tramitacoes for item in sublist] - - return lista + id=Max('id')).values_list('id', flat=True) def filtra_tramitacao_adm_status(status):