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

update

Browse Source
This commit is contained in:
7nimor
2026-02-01 08:35:33 +03:30
parent fdff94fa85
commit 17096924c1
7 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/__pycache__/excel_processing.cpython-39.pyc
View File

Binary file not shown.

BIN
app/__pycache__/helper.cpython-39.pyc
View File

Binary file not shown.

BIN
app/__pycache__/helper_excel.cpython-39.pyc
View File

Binary file not shown.

BIN
app/__pycache__/views.cpython-39.pyc
View File

Binary file not shown.

5
app/excel_processing.py
View File

@@ -2590,7 +2590,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'] = normalize_persian_arabic_text(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:

2
app/helper.py
View File

@@ -160,7 +160,7 @@ def normalize_persian_arabic_text(text):
# 'ک' (U+06A9 - Persian Kaf) -> 'ك' (U+0643 - Arabic Kaf) # 'ک' (U+06A9 - Persian Kaf) -> 'ك' (U+0643 - Arabic Kaf)
# 'ی' (U+06CC - Persian Yeh) -> 'ي' (U+064A - Arabic Yeh) # 'ی' (U+06CC - Persian Yeh) -> 'ي' (U+064A - Arabic Yeh)
text = str(text) text = str(text)
text = text.replace('ک', 'ك') # Persian Kaf to Arabic Kaf # text = text.replace('ک', 'ك') # Persian Kaf to Arabic Kaf
text = text.replace('ی', 'ي') # Persian Yeh to Arabic Yeh text = text.replace('ی', 'ي') # Persian Yeh to Arabic Yeh
return text return text

10
app/views.py
View File

@@ -4522,7 +4522,10 @@ class AllProductsTransportViewSet(viewsets.ModelViewSet):
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'] = normalize_persian_arabic_text(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:
@@ -4762,7 +4765,10 @@ class AllProductsTransportDashboardView(APIView):
destination_province = request.GET.get('destination_province') destination_province = request.GET.get('destination_province')
kill_house_filterset_class = AllProductsTransportFilterSet kill_house_filterset_class = AllProductsTransportFilterSet
if destination_province and destination_province != 'undefined': if destination_province and destination_province != 'undefined':
filters['destination_province'] = normalize_persian_arabic_text(destination_province) if destination_province == 'مرکزی':
filters['destination_province'] = 'مركزي'
else:
filters['destination_province'] = destination_province
queryset = AllProductsTransport.objects.filter(**filters) queryset = AllProductsTransport.objects.filter(**filters)
if search and search != 'undefined' and search.strip(): if search and search != 'undefined' and search.strip():