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
Merge requests
!96
Resolve "Improve "My Students""
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Improve "My Students""
111-improve-my-students
into
master
Overview
5
Commits
2
Pipelines
5
Changes
1
All threads resolved!
Hide all comments
Merged
Jonathan Weth
requested to merge
111-improve-my-students
into
master
4 years ago
Overview
5
Commits
2
Pipelines
5
Changes
1
All threads resolved!
Hide all comments
Expand
Closes
#5 (closed)
,
#111 (closed)
,
#113 (closed)
Edited
4 years ago
by
Nik | Klampfradler
0
0
Merge request reports
Viewing commit
564978f3
Show latest version
1 file
+
1
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Unverified
564978f3
Fix typo
· 564978f3
Jonathan Weth
authored
4 years ago
aleksis/apps/alsijil/model_extensions.py
+
76
−
2
Options
from
datetime
import
date
from
typing
import
Dict
,
Iterator
,
Optional
,
Union
from
typing
import
Dict
,
Iterable
,
Iterator
,
Optional
,
Union
from
django.db.models
import
Exists
,
OuterRef
,
Q
,
QuerySet
from
django.db.models.aggregates
import
Count
from
django.db.models.aggregates
import
Count
,
Sum
from
django.utils.translation
import
gettext
as
_
import
reversion
@@ -282,3 +282,77 @@ def get_owner_groups_with_lessons(self: Person):
Groups which have child groups with related lessons are also included.
"""
return
Group
.
get_groups_with_lessons
().
filter
(
owners
=
self
)
@Group.method
def
generate_person_list_with_class_register_statistics
(
self
:
Group
,
persons
:
Optional
[
Iterable
]
=
None
)
->
QuerySet
:
"""
Get with class register statistics annotated list of all members.
"""
persons
=
persons
or
self
.
members
.
all
()
persons
=
persons
.
filter
(
personal_notes__groups_of_person
=
self
,
personal_notes__lesson_period__lesson__validity__school_term
=
self
.
school_term
,
).
annotate
(
absences_count
=
Count
(
"
personal_notes__absent
"
,
filter
=
Q
(
personal_notes__absent
=
True
,
personal_notes__lesson_period__lesson__validity__school_term
=
self
.
school_term
,
),
),
excused
=
Count
(
"
personal_notes__absent
"
,
filter
=
Q
(
personal_notes__absent
=
True
,
personal_notes__excused
=
True
,
personal_notes__excuse_type__isnull
=
True
,
personal_notes__lesson_period__lesson__validity__school_term
=
self
.
school_term
,
),
),
unexcused
=
Count
(
"
personal_notes__absent
"
,
filter
=
Q
(
personal_notes__absent
=
True
,
personal_notes__excused
=
False
,
personal_notes__lesson_period__lesson__validity__school_term
=
self
.
school_term
,
),
),
tardiness
=
Sum
(
"
personal_notes__late
"
),
tardiness_count
=
Count
(
"
personal_notes
"
,
filter
=~
Q
(
personal_notes__late
=
0
)
&
Q
(
personal_notes__lesson_period__lesson__validity__school_term
=
self
.
school_term
,
),
),
)
for
extra_mark
in
ExtraMark
.
objects
.
all
():
persons
=
persons
.
annotate
(
**
{
extra_mark
.
count_label
:
Count
(
"
personal_notes
"
,
filter
=
Q
(
personal_notes__extra_marks
=
extra_mark
,
personal_notes__lesson_period__lesson__validity__school_term
=
self
.
school_term
,
),
)
}
)
for
excuse_type
in
ExcuseType
.
objects
.
all
():
persons
=
persons
.
annotate
(
**
{
excuse_type
.
count_label
:
Count
(
"
personal_notes__absent
"
,
filter
=
Q
(
personal_notes__absent
=
True
,
personal_notes__excuse_type
=
excuse_type
,
personal_notes__lesson_period__lesson__validity__school_term
=
self
.
school_term
,
),
)
}
)
return
persons
Loading