forked from ScoDoc/ScoDoc
Update opolka/ScoDoc from ScoDoc/ScoDoc #2
@ -330,6 +330,7 @@ def do_formsemestre_archive(
|
|||||||
code_vdi=None,
|
code_vdi=None,
|
||||||
show_title=False,
|
show_title=False,
|
||||||
pv_title=None,
|
pv_title=None,
|
||||||
|
pv_title_session=None,
|
||||||
with_paragraph_nom=False,
|
with_paragraph_nom=False,
|
||||||
anonymous=False,
|
anonymous=False,
|
||||||
bul_version="long",
|
bul_version="long",
|
||||||
@ -453,6 +454,7 @@ def do_formsemestre_archive(
|
|||||||
numero_arrete=numero_arrete,
|
numero_arrete=numero_arrete,
|
||||||
code_vdi=code_vdi,
|
code_vdi=code_vdi,
|
||||||
show_title=show_title,
|
show_title=show_title,
|
||||||
|
pv_title_session=pv_title_session,
|
||||||
pv_title=pv_title,
|
pv_title=pv_title,
|
||||||
with_paragraph_nom=with_paragraph_nom,
|
with_paragraph_nom=with_paragraph_nom,
|
||||||
anonymous=anonymous,
|
anonymous=anonymous,
|
||||||
@ -581,6 +583,7 @@ enregistrés et non modifiables, on peut les retrouver ultérieurement.
|
|||||||
signature=signature,
|
signature=signature,
|
||||||
numero_arrete=tf[2]["numero_arrete"],
|
numero_arrete=tf[2]["numero_arrete"],
|
||||||
code_vdi=tf[2]["code_vdi"],
|
code_vdi=tf[2]["code_vdi"],
|
||||||
|
pv_title_session=tf[2]["pv_title_session"],
|
||||||
pv_title=tf[2]["pv_title"],
|
pv_title=tf[2]["pv_title"],
|
||||||
show_title=tf[2]["show_title"],
|
show_title=tf[2]["show_title"],
|
||||||
with_paragraph_nom=tf[2]["with_paragraph_nom"],
|
with_paragraph_nom=tf[2]["with_paragraph_nom"],
|
||||||
|
@ -414,6 +414,7 @@ def formsemestre_pvjury_pdf(formsemestre_id, group_ids: list[int] = None, etudid
|
|||||||
date_commission=tf[2]["date_commission"],
|
date_commission=tf[2]["date_commission"],
|
||||||
date_jury=tf[2]["date_jury"],
|
date_jury=tf[2]["date_jury"],
|
||||||
show_title=tf[2]["show_title"],
|
show_title=tf[2]["show_title"],
|
||||||
|
pv_title_session=tf[2]["pv_title_session"],
|
||||||
pv_title=tf[2]["pv_title"],
|
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"],
|
||||||
@ -469,11 +470,21 @@ def descrform_pvjury(formsemestre: FormSemestre):
|
|||||||
"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_session",
|
||||||
|
{
|
||||||
|
"input_type": "text",
|
||||||
|
"size": 48,
|
||||||
|
"title": "Nom de la session",
|
||||||
|
"explanation": "utilisé dans le titre du PV",
|
||||||
|
"default": "Session unique",
|
||||||
|
},
|
||||||
|
),
|
||||||
(
|
(
|
||||||
"pv_title",
|
"pv_title",
|
||||||
{
|
{
|
||||||
"input_type": "text",
|
"input_type": "text",
|
||||||
"size": 64,
|
"size": 96,
|
||||||
"title": "Titre du PV",
|
"title": "Titre du PV",
|
||||||
"explanation": "par défaut, titre officiel de la formation",
|
"explanation": "par défaut, titre officiel de la formation",
|
||||||
"default": f_dict["titre_officiel"],
|
"default": f_dict["titre_officiel"],
|
||||||
|
@ -53,6 +53,7 @@ from app.scodoc.sco_pdf import SU
|
|||||||
from app.scodoc.sco_pv_templates import PVTemplate, jury_titres
|
from app.scodoc.sco_pv_templates import PVTemplate, jury_titres
|
||||||
import sco_version
|
import sco_version
|
||||||
|
|
||||||
|
|
||||||
# ----------------------------------------------
|
# ----------------------------------------------
|
||||||
def pvjury_pdf(
|
def pvjury_pdf(
|
||||||
formsemestre: FormSemestre,
|
formsemestre: FormSemestre,
|
||||||
@ -63,6 +64,7 @@ def pvjury_pdf(
|
|||||||
code_vdi=None,
|
code_vdi=None,
|
||||||
show_title=False,
|
show_title=False,
|
||||||
pv_title=None,
|
pv_title=None,
|
||||||
|
pv_title_session=None,
|
||||||
with_paragraph_nom=False,
|
with_paragraph_nom=False,
|
||||||
anonymous=False,
|
anonymous=False,
|
||||||
) -> bytes:
|
) -> bytes:
|
||||||
@ -78,6 +80,7 @@ def pvjury_pdf(
|
|||||||
code_vdi=code_vdi,
|
code_vdi=code_vdi,
|
||||||
date_jury=date_jury,
|
date_jury=date_jury,
|
||||||
show_title=show_title,
|
show_title=show_title,
|
||||||
|
pv_title_session=pv_title_session,
|
||||||
pv_title=pv_title,
|
pv_title=pv_title,
|
||||||
with_paragraph_nom=with_paragraph_nom,
|
with_paragraph_nom=with_paragraph_nom,
|
||||||
anonymous=anonymous,
|
anonymous=anonymous,
|
||||||
@ -102,6 +105,7 @@ def pvjury_pdf(
|
|||||||
numero_arrete=numero_arrete,
|
numero_arrete=numero_arrete,
|
||||||
code_vdi=code_vdi,
|
code_vdi=code_vdi,
|
||||||
show_title=show_title,
|
show_title=show_title,
|
||||||
|
pv_title_session=pv_title_session,
|
||||||
pv_title=pv_title,
|
pv_title=pv_title,
|
||||||
with_paragraph_nom=with_paragraph_nom,
|
with_paragraph_nom=with_paragraph_nom,
|
||||||
anonymous=anonymous,
|
anonymous=anonymous,
|
||||||
@ -161,6 +165,7 @@ def _pvjury_pdf_type(
|
|||||||
code_vdi=None,
|
code_vdi=None,
|
||||||
show_title=False,
|
show_title=False,
|
||||||
pv_title=None,
|
pv_title=None,
|
||||||
|
pv_title_session=None,
|
||||||
anonymous=False,
|
anonymous=False,
|
||||||
with_paragraph_nom=False,
|
with_paragraph_nom=False,
|
||||||
) -> tuple[list, bool]:
|
) -> tuple[list, bool]:
|
||||||
@ -185,7 +190,9 @@ def _pvjury_pdf_type(
|
|||||||
f"""
|
f"""
|
||||||
<para align="center"><b>Procès-verbal de {titre_jury} du département {
|
<para align="center"><b>Procès-verbal de {titre_jury} du département {
|
||||||
sco_preferences.get_preference("DeptName", formsemestre.id) or "(sans nom)"
|
sco_preferences.get_preference("DeptName", formsemestre.id) or "(sans nom)"
|
||||||
} - Session unique {formsemestre.annee_scolaire()}</b></para>
|
} - {pv_title_session} {
|
||||||
|
formsemestre.annee_scolaire()} - {
|
||||||
|
formsemestre.annee_scolaire()+1}</b></para>
|
||||||
""",
|
""",
|
||||||
style,
|
style,
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user