fares.amer/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: <br> pour ReportrLab pdf

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-10-03 08:37:29 +02:00
parent 37a8b3bb0b
commit 036ce650c6
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/scodoc/sco_liste_notes.py
View File

@ -517,18 +517,19 @@ def _make_table_notes(
hh += "s" hh += "s"
hh += ", %d en attente." % (nb_att) hh += ", %d en attente." % (nb_att)
pdf_title = "<br> BORDEREAU DE SIGNATURES" # Attention: ReportLab supporte seulement '<br/>', pas '<br>' !
pdf_title += "<br><br>%(titre)s" % sem pdf_title = "<br/> BORDEREAU DE SIGNATURES"
pdf_title += "<br>(%(mois_debut)s - %(mois_fin)s)" % sem pdf_title += "<br/><br/>%(titre)s" % sem
pdf_title += "<br/>(%(mois_debut)s - %(mois_fin)s)" % sem
pdf_title += " semestre %s %s" % ( pdf_title += " semestre %s %s" % (
sem["semestre_id"], sem["semestre_id"],
sem.get("modalite", ""), sem.get("modalite", ""),
) )
pdf_title += f"<br>Notes du module {module.code} - {module.titre}" pdf_title += f"<br/>Notes du module {module.code} - {module.titre}"
pdf_title += "<br>Evaluation : %(description)s " % e pdf_title += "<br/>Évaluation : %(description)s " % e
if len(e["jour"]) > 0: if len(e["jour"]) > 0:
pdf_title += " (%(jour)s)" % e pdf_title += " (%(jour)s)" % e
pdf_title += "(noté sur %(note_max)s )<br><br>" % e pdf_title += "(noté sur %(note_max)s )<br/><br/>" % e
else: else:
hh = " %s, %s (%d étudiants)" % ( hh = " %s, %s (%d étudiants)" % (
E["description"], E["description"],

12
app/scodoc/sco_preferences.py
View File

@ -1008,7 +1008,7 @@ class BasePreferences(object):
( (
"PV_LETTER_DIPLOMA_SIGNATURE", "PV_LETTER_DIPLOMA_SIGNATURE",
{ {
"initvalue": """Le %(DirectorTitle)s, <br>%(DirectorName)s""", "initvalue": """Le %(DirectorTitle)s, <br/>%(DirectorName)s""",
"title": """Signature des lettres individuelles de diplôme""", "title": """Signature des lettres individuelles de diplôme""",
"explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""", "explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""",
"input_type": "textarea", "input_type": "textarea",
@ -1020,8 +1020,8 @@ class BasePreferences(object):
( (
"PV_LETTER_PASSAGE_SIGNATURE", "PV_LETTER_PASSAGE_SIGNATURE",
{ {
"initvalue": """Pour le Directeur de l'IUT<br> "initvalue": """Pour le Directeur de l'IUT<br/>
et par délégation<br> et par délégation<br/>
Le Chef du département""", Le Chef du département""",
"title": """Signature des lettres individuelles de passage d'un semestre à l'autre""", "title": """Signature des lettres individuelles de passage d'un semestre à l'autre""",
"explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""", "explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""",
@ -1056,7 +1056,7 @@ class BasePreferences(object):
<para leftindent="%(pv_htab1)s">%(codepostaldomicile)s %(villedomicile)s</para> <para leftindent="%(pv_htab1)s">%(codepostaldomicile)s %(villedomicile)s</para>
<para spaceBefore="25mm" fontSize="14" alignment="center"> <para spaceBefore="25mm" fontSize="14" alignment="center">
<b>Jury de %(type_jury)s <br> %(titre_formation)s</b> <b/>Jury de %(type_jury)s <br/> %(titre_formation)s</b>
</para> </para>
<para spaceBefore="10mm" fontSize="14" leftindent="0"> <para spaceBefore="10mm" fontSize="14" leftindent="0">
@ -1499,7 +1499,7 @@ class BasePreferences(object):
"bul_pdf_sig_left", "bul_pdf_sig_left",
{ {
"initvalue": """<para>La direction des études "initvalue": """<para>La direction des études
<br> <br/>
%(responsable)s %(responsable)s
</para> </para>
""", """,
@ -1515,7 +1515,7 @@ class BasePreferences(object):
"bul_pdf_sig_right", "bul_pdf_sig_right",
{ {
"initvalue": """<para>Le chef de département "initvalue": """<para>Le chef de département
<br> <br/>
%(ChiefDeptName)s %(ChiefDeptName)s
</para> </para>
""", """,

10
app/scodoc/sco_pvpdf.py
View File

@ -341,10 +341,10 @@ def _simulate_br(paragraph_txt: str, para="<para>") -> str:
"""Reportlab bug turnaround (could be removed in a future version). """Reportlab bug turnaround (could be removed in a future version).
p is a string with Reportlab intra-paragraph XML tags. p is a string with Reportlab intra-paragraph XML tags.
Replaces <br> (currently ignored by Reportlab) by </para><para> Replaces <br> (currently ignored by Reportlab) by </para><para>
Also replaces <br> by <br> Also replaces <br> by <br/>
""" """
return ("</para>" + para).join( return ("</para>" + para).join(
re.split(r"<.*?br.*?/>", paragraph_txt.replace("<br>", "<br>")) re.split(r"<.*?br.*?/>", paragraph_txt.replace("<br>", "<br/>"))
) )
@ -515,7 +515,7 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
params.update(decision["identite"]) params.update(decision["identite"])
# fix domicile # fix domicile
if params["domicile"]: if params["domicile"]:
params["domicile"] = params["domicile"].replace("\\n", "<br>") params["domicile"] = params["domicile"].replace("\\n", "<br/>")
# UE capitalisées: # UE capitalisées:
if decision["decisions_ue"] and decision["decisions_ue_descr"]: if decision["decisions_ue"] and decision["decisions_ue_descr"]:
@ -649,8 +649,8 @@ def add_apc_infos(formsemestre: FormSemestre, params: dict, decision: dict):
params["decision_sem_descr"] = decision_annee.get("code") or "" params["decision_sem_descr"] = decision_annee.get("code") or ""
params[ params[
"decision_ue_txt" "decision_ue_txt"
] = f"""{params["decision_ue_txt"]}<br> ] = f"""{params["decision_ue_txt"]}<br/>
<b>Niveaux de compétences:</b><br> {decision.get("descr_decisions_rcue") or ""} <b>Niveaux de compétences:</b><br/> {decision.get("descr_decisions_rcue") or ""}
""" """

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.3.51" SCOVERSION = "9.3.52"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"