From 510a63742c768da623facff291bc8674980f06c3 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet <emmanuel.viennet@gmail.com> Date: Wed, 5 Mar 2025 14:27:39 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20assiduite=20si=20non=5Ftravail=20mis=20?= =?UTF-8?q?=C3=A0=20None?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_utils.py | 7 +++++-- app/views/assiduites.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index 2a56cacf..8cee5707 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -402,8 +402,11 @@ class NonWorkDays(int, BiDirectionalEnum): return [ cls.get(day.strip()) - for day in sco_preferences.get_preference( - "non_travail", formsemestre_id=formsemestre_id, dept_id=dept_id + for day in ( + sco_preferences.get_preference( + "non_travail", formsemestre_id=formsemestre_id, dept_id=dept_id + ) + or "" ).split(",") ] diff --git a/app/views/assiduites.py b/app/views/assiduites.py index 9090ec4f..70cf79dc 100644 --- a/app/views/assiduites.py +++ b/app/views/assiduites.py @@ -2008,7 +2008,7 @@ def signal_assiduites_hebdo(): ], } - non_travail = sco_preferences.get_preference("non_travail") + non_travail = sco_preferences.get_preference("non_travail") or "" non_travail = non_travail.replace(" ", "").split(",") hebdo_jours: list[tuple[bool, str]] = [] @@ -2345,7 +2345,7 @@ def feuille_abs_hebdo(): ], } - non_travail = sco_preferences.get_preference("non_travail") + non_travail = sco_preferences.get_preference("non_travail") or "" non_travail = non_travail.replace(" ", "").split(",") hebdo_jours: list[tuple[bool, str]] = [] @@ -3002,7 +3002,7 @@ def _non_work_days() -> str: """Abbréviation des jours non travaillés: "'sam','dim'". donnés par les préférences du département """ - non_travail = sco_preferences.get_preference("non_travail") + non_travail = sco_preferences.get_preference("non_travail") or "" non_travail = non_travail.replace(" ", "").split(",") return ",".join([f"'{i.lower()}'" for i in non_travail]) -- GitLab