add: add new field for list api
This commit is contained in:
@@ -9,6 +9,14 @@ from core.apps.finance.serializers.payment_type import PaymentTypeSerializer
|
||||
from core.apps.projects.models import Project
|
||||
|
||||
|
||||
class ProjectSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Project
|
||||
fields = [
|
||||
'id', 'name', 'start_date', 'end_data', 'status'
|
||||
]
|
||||
|
||||
|
||||
class CashTransactionEmployeeListSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = User
|
||||
@@ -20,13 +28,14 @@ class CashTransactionEmployeeListSerializer(serializers.ModelSerializer):
|
||||
class CashTransactionListSerializer(serializers.ModelSerializer):
|
||||
payment_type = PaymentTypeSerializer(many=True)
|
||||
employees = CashTransactionEmployeeListSerializer(many=True)
|
||||
projects = ProjectSerializer(many=True)
|
||||
|
||||
class Meta:
|
||||
model = CashTransaction
|
||||
fields = [
|
||||
'id', 'name', 'payment_type', 'employees', 'status', 'total_balance_usd',
|
||||
'income_balance_usd', 'expence_balance_usd', 'total_balance_uzs',
|
||||
'income_balance_uzs', 'expence_balance_uzs'
|
||||
'income_balance_uzs', 'expence_balance_uzs', 'projects'
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ class CashTransactionListApiView(generics.ListAPIView):
|
||||
permission_classes = [HasRolePermission]
|
||||
required_permissions = []
|
||||
serializer_class = serializers.CashTransactionListSerializer
|
||||
queryset = CashTransaction.objects.prefetch_related('employees', 'payment_type')
|
||||
queryset = CashTransaction.objects.prefetch_related('employees', 'payment_type', 'projects')
|
||||
pagination_class = CustomPageNumberPagination
|
||||
|
||||
|
||||
|
||||
@@ -8,13 +8,22 @@ from core.apps.accounts.serializers.user import UserListSerializer
|
||||
from core.apps.projects.models.project import Project
|
||||
|
||||
|
||||
class ProjectSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Project
|
||||
fields = [
|
||||
'id', 'name', 'start_date', 'end_data', 'status'
|
||||
]
|
||||
|
||||
|
||||
class WhereHouseListSerializer(serializers.ModelSerializer):
|
||||
users = UserListSerializer(many=True)
|
||||
projects = ProjectSerializer(many=True)
|
||||
|
||||
class Meta:
|
||||
model = WhereHouse
|
||||
fields = [
|
||||
'id', 'name', 'address', 'users'
|
||||
'id', 'name', 'address', 'users', 'projects'
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ from core.apps.accounts.permissions.permissions import HasRolePermission
|
||||
|
||||
class WhereHouseListApiView(generics.GenericAPIView):
|
||||
serializer_class = serializers.WhereHouseListSerializer
|
||||
queryset = WhereHouse.objects.prefetch_related('users')
|
||||
queryset = WhereHouse.objects.prefetch_related('users', 'projects')
|
||||
permission_classes = [HasRolePermission]
|
||||
|
||||
def get(self, request):
|
||||
|
||||
Reference in New Issue
Block a user