diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py index 52e17e16725478db1c049c5974719d49df5861f8..259e8372cbddeb94fdad1705399e4b6e91dcec4d 100644 --- a/app/scodoc/sco_debouche.py +++ b/app/scodoc/sco_debouche.py @@ -149,13 +149,15 @@ def table_debouche_etudids(etudids, keep_numeric=True): if itemsuivis: if keep_numeric: # pour excel: row["debouche"] = "\n".join( - f"""{it.item_date.strftime(scu.DATE_FMT)}: {it.situation or ""}""" + f"""{it.item_date.strftime(scu.DATE_FMT) if it.item_date else "" + } : {it.situation or ""}""" for it in itemsuivis ) else: row["debouche"] = "<br>".join( [ - f"""{it.item_date.strftime(scu.DATE_FMT)} : {it.situation or ""} + f"""{it.item_date.strftime(scu.DATE_FMT) if it.item_date else "" + } : {it.situation or ""} <i>{', '.join( tag.title for tag in it.tags)}</i> """ for it in itemsuivis diff --git a/app/views/assiduites.py b/app/views/assiduites.py index eb9e59694c350f9e3a1f62ab597aabdd8a2c0074..46c47663e4ca0515f73c7b5c6e6442a7c62c7f2f 100644 --- a/app/views/assiduites.py +++ b/app/views/assiduites.py @@ -974,7 +974,14 @@ def calendrier_assi_etud(): mode_demi: bool = scu.to_bool(request.args.get("mode_demi", "t")) show_pres: bool = scu.to_bool(request.args.get("show_pres", "f")) show_reta: bool = scu.to_bool(request.args.get("show_reta", "f")) - annee: int = int(request.args.get("annee", scu.annee_scolaire())) + annee_str = request.args.get("annee", "") + if not annee_str: + annee = scu.annee_scolaire() + else: + try: + annee = int(annee_str) + except ValueError as exc: + raise ScoValueError("année invalide") from exc # Récupération des années d'étude de l'étudiant annees: list[int] = [] diff --git a/sco_version.py b/sco_version.py index cf12c24ab24cef7cd7e9d16be8b6b07783751b25..9b3ad1536fe16036a09e73ab8ca46fa1672fc8d4 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.7.23" +SCOVERSION = "9.7.24" SCONAME = "ScoDoc"