From b4eab5fcbc37726be78d7102cdc9408dbc8d4931 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 9 Jan 2023 07:26:27 -0300 Subject: [PATCH] Avertissements dates sur tableau bord semestre --- app/scodoc/sco_formsemestre_status.py | 17 ++++++++++++++--- app/static/css/scodoc.css | 2 +- sco_version.py | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index 7cd084fe..44f14954 100644 --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -1081,10 +1081,21 @@ def formsemestre_status(formsemestre_id=None, check_parcours=True): formsemestre_warning_etuds_sans_note(formsemestre, nt) if can_change_all_notes else "", - """

Tableau de bord: - cliquez sur un module pour saisir des notes -

""", + """

Tableau de bord : """, ] + if formsemestre.est_courant(): + H.append( + """cliquez sur un module pour saisir des notes""" + ) + elif datetime.date.today() > formsemestre.date_fin: + H.append( + """semestre terminé""" + ) + else: + H.append( + """semestre pas encore commencé""" + ) + H.append("

") if sco_preferences.get_preference("bul_show_all_evals", formsemestre_id): H.append( diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index c6044639..15f5f738 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -1585,7 +1585,7 @@ div.formsemestre_status { color: rgb(215, 90, 0); } -div.formsemestre_status_warning::before { +.formsemestre_status_warning::before { content: "\26a0 \fe0f \00a0"; /* EMO_WARNING, "⚠️" */ } diff --git a/sco_version.py b/sco_version.py index f4440c75..0a6f9c9a 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.4.24" +SCOVERSION = "9.4.25" SCONAME = "ScoDoc"