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 +7 -4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78d97d2c2d - Show all commits

11
app/views/assiduites.py
View File

@ -1276,11 +1276,13 @@ class RowEtudWithAssi(RowEtud):
table: TableEtud,
etud: Identite,
etat_assiduite: str,
est_just: bool,
*args,
**kwargs,
):
super().__init__(table, etud, *args, **kwargs)
self.etat_assiduite = etat_assiduite
self.est_just = est_just
# remplace lien vers fiche par lien vers calendrier
self.target_url = url_for(
"assiduites.calendrier_assi_etud", scodoc_dept=g.scodoc_dept, etudid=etud.id
@ -1298,6 +1300,9 @@ class RowEtudWithAssi(RowEtud):
)
self.classes += ["row-assiduite", self.etat_assiduite.lower()]
if self.est_just:
self.classes += ["justifiee"]
@bp.route("/etat_abs_date")
@scodoc
@ -1345,9 +1350,7 @@ def etat_abs_date():
Assiduite.etudid.in_([etud.id for etud in etuds])
)
# Filtrage des assiduités en fonction des dates données
assiduites = scass.filter_by_date(
assiduites, Assiduite, date_debut, date_fin, False
)
assiduites = scass.filter_by_date(assiduites, Assiduite, date_debut, date_fin)
# Génération table
table = TableEtud(row_class=RowEtudWithAssi)
@ -1357,7 +1360,7 @@ def etat_abs_date():
etat = ""
if assi is not None and assi.etat != scu.EtatAssiduite.PRESENT:
etat = scu.EtatAssiduite.inverse().get(assi.etat).name
row = table.row_class(table, etud, etat)
row = table.row_class(table, etud, etat, assi.est_just)
row.add_etud_cols()
table.add_row(row)