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

fix - search of quotas dashboard

Browse Source
This commit is contained in:
Mojtaba-z
2025-12-09 08:47:41 +03:30
parent 83e4909299
commit 43393b3f85
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/product/services/quota_dashboard_service.py
View File

@@ -14,7 +14,7 @@ class QuotaDashboardService:
@staticmethod @staticmethod
def get_dashboard(self, org: Organization, start_date: str = None, end_date: str = None, def get_dashboard(self, org: Organization, start_date: str = None, end_date: str = None,
search_fields: list[str] = None, quota_is_closed: bool = False): search_fields: list[str] = None, quota_is_closed: bool = False, query_string: str = None):
if org.type.key == 'ADM': if org.type.key == 'ADM':
org_quota_stats = OrganizationQuotaStats.objects.filter(stat_type='quota', quota__is_closed=quota_is_closed) org_quota_stats = OrganizationQuotaStats.objects.filter(stat_type='quota', quota__is_closed=quota_is_closed)
@@ -32,7 +32,8 @@ class QuotaDashboardService:
start=start_date, start=start_date,
end=end_date, end=end_date,
date_field="create_date", date_field="create_date",
search_fields=search_fields search_fields=search_fields,
query_string=query_string
).apply() ).apply()
org_quota_stats = org_quota_stats.aggregate( org_quota_stats = org_quota_stats.aggregate(

4
apps/product/web/api/v1/viewsets/quota_api.py
View File

@@ -381,6 +381,7 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, QuotaDashboardService, viewsets
# filter by date # filter by date
start_date = query_param.get('start') if 'start' in query_param.keys() else None start_date = query_param.get('start') if 'start' in query_param.keys() else None
end_date = query_param.get('end') if 'end' in query_param.keys() else None end_date = query_param.get('end') if 'end' in query_param.keys() else None
query_string = query_param.get('search') if 'search' in query_param.keys() else None
# filter by quota is close or open # filter by quota is close or open
is_closed = True if 'is_closed' in query_param.keys() else False is_closed = True if 'is_closed' in query_param.keys() else False
@@ -391,7 +392,8 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, QuotaDashboardService, viewsets
start_date=start_date, start_date=start_date,
end_date=end_date, end_date=end_date,
search_fields=search_fields, search_fields=search_fields,
quota_is_closed=is_closed quota_is_closed=is_closed,
query_string=query_string
) )
return Response(quota_dashboard) return Response(quota_dashboard)