lehmann/ScoDoc-Front
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Fix: ordre des RCUE sur les bulletins

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-06-17 14:56:04 +02:00
parent f9b4539231
commit 84d40091a8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/but_validations.py
View File

@ -360,9 +360,13 @@ 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 = (
ApcValidationRCUE.query.filter_by(
etudid=etud.id, formsemestre_id=formsemestre.id 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 = []
for dec_rcue in decisions["decision_rcue"]: for dec_rcue in decisions["decision_rcue"]:

2
sco_version.py
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"