From c8349ff50480b7297179c1716ea70b6ce8eca6c2 Mon Sep 17 00:00:00 2001 From: ulyssesBML Date: Tue, 8 Oct 2019 14:56:12 -0300 Subject: [PATCH] Colocando melhorias abordadas n PR --- sapl/norma/forms.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sapl/norma/forms.py b/sapl/norma/forms.py index d4920ed35..64d37e2b0 100644 --- a/sapl/norma/forms.py +++ b/sapl/norma/forms.py @@ -30,8 +30,7 @@ def get_esferas(): ('M', 'Municipal')] -YES_NO_CHOICES = [('', '---------'), - (True, _('Sim')), +YES_NO_CHOICES = [(True, _('Sim')), (False, _('Não'))] ORDENACAO_CHOICES = [('', '---------'), @@ -58,7 +57,7 @@ class NormaFilterSet(django_filters.FilterSet): assuntos = django_filters.ModelChoiceFilter( queryset=AssuntoNorma.objects.all()) - vigencia = django_filters.BooleanFilter(label='Vigência',method='filter_vigencia') + vigencia = django_filters.ChoiceFilter(label='Vigência',method='filter_vigencia',choices=YES_NO_CHOICES) o = NormaPesquisaOrderingFilter(help_text='') @@ -94,9 +93,9 @@ class NormaFilterSet(django_filters.FilterSet): def filter_vigencia(self, queryset, name, data_fim_vigencia): data_atual = timezone.now() - if data_fim_vigencia: # É vigente + if data_fim_vigencia == "True": # É vigente queryset = queryset.filter((Q(data_vigencia__gt=data_atual) | Q(data_vigencia__isnull=True)) & Q(data__lte=data_atual)) - elif data_fim_vigencia == False: + elif data_fim_vigencia == "False": queryset = queryset.filter(Q(data_vigencia__lte=data_atual) | Q(data__gt=data_atual)) return queryset