From e9d64207f2fd1b1437267106618a5e5ced42ed93 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Wed, 9 Jan 2019 17:30:54 -0200 Subject: [PATCH 01/35] Fix #2447 --- sapl/materia/views.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 07911f09b..0f856ede3 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -26,7 +26,7 @@ import weasyprint import sapl from sapl.base.email_utils import do_envia_email_confirmacao -from sapl.base.models import Autor, CasaLegislativa +from sapl.base.models import Autor, CasaLegislativa, AppConfig as BaseAppConfig from sapl.base.signals import tramitacao_signal from sapl.comissoes.models import Comissao, Participacao from sapl.compilacao.models import (STATUS_TA_IMMUTABLE_RESTRICT, @@ -783,16 +783,23 @@ class ProposicaoCrud(Crud): msg_error = _('Proposição não possui nenhum tipo de ' 'Texto associado.') else: - p.data_devolucao = None - p.data_envio = timezone.now() - p.save() - if p.texto_articulado.exists(): ta = p.texto_articulado.first() ta.privacidade = STATUS_TA_IMMUTABLE_RESTRICT ta.editing_locked = True ta.save() + receber_recibo = BaseAppConfig.attr( + 'receber_recibo_proposicao') + + if not receber_recibo: + ta = p.texto_articulado.first() + p.hash_code = 'P' + ta.hash() + SEPARADOR_HASH_PROPOSICAO + str(p.pk) + + p.data_devolucao = None + p.data_envio = timezone.now() + p.save() + messages.success(request, _( 'Proposição enviada com sucesso.')) try: From 05f1bb923912b051d7710952a0b0792bdc1187da Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Thu, 10 Jan 2019 18:42:30 -0200 Subject: [PATCH 02/35] Release: 3.1.141 --- docker-compose.yml | 2 +- sapl/templates/base.html | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b379cf46c..c796253d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.140 + image: interlegis/sapl:3.1.141 restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/sapl/templates/base.html b/sapl/templates/base.html index 59f9919f1..a738aa276 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -184,7 +184,7 @@ Desenvolvido pelo Interlegis em software livre e aberto. - Release: 3.1.140 + Release: 3.1.141

diff --git a/setup.py b/setup.py index 6b7c5a248..61de04956 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.140', + version='3.1.141', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', From bd2bc3a4f7d71f6f7b387f13694defcebaca93ea Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sat, 5 Jan 2019 04:39:39 -0200 Subject: [PATCH 03/35] bump django para 1.11 --- requirements/requirements.txt | 17 +++++++++-------- setup.py | 11 ++++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 3c4d2e135..69cb803f5 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,18 +1,19 @@ +django>=1.11,<2.0 +django-haystack==2.8.1 +django-bootstrap3==11.0.0 +django-filter==2.0.0 +djangorestframework==3.9.0 + dj-database-url==0.4.1 -django-haystack==2.6.0 -django>=1.10,<1.11 -django-bootstrap3==7.0.1 django-bower==5.2.0 django-braces==1.9.0 django-compressor==2.0 django-crispy-forms==1.6.1 django-extensions==1.9.8 django-extra-views==0.11.0 -django-filter==1.0.0 django-floppyforms==1.6.2 django-model-utils==3.1.1 django-sass-processor==0.5.8 -djangorestframework==3.4.0 easy-thumbnails==2.5 django-image-cropping==1.2 libsass==0.11.1 @@ -32,6 +33,6 @@ whoosh==2.7.4 django-speedinfo==1.3.5 django-reversion-compare==0.8.4 -git+git://github.com/interlegis/trml2pdf.git -git+git://github.com/jasperlittle/django-rest-framework-docs -git+git://github.com/rubgombar1/django-admin-bootstrapped.git \ No newline at end of file +#git+git://github.com/interlegis/trml2pdf.git +#git+git://github.com/jasperlittle/django-rest-framework-docs +#git+git://github.com/rubgombar1/django-admin-bootstrapped.git \ No newline at end of file diff --git a/setup.py b/setup.py index 61de04956..a64217d42 100644 --- a/setup.py +++ b/setup.py @@ -9,21 +9,22 @@ with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme: os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) install_requires = [ + 'django>=1.11,<2.0', + 'django-haystack==2.8.1', + 'django-bootstrap3==11.0.0', + 'django-filter==2.0.0', + 'djangorestframework==3.9.0', + 'dj-database-url==0.4.1', - 'django-haystack==2.6.0', - 'django>=1.10,<1.11', - 'django-bootstrap3==7.0.1', 'django-bower==5.2.0', 'django-braces==1.9.0', 'django-compressor==2.0', 'django-crispy-forms==1.6.1', 'django-extensions==1.9.8', 'django-extra-views==0.11.0', - 'django-filter==0.15.3', 'django-floppyforms==1.6.2', 'django-model-utils==3.1.1', 'django-sass-processor==0.5.8', - 'djangorestframework==3.4.0', 'drfdocs', 'easy-thumbnails==2.5', 'django-image-cropping==1.1.0', From 55963883265c9165aa62a8bf62e030395eb7d80b Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sat, 5 Jan 2019 04:40:44 -0200 Subject: [PATCH 04/35] =?UTF-8?q?altera=C3=A7=C3=B5es=20m=C3=ADnimas=20par?= =?UTF-8?q?a=20executar=20manage=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/api/forms.py | 2 +- sapl/api/views.py | 5 +++-- sapl/settings.py | 7 ++++--- sapl/utils.py | 21 ++++++++++----------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/sapl/api/forms.py b/sapl/api/forms.py index fecfbf598..0c8a1889f 100644 --- a/sapl/api/forms.py +++ b/sapl/api/forms.py @@ -6,8 +6,8 @@ from django.forms.widgets import MultiWidget, TextInput from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from django_filters.filters import CharFilter, ModelChoiceFilter, DateFilter +from django_filters.rest_framework.filterset import FilterSet from rest_framework import serializers -from rest_framework.filters import FilterSet from sapl.base.models import Autor, TipoAutor from sapl.parlamentares.models import Legislatura diff --git a/sapl/api/views.py b/sapl/api/views.py index b8cafc1dd..336bb23d7 100644 --- a/sapl/api/views.py +++ b/sapl/api/views.py @@ -1,9 +1,10 @@ import logging + from django.contrib.contenttypes.models import ContentType from django.db.models import Q from django.http import Http404 from django.utils.translation import ugettext_lazy as _ -from rest_framework.filters import DjangoFilterBackend +from django_filters.rest_framework.backends import DjangoFilterBackend from rest_framework.generics import ListAPIView from rest_framework.mixins import ListModelMixin, RetrieveModelMixin from rest_framework.permissions import (AllowAny, IsAuthenticated, @@ -175,7 +176,7 @@ class AutoresProvaveisListView(ListAPIView): serializer_class = ChoiceSerializer def get_queryset(self): - + params = {'content_type__isnull': False} username = self.request.user.username tipo = '' diff --git a/sapl/settings.py b/sapl/settings.py index 80bf18273..63f18e325 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -90,6 +90,7 @@ INSTALLED_APPS = ( 'haystack', 'sass_processor', 'rest_framework', + 'django_filters', 'reversion', 'reversion_compare', 'whoosh', @@ -110,7 +111,7 @@ SOLR_URL = config('SOLR_URL', cast=str, default='http://localhost:8983') SOLR_COLLECTION = config('SOLR_COLLECTION', cast=str, default='sapl') if USE_SOLR: - HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' #enable auto-index + HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' # enable auto-index SEARCH_BACKEND = 'haystack.backends.solr_backend.SolrEngine' SEARCH_URL = ('URL', '{}/solr/{}'.format(SOLR_URL, SOLR_COLLECTION)) @@ -118,7 +119,7 @@ if USE_SOLR: HAYSTACK_CONNECTIONS = { 'default': { 'ENGINE': SEARCH_BACKEND, - SEARCH_URL[0]: SEARCH_URL[1], + SEARCH_URL[0]: SEARCH_URL[1], 'BATCH_SIZE': 1000, 'TIMEOUT': 60, }, @@ -166,7 +167,7 @@ REST_FRAMEWORK = { "DEFAULT_PAGINATION_CLASS": "sapl.api.pagination.StandardPagination", "DEFAULT_FILTER_BACKENDS": ( "rest_framework.filters.SearchFilter", - "rest_framework.filters.DjangoFilterBackend", + 'django_filters.rest_framework.DjangoFilterBackend', ), } diff --git a/sapl/utils.py b/sapl/utils.py index def839eb1..c884a8c48 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -21,7 +21,6 @@ from django.db.models import Q from django.utils import six, timezone from django.utils.translation import ugettext_lazy as _ import django_filters -from django_filters.filterset import STRICTNESS from easy_thumbnails import source_generators from floppyforms import ClearableFileInput import magic @@ -685,12 +684,12 @@ def qs_override_django_filter(self): valid = self.is_bound and self.form.is_valid() if self.is_bound and not valid: - if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: + """if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: raise forms.ValidationError(self.form.errors) - elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS: - self._qs = self.queryset.none() - return self._qs - # else STRICTNESS.IGNORE... ignoring + elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS:""" + self._qs = self.queryset.none() + return self._qs + # else STRICTNESS.IGNORE... ignoring # start with all the results and filter from there qs = self.queryset.all() @@ -703,12 +702,12 @@ def qs_override_django_filter(self): try: value = self.form.fields[name].clean(raw_value) except forms.ValidationError: - if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: + """if self.strict == STRICTNESS.RAISE_VALIDATION_ERROR: raise - elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS: - self._qs = self.queryset.none() - return self._qs - # else STRICTNESS.IGNORE... ignoring + elif bool(self.strict) == STRICTNESS.RETURN_NO_RESULTS:""" + self._qs = self.queryset.none() + return self._qs + # else STRICTNESS.IGNORE... ignoring if value is not None: # valid & clean data qs = qs._next_is_sticky() From b4666807ab6c9f16101a2dd5cc832d580ef06c01 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sat, 5 Jan 2019 04:52:22 -0200 Subject: [PATCH 05/35] =?UTF-8?q?adequa=C3=A7=C3=A3o=20de=20c=C3=B3digo=20?= =?UTF-8?q?na=20chamada=20do=20render=20de=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/base/email_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/base/email_utils.py b/sapl/base/email_utils.py index 024045edd..b41c68402 100644 --- a/sapl/base/email_utils.py +++ b/sapl/base/email_utils.py @@ -18,7 +18,7 @@ def load_email_templates(templates, context={}): emails = [] for t in templates: tpl = loader.get_template(t) - email = tpl.render(Context(context)) + email = tpl.render(context) if t.endswith(".html"): email = email.replace('\n', '').replace('\r', '') emails.append(email) From 243f984a13a60ef441daff8fef9dc8603be773a1 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 6 Jan 2019 16:21:20 -0200 Subject: [PATCH 06/35] remove django-compressor --- requirements/requirements.txt | 11 ++++++----- sapl/base/templatetags/common_tags.py | 15 ++++++++++----- sapl/crud/base.py | 15 +++++++++------ setup.py | 9 +++++---- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 69cb803f5..944b300d7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,13 +1,12 @@ django>=1.11,<2.0 -django-haystack==2.8.1 django-bootstrap3==11.0.0 +django-haystack==2.8.1 django-filter==2.0.0 djangorestframework==3.9.0 - -dj-database-url==0.4.1 +dj-database-url==0.5.0 django-bower==5.2.0 django-braces==1.9.0 -django-compressor==2.0 + django-crispy-forms==1.6.1 django-extensions==1.9.8 django-extra-views==0.11.0 @@ -35,4 +34,6 @@ django-reversion-compare==0.8.4 #git+git://github.com/interlegis/trml2pdf.git #git+git://github.com/jasperlittle/django-rest-framework-docs -#git+git://github.com/rubgombar1/django-admin-bootstrapped.git \ No newline at end of file +#git+git://github.com/rubgombar1/django-admin-bootstrapped.git + +#django-compressor==2.2 \ No newline at end of file diff --git a/sapl/base/templatetags/common_tags.py b/sapl/base/templatetags/common_tags.py index 89f781558..884a6968f 100644 --- a/sapl/base/templatetags/common_tags.py +++ b/sapl/base/templatetags/common_tags.py @@ -1,8 +1,4 @@ -import logging - -from compressor.utils import get_class from django import template -from django.conf import settings from django.template.defaultfilters import stringfilter from sapl.base.models import AppConfig @@ -15,6 +11,15 @@ from sapl.utils import filiacao_data, SEPARADOR_HASH_PROPOSICAO register = template.Library() +def get_class(class_string): + if not hasattr(class_string, '__bases__'): + class_string = str(class_string) + dot = class_string.rindex('.') + mod_name, class_name = class_string[:dot], class_string[dot + 1:] + if class_name: + return getattr(__import__(mod_name, {}, {}, [str('')]), class_name) + + @register.simple_tag def define(arg): return arg @@ -228,7 +233,7 @@ def file_extension(value): def cronometro_to_seconds(value): if not AppConfig.attr('cronometro_' + value): return 0 - + return AppConfig.attr('cronometro_' + value).seconds diff --git a/sapl/crud/base.py b/sapl/crud/base.py index e720b36cd..faa0e1287 100644 --- a/sapl/crud/base.py +++ b/sapl/crud/base.py @@ -1,6 +1,6 @@ import logging + from braces.views import FormMessagesMixin -from compressor.utils.decorators import cached_property from crispy_forms.bootstrap import FieldWithButtons, StrictButton from crispy_forms.helper import FormHelper from crispy_forms.layout import Field, Layout @@ -16,6 +16,7 @@ from django.http.response import Http404 from django.shortcuts import redirect from django.utils.decorators import classonlymethod from django.utils.encoding import force_text +from django.utils.functional import cached_property from django.utils.translation import string_concat from django.utils.translation import ugettext_lazy as _ from django.views.generic import (CreateView, DeleteView, DetailView, ListView, @@ -29,6 +30,7 @@ from sapl.rules.map_rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL, from sapl.settings import BASE_DIR from sapl.utils import normalize + ACTION_LIST, ACTION_CREATE, ACTION_DETAIL, ACTION_UPDATE, ACTION_DELETE = \ 'list', 'create', 'detail', 'update', 'delete' @@ -558,7 +560,8 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView): fm = model._meta.get_field(fo) except Exception as e: username = self.request.user.username - self.logger.error("user=" + username + ". " + str(e)) + self.logger.error( + "user=" + username + ". " + str(e)) pass if fm and hasattr(fm, 'related_model')\ @@ -824,7 +827,7 @@ class CrudUpdateView(PermissionRequiredContainerCrudMixin, logger = logging.getLogger(__name__) def form_valid(self, form): - + self.object = form.instance try: self.object.modifier = self.request.user @@ -882,12 +885,12 @@ class CrudDeleteView(PermissionRequiredContainerCrudMixin, error_msg2 += '{} - {}, '.format( i._meta.verbose_name, i ) - error_msg2 = error_msg2[:len(error_msg2)-2] + '.' + error_msg2 = error_msg2[:len(error_msg2) - 2] + '.' error_msg += '' - + username = request.user.username self.logger.error("user=" + username + ". Registro não pode ser removido, pois " - "é referenciado por outros registros: " + error_msg2) + "é referenciado por outros registros: " + error_msg2) messages.add_message(request, messages.ERROR, error_msg) diff --git a/setup.py b/setup.py index a64217d42..e44ded347 100644 --- a/setup.py +++ b/setup.py @@ -10,15 +10,14 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) install_requires = [ 'django>=1.11,<2.0', - 'django-haystack==2.8.1', 'django-bootstrap3==11.0.0', + 'django-haystack==2.8.1', 'django-filter==2.0.0', 'djangorestframework==3.9.0', - - 'dj-database-url==0.4.1', + 'dj-database-url==0.5.0', 'django-bower==5.2.0', 'django-braces==1.9.0', - 'django-compressor==2.0', + 'django-crispy-forms==1.6.1', 'django-extensions==1.9.8', 'django-extra-views==0.11.0', @@ -47,6 +46,8 @@ install_requires = [ # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' + + #'django-compressor==2.2', ] setup( name='interlegis-sapl', From 22b87f36ebc8659a6ecaf8831ab0f425206b0993 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 6 Jan 2019 16:49:40 -0200 Subject: [PATCH 07/35] =?UTF-8?q?bump=20django-crispy-forms=20e=20ajustes?= =?UTF-8?q?=20de=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/requirements.txt | 2 +- sapl/utils.py | 16 ++++++++++++---- setup.py | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 944b300d7..7b6dc25c1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -6,8 +6,8 @@ djangorestframework==3.9.0 dj-database-url==0.5.0 django-bower==5.2.0 django-braces==1.9.0 +django-crispy-forms==1.7.2 -django-crispy-forms==1.6.1 django-extensions==1.9.8 django-extra-views==0.11.0 django-floppyforms==1.6.2 diff --git a/sapl/utils.py b/sapl/utils.py index c884a8c48..706d5cb65 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -208,19 +208,27 @@ class RangeWidgetOverride(forms.MultiWidget): def __init__(self, attrs=None): widgets = (forms.DateInput(format='%d/%m/%Y', - attrs={'class': 'dateinput', + attrs={'class': 'dateinput form-control', 'placeholder': 'Inicial'}), forms.DateInput(format='%d/%m/%Y', - attrs={'class': 'dateinput', + attrs={'class': 'dateinput form-control', 'placeholder': 'Final'})) super(RangeWidgetOverride, self).__init__(widgets, attrs) def decompress(self, value): if value: return [value.start, value.stop] - return [None, None] + return [] + + def render(self, name, value, attrs=None, renderer=None): + rendered_widgets = [] + for i, x in enumerate(self.widgets): + rendered_widgets.append( + x.render( + '%s_%d' % (name, i), value[i] if value else '' + ) + ) - def format_output(self, rendered_widgets): html = '
%s
%s
'\ % tuple(rendered_widgets) return '
%s
' % html diff --git a/setup.py b/setup.py index e44ded347..018ff1002 100644 --- a/setup.py +++ b/setup.py @@ -17,8 +17,8 @@ install_requires = [ 'dj-database-url==0.5.0', 'django-bower==5.2.0', 'django-braces==1.9.0', + 'django-crispy-forms==1.7.2', - 'django-crispy-forms==1.6.1', 'django-extensions==1.9.8', 'django-extra-views==0.11.0', 'django-floppyforms==1.6.2', @@ -46,7 +46,7 @@ install_requires = [ # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' - + #'django-compressor==2.2', ] setup( From ca684e006734a94e10af7da367cba0c0db5747f8 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 6 Jan 2019 17:08:34 -0200 Subject: [PATCH 08/35] descomenta libs do requirements --- requirements/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7b6dc25c1..4b869decc 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -32,8 +32,8 @@ whoosh==2.7.4 django-speedinfo==1.3.5 django-reversion-compare==0.8.4 -#git+git://github.com/interlegis/trml2pdf.git -#git+git://github.com/jasperlittle/django-rest-framework-docs -#git+git://github.com/rubgombar1/django-admin-bootstrapped.git +git+git://github.com/interlegis/trml2pdf.git +git+git://github.com/jasperlittle/django-rest-framework-docs +git+git://github.com/rubgombar1/django-admin-bootstrapped.git #django-compressor==2.2 \ No newline at end of file From 82fb5613c39f991a985f0291af0d6d95c86754d3 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 00:43:54 -0200 Subject: [PATCH 09/35] bump django-floppyforms --- requirements/requirements.txt | 2 +- sapl/sessao/forms.py | 8 +++----- sapl/settings.py | 19 ++++++++++++------- sapl/static/styles/app.scss | 3 +++ .../parlamentares/parlamentares_list.html | 6 ++++-- setup.py | 4 ++-- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4b869decc..524549446 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,10 +7,10 @@ dj-database-url==0.5.0 django-bower==5.2.0 django-braces==1.9.0 django-crispy-forms==1.7.2 +django-floppyforms==1.7.0 django-extensions==1.9.8 django-extra-views==0.11.0 -django-floppyforms==1.6.2 django-model-utils==3.1.1 django-sass-processor==0.5.8 easy-thumbnails==2.5 diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 35d49e277..68f6d3222 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -3,7 +3,6 @@ from datetime import datetime from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML, Button, Fieldset, Layout from django import forms -from django.contrib import messages from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.db import transaction @@ -12,22 +11,21 @@ from django.forms import ModelForm from django.forms.widgets import CheckboxSelectMultiple from django.utils.translation import ugettext_lazy as _ import django_filters -from floppyforms import widgets from sapl.base.models import Autor, TipoAutor from sapl.crispy_layout_mixin import form_actions, to_row, SaplFormLayout from sapl.materia.forms import MateriaLegislativaFilterSet from sapl.materia.models import (MateriaLegislativa, StatusTramitacao, TipoMateriaLegislativa) -from sapl.parlamentares.models import Parlamentar, Legislatura, Mandato +from sapl.parlamentares.models import Parlamentar, Mandato from sapl.utils import (RANGE_DIAS_MES, RANGE_MESES, MateriaPesquisaOrderingFilter, autor_label, autor_modal, timezone, choice_anos_com_sessaoplenaria) from .models import (Bancada, Bloco, ExpedienteMateria, JustificativaAusencia, Orador, OradorExpediente, OrdemDia, PresencaOrdemDia, SessaoPlenaria, - SessaoPlenariaPresenca, TipoJustificativa, TipoResultadoVotacao, - OcorrenciaSessao, RegistroVotacao, RetiradaPauta, TipoRetiradaPauta) + SessaoPlenariaPresenca, TipoResultadoVotacao, + OcorrenciaSessao, RetiradaPauta, TipoRetiradaPauta) MES_CHOICES = RANGE_MESES diff --git a/sapl/settings.py b/sapl/settings.py index 63f18e325..fbc19f53f 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -79,20 +79,25 @@ INSTALLED_APPS = ( 'django.contrib.messages', 'django.contrib.staticfiles', - # more - 'django_extensions', 'djangobower', - 'bootstrap3', # basically for django_admin_bootstrapped + 'bootstrap3', 'crispy_forms', - 'easy_thumbnails', - 'image_cropping', 'floppyforms', - 'haystack', - 'sass_processor', + 'rest_framework', 'django_filters', + + + + 'django_extensions', + 'easy_thumbnails', + 'image_cropping', + 'sass_processor', + 'reversion', 'reversion_compare', + + 'haystack', 'whoosh', 'speedinfo', diff --git a/sapl/static/styles/app.scss b/sapl/static/styles/app.scss index a0540b8e1..f05189142 100644 --- a/sapl/static/styles/app.scss +++ b/sapl/static/styles/app.scss @@ -451,6 +451,9 @@ nav { overflow-x: auto; } } +.lista-parlamentares .table td { + vertical-align: middle; +} @media (min-width: 1092px) and (max-width: 1199px) { .container { diff --git a/sapl/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html index bc3955b06..43627a9ad 100644 --- a/sapl/templates/parlamentares/parlamentares_list.html +++ b/sapl/templates/parlamentares/parlamentares_list.html @@ -21,7 +21,7 @@ {% if not rows %}

{{ NO_ENTRIES_MSG }}

{% else %} -
+
{% blocktrans with verbose_name_plural=view.verbose_name_plural %}Total de {{ verbose_name_plural }}: {{count}}{% endblocktrans %}
@@ -43,7 +43,9 @@ {% for value, href, obj in value_list %} {% if forloop.first %} {% endif %} - + {% if protocolo.timestamp %} + + {% else %} + + {% endif %} {% if protocolo.tipo_processo == 1 %} diff --git a/sapl/templates/protocoloadm/protocolar_documento.html b/sapl/templates/protocoloadm/protocolar_documento.html index 5cb1fa789..49cf4933f 100644 --- a/sapl/templates/protocoloadm/protocolar_documento.html +++ b/sapl/templates/protocoloadm/protocolar_documento.html @@ -14,3 +14,17 @@ {% block detail_content %} {% crispy form %} {% endblock detail_content %} + +{% block extra_js %} + +{% endblock %} diff --git a/sapl/templates/protocoloadm/protocolar_materia.html b/sapl/templates/protocoloadm/protocolar_materia.html index db3785bd6..2dcb8b4f0 100644 --- a/sapl/templates/protocoloadm/protocolar_materia.html +++ b/sapl/templates/protocoloadm/protocolar_materia.html @@ -26,35 +26,43 @@ } $(document).ready(function() { - function busca_ementa() { - var vincular_materia = $("#id_vincular_materia_1").prop("checked"); - var ano_materia = $("#id_ano_materia").val(); - var numero_materia = $("#id_numero_materia").val(); - var tipo_materia = $("#id_tipo_materia").val(); - var json_data = { - ano : ano_materia, - numero : numero_materia, - tipo : tipo_materia - } - if (vincular_materia === true && ano_materia !== undefined && - numero_materia !== undefined && numero_materia !== "") { - $.getJSON("/protocoloadm/recuperar-materia", json_data, function(data){ - if (data) { - if (data['error'] === undefined){ - $('#id_assunto_ementa').val(data['ementa']); - if (data['autor'] !== undefined) { - $('#id_autor').val(data['autor']); - $('#id_tipo_autor').val(data['tipo_autor']); + $("input[name=data_hora_manual]").change(function(event) { + if (this.value === 'True' && this.checked) + $("#protocolo_data_hora_manual").removeClass('hidden'); + else if (this.value === 'False' && this.checked) + $("#protocolo_data_hora_manual").addClass('hidden'); + }); + $("input[name=data_hora_manual]").trigger('change') + + function busca_ementa() { + var vincular_materia = $("#id_vincular_materia_1").prop("checked"); + var ano_materia = $("#id_ano_materia").val(); + var numero_materia = $("#id_numero_materia").val(); + var tipo_materia = $("#id_tipo_materia").val(); + var json_data = { + ano : ano_materia, + numero : numero_materia, + tipo : tipo_materia + } + if (vincular_materia === true && ano_materia !== undefined && + numero_materia !== undefined && numero_materia !== "") { + $.getJSON("/protocoloadm/recuperar-materia", json_data, function(data){ + if (data) { + if (data['error'] === undefined){ + $('#id_assunto_ementa').val(data['ementa']); + if (data['autor'] !== undefined) { + $('#id_autor').val(data['autor']); + $('#id_tipo_autor').val(data['tipo_autor']); - } - } - } - }) - } + } + } + } + }) + } }; - $("#id_ano_materia").blur(busca_ementa); - $("#id_numero_materia").blur(busca_ementa); - $("#id_tipo_materia").change(busca_ementa); + $("#id_ano_materia").blur(busca_ementa); + $("#id_numero_materia").blur(busca_ementa); + $("#id_tipo_materia").change(busca_ementa); $("#id_tipo_autor").change(function() { var tipo_selecionado = $("#id_tipo_autor").val(); diff --git a/sapl/templates/protocoloadm/protocolo_mostrar.html b/sapl/templates/protocoloadm/protocolo_mostrar.html index 2cac987f3..d22464397 100644 --- a/sapl/templates/protocoloadm/protocolo_mostrar.html +++ b/sapl/templates/protocoloadm/protocolo_mostrar.html @@ -4,6 +4,14 @@ {% load crispy_forms_tags %} {% load static %} +{% block actions %} + + {{ block.super }} +
+ {% trans 'Fazer nova pesquisa' %} +
+{% endblock %} + {% block detail_content %} Protocolo: {{ protocolo.numero|stringformat:'06d' }}/{{ protocolo.ano }} - Etiqueta Individual
@@ -12,7 +20,7 @@ {% if protocolo.timestamp %} Data Protocolo: {{ protocolo.timestamp|localtime|date:"d/m/Y"|default_if_none:"Não informado" }} - Horário: {{ protocolo.timestamp|localtime|date:"G:i:s" }}
{% else %} - Data Protocolo: {{ protocolo.data|date:"d/m/Y"|default_if_none:"Não informado" }} - Horário: {{ protocolo.hora|date:"G:i:s" }}
+ Data Protocolo: {{ protocolo.data|date:"d/m/Y"|default_if_none:"Não informado" }} - Horário: {{ protocolo.hora|date:"G:i:s" }} - {% if not protocolo.timestamp %} Informado Manualmente por: {{protocolo.user_data_hora_manual}}{% endif %}
{% endif %} {% if protocolo.tipo_processo == 0 %} diff --git a/sapl/utils.py b/sapl/utils.py index 706d5cb65..eb26cadb1 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -18,6 +18,7 @@ from django.core.exceptions import ValidationError from django.core.mail import get_connection from django.db import models from django.db.models import Q +from django.forms.widgets import SplitDateTimeWidget from django.utils import six, timezone from django.utils.translation import ugettext_lazy as _ import django_filters @@ -234,6 +235,23 @@ class RangeWidgetOverride(forms.MultiWidget): return '
%s
' % html +class CustomSplitDateTimeWidget(SplitDateTimeWidget): + def render(self, name, value, attrs=None, renderer=None): + rendered_widgets = [] + for i, x in enumerate(self.widgets): + x.attrs['class'] += ' form-control' + rendered_widgets.append( + x.render( + '%s_%d' % (name, i), self.decompress( + value)[i] if value else '' + ) + ) + + html = '
%s
%s
'\ + % tuple(rendered_widgets) + return '
%s
' % html + + def register_all_models_in_admin(module_name, exclude_list=[]): appname = module_name.split('.') appname = appname[1] if appname[0] == 'sapl' else appname[0] From 5bbfbc4b74819351d8474a9d4f5fd42234b7f0eb Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Thu, 10 Jan 2019 20:51:51 -0200 Subject: [PATCH 24/35] =?UTF-8?q?add=20informa=C3=A7=C3=A3o=20na=20lista?= =?UTF-8?q?=20de=20protocolos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/templates/protocoloadm/protocolo_filter.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/templates/protocoloadm/protocolo_filter.html b/sapl/templates/protocoloadm/protocolo_filter.html index 316003075..d3d1968d8 100644 --- a/sapl/templates/protocoloadm/protocolo_filter.html +++ b/sapl/templates/protocoloadm/protocolo_filter.html @@ -47,7 +47,7 @@ {% if p.timestamp%} Data Protocolo: {{ p.timestamp|localtime|date:"d/m/Y"|default_if_none:"Não informado" }} - Horário: {{ p.timestamp|localtime|date:"G:i:s" }}
{% else %} - Data Protocolo: {{ p.data|date:"d/m/Y"|default_if_none:"Não informado" }} - Horário: {{ p.hora|date:"G:i:s" }}
+ Data Protocolo: {{ p.data|date:"d/m/Y"|default_if_none:"Não informado" }} - Horário: {{ p.hora|date:"G:i:s" }} - {% if not p.timestamp %} Informado Manualmente por: {{p.user_data_hora_manual}}{% endif %}
{% endif %} {% if p.tipo_processo == 0 %} Interessado: {{ p.interessado|default_if_none:"Não informado" }}
From 091f566688363e3c8693c8d315e1b4ed898dfe38 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Fri, 11 Jan 2019 12:07:40 -0200 Subject: [PATCH 25/35] HOT-FIX: insere EMAIL_SEND_USER em docs e envs. --- config/env-sample | 1 + config/env_dockerfile | 1 + docker-compose.yml | 1 + docs/instalacao31.rst | 1 + sapl/.env_test | 1 + sapl/env-backup | 1 + 6 files changed, 6 insertions(+) diff --git a/config/env-sample b/config/env-sample index bde081a92..aeb8c38c4 100644 --- a/config/env-sample +++ b/config/env-sample @@ -5,4 +5,5 @@ EMAIL_USE_TLS = True EMAIL_PORT = 587 EMAIL_HOST = '' EMAIL_HOST_USER = '' +EMAIL_SEND_USER = '' EMAIL_HOST_PASSWORD = '' diff --git a/config/env_dockerfile b/config/env_dockerfile index c83fc88f1..134beb274 100644 --- a/config/env_dockerfile +++ b/config/env_dockerfile @@ -5,4 +5,5 @@ EMAIL_USE_TLS = True EMAIL_PORT = 587 EMAIL_HOST = '' EMAIL_HOST_USER = '' +EMAIL_SEND_USER = '' EMAIL_HOST_PASSWORD = '' diff --git a/docker-compose.yml b/docker-compose.yml index c796253d4..51af52a6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,7 @@ sapl: EMAIL_USE_TLS: 'False' EMAIL_HOST: smtp.dominio.net EMAIL_HOST_USER: usuariosmtp + EMAIL_SEND_USER: usuariosmtp EMAIL_HOST_PASSWORD: senhasmtp TZ: America/Sao_Paulo volumes: diff --git a/docs/instalacao31.rst b/docs/instalacao31.rst index e904f8d6c..6e9146ee4 100644 --- a/docs/instalacao31.rst +++ b/docs/instalacao31.rst @@ -147,6 +147,7 @@ Criação da `SECRET_KEY Date: Wed, 16 Jan 2019 10:57:00 -0200 Subject: [PATCH 26/35] HOT-FIX: corrige form e view no cadastro de Frentes --- sapl/parlamentares/views.py | 11 ++++++++++- sapl/templates/parlamentares/frente_form.html | 19 +++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index c47d36566..7b09c4067 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -301,9 +301,18 @@ class FrenteCrud(Crud): def form_valid(self, form): return super(Crud.CreateView, self).form_valid(form) + class DetailView(Crud.DetailView): + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['subnav_template_name'] = '' + return context + class UpdateView(Crud.UpdateView): form_class = FrenteForm - + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['subnav_template_name'] = '' + return context class MandatoCrud(MasterDetailCrud): diff --git a/sapl/templates/parlamentares/frente_form.html b/sapl/templates/parlamentares/frente_form.html index bbab780ae..1d71f6b76 100644 --- a/sapl/templates/parlamentares/frente_form.html +++ b/sapl/templates/parlamentares/frente_form.html @@ -57,16 +57,15 @@ function selecionar_parlamentares_frente() { // Seleciona automaticamente todos os parlamentares // que já estão presentes naquela frente - var update_view = {{ update_view }} - if (update_view == 1) { - var frente_id = {{ object.id }} - $.get("/sistema/frente/parlamentares-frente-selected", - {frente_id: frente_id}, - function (data) { - id_list = data['id_list']; - $("div.controls select").val(id_list); - }); - } + {% if object.id %} + var frente_id = {{ object.id }} + $.get("/sistema/frente/parlamentares-frente-selected", + {frente_id: frente_id}, + function (data) { + id_list = data['id_list']; + $("div.controls select").val(id_list); + }); + {% endif %} } function atualiza_parlamentares() { From a07e9ca39e156a3b0dd31dd0076feaf61f06fbdc Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Wed, 16 Jan 2019 11:11:34 -0200 Subject: [PATCH 27/35] HOT-FIX: corrige html em frente_form.html --- sapl/static/js/app.js | 2 +- sapl/templates/parlamentares/frente_form.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sapl/static/js/app.js b/sapl/static/js/app.js index d3616a8b5..c30f357bd 100644 --- a/sapl/static/js/app.js +++ b/sapl/static/js/app.js @@ -190,7 +190,7 @@ function OptionalCustomFrontEnd() { if (_label.length === 0) { _label = $('label[for='+this.id+']'); if (_label.length === 0) { - _label = $('').insertBefore(this) + _label = $('
- + {% if obj.fotografia %} + + {% endif %} diff --git a/setup.py b/setup.py index 018ff1002..12a1823a7 100644 --- a/setup.py +++ b/setup.py @@ -18,10 +18,10 @@ install_requires = [ 'django-bower==5.2.0', 'django-braces==1.9.0', 'django-crispy-forms==1.7.2', + 'django-floppyforms==1.7.0', - 'django-extensions==1.9.8', 'django-extra-views==0.11.0', - 'django-floppyforms==1.6.2', + 'django-extensions==1.9.8', 'django-model-utils==3.1.1', 'django-sass-processor==0.5.8', 'drfdocs', From 3564909a1b6baf6735e471af5ca3fdb006738b18 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 01:03:06 -0200 Subject: [PATCH 10/35] bump django-extra-views --- requirements/requirements.txt | 2 +- sapl/settings.py | 25 +++++++++++++++------- sapl/temp_suppress_crispy_form_warnings.py | 22 ------------------- setup.py | 2 +- 4 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 sapl/temp_suppress_crispy_form_warnings.py diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 524549446..3b260f0d6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,9 +8,9 @@ django-bower==5.2.0 django-braces==1.9.0 django-crispy-forms==1.7.2 django-floppyforms==1.7.0 +django-extra-views==0.12.0 django-extensions==1.9.8 -django-extra-views==0.11.0 django-model-utils==3.1.1 django-sass-processor==0.5.8 easy-thumbnails==2.5 diff --git a/sapl/settings.py b/sapl/settings.py index fbc19f53f..78f8f7781 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -22,9 +22,6 @@ from dj_database_url import parse as db_url from easy_thumbnails.conf import Settings as thumbnail_settings from unipath import Path -from .temp_suppress_crispy_form_warnings import \ - SUPRESS_CRISPY_FORM_WARNINGS_LOGGING - host = socket.gethostbyname_ex(socket.gethostname())[0] @@ -288,6 +285,7 @@ DAB_FIELD_RENDERER = \ CRISPY_TEMPLATE_PACK = 'bootstrap3' CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_FAIL_SILENTLY = not DEBUG +FLOPPY_FORMS_USE_GIS = False BOWER_COMPONENTS_ROOT = PROJECT_DIR.child("bower") BOWER_INSTALLED_APPS = ( @@ -345,6 +343,22 @@ LOGGING = { } } +PASSWORD_HASHERS = [ + 'django.contrib.auth.hashers.PBKDF2PasswordHasher', # default + 'sapl.hashers.ZopeSHA1PasswordHasher', +] + + +def remove_warnings(): + import warnings + warnings.filterwarnings( + 'ignore', module='floppyforms', + message='Unable to import floppyforms.gis' + ) + + +remove_warnings() + def uncaught_exceptions(type, value, error_traceback): import traceback @@ -356,8 +370,3 @@ def uncaught_exceptions(type, value, error_traceback): # captura exceções que não foram tratadas sys.excepthook = uncaught_exceptions - -PASSWORD_HASHERS = [ - 'django.contrib.auth.hashers.PBKDF2PasswordHasher', # default - 'sapl.hashers.ZopeSHA1PasswordHasher', -] diff --git a/sapl/temp_suppress_crispy_form_warnings.py b/sapl/temp_suppress_crispy_form_warnings.py deleted file mode 100644 index 39105d39e..000000000 --- a/sapl/temp_suppress_crispy_form_warnings.py +++ /dev/null @@ -1,22 +0,0 @@ -import copy -import logging - -from django.utils.log import DEFAULT_LOGGING - -# hack to suppress many annoying warnings from crispy_forms -# Do remove this file and corresponding import in settings -# when crispy_forms is corrected !!! -SUPRESS_CRISPY_FORM_WARNINGS_LOGGING = copy.deepcopy(DEFAULT_LOGGING) -SUPRESS_CRISPY_FORM_WARNINGS_LOGGING['filters']['suppress_deprecated'] = { - '()': 'sapl.temp_suppress_crispy_form_warnings.SuppressDeprecated' -} -SUPRESS_CRISPY_FORM_WARNINGS_LOGGING['handlers']['console']['filters'].append( - 'suppress_deprecated') - - -class SuppressDeprecated(logging.Filter): - - def filter(self, record): - msg = record.getMessage() - return not ('crispy_forms' in msg and - 'RemovedInDjango19Warning' in msg) diff --git a/setup.py b/setup.py index 12a1823a7..4a44886a9 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ install_requires = [ 'django-braces==1.9.0', 'django-crispy-forms==1.7.2', 'django-floppyforms==1.7.0', + 'django-extra-views==0.12.0', - 'django-extra-views==0.11.0', 'django-extensions==1.9.8', 'django-model-utils==3.1.1', 'django-sass-processor==0.5.8', From 08d249f123304f8bcb817c89bd1cdf3bb36e7b0a Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 09:57:28 -0200 Subject: [PATCH 11/35] bump django-models-utils e django-sass-processor --- requirements/requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 3b260f0d6..5ad014630 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -9,10 +9,10 @@ django-braces==1.9.0 django-crispy-forms==1.7.2 django-floppyforms==1.7.0 django-extra-views==0.12.0 +django-model-utils==3.1.2 +django-sass-processor==0.7.2 django-extensions==1.9.8 -django-model-utils==3.1.1 -django-sass-processor==0.5.8 easy-thumbnails==2.5 django-image-cropping==1.2 libsass==0.11.1 diff --git a/setup.py b/setup.py index 4a44886a9..b17a241c0 100644 --- a/setup.py +++ b/setup.py @@ -20,10 +20,10 @@ install_requires = [ 'django-crispy-forms==1.7.2', 'django-floppyforms==1.7.0', 'django-extra-views==0.12.0', + 'django-model-utils==3.1.2', + 'django-sass-processor==0.7.2', 'django-extensions==1.9.8', - 'django-model-utils==3.1.1', - 'django-sass-processor==0.5.8', 'drfdocs', 'easy-thumbnails==2.5', 'django-image-cropping==1.1.0', From 9bc8225bbc0a14b2bf526d96df15fdb81d115ce7 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:18:30 -0200 Subject: [PATCH 12/35] bump django-reversion e django-reversion-compare --- requirements/requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5ad014630..229fc2b44 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -11,6 +11,8 @@ django-floppyforms==1.7.0 django-extra-views==0.12.0 django-model-utils==3.1.2 django-sass-processor==0.7.2 +django-reversion==3.0.2 +django-reversion-compare==0.8.6 django-extensions==1.9.8 easy-thumbnails==2.5 @@ -26,11 +28,9 @@ unipath==1.1 pysolr==3.6.0 python-magic==0.4.12 gunicorn==19.6.0 -django-reversion==2.0.8 WeasyPrint==0.42 whoosh==2.7.4 django-speedinfo==1.3.5 -django-reversion-compare==0.8.4 git+git://github.com/interlegis/trml2pdf.git git+git://github.com/jasperlittle/django-rest-framework-docs diff --git a/setup.py b/setup.py index b17a241c0..c08b7cafb 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,8 @@ install_requires = [ 'django-extra-views==0.12.0', 'django-model-utils==3.1.2', 'django-sass-processor==0.7.2', + 'django-reversion==3.0.2', + 'django-reversion-compare==0.8.6' 'django-extensions==1.9.8', 'drfdocs', @@ -38,11 +40,9 @@ install_requires = [ 'pysolr==3.6.0', 'python-magic==0.4.12', 'gunicorn==19.6.0', - 'django-reversion==2.0.8', 'WeasyPrint==0.42', 'whoosh==2.7.4', 'django-speedinfo==1.3.5', - 'django-reversion-compare==0.8.4' # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' From 93c462703ff30be1e3f970caf905c0ed93daf2bf Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:25:46 -0200 Subject: [PATCH 13/35] bump django-speedinfo --- requirements/requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 229fc2b44..0ebfd9195 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -13,6 +13,7 @@ django-model-utils==3.1.2 django-sass-processor==0.7.2 django-reversion==3.0.2 django-reversion-compare==0.8.6 +django-speedinfo==1.4.0 django-extensions==1.9.8 easy-thumbnails==2.5 @@ -30,7 +31,6 @@ python-magic==0.4.12 gunicorn==19.6.0 WeasyPrint==0.42 whoosh==2.7.4 -django-speedinfo==1.3.5 git+git://github.com/interlegis/trml2pdf.git git+git://github.com/jasperlittle/django-rest-framework-docs diff --git a/setup.py b/setup.py index c08b7cafb..e7839c35e 100644 --- a/setup.py +++ b/setup.py @@ -24,6 +24,7 @@ install_requires = [ 'django-sass-processor==0.7.2', 'django-reversion==3.0.2', 'django-reversion-compare==0.8.6' + 'django-speedinfo==1.4.0', 'django-extensions==1.9.8', 'drfdocs', @@ -42,7 +43,6 @@ install_requires = [ 'gunicorn==19.6.0', 'WeasyPrint==0.42', 'whoosh==2.7.4', - 'django-speedinfo==1.3.5', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' From 1c6192a54e9ff358908fa3ed0d5be56bf4001cde Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:31:54 -0200 Subject: [PATCH 14/35] bump django-extensions --- requirements/requirements.txt | 4 ++-- sapl/settings.py | 6 ++---- setup.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 0ebfd9195..2b83fa694 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -14,10 +14,10 @@ django-sass-processor==0.7.2 django-reversion==3.0.2 django-reversion-compare==0.8.6 django-speedinfo==1.4.0 +django-extensions==2.1.4 -django-extensions==1.9.8 -easy-thumbnails==2.5 django-image-cropping==1.2 +easy-thumbnails==2.5 libsass==0.11.1 psycopg2-binary==2.7.4 python-decouple==3.0 diff --git a/sapl/settings.py b/sapl/settings.py index 78f8f7781..782cbb0f4 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -75,21 +75,19 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django_extensions', 'djangobower', 'bootstrap3', 'crispy_forms', 'floppyforms', + 'sass_processor', 'rest_framework', 'django_filters', - - - 'django_extensions', 'easy_thumbnails', 'image_cropping', - 'sass_processor', 'reversion', 'reversion_compare', diff --git a/setup.py b/setup.py index e7839c35e..2ebde35b9 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,8 @@ install_requires = [ 'django-reversion==3.0.2', 'django-reversion-compare==0.8.6' 'django-speedinfo==1.4.0', + 'django-extensions==2.1.4', - 'django-extensions==1.9.8', 'drfdocs', 'easy-thumbnails==2.5', 'django-image-cropping==1.1.0', From 33200eae61f253baf2ac826a2bf9ffa3e6efc934 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:33:54 -0200 Subject: [PATCH 15/35] bump django-image-cropping --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 2ebde35b9..3917d49bd 100644 --- a/setup.py +++ b/setup.py @@ -26,10 +26,9 @@ install_requires = [ 'django-reversion-compare==0.8.6' 'django-speedinfo==1.4.0', 'django-extensions==2.1.4', - - 'drfdocs', + 'django-image-cropping==1.2.0', 'easy-thumbnails==2.5', - 'django-image-cropping==1.1.0', + 'libsass==0.11.1', 'psycopg2==2.7.4', 'python-decouple==3.0', @@ -43,6 +42,8 @@ install_requires = [ 'gunicorn==19.6.0', 'WeasyPrint==0.42', 'whoosh==2.7.4', + + 'drfdocs', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' From bfdbf82ef5fc121c3cf683d70f13ec316b3a1ac8 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:38:06 -0200 Subject: [PATCH 16/35] bump libsass --- requirements/requirements.txt | 10 +++++----- setup.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 2b83fa694..5e5425ebe 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -15,10 +15,10 @@ django-reversion==3.0.2 django-reversion-compare==0.8.6 django-speedinfo==1.4.0 django-extensions==2.1.4 - django-image-cropping==1.2 easy-thumbnails==2.5 -libsass==0.11.1 +libsass==0.17.0 + psycopg2-binary==2.7.4 python-decouple==3.0 pytz==2016.4 @@ -32,8 +32,8 @@ gunicorn==19.6.0 WeasyPrint==0.42 whoosh==2.7.4 -git+git://github.com/interlegis/trml2pdf.git -git+git://github.com/jasperlittle/django-rest-framework-docs -git+git://github.com/rubgombar1/django-admin-bootstrapped.git +#git+git://github.com/interlegis/trml2pdf.git +#git+git://github.com/jasperlittle/django-rest-framework-docs +#git+git://github.com/rubgombar1/django-admin-bootstrapped.git #django-compressor==2.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 3917d49bd..d8fbacbe5 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ install_requires = [ 'django-image-cropping==1.2.0', 'easy-thumbnails==2.5', - 'libsass==0.11.1', + 'libsass==0.17.0', 'psycopg2==2.7.4', 'python-decouple==3.0', 'pytz==2016.4', @@ -42,7 +42,7 @@ install_requires = [ 'gunicorn==19.6.0', 'WeasyPrint==0.42', 'whoosh==2.7.4', - + 'drfdocs', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' From a0d47f84c052cf602b32ae3d595a982d3a4ad6a6 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:43:31 -0200 Subject: [PATCH 17/35] bump python-decouple --- requirements/requirements.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5e5425ebe..584b51380 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -18,9 +18,9 @@ django-extensions==2.1.4 django-image-cropping==1.2 easy-thumbnails==2.5 libsass==0.17.0 +python-decouple==3.1 psycopg2-binary==2.7.4 -python-decouple==3.0 pytz==2016.4 pyyaml==4.2b1 rtyaml==0.0.3 diff --git a/setup.py b/setup.py index d8fbacbe5..80379f086 100644 --- a/setup.py +++ b/setup.py @@ -28,10 +28,10 @@ install_requires = [ 'django-extensions==2.1.4', 'django-image-cropping==1.2.0', 'easy-thumbnails==2.5', - 'libsass==0.17.0', + 'python-decouple==3.1', + 'psycopg2==2.7.4', - 'python-decouple==3.0', 'pytz==2016.4', 'pyyaml==4.2b1', 'rtyaml==0.0.3', From 5ef0e0421b6a8d62d78f06b105e50a9a8eab039b Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:46:34 -0200 Subject: [PATCH 18/35] bump psycopg2-binary --- requirements/requirements.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 584b51380..44e37516e 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -19,8 +19,8 @@ django-image-cropping==1.2 easy-thumbnails==2.5 libsass==0.17.0 python-decouple==3.1 +psycopg2-binary==2.7.6.1 -psycopg2-binary==2.7.4 pytz==2016.4 pyyaml==4.2b1 rtyaml==0.0.3 diff --git a/setup.py b/setup.py index 80379f086..b48c420ee 100644 --- a/setup.py +++ b/setup.py @@ -30,10 +30,10 @@ install_requires = [ 'easy-thumbnails==2.5', 'libsass==0.17.0', 'python-decouple==3.1', + 'psycopg2-binary==2.7.6.1', + 'pyyaml==4.2b1', - 'psycopg2==2.7.4', 'pytz==2016.4', - 'pyyaml==4.2b1', 'rtyaml==0.0.3', 'textract==1.5.0', 'unipath==1.1', From 0e1ed356c47e9031cc3cb00f3ab67c5373c26c1f Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 10:53:26 -0200 Subject: [PATCH 19/35] bump pytz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pytz é uma biblioteca que necessita ser atualizada com mais frequencia... ela traz informações e registra as mudanças de horários de verão, fato comum no Brasil. --- requirements/requirements.txt | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 44e37516e..8f0e1c523 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -20,9 +20,9 @@ easy-thumbnails==2.5 libsass==0.17.0 python-decouple==3.1 psycopg2-binary==2.7.6.1 - -pytz==2016.4 pyyaml==4.2b1 +pytz==2018.9 + rtyaml==0.0.3 textract==1.5.0 unipath==1.1 diff --git a/setup.py b/setup.py index b48c420ee..6b720f173 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,8 @@ install_requires = [ 'python-decouple==3.1', 'psycopg2-binary==2.7.6.1', 'pyyaml==4.2b1', + 'pytz==2018.9', - 'pytz==2016.4', 'rtyaml==0.0.3', 'textract==1.5.0', 'unipath==1.1', From 09fc9942c8a428836230e96f29002ec4cf4f3395 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 17:09:31 -0200 Subject: [PATCH 20/35] bump rtyaml --- requirements/requirements.txt | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8f0e1c523..7c40f527d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -22,8 +22,8 @@ python-decouple==3.1 psycopg2-binary==2.7.6.1 pyyaml==4.2b1 pytz==2018.9 +rtyaml==0.0.5 -rtyaml==0.0.3 textract==1.5.0 unipath==1.1 pysolr==3.6.0 @@ -32,8 +32,8 @@ gunicorn==19.6.0 WeasyPrint==0.42 whoosh==2.7.4 -#git+git://github.com/interlegis/trml2pdf.git -#git+git://github.com/jasperlittle/django-rest-framework-docs -#git+git://github.com/rubgombar1/django-admin-bootstrapped.git +git+git://github.com/interlegis/trml2pdf.git +git+git://github.com/jasperlittle/django-rest-framework-docs +git+git://github.com/rubgombar1/django-admin-bootstrapped.git #django-compressor==2.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 6b720f173..e89b7e402 100644 --- a/setup.py +++ b/setup.py @@ -33,8 +33,8 @@ install_requires = [ 'psycopg2-binary==2.7.6.1', 'pyyaml==4.2b1', 'pytz==2018.9', + 'rtyaml==0.0.5', - 'rtyaml==0.0.3', 'textract==1.5.0', 'unipath==1.1', 'pysolr==3.6.0', From a4297969901c78aef7480c870b1df85a5a1813c0 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 17:25:08 -0200 Subject: [PATCH 21/35] bump WeasyPrint --- requirements/requirements.txt | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7c40f527d..0ef545cc5 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -23,13 +23,13 @@ psycopg2-binary==2.7.6.1 pyyaml==4.2b1 pytz==2018.9 rtyaml==0.0.5 +python-magic==0.4.15 +unipath==1.1 +WeasyPrint==44 textract==1.5.0 -unipath==1.1 pysolr==3.6.0 -python-magic==0.4.12 gunicorn==19.6.0 -WeasyPrint==0.42 whoosh==2.7.4 git+git://github.com/interlegis/trml2pdf.git diff --git a/setup.py b/setup.py index e89b7e402..370a8f3ca 100644 --- a/setup.py +++ b/setup.py @@ -34,13 +34,13 @@ install_requires = [ 'pyyaml==4.2b1', 'pytz==2018.9', 'rtyaml==0.0.5', + 'WeasyPrint==44', 'textract==1.5.0', 'unipath==1.1', 'pysolr==3.6.0', 'python-magic==0.4.12', 'gunicorn==19.6.0', - 'WeasyPrint==0.42', 'whoosh==2.7.4', 'drfdocs', From 284c4662b4adb8b30d0b192072dc238ef8f64712 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 7 Jan 2019 17:26:39 -0200 Subject: [PATCH 22/35] bump gunicorn --- requirements/requirements.txt | 2 +- setup.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 0ef545cc5..bcc15f37b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -26,10 +26,10 @@ rtyaml==0.0.5 python-magic==0.4.15 unipath==1.1 WeasyPrint==44 +gunicorn==19.9.0 textract==1.5.0 pysolr==3.6.0 -gunicorn==19.6.0 whoosh==2.7.4 git+git://github.com/interlegis/trml2pdf.git diff --git a/setup.py b/setup.py index 370a8f3ca..7b750d91a 100644 --- a/setup.py +++ b/setup.py @@ -34,16 +34,15 @@ install_requires = [ 'pyyaml==4.2b1', 'pytz==2018.9', 'rtyaml==0.0.5', + 'python-magic==0.4.15', + 'unipath==1.1', 'WeasyPrint==44', + 'gunicorn==19.9.0', 'textract==1.5.0', - 'unipath==1.1', 'pysolr==3.6.0', - 'python-magic==0.4.12', - 'gunicorn==19.6.0', 'whoosh==2.7.4', - 'drfdocs', # 'git+git://github.com/interlegis/trml2pdf.git', # 'git+git://github.com/jasperlittle/django-rest-framework-docs' # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' From ac91543b0fd0a32f3f30ec881e9052d1ce9cfa58 Mon Sep 17 00:00:00 2001 From: Leandro Roberto da Silva Date: Thu, 10 Jan 2019 20:45:58 -0200 Subject: [PATCH 23/35] Fix #2337 (#2448) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * impl data e hora manual no protocolo de matérias * impl data e hora manual no protocolo de documentos * ajustes de teste em protocoloadm --- sapl/protocoloadm/forms.py | 155 +++++++++++++----- .../migrations/0014_auto_20190110_1300.py | 35 ++++ ...15_protocolo_timestamp_data_hora_manual.py | 21 +++ .../migrations/0016_auto_20190110_1345.py | 21 +++ sapl/protocoloadm/models.py | 24 ++- sapl/protocoloadm/tests/test_protocoloadm.py | 23 ++- sapl/protocoloadm/views.py | 41 ++++- sapl/relatorios/views.py | 35 ++-- sapl/static/js/app.js | 1 + sapl/templates/protocoloadm/comprovante.html | 6 +- .../protocoloadm/protocolar_documento.html | 14 ++ .../protocoloadm/protocolar_materia.html | 62 ++++--- .../protocoloadm/protocolo_mostrar.html | 10 +- sapl/utils.py | 18 ++ 14 files changed, 369 insertions(+), 97 deletions(-) create mode 100644 sapl/protocoloadm/migrations/0014_auto_20190110_1300.py create mode 100644 sapl/protocoloadm/migrations/0015_protocolo_timestamp_data_hora_manual.py create mode 100644 sapl/protocoloadm/migrations/0016_auto_20190110_1345.py diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index d0c812958..8f476d443 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -1,9 +1,9 @@ import logging -from crispy_forms.bootstrap import InlineRadios +from crispy_forms.bootstrap import InlineRadios, Alert from crispy_forms.helper import FormHelper -from crispy_forms.layout import HTML, Button, Column, Fieldset, Layout +from crispy_forms.layout import HTML, Button, Column, Fieldset, Layout, Div from django import forms from django.core.exceptions import (MultipleObjectsReturned, ObjectDoesNotExist, ValidationError) @@ -18,11 +18,12 @@ from sapl.base.models import Autor, TipoAutor from sapl.crispy_layout_mixin import SaplFormLayout, form_actions, to_row from sapl.materia.models import (MateriaLegislativa, TipoMateriaLegislativa, UnidadeTramitacao) +from sapl.protocoloadm.models import Protocolo from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, AnoNumeroOrderingFilter, RangeWidgetOverride, autor_label, autor_modal, choice_anos_com_protocolo, choice_force_optional, choice_anos_com_documentoadministrativo, - FilterOverridesMetaMixin) + FilterOverridesMetaMixin, choice_anos_com_materias) from .models import (AcompanhamentoDocumento, DocumentoAcessorioAdministrativo, DocumentoAdministrativo, @@ -344,6 +345,12 @@ class ProtocoloDocumentForm(ModelForm): numero = forms.IntegerField( required=False, label=_('Número de Protocolo (opcional)')) + data_hora_manual = forms.ChoiceField( + label=_('Informar data e hora manualmente?'), + widget=forms.RadioSelect(), + choices=YES_NO_CHOICES, + initial=False) + class Meta: model = Protocolo fields = ['tipo_protocolo', @@ -352,7 +359,9 @@ class ProtocoloDocumentForm(ModelForm): 'assunto', 'interessado', 'observacao', - 'numero' + 'numero', + 'data', + 'hora', ] def __init__(self, *args, **kwargs): @@ -360,30 +369,56 @@ class ProtocoloDocumentForm(ModelForm): row1 = to_row( [(InlineRadios('tipo_protocolo'), 12)]) row2 = to_row( - [('tipo_documento', 6), - ('numero_paginas', 6)]) - row3 = to_row( - [('assunto', 12)]) + [('tipo_documento', 5), + ('numero_paginas', 2), + (Div(), 1), + (InlineRadios('data_hora_manual'), 4), + ]) + row3 = to_row([ + (Div(), 2), + (Alert( + """ + Usuário: {} - {}
+ IP: {} - {}
+ + """.format( + kwargs['initial']['user_data_hora_manual'], + Protocolo._meta.get_field( + 'user_data_hora_manual').help_text, + kwargs['initial']['ip_data_hora_manual'], + Protocolo._meta.get_field( + 'ip_data_hora_manual').help_text, + + ), + dismiss=False, + css_class='alert-info'), 6), + ('data', 2), + ('hora', 2), + ]) row4 = to_row( - [('interessado', 12)]) + [('assunto', 12)]) row5 = to_row( - [('observacao', 12)]) + [('interessado', 12)]) row6 = to_row( + [('observacao', 12)]) + row7 = to_row( [('numero', 12)]) self.helper = FormHelper() self.helper.layout = Layout( Fieldset(_('Identificação de Documento'), row1, - row2, + row2), + Fieldset(_('Protocolo com data e hora informados manualmente'), row3, - row4, - row5, - HTML(" "), - ), + css_id='protocolo_data_hora_manual', + css_class='hidden'), + row4, + row5, + HTML(" "), Fieldset(_('Número do Protocolo (Apenas se quiser que a numeração comece ' 'a partir do número a ser informado)'), - row6, + row7, HTML(" "), form_actions(label=_('Protocolar Documento')) ) @@ -419,10 +454,11 @@ class ProtocoloMateriaForm(ModelForm): ano_materia = forms.CharField( label=_('Ano matéria'), required=False) - vincular_materia = forms.ChoiceField(label=_('Vincular a matéria existente?'), - widget=forms.RadioSelect(), - choices=YES_NO_CHOICES, - initial=False) + vincular_materia = forms.ChoiceField( + label=_('Vincular a matéria existente?'), + widget=forms.RadioSelect(), + choices=YES_NO_CHOICES, + initial=False) numero_paginas = forms.CharField(label=_('Núm. Páginas'), required=True) @@ -435,6 +471,12 @@ class ProtocoloMateriaForm(ModelForm): numero = forms.IntegerField( required=False, label=_('Número de Protocolo (opcional)')) + data_hora_manual = forms.ChoiceField( + label=_('Informar data e hora manualmente?'), + widget=forms.RadioSelect(), + choices=YES_NO_CHOICES, + initial=False) + class Meta: model = Protocolo fields = ['tipo_materia', @@ -446,7 +488,9 @@ class ProtocoloMateriaForm(ModelForm): 'numero_materia', 'ano_materia', 'vincular_materia', - 'numero' + 'numero', + 'data', + 'hora', ] def clean_autor(self): @@ -506,28 +550,55 @@ class ProtocoloMateriaForm(ModelForm): ('tipo_autor', 3), ('autor', 3)]) row2 = to_row( - [(InlineRadios('vincular_materia'), 4), - ('numero_materia', 4), - ('ano_materia', 4), ]) - row3 = to_row( - [('assunto_ementa', 12)]) + [(InlineRadios('vincular_materia'), 3), + ('numero_materia', 2), + ('ano_materia', 2), + (Div(), 1), + (InlineRadios('data_hora_manual'), 4), + ]) + row3 = to_row([ + (Div(), 2), + (Alert( + """ + Usuário: {} - {}
+ IP: {} - {}
+ + """.format( + kwargs['initial']['user_data_hora_manual'], + Protocolo._meta.get_field( + 'user_data_hora_manual').help_text, + kwargs['initial']['ip_data_hora_manual'], + Protocolo._meta.get_field( + 'ip_data_hora_manual').help_text, + + ), + dismiss=False, + css_class='alert-info'), 6), + ('data', 2), + ('hora', 2), + ]) row4 = to_row( - [('observacao', 12)]) + [('assunto_ementa', 12)]) row5 = to_row( + [('observacao', 12)]) + row6 = to_row( [('numero', 12)]) self.helper = FormHelper() self.helper.layout = Layout( Fieldset(_('Identificação da Matéria'), row1, - row2, + row2), + Fieldset(_('Protocolo com data e hora informados manualmente'), row3, - row4, - HTML(" "), - ), + css_id='protocolo_data_hora_manual', + css_class='hidden'), + row4, + row5, + HTML(" "), Fieldset(_('Número do Protocolo (Apenas se quiser que a numeração comece' ' a partir do número a ser informado)'), - row5, + row6, HTML(" "), form_actions(label=_('Protocolar Matéria'))) ) @@ -855,15 +926,15 @@ class DesvincularDocumentoForm(ModelForm): logger = logging.getLogger(__name__) - numero = forms.CharField(required=True, - label=DocumentoAdministrativo._meta. - get_field('numero').verbose_name - ) - ano = forms.ChoiceField(required=True, - label=DocumentoAdministrativo._meta. - get_field('ano').verbose_name, - choices=RANGE_ANOS, - widget=forms.Select(attrs={'class': 'selector'})) + numero = forms.CharField( + required=True, + label=DocumentoAdministrativo._meta.get_field('numero').verbose_name) + + ano = forms.ChoiceField( + required=True, + label=DocumentoAdministrativo._meta.get_field('ano').verbose_name, + choices=choice_anos_com_documentoadministrativo, + widget=forms.Select(attrs={'class': 'selector'})) def clean(self): super(DesvincularDocumentoForm, self).clean() @@ -929,7 +1000,7 @@ class DesvincularMateriaForm(forms.Form): label=_('Número da Matéria')) ano = forms.ChoiceField(required=True, label=_('Ano da Matéria'), - choices=RANGE_ANOS, + choices=choice_anos_com_materias, widget=forms.Select(attrs={'class': 'selector'})) tipo = forms.ModelChoiceField(label=_('Tipo de Matéria'), required=True, diff --git a/sapl/protocoloadm/migrations/0014_auto_20190110_1300.py b/sapl/protocoloadm/migrations/0014_auto_20190110_1300.py new file mode 100644 index 000000000..56cdf8d36 --- /dev/null +++ b/sapl/protocoloadm/migrations/0014_auto_20190110_1300.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.8 on 2019-01-10 15:00 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0013_auto_20190106_1336'), + ] + + operations = [ + migrations.AddField( + model_name='protocolo', + name='ip_data_hora_manual', + field=models.CharField(blank=True, help_text='Endereço IP da estação de trabalho do usuário que está realizando Protocolo e informando data e hora manualmente.', max_length=15, verbose_name='IP'), + ), + migrations.AddField( + model_name='protocolo', + name='user_data_hora_manual', + field=models.CharField(blank=True, help_text='Usuário que está realizando Protocolo e informando data e hora manualmente.', max_length=20, verbose_name='IP'), + ), + migrations.AlterField( + model_name='protocolo', + name='data', + field=models.DateField(blank=True, help_text='Informado manualmente', null=True, verbose_name='Data do Protocolo'), + ), + migrations.AlterField( + model_name='protocolo', + name='hora', + field=models.TimeField(blank=True, help_text='Informado manualmente', null=True, verbose_name='Hora do Protocolo'), + ), + ] diff --git a/sapl/protocoloadm/migrations/0015_protocolo_timestamp_data_hora_manual.py b/sapl/protocoloadm/migrations/0015_protocolo_timestamp_data_hora_manual.py new file mode 100644 index 000000000..85554edad --- /dev/null +++ b/sapl/protocoloadm/migrations/0015_protocolo_timestamp_data_hora_manual.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.8 on 2019-01-10 15:43 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0014_auto_20190110_1300'), + ] + + operations = [ + migrations.AddField( + model_name='protocolo', + name='timestamp_data_hora_manual', + field=models.DateTimeField(default=django.utils.timezone.now), + ), + ] diff --git a/sapl/protocoloadm/migrations/0016_auto_20190110_1345.py b/sapl/protocoloadm/migrations/0016_auto_20190110_1345.py new file mode 100644 index 000000000..71f2b7f7a --- /dev/null +++ b/sapl/protocoloadm/migrations/0016_auto_20190110_1345.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.8 on 2019-01-10 15:45 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0015_protocolo_timestamp_data_hora_manual'), + ] + + operations = [ + migrations.AlterField( + model_name='protocolo', + name='timestamp', + field=models.DateTimeField(blank=True, default=django.utils.timezone.now, null=True), + ), + ] diff --git a/sapl/protocoloadm/models.py b/sapl/protocoloadm/models.py index 6d3d90671..e335a5db1 100644 --- a/sapl/protocoloadm/models.py +++ b/sapl/protocoloadm/models.py @@ -57,13 +57,29 @@ class Protocolo(models.Model): choices=RANGE_ANOS, verbose_name=_('Ano do Protocolo')) - # FIXME: https://github.com/interlegis/sapl/issues/2337 - data = models.DateField(null=True, blank=True) - hora = models.TimeField(null=True, blank=True) + data = models.DateField(null=True, blank=True, + verbose_name=_('Data do Protocolo'), + help_text=_('Informado manualmente')) + hora = models.TimeField(null=True, blank=True, + verbose_name=_('Hora do Protocolo'), + help_text=_('Informado manualmente')) + timestamp_data_hora_manual = models.DateTimeField(default=timezone.now) + user_data_hora_manual = models.CharField( + max_length=20, blank=True, + verbose_name=_('IP'), + help_text=_('Usuário que está realizando Protocolo e informando ' + 'data e hora manualmente.')) + ip_data_hora_manual = models.CharField( + max_length=15, blank=True, + verbose_name=_('IP'), + help_text=_('Endereço IP da estação de trabalho ' + 'do usuário que está realizando Protocolo e informando ' + 'data e hora manualmente.')) # Não foi utilizado auto_now_add=True em timestamp porque # ele usa datetime.now que não é timezone aware. - timestamp = models.DateTimeField(default=timezone.now) + timestamp = models.DateTimeField( + default=timezone.now, null=True, blank=True) tipo_protocolo = models.PositiveIntegerField( blank=True, null=True, verbose_name=_('Tipo de Protocolo')) tipo_processo = models.PositiveIntegerField() diff --git a/sapl/protocoloadm/tests/test_protocoloadm.py b/sapl/protocoloadm/tests/test_protocoloadm.py index 2a4c9f53c..c7e4bc341 100644 --- a/sapl/protocoloadm/tests/test_protocoloadm.py +++ b/sapl/protocoloadm/tests/test_protocoloadm.py @@ -1,4 +1,4 @@ -from datetime import date, timedelta +from datetime import date, timedelta, datetime from django.core.urlresolvers import reverse from django.utils import timezone @@ -392,29 +392,42 @@ def test_documento_administrativo_protocolo_inexistente(): def test_protocolo_documento_form_invalido(): - form = ProtocoloDocumentForm(data={}) + form = ProtocoloDocumentForm( + data={}, + initial={ + 'user_data_hora_manual': '', + 'ip_data_hora_manual': '', + 'data': timezone.localdate(timezone.now()), + 'hora': timezone.localtime(timezone.now())}) assert not form.is_valid() errors = form.errors + assert errors['data_hora_manual'] == [_('Este campo é obrigatório.')] assert errors['tipo_protocolo'] == [_('Este campo é obrigatório.')] assert errors['interessado'] == [_('Este campo é obrigatório.')] assert errors['tipo_documento'] == [_('Este campo é obrigatório.')] assert errors['numero_paginas'] == [_('Este campo é obrigatório.')] assert errors['assunto'] == [_('Este campo é obrigatório.')] - assert len(errors) == 5 + assert len(errors) == 6 def test_protocolo_materia_invalido(): - form = ProtocoloMateriaForm(data={}) + form = ProtocoloMateriaForm(data={}, + initial={ + 'user_data_hora_manual': '', + 'ip_data_hora_manual': '', + 'data': timezone.localdate(timezone.now()), + 'hora': timezone.localtime(timezone.now())}) assert not form.is_valid() errors = form.errors + assert errors['data_hora_manual'] == [_('Este campo é obrigatório.')] assert errors['assunto_ementa'] == [_('Este campo é obrigatório.')] assert errors['tipo_autor'] == [_('Este campo é obrigatório.')] assert errors['tipo_materia'] == [_('Este campo é obrigatório.')] @@ -422,4 +435,4 @@ def test_protocolo_materia_invalido(): assert errors['autor'] == [_('Este campo é obrigatório.')] assert errors['vincular_materia'] == [_('Este campo é obrigatório.')] - assert len(errors) == 6 + assert len(errors) == 7 diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index 8dd7e9e47..f91ee5227 100755 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -492,6 +492,15 @@ class ProtocoloDocumentoView(PermissionRequiredMixin, return reverse('sapl.protocoloadm:protocolo_mostrar', kwargs={'pk': self.object.id}) + def get_initial(self): + initial = super().get_initial() + + initial['user_data_hora_manual'] = self.request.user.username + initial['ip_data_hora_manual'] = get_client_ip(self.request) + initial['data'] = timezone.localdate(timezone.now()) + initial['hora'] = timezone.localtime(timezone.now()) + return initial + def form_valid(self, form): protocolo = form.save(commit=False) username = self.request.user.username @@ -538,6 +547,17 @@ class ProtocoloDocumentoView(PermissionRequiredMixin, return self.render_to_response(self.get_context_data()) protocolo.ano = timezone.now().year protocolo.assunto_ementa = self.request.POST['assunto'] + + if form.cleaned_data['data_hora_manual'] == 'True': + protocolo.timestamp = None + protocolo.user_data_hora_manual = username + protocolo.ip_data_hora_manual = get_client_ip(self.request) + else: + protocolo.data = None + protocolo.hora = None + protocolo.user_data_hora_manual = '' + protocolo.ip_data_hora_manual = '' + protocolo.save() self.object = protocolo return redirect(self.get_success_url()) @@ -659,6 +679,15 @@ class ProtocoloMateriaView(PermissionRequiredMixin, CreateView): return reverse('sapl.protocoloadm:materia_continuar', kwargs={ 'pk': protocolo.pk}) + def get_initial(self): + initial = super().get_initial() + + initial['user_data_hora_manual'] = self.request.user.username + initial['ip_data_hora_manual'] = get_client_ip(self.request) + initial['data'] = timezone.localdate(timezone.now()) + initial['hora'] = timezone.localtime(timezone.now()) + return initial + def form_valid(self, form): protocolo = form.save(commit=False) username = self.request.user.username @@ -719,6 +748,16 @@ class ProtocoloMateriaView(PermissionRequiredMixin, CreateView): protocolo.observacao = self.request.POST['observacao'] protocolo.assunto_ementa = self.request.POST['assunto_ementa'] + if form.cleaned_data['data_hora_manual'] == 'True': + protocolo.timestamp = None + protocolo.user_data_hora_manual = username + protocolo.ip_data_hora_manual = get_client_ip(self.request) + else: + protocolo.data = None + protocolo.hora = None + protocolo.user_data_hora_manual = '' + protocolo.ip_data_hora_manual = '' + protocolo.save() data = form.cleaned_data if data['vincular_materia'] == 'True': @@ -1168,4 +1207,4 @@ class FichaSelecionaAdmView(PermissionRequiredMixin, FormView): context['documento'] = documento return gerar_pdf_impressos(self.request, context, - 'materia/impressos/ficha_adm_pdf.html') \ No newline at end of file + 'materia/impressos/ficha_adm_pdf.html') diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index 0c5dfd377..f4bc8cda2 100755 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -1,7 +1,7 @@ +from datetime import datetime as dt import html -import re import logging -from datetime import datetime as dt +import re from django.core.exceptions import ObjectDoesNotExist from django.http import Http404, HttpResponse @@ -581,7 +581,6 @@ def get_sessao_plenaria(sessao, casa): if dic_expedientes: lst_expedientes.append(dic_expedientes) - # Lista das matérias do Expediente, incluindo o resultado das votacoes lst_expediente_materia = [] for expediente_materia in ExpedienteMateria.objects.filter( @@ -612,7 +611,8 @@ def get_sessao_plenaria(sessao, casa): dic_expediente_materia["nom_autor"] = '' autoria = materia.autoria_set.all() - dic_expediente_materia['num_autores'] = 'Autores' if len(autoria) > 1 else 'Autor' + dic_expediente_materia['num_autores'] = 'Autores' if len( + autoria) > 1 else 'Autor' if autoria: for a in autoria: if a.autor.nome: @@ -687,7 +687,7 @@ def get_sessao_plenaria(sessao, casa): numeracao = materia.numeracao_set.first() if numeracao: - + dic_votacao["des_numeracao"] = ( str(numeracao.numero_materia) + '/' + @@ -762,7 +762,6 @@ def get_sessao_plenaria(sessao, casa): lst_ocorrencias.append(o) - return (inf_basicas_dic, lst_mesa, lst_presenca_sessao, @@ -810,10 +809,12 @@ def relatorio_sessao_plenaria(request, pk): imagem = get_imagem(casa) try: - logger.debug("user=" + username + ". Tentando obter SessaoPlenaria com id={}.".format(pk)) + logger.debug("user=" + username + + ". Tentando obter SessaoPlenaria com id={}.".format(pk)) sessao = SessaoPlenaria.objects.get(id=pk) except ObjectDoesNotExist as e: - logger.error("user=" + username + ". Essa SessaoPlenaria não existe (pk={}). ".format(pk) + str(e)) + logger.error("user=" + username + + ". Essa SessaoPlenaria não existe (pk={}). ".format(pk) + str(e)) raise Http404('Essa página não existe') (inf_basicas_dic, @@ -828,11 +829,10 @@ def relatorio_sessao_plenaria(request, pk): lst_oradores, lst_ocorrencias) = get_sessao_plenaria(sessao, casa) - for idx in range(len(lst_expedientes)): txt_expedientes = lst_expedientes[idx]['txt_expediente'] txt_expedientes = TrocaTag(txt_expedientes, '', 6, 6, - 'expedientes', '') lst_expedientes[idx]['txt_expediente'] = txt_expedientes pdf = pdf_sessao_plenaria_gerar.principal( @@ -868,7 +868,7 @@ def get_protocolos(prots): ts.strftime("%H:%m") else: dic['data'] = protocolo.data.strftime("%d/%m/%Y") + ' - Horário:' \ - + protocolo.hora.strftime("%H:%m") + + protocolo.hora.strftime("%H:%m") dic['txt_assunto'] = protocolo.assunto_ementa @@ -979,8 +979,8 @@ def get_etiqueta_protocolos(prots): dic['titulo'] = str(p.numero) + '/' + str(p.ano) - tz_hora = timezone.localtime(p.timestamp) if p.timestamp: + tz_hora = timezone.localtime(p.timestamp) dic['data'] = 'Data: ' + tz_hora.strftime( "%d/%m/%Y") + ' - Horário: ' + tz_hora.strftime("%H:%M") else: @@ -1072,7 +1072,8 @@ def get_pauta_sessao(sessao, casa): id=expediente_materia.materia.id).first() dic_expediente_materia = {} - dic_expediente_materia["tipo_materia"] = materia.tipo.sigla + ' - ' + materia.tipo.descricao + dic_expediente_materia["tipo_materia"] = materia.tipo.sigla + \ + ' - ' + materia.tipo.descricao dic_expediente_materia["num_ordem"] = str( expediente_materia.numero_ordem) dic_expediente_materia["id_materia"] = str( @@ -1090,7 +1091,8 @@ def get_pauta_sessao(sessao, casa): dic_expediente_materia["nom_autor"] = '' autoria = materia.autoria_set.all() - dic_expediente_materia['num_autores'] = 'Autores' if len(autoria) > 1 else 'Autor' + dic_expediente_materia['num_autores'] = 'Autores' if len( + autoria) > 1 else 'Autor' if autoria: for a in autoria: if a.autor.nome: @@ -1112,7 +1114,8 @@ def get_pauta_sessao(sessao, casa): materia = MateriaLegislativa.objects.filter( id=votacao.materia.id).first() dic_votacao = {} - dic_votacao["tipo_materia"] = materia.tipo.sigla + ' - ' + materia.tipo.descricao + dic_votacao["tipo_materia"] = materia.tipo.sigla + \ + ' - ' + materia.tipo.descricao dic_votacao["num_ordem"] = votacao.numero_ordem dic_votacao["id_materia"] = str( materia.numero) + "/" + str(materia.ano) @@ -1124,7 +1127,7 @@ def get_pauta_sessao(sessao, casa): numeracao = Numeracao.objects.filter(materia=votacao.materia).first() if numeracao: dic_votacao["des_numeracao"] = str( - numeracao.numero_materia) + '/' + str(numeracao.ano_materia) + numeracao.numero_materia) + '/' + str(numeracao.ano_materia) turno, tramitacao = get_turno(materia) dic_votacao["des_turno"] = turno diff --git a/sapl/static/js/app.js b/sapl/static/js/app.js index 48777c0e3..d3616a8b5 100644 --- a/sapl/static/js/app.js +++ b/sapl/static/js/app.js @@ -47,6 +47,7 @@ function refreshMask() { $('.dateinput').mask('00/00/0000', {placeholder:"__/__/____"}); $('.hora').mask("00:00", {placeholder:"hh:mm"}); $('.hora_hms').mask("00:00:00", {placeholder:"hh:mm:ss"}); + $('.timeinput').mask("00:00:00", {placeholder:"hh:mm:ss"}); $('.cronometro').mask("00:00:00", {placeholder:"hh:mm:ss"}); } diff --git a/sapl/templates/protocoloadm/comprovante.html b/sapl/templates/protocoloadm/comprovante.html index d285b4e4f..23d299ecf 100644 --- a/sapl/templates/protocoloadm/comprovante.html +++ b/sapl/templates/protocoloadm/comprovante.html @@ -65,7 +65,11 @@
Data / Horário{{ protocolo.timestamp|date:"d/m/Y" }} - {{ protocolo.timestamp|date:"H:i:s" }}{{ protocolo.timestamp|date:"d/m/Y" }} - {{ protocolo.timestamp|date:"H:i:s" }}{{ protocolo.data|date:"d/m/Y" }} - {{ protocolo.hora|date:"H:i:s" }}