leonard.montalbano/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Améliore visualisation des évaluations 'cachées' sur la tableau de bord module

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-10-12 22:53:26 +02:00
parent 18cfd383d8
commit a732b8161e
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/scodoc/sco_moduleimpl_status.py
View File

@ -530,6 +530,8 @@ def _ligne_evaluation(
tr_class = "mievr mievr_rattr" tr_class = "mievr mievr_rattr"
else: else:
tr_class = "mievr" tr_class = "mievr"
if not evaluation.visibulletin:
tr_class += " non_visible_inter"
tr_class_1 = "mievr" tr_class_1 = "mievr"
if not first_eval: if not first_eval:
H.append("""<tr><td colspan="8">&nbsp;</td></tr>""") H.append("""<tr><td colspan="8">&nbsp;</td></tr>""")
@ -608,8 +610,14 @@ def _ligne_evaluation(
H.append(arrow_none) H.append(arrow_none)
if etat["evalcomplete"]: if etat["evalcomplete"]:
etat_txt = """(prise en compte)""" etat_txt = f"""(prise en compte{
etat_descr = "notes utilisées dans les moyennes" ""
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: elif etat["evalattente"] and not evaluation.publish_incomplete:
etat_txt = "(prise en compte, mais <b>notes en attente</b>)" etat_txt = "(prise en compte, mais <b>notes en attente</b>)"
etat_descr = "il y a des notes en attente" etat_descr = "il y a des notes en attente"

11
app/static/css/scodoc.css
View File

@ -2054,6 +2054,17 @@ tr.mievr td {
background-color: white; 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 { tr.mievr th {
background-color: white; background-color: white;
} }

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.6.44" SCOVERSION = "9.6.45"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"