IDK/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge bugfixes from 9.5.1

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-07-12 14:15:15 +02:00
commit f4547c37c5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scodoc/sco_bulletins.py
View File

@ -945,7 +945,7 @@ def formsemestre_bulletinetud(
)[0] )[0]
if format not in {"html", "pdfmail"}: if format not in {"html", "pdfmail"}:
filename = scu.bul_filename(formsemestre, etud, format) filename = scu.bul_filename(formsemestre, etud)
mime, suffix = scu.get_mime_suffix(format) mime, suffix = scu.get_mime_suffix(format)
return scu.send_file(bulletin, filename, mime=mime, suffix=suffix) return scu.send_file(bulletin, filename, mime=mime, suffix=suffix)
elif format == "pdfmail": elif format == "pdfmail":

2
app/scodoc/sco_cursus_dut.py
View File

@ -969,7 +969,7 @@ def do_formsemestre_validate_ue(
if (code == ADM) and (moy_ue is None): if (code == ADM) and (moy_ue is None):
# stocke la moyenne d'UE capitalisée: # stocke la moyenne d'UE capitalisée:
ue_status = nt.get_etud_ue_status(etudid, ue_id) ue_status = nt.get_etud_ue_status(etudid, ue_id)
moy_ue = ue_status["moy"] if ue_status else "" args["moy_ue"] = ue_status["moy"] if ue_status else ""
log("formsemestre_validate_ue: create %s" % args) log("formsemestre_validate_ue: create %s" % args)
if code is not None: if code is not None:

2
app/scodoc/sco_groups.py
View File

@ -1523,7 +1523,7 @@ def create_etapes_partition(formsemestre_id, partition_name="apo_etapes"):
) )
partition: Partition = db.session.get(Partition, pid) partition: Partition = db.session.get(Partition, pid)
groups = partition.groups groups = partition.groups
groups_by_names = {g["group_name"]: g for g in groups} groups_by_names = {g.group_name: g for g in groups}
for etape in etapes: for etape in etapes:
if etape not in groups_by_names: if etape not in groups_by_names:
new_group = create_group(pid, etape) new_group = create_group(pid, etape)

6
app/scodoc/sco_utils.py
View File

@ -838,10 +838,10 @@ def bul_filename_old(sem: dict, etud: dict, format):
return filename return filename
def bul_filename(formsemestre, etud, format): def bul_filename(formsemestre, etud):
"""Build a filename for this bulletin""" """Build a filename for this bulletin (without suffix)"""
dt = time.strftime("%Y-%m-%d") dt = time.strftime("%Y-%m-%d")
filename = f"bul-{formsemestre.titre_num()}-{dt}-{etud.nom}.{format}" filename = f"bul-{formsemestre.titre_num()}-{dt}-{etud.nom}"
filename = make_filename(filename) filename = make_filename(filename)
return filename return filename