Skip to content
Snippets Groups Projects
Commit fa679017 authored by Emmanuel Viennet's avatar Emmanuel Viennet
Browse files

Version 9.7.67

parent 6bca4a79
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ from app.scodoc.codes_cursus import code_semestre_validant, code_semestre_attent ...@@ -47,7 +47,7 @@ from app.scodoc.codes_cursus import code_semestre_validant, code_semestre_attent
import sco_version import sco_version
def etud_get_poursuite_info(sem: dict, etud: dict) -> dict: def etud_get_poursuite_info(sem: dict, etud: dict, keep_numeric: bool = False) -> dict:
"""{ 'nom' : ..., 'semlist' : [ { 'semestre_id': , 'moy' : ... }, {}, ...] }""" """{ 'nom' : ..., 'semlist' : [ { 'semestre_id': , 'moy' : ... }, {}, ...] }"""
infos = {} infos = {}
infos.update(etud) # copie nom, prenom, civilite, ... infos.update(etud) # copie nom, prenom, civilite, ...
...@@ -72,7 +72,9 @@ def etud_get_poursuite_info(sem: dict, etud: dict) -> dict: ...@@ -72,7 +72,9 @@ def etud_get_poursuite_info(sem: dict, etud: dict) -> dict:
moy_ues.append( moy_ues.append(
( (
ue["acronyme"], ue["acronyme"],
scu.fmt_note(ue_status["moy"]), scu.fmt_note(
ue_status["moy"], keep_numeric=keep_numeric
),
) )
) )
else: else:
...@@ -91,7 +93,8 @@ def etud_get_poursuite_info(sem: dict, etud: dict) -> dict: ...@@ -91,7 +93,8 @@ def etud_get_poursuite_info(sem: dict, etud: dict) -> dict:
if modimpl["module"]["ue_id"] == ue["ue_id"]: if modimpl["module"]["ue_id"] == ue["ue_id"]:
code_module = modimpl["module"]["code"] or "" code_module = modimpl["module"]["code"] or ""
note_module = scu.fmt_note( note_module = scu.fmt_note(
nt.get_etud_mod_moy(modimpl["moduleimpl_id"], etudid) nt.get_etud_mod_moy(modimpl["moduleimpl_id"], etudid),
keep_numeric=keep_numeric,
) )
# si étudiant inscrit au module, sauf BUT # si étudiant inscrit au module, sauf BUT
if (note_module != "NI") and not nt.is_apc: if (note_module != "NI") and not nt.is_apc:
...@@ -120,8 +123,16 @@ def etud_get_poursuite_info(sem: dict, etud: dict) -> dict: ...@@ -120,8 +123,16 @@ def etud_get_poursuite_info(sem: dict, etud: dict) -> dict:
and nt.get_etud_etat(etudid) == scu.INSCRIT and nt.get_etud_etat(etudid) == scu.INSCRIT
): ):
d = [ d = [
("moy", scu.fmt_note(nt.get_etud_moy_gen(etudid))), (
("moy_promo", scu.fmt_note(nt.moy_moy)), "moy",
scu.fmt_note(
nt.get_etud_moy_gen(etudid), keep_numeric=keep_numeric
),
),
(
"moy_promo",
scu.fmt_note(nt.moy_moy, keep_numeric=keep_numeric),
),
("rang", nt.get_etud_rang(etudid)), ("rang", nt.get_etud_rang(etudid)),
("effectif", len(nt.T)), ("effectif", len(nt.T)),
("date_debut", s["date_debut"]), ("date_debut", s["date_debut"]),
...@@ -182,6 +193,7 @@ def _get_etud_info_groupes(group_ids, etat=None): ...@@ -182,6 +193,7 @@ def _get_etud_info_groupes(group_ids, etat=None):
def formsemestre_poursuite_report(formsemestre_id, fmt="html"): def formsemestre_poursuite_report(formsemestre_id, fmt="html"):
"""Table avec informations "poursuite" """ """Table avec informations "poursuite" """
keep_numeric = fmt in ("xls", "xlsx", "json", "csv")
sem = sco_formsemestre.get_formsemestre(formsemestre_id) sem = sco_formsemestre.get_formsemestre(formsemestre_id)
etuds = _get_etud_info_groupes([sco_groups.get_default_group(formsemestre_id)]) etuds = _get_etud_info_groupes([sco_groups.get_default_group(formsemestre_id)])
...@@ -194,7 +206,7 @@ def formsemestre_poursuite_report(formsemestre_id, fmt="html"): ...@@ -194,7 +206,7 @@ def formsemestre_poursuite_report(formsemestre_id, fmt="html"):
etud["_nom_target"] = fiche_url etud["_nom_target"] = fiche_url
etud["_prenom_target"] = fiche_url etud["_prenom_target"] = fiche_url
etud["_nom_td_attrs"] = f"""id="{etud['etudid']}" class="etudinfo" """ etud["_nom_td_attrs"] = f"""id="{etud['etudid']}" class="etudinfo" """
info = etud_get_poursuite_info(sem, etud) info = etud_get_poursuite_info(sem, etud, keep_numeric=keep_numeric)
idd = _flatten_info(info) idd = _flatten_info(info)
# On recupere la totalite des UEs dans ids # On recupere la totalite des UEs dans ids
for key in idd: for key in idd:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment