forked from ScoDoc/ScoDoc
Ajout colonne 'Résultat au diplôme'
This commit is contained in:
parent
6160d48e9e
commit
f1f3112e7b
@ -63,8 +63,7 @@ Jury de semestre n
|
||||
|
||||
|
||||
def _descr_decisions_ues(context, nt, etudid, decisions_ue, decision_sem):
|
||||
"""Liste des UE validées dans ce semestre
|
||||
"""
|
||||
"""Liste des UE validées dans ce semestre"""
|
||||
if not decisions_ue:
|
||||
return []
|
||||
uelist = []
|
||||
@ -147,8 +146,7 @@ def _comp_ects_by_ue_code_and_type(nt, decision_ues):
|
||||
|
||||
|
||||
def _comp_ects_capitalises_by_ue_code(nt, etudid):
|
||||
"""Calcul somme des ECTS des UE capitalisees
|
||||
"""
|
||||
"""Calcul somme des ECTS des UE capitalisees"""
|
||||
ues = nt.get_ues()
|
||||
ects_by_ue_code = {}
|
||||
for ue in ues:
|
||||
@ -203,8 +201,8 @@ def dict_pvjury(
|
||||
}
|
||||
]
|
||||
},
|
||||
'decisions_dict' : { etudid : decision (comme ci-dessous) },
|
||||
}
|
||||
'decisions_dict' : { etudid : decision (comme ci-dessus) },
|
||||
}
|
||||
"""
|
||||
nt = context._getNotesCache().get_NotesTable(
|
||||
context, formsemestre_id
|
||||
@ -383,6 +381,7 @@ def pvjury_table(
|
||||
"ue_cap": "UE" + sem_id_txt_sp + " capitalisées",
|
||||
"ects": "ECTS",
|
||||
"devenir": "Devenir",
|
||||
"validation_parcours_code": "Résultat au diplôme",
|
||||
"observations": "Observations",
|
||||
}
|
||||
if anonymous:
|
||||
@ -412,9 +411,10 @@ def pvjury_table(
|
||||
columns_ids += ["ue_cap"]
|
||||
if context.get_preference("bul_show_ects", formsemestre_id):
|
||||
columns_ids += ["ects"]
|
||||
|
||||
# if dpv['semestre_non_terminal']:
|
||||
# dec 2017: indique toujours le devenir ("diplôme obtenu" ou semestre suivant)
|
||||
columns_ids += ["devenir"]
|
||||
columns_ids += ["validation_parcours_code", "devenir"]
|
||||
columns_ids += ["observations"]
|
||||
|
||||
lines = []
|
||||
@ -432,6 +432,7 @@ def pvjury_table(
|
||||
context, e["etat"], e["decision_sem"]
|
||||
),
|
||||
"ue_cap": e["decisions_ue_descr"],
|
||||
"validation_parcours_code": "ADM" if e["validation_parcours"] else "AJ",
|
||||
"devenir": e["autorisations_descr"],
|
||||
"observations": unquote(e["observation"]),
|
||||
"mention": e["mention"],
|
||||
@ -705,8 +706,7 @@ def formsemestre_pvjury_pdf(
|
||||
|
||||
|
||||
def descrform_pvjury(sem):
|
||||
"""Définition de formulaire pour PV jury PDF
|
||||
"""
|
||||
"""Définition de formulaire pour PV jury PDF"""
|
||||
return [
|
||||
(
|
||||
"date_commission",
|
||||
|
Loading…
Reference in New Issue
Block a user