From 6d3033ba37d583a4f8d8b5527be0899442a3cd2a Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sat, 31 Aug 2024 13:52:47 +0200 Subject: [PATCH] =?UTF-8?q?On=20supprime=20la=20navigation=20vers=20les=20?= =?UTF-8?q?pages=201=20an=20avant=20maintenant=20et=201=20an=20apr=C3=A8s?= =?UTF-8?q?=20maintenant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/calendar.py | 1 - .../templates/agenda_culturel/page-day.html | 22 +++++++++++++------ .../templates/agenda_culturel/page-month.html | 8 +++++++ .../templates/agenda_culturel/page-week.html | 10 ++++++++- .../templatetags/utils_extra.py | 11 +++++++++- 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index c8def2d..9ea82eb 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -3,7 +3,6 @@ import calendar from django.db.models import Q from django.utils import timezone - import logging logger = logging.getLogger(__name__) diff --git a/src/agenda_culturel/templates/agenda_culturel/page-day.html b/src/agenda_culturel/templates/agenda_culturel/page-day.html index 1f91458..341b1f6 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-day.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-day.html @@ -38,19 +38,27 @@

{{ day | date:"l j F Y"|frdate }}

diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html index dc5241c..b0fd3d6 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-month.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html @@ -35,14 +35,22 @@

{{ calendar.firstdate | date:"F o" }}

diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html index b4e4ed5..4bcd8c6 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-week.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html @@ -31,14 +31,22 @@

Semaine du {{ calendar.calendar_days_list.0.date |date|frdate }}

diff --git a/src/agenda_culturel/templatetags/utils_extra.py b/src/agenda_culturel/templatetags/utils_extra.py index b7965b5..ec4f1d9 100644 --- a/src/agenda_culturel/templatetags/utils_extra.py +++ b/src/agenda_culturel/templatetags/utils_extra.py @@ -3,7 +3,8 @@ from django.utils.safestring import mark_safe from django.template.defaultfilters import stringfilter from urllib.parse import urlparse -from datetime import timedelta, date +from datetime import timedelta, date, datetime +from dateutil.relativedelta import relativedelta from django.urls import reverse_lazy from django.templatetags.static import static from string import ascii_uppercase as auc @@ -27,6 +28,14 @@ def week(d): return d.isocalendar()[1] +@register.filter +def not_before_first(d): + return d >= datetime.now().date() - relativedelta(years=1) + +@register.filter +def not_after_last(d): + return d <= datetime.now().date() + relativedelta(years=1) + @register.filter def shift_day(d, shift): return d + timedelta(days=shift)