Commit 819c1c73 authored by Gladys Forte's avatar Gladys Forte

object

parent 52f0edae
...@@ -50,4 +50,9 @@ class ChangeRequestFormApproversViewset(viewsets.ModelViewSet): ...@@ -50,4 +50,9 @@ class ChangeRequestFormApproversViewset(viewsets.ModelViewSet):
return Response( return Response(
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
\ No newline at end of file
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
\ No newline at end of file
...@@ -18,10 +18,12 @@ class ChangeRequestFormAttachmentsSerializer( ...@@ -18,10 +18,12 @@ class ChangeRequestFormAttachmentsSerializer(
"contact_no": instance.uploaded_by.contact_no "contact_no": instance.uploaded_by.contact_no
} }
ret['uploaded_by'] = user_object ret['uploaded_by'] = user_object
ret['file_upload'] = self.context['request'].build_absolute_uri(instance.file_upload.url.url) ret['file_upload'] = self.context['request'].build_absolute_uri(
instance.file_upload.url.url)
return ret return ret
except Exception as e: except Exception as e:
ret['uploaded_by'] = "none" ret['uploaded_by'] = "none"
ret['file_upload'] = "none"
return ret return ret
class Meta: class Meta:
......
...@@ -47,4 +47,9 @@ class ChangeRequestFormAttachmentsViewset(viewsets.ModelViewSet): ...@@ -47,4 +47,9 @@ class ChangeRequestFormAttachmentsViewset(viewsets.ModelViewSet):
return Response( return Response(
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
\ No newline at end of file
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
\ No newline at end of file
...@@ -47,3 +47,8 @@ class ChangeRequestFormDetailsViewset(viewsets.ModelViewSet): ...@@ -47,3 +47,8 @@ class ChangeRequestFormDetailsViewset(viewsets.ModelViewSet):
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
...@@ -363,11 +363,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -363,11 +363,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
) )
def retrieve(self, request, *args, **kwargs): def retrieve(self, request, *args, **kwargs):
# instance = self.queryset.filter(
# form_code=str(self.kwargs.get('form_code'))
# ).first()
# serializer = self.get_serializer(instance)
# return Response(serializer.data)
instance = self.get_object() instance = self.get_object()
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
return Response(serializer.data) return Response(serializer.data)
......
...@@ -49,3 +49,8 @@ class ChangeRequestFormStakeHoldersViewset(viewsets.ModelViewSet): ...@@ -49,3 +49,8 @@ class ChangeRequestFormStakeHoldersViewset(viewsets.ModelViewSet):
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
\ No newline at end of file
...@@ -51,3 +51,8 @@ class ChangeRequestTemplateApproversViewset(viewsets.ModelViewSet): ...@@ -51,3 +51,8 @@ class ChangeRequestTemplateApproversViewset(viewsets.ModelViewSet):
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
\ No newline at end of file
...@@ -50,3 +50,8 @@ class ChangeRequestTemplateAttachmentsViewset(viewsets.ModelViewSet): ...@@ -50,3 +50,8 @@ class ChangeRequestTemplateAttachmentsViewset(viewsets.ModelViewSet):
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
\ No newline at end of file
...@@ -48,3 +48,8 @@ class ChangeRequestTemplateDetailsViewset(viewsets.ModelViewSet): ...@@ -48,3 +48,8 @@ class ChangeRequestTemplateDetailsViewset(viewsets.ModelViewSet):
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
...@@ -32,6 +32,19 @@ class ChangeRequestTemplatesSerializer( ...@@ -32,6 +32,19 @@ class ChangeRequestTemplatesSerializer(
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
try: try:
requested_to_user_object = {
"id": instance.requested_to_user.id,
"name": instance.requested_to_user.name,
"username": instance.requested_to_user.username,
"code": instance.requested_to_user.code,
"email": instance.requested_to_user.email,
"contact_no": instance.requested_to_user.contact_no
}
ret['requested_to_company_object'] = model_to_dict(instance.requested_to_company)
ret['requested_to_department_object'] = model_to_dict(instance.requested_to_department)
ret['requested_to_user_object'] = requested_to_user_object
ret['company'] = instance.requested_to_company.name ret['company'] = instance.requested_to_company.name
ret['department'] = instance.requested_to_department.name ret['department'] = instance.requested_to_department.name
...@@ -70,7 +83,20 @@ class ChangeRequestTemplatesSerializerList( ...@@ -70,7 +83,20 @@ class ChangeRequestTemplatesSerializerList(
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
try: try:
requested_to_user_object = {
"id": instance.requested_to_user.id,
"name": instance.requested_to_user.name,
"username": instance.requested_to_user.username,
"code": instance.requested_to_user.code,
"email": instance.requested_to_user.email,
"contact_no": instance.requested_to_user.contact_no
}
ret['requested_to_company_object'] = model_to_dict(instance.requested_to_company)
ret['requested_to_department_object'] = model_to_dict(instance.requested_to_department)
ret['requested_to_user_object'] = requested_to_user_object
ret['company'] = instance.requested_to_company.name ret['company'] = instance.requested_to_company.name
ret['department'] = instance.requested_to_department.name ret['department'] = instance.requested_to_department.name
ret['point_of_contact'] = instance.requested_to_user.name ret['point_of_contact'] = instance.requested_to_user.name
......
...@@ -51,3 +51,8 @@ class ChangeRequestTemplateStakeholdersViewset(viewsets.ModelViewSet): ...@@ -51,3 +51,8 @@ class ChangeRequestTemplateStakeholdersViewset(viewsets.ModelViewSet):
serializer.data, serializer.data,
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
\ No newline at end of file
...@@ -442,7 +442,7 @@ class MasterAttachment(models.Model): ...@@ -442,7 +442,7 @@ class MasterAttachment(models.Model):
upload_to='uploads/', upload_to='uploads/',
blank=True, blank=True,
null=True) null=True)
class Meta: class Meta:
db_table = 'master_attachments' db_table = 'master_attachments'
......
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