dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-03 12:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix another counting issue

Browse Source
This commit is contained in:
Daniele Viganò
2025-05-24 14:44:42 +02:00
parent 552ba39970
commit 3acc80e2ad
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ram/portal/views.py
View File

@@ -491,10 +491,37 @@ class Manufacturers(GetData):
def get_data(self, request):
return (
Manufacturer.objects.filter(self.filter)
.annotate(
num_items=Count("rollingstock") + Count("rollingclass"),
Manufacturer.objects.filter(self.filter).annotate(
num_rollingstock=(
Count(
"rollingstock",
filter=Q(
rollingstock__in=(
RollingStock.objects.get_published(
request.user
)
)
),
distinct=True,
)
)
)
.annotate(
num_rollingclass=(
Count(
"rollingclass__rolling_class",
filter=Q(
rollingclass__rolling_class__in=(
RollingStock.objects.get_published(
request.user
)
),
),
distinct=True,
)
)
)
.annotate(num_items=F("num_rollingstock") + F("num_rollingclass"))
.order_by("name")
)