opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +16 -7
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee601071f5 - Show all commits

4
app/scodoc/sco_formsemestre_status.py
View File

@ -1290,7 +1290,7 @@ def formsemestre_tableau_modules(
nb_evals = etat["nb_evals"] nb_evals = etat["nb_evals"]
if nb_evals != 0: if nb_evals != 0:
if etat["nb_evals_blocked"] > 0: if etat["nb_evals_blocked"] > 0:
blocked_txt = f""", <span class="nb_evals_blocked">{ blocked_txt = f"""<span class="nb_evals_blocked">{
etat["nb_evals_blocked"]} bloquée{'s' etat["nb_evals_blocked"]} bloquée{'s'
if etat["nb_evals_blocked"] > 1 else ''}</span>""" if etat["nb_evals_blocked"] > 1 else ''}</span>"""
else: else:
@ -1312,7 +1312,7 @@ def formsemestre_tableau_modules(
if etat["attente"]: if etat["attente"]:
H.append( H.append(
f""" <span><a class="redlink" href="{moduleimpl_status_url}" f""" <span><a class="redlink" href="{moduleimpl_status_url}"
title="Il y a des notes en attente">[en attente]</a></span>""" title="Il y a des notes en attente"><span class="evals_attente">en attente</span></a></span>"""
) )
if not mod_is_conforme: if not mod_is_conforme:
H.append( H.append(

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

@ -1821,12 +1821,20 @@ tr.modimpl_non_conforme td, tr.modimpl_attente td {
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
} }
tr.modimpl_has_blocked span.nb_evals_blocked { tr.modimpl_has_blocked span.nb_evals_blocked, tr span.evals_attente {
font-weight: bold;
color: red;
background-color: yellow; background-color: yellow;
padding-left: 2px; border-radius: 4px;
padding-right: 2px; 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 { table.formsemestre_status a.redlink {
text-decoration: none; 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 { tr.mievr_in.evaluation_blocked td, tr.mievr_in.evaluation_blocked th {
background-color: rgb(195, 235, 255); background-color: rgb(195, 235, 255);
padding-top: 4px;
} }