diff --git a/app/models/modules.py b/app/models/modules.py index c0bb84ac..e3610148 100644 --- a/app/models/modules.py +++ b/app/models/modules.py @@ -5,7 +5,7 @@ from app import db from app.models import APO_CODE_STR_LEN from app.models.but_refcomp import ApcParcours, app_critiques_modules, parcours_modules from app.scodoc import sco_utils as scu -from app.scodoc.sco_codes_parcours import UE_SPORT +from app.scodoc.codes_cursus import UE_SPORT from app.scodoc.sco_exceptions import ScoValueError from app.scodoc.sco_utils import ModuleType diff --git a/app/tables/jury_recap.py b/app/tables/jury_recap.py index 78ed33b5..94856b68 100644 --- a/app/tables/jury_recap.py +++ b/app/tables/jury_recap.py @@ -23,6 +23,7 @@ from app.comp.res_compat import NotesTableCompat from app.models import ApcNiveau, UniteEns from app.models.etudiants import Identite from app.models.formsemestre import FormSemestre +from app.scodoc import html_sco_header from app.scodoc.codes_cursus import ( BUT_BARRE_RCUE, BUT_RCUE_SUFFISANT, diff --git a/app/tables/recap.py b/app/tables/recap.py index 8ae435c9..1f4a6c89 100644 --- a/app/tables/recap.py +++ b/app/tables/recap.py @@ -12,7 +12,8 @@ import numpy as np from app.auth.models import User from app.comp.res_common import ResultatsSemestre -from app.models import Identite, FormSemestre, UniteEns +from app.models import Identite +from app.models.ues import UniteEns from app.scodoc.codes_cursus import UE_SPORT, DEF from app.scodoc import sco_evaluation_db from app.scodoc import sco_groups diff --git a/app/templates/pn/form_mods.j2 b/app/templates/pn/form_mods.j2 index 21677f40..f88140f1 100644 --- a/app/templates/pn/form_mods.j2 +++ b/app/templates/pn/form_mods.j2 @@ -49,7 +49,7 @@ ({{mod.ue.acronyme}}), {% endif %} - - parcours {{ mod.get_parcours()|map(attribute="code")|join(", ")|default('tronc commun', + - parcours {{ mod.get_cursus()|map(attribute="code")|join(", ")|default('tronc commun', true)|safe }} {% if mod.heures_cours or mod.heures_td or mod.heures_tp %}