diff --git a/sapl/base/views.py b/sapl/base/views.py index c2df6848c..6f707a20e 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -803,8 +803,10 @@ class RelatorioNormasVigenciaView(FilterView): else: qs = qs.filter(data_vigencia__lt=datetime.datetime.now().date()) + # import ipdb; ipdb.set_trace() + kwargs.update({ - 'queryset': qs, + 'queryset': qs }) return kwargs @@ -818,12 +820,23 @@ class RelatorioNormasVigenciaView(FilterView): if not self.filterset.form.is_valid(): return context + normas_totais = NormaJuridica.objects.filter(ano=self.request.GET['ano']) + + context['quant_total'] = len(normas_totais) + if self.request.GET['vigencia'] == 'True': + context['vigencia'] = 'Vigente' + context['quant_vigente'] = len(context['object_list']) + context['quant_nao_vigente'] = context['quant_total'] - context['quant_vigente'] + else: + context['vigencia'] = 'Não vigente' + context['quant_nao_vigente'] = len(context['object_list']) + context['quant_vigente'] = context['quant_total'] - context['quant_nao_vigente'] + qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['show_results'] = show_results_filter_set(qr) context['ano'] = self.request.GET['ano'] - context['vigencia'] = 'Vigente' if self.request.GET['vigencia'] == 'True' else 'Não vigente' return context diff --git a/sapl/templates/base/RelatorioNormasVigencia_filter.html b/sapl/templates/base/RelatorioNormasVigencia_filter.html index 81bc7fc62..bcbbf8ab3 100644 --- a/sapl/templates/base/RelatorioNormasVigencia_filter.html +++ b/sapl/templates/base/RelatorioNormasVigencia_filter.html @@ -16,6 +16,12 @@  Ano: {{ ano }}
 Vigência: {{ vigencia }}
{% if object_list %} +
+ {% if object_list|length > 1 %} +

Foram encontradas {{object_list|length}} normas.

+ {% else %} +

Foi encontrada 1 norma.

+ {% endif %}
@@ -35,6 +41,8 @@ {% endfor %}
+

Estatísticas das normas do ano:


+

{{quant_vigente}} vigente(s) / {{quant_nao_vigente}} não vigente(s)

{% else %}