correcoes

sapl/base/forms.py

@@ -13,6 +13,7 @@ from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.db.models import Q
 from django.forms import Form, ModelForm
+from django.utils import timezone
 from django.utils.translation import string_concat
 from django.utils.translation import ugettext_lazy as _
 import django_filters
@@ -739,7 +740,8 @@ class EstatisticasAcessoNormasForm(Form):
 
     ano = forms.ChoiceField(required=True,
                             label='Ano de acesso',
-                            choices=RANGE_ANOS)
+                            choices=RANGE_ANOS,
+                            initial=timezone.now().year)
 
     class Meta:
         fields = ['ano']
@@ -763,11 +765,17 @@ class EstatisticasAcessoNormasForm(Form):
         return self.cleaned_data
 
 
+def ultimo_ano_com_norma():
+    anos_normas = choice_anos_com_normas()
+    return anos_normas[0]
+
+
 class RelatorioNormasVigenciaFilterSet(django_filters.FilterSet):
 
     ano = django_filters.ChoiceFilter(required=True,
                                       label='Ano da Norma',
-                                      choices=choice_anos_com_normas)
+                                      choices=choice_anos_com_normas,
+                                      initial=ultimo_ano_com_norma)
 
     vigencia = forms.ChoiceField(
         label=_('Vigência'),

sapl/base/views.py

@@ -15,6 +15,7 @@ from django.db.models import Count, Q
 from django.http import Http404, HttpResponseRedirect
 from django.template import TemplateDoesNotExist
 from django.template.loader import get_template
+from django.utils import timezone
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
 from django.utils.translation import string_concat
@@ -822,7 +823,9 @@ class RelatorioNormasVigenciaView(FilterView):
         if kwargs['data']:
             ano = kwargs['data']['ano']
             vigencia = kwargs['data']['vigencia']
+            if ano:
                 qs = qs.filter(ano=ano)
+            
             if vigencia == 'True':
                 qs_dt_not_null = qs.filter(data_vigencia__isnull=True)
                 qs = (qs_dt_not_null | qs.filter(data_vigencia__gte=datetime.datetime.now().date())).distinct()

sapl/protocoloadm/migrations/0017_merge_20190121_1552.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.18 on 2019-01-21 17:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('protocoloadm', '0015_auto_20190108_1606'),
+        ('protocoloadm', '0016_auto_20190110_1345'),
+    ]
+
+    operations = [
+    ]