From d5580c7f9f879b13ad0626f0b0ed6f118e413290 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 19 Jul 2024 10:11:02 +0200 Subject: [PATCH] =?UTF-8?q?Titre=20par=20d=C3=A9faut=20formsemestre:=20uti?= =?UTF-8?q?lise=20acronyme=20formation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_edit_formation.py | 4 ++-- app/scodoc/sco_formsemestre_edit.py | 3 +-- app/scodoc/sco_portal_apogee.py | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_edit_formation.py b/app/scodoc/sco_edit_formation.py index addc5847..82d7d8d4 100644 --- a/app/scodoc/sco_edit_formation.py +++ b/app/scodoc/sco_edit_formation.py @@ -186,7 +186,7 @@ def formation_edit(formation_id=None, create=False): "acronyme", { "size": 12, - "explanation": "identifiant de la formation (par ex. DUT R&T)", + "explanation": "identifiant de la formation (par ex. BUT R&T)", "allow_null": False, }, ), @@ -194,7 +194,7 @@ def formation_edit(formation_id=None, create=False): "titre", { "size": 80, - "explanation": "nom complet de la formation (ex: DUT Réseaux et Télécommunications", + "explanation": "nom de la formation (ex: BUT Réseaux et Télécommunications)", "allow_null": False, }, ), diff --git a/app/scodoc/sco_formsemestre_edit.py b/app/scodoc/sco_formsemestre_edit.py index 1fdafb03..dc066f21 100644 --- a/app/scodoc/sco_formsemestre_edit.py +++ b/app/scodoc/sco_formsemestre_edit.py @@ -63,7 +63,6 @@ from app.scodoc.sco_permissions import Permission from app.scodoc.sco_vdi import ApoEtapeVDI from app.scodoc import html_sco_header from app.scodoc import codes_cursus -from app.scodoc import sco_compute_moy from app.scodoc import sco_edit_module from app.scodoc import sco_formsemestre from app.scodoc import sco_groups_copy @@ -77,7 +76,7 @@ from app.scodoc import sco_users def _default_sem_title(formation): """Default title for a semestre in formation""" - return formation.titre + return formation.acronyme def formsemestre_createwithmodules(): diff --git a/app/scodoc/sco_portal_apogee.py b/app/scodoc/sco_portal_apogee.py index 7081f7c9..634002b8 100644 --- a/app/scodoc/sco_portal_apogee.py +++ b/app/scodoc/sco_portal_apogee.py @@ -188,7 +188,8 @@ def get_inscrits_etape( break if not doc: raise ScoValueError( - f"pas de réponse du portail !
(timeout={portal_timeout}, requête: {req})" + f"pas de réponse du portail !
(timeout={portal_timeout}, requête: {req})", + safe=True, ) etuds = _normalize_apo_fields(xml_to_list_of_dicts(doc, req=req))