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

Pas de rangs dans les modimpls

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-02-11 16:34:02 +01:00
parent 7c0b281b3c
commit 8d963db983
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/comp/res_common.py
View File

@ -311,9 +311,7 @@ class NotesTableCompat(ResultatsSemestre):
self.bonus = None # virtuel self.bonus = None # virtuel
self.bonus_ues = None # virtuel self.bonus_ues = None # virtuel
self.ue_rangs = {u.id: (None, nb_etuds) for u in self.ues} self.ue_rangs = {u.id: (None, nb_etuds) for u in self.ues}
self.mod_rangs = { self.mod_rangs = None # sera surchargé en Classic, mais pas en APC
m.id: (None, nb_etuds) for m in self.formsemestre.modimpls_sorted
}
self.moy_min = "NA" self.moy_min = "NA"
self.moy_max = "NA" self.moy_max = "NA"
self.moy_moy = "NA" self.moy_moy = "NA"

7
app/scodoc/sco_bulletins.py
View File

@ -621,7 +621,12 @@ def _ue_mod_bulletin(etudid, formsemestre_id, ue_id, modimpls, nt, version):
e["note_txt"] = e["note_html"] = "" e["note_txt"] = e["note_html"] = ""
e["coef_txt"] = scu.fmt_coef(e["coefficient"]) e["coef_txt"] = scu.fmt_coef(e["coefficient"])
# Classement # Classement
if bul_show_mod_rangs and mod["mod_moy_txt"] != "-" and not is_malus: if (
bul_show_mod_rangs
and (nt.mod_rangs is not None)
and mod["mod_moy_txt"] != "-"
and not is_malus
):
rg = nt.mod_rangs[modimpl["moduleimpl_id"]] rg = nt.mod_rangs[modimpl["moduleimpl_id"]]
if rg[0] is None: if rg[0] is None:
mod["mod_rang_txt"] = "" mod["mod_rang_txt"] = ""

9
app/scodoc/sco_poursuite_dut.py
View File

@ -86,9 +86,12 @@ def etud_get_poursuite_info(sem, etud):
nt.get_etud_mod_moy(modimpl["moduleimpl_id"], etudid) nt.get_etud_mod_moy(modimpl["moduleimpl_id"], etudid)
) )
if noteModule != "NI": # si étudiant inscrit au module if noteModule != "NI": # si étudiant inscrit au module
rangModule = nt.mod_rangs[modimpl["moduleimpl_id"]][0][ if nt.mod_rangs is not None:
etudid rangModule = nt.mod_rangs[modimpl["moduleimpl_id"]][
] 0
][etudid]
else:
rangModule = ""
modules.append([codeModule, noteModule]) modules.append([codeModule, noteModule])
rangs.append(["rang_" + codeModule, rangModule]) rangs.append(["rang_" + codeModule, rangModule])