AllProductsTransportViewSet
This commit is contained in:
@@ -4775,10 +4775,11 @@ class AllProductsTransportDashboardView(APIView):
|
||||
bars = queryset.filter(jihadi_origin__in=kill_house_codes)
|
||||
|
||||
if destination_province and destination_province != 'undefined':
|
||||
bars = bars.filter(destination_province=destination_province)
|
||||
if destination_province=='مرکزی':
|
||||
bars = bars.filter(destination_province='مركزي')
|
||||
|
||||
else:
|
||||
bars = bars.filter(destination_province=destination_province)
|
||||
|
||||
aggregation = bars.aggregate(
|
||||
total=Sum('quantity'),
|
||||
@@ -4839,10 +4840,12 @@ class AllProductsTransportDashboardView(APIView):
|
||||
).order_by('-modify_date')
|
||||
|
||||
if destination_province and destination_province != 'undefined':
|
||||
bars = bars.filter(destination_province=destination_province)
|
||||
if destination_province=='مرکزی':
|
||||
|
||||
if destination_province == 'مرکزی':
|
||||
bars = bars.filter(destination_province='مركزي')
|
||||
|
||||
else:
|
||||
bars = bars.filter(destination_province=destination_province)
|
||||
aggregation = bars.aggregate(
|
||||
total=Sum('quantity'),
|
||||
input_total=Sum('quantity', filter=Q(out=False)),
|
||||
|
||||
Reference in New Issue
Block a user