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

update kill_house

Browse Source
This commit is contained in:
7nimor
2026-02-10 14:47:49 +03:30
parent dda06d2fa9
commit 0d0d9410e6
1 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
panel/KillHouse/views.py
View File

@@ -8234,7 +8234,7 @@ class KillHouseRequestForCompleteInformationViewSet(viewsets.ModelViewSet):
assignment_state_archive='pending',
non_receipt=False,
trash=False).order_by(
'create_date')
'-create_date')
else:
if role_key:
@@ -8255,7 +8255,7 @@ class KillHouseRequestForCompleteInformationViewSet(viewsets.ModelViewSet):
killer__in=kill_house)),
assignment_state_archive='pending',
non_receipt=False,
trash=False)
trash=False).order_by('-create_date')
if 'search' in request.GET:
if request.GET['search'] == 'filter':
@@ -13044,10 +13044,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')
@@ -13060,39 +13064,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':