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
d87a2ee4
Verified
Commit
d87a2ee4
authored
4 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Fix name of decorator
parent
695b9eba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/chronos/models.py
+10
-10
10 additions, 10 deletions
aleksis/apps/chronos/models.py
with
10 additions
and
10 deletions
aleksis/apps/chronos/models.py
+
10
−
10
View file @
d87a2ee4
...
...
@@ -239,7 +239,7 @@ class LessonSubstitution(ExtensibleModel):
if
self
.
subject
and
self
.
cancelled
:
raise
ValidationError
(
_
(
"
Lessons can only be either substituted or cancelled.
"
))
@property
@property
_
def
date
(
self
):
week
=
CalendarWeek
(
week
=
self
.
week
)
return
week
[
self
.
lesson_period
.
period
.
weekday
]
...
...
@@ -563,23 +563,23 @@ class Break(ExtensibleModel):
null
=
True
,
)
@property
@property
_
def
weekday
(
self
):
return
self
.
after_period
.
weekday
if
self
.
after_period
else
self
.
before_period
.
weekday
@property
@property
_
def
after_period_number
(
self
):
return
self
.
after_period
.
period
if
self
.
after_period
else
self
.
before_period
.
period
-
1
@property
@property
_
def
before_period_number
(
self
):
return
self
.
before_period
.
period
if
self
.
before_period
else
self
.
after_period
.
period
+
1
@property
@property
_
def
time_start
(
self
):
return
self
.
after_period
.
time_end
if
self
.
after_period
else
None
@property
@property
_
def
time_end
(
self
):
return
self
.
before_period
.
time_start
if
self
.
before_period
else
None
...
...
@@ -629,7 +629,7 @@ class Supervision(ExtensibleModel):
return
substitution
return
None
@property
@property
_
def
teachers
(
self
):
return
[
self
.
teacher
]
...
...
@@ -654,7 +654,7 @@ class SupervisionSubstitution(ExtensibleModel):
verbose_name
=
_
(
"
Teacher
"
),
)
@property
@property
_
def
teachers
(
self
):
return
[
self
.
teacher
]
...
...
@@ -699,7 +699,7 @@ class Event(ExtensibleModel, GroupPropertiesMixin, TeacherPropertiesMixin):
else
:
return
_
(
f
"
Event
{
self
.
pk
}
"
)
@property
@property
_
def
period_from_on_day
(
self
)
->
int
:
day
=
getattr
(
self
,
"
_date
"
,
timezone
.
now
().
date
())
if
day
!=
self
.
date_start
:
...
...
@@ -707,7 +707,7 @@ class Event(ExtensibleModel, GroupPropertiesMixin, TeacherPropertiesMixin):
else
:
return
self
.
period_from
.
period
@property
@property
_
def
period_to_on_day
(
self
)
->
int
:
day
=
getattr
(
self
,
"
_date
"
,
timezone
.
now
().
date
())
if
day
!=
self
.
date_end
:
...
...
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