From f5bc6fb1d197d3abb2e1ee3a7174a3c27d9f827d Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 10 Feb 2022 11:54:03 +0100
Subject: [PATCH] =?UTF-8?q?affiche=20UE=20capitalis=C3=A9es=20sur=20bullet?=
 =?UTF-8?q?ins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_bulletins.py          | 14 ++++++--------
 app/scodoc/sco_bulletins_legacy.py   |  2 +-
 app/scodoc/sco_bulletins_standard.py |  8 +++++++-
 app/static/css/scodoc.css            | 11 +++++++++--
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py
index 41f79ce0..beb224d0 100644
--- a/app/scodoc/sco_bulletins.py
+++ b/app/scodoc/sco_bulletins.py
@@ -352,18 +352,16 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"):
         ] = []  # modules de l'UE capitalisée (liste vide si pas capitalisée)
         if ue_status["is_capitalized"]:
             sem_origin = sco_formsemestre.get_formsemestre(ue_status["formsemestre_id"])
-            u["ue_descr_txt"] = "Capitalisée le %s" % ndb.DateISOtoDMY(
+            u["ue_descr_txt"] = "capitalisée le %s" % ndb.DateISOtoDMY(
                 ue_status["event_date"]
             )
             u[
                 "ue_descr_html"
-            ] = '<a href="formsemestre_bulletinetud?formsemestre_id=%s&etudid=%s" title="%s" class="bull_link">%s</a>' % (
-                sem_origin["formsemestre_id"],
-                etudid,
-                sem_origin["titreannee"],
-                u["ue_descr_txt"],
-            )
-            # log('cap details   %s' % ue_status['moy'])
+            ] = f"""<a href="{ url_for( 'notes.formsemestre_bulletinetud',
+            scodoc_dept=g.scodoc_dept, formsemestre_id=sem_origin['formsemestre_id'], etudid=etudid)}"
+            title="{sem_origin['titreannee']}" class="bull_link"
+            >{u["ue_descr_txt"]} pouet</a>
+            """
             if ue_status["moy"] != "NA" and ue_status["formsemestre_id"]:
                 # detail des modules de l'UE capitalisee
                 # nt_cap = sco_cache.NotesTableCache.get(
diff --git a/app/scodoc/sco_bulletins_legacy.py b/app/scodoc/sco_bulletins_legacy.py
index 8be1d0c5..fcc714e3 100644
--- a/app/scodoc/sco_bulletins_legacy.py
+++ b/app/scodoc/sco_bulletins_legacy.py
@@ -169,7 +169,7 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
                                 )
                             )
 
-        # Contenu table: UE apres UE
+        # Contenu table: UE après UE
         for ue in I["ues"]:
             ue_descr = ue["ue_descr_html"]
             coef_ue = ue["coef_ue_txt"]
diff --git a/app/scodoc/sco_bulletins_standard.py b/app/scodoc/sco_bulletins_standard.py
index 12dd9d12..0cae4b92 100644
--- a/app/scodoc/sco_bulletins_standard.py
+++ b/app/scodoc/sco_bulletins_standard.py
@@ -430,7 +430,13 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
 
                 t = {
                     "titre": ue["acronyme"] + " " + ue["titre"],
-                    "_titre_html": plusminus + ue["acronyme"] + " " + ue["titre"],
+                    "_titre_html": plusminus
+                    + ue["acronyme"]
+                    + " "
+                    + ue["titre"]
+                    + ' <span class="bul_ue_descr">'
+                    + ue["ue_descr_txt"]
+                    + "</span>",
                     "_titre_help": ue["ue_descr_txt"],
                     "_titre_colspan": 2,
                     "module": ue_descr,
diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css
index 8ca51f7b..e8893085 100644
--- a/app/static/css/scodoc.css
+++ b/app/static/css/scodoc.css
@@ -1959,7 +1959,6 @@ tr.notes_bulletin_row_ue {
 
 tr.bul_row_ue_cur {
    background-color: rgb(180,180,180);
-   color: rgb(50,50,50);
 }
 
 tr.bul_row_ue_cap {
@@ -2004,6 +2003,11 @@ tr.notes_bulletin_row_eval td.module {
   border-left: 1px dashed rgb(170,170,170);
 }
 
+span.bul_ue_descr {
+  font-weight: normal;
+  font-style: italic;
+}
+
 table.notes_bulletin td.note {
   padding-left: 1em;
 }
@@ -2012,10 +2016,13 @@ table.notes_bulletin td.min, table.notes_bulletin td.max, table.notes_bulletin t
 }
 
 table.notes_bulletin tr.notes_bulletin_row_ue_cur td.note, table.notes_bulletin tr.notes_bulletin_row_ue_cur td.min, table.notes_bulletin tr.notes_bulletin_row_ue_cur td.max {
-  color: rgb(80,80,80);
   font-style: italic; 
 }
 
+table.notes_bulletin tr.bul_row_ue_cur td, table.notes_bulletin tr.bul_row_ue_cur td a {
+  color:rgb(114, 89, 89);
+}
+
 .note_bold {
    font-weight: bold; 
 }