From a43f7fa835fcdf9f591c3f759f5ab7545c9df5b3 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Wed, 27 Sep 2017 14:58:06 +0200 Subject: Affichage d’un message lorsque quelqu’un consulte un emploi du temps périmé --- templates/timetable.html | 7 ++++++- views.py | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/templates/timetable.html b/templates/timetable.html index 7a30595..21afa24 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -4,6 +4,11 @@ {% block body %}

{{ group.timetable }} – {{ group }} – Semaine {{ week }}

-

Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}

+

+ {% if is_old_timetable %} + Accéder à l’emploi du temps de cette semaine.
+ {% endif %} + Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }} +

{% include "timetable_common.html" %}

ICSRSSAtom

{% endblock %} diff --git a/views.py b/views.py index 66f0a03..442ada6 100644 --- a/views.py +++ b/views.py @@ -55,8 +55,13 @@ def group_list(request, year_slug, timetable_slug): return render(request, "group_list.html", {"timetable": timetable, "groups": groups}) def timetable(request, year_slug, timetable_slug, group_slug, year=None, week=None): + current_year, current_week = get_current_week() + is_old_timetable = False + if year is None or week is None: - year, week = get_current_week() + year, week = current_year, current_week + elif (int(year), int(week)) < (current_year, current_week): + is_old_timetable = True start, end = get_week(int(year), int(week)) @@ -69,7 +74,10 @@ def timetable(request, year_slug, timetable_slug, group_slug, year=None, week=No grouped_courses = group_courses(courses) - return render(request, "timetable.html", {"group": group, "courses": grouped_courses, "last_update": courses.first().last_update__max, "year": year, "week": int(week)}) + return render(request, "timetable.html", {"group": group, "courses": grouped_courses, + "last_update": courses.first().last_update__max, + "year": year, "week": int(week), + "is_old_timetable": is_old_timetable}) def contact(request): return render(request, "contact.html", {"email": settings.ADMINS[0][1]}) -- cgit v1.2.1