Fix: bulletins oldjson des dém.

This commit is contained in:
Emmanuel Viennet 2021-12-17 21:36:34 +01:00
parent ff1e503d30
commit 71615613f1
3 changed files with 10 additions and 1 deletions

View File

@ -33,6 +33,7 @@ import json
from app.but import bulletin_but
from app.models.formsemestre import FormSemestre
from app.models.etudiants import Identite
import app.scodoc.sco_utils as scu
import app.scodoc.notesdb as ndb
@ -86,6 +87,7 @@ def formsemestre_bulletinetud_published_dict(
from app.scodoc import sco_bulletins
formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
etud = Identite.query.get(etudid)
sem = sco_formsemestre.get_formsemestre(formsemestre_id)
if formsemestre.formation.is_apc():
@ -139,6 +141,11 @@ def formsemestre_bulletinetud_published_dict(
if not published:
return d # stop !
etat_inscription = etud.etat_inscription(formsemestre.id)
if etat_inscription != scu.INSCRIT:
d.update(dict_decision_jury(etudid, formsemestre_id, with_decisions=True))
return d
# Groupes:
partitions = sco_groups.get_partitions_list(formsemestre_id, with_default=False)
partitions_etud_groups = {} # { partition_id : { etudid : group } }

View File

@ -35,7 +35,6 @@ Optimisation possible:
"""
import collections
import operator
import re
import time
from xml.etree import ElementTree
@ -45,6 +44,7 @@ import flask
from flask import g, request
from flask import url_for, make_response
from app import db
from app.models.groups import Partition
import app.scodoc.sco_utils as scu
import app.scodoc.notesdb as ndb

View File

@ -285,6 +285,8 @@ def formsemestre_bulletinetud(
prefer_mail_perso=False,
code_nip=None,
):
if not formsemestre_id:
flask.abort(404, "argument manquant: formsemestre_id")
formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
if formsemestre.formation.is_apc() and format != "oldjson":
if etudid: