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
2 changed files with 7 additions and 3 deletions
Showing only changes of commit 9ee36f5eba - Show all commits

View File

@ -360,8 +360,12 @@ def dict_decision_jury(etud: Identite, formsemestre: FormSemestre) -> dict:
# --- RCUEs: seulement sur semestres pairs XXX à améliorer # --- RCUEs: seulement sur semestres pairs XXX à améliorer
if formsemestre.semestre_id % 2 == 0: if formsemestre.semestre_id % 2 == 0:
# validations émises depuis ce formsemestre: # validations émises depuis ce formsemestre:
validations_rcues = ApcValidationRCUE.query.filter_by( validations_rcues = (
etudid=etud.id, formsemestre_id=formsemestre.id ApcValidationRCUE.query.filter_by(
etudid=etud.id, formsemestre_id=formsemestre.id
)
.join(UniteEns, UniteEns.id == ApcValidationRCUE.ue1_id)
.order_by(UniteEns.numero, UniteEns.acronyme)
) )
decisions["decision_rcue"] = [v.to_dict_bul() for v in validations_rcues] decisions["decision_rcue"] = [v.to_dict_bul() for v in validations_rcues]
titres_rcues = [] titres_rcues = []

View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.4.85" SCOVERSION = "9.4.86"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"