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
Merge requests
!95
Add helper methods for getting next/previous lesson of a person on a day
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Add helper methods for getting next/previous lesson of a person on a day
feature/helper-next-prev-lesson-of-person
into
master
Overview
4
Commits
2
Pipelines
2
Changes
1
Merged
Jonathan Weth
requested to merge
feature/helper-next-prev-lesson-of-person
into
master
4 years ago
Overview
4
Commits
2
Pipelines
2
Changes
1
Expand
0
0
Merge request reports
Compare
master
version 1
3a07d8c0
4 years ago
master (base)
and
latest version
latest version
3fb43b95
2 commits,
4 years ago
version 1
3a07d8c0
1 commit,
4 years ago
1 file
+
42
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
aleksis/apps/chronos/model_extensions.py
+
42
−
0
Options
from
datetime
import
date
from
typing
import
Optional
,
Union
from
django.utils.translation
import
gettext_lazy
as
_
@@ -79,6 +80,47 @@ def lesson_periods_as_teacher(self):
return
LessonPeriod
.
objects
.
filter
(
lesson__teachers
=
self
)
@Person.method
def
lessons_on_day
(
self
,
day
:
date
):
"""
Get all lessons of this person (either as participant or teacher) on the given day.
"""
return
(
LessonPeriod
.
objects
.
on_day
(
day
)
.
filter_from_person
(
self
)
.
order_by
(
"
period__period
"
)
)
@Person.method
def
_adjacent_lesson
(
self
,
lesson_period
:
"
LessonPeriod
"
,
day
:
date
,
offset
:
int
=
1
)
->
Union
[
"
LessonPeriod
"
,
None
]:
"""
Get next/previous lesson of the person (either as participant or teacher) on the same day.
"""
daily_lessons
=
self
.
lessons_on_day
(
day
)
ids
=
list
(
daily_lessons
.
values_list
(
"
id
"
,
flat
=
True
))
index
=
ids
.
index
(
lesson_period
.
pk
)
if
(
offset
>
0
and
index
+
offset
<
len
(
ids
))
or
(
offset
<
0
and
index
>=
-
offset
):
return
daily_lessons
[
index
+
offset
]
else
:
return
None
@Person.method
def
next_lesson
(
self
,
lesson_period
:
"
LessonPeriod
"
,
day
:
date
)
->
Union
[
"
LessonPeriod
"
,
None
]:
"""
Get next lesson of the person (either as participant or teacher) on the same day.
"""
return
self
.
_adjacent_lesson
(
lesson_period
,
day
)
@Person.method
def
previous_lesson
(
self
,
lesson_period
:
"
LessonPeriod
"
,
day
:
date
)
->
Union
[
"
LessonPeriod
"
,
None
]:
"""
Get previous lesson of the person (either as participant or teacher) on the same day.
"""
return
self
.
_adjacent_lesson
(
lesson_period
,
day
,
offset
=-
1
)
def
for_timetables
(
cls
):
"""
Return all announcements that should be shown in timetable views.
"""
return
cls
.
objects
.
filter
(
show_in_timetables
=
True
)
Loading