From 5d7a8aa51d6885a2985b8395d173aded600df27b Mon Sep 17 00:00:00 2001 From: 7nimor <7nimor@gmail.com> Date: Tue, 10 Feb 2026 14:38:40 +0330 Subject: [PATCH] update kill_house --- panel/KillHouse/views.py | 69 +++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/panel/KillHouse/views.py b/panel/KillHouse/views.py index 39895de..1e91cf0 100644 --- a/panel/KillHouse/views.py +++ b/panel/KillHouse/views.py @@ -8206,6 +8206,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 @@ -8214,22 +8215,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__recive_date__date__lte=date2, + kill_request__slaughter_house__in=kill_house_list), 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 = 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, + killer__in=kill_house)), assignment_state_archive='pending', non_receipt=False, trash=False) @@ -15372,6 +15390,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'], @@ -15381,7 +15400,11 @@ class DashboardEnterLoadInformationView(viewsets.ViewSet): user = SystemUserProfile.objects.get(user=request.user) kill_house = [] 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') @@ -15394,26 +15417,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( @@ -15426,6 +15464,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():