diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index ed76196e..c5fce57b 100755 --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -1290,7 +1290,7 @@ def formsemestre_tableau_modules( nb_evals = etat["nb_evals"] if nb_evals != 0: if etat["nb_evals_blocked"] > 0: - blocked_txt = f""", { + blocked_txt = f"""{ etat["nb_evals_blocked"]} bloquée{'s' if etat["nb_evals_blocked"] > 1 else ''}""" else: @@ -1312,7 +1312,7 @@ def formsemestre_tableau_modules( if etat["attente"]: H.append( f""" [en attente]""" + title="Il y a des notes en attente">en attente""" ) if not mod_is_conforme: H.append( diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index c0671169..84e09201 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -1821,12 +1821,20 @@ tr.modimpl_non_conforme td, tr.modimpl_attente td { padding-top: 4px; padding-bottom: 4px; } -tr.modimpl_has_blocked span.nb_evals_blocked { - font-weight: bold; - color: red; +tr.modimpl_has_blocked span.nb_evals_blocked, tr span.evals_attente { background-color: yellow; - padding-left: 2px; - padding-right: 2px; + border-radius: 4px; + font-weight: bold; + margin-left: 8px; + padding-left: 4px; + padding-right: 4px; +} +tr.modimpl_has_blocked span.nb_evals_blocked { + color: red; +} +tr span.evals_attente { + background-color: orange; + color: green; } table.formsemestre_status a.redlink { text-decoration: none; @@ -2177,6 +2185,7 @@ tr.mievr_tit.evaluation_blocked td,tr.mievr_tit.evaluation_blocked th { } tr.mievr_in.evaluation_blocked td, tr.mievr_in.evaluation_blocked th { background-color: rgb(195, 235, 255); + padding-top: 4px; }