From 27271e5c9621b6d243fb1c5f8bd0ae6c8e7d884b Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 24 Jun 2022 04:16:31 +0200
Subject: [PATCH] Cosmetic / n'affiche pas ECTS pour UE bonus

---
 app/but/forms/refcomp_forms.py |  2 +-
 app/scodoc/sco_edit_apc.py     |  2 +-
 app/static/css/jury_but.css    | 13 ++++++++++++-
 app/templates/pn/form_ues.html | 10 ++++++++--
 app/views/notes.py             | 10 ++++++----
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/app/but/forms/refcomp_forms.py b/app/but/forms/refcomp_forms.py
index b39ea2131..ee67cba28 100644
--- a/app/but/forms/refcomp_forms.py
+++ b/app/but/forms/refcomp_forms.py
@@ -25,7 +25,7 @@ class RefCompLoadForm(FlaskForm):
         "Choisir un référentiel de compétences officiel BUT"
     )
     upload = FileField(
-        label="Ou bien sélectionner un fichier XML au format Orébut",
+        label="... ou bien sélectionner un fichier XML au format Orébut (réservé aux développeurs !)",
         validators=[
             FileAllowed(
                 [
diff --git a/app/scodoc/sco_edit_apc.py b/app/scodoc/sco_edit_apc.py
index 8cb516a5a..7e71f51d1 100644
--- a/app/scodoc/sco_edit_apc.py
+++ b/app/scodoc/sco_edit_apc.py
@@ -76,7 +76,7 @@ def html_edit_formation_apc(
         ues_by_sem[semestre_idx] = formation.ues.filter_by(
             semestre_idx=semestre_idx
         ).order_by(UniteEns.semestre_idx, UniteEns.numero, UniteEns.acronyme)
-        ects = [ue.ects for ue in ues_by_sem[semestre_idx]]
+        ects = [ue.ects for ue in ues_by_sem[semestre_idx] if ue.type != UE_SPORT]
         if None in ects:
             ects_by_sem[semestre_idx] = '<span class="missing_ue_ects">manquant</span>'
         else:
diff --git a/app/static/css/jury_but.css b/app/static/css/jury_but.css
index 1182096a9..642fab4c6 100644
--- a/app/static/css/jury_but.css
+++ b/app/static/css/jury_but.css
@@ -1,9 +1,20 @@
 /* Saisie décision de jury BUT */
 
-.jury_but {
+.jury_but form {
     font-family: Verdana, Geneva, Tahoma, sans-serif;
 }
 
+.jury_but .titre_parcours {
+    font-size: 130%;
+    padding-bottom: 12px;
+}
+
+.jury_but .nom_etud {
+    font-size: 100%;
+    font-weight: bold;
+    padding-bottom: 12px;
+}
+
 .but_annee {
     display: inline-grid;
     grid-template-columns: repeat(4, auto);
diff --git a/app/templates/pn/form_ues.html b/app/templates/pn/form_ues.html
index a867bfc95..fed118333 100644
--- a/app/templates/pn/form_ues.html
+++ b/app/templates/pn/form_ues.html
@@ -43,8 +43,14 @@
                     {% set virg = joiner(", ") %}
                     <span class="ue_code">(
                         {%- if ue.ue_code -%}{{ virg() }}code {{ue.ue_code}} {%- endif -%} 
-                        {{ virg() }}{{ue.ects if ue.ects is not none 
-                        else '<span class="missing_ue_ects">aucun</span>'|safe}} ECTS)
+                        {{ virg() }}
+                        {%- if ue.type == 0 -%}
+                            {{ue.ects 
+                                if ue.ects is not none 
+                                else '<span class="missing_ue_ects">aucun</span>'|safe
+                            }} ECTS
+                        {%- endif -%}
+                    )
                     </span>
                 </span>
                 {% if (ue.niveau_competence is none) and ue.type == 0 %}
diff --git a/app/views/notes.py b/app/views/notes.py
index 715be55a4..b13b2667f 100644
--- a/app/views/notes.py
+++ b/app/views/notes.py
@@ -2263,12 +2263,14 @@ def formsemestre_validation_but(formsemestre_id: int, etudid: int):
         )
     H.append(
         f"""
-    <form method="POST">
-    <div class="titre_parcours">
-    <h2>Jury BUT{deca.annee_but}
+    <div>
+    <div class="titre_parcours">Jury BUT{deca.annee_but}
     - Parcours {(deca.parcour.libelle if deca.parcour else False) or "non spécifié"}
-    - {deca.annee_scolaire_str()}</h2>
+    - {deca.annee_scolaire_str()}</div>
+    <div class="nom_etud">{etud.nomprenom}</div>
     </div>
+    
+    <form method="POST">
     <div class="but_section_annee">
         <div>
         <b>Décision de jury pour l'année :</b> {