From 5eeb23c61c23ff9e41a691aaff46ffc5e16574ac Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Mon, 17 Mar 2025 12:27:37 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9liorer=20message=20avertissement=20asso?=
=?UTF-8?q?ciations=20UEs/Niveaux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/but/cursus_but.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/but/cursus_but.py b/app/but/cursus_but.py
index a31f3400..51891ab1 100644
--- a/app/but/cursus_but.py
+++ b/app/but/cursus_but.py
@@ -645,13 +645,15 @@ def formsemestre_warning_apc_setup(
ues_parcour = formsemestre.formation.query_ues_parcour(parcour).filter(
UniteEns.semestre_idx == formsemestre.semestre_id
)
- ues_niveaux_ids = {
- ue.niveau_competence.id for ue in ues_parcour if ue.niveau_competence
- }
- if niveaux_ids != ues_niveaux_ids:
+ ues_with_niveaux = sorted(
+ (ue for ue in ues_parcour if ue.niveau_competence), key=lambda ue: ue.numero
+ )
+ niveaux_ues_ids = {ue.niveau_competence_id for ue in ues_with_niveaux}
+ if niveaux_ids != niveaux_ues_ids:
+ ue_accros = ", ".join(ue.acronyme for ue in ues_with_niveaux)
H.append(
f"""Parcours {parcour.code if parcour else "Tronc commun"} :
- {len(ues_niveaux_ids)} UE avec niveaux
+ {len(ues_with_niveaux)} UE avec niveaux: {ue_accros},
mais {len(niveaux_ids)} niveaux à valider !
"""
)
--
GitLab