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
edfd5296
Verified
Commit
edfd5296
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Move extensions for announcement model to model_extensions.py
parent
1ed1dd51
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!41
Show announcements in timetable views
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/chronos/model_extensions.py
+12
-1
12 additions, 1 deletion
aleksis/apps/chronos/model_extensions.py
aleksis/apps/chronos/models.py
+1
-10
1 addition, 10 deletions
aleksis/apps/chronos/models.py
with
13 additions
and
11 deletions
aleksis/apps/chronos/model_extensions.py
+
12
−
1
View file @
edfd5296
from
typing
import
Optional
,
Union
from
aleksis.core.models
import
Person
,
Group
from
django.utils.translation
import
gettext_lazy
as
_
from
jsonstore
import
BooleanField
from
aleksis.core.models
import
Person
,
Group
,
Announcement
from
.models
import
Lesson
,
LessonPeriod
...
...
@@ -81,3 +84,11 @@ def lesson_periods_as_teacher(self):
"""
return
LessonPeriod
.
objects
.
filter
(
lesson__teachers
=
self
)
def
for_timetables
(
cls
):
return
cls
.
objects
.
filter
(
show_in_timetables
=
True
)
Announcement
.
class_method
(
for_timetables
)
Announcement
.
field
(
show_in_timetables
=
BooleanField
(
verbose_name
=
_
(
"
Show announcement in timetable views?
"
)))
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/models.py
+
1
−
10
View file @
edfd5296
...
...
@@ -19,10 +19,9 @@ from django.utils.translation import ugettext_lazy as _
from
calendarweek.django
import
CalendarWeek
,
i18n_day_names_lazy
,
i18n_day_abbrs_lazy
from
django_global_request.middleware
import
get_request
from
jsonstore
import
BooleanField
from
aleksis.core.mixins
import
ExtensibleModel
from
aleksis.core.models
import
Group
,
Person
,
DashboardWidget
,
Announcement
from
aleksis.core.models
import
Group
,
Person
,
DashboardWidget
from
aleksis.apps.chronos.util.date
import
week_weekday_from_date
from
aleksis.core.util.core_helpers
import
has_person
...
...
@@ -553,14 +552,6 @@ class LessonPeriod(ExtensibleModel):
indexes
=
[
models
.
Index
(
fields
=
[
"
lesson
"
,
"
period
"
])]
def
for_timetables
(
cls
):
return
cls
.
objects
.
filter
(
show_in_timetables
=
True
)
Announcement
.
class_method
(
for_timetables
)
Announcement
.
field
(
show_in_timetables
=
BooleanField
(
verbose_name
=
_
(
"
Show announcement in timetable views?
"
)))
class
TimetableWidget
(
DashboardWidget
):
template
=
"
chronos/widget.html
"
...
...
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