diff --git a/app/excel_processing.py b/app/excel_processing.py index 67cfb4a..bdee4ef 100644 --- a/app/excel_processing.py +++ b/app/excel_processing.py @@ -2589,7 +2589,10 @@ def all_products_transport_excel(request): filters['product'] = product_type 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': try: diff --git a/app/views.py b/app/views.py index c875ead..d050534 100644 --- a/app/views.py +++ b/app/views.py @@ -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)),