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

Reformat portal/views.py

Browse Source
This commit is contained in:
Daniele Viganò
2025-04-30 22:52:51 +02:00
parent 2e06e94fde
commit 40f42a9ee9
1 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
ram/portal/views.py
View File

@@ -490,11 +490,13 @@ class Manufacturers(GetData):
item_type = "manufacturer" item_type = "manufacturer"
def get_data(self, request): def get_data(self, request):
return Manufacturer.objects.filter( return (
self.filter Manufacturer.objects.filter(self.filter)
).annotate( .annotate(
num_items=Count("rollingstock") + Count("rollingclass"), num_items=Count("rollingstock") + Count("rollingclass"),
).order_by("name") )
.order_by("name")
)
# overload get method to filter by category # overload get method to filter by category
def get(self, request, category, page=1): def get(self, request, category, page=1):
@@ -510,33 +512,38 @@ class Companies(GetData):
item_type = "company" item_type = "company"
def get_data(self, request): def get_data(self, request):
return Company.objects.annotate( return (
num_rollingstock=( Company.objects.annotate(
Count( num_rollingstock=(
"rollingclass__rolling_class", Count(
filter=Q( "rollingclass__rolling_class",
rollingclass__rolling_class__in=( filter=Q(
RollingStock.objects.get_published(request.user) rollingclass__rolling_class__in=(
) RollingStock.objects.get_published(
), request.user
distinct=True )
) )
)
).annotate(
num_consists=(
Count(
"consist",
filter=Q(
consist__in=(
Consist.objects.get_published(request.user)
), ),
), distinct=True,
distinct=True )
) )
) )
).annotate( .annotate(
num_items=F("num_rollingstock") + F("num_consists") num_consists=(
).order_by("name") 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("name")
)
class Scales(GetData): class Scales(GetData):
@@ -614,7 +621,7 @@ class GetBookCatalog(View):
"book": book, "book": book,
"documents": documents, "documents": documents,
"properties": properties, "properties": properties,
"type": selector "type": selector,
}, },
) )