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

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +10 -5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 814a3802e9 - Show all commits

11
app/scodoc/sco_formation_versions.py
View File

@ -200,7 +200,7 @@ def do_formsemestres_associate_new_version(
# New formation: # New formation:
( (
formation_id, new_formation_id,
modules_old2new, modules_old2new,
ues_old2new, ues_old2new,
) = sco_formations.formation_create_new_version(formation_id, redirect=False) ) = sco_formations.formation_create_new_version(formation_id, redirect=False)
@ -219,7 +219,7 @@ def do_formsemestres_associate_new_version(
# re-associate # re-associate
for formsemestre_id in formsemestre_ids: for formsemestre_id in formsemestre_ids:
formsemestre = FormSemestre.get_formsemestre(formsemestre_id) formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
formsemestre.formation_id = formation_id formsemestre.formation_id = new_formation_id
db.session.add(formsemestre) db.session.add(formsemestre)
_reassociate_moduleimpls(formsemestre, ues_old2new, modules_old2new) _reassociate_moduleimpls(formsemestre, ues_old2new, modules_old2new)
@ -246,8 +246,12 @@ def _reassociate_moduleimpls(
Evaluation.moduleimpl_id == ModuleImpl.id, Evaluation.moduleimpl_id == ModuleImpl.id,
ModuleImpl.formsemestre_id == formsemestre.id, ModuleImpl.formsemestre_id == formsemestre.id,
): ):
if poids.ue_id in ues_old2new:
poids.ue_id = ues_old2new[poids.ue_id] poids.ue_id = ues_old2new[poids.ue_id]
db.session.add(poids) db.session.add(poids)
else:
# poids vers une UE qui n'est pas ou plus dans notre formation
db.session.delete(poids)
# update decisions: # update decisions:
for event in ScolarEvent.query.filter_by(formsemestre_id=formsemestre.id): for event in ScolarEvent.query.filter_by(formsemestre_id=formsemestre.id):
@ -258,8 +262,9 @@ def _reassociate_moduleimpls(
for validation in ScolarFormSemestreValidation.query.filter_by( for validation in ScolarFormSemestreValidation.query.filter_by(
formsemestre_id=formsemestre.id formsemestre_id=formsemestre.id
): ):
if validation.ue_id is not None: if (validation.ue_id is not None) and validation.ue_id in ues_old2new:
validation.ue_id = ues_old2new[validation.ue_id] validation.ue_id = ues_old2new[validation.ue_id]
# si l'UE n'est pas ou plus dans notre formation, laisse.
db.session.add(validation) db.session.add(validation)
db.session.commit() db.session.commit()