From 9fd242f446a993cf9660e79120e6c33b0d7cf00b Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sat, 14 Sep 2019 14:11:25 +0200
Subject: [PATCH] Use new week API in week_helpers. Advances #27.
---
.../apps/chronos/templatetags/week_helpers.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/biscuit/apps/chronos/templatetags/week_helpers.py b/biscuit/apps/chronos/templatetags/week_helpers.py
index be2f7e5c..8f860092 100644
--- a/biscuit/apps/chronos/templatetags/week_helpers.py
+++ b/biscuit/apps/chronos/templatetags/week_helpers.py
@@ -4,30 +4,30 @@ from typing import Optional
from django import template
from django.db.models.query import QuerySet
-from ..util import current_week, week_days, week_weekday_to_date
+from ..util import CalendarWeek, week_weekday_to_date
register = template.Library()
@register.filter
-def week_start(week: int) -> date:
- return week_days(week)[0]
+def week_start(week: CalendarWeek) -> date:
+ return week[0]
@register.filter
-def week_end(week: int) -> date:
- return week_days(week)[-1]
+def week_end(week: CalendarWeek) -> date:
+ return week[-1]
@register.filter
-def only_week(qs: QuerySet, week: Optional[int]) -> QuerySet:
- wanted_week = week or current_week()
- return qs.filter(week=wanted_week)
+def only_week(qs: QuerySet, week: Optional[CalendarWeek]) -> QuerySet:
+ wanted_week = week or CalendarWeek()
+ return qs.filter(week=wanted_week.week)
@register.simple_tag
-def weekday_to_date(week: int, weekday: int) -> date:
+def weekday_to_date(week: CalendarWeek, weekday: int) -> date:
return week_weekday_to_date(week, weekday)
--
GitLab