Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Chronos
Commits
62b2f671
Verified
Commit
62b2f671
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Move get_prev_next_by_day to util namespace
parent
687857a8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!31
Biscuit merge. Closes #53.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/chronos/util/prev_next.py
+13
-1
13 additions, 1 deletion
aleksis/apps/chronos/util/prev_next.py
aleksis/apps/chronos/views.py
+1
-13
1 addition, 13 deletions
aleksis/apps/chronos/views.py
with
14 additions
and
14 deletions
aleksis/apps/chronos/util/prev_next.py
+
13
−
1
View file @
62b2f671
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
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/views.py
+
1
−
13
View file @
62b2f671
...
@@ -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
=
{}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment