From b6e4066a69da042356bdc3a8a24fd2ce5af884c3 Mon Sep 17 00:00:00 2001 From: Edward Date: Tue, 23 Aug 2016 18:21:48 -0300 Subject: [PATCH 01/12] Update travis.yml Adiciona ``--create-db`` --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d02e929c4..bf5ee38fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,5 +18,5 @@ before_script: script: - ./manage.py migrate - ./manage.py bower install - - py.test + - py.test --create-db # - ./test_and_check_qa.sh From 4b9908e7da2436328b55063286a94f118e697f8c Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 24 Aug 2016 16:17:11 -0300 Subject: [PATCH 02/12] =?UTF-8?q?Adiciona=20try=20except=20nos=20metodos?= =?UTF-8?q?=20de=20permiss=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/utils.py | 99 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 36 deletions(-) diff --git a/sapl/utils.py b/sapl/utils.py index 6d8a0c7f5..f7cbd2fa9 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -224,73 +224,97 @@ def intervalos_tem_intersecao(a_inicio, a_fim, b_inicio, b_fim): def permissoes_materia(): lista_permissoes = [] - cts = ContentType.objects.filter(app_label='materia') - perms_materia = list(Permission.objects.filter(content_type__in=cts)) - for p in perms_materia: - lista_permissoes.append('materia.' + p.codename) + try: + cts = ContentType.objects.filter(app_label='materia') + perms_materia = list(Permission.objects.filter(content_type__in=cts)) + for p in perms_materia: + lista_permissoes.append('materia.' + p.codename) + except: + pass return set(lista_permissoes) def permissoes_comissoes(): lista_permissoes = [] - cts = ContentType.objects.filter(app_label='comissoes') - perms_comissoes = list(Permission.objects.filter(content_type__in=cts)) - for p in perms_comissoes: - lista_permissoes.append('comissoes.' + p.codename) + try: + cts = ContentType.objects.filter(app_label='comissoes') + perms_comissoes = list(Permission.objects.filter(content_type__in=cts)) + for p in perms_comissoes: + lista_permissoes.append('comissoes.' + p.codename) + except: + pass return set(lista_permissoes) def permissoes_norma(): lista_permissoes = [] - cts = ContentType.objects.filter(app_label='norma') - perms_norma = list(Permission.objects.filter(content_type__in=cts)) - for p in perms_norma: - lista_permissoes.append('norma.' + p.codename) + try: + cts = ContentType.objects.filter(app_label='norma') + perms_norma = list(Permission.objects.filter(content_type__in=cts)) + for p in perms_norma: + lista_permissoes.append('norma.' + p.codename) + except: + pass return set(lista_permissoes) def permissoes_parlamentares(): lista_permissoes = [] - cts = ContentType.objects.filter(app_label='parlamentares') - perms_parlamentares = list(Permission.objects.filter(content_type__in=cts)) - for p in perms_parlamentares: - lista_permissoes.append('parlamentares.' + p.codename) + try: + cts = ContentType.objects.filter(app_label='parlamentares') + perms_parlamentares = list(Permission.objects.filter(content_type__in=cts)) + for p in perms_parlamentares: + lista_permissoes.append('parlamentares.' + p.codename) + except: + pass return set(lista_permissoes) def permissoes_protocoloadm(): lista_permissoes = [] - perms_protocolo = Permission.objects.filter( - group__name='Operador de Protocolo Administrativo') - for p in perms_protocolo: - lista_permissoes.append('protocoloadm.' + p.codename) + try: + perms_protocolo = Permission.objects.filter( + group__name='Operador de Protocolo Administrativo') + for p in perms_protocolo: + lista_permissoes.append('protocoloadm.' + p.codename) + except: + pass return set(lista_permissoes) def permissoes_adm(): lista_permissoes = [] - perms_adm = Permission.objects.filter( - group__name='Operador Administrativo') - for p in perms_adm: - lista_permissoes.append('protocoloadm.' + p.codename) + try: + perms_adm = Permission.objects.filter( + group__name='Operador Administrativo') + for p in perms_adm: + lista_permissoes.append('protocoloadm.' + p.codename) + except: + pass return set(lista_permissoes) def permissoes_sessao(): lista_permissoes = [] - perms_sessao = list(Permission.objects.filter( - group__name='Operador de Sessão Plenária')) - for p in perms_sessao: - lista_permissoes.append('sessao.' + p.codename) + try: + perms_sessao = list(Permission.objects.filter( + group__name='Operador de Sessão Plenária')) + for p in perms_sessao: + lista_permissoes.append('sessao.' + p.codename) + except: + pass return set(lista_permissoes) def permissoes_painel(): lista_permissoes = [] - perms_painel = list(Permission.objects.filter( - group__name='Operador de Painel Eletrônico')) - for p in perms_painel: - lista_permissoes.append('painel.' + p.codename) + try: + perms_painel = list(Permission.objects.filter( + group__name='Operador de Painel Eletrônico')) + for p in perms_painel: + lista_permissoes.append('painel.' + p.codename) + except: + pass return set(lista_permissoes) @@ -304,10 +328,13 @@ def permissao_tb_aux(self): def permissoes_autor(): lista_permissoes = [] - perms_autor = list(Permission.objects.filter( - group__name='Autor')) - for p in perms_autor: - lista_permissoes.append('materia.' + p.codename) + try: + perms_autor = list(Permission.objects.filter( + group__name='Autor')) + for p in perms_autor: + lista_permissoes.append('materia.' + p.codename) + except: + pass return set(lista_permissoes) From cf667dd4e5adab2915a2ac628022982e8510ff5c Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 24 Aug 2016 17:25:51 -0300 Subject: [PATCH 03/12] =?UTF-8?q?Ajustes=20proposi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/views.py | 2 +- sapl/templates/base.html | 2 +- sapl/templates/materia/proposicao_detail.html | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index c6c00dd8a..f31d53a65 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -397,7 +397,7 @@ class ProposicaoCrud(Crud): def get_initial(self): try: - autor_id = Autor.objects.get(user=self.request.user.id).id + autor_id = Autor.objects.get(id=self.request.user.id).id except MultipleObjectsReturned: msg = _('Este usuário está relacionado a mais de um autor. ' + 'Operação cancelada') diff --git a/sapl/templates/base.html b/sapl/templates/base.html index cec533fc0..b02ab96e2 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -62,7 +62,7 @@
  • Receber Proposições
    • {#
  • Protocolo Geral
    • #} - {#
  • Proposições
    • #} + {#
  • Proposições
    • #} diff --git a/sapl/templates/materia/proposicao_detail.html b/sapl/templates/materia/proposicao_detail.html index e2963f548..65f7c370b 100644 --- a/sapl/templates/materia/proposicao_detail.html +++ b/sapl/templates/materia/proposicao_detail.html @@ -4,7 +4,6 @@ {% block actions %}
    -<<<<<<< HEAD {% if proposicao.data_envio %} {% if perms|get_change_perm:view %} {% trans 'Editar Proposição' %} From b1e7f03e8ebdd8c09adbaba8d74bacbc38f76dac Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 10:52:57 -0300 Subject: [PATCH 04/12] =?UTF-8?q?Conserta=20adi=C3=A7=C3=A3o/evio=20de=20p?= =?UTF-8?q?ropopi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/forms.py | 4 ++-- sapl/materia/views.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 054854e54..8f18e23a5 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -100,8 +100,8 @@ class ProposicaoForm(ModelForm): return texto_original def clean_data_envio(self): - data_envio = self.cleaned_data.get('data_envio') - if (not data_envio) and bool(self.initial): + data_envio = self.cleaned_data.get('data_envio') or None + if (not data_envio) and len(self.initial) > 1: data_envio = datetime.now() return data_envio diff --git a/sapl/materia/views.py b/sapl/materia/views.py index f31d53a65..3deff9217 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -397,12 +397,18 @@ class ProposicaoCrud(Crud): def get_initial(self): try: - autor_id = Autor.objects.get(id=self.request.user.id).id + autor_id = Autor.objects.get(user=self.request.user).id except MultipleObjectsReturned: msg = _('Este usuário está relacionado a mais de um autor. ' + 'Operação cancelada') messages.add_message(self.request, messages.ERROR, msg) return redirect(self.get_success_url()) + except ObjectDoesNotExist: + autor_id = Autor.objects.create( + user=self.request.user, + nome=str(self.request.user), + tipo_id=4).id + return {'autor': autor_id} else: return {'autor': autor_id} From 402dd92a7fdf4390a67581328429ad793f5218ab Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 13:04:29 -0300 Subject: [PATCH 05/12] =?UTF-8?q?Fix=20detail/update=20proposi=C3=A7=C3=A3?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/forms.py | 5 ----- sapl/materia/views.py | 28 ++++++++++++---------------- sapl/templates/materia/layouts.yaml | 3 ++- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 8f18e23a5..8351cac05 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -111,8 +111,6 @@ class ProposicaoForm(ModelForm): if cleaned_data['tipo'].descricao == 'Parecer': if self.instance.materia: cleaned_data['materia'] = self.instance.materia - cleaned_data['autor'] = ( - self.instance.materia.autoria_set.first().autor) else: try: materia = MateriaLegislativa.objects.get( @@ -124,9 +122,6 @@ class ProposicaoForm(ModelForm): raise ValidationError(msg) else: cleaned_data['materia'] = materia - cleaned_data['autor'] = materia.autoria_set.first( - ).autor - return cleaned_data def save(self, commit=False): diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 3deff9217..0800a56c2 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -404,10 +404,13 @@ class ProposicaoCrud(Crud): messages.add_message(self.request, messages.ERROR, msg) return redirect(self.get_success_url()) except ObjectDoesNotExist: + # FIXME: Pensar em uma melhor forma + tipo = TipoAutor.objects.get(name='Externo') + autor_id = Autor.objects.create( user=self.request.user, nome=str(self.request.user), - tipo_id=4).id + tipo=tipo).id return {'autor': autor_id} else: return {'autor': autor_id} @@ -416,6 +419,14 @@ class ProposicaoCrud(Crud): form_class = ProposicaoForm permission_required = permissoes_autor() + def get_initial(self): + initial = self.initial.copy() + if self.object.materia: + initial['tipo_materia'] = self.object.materia.tipo.id + initial['numero_materia'] = self.object.materia.numero + initial['ano_materia'] = self.object.materia.ano + return initial + @property def layout_key(self): return 'ProposicaoCreate' @@ -442,21 +453,6 @@ class ProposicaoCrud(Crud): class DetailView(PermissionRequiredMixin, CrudDetailView): permission_required = permissoes_autor() - def get_context_data(self, **kwargs): - context = super(DetailView, self).get_context_data(**kwargs) - if self.object.materia: - context['form'].fields['tipo_materia'].initial = ( - self.object.materia.tipo.id) - context['form'].fields['numero_materia'].initial = ( - self.object.materia.numero) - context['form'].fields['ano_materia'].initial = ( - self.object.materia.ano) - return context - - @property - def layout_key(self): - return 'ProposicaoCreate' - def has_permission(self): perms = self.get_permission_required() if self.request.user.has_perms(perms): diff --git a/sapl/templates/materia/layouts.yaml b/sapl/templates/materia/layouts.yaml index 49e201711..19c5fcdbd 100644 --- a/sapl/templates/materia/layouts.yaml +++ b/sapl/templates/materia/layouts.yaml @@ -98,7 +98,8 @@ ProposicaoCreate: {% trans 'Proposição' %}: - tipo data_envio - descricao - + {% trans 'Materia' %}: + - tipo_materia numero_materia ano_materia {% trans 'Complemento' %}: - texto_original From 24648662f6597f9e060351bbd1da8baea303bf48 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 13:25:33 -0300 Subject: [PATCH 06/12] Atualiza debug toolbar para 1.5 --- requirements/dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 9d8174f64..89b119a7f 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,7 +1,7 @@ -r test-requirements.txt autopep8==1.2.4 beautifulsoup4==4.4.1 -django-debug-toolbar==1.4 +django-debug-toolbar==1.5 ipdb==0.10.1 pip-review==0.4 pygraphviz==1.3.1 From eb31e3e43139abdd0f0659e05779a12ff346a755 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 13:37:31 -0300 Subject: [PATCH 07/12] =?UTF-8?q?Some=20bot=C3=B5es=20de=20edi=C3=A7=C3=A3?= =?UTF-8?q?o/exclus=C3=A3o=20caso=20proposi=C3=A7=C3=A3o=20tenha=20sido=20?= =?UTF-8?q?recebida?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/templates/materia/proposicao_detail.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sapl/templates/materia/proposicao_detail.html b/sapl/templates/materia/proposicao_detail.html index 65f7c370b..9a2057609 100644 --- a/sapl/templates/materia/proposicao_detail.html +++ b/sapl/templates/materia/proposicao_detail.html @@ -5,20 +5,20 @@ {% block actions %}
    {% if proposicao.data_envio %} - {% if perms|get_change_perm:view %} + {% if perms|get_change_perm:view and not object.data_recebimento %} {% trans 'Editar Proposição' %} {% endif %} - {% if perms|get_delete_perm:view %} + {% if perms|get_delete_perm:view and not object.data_recebimento %} {% trans 'Retornar Proposição Enviada' %} {% endif %} {% else %} - {% if perms|get_change_perm:view %} + {% if perms|get_change_perm:view and not object.data_recebimento %} {% trans 'Enviar/Editar Proposição' %} {% endif %} - {% if perms|get_delete_perm:view %} + {% if perms|get_delete_perm:view and not object.data_recebimento %} {% trans 'Excluir Proposição' %} {% endif %} {% endif %} From 2c59c34d48541a8b8f807f3e58d919a58618db40 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 13:48:17 -0300 Subject: [PATCH 08/12] =?UTF-8?q?Fix=20permiss=C3=A3o=20para=20deletar=20p?= =?UTF-8?q?roposi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 0800a56c2..f5aefc62c 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -490,7 +490,7 @@ class ProposicaoCrud(Crud): return lista class DeleteView(PermissionRequiredMixin, CrudDeleteView): - permission_required = permissoes_materia() + permission_required = {'materia.delete_proposicao'} def delete(self, request, *args, **kwargs): proposicao = Proposicao.objects.get(id=self.kwargs['pk']) From 8c79d99b57f619974305518d406e37c0088d0c89 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 15:04:40 -0300 Subject: [PATCH 09/12] Adiciona template base para relatorios --- sapl/base/urls.py | 2 ++ sapl/templates/base/relatorios_list.html | 42 ++++++++++++++++++++++++ sapl/templates/index.html | 2 +- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 sapl/templates/base/relatorios_list.html diff --git a/sapl/base/urls.py b/sapl/base/urls.py index 05b977ffc..6108036ab 100644 --- a/sapl/base/urls.py +++ b/sapl/base/urls.py @@ -12,6 +12,8 @@ app_name = AppConfig.name urlpatterns = [ url(r'^sistema/', TemplateView.as_view(template_name='sistema.html')), url(r'^ajuda/', TemplateView.as_view(template_name='ajuda.html')), + url(r'^relatorios/', TemplateView.as_view( + template_name='base/relatorios_list.html')), url(r'^ajuda/(?P\w+)$', HelpView.as_view(), name='help_topic'), url(r'^ajuda/', TemplateView.as_view(template_name='ajuda/index.html'), name='help_base'), diff --git a/sapl/templates/base/relatorios_list.html b/sapl/templates/base/relatorios_list.html new file mode 100644 index 000000000..b4ffc0da3 --- /dev/null +++ b/sapl/templates/base/relatorios_list.html @@ -0,0 +1,42 @@ +{% extends "base.html" %} +{% load i18n crispy_forms_tags %} + +{% block base_content %} +
    + Relatórios Administrativos + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TítuloDescrição
    Matérias em tramitaçãoMatérias Legislativas por Ano, Tipo, Local atual e Status da Tramitação informados.
    Proposituras por Tipo, Autor e AnoNúmero de matérias legislativas, agrupadas por Tipo e Autor e Ano selecionado.
    Proposituras por AutorResumo de Proposituras de um determinado ano, agrupadas por Autor.
    Presença nas sessõesPresença dos parlamentares nas sessões plenárias.
    AtasMatérias Legislativas por Ano, Tipo, Local atual e Status da Tramitação informados.
    Histórico de tramitaçõesHistórico de tramitações por período e local informados.
    +
    - +
    From 745cb4dc912f4a0aa28c04cdb3c72694184601c3 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 15:17:27 -0300 Subject: [PATCH 10/12] Fix relatorio pauta --- sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py | 8 ++++---- sapl/relatorios/views.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py index 13b3ae8c5..54cf0be69 100644 --- a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py +++ b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py @@ -13,8 +13,8 @@ def cabecalho(inf_basicas_dic, imagem): """ """ tmp = '' - tmp += '\t\t\t\t\n' + # tmp += '\t\t\t\t\n' tmp += '\t\t\t\t2cm 25.4cm 19cm 25.4cm\n' tmp += '\t\t\t\t\n' tmp += '\t\t\t\t' + \ @@ -235,8 +235,8 @@ def votacao(lst_votacao): txt_ementa = votacao['txt_ementa'].replace('&', '&') tmp += '' + txt_ementa + '\n' tmp += '' + \ - votacao['nom_resultado'] + '\n' + '' + \ - votacao['votacao_observacao'] + '\n' + str(votacao['nom_resultado']) + '\n' + '' + \ + str(votacao['votacao_observacao']) + '\n' tmp += '\t\t\n' return tmp diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index 29b05bade..72dbd9797 100644 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -564,7 +564,8 @@ def get_sessao_plenaria(sessao, casa): materia=expediente_materia.materia).first() if numeracao is not None: dic_expediente_materia["des_numeracao"] = ( - str(numeracao.numero) + '/' + str(numeracao.ano)) + str(numeracao.numero_materia) + '/' + str( + numeracao.ano_materia)) dic_expediente_materia["des_turno"] = ' ' tram = Tramitacao.objects.filter( From d95b5674232b908ffecfcd0a804640c612a8ea62 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 15:53:15 -0300 Subject: [PATCH 11/12] =?UTF-8?q?Fix=20caminho=20de=20logo=20padr=C3=A3o?= =?UTF-8?q?=20no=20relatorio=20de=20pauta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py | 4 ++-- sapl/relatorios/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py index 54cf0be69..3dcb87cee 100644 --- a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py +++ b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py @@ -13,8 +13,8 @@ def cabecalho(inf_basicas_dic, imagem): """ """ tmp = '' - # tmp += '\t\t\t\t\n' + tmp += '\t\t\t\t\n' tmp += '\t\t\t\t2cm 25.4cm 19cm 25.4cm\n' tmp += '\t\t\t\t\n' tmp += '\t\t\t\t' + \ diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index 72dbd9797..69fad9d7d 100644 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -16,6 +16,7 @@ from sapl.sessao.models import (ExpedienteMateria, ExpedienteSessao, Orador, OradorExpediente, OrdemDia, PresencaOrdemDia, RegistroVotacao, SessaoPlenaria, SessaoPlenariaPresenca, TipoExpediente) +from sapl.settings import STATIC_ROOT from sapl.utils import UF from .templates import (pdf_capa_processo_gerar, @@ -49,12 +50,11 @@ def get_cabecalho(casa): def get_imagem(casa): - if casa.logotipo: return casa.logotipo.path else: # TODO: recuperar de uma variavel de sistema - return 'static/img/brasao_transp.gif' + return STATIC_ROOT + '/img/brasao_transp.gif' def get_rodape(casa): From 386628c2fefe9adc89b9fd5c09d808352fb62698 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 25 Aug 2016 16:00:44 -0300 Subject: [PATCH 12/12] Fix qa --- sapl/base/urls.py | 2 +- sapl/materia/tests/test_materia.py | 12 +++++------- sapl/materia/urls.py | 3 ++- sapl/materia/views.py | 3 +-- sapl/parlamentares/views.py | 5 ++--- sapl/protocoloadm/views.py | 7 +++---- sapl/relatorios/views.py | 1 - sapl/sessao/forms.py | 2 +- sapl/sessao/urls.py | 9 ++++----- sapl/sessao/views.py | 13 +++++-------- sapl/utils.py | 3 ++- 11 files changed, 26 insertions(+), 34 deletions(-) diff --git a/sapl/base/urls.py b/sapl/base/urls.py index 6108036ab..03b5b4eb3 100644 --- a/sapl/base/urls.py +++ b/sapl/base/urls.py @@ -4,7 +4,7 @@ from django.views.generic.base import TemplateView from .apps import AppConfig from .forms import LoginForm -from .views import CasaLegislativaCrud, HelpView, SistemaView +from .views import CasaLegislativaCrud, HelpView app_name = AppConfig.name diff --git a/sapl/materia/tests/test_materia.py b/sapl/materia/tests/test_materia.py index b8ad79280..f400a453e 100644 --- a/sapl/materia/tests/test_materia.py +++ b/sapl/materia/tests/test_materia.py @@ -1,18 +1,16 @@ import pytest - from django.contrib.auth.models import User from django.core.files.uploadedfile import SimpleUploadedFile from django.core.urlresolvers import reverse - from model_mommy import mommy + from sapl.comissoes.models import Comissao, TipoComissao from sapl.materia.models import (Anexada, Autor, Autoria, DespachoInicial, DocumentoAcessorio, MateriaLegislativa, - Numeracao, Proposicao, - RegimeTramitacao, StatusTramitacao, - TipoAutor, TipoProposicao, TipoDocumento, - TipoMateriaLegislativa, Tramitacao, - UnidadeTramitacao) + Numeracao, Proposicao, RegimeTramitacao, + StatusTramitacao, TipoAutor, TipoDocumento, + TipoMateriaLegislativa, TipoProposicao, + Tramitacao, UnidadeTramitacao) from sapl.norma.models import (LegislacaoCitada, NormaJuridica, TipoNormaJuridica) diff --git a/sapl/materia/urls.py b/sapl/materia/urls.py index 39d02776e..a0584d94d 100644 --- a/sapl/materia/urls.py +++ b/sapl/materia/urls.py @@ -34,7 +34,8 @@ urlpatterns = [ RelatoriaCrud.get_urls() + DocumentoAcessorioCrud.get_urls())), - url(r'^confirmar/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', + url(r'''^confirmar/(?P[0-9A-Za-z_\-]+)/ + (?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$''', ConfirmarEmailView.as_view(), name='confirmar_email'), url(r'^proposicao/', include(ProposicaoCrud.get_urls())), diff --git a/sapl/materia/views.py b/sapl/materia/views.py index f5aefc62c..35f4eef50 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -18,8 +18,7 @@ from django.template import Context, loader from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode from django.utils.translation import ugettext_lazy as _ -from django.views.generic import (CreateView, DetailView, ListView, - TemplateView, UpdateView) +from django.views.generic import CreateView, ListView, TemplateView, UpdateView from django_filters.views import FilterView from sapl.base.models import CasaLegislativa diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index 93e49f120..e104cb91f 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -2,7 +2,6 @@ from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.core.urlresolvers import reverse_lazy from django.shortcuts import redirect from django.utils.datastructures import MultiValueDictKeyError @@ -10,8 +9,8 @@ from django.utils.translation import ugettext_lazy as _ from django.views.generic import FormView from sapl.crud.base import (Crud, CrudBaseMixin, CrudCreateView, - CrudDeleteView, CrudDetailView, - CrudListView, CrudUpdateView) + CrudDeleteView, CrudDetailView, CrudListView, + CrudUpdateView) from sapl.crud.masterdetail import MasterDetailCrud from sapl.utils import permissao_tb_aux, permissoes_parlamentares diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index ca549aba3..c6595f5fc 100644 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -24,10 +24,9 @@ from sapl.utils import (create_barcode, get_client_ip, permissoes_adm, from .forms import (AnularProcoloAdmForm, DocumentoAcessorioAdministrativoForm, DocumentoAdministrativoFilterSet, - DocumentoAdministrativoForm, - ProtocoloDocumentForm, ProtocoloFilterSet, - ProtocoloMateriaForm, TramitacaoAdmEditForm, - TramitacaoAdmForm) + DocumentoAdministrativoForm, ProtocoloDocumentForm, + ProtocoloFilterSet, ProtocoloMateriaForm, + TramitacaoAdmEditForm, TramitacaoAdmForm) from .models import (Autor, DocumentoAcessorioAdministrativo, DocumentoAdministrativo, Protocolo, StatusTramitacaoAdministrativo, diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index 69fad9d7d..3578d6ec3 100644 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -53,7 +53,6 @@ def get_imagem(casa): if casa.logotipo: return casa.logotipo.path else: - # TODO: recuperar de uma variavel de sistema return STATIC_ROOT + '/img/brasao_transp.gif' diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 6de9c622f..8b5845de2 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -13,7 +13,7 @@ from sapl.materia.forms import MateriaLegislativaFilterSet from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa from sapl.utils import RANGE_DIAS_MES, RANGE_MESES, autor_label, autor_modal -from .models import Bancada, ExpedienteMateria, SessaoPlenaria, OrdemDia +from .models import Bancada, ExpedienteMateria, OrdemDia, SessaoPlenaria def pega_anos(): diff --git a/sapl/sessao/urls.py b/sapl/sessao/urls.py index a6b427628..0c1a5c424 100644 --- a/sapl/sessao/urls.py +++ b/sapl/sessao/urls.py @@ -1,11 +1,10 @@ from django.conf.urls import include, url from sapl.sessao.views import (AdicionarVariasMateriasExpediente, - AdicionarVariasMateriasOrdemDia, - BancadaCrud, CargoBancadaCrud, - ExpedienteMateriaCrud, ExpedienteView, - MateriaOrdemDiaCrud, MesaView, OradorCrud, - OradorExpedienteCrud, PainelView, + AdicionarVariasMateriasOrdemDia, BancadaCrud, + CargoBancadaCrud, ExpedienteMateriaCrud, + ExpedienteView, MateriaOrdemDiaCrud, MesaView, + OradorCrud, OradorExpedienteCrud, PainelView, PautaExpedienteDetail, PautaOrdemDetail, PautaSessaoDetailView, PautaSessaoListView, PesquisarSessaoPlenariaView, diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 8faef90f2..831c28b96 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -10,7 +10,7 @@ from django.http.response import HttpResponseRedirect from django.utils.datastructures import MultiValueDictKeyError from django.utils.html import strip_tags from django.utils.translation import ugettext_lazy as _ -from django.views.generic import FormView, ListView, TemplateView +from django.views.generic import ListView, TemplateView from django.views.generic.edit import FormMixin from django_filters.views import FilterView from rest_framework import generics @@ -20,18 +20,16 @@ from sapl.crud.base import (Crud, CrudBaseMixin, CrudCreateView, CrudUpdateView, make_pagination) from sapl.crud.masterdetail import MasterDetailCrud from sapl.materia.forms import pega_ultima_tramitacao -from sapl.materia.models import (Autoria, DocumentoAcessorio, - TipoMateriaLegislativa, Tramitacao) +from sapl.materia.models import Autoria, DocumentoAcessorio, Tramitacao from sapl.materia.views import MateriaLegislativaPesquisaView from sapl.norma.models import NormaJuridica from sapl.parlamentares.models import Parlamentar from sapl.sessao.serializers import SessaoPlenariaSerializer from sapl.utils import permissao_tb_aux, permissoes_painel, permissoes_sessao -from .forms import (AdicionarVariasMateriasFilterSet, - BancadaForm, ExpedienteForm, ExpedienteMateriaForm, - ListMateriaForm, MesaForm, - OrdemDiaForm, PresencaForm, +from .forms import (AdicionarVariasMateriasFilterSet, BancadaForm, + ExpedienteForm, ExpedienteMateriaForm, ListMateriaForm, + MesaForm, OrdemDiaForm, PresencaForm, SessaoPlenariaFilterSet, VotacaoEditForm, VotacaoForm, VotacaoNominalForm) from .models import (Bancada, CargoBancada, CargoMesa, ExpedienteMateria, @@ -2059,7 +2057,6 @@ class AdicionarVariasMateriasExpediente(MateriaLegislativaPesquisaView): return kwargs def get_context_data(self, **kwargs): - # import ipdb; ipdb.set_trace() context = super(MateriaLegislativaPesquisaView, self).get_context_data(**kwargs) diff --git a/sapl/utils.py b/sapl/utils.py index f7cbd2fa9..34aa2ce8c 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -262,7 +262,8 @@ def permissoes_parlamentares(): lista_permissoes = [] try: cts = ContentType.objects.filter(app_label='parlamentares') - perms_parlamentares = list(Permission.objects.filter(content_type__in=cts)) + perms_parlamentares = list(Permission.objects.filter( + content_type__in=cts)) for p in perms_parlamentares: lista_permissoes.append('parlamentares.' + p.codename) except: