2021-10-11 12:29:33 +02:00
|
|
|
"""Test calculs rattrapages
|
|
|
|
"""
|
2024-02-24 16:49:41 +01:00
|
|
|
|
2023-08-25 17:58:57 +02:00
|
|
|
import datetime
|
2021-10-11 12:29:33 +02:00
|
|
|
|
|
|
|
import app
|
2023-07-11 06:57:38 +02:00
|
|
|
from app import db
|
2022-11-13 14:22:47 +01:00
|
|
|
from app.comp import res_sem
|
|
|
|
from app.comp.res_but import ResultatsSemestreBUT
|
2023-08-30 09:22:51 +02:00
|
|
|
from app.models import Evaluation, FormSemestre, ModuleImpl
|
2022-11-13 14:22:47 +01:00
|
|
|
from app.scodoc import (
|
|
|
|
sco_bulletins,
|
|
|
|
sco_formsemestre,
|
|
|
|
sco_saisie_notes,
|
|
|
|
)
|
2021-10-11 12:29:33 +02:00
|
|
|
from app.scodoc import sco_utils as scu
|
2022-11-13 14:22:47 +01:00
|
|
|
from config import TestConfig
|
|
|
|
from tests.unit import sco_fake_gen
|
2021-10-11 12:29:33 +02:00
|
|
|
|
|
|
|
DEPT = TestConfig.DEPT_TEST
|
|
|
|
|
|
|
|
|
|
|
|
def test_notes_rattrapage(test_client):
|
|
|
|
"""Test quelques opérations élémentaires de ScoDoc
|
2021-10-30 23:27:27 +02:00
|
|
|
Création 1 étudiant, formation, semestre, inscription etudiant,
|
|
|
|
creation 1 evaluation, saisie notes.
|
2021-10-11 12:29:33 +02:00
|
|
|
"""
|
|
|
|
app.set_sco_dept(DEPT)
|
|
|
|
|
|
|
|
G = sco_fake_gen.ScoFake(verbose=False)
|
|
|
|
etuds = [G.create_etud(code_nip=None)] # un seul
|
|
|
|
|
2022-01-15 21:36:06 +01:00
|
|
|
formation_id = G.create_formation(acronyme="")
|
|
|
|
ue_id = G.create_ue(formation_id=formation_id, acronyme="TST1", titre="ue test")
|
|
|
|
matiere_id = G.create_matiere(ue_id=ue_id, titre="matière test")
|
|
|
|
module_id = G.create_module(
|
|
|
|
matiere_id=matiere_id,
|
2021-10-11 12:29:33 +02:00
|
|
|
code="TSM1",
|
|
|
|
coefficient=1.0,
|
|
|
|
titre="module test",
|
|
|
|
)
|
|
|
|
|
|
|
|
# --- Mise place d'un semestre
|
2022-01-15 21:36:06 +01:00
|
|
|
formsemestre_id = G.create_formsemestre(
|
|
|
|
formation_id=formation_id,
|
2021-10-11 12:29:33 +02:00
|
|
|
semestre_id=1,
|
|
|
|
date_debut="01/01/2020",
|
|
|
|
date_fin="30/06/2020",
|
|
|
|
)
|
2022-01-15 21:36:06 +01:00
|
|
|
sem = sco_formsemestre.get_formsemestre(formsemestre_id)
|
|
|
|
moduleimpl_id = G.create_moduleimpl(
|
|
|
|
module_id=module_id,
|
|
|
|
formsemestre_id=formsemestre_id,
|
2021-10-11 12:29:33 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
# --- Inscription des étudiants
|
|
|
|
for etud in etuds:
|
2022-01-15 21:36:06 +01:00
|
|
|
G.inscrit_etudiant(formsemestre_id, etud)
|
2021-10-11 12:29:33 +02:00
|
|
|
# --- Creation évaluation
|
|
|
|
e = G.create_evaluation(
|
2022-01-15 21:36:06 +01:00
|
|
|
moduleimpl_id=moduleimpl_id,
|
2023-08-25 17:58:57 +02:00
|
|
|
date_debut=datetime.datetime(2020, 1, 1),
|
2021-10-11 12:29:33 +02:00
|
|
|
description="evaluation test",
|
|
|
|
coefficient=1.0,
|
|
|
|
)
|
|
|
|
# --- Création d'une évaluation "de rattrapage"
|
|
|
|
e_rat = G.create_evaluation(
|
2022-01-15 21:36:06 +01:00
|
|
|
moduleimpl_id=moduleimpl_id,
|
2023-08-25 17:58:57 +02:00
|
|
|
date_debut=datetime.datetime(2020, 1, 2),
|
2021-10-11 12:29:33 +02:00
|
|
|
description="evaluation rattrapage",
|
|
|
|
coefficient=1.0,
|
2024-02-24 16:49:41 +01:00
|
|
|
evaluation_type=Evaluation.EVALUATION_RATTRAPAGE,
|
2021-10-11 12:29:33 +02:00
|
|
|
)
|
|
|
|
etud = etuds[0]
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e["id"], etudid=etud["etudid"], note=12.0)
|
|
|
|
_ = G.create_note(evaluation_id=e_rat["id"], etudid=etud["etudid"], note=11.0)
|
2022-11-13 14:22:47 +01:00
|
|
|
|
|
|
|
# --- Vérifications internes structures ScoDoc
|
2023-07-11 06:57:38 +02:00
|
|
|
formsemestre = db.session.get(FormSemestre, formsemestre_id)
|
2022-11-13 14:22:47 +01:00
|
|
|
res: ResultatsSemestreBUT = res_sem.load_formsemestre_results(formsemestre)
|
|
|
|
mod_res = res.modimpls_results[moduleimpl_id]
|
2023-07-11 06:57:38 +02:00
|
|
|
moduleimpl = db.session.get(ModuleImpl, moduleimpl_id)
|
2022-11-13 14:22:47 +01:00
|
|
|
# retrouve l'éval. de rattrapage:
|
2024-05-21 20:23:10 +02:00
|
|
|
evals_rat = mod_res.get_evaluations_rattrapage(moduleimpl)
|
|
|
|
assert len(evals_rat) == 1
|
|
|
|
assert evals_rat[0].id == e_rat["id"]
|
2022-11-13 14:22:47 +01:00
|
|
|
# Les deux évaluations sont considérées comme complètes:
|
|
|
|
assert len(mod_res.get_evaluations_completes(moduleimpl)) == 2
|
|
|
|
|
|
|
|
# --- Vérification sur bulletin
|
2021-10-11 12:29:33 +02:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
# Vérifie structure du bulletin:
|
|
|
|
assert b["etudid"] == etud["etudid"]
|
|
|
|
assert len(b["ues"][0]["modules"][0]["evaluations"]) == 2
|
|
|
|
assert len(b["ues"][0]["modules"]) == 1
|
|
|
|
# Note moyenne: ici le ratrapage est inférieur à la note:
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(12.0)
|
|
|
|
# rattrapage > moyenne:
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e_rat["id"], etudid=etud["etudid"], note=18.0)
|
2021-10-11 12:29:33 +02:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(18.0)
|
|
|
|
# rattrapage vs absences
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e["id"], etudid=etud["etudid"], note=None) # abs
|
|
|
|
_ = G.create_note(evaluation_id=e_rat["id"], etudid=etud["etudid"], note=17.0)
|
2021-10-11 12:29:33 +02:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(17.0)
|
|
|
|
# et sans note de rattrapage
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e["id"], etudid=etud["etudid"], note=10.0)
|
|
|
|
_ = G.create_note(evaluation_id=e_rat["id"], etudid=etud["etudid"], note=None)
|
2021-10-11 12:29:33 +02:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(10.0)
|
2022-11-13 14:22:47 +01:00
|
|
|
|
|
|
|
# Supprime toutes les notes de l'évaluation de rattrapage:
|
|
|
|
sco_saisie_notes.evaluation_suppress_alln(e_rat["id"], dialog_confirmed=True)
|
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
# Vérifie structure du bulletin:
|
|
|
|
assert b["etudid"] == etud["etudid"]
|
|
|
|
assert len(b["ues"][0]["modules"][0]["evaluations"]) == 1 # reste une eval normale
|
|
|
|
assert len(b["ues"][0]["modules"]) == 1
|
|
|
|
# Note moyenne: reviens à 10/20
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(10.0)
|
|
|
|
# Supprime l'évaluation de rattrapage:
|
2023-08-30 09:22:51 +02:00
|
|
|
evaluation = db.session.get(Evaluation, e_rat["id"])
|
|
|
|
assert evaluation
|
|
|
|
evaluation.delete()
|
2022-11-13 14:22:47 +01:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
assert len(b["ues"][0]["modules"][0]["evaluations"]) == 1 # reste une eval normale
|
|
|
|
|
|
|
|
# Création évaluation session 2:
|
|
|
|
e_session2 = G.create_evaluation(
|
|
|
|
moduleimpl_id=moduleimpl_id,
|
2023-08-25 17:58:57 +02:00
|
|
|
date_debut=datetime.datetime(2020, 1, 2),
|
2022-11-13 14:22:47 +01:00
|
|
|
description="evaluation session 2",
|
|
|
|
coefficient=1.0,
|
2024-02-24 16:49:41 +01:00
|
|
|
evaluation_type=Evaluation.EVALUATION_SESSION2,
|
2022-11-13 14:22:47 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
res: ResultatsSemestreBUT = res_sem.load_formsemestre_results(formsemestre)
|
|
|
|
mod_res = res.modimpls_results[moduleimpl_id]
|
|
|
|
# retrouve l'éval. de session 2:
|
2024-05-20 23:28:39 +02:00
|
|
|
evals_session2 = mod_res.get_evaluations_session2(moduleimpl)
|
|
|
|
assert len(evals_session2) == 1
|
|
|
|
assert evals_session2[0].id == e_session2["id"]
|
2022-11-13 14:22:47 +01:00
|
|
|
# Les deux évaluations sont considérées comme complètes:
|
|
|
|
assert len(mod_res.get_evaluations_completes(moduleimpl)) == 2
|
|
|
|
|
|
|
|
# Saisie note session 2:
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e_session2["id"], etudid=etud["etudid"], note=5.0)
|
2022-11-13 14:22:47 +01:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
# Note moyenne: utilise session 2 même si inférieure
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(5.0)
|
|
|
|
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e_session2["id"], etudid=etud["etudid"], note=20.0)
|
2022-11-13 14:22:47 +01:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
# Note moyenne: utilise session 2 même si inférieure
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(20.0)
|
|
|
|
|
2024-05-21 20:23:10 +02:00
|
|
|
# Met la note session2 à ABS (None)
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e_session2["id"], etudid=etud["etudid"], note=None)
|
2022-11-13 14:22:47 +01:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
2024-05-21 20:23:10 +02:00
|
|
|
# Note moyenne: zéro car ABS
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(0.0)
|
|
|
|
# Supprime note session 2
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(
|
2024-02-24 17:01:14 +01:00
|
|
|
evaluation_id=e_session2["id"], etudid=etud["etudid"], note=scu.NOTES_SUPPRESS
|
|
|
|
)
|
2024-05-21 20:23:10 +02:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
# Note moyenne: revient à sa valeur initiale, 10/20
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(10.0)
|
|
|
|
# Supprime évaluation session 2
|
2024-02-24 17:01:14 +01:00
|
|
|
evaluation = db.session.get(Evaluation, e_session2["id"])
|
|
|
|
assert evaluation
|
|
|
|
evaluation.delete()
|
|
|
|
#
|
|
|
|
# --- Evaluation bonus ---
|
|
|
|
#
|
|
|
|
# --- Création d'une évaluation "bonus"
|
|
|
|
e_bonus = G.create_evaluation(
|
|
|
|
moduleimpl_id=moduleimpl_id,
|
|
|
|
date_debut=datetime.datetime(2020, 1, 2),
|
|
|
|
description="evaluation bonus",
|
|
|
|
coefficient=1.0,
|
|
|
|
evaluation_type=Evaluation.EVALUATION_BONUS,
|
|
|
|
)
|
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
# Note moyenne sans bonus
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(10.0)
|
|
|
|
# Saisie note bonus
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e_bonus["id"], etudid=etud["etudid"], note=1.0)
|
2024-02-24 17:01:14 +01:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
# Note moyenne sans bonus
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(11.0)
|
|
|
|
# Négatif, avec clip à zéro
|
2024-06-14 20:15:20 +02:00
|
|
|
_ = G.create_note(evaluation_id=e_bonus["id"], etudid=etud["etudid"], note=-20.0)
|
2024-02-24 17:01:14 +01:00
|
|
|
b = sco_bulletins.formsemestre_bulletinetud_dict(
|
|
|
|
sem["formsemestre_id"], etud["etudid"]
|
|
|
|
)
|
|
|
|
assert b["ues"][0]["modules"][0]["mod_moy_txt"] == scu.fmt_note(0.0)
|