diff --git a/app/scodoc/sco_evaluations.py b/app/scodoc/sco_evaluations.py
index 4a9dfb6d..12440d11 100644
--- a/app/scodoc/sco_evaluations.py
+++ b/app/scodoc/sco_evaluations.py
@@ -40,7 +40,6 @@ from flask import request
from app.comp import res_sem
from app.comp.res_compat import NotesTableCompat
from app.models import FormSemestre
-from app.models import ScolarNews
import app.scodoc.sco_utils as scu
from app.scodoc.sco_utils import ModuleType
@@ -217,19 +216,19 @@ def do_evaluation_etat(
(TotalNbMissing > 0)
and (E["evaluation_type"] != scu.EVALUATION_RATTRAPAGE)
and (E["evaluation_type"] != scu.EVALUATION_SESSION2)
- and not is_malus
):
complete = False
else:
complete = True
- if (
- TotalNbMissing > 0
- and ((TotalNbMissing == TotalNbAtt) or E["publish_incomplete"])
- and not is_malus
- ):
- evalattente = True
- else:
- evalattente = False
+
+ complete = (
+ (TotalNbMissing == 0)
+ or (E["evaluation_type"] == scu.EVALUATION_RATTRAPAGE)
+ or (E["evaluation_type"] == scu.EVALUATION_SESSION2)
+ )
+ evalattente = (TotalNbMissing > 0) and (
+ (TotalNbMissing == TotalNbAtt) or E["publish_incomplete"]
+ )
# mais ne met pas en attente les evals immediates sans aucune notes:
if E["publish_incomplete"] and nb_notes == 0:
evalattente = False
diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py
index 170bfdca..84e5766a 100644
--- a/app/scodoc/sco_moduleimpl_status.py
+++ b/app/scodoc/sco_moduleimpl_status.py
@@ -564,7 +564,10 @@ def _ligne_evaluation(
if modimpl.module.ue.type != UE_SPORT:
# Avertissement si coefs x poids nuls
if coef < scu.NOTES_PRECISION:
- H.append("""coef. nul !""")
+ if modimpl.module.module_type == scu.ModuleType.MALUS:
+ H.append("""malus""")
+ else:
+ H.append("""coef. nul !""")
elif is_apc:
# visualisation des poids (Hinton map)
H.append(_evaluation_poids_html(evaluation, max_poids))