Commit b3dbea77 authored by Gladys Forte's avatar Gladys Forte

requested to user comp and dept details

parent 204faf4b
...@@ -27,7 +27,7 @@ class UserListTemplate(APIView): ...@@ -27,7 +27,7 @@ class UserListTemplate(APIView):
code__in=verified_users code__in=verified_users
) )
print(user_list) print(user_list)
page = self.paginate_queryset(user_list) page = self.paginate_queryset(user_list)
if page is not None: if page is not None:
......
...@@ -43,7 +43,11 @@ class ChangeRequestTemplatesSerializer( ...@@ -43,7 +43,11 @@ class ChangeRequestTemplatesSerializer(
"username": instance.requested_to_user.username, "username": instance.requested_to_user.username,
"code": instance.requested_to_user.code, "code": instance.requested_to_user.code,
"email": instance.requested_to_user.email, "email": instance.requested_to_user.email,
"contact_no": instance.requested_to_user.contact_no "contact_no": instance.requested_to_user.contact_no,
"company_code": instance.requested_to_user.department.company.code,
"company_name": instance.requested_to_user.department.company.name,
"department_code": instance.requested_to_user.department.code,
"department_name": instance.requested_to_user.department.name
} }
ret['requested_to_company'] = { ret['requested_to_company'] = {
......
...@@ -64,7 +64,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet): ...@@ -64,7 +64,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
'created', 'created',
'created_by_user__name' 'created_by_user__name'
) )
search_fields = ( search_fields = (
"template_no", "requested_to_template_id", "created_by_user__name", "template_no", "requested_to_template_id", "created_by_user__name",
"created_by_user__code", "created_by_department__name", "created_by_user__code", "created_by_department__name",
......
...@@ -52,6 +52,7 @@ class ChangeRequestList(serializers.ModelSerializer): ...@@ -52,6 +52,7 @@ class ChangeRequestList(serializers.ModelSerializer):
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
ret['company_name'] = instance.department.company.name ret['company_name'] = instance.department.company.name
ret['company_code'] = instance.department.company.code ret['company_code'] = instance.department.company.code
ret['department_code'] = instance.department.code ret['department_code'] = instance.department.code
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment