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

Ajout colonne 'Résultat au diplôme'

Browse Source
This commit is contained in:
viennet 2020-10-13 16:01:38 +02:00
parent 6160d48e9e
commit f1f3112e7b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sco_pvjury.py
View File

@ -63,8 +63,7 @@ Jury de semestre n
def _descr_decisions_ues(context, nt, etudid, decisions_ue, decision_sem): 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: if not decisions_ue:
return [] return []
uelist = [] 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): 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() ues = nt.get_ues()
ects_by_ue_code = {} ects_by_ue_code = {}
for ue in ues: 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( nt = context._getNotesCache().get_NotesTable(
context, formsemestre_id context, formsemestre_id
@ -383,6 +381,7 @@ def pvjury_table(
"ue_cap": "UE" + sem_id_txt_sp + " capitalisées", "ue_cap": "UE" + sem_id_txt_sp + " capitalisées",
"ects": "ECTS", "ects": "ECTS",
"devenir": "Devenir", "devenir": "Devenir",
"validation_parcours_code": "Résultat au diplôme",
"observations": "Observations", "observations": "Observations",
} }
if anonymous: if anonymous:
@ -412,9 +411,10 @@ def pvjury_table(
columns_ids += ["ue_cap"] columns_ids += ["ue_cap"]
if context.get_preference("bul_show_ects", formsemestre_id): if context.get_preference("bul_show_ects", formsemestre_id):
columns_ids += ["ects"] columns_ids += ["ects"]
# if dpv['semestre_non_terminal']: # if dpv['semestre_non_terminal']:
# dec 2017: indique toujours le devenir ("diplôme obtenu" ou semestre suivant) # dec 2017: indique toujours le devenir ("diplôme obtenu" ou semestre suivant)
columns_ids += ["devenir"] columns_ids += ["validation_parcours_code", "devenir"]
columns_ids += ["observations"] columns_ids += ["observations"]
lines = [] lines = []
@ -432,6 +432,7 @@ def pvjury_table(
context, e["etat"], e["decision_sem"] context, e["etat"], e["decision_sem"]
), ),
"ue_cap": e["decisions_ue_descr"], "ue_cap": e["decisions_ue_descr"],
"validation_parcours_code": "ADM" if e["validation_parcours"] else "AJ",
"devenir": e["autorisations_descr"], "devenir": e["autorisations_descr"],
"observations": unquote(e["observation"]), "observations": unquote(e["observation"]),
"mention": e["mention"], "mention": e["mention"],
@ -705,8 +706,7 @@ def formsemestre_pvjury_pdf(
def descrform_pvjury(sem): def descrform_pvjury(sem):
"""Définition de formulaire pour PV jury PDF """Définition de formulaire pour PV jury PDF"""
"""
return [ return [
( (
"date_commission", "date_commission",