From 32dbe579a9b9e9d9c7662c489640d9fb7814d833 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Tue, 18 Sep 2018 09:12:55 -0300 Subject: [PATCH] Fix #2221 --- sapl/materia/models.py | 3 +++ sapl/materia/views.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sapl/materia/models.py b/sapl/materia/models.py index a43a798b0..6bcb6f8c0 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -908,6 +908,9 @@ class Tramitacao(models.Model): null=True, verbose_name=_('Status')) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE) + # TODO: Remover os campos de data + # TODO: pois timestamp supre a necessidade + timestamp = models.DateTimeField(default=timezone.now) data_tramitacao = models.DateField(verbose_name=_('Data Tramitação')) unidade_tramitacao_local = models.ForeignKey( UnidadeTramitacao, diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 050be7ba6..9e738dbe9 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1080,6 +1080,7 @@ class TramitacaoCrud(MasterDetailCrud): ultima_tramitacao = Tramitacao.objects.filter( materia_id=self.kwargs['pk']).order_by( '-data_tramitacao', + '-timestamp', '-id').first() if ultima_tramitacao: @@ -1150,6 +1151,7 @@ class TramitacaoCrud(MasterDetailCrud): qs = super(MasterDetailCrud.ListView, self).get_queryset() kwargs = {self.crud.parent_field: self.kwargs['pk']} return qs.filter(**kwargs).order_by('-data_tramitacao', + '-timestamp', '-id') class DeleteView(MasterDetailCrud.DeleteView): @@ -1162,6 +1164,7 @@ class TramitacaoCrud(MasterDetailCrud): ultima_tramitacao = materia.tramitacao_set.order_by( '-data_tramitacao', + '-timestamp', '-id').first() if tramitacao.pk != ultima_tramitacao.pk: