From 41999da971235827f0644f490d241d5daf99d779 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Thu, 15 Aug 2019 12:44:08 -0300 Subject: [PATCH] =?UTF-8?q?Melhora=20forma=20como=20=C3=A9=20obtida=20vari?= =?UTF-8?q?=C3=A1vel=20expedientes=20vazios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/sessao/views.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index b6a9e262e..a03612587 100755 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -2087,16 +2087,13 @@ class ExpedienteView(FormMixin, DetailView): def get(self, request, *args, **kwargs): self.object = self.get_object() context = self.get_context_data(object=self.object) - tipos = TipoExpediente.objects.all().order_by('ordenacao') + tipos = TipoExpediente.objects.all().order_by('ordenacao', 'nome') expedientes_sessao = ExpedienteSessao.objects.filter( - sessao_plenaria_id=self.object.id).order_by('tipo__ordenacao') + sessao_plenaria_id=self.object.id).order_by('tipo__ordenacao', 'tipo__nome') - expedientes_salvos = [] - for e in expedientes_sessao: - expedientes_salvos.append(e.tipo) + expedientes_salvos = [e.tipo.id for e in expedientes_sessao] - tipos_null = list(set(tipos) - set(expedientes_salvos)) - tipos_null.sort(key=lambda x: x.ordenacao) + tipos_null = TipoExpediente.objects.all().exclude(id__in=expedientes_salvos).order_by('ordenacao', 'nome') expedientes = [] for e, t in zip(expedientes_sessao, tipos):