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

8
app/scodoc/sco_evaluation_check_abs.py
View File

@ -51,7 +51,7 @@ def evaluation_check_absences(evaluation: Evaluation):
EXC et pas justifie EXC et pas justifie
Ramene 5 listes d'etudid Ramene 5 listes d'etudid
""" """
if not evaluation.date_debut: if not evaluation.date_debut or not evaluation.date_fin:
return [], [], [], [], [] # evaluation sans date return [], [], [], [], [] # evaluation sans date
etudids = [ etudids = [
@ -68,10 +68,8 @@ def evaluation_check_absences(evaluation: Evaluation):
assiduites: Query = Assiduite.query.filter( assiduites: Query = Assiduite.query.filter(
Assiduite.etudid.in_(etudids), Assiduite.etudid.in_(etudids),
Assiduite.etat == scu.EtatAssiduite.ABSENT, Assiduite.etat == scu.EtatAssiduite.ABSENT,
or_( fin >= Assiduite.date_debut,
and_(Assiduite.date_debut >= deb, Assiduite.date_debut <= fin), deb <= Assiduite.date_fin,
and_(Assiduite.date_fin >= deb, Assiduite.date_fin <= fin),
),
) )
abs_etudids = set(assi.etudid for assi in assiduites) abs_etudids = set(assi.etudid for assi in assiduites)

1
app/views/scolar.py
View File

@ -933,6 +933,7 @@ def partition_editor(formsemestre_id: int, edit_partition=False):
formsemestre=formsemestre, formsemestre=formsemestre,
read_only=not formsemestre.can_change_groups(), read_only=not formsemestre.can_change_groups(),
edit_partition=edit_partition, edit_partition=edit_partition,
scu=scu,
), ),
html_sco_header.sco_footer(), html_sco_header.sco_footer(),
] ]