martin.murzeau/ScoDocMM
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: edition UE / ref. comp.

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-06-25 23:42:39 +02:00
parent 060b7ad7cd
commit 21460df51a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/but_refcomp.py
View File

@ -124,7 +124,7 @@ class ApcReferentielCompetences(db.Model, XMLModel):
""" """
parcours = self.parcours.order_by(ApcParcours.numero).all() parcours = self.parcours.order_by(ApcParcours.numero).all()
niveaux_by_parcours = { 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 for parcour in parcours
} }
# Cherche tronc commun # Cherche tronc commun

10
app/scodoc/sco_pvjury.py
View File

@ -498,12 +498,10 @@ def formsemestre_pvjury(formsemestre_id, format="html", publish=True):
# XXX TODO # XXX TODO
formsemestre = FormSemestre.query.get_or_404(formsemestre_id) formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
if formsemestre.formation.is_apc() and formsemestre.semestre_id % 2 == 0: if formsemestre.formation.is_apc() and formsemestre.semestre_id % 2 == 0:
return redirect( from app.but import jury_but_recap
url_for(
"notes.formsemestre_jury_but_recap", return jury_but_recap.formsemestre_saisie_jury_but(
scodoc_dept=g.scodoc_dept, formsemestre, readonly=True, mode="recap"
formsemestre_id=formsemestre_id,
)
) )
# /XXX # /XXX
footer = html_sco_header.sco_footer() footer = html_sco_header.sco_footer()