Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
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-Alsijil
Commits
10c43d74
Verified
Commit
10c43d74
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Automatically take over data from first lesson to second lesson in double lessons
parent
c692554f
No related branches found
No related tags found
1 merge request
!79
Resolve "Carry over the data of the first lesson for double (or triple, ...) lessons"
Pipeline
#3374
passed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/models.py
+49
-0
49 additions, 0 deletions
aleksis/apps/alsijil/models.py
aleksis/apps/alsijil/preferences.py
+13
-0
13 additions, 0 deletions
aleksis/apps/alsijil/preferences.py
with
62 additions
and
0 deletions
aleksis/apps/alsijil/models.py
+
49
−
0
View file @
10c43d74
from
django.db
import
models
from
django.utils.translation
import
gettext_lazy
as
_
from
calendarweek
import
CalendarWeek
from
aleksis.apps.chronos.models
import
LessonPeriod
from
aleksis.core.mixins
import
ExtensibleModel
from
aleksis.core.util.core_helpers
import
get_site_preferences
def
isidentifier
(
value
:
str
)
->
bool
:
...
...
@@ -102,6 +106,51 @@ class LessonDocumentation(ExtensibleModel):
verbose_name
=
_
(
"
Group note
"
),
max_length
=
200
,
blank
=
True
)
def
_take_over_data
(
self
):
"""
Take over data to the next lesson, if exists and data are not already set.
Can be deactivated using site preference ``alsijil__take_over_double``.
"""
if
get_site_preferences
()[
"
alsijil__take_over_double
"
]
and
(
self
.
topic
or
self
.
homework
or
self
.
group_note
):
try
:
second_lesson
=
LessonPeriod
.
objects
.
get
(
lesson
=
self
.
lesson_period
.
lesson
,
period__weekday
=
self
.
lesson_period
.
period
.
weekday
,
period__period
=
self
.
lesson_period
.
period
.
period
+
1
,
)
lesson_documentation
=
second_lesson
.
get_or_create_lesson_documentation
(
CalendarWeek
(
week
=
self
.
week
,
year
=
self
.
lesson_period
.
lesson
.
get_year
(
self
.
week
),
)
)
changed
=
False
if
not
lesson_documentation
.
topic
:
lesson_documentation
.
topic
=
self
.
topic
changed
=
True
if
not
lesson_documentation
.
homework
:
lesson_documentation
.
homework
=
self
.
homework
changed
=
True
if
not
lesson_documentation
.
group_note
:
lesson_documentation
.
group_note
=
self
.
group_note
changed
=
True
if
changed
:
lesson_documentation
.
save
()
except
LessonPeriod
.
DoesNotExist
:
# Do nothing if it's a single lesson
pass
def
save
(
self
,
*
args
,
**
kwargs
):
self
.
_take_over_data
()
super
().
save
(
*
args
,
**
kwargs
)
class
Meta
:
verbose_name
=
_
(
"
Lesson documentation
"
)
verbose_name_plural
=
_
(
"
Lesson documentations
"
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/preferences.py
+
13
−
0
View file @
10c43d74
...
...
@@ -14,3 +14,16 @@ class BlockPersonalNotesForCancelled(BooleanPreference):
name
=
"
block_personal_notes_for_cancelled
"
default
=
True
verbose_name
=
_
(
"
Block adding personal notes for cancelled lessons
"
)
@site_preferences_registry.register
class
TakeOverDataForDoubleLessons
(
BooleanPreference
):
section
=
alsijil
name
=
"
take_over_double
"
default
=
True
verbose_name
=
_
(
"
Take over data from first lesson for second lesson in double lessons
"
)
help_text
=
_
(
"
This will take over data only if the data in the second lesson are empty.
"
)
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