From 6fd8035a403c0add0ae8984536a5c10016055869 Mon Sep 17 00:00:00 2001
From: 7nimor <7nimor@gmail.com>
Date: Tue, 10 Feb 2026 14:46:14 +0330
Subject: [PATCH] update kill_house

---
 panel/KillHouse/views.py | 45 ++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/panel/KillHouse/views.py b/panel/KillHouse/views.py
index 7415c88..0b51ee8 100644
--- a/panel/KillHouse/views.py
+++ b/panel/KillHouse/views.py
@@ -13039,10 +13039,14 @@ class KillHouseRequestForAggregateLoadsViewSet(viewsets.ModelViewSet):
         # user = SystemUserProfile.objects.get(user=request.user)
         date1 = datetime.strptime(str(request.GET['date1']), '%Y-%m-%d').date()
         date2 = datetime.strptime(str(request.GET['date2']), '%Y-%m-%d').date()
+        role_key = request.GET.get('role_key')
         kill_house = []
         kill_house_requests_list = []
         if request.GET['role'] == 'KillHouse':
-            kill_house = KillHouse.objects.filter(kill_house_operator__user=user, trash=False)
+            if role_key:
+                kill_house = KillHouse.objects.filter(key=role_key, trash=False)
+            else:
+                kill_house = KillHouse.objects.filter(kill_house_operator__user=user, trash=False)
 
         elif request.GET['role'] == 'KillHouseVet':
             kill_house_vets = KillHouseVet.objects.filter(vet__user=user, trash=False).select_related('kill_house')
@@ -13055,39 +13059,62 @@ class KillHouseRequestForAggregateLoadsViewSet(viewsets.ModelViewSet):
         if request.GET['role'] in ['CityOperator', 'CityJahad', 'CityPoultry']:
             if request.GET['role'] == 'CityOperator':
                 city_operator = CityOperator.objects.get(user=user, trash=False)
+                # kill_house_requests = KillHouseRequest.objects.filter(
+                #     (Q(killhouse_user__in=kill_house) | Q(kill_request__slaughter_house__in=kill_house)),
+                #     kill_request__recive_date__date__gte=date1,
+                #     kill_request__recive_date__date__lte=date2,
+                #     assignment_state_archive='pending',
+                #     non_receipt=False,
+                #     trash=False, province_request__poultry_request__poultry__city_operator=city_operator.unit_name,
+                #
+                # ).order_by('-kill_request__recive_date')
                 kill_house_requests = KillHouseRequest.objects.filter(
                     (Q(killhouse_user__in=kill_house) | Q(kill_request__slaughter_house__in=kill_house)),
-                    kill_request__recive_date__date__gte=date1,
-                    kill_request__recive_date__date__lte=date2,
+
                     assignment_state_archive='pending',
                     non_receipt=False,
                     trash=False, province_request__poultry_request__poultry__city_operator=city_operator.unit_name,
 
                 ).order_by('-kill_request__recive_date')
             else:
+                # kill_house_requests = KillHouseRequest.objects.filter(
+                #     (Q(killhouse_user__in=kill_house) | Q(kill_request__slaughter_house__in=kill_house)),
+                #     kill_request__recive_date__date__gte=date1,
+                #     kill_request__recive_date__date__lte=date2,
+                #     assignment_state_archive='pending',
+                #     non_receipt=False,
+                #     trash=False, province_request__poultry_request__poultry__address__city=user.city
+                #
+                # ).order_by('-kill_request__recive_date')
                 kill_house_requests = KillHouseRequest.objects.filter(
                     (Q(killhouse_user__in=kill_house) | Q(kill_request__slaughter_house__in=kill_house)),
-                    kill_request__recive_date__date__gte=date1,
-                    kill_request__recive_date__date__lte=date2,
+
                     assignment_state_archive='pending',
                     non_receipt=False,
                     trash=False, province_request__poultry_request__poultry__address__city=user.city
 
                 ).order_by('-kill_request__recive_date')
-
         else:
 
+            # kill_house_requests = KillHouseRequest.objects.filter(
+            #     (Q(killhouse_user__in=kill_house) | Q(kill_request__slaughter_house__in=kill_house) | Q(
+            #         killer__in=kill_house)),
+            #     kill_request__recive_date__date__gte=date1,
+            #     kill_request__recive_date__date__lte=date2,
+            #     assignment_state_archive='pending',
+            #     non_receipt=False,
+            #     trash=False,
+            #
+            # ).order_by('-kill_request__recive_date')
             kill_house_requests = KillHouseRequest.objects.filter(
                 (Q(killhouse_user__in=kill_house) | Q(kill_request__slaughter_house__in=kill_house) | Q(
                     killer__in=kill_house)),
-                kill_request__recive_date__date__gte=date1,
-                kill_request__recive_date__date__lte=date2,
+
                 assignment_state_archive='pending',
                 non_receipt=False,
                 trash=False,
 
             ).order_by('-kill_request__recive_date')
-
         if 'search' in request.GET:
             if request.GET['search'] == 'filter':
                 if request.GET['value'] != "" and request.GET['value'] != 'undefined':