opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Minor bugs (edit_ue)

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-06-29 09:08:31 +02:00
parent a02437323b
commit 72144a4952
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scodoc/sco_bulletins_standard.py
View File

@ -439,7 +439,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
ects_txt = "-"
t = {
"titre": ue["acronyme"] + " " + ue["titre"],
"titre": ue["acronyme"] + " " + (ue["titre"] or ""),
"_titre_html": plusminus
+ ue["acronyme"]
+ " "

21
app/scodoc/sco_edit_ue.py
View File

@ -312,8 +312,7 @@ def ue_edit(ue_id=None, create=False, formation_id=None, default_semestre_idx=No
"type": "int",
"allow_null": False,
"title": parcours.SESSION_NAME.capitalize(),
"explanation": "%s de l'UE dans la formation"
% parcours.SESSION_NAME,
"explanation": f"{parcours.SESSION_NAME} de l'UE dans la formation",
"labels": ["non spécifié"] + [str(x) for x in semestres_indices],
"allowed_values": [""] + semestres_indices,
},
@ -464,9 +463,7 @@ def ue_edit(ue_id=None, create=False, formation_id=None, default_semestre_idx=No
+ ue_div
+ html_sco_header.sco_footer()
)
else:
if not tf[2]: # ceci ne devrait pas arriver
raise ScoValueError("Merci de reprendre l'opération")
elif tf[2]:
if create:
if not tf[2]["ue_code"]:
del tf[2]["ue_code"]
@ -499,12 +496,24 @@ def ue_edit(ue_id=None, create=False, formation_id=None, default_semestre_idx=No
else:
do_ue_edit(tf[2])
flash("UE modifiée")
if tf[2]:
dest_semestre_idx = tf[2]["semestre_idx"]
elif ue:
dest_semestre_idx = ue.semestre_idx
elif default_semestre_idx:
dest_semestre_idx = default_semestre_idx
elif "semestre_idx" in request.form:
dest_semestre_idx = request.form["semestre_idx"]
else:
dest_semestre_idx = 1
return flask.redirect(
url_for(
"notes.ue_table",
scodoc_dept=g.scodoc_dept,
formation_id=formation_id,
semestre_idx=tf[2]["semestre_idx"],
semestre_idx=dest_semestre_idx,
)
)