iziram/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues 12 Pull Requests Projects 1 Releases Wiki Activity

Liste notes BUT: ajout moyennes des moyennes d'UE

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-03-23 23:02:10 +01:00
parent a07c2c247f
commit 62feba8f33
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/scodoc/sco_liste_notes.py
View File

@ -27,6 +27,8 @@
"""Liste des notes d'une évaluation """Liste des notes d'une évaluation
""" """
from collections import defaultdict
import numpy as np
import flask import flask
from flask import url_for, g, request from flask import url_for, g, request
@ -848,15 +850,8 @@ def _add_apc_columns(
nt: NotesTableCompat = res_sem.load_formsemestre_results(modimpl.formsemestre) nt: NotesTableCompat = res_sem.load_formsemestre_results(modimpl.formsemestre)
modimpl_results: ModuleImplResults = nt.modimpls_results[modimpl.id] modimpl_results: ModuleImplResults = nt.modimpls_results[modimpl.id]
# XXX A ENLEVER TODO sum_by_ue = defaultdict(float)
# modimpl = ModuleImpl.query.get(moduleimpl_id) nb_notes_by_ue = defaultdict(int)
# evals_notes, evaluations, evaluations_completes = moy_mod.df_load_modimpl_notes(
# moduleimpl_id
# )
# etuds_moy_module = moy_mod.compute_module_moy(
# evals_notes, evals_poids, evaluations, evaluations_completes
# )
if is_conforme: if is_conforme:
# valeur des moyennes vers les UEs: # valeur des moyennes vers les UEs:
for row in rows: for row in rows:
@ -864,6 +859,9 @@ def _add_apc_columns(
moy_ue = modimpl_results.etuds_moy_module[ue.id].get(row["etudid"], "?") moy_ue = modimpl_results.etuds_moy_module[ue.id].get(row["etudid"], "?")
row[f"moy_ue_{ue.id}"] = scu.fmt_note(moy_ue, keep_numeric=keep_numeric) row[f"moy_ue_{ue.id}"] = scu.fmt_note(moy_ue, keep_numeric=keep_numeric)
row[f"_moy_ue_{ue.id}_class"] = "moy_ue" row[f"_moy_ue_{ue.id}_class"] = "moy_ue"
if isinstance(moy_ue, float) and not np.isnan(moy_ue):
sum_by_ue[ue.id] += moy_ue
nb_notes_by_ue[ue.id] += 1
# Nom et coefs des UE (lignes titres): # Nom et coefs des UE (lignes titres):
ue_coefs = modimpl.module.ue_coefs ue_coefs = modimpl.module.ue_coefs
if is_conforme: if is_conforme:
@ -878,3 +876,9 @@ def _add_apc_columns(
if coefs: if coefs:
row_coefs[f"moy_ue_{ue.id}"] = coefs[0].coef row_coefs[f"moy_ue_{ue.id}"] = coefs[0].coef
row_coefs[f"_moy_ue_{ue.id}_td_attrs"] = f' class="{coef_class}" ' row_coefs[f"_moy_ue_{ue.id}_td_attrs"] = f' class="{coef_class}" '
modimpl_results.etuds_moy_module[ue.id]
if nb_notes_by_ue[ue.id] > 0:
row_moys[col_id] = "%.3g" % (sum_by_ue[ue.id] / nb_notes_by_ue[ue.id])
row_moys["_" + col_id + "_help"] = "moyenne des moyennes"
else:
row_moys[col_id] = ""