From 1fa81a3a2deea0ec1e30d6b106773e6f2521e8fd Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 25 Nov 2015 14:24:08 -0200 Subject: [PATCH] Fix QA Tests --- barcode.gif | Bin 0 -> 4591 bytes barcode.pdf | 57 ++++++++++++++++++++++++++++ barcode.py | 10 +++-- comissoes/urls.py | 10 +++-- comissoes/views.py | 4 +- materia/urls.py | 1 + materia/views.py | 83 +++++++++++++++++++++++------------------ painel/urls.py | 7 ++-- painel/views.py | 9 +++-- parlamentares/urls.py | 1 + parlamentares/views.py | 15 +++++--- protocoloadm/urls.py | 5 +-- protocoloadm/views.py | 8 ++-- sapl/settings.py | 2 +- sapl/urls.py | 2 +- 15 files changed, 146 insertions(+), 68 deletions(-) create mode 100644 barcode.gif create mode 100644 barcode.pdf diff --git a/barcode.gif b/barcode.gif new file mode 100644 index 0000000000000000000000000000000000000000..0f308fd8e317ff4432e5232264dc69f36a815585 GIT binary patch literal 4591 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 +endobj +2 0 obj +<< /BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font >> +endobj +3 0 obj +<< /BaseFont /Times-Roman /Encoding /WinAnsiEncoding /Name /F2 /Subtype /Type1 /Type /Font >> +endobj +4 0 obj +<< /BaseFont /Courier /Encoding /WinAnsiEncoding /Name /F3 /Subtype /Type1 /Type /Font >> +endobj +5 0 obj +<< /Contents 9 0 R /MediaBox [ 0 0 120.24 38.82282 ] /Parent 8 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans << >> + /Type /Page >> +endobj +6 0 obj +<< /Outlines 10 0 R /PageMode /UseNone /Pages 8 0 R /Type /Catalog >> +endobj +7 0 obj +<< /Author (anonymous) /CreationDate (D:20151119124244+03'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (unspecified) + /Title () >> +endobj +8 0 obj +<< /Count 1 /Kids [ 5 0 R ] /Type /Pages >> +endobj +9 0 obj +<< /Filter [ /ASCII85Decode /FlateDecode ] /Length 541 >> +stream +Gatn&btGr>&B4*hr"!kuK&b/EAj+s;p^%h%Xfb-rX(A*lXP)l0#H*>!=YX1fD;LY7i6rtC7h?\t7DFrj@;qKI)X/l!+13?l)O&%h-V*A,5Q&Ma/W`318;l]4]CW_1Hm;TF\qfSja7sW[Zo&u5Rp+a)HrQa$QdVJ)eBUFc67=DK]D%0]F2R2ki#MQo?VQT%d`VY,Y^5IZ??@trj.4cirOiSND?K&p(?c5S*!Yo^F4m^2n%X9Ld,9BJ>PY_s)g#/P`a!&7#1ni^i2lP/%sU?MS\`!]'p'X,kefT0tI-=B25/aQ!$`M7:7>!/(imA;Y;d]a1j8nY%86t).o&j6W8ZG^AL:;p\!at;D*;N$FJG:F.O"3;hGa9PmgFnRut`hPs*r@SGY_kX^[!B(JkmUCDqS@HV[t`isO2c%%FE(Ptl>=*/4=]:67rN#lShpA1;j'm5^<1`q4HY!)kArHp*~>endstream +endobj +10 0 obj +<< /Count 0 /Type /Outlines >> +endobj +xref +0 11 +0000000000 65535 f +0000000075 00000 n +0000000129 00000 n +0000000239 00000 n +0000000351 00000 n +0000000459 00000 n +0000000664 00000 n +0000000752 00000 n +0000000993 00000 n +0000001055 00000 n +0000001691 00000 n +trailer +<< /ID + % ReportLab generated PDF document -- digest (http://www.reportlab.com) + [(\014\3360\267W\316\\\362\367\200\213i0\214le) (\014\3360\267W\316\\\362\367\200\213i0\214le)] + /Info 7 0 R /Root 6 0 R /Size 11 >> +startxref +1741 +%%EOF diff --git a/barcode.py b/barcode.py index bfa265e73..fd879c8f9 100644 --- a/barcode.py +++ b/barcode.py @@ -1,14 +1,16 @@ -from reportlab.lib.units import mm from reportlab.graphics.barcode import createBarcodeDrawing -from reportlab.graphics.shapes import Drawing, String -from reportlab.graphics.charts.barcharts import HorizontalBarChart +from reportlab.graphics.shapes import Drawing +from reportlab.lib.units import mm class BarcodeDrawing(Drawing): def __init__(self, text_value, *args, **kw): barcode = createBarcodeDrawing( - 'Code128', value=text_value, barHeight=10 * mm, humanReadable=True) + 'Code128', + value=text_value, + barHeight=10 * mm, + humanReadable=True) Drawing.__init__(self, barcode.width, barcode.height, *args, **kw) self.add(barcode, name='barcode') diff --git a/comissoes/urls.py b/comissoes/urls.py index 344055628..452d52588 100644 --- a/comissoes/urls.py +++ b/comissoes/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import include, url -from comissoes.views import (ComissaoParlamentarIncluirView, ComposicaoView, - ComissaoParlamentarEditView, +from comissoes.views import (ComissaoParlamentarEditView, + ComissaoParlamentarIncluirView, ComposicaoView, MateriasView, ReunioesView, cargo_crud, comissao_crud, periodo_composicao_crud, tipo_comissao_crud) @@ -10,9 +10,11 @@ comissao_url_patterns = comissao_crud.urlpatterns + [ url(r'^(?P\d+)/composicao$', ComposicaoView.as_view(), name='composicao'), url(r'^(?P\d+)/composicao/(?P\d+)/parlamentar$', - ComissaoParlamentarIncluirView.as_view(), name='comissao_parlamentar'), + ComissaoParlamentarIncluirView.as_view(), + name='comissao_parlamentar'), url(r'^(?P\d+)/composicao/parlamentar/(?P\d+)/edit$', - ComissaoParlamentarEditView.as_view(), name='comissao_parlamentar_edit'), + ComissaoParlamentarEditView.as_view(), + name='comissao_parlamentar_edit'), url(r'^(?P\d+)/materias$', MateriasView.as_view(), name='materias'), url(r'^(?P\d+)/reunioes$', diff --git a/comissoes/views.py b/comissoes/views.py index d95f07b24..1c3b1254b 100644 --- a/comissoes/views.py +++ b/comissoes/views.py @@ -240,8 +240,8 @@ class ComissaoParlamentarEditView(FormMixin, GenericView): participacao = Participacao.objects.get(id=participacao_id) comissao = Comissao.objects.get(id=self.kwargs['pk']) form = ParticipacaoCadastroForm( - initial={'parlamentar_id': participacao.parlamentar.id}, instance=participacao) - print(form) + initial={'parlamentar_id': participacao.parlamentar.id}, + instance=participacao) return self.render_to_response({'form': form, 'comissao': comissao, 'composicao_id': self.kwargs['id']}) diff --git a/materia/urls.py b/materia/urls.py index 9fad29f2a..6670e8701 100644 --- a/materia/urls.py +++ b/materia/urls.py @@ -1,4 +1,5 @@ from django.conf.urls import include, url + from materia.views import (AutoriaEditView, AutoriaView, DespachoInicialEditView, DespachoInicialView, DocumentoAcessorioEditView, DocumentoAcessorioView, diff --git a/materia/views.py b/materia/views.py index 6ae633074..2789efedf 100644 --- a/materia/views.py +++ b/materia/views.py @@ -1,8 +1,6 @@ -from datetime import date, datetime +from datetime import date from re import sub -import sapl -from comissoes.models import Comissao, Composicao from crispy_forms.helper import FormHelper from crispy_forms.layout import (HTML, ButtonHolder, Column, Fieldset, Layout, Submit) @@ -14,11 +12,13 @@ from django.utils.html import strip_tags from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from django.views.generic import ListView -from django.views.generic.detail import SingleObjectMixin from django.views.generic.edit import FormMixin +from vanilla import GenericView + +import sapl +from comissoes.models import Comissao, Composicao from norma.models import LegislacaoCitada, NormaJuridica, TipoNormaJuridica from sapl.crud import build_crud -from vanilla import GenericView from .models import (Anexada, Autor, Autoria, DespachoInicial, DocumentoAcessorio, MateriaLegislativa, Numeracao, Orgao, @@ -284,7 +284,8 @@ class FormularioSimplificadoForm(ModelForm): Fieldset( 'Identificação Básica', HTML( - "
    "), + "
      "), HTML("
    • "), 'tipo', HTML("
      • "), @@ -296,7 +297,8 @@ class FormularioSimplificadoForm(ModelForm): HTML(""), HTML("
    "), HTML( - "
      "), + "
        "), HTML("
      • "), 'data_apresentacao', HTML("
        • "), @@ -308,19 +310,22 @@ class FormularioSimplificadoForm(ModelForm): HTML(""), HTML("
      "), HTML( - "
        "), + "
          "), HTML("
        • "), 'em_tramitacao', HTML("
          • "), HTML("
        "), HTML( - "
          "), + "
            "), HTML("
          • "), 'ementa', HTML("
            • "), HTML("
          "), HTML( - "
            "), + "
              "), HTML("
            • "), 'texto_original', HTML("
              • "), @@ -458,12 +463,6 @@ class FormularioCadastroView(FormMixin, GenericView): return reverse('formulario_cadastro') -def get_tipos_materia(): - return [('', 'Selecione')] \ - + [(t.id, t.sigla + ' - ' + t.descricao) - for t in TipoMateriaLegislativa.objects.all()] - - def get_tipos_documento(): return [('', 'Selecione')] \ + [(t.id, t.descricao) @@ -533,10 +532,11 @@ class MateriaAnexadaView(FormMixin, GenericView): error = 'A matéria a ser anexada não pode ser do mesmo \ tipo da matéria principal.' - return self.render_to_response({'error': error, - 'form': form, - 'materialegislativa': mat_principal, - 'anexadas': anexadas}) + return self.render_to_response( + {'error': error, + 'form': form, + 'materialegislativa': mat_principal, + 'anexadas': anexadas}) anexada = Anexada() anexada.materia_principal = mat_principal @@ -551,16 +551,18 @@ class MateriaAnexadaView(FormMixin, GenericView): except ObjectDoesNotExist: error = 'A matéria a ser anexada não existe no cadastro \ de matérias legislativas.' - return self.render_to_response({'error': error, - 'form': form, - 'materialegislativa': mat_principal, - 'anexadas': anexadas}) + return self.render_to_response( + {'error': error, + 'form': form, + 'materialegislativa': mat_principal, + 'anexadas': anexadas}) return self.form_valid(form) else: - return self.render_to_response({'form': form, - 'materialegislativa': mat_principal, - 'anexadas': anexadas}) + return self.render_to_response( + {'form': form, + 'materialegislativa': mat_principal, + 'anexadas': anexadas}) def get_success_url(self): pk = self.kwargs['pk'] @@ -637,13 +639,15 @@ class MateriaAnexadaEditView(FormMixin, GenericView): except ObjectDoesNotExist: error = 'A matéria a ser anexada não existe no cadastro \ de matérias legislativas.' - return self.render_to_response({'error': error, - 'form': form, - 'materialegislativa': mat_principal}) + return self.render_to_response( + {'error': error, + 'form': form, + 'materialegislativa': mat_principal}) else: - return self.render_to_response({'form': form, - 'materialegislativa': mat_principal}) + return self.render_to_response( + {'form': form, + 'materialegislativa': mat_principal}) def get_success_url(self): pk = self.kwargs['pk'] @@ -1394,7 +1398,8 @@ class TramitacaoForm(ModelForm): self.helper.layout = Layout( Fieldset('Incluir Tramitação', HTML( - "
                "), + "
                  "), HTML("
                • "), 'data_tramitacao', HTML("
                  • "), @@ -1403,7 +1408,8 @@ class TramitacaoForm(ModelForm): HTML(""), HTML("
                "), HTML( - "
                  "), + "
                    "), HTML("
                  • "), 'status', HTML("
                    • "), @@ -1415,13 +1421,15 @@ class TramitacaoForm(ModelForm): HTML(""), HTML("
                  "), HTML( - "
                    "), + "
                      "), HTML("
                    • "), 'unidade_tramitacao_destino', HTML("
                      • "), HTML("
                    "), HTML( - "
                      "), + "
                        "), HTML("
                      • "), 'data_encaminhamento', HTML("
                        • "), @@ -1433,7 +1441,8 @@ class TramitacaoForm(ModelForm): HTML(""), HTML("
                      "), HTML( - "
                        "), + "
                          "), HTML("
                        • "), 'texto', HTML("
                          • "), diff --git a/painel/urls.py b/painel/urls.py index 922b499a4..4b7e00bd5 100644 --- a/painel/urls.py +++ b/painel/urls.py @@ -1,8 +1,7 @@ -from django.conf.urls import include, url +from django.conf.urls import url -from .views import (controlador_painel, #cronometro_painel_crud, - cronometro_painel, - get_dados_painel, painel_mensagem_view, +from .views import controlador_painel # cronometro_painel_crud, +from .views import (cronometro_painel, get_dados_painel, painel_mensagem_view, painel_parlamentares_view, painel_view, painel_votacao_view) diff --git a/painel/views.py b/painel/views.py index 235a2db18..59d90ec98 100644 --- a/painel/views.py +++ b/painel/views.py @@ -45,6 +45,7 @@ def controlador_painel(request): context = {'painel': painel, 'PAINEL_TYPES': Painel.PAINEL_TYPES} return render(request, 'painel/controlador.html', context) + def painel_view(request, pk): context = {'head_title': 'Painel Plenário', 'sessao_id': pk} return render(request, 'painel/index.html', {'context': context}) @@ -61,12 +62,12 @@ def painel_parlamentares_view(request): def painel_votacao_view(request): return render(request, 'painel/votacao.html') -def cronometro_painel(request): - print(request.GET['tipo'] + ' ' + request.GET['action']); - request.session[request.GET['tipo']] = request.GET['action']; +def cronometro_painel(request): + request.session[request.GET['tipo']] = request.GET['action'] return HttpResponse({}) + def get_cronometro_status(request, name): try: cronometro = request.session[name] @@ -176,7 +177,7 @@ def get_dados_painel(request, pk): "tipo_resultado": tipo_resultado, "votos": votos, "cronometro_aparte": cronometro_aparte, - "cronometro_discurso": cronometro_discurso, + "cronometro_discurso": cronometro_discurso, "cronometro_ordem": cronometro_ordem, } diff --git a/parlamentares/urls.py b/parlamentares/urls.py index f8436f9bb..1ab125027 100644 --- a/parlamentares/urls.py +++ b/parlamentares/urls.py @@ -1,4 +1,5 @@ from django.conf.urls import include, url + from parlamentares.views import (ParlamentaresView, cargo_mesa_crud, coligacao_crud, legislatura_crud, nivel_instrucao_crud, parlamentar_crud, diff --git a/parlamentares/views.py b/parlamentares/views.py index cdeafe92a..8f3191651 100644 --- a/parlamentares/views.py +++ b/parlamentares/views.py @@ -1,15 +1,14 @@ from django import forms from django.utils.translation import ugettext_lazy as _ -from sapl.crud import build_crud from vanilla import GenericView -from django import forms + +from sapl.crud import build_crud from .models import (CargoMesa, Coligacao, Dependente, Filiacao, Legislatura, Mandato, NivelInstrucao, Parlamentar, Partido, SessaoLegislativa, SituacaoMilitar, TipoAfastamento, TipoDependente) - cargo_mesa_crud = build_crud( CargoMesa, 'cargo_mesa', [ @@ -48,6 +47,7 @@ partido_crud = build_crud( ('data_extincao', 2)]], ]) + dependente_crud = build_crud( Dependente, '', [ @@ -57,6 +57,7 @@ dependente_crud = build_crud( [('cpf', 4), ('rg', 4), ('titulo_eleitor', 4)]], ]) + sessao_legislativa_crud = build_crud( SessaoLegislativa, 'sessao_legislativa', [ @@ -69,6 +70,7 @@ sessao_legislativa_crud = build_crud( ('data_fim_intervalo', 2)]], ]) + parlamentar_crud = build_crud( Parlamentar, '', [ @@ -136,6 +138,7 @@ tipo_militar_crud = build_crud( [('descricao', 12)]], ]) + class ParlamentaresForm(forms.Form): periodo = forms.CharField() @@ -145,7 +148,8 @@ class ParlamentaresView(GenericView): def get(self, request, *args, **kwargs): form = ParlamentaresForm() - legislaturas = Legislatura.objects.all().order_by('-data_inicio','-data_fim') + legislaturas = Legislatura.objects.all().order_by( + '-data_inicio', '-data_fim') return self.render_to_response( {'legislaturas': legislaturas, 'legislatura_id': legislaturas.first().id, @@ -156,7 +160,8 @@ class ParlamentaresView(GenericView): def post(self, request, *args, **kwargs): form = ParlamentaresForm(request.POST) return self.render_to_response( - {'legislaturas': Legislatura.objects.all().order_by('-data_inicio','-data_fim'), + {'legislaturas': Legislatura.objects.all().order_by( + '-data_inicio', '-data_fim'), 'legislatura_id': int(form.data['periodo']), 'mandatos': Mandato.objects.all(), 'form': form, diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py index 8a8dfb97c..82f5f4281 100644 --- a/protocoloadm/urls.py +++ b/protocoloadm/urls.py @@ -4,9 +4,8 @@ from protocoloadm.views import (AnularProtocoloAdmView, DetailDocumentoAdministrativo, DocumentoAcessorioAdministrativoView, PesquisarDocumentoAdministrativo, - ProposicaoReceberView, ProposicaoView, - ProposicaoDetailView, - ProposicoesIncorporadasView, + ProposicaoDetailView, ProposicaoReceberView, + ProposicaoView, ProposicoesIncorporadasView, ProposicoesNaoIncorporadasView, ProposicoesNaoRecebidasView, ProtocoloDocumentoView, ProtocoloListView, diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 19f0b02fa..eb0bb754a 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -1,7 +1,6 @@ from datetime import date, datetime from re import sub -import sapl from crispy_forms.helper import FormHelper from crispy_forms.layout import ButtonHolder, Field, Fieldset, Layout, Submit from django import forms @@ -17,9 +16,11 @@ from django.utils.translation import ugettext_lazy as _ from django.views.generic import DetailView, ListView from django.views.generic.base import TemplateView from django.views.generic.edit import FormMixin +from vanilla import GenericView + +import sapl from materia.models import Proposicao, TipoMateriaLegislativa from sapl.crud import build_crud -from vanilla import GenericView from .models import (Autor, DocumentoAcessorioAdministrativo, DocumentoAdministrativo, Protocolo, @@ -428,7 +429,7 @@ class ProtocoloDocumentoView(FormMixin, GenericView): protocolo.numero_paginas = request.POST['num_paginas'] protocolo.observacao = sub( ' ', ' ', strip_tags(request.POST['observacao'])) - return self.form_valid(form) + return self.form_valid(form) else: return self.form_invalid(form) @@ -589,6 +590,7 @@ class ProposicaoSimpleForm(forms.Form): class ProposicaoView(TemplateView): template_name = "protocoloadm/proposicoes.html" + class ProposicaoDetailView(DetailView): template_name = "protocoloadm/proposicao_view.html" model = Proposicao diff --git a/sapl/settings.py b/sapl/settings.py index 96df29e84..52d0b2b53 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -119,7 +119,7 @@ USE_L10N = False USE_TZ = True # DATE_FORMAT = 'N j, Y' DATE_FORMAT = 'd/m/Y' -SHORT_DATE_FORMAT='d/m/Y' +SHORT_DATE_FORMAT = 'd/m/Y' DATE_INPUT_FORMATS = ('%d/%m/%Y', '%m-%d-%Y', '%Y-%m-%d') LOCALE_PATHS = ( diff --git a/sapl/urls.py b/sapl/urls.py index 721d356ce..0eb48d1cc 100644 --- a/sapl/urls.py +++ b/sapl/urls.py @@ -21,7 +21,7 @@ urlpatterns = [ url(r'^$', TemplateView.as_view(template_name='index.html')), url(r'^admin/', include(admin.site.urls)), - url(r'', include('comissoes.urls')), + url(r'', include('comissoes.urls')), url(r'', include('sessao.urls')), url(r'', include('parlamentares.urls')), url(r'', include('materia.urls')),