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

change my distributions to assigner & assigned by param

Browse Source
This commit is contained in:
Mojtaba-z
2025-07-29 11:41:34 +03:30
parent b3e37a471f
commit 3d7e9c0b14
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,16 +81,26 @@ class QuotaDistributionViewSet(viewsets.ModelViewSet):
) )
def my_distributions(self, request): def my_distributions(self, request):
""" list of my distributions """ """ list of my distributions """
query = self.request.query_params
organization = get_organization_by_user(request.user) organization = get_organization_by_user(request.user)
# paginate queryset if query.get('param') == 'assigned':
page = self.paginate_queryset( # paginate queryset
self.queryset.filter( page = self.paginate_queryset(
Q(assigned_organization=organization) self.queryset.filter(
).order_by('-modify_date') Q(assigned_organization=organization)
) ).order_by('-modify_date')
if page is not None: )
serializer = self.get_serializer(page, many=True) elif query.get('param') == 'assigner':
# paginate queryset
page = self.paginate_queryset(
self.queryset.filter(
Q(assigner_organization=organization)
).order_by('-modify_date')
)
if page is not None: # noqa
serializer = self.get_serializer(page, many=True) # noqa
return self.get_paginated_response(serializer.data) return self.get_paginated_response(serializer.data)
@action( @action(

3
apps/warehouse/web/api/v1/serializers.py
View File

@@ -47,10 +47,13 @@ class InventoryEntrySerializer(serializers.ModelSerializer):
return attrs return attrs
def to_representation(self, instance): def to_representation(self, instance):
""" custom output of inventory entry serializer """
representation = super().to_representation(instance) representation = super().to_representation(instance)
if instance.document: if instance.document:
representation['document'] = instance.document representation['document'] = instance.document
if instance.distribution: if instance.distribution:
# distribution data
representation['distribution'] = { representation['distribution'] = {
'distribution': instance.distribution.distribution_id, 'distribution': instance.distribution.distribution_id,
'sale_unit': instance.distribution.quota.sale_unit.unit, 'sale_unit': instance.distribution.quota.sale_unit.unit,