1
0
forked from ScoDoc/ScoDoc

Cosmetic (fiche etud)

This commit is contained in:
Emmanuel Viennet 2023-07-17 22:03:11 +02:00
parent 1b297580c9
commit f414ec1c0d
4 changed files with 35 additions and 9 deletions

View File

@ -317,7 +317,7 @@ def ficheEtud(etudid=None):
<span class="link_bul_pdf"> <span class="link_bul_pdf">
<a class="stdlink" href="{ <a class="stdlink" href="{
url_for("notes.etud_bulletins_pdf", scodoc_dept=g.scodoc_dept, etudid=etudid) url_for("notes.etud_bulletins_pdf", scodoc_dept=g.scodoc_dept, etudid=etudid)
}">tous les bulletins</a> }">Tous les bulletins</a>
</span> </span>
""" """
last_formsemestre: FormSemestre = db.session.get( last_formsemestre: FormSemestre = db.session.get(
@ -339,11 +339,11 @@ def ficheEtud(etudid=None):
] = f"""<span class="link_bul_pdf"><a class="stdlink" href="{ ] = f"""<span class="link_bul_pdf"><a class="stdlink" href="{
url_for("notes.formsemestre_inscription_with_modules_form", url_for("notes.formsemestre_inscription_with_modules_form",
scodoc_dept=g.scodoc_dept, etudid=etudid) scodoc_dept=g.scodoc_dept, etudid=etudid)
}">inscrire à un autre semestre</a></span> }">Inscrire à un autre semestre</a></span>
<span class="link_bul_pdf"><a class="stdlink" href="{ <span class="link_bul_pdf"><a class="stdlink" href="{
url_for("notes.jury_delete_manual", url_for("notes.jury_delete_manual",
scodoc_dept=g.scodoc_dept, etudid=etudid) scodoc_dept=g.scodoc_dept, etudid=etudid)
}">éditer toutes décisions de jury</a></span> }">Éditer toutes décisions de jury</a></span>
""" """
else: else:
@ -508,11 +508,26 @@ def ficheEtud(etudid=None):
last_sem = FormSemestre.query.get_or_404(info["sems"][0]["formsemestre_id"]) last_sem = FormSemestre.query.get_or_404(info["sems"][0]["formsemestre_id"])
if last_sem.formation.is_apc(): if last_sem.formation.is_apc():
but_cursus = cursus_but.EtudCursusBUT(etud, last_sem.formation) but_cursus = cursus_but.EtudCursusBUT(etud, last_sem.formation)
info["but_cursus_mkup"] = render_template( info[
"but_cursus_mkup"
] = f"""
<div class="section_but">
{render_template(
"but/cursus_etud.j2", "but/cursus_etud.j2",
cursus=but_cursus, cursus=but_cursus,
scu=scu, scu=scu,
) )}
<div>
<a href="{url_for("notes.validation_rcues",
scodoc_dept=g.scodoc_dept, etudid=etudid,
formsemestre_id=last_formsemestre.id)}"
title="Visualiser les compétences BUT"
>
<img src="/ScoDoc/static/icons/parcours-but.png" alt="validation_rcues" height="100px"/>
</a>
</div>
</div>
"""
tmpl = """<div class="menus_etud">%(menus_etud)s</div> tmpl = """<div class="menus_etud">%(menus_etud)s</div>
<div class="ficheEtud" id="ficheEtud"><table> <div class="ficheEtud" id="ficheEtud"><table>

View File

@ -915,6 +915,17 @@ td.fichetitre2 .fl {
font-weight: normal; font-weight: normal;
} }
div.section_but {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-evenly;
}
div.section_but > div.link_validation_rcues {
align-self: center;
}
.ficheannotations { .ficheannotations {
background-color: #f7d892; background-color: #f7d892;
width: 910px; width: 910px;

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

View File

@ -52,7 +52,7 @@
{% if parcour %} {% if parcour %}
parcours {{parcour.code}} « {{parcour.libelle}} » parcours {{parcour.code}} « {{parcour.libelle}} »
{% else %} {% else %}
non inscrit à un parcours de la spécialité non inscrit{{sco.etud.e}} à un parcours de la spécialité
{% endif %} {% endif %}
</div> </div>