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 +2 -10
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ecb7afdb5 - Show all commits

5
app/scodoc/sco_assiduites.py
View File

@ -467,8 +467,6 @@ def get_assiduites_count_in_interval(
date_debut: datetime = date_debut or datetime.fromisoformat(date_debut_iso)
date_fin: datetime = date_fin or datetime.fromisoformat(date_fin_iso)
log(f"deb : {date_debut.isoformat()} fin: {date_fin.isoformat()}")
assiduites: Query = Assiduite.query.filter_by(etudid=etudid)
assiduites = assiduites.filter(Assiduite.etat == scu.EtatAssiduite.ABSENT)
justificatifs: Justificatif = Justificatif.query.filter_by(etudid=etudid)
@ -481,7 +479,6 @@ def get_assiduites_count_in_interval(
justificatifs = filter_by_date(
justificatifs, Justificatif, date_debut, date_fin
)
log(f"---assi---\n{[a.assiduite_id for a in assiduites]}")
calculator: CountCalculator = CountCalculator()
calculator.compute_assiduites(assiduites)
nb_abs: dict = calculator.to_dict()[metrique]
@ -490,8 +487,6 @@ def get_assiduites_count_in_interval(
etudid, date_debut, date_fin, moduleimpl_id
)
log(f"---justi---\n{[a.assiduite_id for a in abs_just]}")
calculator.reset()
calculator.compute_assiduites(abs_just)
nb_abs_just: dict = calculator.to_dict()[metrique]

7
tests/unit/test_assiduites.py
View File

@ -38,7 +38,6 @@ def test_bi_directional_enum(test_client):
assert BiInt.inverse()[1] == BiInt.A and BiInt.inverse()[2] == BiInt.B
# @pytest.mark.skip # XXX TODO-ASSIDUITE (issue #690)
def test_general(test_client):
"""tests général du modèle assiduite"""
@ -79,9 +78,7 @@ def test_general(test_client):
date_fin="31/07/2024",
)
formsemestre_1 = FormSemestre.get_formsemestre(
formsemestre_id_1
) # Utiliser plutot FormSemestre de nos jours TODO-ASSIDUITE
formsemestre_1 = FormSemestre.get_formsemestre(formsemestre_id_1)
formsemestre_2 = FormSemestre.get_formsemestre(formsemestre_id_2)
formsemestre_3 = FormSemestre.get_formsemestre(formsemestre_id_3)
@ -136,7 +133,7 @@ def test_general(test_client):
etud_faux_dict = g_fake.create_etud(code_nip=None, prenom="etudfaux")
etud_faux = Identite.query.filter_by(id=etud_faux_dict["id"]).first()
# verif_migration_abs_assiduites() // Test à revoir TODO-ASSIDUITE
# verif_migration_abs_assiduites() // Test à revoir TODO-ASSIDUITE (issue #696)
ajouter_assiduites(etuds, moduleimpls, etud_faux)
justificatifs: list[Justificatif] = ajouter_justificatifs(etuds[0])