From bc01d5ac021f7dbaa814ba4dab42f336cd239fe4 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 8 Sep 2022 09:46:16 +0200 Subject: [PATCH] 3 petits bugs --- app/scodoc/sco_abs_billets.py | 2 +- app/scodoc/sco_formsemestre_status.py | 2 +- app/scodoc/sco_undo_notes.py | 4 ++-- sco_version.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_abs_billets.py b/app/scodoc/sco_abs_billets.py index 1de46d1e8..ee7e090bc 100644 --- a/app/scodoc/sco_abs_billets.py +++ b/app/scodoc/sco_abs_billets.py @@ -64,7 +64,7 @@ def table_billets_etud( ) -> GenTable: """Page avec table billets.""" etud = Identite.query.get_or_404(etudid) if etudid is not None else None - billets = query_billets_etud(etud.id, etat) + billets = query_billets_etud(etudid, etat) return table_billets(billets, etud=etud, with_links=with_links) diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index a9cea70a5..cfe24135a 100644 --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -1113,7 +1113,7 @@ def formsemestre_status(formsemestre_id=None): "", ] # --- Lien mail enseignants: - adrlist = list(mails_enseignants - set([""])) + adrlist = list(mails_enseignants - {None, ""}) if adrlist: H.append( '

Courrier aux %d enseignants du semestre

' diff --git a/app/scodoc/sco_undo_notes.py b/app/scodoc/sco_undo_notes.py index 53fda830d..c70d133a7 100644 --- a/app/scodoc/sco_undo_notes.py +++ b/app/scodoc/sco_undo_notes.py @@ -227,11 +227,11 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): titles=titles, columns_ids=columns_ids, rows=rows, - html_title=f"

Saisies de notes dans {formsemestre.titreannee()}

", + html_title=f"

Saisies de notes dans {formsemestre.titre_annee()}

", html_class="table_leftalign table_coldate gt_table_searchable", html_class_ignore_default=True, html_sortable=True, - caption=f"Saisies de notes dans {formsemestre.titreannee()}", + caption=f"Saisies de notes dans {formsemestre.titre_annee()}", preferences=sco_preferences.SemPreferences(formsemestre_id), base_url="%s?formsemestre_id=%s" % (request.base_url, formsemestre_id), origin=f"Généré par {sco_version.SCONAME} le " + scu.timedate_human_repr() + "", diff --git a/sco_version.py b/sco_version.py index 92405ec34..247488df8 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.3.35" +SCOVERSION = "9.3.36" SCONAME = "ScoDoc"