aminhashemi92/shafafiyat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: aminhashemi92:1b37aa1522b02e435cc433350e4e4af8932b7ac0
Branches Tags
aminhashemi92:main
aminhashemi92:production
aminhashemi92:fix_installer
aminhashemi92:fix_city
aminhashemi92:Add_field
aminhashemi92:shafafiyat/production
..
compare: aminhashemi92:37524386303eddc49f5b92da1dada034e6f9cc7c
Branches Tags
aminhashemi92:production
aminhashemi92:fix_installer
aminhashemi92:fix_city
aminhashemi92:Add_field
aminhashemi92:shafafiyat/production
aminhashemi92:main

2 commits
1b37aa1522 ... 3752438630

Author SHA1 Message Date
Hadi
3752438630 Merge remote-tracking branch 'origin/fix_city' into production 2025-10-28 13:06:56 +03:30
aminhashemi92
c58ccb3977 fix city in queryset. 2025-10-28 12:42:19 +03:30
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
processes/utils.py
View file

@ -21,7 +21,7 @@ def scope_instances_queryset(user, queryset=None):
if profile.has_role(UserRoles.BROKER):
return qs.filter(broker=profile.broker)
if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER) or profile.has_role(UserRoles.WATER_RESOURCE_MANAGER):
return qs.filter(broker__affairs__county=profile.county)
return qs.filter(broker__affairs__county__city=profile.county.city)
if profile.has_role(UserRoles.ADMIN):
return qs
# if profile.has_role(UserRoles.WATER_RESOURCE_MANAGER) or profile.has_role(UserRoles.HEADQUARTER):
@ -70,7 +70,7 @@ def scope_wells_queryset(user, queryset=None):
if profile.has_role(UserRoles.BROKER):
return qs.filter(broker=profile.broker)
if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER) or profile.has_role(UserRoles.WATER_RESOURCE_MANAGER):
return qs.filter(broker__affairs__county=profile.county)
return qs.filter(broker__affairs__county__city=profile.county.city)
if profile.has_role(UserRoles.INSTALLER):
# Wells that have instances assigned to this installer
from installations.models import InstallationAssignment
@ -103,7 +103,7 @@ def scope_customers_queryset(user, queryset=None):
if profile.has_role(UserRoles.BROKER):
return qs.filter(broker=profile.broker)
if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER) or profile.has_role(UserRoles.WATER_RESOURCE_MANAGER):
return qs.filter(county=profile.county)
return qs.filter(county__city=profile.county.city)
if profile.has_role(UserRoles.INSTALLER):
# Customers that are representatives of instances assigned to this installer
from installations.models import InstallationAssignment