Formatting changes

This commit is contained in:
Claude Paroz 2018-04-12 13:50:13 +02:00
parent 3b43477e17
commit 7d80994587
2 changed files with 15 additions and 15 deletions

View file

@ -17,11 +17,11 @@ from reportlab.platypus import (
SimpleDocTemplate, Spacer, Table, TableStyle,
)
style_normal = PS(name='CORPS', fontName='Helvetica', fontSize=8, alignment = TA_LEFT)
style_bold = PS(name='CORPS', fontName='Helvetica-Bold', fontSize=10, alignment = TA_LEFT)
style_title = PS(name='CORPS', fontName='Helvetica-Bold', fontSize=12, alignment = TA_LEFT, spaceBefore=1*cm)
style_adress = PS(name='CORPS', fontName='Helvetica', fontSize=10, alignment = TA_LEFT, leftIndent=280)
style_normal_right = PS(name='CORPS', fontName='Helvetica', fontSize=8, alignment = TA_RIGHT)
style_normal = PS(name='CORPS', fontName='Helvetica', fontSize=8, alignment=TA_LEFT)
style_bold = PS(name='CORPS', fontName='Helvetica-Bold', fontSize=10, alignment=TA_LEFT)
style_title = PS(name='CORPS', fontName='Helvetica-Bold', fontSize=12, alignment=TA_LEFT, spaceBefore=1*cm)
style_adress = PS(name='CORPS', fontName='Helvetica', fontSize=8, alignment=TA_LEFT, leftIndent=280)
style_normal_right = PS(name='CORPS', fontName='Helvetica', fontSize=8, alignment=TA_RIGHT)
style_bold_center = PS(name="CORPS", fontName="Helvetica-Bold", fontSize=9, alignment=TA_CENTER)
style_footer = PS(name='CORPS', fontName='Helvetica', fontSize=7, alignment=TA_CENTER)
@ -35,7 +35,7 @@ class EpcBaseDocTemplate(SimpleDocTemplate):
def __init__(self, filename, title='', pagesize=A4):
super().__init__(
filename, pagesize=pagesize, _pageBreakQuick=0,
lefMargin=1.5 * cm, bottomMargin=1.5 * cm, topMargin=1.5 * cm, rightMargin=1.5 * cm
lefMargin=1.5 * cm, bottomMargin=1.5 * cm, topMargin=1.5 * cm, rightMargin=2.5 * cm
)
self.story = []
self.title = title
@ -142,7 +142,7 @@ class ChargeSheetPDF(SimpleDocTemplate):
t.setStyle(TableStyle([('ALIGN', (1, 0), (-1, -1), 'RIGHT'),
('FONT', (0, 0), (-1, 0), 'Helvetica-Bold'),
('LINEBELOW', (0, 0), (-1, 0), 0.5, colors.black),
('LINEABOVE', (0, -3) ,(-1, -1), 0.5, colors.black),
('LINEABOVE', (0, -3), (-1, -1), 0.5, colors.black),
('FONT', (0, -2), (-1, -2), 'Helvetica-Bold'),
]))
t.hAlign = TA_CENTER
@ -154,12 +154,12 @@ class ChargeSheetPDF(SimpleDocTemplate):
self.story.append(Paragraph('la direction', style_normal))
max_total = settings.MAX_ENS_PERIODS + settings.MAX_ENS_FORMATION
if activities['tot_paye'] == max_total and activities['tot_paye'] != activities['tot_trav']:
self.story.append(Spacer(0, 1 * cm))
d = 'Je soussigné-e déclare accepter les conditions ci-dessus pour la régularisation de mon salaire.'
self.story.append(Paragraph(d, style_normal))
self.story.append(Spacer(0, 1 * cm))
d = 'Lieu, date et signature: ___________________________________________________________________________'
self.story.append(Paragraph(d, style_normal))
self.story.append(Spacer(0, 1 * cm))
d = 'Je soussigné-e déclare accepter les conditions ci-dessus pour la régularisation de mon salaire.'
self.story.append(Paragraph(d, style_normal))
self.story.append(Spacer(0, 1 * cm))
d = 'Lieu, date et signature: ___________________________________________________________________________'
self.story.append(Paragraph(d, style_normal))
self.story.append(PageBreak())
self.build(self.story)
header.close()

View file

@ -365,7 +365,7 @@ class StudentImportView(ImportViewBase):
except Student.DoesNotExist:
student = Student.objects.create(**defaults)
obj_created += 1
#FIXME: implement arch_staled
# FIXME: implement arch_staled
return {'created': obj_created, 'modified': obj_modified}
def get_corporation(self, corp_values):
@ -634,7 +634,7 @@ class SendStudentReportsView(FormView):
# Attach PDF file to email
student_filename = slugify('{0} {1}'.format(self.student.last_name, self.student.first_name))
student_filename = '{0}.pdf'.format(student_filename)
#pdf_file = os.path.join(dir_klass, pdf_file_list[attach_idx])
# pdf_file = os.path.join(dir_klass, pdf_file_list[attach_idx])
pdf_name = 'bulletin_scol_{0}'.format(student_filename)
with open(getattr(self.student, 'report_sem%d' % self.semestre).path, 'rb') as pdf:
email.attach(pdf_name, pdf.read(), 'application/pdf')