forked from ScoDoc/ScoDoc
affiche UE capitalisées sur bulletins
This commit is contained in:
parent
4465a735fc
commit
f5bc6fb1d1
@ -352,18 +352,16 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"):
|
||||
] = [] # modules de l'UE capitalisée (liste vide si pas capitalisée)
|
||||
if ue_status["is_capitalized"]:
|
||||
sem_origin = sco_formsemestre.get_formsemestre(ue_status["formsemestre_id"])
|
||||
u["ue_descr_txt"] = "Capitalisée le %s" % ndb.DateISOtoDMY(
|
||||
u["ue_descr_txt"] = "capitalisée le %s" % ndb.DateISOtoDMY(
|
||||
ue_status["event_date"]
|
||||
)
|
||||
u[
|
||||
"ue_descr_html"
|
||||
] = '<a href="formsemestre_bulletinetud?formsemestre_id=%s&etudid=%s" title="%s" class="bull_link">%s</a>' % (
|
||||
sem_origin["formsemestre_id"],
|
||||
etudid,
|
||||
sem_origin["titreannee"],
|
||||
u["ue_descr_txt"],
|
||||
)
|
||||
# log('cap details %s' % ue_status['moy'])
|
||||
] = f"""<a href="{ url_for( 'notes.formsemestre_bulletinetud',
|
||||
scodoc_dept=g.scodoc_dept, formsemestre_id=sem_origin['formsemestre_id'], etudid=etudid)}"
|
||||
title="{sem_origin['titreannee']}" class="bull_link"
|
||||
>{u["ue_descr_txt"]} pouet</a>
|
||||
"""
|
||||
if ue_status["moy"] != "NA" and ue_status["formsemestre_id"]:
|
||||
# detail des modules de l'UE capitalisee
|
||||
# nt_cap = sco_cache.NotesTableCache.get(
|
||||
|
@ -169,7 +169,7 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
|
||||
)
|
||||
)
|
||||
|
||||
# Contenu table: UE apres UE
|
||||
# Contenu table: UE après UE
|
||||
for ue in I["ues"]:
|
||||
ue_descr = ue["ue_descr_html"]
|
||||
coef_ue = ue["coef_ue_txt"]
|
||||
|
@ -430,7 +430,13 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
|
||||
|
||||
t = {
|
||||
"titre": ue["acronyme"] + " " + ue["titre"],
|
||||
"_titre_html": plusminus + ue["acronyme"] + " " + ue["titre"],
|
||||
"_titre_html": plusminus
|
||||
+ ue["acronyme"]
|
||||
+ " "
|
||||
+ ue["titre"]
|
||||
+ ' <span class="bul_ue_descr">'
|
||||
+ ue["ue_descr_txt"]
|
||||
+ "</span>",
|
||||
"_titre_help": ue["ue_descr_txt"],
|
||||
"_titre_colspan": 2,
|
||||
"module": ue_descr,
|
||||
|
@ -1959,7 +1959,6 @@ tr.notes_bulletin_row_ue {
|
||||
|
||||
tr.bul_row_ue_cur {
|
||||
background-color: rgb(180,180,180);
|
||||
color: rgb(50,50,50);
|
||||
}
|
||||
|
||||
tr.bul_row_ue_cap {
|
||||
@ -2004,6 +2003,11 @@ tr.notes_bulletin_row_eval td.module {
|
||||
border-left: 1px dashed rgb(170,170,170);
|
||||
}
|
||||
|
||||
span.bul_ue_descr {
|
||||
font-weight: normal;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
table.notes_bulletin td.note {
|
||||
padding-left: 1em;
|
||||
}
|
||||
@ -2012,10 +2016,13 @@ table.notes_bulletin td.min, table.notes_bulletin td.max, table.notes_bulletin t
|
||||
}
|
||||
|
||||
table.notes_bulletin tr.notes_bulletin_row_ue_cur td.note, table.notes_bulletin tr.notes_bulletin_row_ue_cur td.min, table.notes_bulletin tr.notes_bulletin_row_ue_cur td.max {
|
||||
color: rgb(80,80,80);
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
table.notes_bulletin tr.bul_row_ue_cur td, table.notes_bulletin tr.bul_row_ue_cur td a {
|
||||
color:rgb(114, 89, 89);
|
||||
}
|
||||
|
||||
.note_bold {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user