diff --git a/sapl/base/models.py b/sapl/base/models.py index 0a4c8d8f2..2917ea3ea 100644 --- a/sapl/base/models.py +++ b/sapl/base/models.py @@ -11,6 +11,7 @@ TIPO_DOCUMENTO_ADMINISTRATIVO = (('O', _('Ostensivo')), ('R', _('Restritivo'))) SEQUENCIA_NUMERACAO = (('A', _('Sequencial por ano')), + ('L', _('Sequencial por legislatura')), ('U', _('Sequencial Ășnico'))) diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index 9fffa3669..e26168d0d 100644 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -287,6 +287,13 @@ class ProtocoloDocumentoView(PermissionRequiredMixin, if numeracao == 'A': numero = Protocolo.objects.filter( ano=date.today().year).aggregate(Max('numero')) + elif numeracao == 'L': + legislatura = Legislatura.objects.last() + data_inicio = legislatura.data_inicio + data_fim = legislatura.data_fim + numero = Protocolo.objects.filter( + data__gte=data_inicio, data__lte=data_fim).aggregate( + Max('numero')) elif numeracao == 'U': numero = Protocolo.objects.all().aggregate(Max('numero'))