From 5f8ecb5f0f711f04f5efa527dccf7e7b95713c6d Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 25 Aug 2022 19:54:26 +0200 Subject: [PATCH] Ajustements courriers PDF pour CPNE --- common/settings.py | 1 - stages/pdf.py | 84 +++++++++++------------ stages/static/img/logo_CPNE_avec_adr.png | Bin 0 -> 18976 bytes stages/views/export.py | 6 +- 4 files changed, 44 insertions(+), 47 deletions(-) create mode 100644 stages/static/img/logo_CPNE_avec_adr.png diff --git a/common/settings.py b/common/settings.py index 256b9d3..0d2915c 100644 --- a/common/settings.py +++ b/common/settings.py @@ -133,7 +133,6 @@ INSTRUCTOR_IMPORT_MAPPING = { } CHARGE_SHEET_TITLE = "Feuille de charge pour l'année scolaire 2018-2019" -PDF_FOOTER_TEXT = 'Ecole Santé-social Pierre-Coullery | Prévoyance 82 - 2300 La Chaux-de-Fonds | 032 886 33 00 | cifom-epc@rpn.ch' # Maximum numbers of periods per teacher per year MAX_ENS_PERIODS = 1900 diff --git a/stages/pdf.py b/stages/pdf.py index 08be45a..b253577 100644 --- a/stages/pdf.py +++ b/stages/pdf.py @@ -14,22 +14,24 @@ from reportlab.platypus import ( SimpleDocTemplate, Spacer, Table, TableStyle, Preformatted ) -style_normal = PS(name='CORPS', fontName='Helvetica', fontSize=8, alignment=TA_LEFT) -style_normal_center = PS(name='CORPS', fontName='Helvetica', fontSize=8, alignment=TA_CENTER) -style_bold = PS(name='CORPS', fontName='Helvetica-Bold', fontSize=8, spaceBefore=0.3 * cm, alignment=TA_LEFT) -style_bold_italic = PS(name='CORPS', fontName='Helvetica-BoldOblique', fontSize=8, spaceBefore=0.3 * cm, 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=10 * cm) -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) -style_bold_title = PS(name="CORPS", fontName="Helvetica-Bold", fontSize=12, alignment=TA_LEFT) -style_smallx = PS(name='CORPS', fontName="Helvetica-BoldOblique", fontSize=6, alignment=TA_LEFT) +font_size_base = 10 +style_normal = PS(name='CORPS', fontName='Helvetica', fontSize=font_size_base, alignment=TA_LEFT) +style_normal_center = PS(name='CORPS', fontName='Helvetica', fontSize=font_size_base, alignment=TA_CENTER) +style_bold = PS(name='CORPS', fontName='Helvetica-Bold', fontSize=font_size_base, spaceBefore=0.3 * cm, alignment=TA_LEFT) +style_bold_italic = PS(name='CORPS', fontName='Helvetica-BoldOblique', fontSize=font_size_base, spaceBefore=0.3 * cm, alignment=TA_LEFT) +style_title = PS(name='CORPS', fontName='Helvetica-Bold', fontSize=font_size_base + 4, alignment=TA_LEFT, spaceBefore=1 * cm) +style_adress = PS(name='CORPS', fontName='Helvetica', fontSize=font_size_base, alignment=TA_LEFT, leftIndent=9 * cm) +style_normal_right = PS(name='CORPS', fontName='Helvetica', fontSize=font_size_base, alignment=TA_RIGHT) +style_bold_center = PS(name="CORPS", fontName="Helvetica-Bold", fontSize=font_size_base, alignment=TA_CENTER) +style_footer = PS(name='CORPS', fontName='Helvetica', fontSize=font_size_base - 1, alignment=TA_CENTER) +style_bold_title = PS(name="CORPS", fontName="Helvetica-Bold", fontSize=font_size_base + 4, alignment=TA_LEFT) +style_smallx = PS(name='CORPS', fontName="Helvetica-BoldOblique", fontSize=font_size_base - 2, alignment=TA_LEFT) LOGO_EPC = find('img/logo_EPC.png') LOGO_ESNE = find('img/logo_ESNE.png') LOGO_EPC_LONG = find('img/header.gif') LOGO_CPNE = find('img/logo_CPNE.jpg') +LOGO_CPNE_ADR = find('img/logo_CPNE_avec_adr.png') class HorLine(Flowable): @@ -65,17 +67,16 @@ class EpcBaseDocTemplate(SimpleDocTemplate): def header(self, canvas, doc): canvas.saveState() canvas.drawImage( - LOGO_EPC, doc.leftMargin, doc.height - 1.5 * cm, 5 * cm, 3 * cm, preserveAspectRatio=True - ) - canvas.drawImage( - LOGO_ESNE, doc.width - 2.5 * cm, doc.height - 1.2 * cm, 5 * cm, 3.3 * cm, preserveAspectRatio=True + LOGO_CPNE_ADR, doc.leftMargin, doc.height - 3.5 * cm, 7 * cm, 3 * cm, preserveAspectRatio=True ) # Footer - canvas.line(doc.leftMargin, 1 * cm, doc.width + doc.leftMargin, 1 * cm) - footer = Paragraph(settings.PDF_FOOTER_TEXT, style_footer) - w, h = footer.wrap(doc.width, doc.bottomMargin) - footer.drawOn(canvas, doc.leftMargin, h) + canvas.setFont('Helvetica', 9) + canvas.drawString(doc.leftMargin, doc.bottomMargin, "032 886 33 00") + canvas.drawCentredString(doc.leftMargin + doc.width / 2, doc.bottomMargin, "cpne-2s@rpn.ch") + canvas.setFont('Helvetica-Bold', 9) + canvas.drawRightString(doc.width + doc.leftMargin, doc.bottomMargin, "www.cpne.ch") + canvas.restoreState() def header_cpne(self, canvas, doc): @@ -283,8 +284,8 @@ class CompensationForm: MENTOR_MANDAT = 'MENTOR' EXPERT_ACCOUNT = '30 490 002' MENTOR_ACCOUNT = "30 490 002" - OTP_EDE_PS_OTP = "CIFO01.03.02.07.02.01" - OTP_EDE_PE_OTP = "CIFO01.03.02.07.01.01" + OTP_EDE_PE_OTP = "CPNE01.08.01.07.01.01" + OTP_EDE_PS_OTP = "CPNE01.08.01.07.02.01" def add_private_data(self, person): self.story.append(Spacer(0, 0.5 * cm)) @@ -293,7 +294,7 @@ class CompensationForm: self.story.append(Spacer(0, 0.2 * cm)) quest_url = 'https://edus2.rpn.ch/DocumentsRHPersonnelEcolesPro/Formulaire%20imp%C3%B4t%20%C3%A0%20la%20source%202021.pdf' data = [ - [self.formating('PÔLE :', style=style_normal), 'École Santé-social Pierre-Coullery', '', ''], + [self.formating('PÔLE :', style=style_normal), 'Santé et Social', '', ''], [Paragraph('COORDONNÉES PERSONNELLES :', style=style_bold_italic), '', '', ''], [self.formating('Nom : '), person.last_name or self.points, self.formating('N° de téléphone :'), person.tel or ''], [self.formating('Prénom :'), person.first_name or self.points, self.formating('N° AVS :'), person.avs or ''], @@ -393,7 +394,7 @@ class CompensationForm: class ExpertEdeLetterPdf(CompensationForm, EpcBaseDocTemplate): - reference = 'ASH/val' + reference = 'BAH/val' title = 'Travail de diplôme' resp_filiere, resp_genre = settings.RESP_FILIERE_EDE part1_text = """ @@ -401,14 +402,14 @@ class ExpertEdeLetterPdf(CompensationForm, EpcBaseDocTemplate): Vous avez accepté de fonctionner comme expert{expert_accord} pour un {title_lower} de l’un-e de nos étudiant-e-s. Nous vous remercions très chaleureusement de votre disponibilité.

En annexe, nous avons l’avantage de vous remettre le travail de {student_civility_full_name}, - ainsi que la grille d’évaluation commune aux deux membres du jury.

+ accompagné des documents usuels à l’évaluation de ce dernier.

La soutenance de ce travail de diplôme se déroulera le:

""" part2_text = """
L’autre membre du jury sera {internal_expert_civility} {internal_expert_full_name}, {internal_expert_role} dans notre école.

- Par ailleurs, nous nous permettons de vous faire parvenir en annexe le formulaire «Indemnisation d’experts aux examens» + Par ailleurs, nous nous permettons de vous faire parvenir en annexe le formulaire «Indemnisation d’experts» que vous voudrez bien compléter au niveau des «données privées / coordonnées de paiement» et nous retourner dans les meilleurs délais.

Restant à votre disposition pour tout complément d’information et en vous remerciant de @@ -439,16 +440,14 @@ class ExpertEdeLetterPdf(CompensationForm, EpcBaseDocTemplate): header_text = """


La Chaux-de-Fonds, le {current_date}
- N/réf.: {ref}
-


- {title} + Réf : {ref}



""" self.story.append(Paragraph(header_text.format( current_date=django_format(date.today(), 'j F Y'), ref=self.reference, title=self.title, - ), style_normal)) + ), style_adress)) self.story.append(Paragraph(self.part1_text.format( title_lower=self.title.lower(), @@ -457,10 +456,13 @@ class ExpertEdeLetterPdf(CompensationForm, EpcBaseDocTemplate): student_civility_full_name=self.exam.student.civility_full_name, ), style_normal)) - date_text = "
{0} à l'Ecole Santé-social Pierre-Coullery, salle {1}

" + date_text = ( + "
{date} en {salle}
" + "CPNE Pôle Santé et Social, rue Sophie-Mairet 29-31 - 2300 La Chaux-de-Fonds

" + ) self.story.append(Paragraph(date_text.format( - django_format(exam_data['date_exam'], 'l j F Y à H\hi'), - exam_data['room'], + date=django_format(exam_data['date_exam'], 'l j F Y à H\hi'), + salle=exam_data['room'], ), style_bold_center)) self.story.append(Paragraph(self.part2_text.format( @@ -471,16 +473,12 @@ class ExpertEdeLetterPdf(CompensationForm, EpcBaseDocTemplate): ), style_normal)) footer_text = """ - {lela} responsable de filière:
-

- {resp_filiere} -


- Annexes: ment. +
Brahim Hemma
+ Directeur adjoint CPNE-2S """ - self.story.append(Paragraph(footer_text.format( - lela='Le' if self.resp_genre == 'M' else 'La', - resp_filiere=self.resp_filiere, - ), style_normal)) + self.story.append(Paragraph(footer_text, style_adress)) + self.story.append(Spacer(0, 1.5 * cm)) + self.story.append(Paragraph("Annexes: ment.", style_normal)) # ISO page self.story.append(NextPageTemplate('ISOPage')) @@ -509,8 +507,8 @@ class ExpertEdsLetterPdf(ExpertEdeLetterPdf): resp_filiere, resp_genre = settings.RESP_FILIERE_EDS part1_text = """ {expert_civility},

- Vous avez accepté de fonctionner comme expert{expert_accord} pour un {title_lower} de l'un-e de nos - étudiant-e-s. Nous vous remercions très chaleureusement de votre disponibilité.

+ Vous avez accepté de fonctionner comme expert{expert_accord} pour un {title_lower} de l'un·e de nos + étudiant·e·s. Nous vous remercions très chaleureusement de votre disponibilité.

En annexe, nous avons l'avantage de vous remettre le travail de {student_civility_full_name}, ainsi que diverses informations sur le cadre de cet examen et la grille d'évaluation commune aux deux membres du jury.

diff --git a/stages/static/img/logo_CPNE_avec_adr.png b/stages/static/img/logo_CPNE_avec_adr.png new file mode 100644 index 0000000000000000000000000000000000000000..0e75e7abe4ec8f3f8aa946a3d0a701b2eb997302 GIT binary patch literal 18976 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 literal 0 HcmV?d00001 diff --git a/stages/views/export.py b/stages/views/export.py index e2cd332..9359a83 100644 --- a/stages/views/export.py +++ b/stages/views/export.py @@ -243,9 +243,9 @@ def export_sap(request): 'ASAFE': 'CIFO01.03.02.03.01.02 - ASA EE', 'ASEFE': 'CIFO01.03.02.04.01.02 - CFC ASE EE', 'ASSCFE': 'CIFO01.03.02.04.02.02 - CFC ASSC EE', - 'EDEpe': 'CIFO01.03.02.07.01.01 - EDE prat. prof. PT', - 'EDEps': 'CIFO01.03.02.07.02.01 - EDE stages PT', - 'EDS': 'CIFO01.03.02.07.03.02 - EDS EE', + 'EDEpe': 'CPNE01.08.01.07.01.01 - EDE-S-SS', + 'EDEps': 'CPNE01.08.01.07.02.01 - EDE-S-PS', + 'EDS': 'CPNE01.08.01.07.03.02 - EDS EE', 'CAS_FPP': 'CIFO01.03.02.01.03 - Mandats divers (CAS FPP)', 'MPTS' : 'CIFO01.04.03.06.02.01 - MPTS ASE', 'MPS': 'CIFO01.04.03.06.03.01 - MPS Santé',