update kill_house

panel/KillHouse/views.py

@@ -8211,6 +8211,7 @@ class KillHouseRequestForCompleteInformationViewSet(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
         kill_house_request_list = []
         now = datetime.now().date()
+        role_key = request.GET.get('role_key')
         user = SystemUserProfile.objects.get(user=request.user, trash=False)
         date1 = datetime.strptime(str(request.GET['date1']),
                                   '%Y-%m-%d').date() if 'date1' in request.GET else now
@@ -8219,22 +8220,39 @@ class KillHouseRequestForCompleteInformationViewSet(viewsets.ModelViewSet):
         if request.GET['role'] == 'KillHouseVet':
             kill_house_vet = KillHouseVet.objects.filter(vet__user=user, trash=False)
             kill_house_list = kill_house_vet.values_list('kill_house', flat=True).distinct()
+            # kill_house_requests = KillHouseRequest.objects.filter(
+            #     Q(killhouse_user__in=kill_house_list) | Q(
+            #         kill_request__slaughter_house__in=kill_house_list), 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(
+            #     'create_date')
             kill_house_requests = KillHouseRequest.objects.filter(
                 Q(killhouse_user__in=kill_house_list) | Q(
-                    kill_request__slaughter_house__in=kill_house_list), kill_request__recive_date__date__gte=date1,
+                    kill_request__slaughter_house__in=kill_house_list),
-                kill_request__recive_date__date__lte=date2,
                 assignment_state_archive='pending',
                 non_receipt=False,
                 trash=False).order_by(
                 'create_date')
 
         else:
-
+            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)
+
+            # 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)
+
             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,
+                    killer__in=kill_house)),
-                kill_request__recive_date__date__lte=date2,
                 assignment_state_archive='pending',
                 non_receipt=False,
                 trash=False)
@@ -15377,6 +15395,7 @@ class DashboardEnterLoadInformationView(viewsets.ViewSet):
 
     def list(self, request, *args, **kwargs):
         now = datetime.now().date()
+        role_key = request.GET.get('role_key')
         date1 = datetime.strptime(request.GET['date1'],
                                   '%Y-%m-%d').date() if 'date1' in request.GET else now
         date2 = datetime.strptime(request.GET['date2'],
@@ -15386,8 +15405,12 @@ class DashboardEnterLoadInformationView(viewsets.ViewSet):
         user = SystemUserProfile.objects.get(user=request.user)
         kill_house = []
         if request.GET['role'] == 'KillHouse':
+            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')
             for kill_house_vet in kill_house_vets:
@@ -15399,26 +15422,41 @@ class DashboardEnterLoadInformationView(viewsets.ViewSet):
         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(
@@ -15431,6 +15469,15 @@ class DashboardEnterLoadInformationView(viewsets.ViewSet):
                 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)),
+
+                assignment_state_archive='pending',
+                non_receipt=False,
+                trash=False,
+
+            ).order_by('-kill_request__recive_date')
 
         if value and search == 'filter':
             if value != 'undefined' and value.strip():