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
ec861d0d
Verified
Commit
ec861d0d
authored
5 years ago
by
mirabilos
Committed by
mirabilos
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Rearrange code: exit early, dedent the remainder of the body.
parent
42f3be7d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
biscuit/apps/alsijil/views.py
+39
-39
39 additions, 39 deletions
biscuit/apps/alsijil/views.py
with
39 additions
and
39 deletions
biscuit/apps/alsijil/views.py
+
39
−
39
View file @
ec861d0d
...
...
@@ -33,48 +33,48 @@ def lesson(request: HttpRequest, week: Optional[int] = None, period_id: Optional
context
[
'
week
'
]
=
wanted_week
context
[
'
day
'
]
=
week_days
(
wanted_week
)[
lesson_period
.
period
.
weekday
]
if
lesson_period
:
# Create or get lesson documentation object; can be empty when first opening lesson
lesson_documentation
,
created
=
LessonDocumentation
.
objects
.
get_or_create
(
lesson_period
=
lesson_period
,
week
=
wanted_week
)
lesson_documentation_form
=
LessonDocumentationForm
(
request
.
POST
or
None
,
instance
=
lesson_documentation
,
prefix
=
'
leson_documentation
'
)
# Create all missing personal notes about members of all groups in lesson
missing_persons
=
Person
.
objects
.
annotate
(
no_personal_notes
=~
Exists
(
PersonalNote
.
objects
.
filter
(
week
=
wanted_week
,
lesson_period
=
lesson_period
,
person__pk
=
OuterRef
(
'
pk
'
)
))
).
filter
(
member_of__in
=
Group
.
objects
.
filter
(
pk__in
=
lesson_period
.
lesson
.
groups
.
all
()),
is_active
=
True
,
no_personal_notes
=
True
)
PersonalNote
.
objects
.
bulk_create
([
PersonalNote
(
person
=
person
,
lesson_period
=
lesson_period
,
week
=
wanted_week
)
for
person
in
missing_persons
])
# Create a formset that holds all personal notes for all persons in this lesson
persons_qs
=
PersonalNote
.
objects
.
select_related
(
'
person
'
).
filter
(
lesson_period
=
lesson_period
,
week
=
wanted_week
)
personal_note_formset
=
PersonalNoteFormSet
(
request
.
POST
or
None
,
queryset
=
persons_qs
,
prefix
=
'
personal_notes
'
)
if
request
.
method
==
'
POST
'
:
if
lesson_documentation_form
.
is_valid
():
lesson_documentation_form
.
save
()
if
personal_note_formset
.
is_valid
():
personal_note_formset
.
save
()
context
[
'
lesson_documentation_form
'
]
=
lesson_documentation_form
context
[
'
personal_note_formset
'
]
=
personal_note_formset
else
:
if
not
lesson_period
:
#XXX TODO: nice error page (“no lesson currently running for you?” or so)
return
HttpResponseNotFound
(
"
no current lesson found for you
"
)
# Create or get lesson documentation object; can be empty when first opening lesson
lesson_documentation
,
created
=
LessonDocumentation
.
objects
.
get_or_create
(
lesson_period
=
lesson_period
,
week
=
wanted_week
)
lesson_documentation_form
=
LessonDocumentationForm
(
request
.
POST
or
None
,
instance
=
lesson_documentation
,
prefix
=
'
leson_documentation
'
)
# Create all missing personal notes about members of all groups in lesson
missing_persons
=
Person
.
objects
.
annotate
(
no_personal_notes
=~
Exists
(
PersonalNote
.
objects
.
filter
(
week
=
wanted_week
,
lesson_period
=
lesson_period
,
person__pk
=
OuterRef
(
'
pk
'
)
))
).
filter
(
member_of__in
=
Group
.
objects
.
filter
(
pk__in
=
lesson_period
.
lesson
.
groups
.
all
()),
is_active
=
True
,
no_personal_notes
=
True
)
PersonalNote
.
objects
.
bulk_create
([
PersonalNote
(
person
=
person
,
lesson_period
=
lesson_period
,
week
=
wanted_week
)
for
person
in
missing_persons
])
# Create a formset that holds all personal notes for all persons in this lesson
persons_qs
=
PersonalNote
.
objects
.
select_related
(
'
person
'
).
filter
(
lesson_period
=
lesson_period
,
week
=
wanted_week
)
personal_note_formset
=
PersonalNoteFormSet
(
request
.
POST
or
None
,
queryset
=
persons_qs
,
prefix
=
'
personal_notes
'
)
if
request
.
method
==
'
POST
'
:
if
lesson_documentation_form
.
is_valid
():
lesson_documentation_form
.
save
()
if
personal_note_formset
.
is_valid
():
personal_note_formset
.
save
()
context
[
'
lesson_documentation_form
'
]
=
lesson_documentation_form
context
[
'
personal_note_formset
'
]
=
personal_note_formset
return
render
(
request
,
'
alsijil/lesson.html
'
,
context
)
...
...
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