From 21460df51aacd1261fd242aa43a56bb1571c58d6 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 25 Jun 2022 23:42:39 +0200 Subject: [PATCH] Fix: edition UE / ref. comp. --- app/models/but_refcomp.py | 2 +- app/scodoc/sco_pvjury.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/models/but_refcomp.py b/app/models/but_refcomp.py index 4e4b4b27f..b1aea93e7 100644 --- a/app/models/but_refcomp.py +++ b/app/models/but_refcomp.py @@ -124,7 +124,7 @@ class ApcReferentielCompetences(db.Model, XMLModel): """ parcours = self.parcours.order_by(ApcParcours.numero).all() niveaux_by_parcours = { - parcour.id: ApcNiveau.niveaux_annee_de_parcours(parcour, annee) + parcour.id: ApcNiveau.niveaux_annee_de_parcours(parcour, annee, self) for parcour in parcours } # Cherche tronc commun diff --git a/app/scodoc/sco_pvjury.py b/app/scodoc/sco_pvjury.py index fcc647b78..ecbe19f20 100644 --- a/app/scodoc/sco_pvjury.py +++ b/app/scodoc/sco_pvjury.py @@ -498,12 +498,10 @@ def formsemestre_pvjury(formsemestre_id, format="html", publish=True): # XXX TODO formsemestre = FormSemestre.query.get_or_404(formsemestre_id) if formsemestre.formation.is_apc() and formsemestre.semestre_id % 2 == 0: - return redirect( - url_for( - "notes.formsemestre_jury_but_recap", - scodoc_dept=g.scodoc_dept, - formsemestre_id=formsemestre_id, - ) + from app.but import jury_but_recap + + return jury_but_recap.formsemestre_saisie_jury_but( + formsemestre, readonly=True, mode="recap" ) # /XXX footer = html_sco_header.sco_footer()