pascal.bouron/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Assiduité: tri sur page edit_justificatif_etud. Closes #1009.

Browse Source
This commit is contained in:
Emmanuel Viennet 2024-11-26 20:37:37 +01:00
parent 540f2296aa
commit 16e96c24ef
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/assiduites/pages/ajout_justificatif_etud.j2
View File

@ -55,7 +55,7 @@ div.submit > input {
</div>
<div class="info-row">
<span class="info-label">Assiduités concernées: </span>
<span class="info-label">Absences et retards concernés&nbsp;: </span>
{% if justif.justification.assiduites %}
<ul>
{% for assi in justif.justification.assiduites %}
@ -67,7 +67,7 @@ div.submit > input {
{% endfor %}
</ul>
{% else %}
<span class="text">Aucune</span>
<span class="text">aucune</span>
{% endif %}
</div>

5
app/views/assiduites.py
View File

@ -318,6 +318,7 @@ def ajout_assiduite_etud() -> str | Response:
sco=ScoData(etud=etud, formsemestre=formsemestre),
tableau=tableau,
scu=scu,
title=f"Saisie assiduité {etud.nom_short}",
)
@ -1695,7 +1696,9 @@ def _preparer_objet(
objet_prepare["justification"] = {"assiduites": [], "fichiers": {}}
if not sans_gros_objet:
assiduites: list[Assiduite] = justif.get_assiduites()
assiduites: list[Assiduite] = justif.get_assiduites().order_by(
Assiduite.date_debut
)
for assi in assiduites:
objet_prepare["justification"]["assiduites"].append(
_preparer_objet("assiduite", assi, sans_gros_objet=True)