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
83c085b6
Verified
Commit
83c085b6
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Rename get_from_period to from_period and add docstring
parent
4fe76e99
No related branches found
Branches containing commit
No related tags found
1 merge request
!129
Rewrite some API on Event and ExtraLesson
Pipeline
#5903
passed
4 years ago
Stage: test
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/chronos/models.py
+7
-3
7 additions, 3 deletions
aleksis/apps/chronos/models.py
with
7 additions
and
3 deletions
aleksis/apps/chronos/models.py
+
7
−
3
View file @
83c085b6
...
@@ -218,7 +218,11 @@ class TimePeriod(ValidityRangeRelatedExtensibleModel):
...
@@ -218,7 +218,11 @@ class TimePeriod(ValidityRangeRelatedExtensibleModel):
return
url_prev
,
url_next
return
url_prev
,
url_next
@classmethod
@classmethod
def
get_from_period
(
cls
,
period
:
int
,
day
:
date
)
->
"
TimePeriod
"
:
def
from_period
(
cls
,
period
:
int
,
day
:
date
)
->
"
TimePeriod
"
:
"""
Get `TimePeriod` object for a period on a specific date.
This will respect the relation to validity ranges.
"""
return
cls
.
objects
.
on_day
(
day
).
filter
(
period
=
period
).
first
()
return
cls
.
objects
.
on_day
(
day
).
filter
(
period
=
period
).
first
()
@classproperty
@classproperty
...
@@ -907,7 +911,7 @@ class Event(SchoolTermRelatedExtensibleModel, GroupPropertiesMixin, TeacherPrope
...
@@ -907,7 +911,7 @@ class Event(SchoolTermRelatedExtensibleModel, GroupPropertiesMixin, TeacherPrope
"""
"""
day
=
getattr
(
self
,
"
_date
"
,
timezone
.
now
().
date
())
day
=
getattr
(
self
,
"
_date
"
,
timezone
.
now
().
date
())
if
day
!=
self
.
date_start
:
if
day
!=
self
.
date_start
:
return
TimePeriod
.
get_
from_period
(
TimePeriod
.
period_min
,
day
)
return
TimePeriod
.
from_period
(
TimePeriod
.
period_min
,
day
)
else
:
else
:
return
self
.
period_from
return
self
.
period_from
...
@@ -919,7 +923,7 @@ class Event(SchoolTermRelatedExtensibleModel, GroupPropertiesMixin, TeacherPrope
...
@@ -919,7 +923,7 @@ class Event(SchoolTermRelatedExtensibleModel, GroupPropertiesMixin, TeacherPrope
"""
"""
day
=
getattr
(
self
,
"
_date
"
,
timezone
.
now
().
date
())
day
=
getattr
(
self
,
"
_date
"
,
timezone
.
now
().
date
())
if
day
!=
self
.
date_end
:
if
day
!=
self
.
date_end
:
return
TimePeriod
.
get_
from_period
(
TimePeriod
.
period_max
,
day
)
return
TimePeriod
.
from_period
(
TimePeriod
.
period_max
,
day
)
else
:
else
:
return
self
.
period_to
return
self
.
period_to
...
...
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