From 6e662cb31d2b4292b33be2eb47df41455d4c2a22 Mon Sep 17 00:00:00 2001 From: ulyssesBML Date: Thu, 29 Aug 2019 16:02:39 -0300 Subject: [PATCH] Corrigindo logica de vigencia --- sapl/norma/forms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sapl/norma/forms.py b/sapl/norma/forms.py index e4c60e392..a7ce41652 100644 --- a/sapl/norma/forms.py +++ b/sapl/norma/forms.py @@ -94,10 +94,10 @@ class NormaFilterSet(django_filters.FilterSet): def filter_vigencia(self, queryset, name, value): data_atual = timezone.now() - if value: - queryset = queryset.filter(Q(data_vigencia__lt=data_atual) | Q(data_vigencia__isnull=True)) + if value: # É vigente + queryset = queryset.filter((Q(data_vigencia__gt=data_atual) or Q(data_vigencia__isnull=True)) and Q(data__lte=data_atual)) else: - queryset = queryset.filter(data_vigencia__gt=data_atual) + queryset = queryset.filter(Q(data_vigencia__lte=data_atual) or Q(data__gt=data_atual)) return queryset