From 4e05de55848986217b244c79b24102b1c6faed5d Mon Sep 17 00:00:00 2001 From: ulyssesBML Date: Mon, 18 Feb 2019 15:19:29 -0300 Subject: [PATCH] Gerar e aprimorar pdf de extrato MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Colocando nome completo nos extratos e acresentando cargos nas assinaturas. Fix #2514 Fix #2506 Refatorando classe ResumoView (extraindo metodos) Adicionando testes a refatoração feita na classe ResumoView Iniciando a geração do pdf de extrato da reunião Aprimorando relatorio do extrato da reunião; Fix #2514 Colocando numero de votos Arrumando header e tabelas do relatorio de extrato Colocando rodape no documento de extrato Melhorando formatação da documentação de extrato de reunião Melhorando assinaturas e removendo codigo morto Adicionando nome de parlaentares nos votos nominais Fix #2514 Fix #2502 Fix #2506 --- sapl/relatorios/views.py | 3 +-- sapl/static/sapl/css/header-relatorio.css | 5 +++++ sapl/templates/relatorios/header_ata.html | 2 ++ sapl/templates/relatorios/relatorio_ata.html | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index c7fb91eb2..0527c1cde 100755 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -1224,7 +1224,6 @@ def make_pdf(base_url,main_template,header_template,main_css='',header_css=''): # Template of header html = HTML(base_url=base_url,string=header_template) header = html.render(stylesheets=[CSS(string='@page {size:A4; margin:1cm;}')]) - header_page = header.pages[0] header_body = get_page_body(header_page._page_box.all_children()) header_body = header_body.copy_with_children(header_body.all_children()) @@ -1259,12 +1258,12 @@ def resumo_ata_pdf(request,pk): context.update({'object':sessao_plenaria}) context.update({'data': dt.today().strftime('%d/%m/%Y')}) context.update({'rodape':rodape}) - header_context = {"casa":casa, 'logotipo':casa.logotipo, 'MEDIA_URL': MEDIA_URL} html_template = render_to_string('relatorios/relatorio_ata.html',context) html_header = render_to_string('relatorios/header_ata.html', header_context) + pdf_file = make_pdf(base_url=base_url,main_template=html_template,header_template=html_header) response = HttpResponse(content_type='application/pdf;') diff --git a/sapl/static/sapl/css/header-relatorio.css b/sapl/static/sapl/css/header-relatorio.css index e7cbea992..31dc2b0f4 100644 --- a/sapl/static/sapl/css/header-relatorio.css +++ b/sapl/static/sapl/css/header-relatorio.css @@ -43,4 +43,9 @@ ul { html body section dt img { max-width:80px; margin-left: 20px; + margin-left: 50px; +} +h3 { + font-size: 12pt; + color: #6e6e6e; } \ No newline at end of file diff --git a/sapl/templates/relatorios/header_ata.html b/sapl/templates/relatorios/header_ata.html index 494d2c60b..e5351eb28 100644 --- a/sapl/templates/relatorios/header_ata.html +++ b/sapl/templates/relatorios/header_ata.html @@ -1,6 +1,7 @@ {% load common_tags %} {% load render_bundle from webpack_loader %} {% load webpack_static from webpack_loader %} + {% load static %} @@ -21,6 +22,7 @@ diff --git a/sapl/templates/relatorios/relatorio_ata.html b/sapl/templates/relatorios/relatorio_ata.html index 7c119d249..c80cfd110 100644 --- a/sapl/templates/relatorios/relatorio_ata.html +++ b/sapl/templates/relatorios/relatorio_ata.html @@ -50,6 +50,7 @@
+ {{texto_assinatura}}