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

Affichage poids sur tableau de bord module: normalisation par evaluation_type. Closes #886

Browse Source
This commit is contained in:
Emmanuel Viennet 2024-05-29 12:12:31 +02:00
parent e44d3fd5dc
commit e7f23efe65
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/scodoc/sco_moduleimpl_status.py
View File

@ -214,13 +214,22 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None):
Evaluation.date_debut.desc(), Evaluation.date_debut.desc(),
).all() ).all()
nb_evaluations = len(evaluations) nb_evaluations = len(evaluations)
max_poids = max( # Le poids max pour chaque catégorie d'évaluation
[ max_poids_by_type: dict[int, float] = {}
max([p.poids for p in e.ue_poids] or [0]) * (e.coefficient or 0.0) for eval_type in (
for e in evaluations Evaluation.EVALUATION_NORMALE,
] Evaluation.EVALUATION_RATTRAPAGE,
or [0] Evaluation.EVALUATION_SESSION2,
) Evaluation.EVALUATION_BONUS,
):
max_poids_by_type[eval_type] = max(
[
max([p.poids for p in e.ue_poids] or [0]) * (e.coefficient or 0.0)
for e in evaluations
if e.evaluation_type == eval_type
]
or [0.0]
)
# #
sem_locked = not formsemestre.etat sem_locked = not formsemestre.etat
can_edit_evals = ( can_edit_evals = (
@ -481,7 +490,7 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None):
eval_index=eval_index, eval_index=eval_index,
nb_evals=nb_evaluations, nb_evals=nb_evaluations,
is_apc=nt.is_apc, is_apc=nt.is_apc,
max_poids=max_poids, max_poids=max_poids_by_type.get(evaluation.evaluation_type, 10000.0),
) )
) )
eval_index -= 1 eval_index -= 1