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
!63
Fix some date/time functions and add new helper functions
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix some date/time functions and add new helper functions
date-time-helpers
into
master
Overview
0
Commits
6
Pipelines
3
Changes
3
Merged
Jonathan Weth
requested to merge
date-time-helpers
into
master
4 years ago
Overview
0
Commits
6
Pipelines
3
Changes
1
Expand
0
0
Merge request reports
Compare
version 1
version 2
14ecf7fb
4 years ago
version 1
0596b8b3
4 years ago
master (base)
and
version 2
latest version
5b6aed8f
6 commits,
4 years ago
version 2
14ecf7fb
5 commits,
4 years ago
version 1
0596b8b3
3 commits,
4 years ago
Show latest version
1 file
+
1
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
aleksis/apps/chronos/models.py
+
12
−
2
Options
@@ -36,7 +36,7 @@ from aleksis.apps.chronos.managers import (
)
from
aleksis.apps.chronos.util.format
import
format_m2m
from
aleksis.core.mixins
import
ExtensibleModel
from
aleksis.core.models
import
DashboardWidget
from
aleksis.core.models
import
DashboardWidget
,
SchoolTerm
from
aleksis.core.util.core_helpers
import
has_person
@@ -68,13 +68,23 @@ class TimePeriod(ExtensibleModel):
year
=
date
.
today
().
year
week_number
=
week
or
getattr
(
self
,
"
_week
"
,
None
)
or
CalendarWeek
().
week
if
week_number
<
self
.
s
chool
.
current
_term
.
date_start
.
isocalendar
()[
1
]:
if
week_number
<
S
chool
Term
.
current
.
date_start
.
isocalendar
()[
1
]:
year
+=
1
wanted_week
=
CalendarWeek
(
year
=
year
,
week
=
week_number
)
return
wanted_week
[
self
.
weekday
]
def
get_datetime_start
(
self
,
week
:
Optional
[
Union
[
CalendarWeek
,
int
]]
=
None
)
->
datetime
:
"""
Get datetime of lesson start in a specific week.
"""
day
=
self
.
get_date
(
week
)
return
datetime
.
combine
(
day
,
self
.
time_start
)
def
get_datetime_end
(
self
,
week
:
Optional
[
Union
[
CalendarWeek
,
int
]]
=
None
)
->
datetime
:
"""
Get datetime of lesson end in a specific week.
"""
day
=
self
.
get_date
(
week
)
return
datetime
.
combine
(
day
,
self
.
time_end
)
@classmethod
def
get_next_relevant_day
(
cls
,
day
:
Optional
[
date
]
=
None
,
time
:
Optional
[
time
]
=
None
,
prev
:
bool
=
False
Loading