Skip to content
Snippets Groups Projects
Verified Commit 62b2f671 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Move get_prev_next_by_day to util namespace

parent 687857a8
No related branches found
No related tags found
1 merge request!31Biscuit merge. Closes #53.
from datetime import timedelta, date, time from datetime import timedelta, date, time
from typing import Optional from typing import Optional, Tuple
from calendarweek import CalendarWeek from calendarweek import CalendarWeek
from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from aleksis.apps.chronos.util.min_max import weekday_min_, weekday_max, time_max from aleksis.apps.chronos.util.min_max import weekday_min_, weekday_max, time_max
...@@ -34,3 +35,14 @@ def get_next_relevant_day(day: Optional[date] = None, time: Optional[time] = Non ...@@ -34,3 +35,14 @@ def get_next_relevant_day(day: Optional[date] = None, time: Optional[time] = Non
return day return day
def get_prev_next_by_day(day: date, url: str) -> Tuple[str, str]:
""" Build URLs for previous/next day """
day_prev = get_next_relevant_day(day - timedelta(days=1), prev=True)
day_next = get_next_relevant_day(day + timedelta(days=1))
url_prev = reverse(url, args=[day_prev.year, day_prev.month, day_prev.day])
url_next = reverse(url, args=[day_next.year, day_next.month, day_next.day])
return url_prev, url_next
...@@ -23,22 +23,10 @@ from .util.min_max import ( ...@@ -23,22 +23,10 @@ from .util.min_max import (
weekday_min_, weekday_min_,
weekday_max weekday_max
) )
from .util.prev_next import get_next_relevant_day from .util.prev_next import get_next_relevant_day, get_prev_next_by_day
from .util.weeks import CalendarWeek, get_weeks_for_year from .util.weeks import CalendarWeek, get_weeks_for_year
def get_prev_next_by_day(day: date, url: str) -> Tuple[str, str]:
""" Build URLs for previous/next day """
day_prev = get_next_relevant_day(day - timedelta(days=1), prev=True)
day_next = get_next_relevant_day(day + timedelta(days=1))
url_prev = reverse(url, args=[day_prev.year, day_prev.month, day_prev.day])
url_next = reverse(url, args=[day_next.year, day_next.month, day_next.day])
return url_prev, url_next
@login_required @login_required
def all(request: HttpRequest) -> HttpResponse: def all(request: HttpRequest) -> HttpResponse:
context = {} context = {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment