ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update exam counts to use distinct counts for archived and non-archived exams

Browse Source
This commit is contained in:
Ross
2025-11-11 21:31:07 +00:00
parent 06ea87be14
commit d781508364
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic/views.py
+12 -6
View File
@@ -5354,12 +5354,12 @@ class ExamCollectionList(ListView):
if show_archived: if show_archived:
# include archived exams in counts (count all exams for each app) # include archived exams in counts (count all exams for each app)
counts = { counts = {
"anatomy_count": Count("anatomy_exams"), "anatomy_count": Count("anatomy_exams", distinct=True),
"longs_count": Count("longs_exams"), "longs_count": Count("longs_exams", distinct=True),
"physics_count": Count("physics_exams"), "physics_count": Count("physics_exams", distinct=True),
"rapids_count": Count("rapids_exams"), "rapids_count": Count("rapids_exams", distinct=True),
"sbas_count": Count("sbas_exams"), "sbas_count": Count("sbas_exams", distinct=True),
"shorts_count": Count("shorts_exams"), "shorts_count": Count("shorts_exams", distinct=True),
} }
else: else:
# only count non-archived exams # only count non-archived exams
@@ -5367,26 +5367,32 @@ class ExamCollectionList(ListView):
"anatomy_count": Count( "anatomy_count": Count(
"anatomy_exams", "anatomy_exams",
filter=Q(anatomy_exams__archive=False), filter=Q(anatomy_exams__archive=False),
distinct=True,
), ),
"longs_count": Count( "longs_count": Count(
"longs_exams", "longs_exams",
filter=Q(longs_exams__archive=False), filter=Q(longs_exams__archive=False),
distinct=True,
), ),
"physics_count": Count( "physics_count": Count(
"physics_exams", "physics_exams",
filter=Q(physics_exams__archive=False), filter=Q(physics_exams__archive=False),
distinct=True,
), ),
"rapids_count": Count( "rapids_count": Count(
"rapids_exams", "rapids_exams",
filter=Q(rapids_exams__archive=False), filter=Q(rapids_exams__archive=False),
distinct=True,
), ),
"sbas_count": Count( "sbas_count": Count(
"sbas_exams", "sbas_exams",
filter=Q(sbas_exams__archive=False), filter=Q(sbas_exams__archive=False),
distinct=True,
), ),
"shorts_count": Count( "shorts_count": Count(
"shorts_exams", "shorts_exams",
filter=Q(shorts_exams__archive=False), filter=Q(shorts_exams__archive=False),
distinct=True,
), ),
} }