From d1b7229a91269b43e46af4d84022c7f9de428026 Mon Sep 17 00:00:00 2001 From: Dominik George <nik@naturalnet.de> Date: Wed, 4 Sep 2019 20:04:09 +0200 Subject: [PATCH] Add template helpers to work with weekdays. Advances BiscuIT-App-Alsijil#9. --- biscuit/apps/chronos/templatetags/week_helpers.py | 12 +++++++++++- biscuit/apps/chronos/util.py | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/biscuit/apps/chronos/templatetags/week_helpers.py b/biscuit/apps/chronos/templatetags/week_helpers.py index a30af503..31df6f58 100644 --- a/biscuit/apps/chronos/templatetags/week_helpers.py +++ b/biscuit/apps/chronos/templatetags/week_helpers.py @@ -2,7 +2,7 @@ from datetime import date from django import template -from ..util import week_days +from ..util import week_days, week_weekday_to_date register = template.Library() @@ -16,3 +16,13 @@ def week_start(week: int) -> date: @register.filter def week_end(week: int) -> date: return week_days(week)[-1] + + +@register.simple_tag +def weekday_to_date(week: int, weekday: int) -> date: + return week_weekday_to_date(week, weekday) + + +@register.simple_tag +def today() -> date: + return date.today() diff --git a/biscuit/apps/chronos/util.py b/biscuit/apps/chronos/util.py index 85cd40f3..88b010dc 100644 --- a/biscuit/apps/chronos/util.py +++ b/biscuit/apps/chronos/util.py @@ -34,3 +34,7 @@ def current_lesson_periods(when: Optional[datetime] = None) -> models.query.Quer def week_weekday_from_date(when: date) -> Sequence[int]: return (int(when.strftime('%V')), int(when.strftime('%u'))) + + +def week_weekday_to_date(week: int, weekday: int) -> date: + return week_days(week)[weekday] -- GitLab