jmplace/DocScoDoc
1
0
Fork 0
forked from ScoDoc/DocScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: Affichage moyenne promo par évaluation sur bulletin

Browse Source
This commit is contained in:
viennet 2020-12-25 12:10:37 +01:00
parent 2b5a470516
commit 6af4c6a2fd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sco_bulletins_standard.py
View File

@ -495,7 +495,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
del t["module"] del t["module"]
del t["coef"] del t["coef"]
t["_pdf_style"].append(("SPAN", (colidx["note"], 0), (-1, 0))) t["_pdf_style"].append(("SPAN", (colidx["note"], 0), (-1, 0)))
# t["_module_colspan"] = 3 # non car bug si aucune colonne additionnelle # t["_module_colspan"] = 3 # non car bug si aucune colonne additionnelle
# UE électives # UE électives
if ue["type"] == UE_ELECTIVE: if ue["type"] == UE_ELECTIVE:
t["module"] += " <i>(élective)</i>" t["module"] += " <i>(élective)</i>"
@ -544,8 +544,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
rowstyle="", rowstyle="",
hidden=False, hidden=False,
): ):
"""Liste dans la table les descriptions des modules et, si version != short, des évaluations. """Liste dans la table les descriptions des modules et, si version != short, des évaluations."""
"""
if ue_type == "cur": # UE courante non prise en compte (car capitalisee) if ue_type == "cur": # UE courante non prise en compte (car capitalisee)
pdf_style_bg = [("BACKGROUND", (0, 0), (-1, 0), self.PDF_UE_CUR_BG)] pdf_style_bg = [("BACKGROUND", (0, 0), (-1, 0), self.PDF_UE_CUR_BG)]
else: else:
@ -666,6 +665,8 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
) )
t["min"] = fmt_note(etat["mini"]) t["min"] = fmt_note(etat["mini"])
t["max"] = fmt_note(etat["maxi"]) t["max"] = fmt_note(etat["maxi"])
if prefs["bul_show_moypromo"]:
t["moy"] = fmt_note(etat["moy"])
P.append(t) P.append(t)
nbeval += 1 nbeval += 1
return nbeval return nbeval