MNPC/Rasadyar_RSI
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AllProductsTransportViewSet

Browse Source
This commit is contained in:
7nimor
2026-01-31 22:37:08 +03:30
parent 70262f48dc
commit b0cde349b6
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/excel_processing.py
View File

@@ -2589,7 +2589,10 @@ def all_products_transport_excel(request):
filters['product'] = product_type filters['product'] = product_type
if destination_province and destination_province != 'undefined': if destination_province and destination_province != 'undefined':
filters['destination_province'] = destination_province if destination_province == 'مرکزی':
filters['destination_province'] = 'مركزي'
else:
filters['destination_province'] = destination_province
if date1 and date2 and date1 != 'undefined' and date2 != 'undefined': if date1 and date2 and date1 != 'undefined' and date2 != 'undefined':
try: try:

9
app/views.py
View File

@@ -4775,10 +4775,11 @@ class AllProductsTransportDashboardView(APIView):
bars = queryset.filter(jihadi_origin__in=kill_house_codes) bars = queryset.filter(jihadi_origin__in=kill_house_codes)
if destination_province and destination_province != 'undefined': 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='مركزي') bars = bars.filter(destination_province='مركزي')
else:
bars = bars.filter(destination_province=destination_province)
aggregation = bars.aggregate( aggregation = bars.aggregate(
total=Sum('quantity'), total=Sum('quantity'),
@@ -4839,10 +4840,12 @@ class AllProductsTransportDashboardView(APIView):
).order_by('-modify_date') ).order_by('-modify_date')
if destination_province and destination_province != 'undefined': 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='مركزي') bars = bars.filter(destination_province='مركزي')
else:
bars = bars.filter(destination_province=destination_province)
aggregation = bars.aggregate( aggregation = bars.aggregate(
total=Sum('quantity'), total=Sum('quantity'),
input_total=Sum('quantity', filter=Q(out=False)), input_total=Sum('quantity', filter=Q(out=False)),