From 5085e375af7973f0b93c25c365be8d5998c9cb3f Mon Sep 17 00:00:00 2001
From: 7nimor <7nimor@gmail.com>
Date: Mon, 26 Jan 2026 16:33:18 +0330
Subject: [PATCH] update excel

---
 .../excel_processing.cpython-39.pyc           | Bin 51500 -> 51388 bytes
 app/excel_processing.py                       | 173 ++++++++++--------
 2 files changed, 100 insertions(+), 73 deletions(-)

diff --git a/app/__pycache__/excel_processing.cpython-39.pyc b/app/__pycache__/excel_processing.cpython-39.pyc
index b9041bc42aa1599d3ef3ea782b28b901e7dada39..c368ed6db7df8976001d7af0d8658a82531f57bb 100644
GIT binary patch
delta 1619
zcmZ`(TW=dh6rP#A_>#5b*k0S~+#Dxu8cIW5+N4d=0&NITAQW0aprW+mB(0q`4Vx{9
zYE~9l2&s~*z`g*XWsMLLs4r=F1BuWkDUXPYR3aWK1P`Tu0Tj-R(}+CaqxsG^-#L3`
z=FEDpzOQ`qo)SG7iG&IM{uzIxSh_VI{qXB@7N-`DLpWw~Dj^PWDNtZV>M~AB)Mud7
zsH?1V6}h_3HRRel*OBY%Jb*mF75g|>AUG*KXAl}9T(zgUDmC<|sbv&3`)97>&}0C4
z-Cx-2C?&;L9gS-h3gH@agByyzu7r3H%QRq>5PD;Xyhx_vDsl8Tf22g%OJs`eBu=0d
zEQKaWk#P1Iy+r*mL?8rFC^te3njj7dP$3B>q#z9$upkS~&;qTsgd668S!y5P0kN$*
z^BZbJvala=3{FdtQj`ZO49^|r;Zh^CL3<VXDFV4qsoUVhD#SIMCd3Gjl;Um_I(W2{
z7)zFU)Hfktqm-bKf;?JhmAQ>h8oJQ7R2gp^%Ybb2>tfNrH+q1V1DZwZo$#$1akWh`
zeN#+#vZ9Y}3_W(wZGx>lHdiLl&70;3Y`d)SDD(^wry2cyupRD)9nf3VaAWE$vv=3;
zO)#190PN)I9J$P(0K2LxW+@nZxqjn<$*c!qH&<lVo_dzk!lS$a57`I(u(zU@DS>@%
z9P(}g2HYeM591kMX>(0(!k|TF+4LpUQ#{F2{RHC))CVkrn3p&tbFRUDo<i+_)b<I@
z{>{;xtka4r&ap=w@KBXi=oG_T6Z&Lkzf~5c9+s0wBp#G_NaC=>NB_eybCS&}b{C9b
zp~vvq$8j-bdY3HvgyaV#KP;bmQYiMs##V5?c`Ics@sxbbf&HgUH_a1}$CD;F_5^+0
zX~Tx4#Vk!AU%^Jtve!5~4Wq(%vhM#Mv1Ufr$Y6~@Q3IZVBl21!emg&C$XCzsb1)#7
z(*e)IbNKFBaMaJku^QzTJdb}b%kSid-&G?r-#SWqUKq7+;zwh|ODuNpuzx~o7X;iA
z@T-7}l#o@e=!~D8v425fRXsmdbnK73Kd*1~%o}});tv5rdgyBS)zjyvCdX!q7seNy
z#Sf@gD41UE`jz8YfY|Q{I3eJifDRPxX~8B1JA-gXeAVpjf*Hu}M8x!rfU^S93?U=H
z5|9<p%)E<Nb6#lah_b~_c(*57ymyx(g?5oYC*WfNe+jrEV4HwX1o#N6K|Gax(m7{)
zU*vkdKbG3OW2f89tUWI>t_fHW(2q-b9g9hCbU97G@+OuGu^U1k5g=M(f9IX(Z1uif
z&KIJ%eL__hq{cmC1`W!Qp^V1S>M@;#DO=OMc{A_b9#os|vNe{?Qk5EOs$!@?%j-3>
zhvPIxQw&FA97AaMRFno4Ms+j;E9$gMaxuSW8M(HI7<bi75LZm?@!neL_C8<9(cy)g
OE5B1Z?0xzD+y4S@yp&J?

delta 1647
zcmZux+iz4w7@wIv=j`cr@3-!5?=AGA7AS>MO0jCODk6z!L=v$gUrV}3!P7xwGlz|?
zmjtu2FfVAWo;AiNU%2?B(P}U8-QcAUrt#7EKj1gh(<U|UWPac8yUaK9eKUK$yB_%Z
zMj(175(yFfu@~N)zWLj&=*Qod@~9SYj^Ug=VGzQJOF1pFVgM+x3U!$vMZ+^8P@`_Z
z=LT}a=O%K~=N59y=RxE_5pbqN0POQhVov0BI;Y`W5eC>LbX?I6147ziI_tv1Y3fDD
zH{{$Pw~Ce*<hC%&6zXftwYMymZ>iInY*7c{3Uk>>GLtk2uY2oHO4K+-X4oDgf>r87
zMNs9fmNfN3HKL8o3-EeDi{WBK1j`I7U_2_A7lQ~yYYbu#udrg=4V@#9_=39iJW(cY
zm?se<B2rAbQHY6XF+GtHQ7;S08l?pF21w#a;h|zY2WcFc3KOx3d<k^x-cZ~Bx>XN0
z9Lzk~sLCtUh-+^1S=)RTZ&W>T<0!EcZUV9*K2M-QBoK28riem*gzzSm1!#mOXoi-G
zi3c;PC5ElQd%#v8(;=<UCX9Kqz@QyEDh7rr-@c7oR7^*8!VVG8Q9C!Hc(aI#daSYw
zx}m3RQ3Aa#R_&%lsA@QA5juiJo_^I$i<C&?dwQToMY@FKK}AqLRHK;w{Y^f@pilE%
zzJIqb_vpCqxy>7Si;h4G_9_Pb6;`HO>-PHb1HQyZtE2b%azDzF+IY}69Ps7Pe{@`U
zo>c=*0S;pFVV&d<9wOlE-Q-)Fj%fQ)ZAZRkKkVmxSo`NT53lM+)Bl`)R0rPBiIA&A
z=Q3_aq#${KU{kTRD3iPu+n!Nc1A$~2udB*lf04JrBk<_EL^ZvP+1)HW24iZ7?1uEQ
zq>bB5W4KL&PTPQKkEpcpIE?ED6Y<(bSikA8*8xu`#yjCjcnbfzIXLR=fTyv}92^@V
zBIoTCVXv!3bbRhP()-NuamS;Ctc5Q*7vb_*KEdTbKQs;ZQs)=^{Gj*{y-vU4%=sOK
z^9RD5*#~F%<XpJ#tTTyZLTS%ChtPHB%f*{i9{%Ze_f@r0Wmz+)`Q(LJ=b~DEPZ^BM
zGt=DpMCq60{>3iac}?*PM4nn4l6MCavTdqP-itTeD*U+f0g-PXYm8jSPvtB_i$Ujh
z%XmjtzBG_;bSi4?vkKl*@R5RR3aET}>2$K&NhzgO!MuV`<@!{UTw98?ex}qO1)nSM
z6m%<CP*9U!we`#K<raD3U}q%n+)~Ed3hv5l%LDWqxwPD0UsHx36)eeDI-6ztO2^PT
zs)QOW%EHtiis_l7j3)I6Q;S(NO${2pZx~r-=jE<UL9VRCM=Tm*jM>ztIh;1_(Wuzw
qXhM(j_0ZhkM#09|ENbk&Js=aS-EwfXjgH<qx%wBSqjLD?cm4&t2d_W?

diff --git a/app/excel_processing.py b/app/excel_processing.py
index a65ecda..c45729c 100644
--- a/app/excel_processing.py
+++ b/app/excel_processing.py
@@ -2578,8 +2578,7 @@ def import_transporting_detail(request):
 def all_products_transport_excel(request):
     filterset_class = AllProductsTransportFilterSet
 
-    transports = AllProductsTransport.objects.filter(trash=False)
-
+    filters={"trash":False}
     product_type = request.GET.get('product_type')
     destination_province = request.GET.get('destination_province')
     date1 = request.GET.get('date1')
@@ -2587,26 +2586,52 @@ def all_products_transport_excel(request):
     search = request.GET.get('search')
 
     if product_type and product_type != 'undefined':
-        transports = transports.filter(product=product_type)
+        filters['product'] = product_type
 
     if destination_province and destination_province != 'undefined':
-        transports = transports.filter(destination_province=destination_province)
+        filters['destination_province'] = destination_province
 
     if date1 and date2 and date1 != 'undefined' and date2 != 'undefined':
         try:
             start_date = datetime.datetime.strptime(str(date1), '%Y-%m-%d')
             end_date = datetime.datetime.strptime(str(date2), '%Y-%m-%d')
-            transports = transports.filter(date__gte=start_date, date__lte=end_date)
+            filters['date__gte'] = start_date
+            filters['date__lte'] = end_date
         except ValueError:
             pass
+    transports = (
+        AllProductsTransport.objects
+            .filter(**filters)
+            .values_list(
+            "tracking",
+            "product",
+            "items",
+            "quantity",
+            "unit",
+            "date",
+            "destination",
+            "jihadi_destination",
+            "destination_province",
+            "destination_city",
+            "origin",
+            "jihadi_origin",
+            "origin_province",
+            "origin_city",
+            "destination_prev",
+            "destination_changed",
+            "car_tracking_code",
+            "unloading_date",
+            "unloading",
+        )
+    )
 
-    if search:
-        if search != 'undefined' and search.strip():
-            transports = transports.filter(
-                build_query(filterset_class.Meta.fields, search)
-            )
+    if search and search != 'undefined' and search.strip():
+        transports = transports.filter(
+            build_query(filterset_class.Meta.fields, search)
+        )
+    transports = transports.iterator(chunk_size=2000)
 
-    serializer = AllProductsTransportCustomSerializer(transports.order_by('-date', '-create_date'), many=True).data
+    # serializer = AllProductsTransportCustomSerializer(transports.order_by('-date', '-create_date'), many=True).data
 
     excel_options = [
         'ردیف',
@@ -2670,40 +2695,42 @@ def all_products_transport_excel(request):
     create_header_freez(worksheet, excel_options, 1, 6, 7, 20)
     l = 5
     m = 1
-    if serializer:
-        for data in serializer:
-            list1 = [
-                m,  # ردیف
+    total_quantity = 0
 
-                data.get("tracking"),
-                data.get("product"),
-                data.get("items") if data.get("items") else '-',
-                data.get("quantity"),
-                data.get("unit"),
-                str(shamsi_date(convert_str_to_date(data.get("date")),in_value=True)) if data.get('date') else '-',
-                data.get("destination"),
-                data.get("jihadi_destination"),
-                data.get("destination_province"),
-                data.get("destination_city"),
-                data.get("origin"),
-                data.get("jihadi_origin"),
-                data.get("origin_province"),
-                data.get("origin_city"),
-                "داخل استان" if data.get("origin_province") == data.get("destination_province") else "خارج استان",
-                data.get("destination_prev") if data.get("destination_prev") else '-',
-                data.get("destination_changed") if data.get("destination_changed") else '-',
-                data.get("car_tracking_code"),
-                str(shamsi_date(convert_str_to_date(data.get("unloading_date")), in_value=True)) if data.get("unloading_date") else '-',
-                data.get("unloading") if data.get("unloading") else '-',
-            ]
+    for row in transports:
+        quantity = row[3] or 0
+        total_quantity += quantity
 
+        list1 = [
+            m,
+            row[0],  # tracking
+            row[1],  # product
+            row[2] or '-',  # items
+            quantity,
+            row[4],  # unit
+            str(shamsi_date(convert_str_to_date(row[5]), in_value=True)) if row[5] else '-',
+            row[6],  # destination
+            row[7],  # jihadi_destination
+            row[8],  # destination_province
+            row[9],  # destination_city
+            row[10],  # origin
+            row[11],  # jihadi_origin
+            row[12],  # origin_province
+            row[13],  # origin_city
+            "داخل استان" if row[12] == row[8] else "خارج استان",
+            row[14] or '-',  # destination_prev
+            row[15] or '-',  # destination_changed
+            row[16],  # car_tracking_code
+            str(shamsi_date(convert_str_to_date(row[17]), in_value=True)) if row[17] else '-',
+            row[18] or '-',  # unloading
+        ]
 
-            m += 1
+        m += 1
+        l += 1
+        create_value(worksheet, list1, l + 1, 1)
 
-            l += 1
-            create_value(worksheet, list1, l + 1, 1)
-        total_quantity = sum(
-            item['quantity'] for item in serializer)
+        # total_quantity = sum(
+        #     item['quantity'] for item in serializer)
         # aggregation1_bars = all_bars.aggregate(
         #     total=Sum('GoodAmount'),
         #     input_total=Sum('GoodAmount', filter=Q(Out=False)),
@@ -2752,39 +2779,39 @@ def all_products_transport_excel(request):
         #
         # create_value(worksheet, value_header_list2, 3, 5, border_style='thin')
 
-        list2 = [
-            'مجموع==>',
-            '',
-            '',
-            '',
-            total_quantity,
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            # total_count,
-            # total_bars_quantity,
-            # input_bars_count,
-            # total_input_bars_quantity,
-            # total_input_bars_percent,
-            # output_bars_count,
-            # total_output_bars_quantity,
-            # total_output_bars_percent,
+    list2 = [
+        'مجموع==>',
+        '',
+        '',
+        '',
+        total_quantity,
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '',
+        # total_count,
+        # total_bars_quantity,
+        # input_bars_count,
+        # total_input_bars_quantity,
+        # total_input_bars_percent,
+        # output_bars_count,
+        # total_output_bars_quantity,
+        # total_output_bars_percent,
 
-        ]
-        create_value(worksheet, list2, l + 3, 1, color='green')
+    ]
+    create_value(worksheet, list2, l + 3, 1, color='green')
 
     workbook.save(output)
     output.seek(0)