diff --git a/docker-compose.yml b/docker-compose.yml index e1680ee16..cb498a26d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.148 + image: interlegis/sapl:3.1.149 restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/sapl/base/views.py b/sapl/base/views.py index 56aeb58e2..2312ab721 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -611,12 +611,13 @@ class RelatorioMateriasTramitacaoView(FilterView): qs = filtra_url_materias_em_tramitacao( qr, qs, 'tramitacao__status', 'status') - context['object_list'] = qs + li = [li1 for li1 in qs if li1.tramitacao_set.last() and li1.tramitacao_set.last().status.indicador != 'F'] + context['object_list'] = li qtdes = {} for tipo in TipoMateriaLegislativa.objects.all(): - qs = context['object_list'] - qtde = len(qs.filter(tipo_id=tipo.id)) + li = context['object_list'] + qtde = sum(1 for i in li if i.tipo_id==tipo.id) if qtde > 0: qtdes[tipo] = qtde context['qtdes'] = qtdes diff --git a/sapl/crud/base.py b/sapl/crud/base.py index 0dc11ea5c..98af2a3bb 100644 --- a/sapl/crud/base.py +++ b/sapl/crud/base.py @@ -581,6 +581,8 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView): rmo = rmo[0] if not isinstance(rmo, str): rmo = rmo[0] + if rmo.startswith('-'): + rmo = rmo[1:] fo = '%s__%s' % (fo, rmo) fo = desc + fo diff --git a/sapl/sessao/urls.py b/sapl/sessao/urls.py index 9bcb414b6..4da3a761a 100644 --- a/sapl/sessao/urls.py +++ b/sapl/sessao/urls.py @@ -12,7 +12,7 @@ from sapl.sessao.views import (AdicionarVariasMateriasExpediente, PresencaOrdemDiaView, PresencaView, ResumoOrdenacaoView, ResumoView, ResumoAtaView, RetiradaPautaCrud, SessaoCrud, TipoJustificativaCrud, TipoExpedienteCrud, TipoResultadoVotacaoCrud, - TipoExpedienteCrud, TipoResultadoVotacaoCrud,TipoRetiradaPautaCrud, + TipoExpedienteCrud, TipoResultadoVotacaoCrud, TipoRetiradaPautaCrud, TipoSessaoCrud, VotacaoEditView, VotacaoExpedienteEditView, VotacaoExpedienteView, VotacaoNominalEditView, @@ -30,7 +30,7 @@ from sapl.sessao.views import (AdicionarVariasMateriasExpediente, reordernar_materias_ordem, sessao_legislativa_legislatura_ajax, VotacaoEmBlocoOrdemDia, VotacaoEmBlocoExpediente, - VotacaoEmBlocoSimbolicaView,VotacaoEmBlocoNominalView) + VotacaoEmBlocoSimbolicaView, VotacaoEmBlocoNominalView) from .apps import AppConfig @@ -59,9 +59,13 @@ urlpatterns = [ name='remove_parlamentar_composicao'), url(r'^sessao/recuperar-materia/', recuperar_materia), - url(r'^sessao/recuperar-numero-sessao/', recuperar_numero_sessao), + url(r'^sessao/recuperar-numero-sessao/', + recuperar_numero_sessao, + name='recuperar_numero_sessao_view' + ), url(r'^sessao/sessao-legislativa-legislatura-ajax/', - sessao_legislativa_legislatura_ajax), + sessao_legislativa_legislatura_ajax, + name='sessao_legislativa_legislatura_ajax_view'), url(r'^sessao/(?P\d+)/(?P\d+)/abrir-votacao$', abrir_votacao, @@ -78,7 +82,7 @@ urlpatterns = [ url(r'^sistema/sessao-plenaria/tipo-expediente/', include(TipoExpedienteCrud.get_urls())), url(r'^sistema/sessao-plenaria/tipo-justificativa/', - include(TipoJustificativaCrud.get_urls())), + include(TipoJustificativaCrud.get_urls())), url(r'^sistema/sessao-plenaria/tipo-retirada-pauta/', include(TipoRetiradaPautaCrud.get_urls())), url(r'^sistema/bancada/', @@ -123,7 +127,7 @@ urlpatterns = [ url(r'^sessao/(?P\d+)/votacao_bloco/votnom$', VotacaoEmBlocoNominalView.as_view(), name='votacaobloconom'), url(r'^sessao/(?P\d+)/votacao_bloco/votsimb$', - VotacaoEmBlocoSimbolicaView.as_view(), name='votacaoblocosimb'), + VotacaoEmBlocoSimbolicaView.as_view(), name='votacaoblocosimb'), url(r'^sessao/(?P\d+)/votacao_bloco_expediente$', VotacaoEmBlocoExpediente.as_view(), name='votacao_bloco_expediente'), @@ -145,7 +149,7 @@ urlpatterns = [ VotacaoEditView.as_view(), name='votacaosecretaedit'), url(r'^sessao/(?P\d+)/matordemdia/votsimb/(?P\d+)/(?P\d+)$', VotacaoView.as_view(), name='votacaosimbolica'), - + url(r'^sessao/(?P\d+)/matordemdia/votsimbbloco/$', VotacaoView.as_view(), name='votacaosimbolicabloco'), diff --git a/sapl/settings.py b/sapl/settings.py index ac1209521..517b76921 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -41,7 +41,7 @@ ALLOWED_HOSTS = ['*'] LOGIN_REDIRECT_URL = '/' LOGIN_URL = '/login/?next=' -SAPL_VERSION = '3.1.148' +SAPL_VERSION = '3.1.149' if DEBUG: EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' diff --git a/sapl/templates/base.html b/sapl/templates/base.html index 454d63ca2..a2de10343 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -179,7 +179,7 @@ Desenvolvido pelo Interlegis em software livre e aberto. - Release: 3.1.148 + Release: 3.1.149

diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index 752e0c885..bc7bf8292 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -1,46 +1,45 @@ {% extends "crud/list.html" %} {% load i18n common_tags crispy_forms_tags%} -{% block base_content %} +{% block actions %} {% if user.is_authenticated and perms.comissoes.add_composicao %} -
- {% block actions %} -
- {% if view.create_url %} - - {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} - - {% endif %} - {% block more_buttons %}{% endblock more_buttons %} -
- {% endblock actions %} -
+
+ {% if view.create_url %} + + {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} + + {% endif %} + {% block more_buttons %}{% endblock more_buttons %} +
{% endif %} +{% endblock actions %} -
- Selecione o Período -
- -
-
+{% block extra_content %} +
+
+ Selecione o Período + +
+

+{% endblock %} + +{% block container_table_list %} {% if user.is_authenticated and perms.comissoes.add_participacao %} -
- - Adicionar Participação em Comissão - +
+
+ + Adicionar Participação em Comissão + +
{% endif %} - -
- -
@@ -71,4 +70,4 @@
-{% endblock base_content %} +{% endblock %} diff --git a/sapl/templates/crud/list.html b/sapl/templates/crud/list.html index 375c6edbb..51f0f5223 100644 --- a/sapl/templates/crud/list.html +++ b/sapl/templates/crud/list.html @@ -5,17 +5,18 @@
-
+
{% if form %} {% crispy form %} {% endif %}
+ {% block actions %}
{% if view.create_url %} - - {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} - + + {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} + {% endif %} {% block more_buttons %}{% endblock more_buttons %}
diff --git a/sapl/templates/protocoloadm/MateriaTemplate.html b/sapl/templates/protocoloadm/MateriaTemplate.html index 16677f483..2207628f5 100644 --- a/sapl/templates/protocoloadm/MateriaTemplate.html +++ b/sapl/templates/protocoloadm/MateriaTemplate.html @@ -3,17 +3,17 @@ {% block base_content %}
-
+
- Imprimir Etiqueta + Imprimir Etiqueta
- Imprimir Comprovante + Imprimir Comprovante
diff --git a/sapl/templates/sessao/sessaoplenaria_form.html b/sapl/templates/sessao/sessaoplenaria_form.html index 81057ba57..ee1bba4ac 100644 --- a/sapl/templates/sessao/sessaoplenaria_form.html +++ b/sapl/templates/sessao/sessaoplenaria_form.html @@ -13,10 +13,10 @@ var sessao = $("#id_sessao_legislativa").val() if (tipo) { - $.get("/sessao/recuperar-numero-sessao",{tipo: tipo, sessao_legislativa:sessao}, + $.get("{% url 'sapl.sessao:recuperar_numero_sessao_view' %}",{tipo: tipo, sessao_legislativa:sessao}, function(data, status) { $("#id_numero").val(data.numero); - console.log(data) + // console.log(data) }); } else{ @@ -35,7 +35,7 @@ var id_sessao_leg = $("#id_sessao_legislativa").val(); $("#id_sessao_legislativa option").remove(); if (id_legislatura) { - $.get("/sessao/sessao-legislativa-legislatura-ajax", {legislatura: id_legislatura}, function(data) { + $.get("{% url 'sapl.sessao:sessao_legislativa_legislatura_ajax_view' %}", {legislatura: id_legislatura}, function(data) { lista_sessoes = data['sessao_legislativa']; $('#id_sessao_legislativa').append(''); diff --git a/setup.py b/setup.py index bce1af445..dbfa7fe8f 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ install_requires = [ 'django-extra-views==0.12.0', 'django-model-utils==3.1.2', 'django-reversion==3.0.2', - 'django-reversion-compare==0.8.6' + 'django-reversion-compare==0.8.6', 'django-speedinfo==1.4.0', 'django-extensions==2.1.4', 'django-image-cropping==1.2.0', @@ -43,7 +43,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.148', + version='3.1.149', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007',