opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +13 -11
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14aa70fdc5 - Show all commits

19
app/scodoc/sco_evaluations.py
View File

@ -40,7 +40,6 @@ from flask import request
from app.comp import res_sem from app.comp import res_sem
from app.comp.res_compat import NotesTableCompat from app.comp.res_compat import NotesTableCompat
from app.models import FormSemestre from app.models import FormSemestre
from app.models import ScolarNews
import app.scodoc.sco_utils as scu import app.scodoc.sco_utils as scu
from app.scodoc.sco_utils import ModuleType from app.scodoc.sco_utils import ModuleType
@ -217,19 +216,19 @@ def do_evaluation_etat(
(TotalNbMissing > 0) (TotalNbMissing > 0)
and (E["evaluation_type"] != scu.EVALUATION_RATTRAPAGE) and (E["evaluation_type"] != scu.EVALUATION_RATTRAPAGE)
and (E["evaluation_type"] != scu.EVALUATION_SESSION2) and (E["evaluation_type"] != scu.EVALUATION_SESSION2)
and not is_malus
): ):
complete = False complete = False
else: else:
complete = True complete = True
if (
TotalNbMissing > 0 complete = (
and ((TotalNbMissing == TotalNbAtt) or E["publish_incomplete"]) (TotalNbMissing == 0)
and not is_malus or (E["evaluation_type"] == scu.EVALUATION_RATTRAPAGE)
): or (E["evaluation_type"] == scu.EVALUATION_SESSION2)
evalattente = True )
else: evalattente = (TotalNbMissing > 0) and (
evalattente = False (TotalNbMissing == TotalNbAtt) or E["publish_incomplete"]
)
# mais ne met pas en attente les evals immediates sans aucune notes: # mais ne met pas en attente les evals immediates sans aucune notes:
if E["publish_incomplete"] and nb_notes == 0: if E["publish_incomplete"] and nb_notes == 0:
evalattente = False evalattente = False

5
app/scodoc/sco_moduleimpl_status.py
View File

@ -564,7 +564,10 @@ def _ligne_evaluation(
if modimpl.module.ue.type != UE_SPORT: if modimpl.module.ue.type != UE_SPORT:
# Avertissement si coefs x poids nuls # Avertissement si coefs x poids nuls
if coef < scu.NOTES_PRECISION: if coef < scu.NOTES_PRECISION:
H.append("""<span class="eval_warning_coef">coef. nul !</span>""") if modimpl.module.module_type == scu.ModuleType.MALUS:
H.append("""<span class="eval_warning_coef">malus</span>""")
else:
H.append("""<span class="eval_warning_coef">coef. nul !</span>""")
elif is_apc: elif is_apc:
# visualisation des poids (Hinton map) # visualisation des poids (Hinton map)
H.append(_evaluation_poids_html(evaluation, max_poids)) H.append(_evaluation_poids_html(evaluation, max_poids))