From a732b8161e322442d093600dd5ceb30ab8743720 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 12 Oct 2023 22:53:26 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9liore=20visualisation=20des=20=C3=A9val?= =?UTF-8?q?uations=20'cach=C3=A9es'=20sur=20la=20tableau=20de=20bord=20mod?= =?UTF-8?q?ule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_moduleimpl_status.py | 12 ++++++++++-- app/static/css/scodoc.css | 11 +++++++++++ sco_version.py | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py index 71f05ccc7..b68726391 100644 --- a/app/scodoc/sco_moduleimpl_status.py +++ b/app/scodoc/sco_moduleimpl_status.py @@ -530,6 +530,8 @@ def _ligne_evaluation( tr_class = "mievr mievr_rattr" else: tr_class = "mievr" + if not evaluation.visibulletin: + tr_class += " non_visible_inter" tr_class_1 = "mievr" if not first_eval: H.append(""" """) @@ -608,8 +610,14 @@ def _ligne_evaluation( H.append(arrow_none) if etat["evalcomplete"]: - etat_txt = """(prise en compte)""" - etat_descr = "notes utilisées dans les moyennes" + etat_txt = f"""(prise en compte{ + "" + if evaluation.visibulletin + else ", cachée en intermédiaire"}) + """ + etat_descr = f"""notes utilisées dans les moyennes{ + ", évaluation cachée sur les bulletins en version intermédiaire et sur la passerelle" + }""" elif etat["evalattente"] and not evaluation.publish_incomplete: etat_txt = "(prise en compte, mais notes en attente)" etat_descr = "il y a des notes en attente" diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 500b41094..c4d760e2d 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -2054,6 +2054,17 @@ tr.mievr td { background-color: white; } +tr.mievr.non_visible_inter td, tr.mievr.non_visible_inter th { + /* background-color: #d2cdc5; */ + background: repeating-linear-gradient( + 45deg, + #f0f0f0, + #f0f0f0 10px, + #e0e0e0 10px, + #e0e0e0 20px +); +} + tr.mievr th { background-color: white; } diff --git a/sco_version.py b/sco_version.py index c9cbef32f..df7c410ab 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.6.44" +SCOVERSION = "9.6.45" SCONAME = "ScoDoc"