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

fix - dashboard quota filter by date

Browse Source
This commit is contained in:
Mojtaba-z
2025-12-08 14:36:24 +03:30
parent 12dccc624a
commit c8174a7674
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,7 +441,8 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, QuotaDashboardService, viewsets
queryset = self.filter_query(
self.get_queryset(visibility_by_org_scope=True).filter(
is_closed=False)) # return by search param or all objects
is_closed=False)
) # return by search param or all objects
# paginate queryset
page = self.paginate_queryset(

3
apps/product/web/api/v1/viewsets/quota_distribution_api.py
View File

@@ -134,6 +134,9 @@ class QuotaDistributionViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewS
else:
queryset = queryset.filter(Q(quota__is_closed=False))
if query.get('product_id'):
queryset = queryset.filter(Q(quota__product_id=int(query.get('product_id'))))
queryset = self.filter_query(self.filter_queryset(queryset))
page = self.paginate_queryset(queryset)