dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-04 05:07:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix filter by scale counters and add consist constrains

Browse Source 
Still to be improved, see FIXME
This commit is contained in:
Daniele Viganò
2025-05-01 23:49:22 +02:00
parent 40f42a9ee9
commit 7673f0514a
5 changed files with 103 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ram/portal/views.py
View File

@@ -551,16 +551,30 @@ class Scales(GetData):
item_type = "scale"
def get_data(self, request):
return Scale.objects.annotate(
num_items=Count(
"rollingstock",
filter=Q(
rollingstock__in=RollingStock.objects.get_published(
request.user
)
return (
Scale.objects.annotate(
num_rollingstock=Count(
"rollingstock",
filter=Q(
rollingstock__in=RollingStock.objects.get_published(
request.user
)
),
distinct=True,
),
),
).order_by("-ratio_int", "-tracks", "scale")
num_consists=Count(
"consist",
filter=Q(
consist__in=Consist.objects.get_published(
request.user
)
),
distinct=True,
),
)
.annotate(num_items=F("num_rollingstock") + F("num_consists"))
.order_by("-ratio_int", "-tracks", "scale")
)
class Types(GetData):