diff --git a/app/scodoc/sco_pv_forms.py b/app/scodoc/sco_pv_forms.py index ce8e97f99..e8aa3f068 100644 --- a/app/scodoc/sco_pv_forms.py +++ b/app/scodoc/sco_pv_forms.py @@ -443,12 +443,13 @@ def formsemestre_pvjury_pdf(formsemestre_id, etudid=None): formsemestre, etudids, numero_arrete=tf[2]["numero_arrete"], - code_vdi=tf[2]["code_vdi"], + code_vdi=f"""{tf[2]["code_vdi"]} {tf[2]["code_diplome"]}""", date_commission=tf[2]["date_commission"], date_jury=tf[2]["date_jury"], show_title=tf[2]["show_title"], pv_title_session=tf[2]["pv_title_session"], pv_title=tf[2]["pv_title"], + pv_subtitle=tf[2]["pv_subtitle"], with_paragraph_nom=tf[2]["with_paragraph_nom"], anonymous=tf[2]["anonymous"], ) @@ -499,8 +500,17 @@ def descrform_pvjury(formsemestre: FormSemestre): { "input_type": "text", "size": 15, - "title": "VDI et Code", - "explanation": "VDI et code du diplôme Apogée (format libre, n'est pas vérifié par ScoDoc)", + "title": "Version et code étape", + "explanation": "VDI et étape Apogée (format libre, n'est pas vérifié par ScoDoc)", + }, + ), + ( + "code_diplome", + { + "input_type": "text", + "size": 15, + "title": "Version et code diplôme", + "explanation": "format libre, sera écrit à la suite du code étape ci-dessus", }, ), ( @@ -523,6 +533,15 @@ def descrform_pvjury(formsemestre: FormSemestre): "default": f_dict["titre_officiel"], }, ), + ( + "pv_subtitle", + { + "input_type": "text", + "size": 90, + "title": "Sous-titre", + "explanation": "optionnel, placé sous le titre du PV", + }, + ), ( "show_title", { diff --git a/app/scodoc/sco_pv_pdf.py b/app/scodoc/sco_pv_pdf.py index ef72180ed..a9d482795 100644 --- a/app/scodoc/sco_pv_pdf.py +++ b/app/scodoc/sco_pv_pdf.py @@ -65,6 +65,7 @@ def pvjury_pdf( code_vdi=None, show_title=False, pv_title=None, + pv_subtitle=None, pv_title_session=None, with_paragraph_nom=False, anonymous=False, @@ -83,6 +84,7 @@ def pvjury_pdf( show_title=show_title, pv_title_session=pv_title_session, pv_title=pv_title, + pv_subtitle=pv_subtitle, with_paragraph_nom=with_paragraph_nom, anonymous=anonymous, ) @@ -170,6 +172,7 @@ def _pvjury_pdf_type( code_vdi=None, show_title=False, pv_title=None, + pv_subtitle=None, pv_title_session=None, anonymous=False, with_paragraph_nom=False, @@ -206,6 +209,11 @@ def _pvjury_pdf_type( f"""{titre_diplome}""", style, ) + if pv_subtitle: + objects += sco_pdf.make_paras( + f"""{pv_subtitle}""", + style, + ) if show_title: objects += sco_pdf.make_paras( @@ -214,7 +222,8 @@ def _pvjury_pdf_type( ) if sco_preferences.get_preference("PV_TITLE_WITH_VDI", formsemestre.id): objects += sco_pdf.make_paras( - f"""VDI et Code: {(code_vdi or "")}""", style + f"""Code: {code_vdi or ""}""", + style, ) if date_jury: diff --git a/sco_version.py b/sco_version.py index 32ed764ba..cf12c24ab 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.7.22" +SCOVERSION = "9.7.23" SCONAME = "ScoDoc"