1
0
forked from ScoDoc/ScoDoc

Choix titre sur PV jury PDF

This commit is contained in:
viennet 2020-12-01 11:03:20 +01:00
parent 072f8b09de
commit 3ff5fedbf6
3 changed files with 21 additions and 5 deletions

View File

@ -402,7 +402,7 @@ enregistrés et non modifiables, on peut les retrouver ultérieurement.
), ),
("sep", {"input_type": "separator", "title": "Informations sur PV de jury"}), ("sep", {"input_type": "separator", "title": "Informations sur PV de jury"}),
] ]
descr += sco_pvjury.descrform_pvjury(sem) descr += sco_pvjury.descrform_pvjury(context, sem)
descr += [ descr += [
( (
"signature", "signature",

View File

@ -635,7 +635,7 @@ def formsemestre_pvjury_pdf(
</p>""", </p>""",
context.sco_footer(REQUEST), context.sco_footer(REQUEST),
] ]
descr = descrform_pvjury(sem) descr = descrform_pvjury(context, sem)
if etudid: if etudid:
descr.append(("etudid", {"input_type": "hidden"})) descr.append(("etudid", {"input_type": "hidden"}))
@ -690,6 +690,7 @@ def formsemestre_pvjury_pdf(
date_commission=tf[2]["date_commission"], date_commission=tf[2]["date_commission"],
date_jury=tf[2]["date_jury"], date_jury=tf[2]["date_jury"],
showTitle=tf[2]["showTitle"], showTitle=tf[2]["showTitle"],
pv_title=tf[2]["pv_title"],
with_paragraph_nom=tf[2]["with_paragraph_nom"], with_paragraph_nom=tf[2]["with_paragraph_nom"],
anonymous=tf[2]["anonymous"], anonymous=tf[2]["anonymous"],
) )
@ -705,8 +706,9 @@ def formsemestre_pvjury_pdf(
return sendPDFFile(REQUEST, pdfdoc, filename) return sendPDFFile(REQUEST, pdfdoc, filename)
def descrform_pvjury(sem): def descrform_pvjury(context, sem):
"""Définition de formulaire pour PV jury PDF""" """Définition de formulaire pour PV jury PDF"""
F = context.Notes.formation_list(formation_id=sem["formation_id"])[0]
return [ return [
( (
"date_commission", "date_commission",
@ -744,11 +746,21 @@ def descrform_pvjury(sem):
"explanation": "VDI et code du diplôme Apogée (format libre, n'est pas vérifié par ScoDoc)", "explanation": "VDI et code du diplôme Apogée (format libre, n'est pas vérifié par ScoDoc)",
}, },
), ),
(
"pv_title",
{
"input_type": "text",
"size": 64,
"title": "Titre du PV",
"explanation": "par défaut, titre officiel de la formation",
"default": F["titre_officiel"],
},
),
( (
"showTitle", "showTitle",
{ {
"input_type": "checkbox", "input_type": "checkbox",
"title": "Indiquer le titre du semestre sur le PV", "title": "Indiquer en plus le titre du semestre sur le PV",
"explanation": '(le titre est "%s")' % sem["titre"], "explanation": '(le titre est "%s")' % sem["titre"],
"labels": [""], "labels": [""],
"allowed_values": ("1",), "allowed_values": ("1",),

View File

@ -592,6 +592,7 @@ def pvjury_pdf(
numeroArrete=None, numeroArrete=None,
VDICode=None, VDICode=None,
showTitle=False, showTitle=False,
pv_title=None,
with_paragraph_nom=False, with_paragraph_nom=False,
anonymous=False, anonymous=False,
): ):
@ -613,6 +614,7 @@ def pvjury_pdf(
VDICode=VDICode, VDICode=VDICode,
date_jury=date_jury, date_jury=date_jury,
showTitle=showTitle, showTitle=showTitle,
pv_title=pv_title,
with_paragraph_nom=with_paragraph_nom, with_paragraph_nom=with_paragraph_nom,
anonymous=anonymous, anonymous=anonymous,
) )
@ -635,6 +637,7 @@ def pvjury_pdf(
numeroArrete=numeroArrete, numeroArrete=numeroArrete,
VDICode=VDICode, VDICode=VDICode,
showTitle=showTitle, showTitle=showTitle,
pv_title=pv_title,
with_paragraph_nom=with_paragraph_nom, with_paragraph_nom=with_paragraph_nom,
anonymous=anonymous, anonymous=anonymous,
) )
@ -668,6 +671,7 @@ def _pvjury_pdf_type(
numeroArrete=None, numeroArrete=None,
VDICode=None, VDICode=None,
showTitle=False, showTitle=False,
pv_title=None,
anonymous=False, anonymous=False,
with_paragraph_nom=False, with_paragraph_nom=False,
): ):
@ -680,7 +684,7 @@ def _pvjury_pdf_type(
sem = dpv["formsemestre"] sem = dpv["formsemestre"]
formsemestre_id = sem["formsemestre_id"] formsemestre_id = sem["formsemestre_id"]
titre_jury, titre_court_jury = _descr_jury(sem, diplome) titre_jury, titre_court_jury = _descr_jury(sem, diplome)
titre_diplome = dpv["formation"]["titre_officiel"] titre_diplome = pv_title or dpv["formation"]["titre_officiel"]
objects = [] objects = []
style = reportlab.lib.styles.ParagraphStyle({}) style = reportlab.lib.styles.ParagraphStyle({})