diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py
index 8d963b5b8..c7fb91eb2 100755
--- a/sapl/relatorios/views.py
+++ b/sapl/relatorios/views.py
@@ -10,6 +10,7 @@ from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from django.template.loader import render_to_string
+from sapl.settings import MEDIA_URL
from sapl.base.models import Autor, CasaLegislativa
from sapl.comissoes.models import Comissao
from sapl.materia.models import (Autoria, MateriaLegislativa, Numeracao,
@@ -1222,7 +1223,7 @@ 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='div {position: fixed; top: 0cm; left: 0cm;}')])
+ 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())
@@ -1256,21 +1257,19 @@ def resumo_ata_pdf(request,pk):
context.update(get_oradores_explicações_pessoais(sessao_plenaria))
context.update(get_ocorrencias_da_sessão(sessao_plenaria))
context.update({'object':sessao_plenaria})
- context.update({"data": dt.today().strftime('%d/%m/%Y')})
+ 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',{"casa":casa})
+ 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;')
response['Content-Disposition'] = 'inline; filename=relatorio.pdf'
response['Content-Transfer-Encoding'] = 'binary'
- with tempfile.NamedTemporaryFile(delete=True) as output:
- output.write(pdf_file)
- output.flush()
- output = open(output.name, 'rb')
- response.write(output.read())
+ response.write(pdf_file)
return response
\ No newline at end of file
diff --git a/sapl/static/sapl/css/header-relatorio.css b/sapl/static/sapl/css/header-relatorio.css
index 4e6241d2c..e7cbea992 100644
--- a/sapl/static/sapl/css/header-relatorio.css
+++ b/sapl/static/sapl/css/header-relatorio.css
@@ -3,6 +3,7 @@ html body p {
text-align: center;
font-size: 11pt;
padding: 5px;
+ margin-top: -15px;
}
html body section {
box-sizing: border-box;
@@ -22,9 +23,24 @@ html body section dd {
}
html body section dd ul li {
list-style-type: none;
- margin-left: 50px;
+ margin-left: 90px;
+ margin-bottom: -15px;
+
+}
+h2 {
+ font-size: 14pt;
}
h3 {
- font-size: 12pt;
+ font-size: 10pt;
color: #6e6e6e;
+}
+ul {
+ padding: 0;
+ list-style: none;
+ margin-top:10px;
+}
+
+html body section dt img {
+ max-width:80px;
+ margin-left: 20px;
}
\ No newline at end of file
diff --git a/sapl/static/sapl/css/relatorio.css b/sapl/static/sapl/css/relatorio.css
index 645ca777d..c3f2ec21f 100644
--- a/sapl/static/sapl/css/relatorio.css
+++ b/sapl/static/sapl/css/relatorio.css
@@ -1,5 +1,5 @@
@page{
- margin-top: 8cm;
+ margin-top: 4.5cm;
size: A4 portrait;
}
diff --git a/sapl/templates/relatorios/header_ata.html b/sapl/templates/relatorios/header_ata.html
index c1d9c3515..494d2c60b 100644
--- a/sapl/templates/relatorios/header_ata.html
+++ b/sapl/templates/relatorios/header_ata.html
@@ -1,3 +1,6 @@
+{% load common_tags %}
+{% load render_bundle from webpack_loader %}
+{% load webpack_static from webpack_loader %}
{% load static %}
@@ -10,23 +13,19 @@
-
+ 