From 41adb1953ef45d15b72c46cfc6a95805de78e80a Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 10 Feb 2022 18:49:25 +0100 Subject: [PATCH] Close #201 --- app/but/bulletin_but.py | 7 ++++++- app/forms/main/config_logos.py | 4 ++-- app/scodoc/notes_table.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py index 2f1637fb..5b17c814 100644 --- a/app/but/bulletin_but.py +++ b/app/but/bulletin_but.py @@ -153,7 +153,12 @@ class BulletinBUT: self.etud_eval_results(etud, e) for e in modimpl.evaluations if e.visibulletin - and modimpl_results.evaluations_etat[e.id].is_complete + and ( + modimpl_results.evaluations_etat[e.id].is_complete + or sco_preferences.get_preference( + "bul_show_all_evals", res.formsemestre.id + ) + ) ], } return d diff --git a/app/forms/main/config_logos.py b/app/forms/main/config_logos.py index 91a73747..2be78713 100644 --- a/app/forms/main/config_logos.py +++ b/app/forms/main/config_logos.py @@ -119,9 +119,9 @@ class AddLogoForm(FlaskForm): label="Nom", validators=[ validators.regexp( - r"^[a-zA-Z0-9-]*$", + r"^[a-zA-Z0-9-_]*$", re.IGNORECASE, - "Ne doit comporter que lettres, chiffres ou -", + "Ne doit comporter que lettres, chiffres, _ ou -", ), validators.Length( max=20, message="Un nom ne doit pas dépasser 20 caractères" diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py index a9aaf7e1..d014d9fa 100644 --- a/app/scodoc/notes_table.py +++ b/app/scodoc/notes_table.py @@ -171,7 +171,7 @@ class NotesTable: def __init__(self, formsemestre_id): # log(f"NotesTable( formsemestre_id={formsemestre_id} )") - raise NotImplementedError() # XXX + # raise NotImplementedError() # XXX if not formsemestre_id: raise ValueError("invalid formsemestre_id (%s)" % formsemestre_id) self.formsemestre_id = formsemestre_id