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
9dd38abe
Verified
Commit
9dd38abe
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Add missing distinct to extra mark and custom excuse aggregations
parent
fc121ed3
No related branches found
Branches containing commit
No related tags found
1 merge request
!148
Resolve "Extra marks and custom excuses (potentially) counted multiple times"
Pipeline
#6095
passed
4 years ago
Stage: test
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/model_extensions.py
+2
-0
2 additions, 0 deletions
aleksis/apps/alsijil/model_extensions.py
with
2 additions
and
0 deletions
aleksis/apps/alsijil/model_extensions.py
+
2
−
0
View file @
9dd38abe
...
...
@@ -448,6 +448,7 @@ def generate_person_list_with_class_register_statistics(
extra_mark
.
count_label
:
Count
(
"
personal_notes
"
,
filter
=
Q
(
personal_notes__extra_marks
=
extra_mark
)
&
school_term_q
&
groups_q
,
distinct
=
True
,
)
}
)
...
...
@@ -460,6 +461,7 @@ def generate_person_list_with_class_register_statistics(
filter
=
Q
(
personal_notes__absent
=
True
,
personal_notes__excuse_type
=
excuse_type
,)
&
school_term_q
&
groups_q
,
distinct
=
True
,
)
}
)
...
...
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