From cf7a666374136f26f6572258707cee30bbe85ef8 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 22 Feb 2023 21:41:58 +0100 Subject: [PATCH] =?UTF-8?q?Souligne=20UE=20capitalis=C3=A9es=20dans=20tabl?= =?UTF-8?q?es=20recap.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/css/scodoc.css | 3 ++- app/tables/recap.py | 13 ++++++++----- sco_version.py | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index a30995e4..e377cacb 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -3311,6 +3311,7 @@ td.ue_cmp { td.ue_capitalized, .ue_cap { text-decoration: underline; + text-decoration-thickness: 3px; } h3.sfv { @@ -4263,7 +4264,7 @@ table.table_recap td.moy_ue_warning { color: rgb(255, 0, 0); } -table.table_recap td.col_ues_validables { +table.table_recap td.cap table.table_recap td.col_ues_validables { white-space: nowrap; font-style: normal !important; } diff --git a/app/tables/recap.py b/app/tables/recap.py index 964adae5..d6491e26 100644 --- a/app/tables/recap.py +++ b/app/tables/recap.py @@ -705,22 +705,25 @@ class RowRecap(tb.Row): ] = f"UEs du S{formsemestre.semestre_id} {formsemestre.annee_scolaire()}" col_id = f"moy_ue_{ue.id}" val = ue_status["moy"] - note_class = "" + note_classes = [] if isinstance(val, float): if val < table.barre_moy: - note_class = "moy_inf" + note_classes = ["moy_inf"] elif val >= table.barre_valid_ue: - note_class = "moy_ue_valid" + note_classes = ["moy_ue_valid"] self.nb_ues_validables += 1 if val < table.barre_warning_ue: - note_class = "moy_ue_warning" # notes très basses + note_classes = ["moy_ue_warning"] # notes très basses self.nb_ues_warning += 1 + if ue_status["is_capitalized"]: + note_classes.append("ue_capitalized") + self.add_cell( col_id, ue.acronyme, table.fmt_note(val), group=col_group or f"col_ue_{ue.id}", - classes=[note_class], + classes=note_classes, column_classes={f"col_ue_{ue.id}", "col_moy_ue", "col_ue"}, ) table.foot_title_row.cells[col_id].target_attrs[ diff --git a/sco_version.py b/sco_version.py index b3722bb1..25740e32 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.4.48" +SCOVERSION = "9.4.49" SCONAME = "ScoDoc"