dubacq/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Amélioration édition module

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-05-29 17:31:29 +02:00
parent 45449f0465
commit 6596bd778c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/scodoc/sco_edit_module.py
View File

@ -272,7 +272,7 @@ def module_edit(
from app.scodoc import sco_tag_module from app.scodoc import sco_tag_module
# --- Détermination de la formation # --- Détermination de la formation
orig_semestre_idx = None orig_semestre_idx = semestre_id
ue = None ue = None
if create: if create:
if matiere_id: if matiere_id:
@ -331,10 +331,16 @@ def module_edit(
) )
semestres_indices = list(range(1, parcours.NB_SEM + 1)) semestres_indices = list(range(1, parcours.NB_SEM + 1))
# Toutes les UE de la formation (tout parcours): # Toutes les UEs de la formation (tout parcours):
ues = formation.ues.order_by( ues = formation.ues.order_by(
UniteEns.semestre_idx, UniteEns.numero, UniteEns.acronyme UniteEns.semestre_idx, UniteEns.numero, UniteEns.acronyme
).all() ).all()
# L'UE de rattachement par défaut: 1ere du semestre
ue_default = (
formation.ues.filter_by(semestre_idx=orig_semestre_idx)
.order_by(UniteEns.numero, UniteEns.acronyme)
.first()
)
# --- Titre de la page # --- Titre de la page
if create: if create:
@ -535,6 +541,13 @@ def module_edit(
"default": formation.id, "default": formation.id,
}, },
), ),
(
"semestre_id",
{
"input_type": "hidden",
"default": orig_semestre_idx,
},
),
] ]
if module: if module:
descr += [ descr += [
@ -582,6 +595,7 @@ def module_edit(
for u in ues for u in ues
], ],
"allowed_values": [u.id for u in ues], "allowed_values": [u.id for u in ues],
"default": ue_default.id if ue_default is not None else "",
}, },
), ),
] ]