Commit 37a88913 authored by Gladys Forte's avatar Gladys Forte

archive form

parent 395e14bf
......@@ -7,27 +7,27 @@ class ChangeRequestFormAttachmentsSerializer(
serializers.ModelSerializer
):
def to_representation(self, instance):
# try:
ret = super().to_representation(instance)
user_object = {
"id": instance.uploaded_by.id,
"name": instance.uploaded_by.name,
"username": instance.uploaded_by.username,
"code": instance.uploaded_by.code,
"email": instance.uploaded_by.email,
"contact_no": instance.uploaded_by.contact_no
}
ret['uploaded_by'] = user_object
ret['file_upload'] = self.context['request'].build_absolute_uri(
instance.file_upload.url.url)
ret['file_upload_id'] = self.context['request'].build_absolute_uri(
instance.file_upload.id
)
return ret
# except Exception as e:
# ret['uploaded_by'] = user_object
# ret['file_upload'] = "none"
# return ret
try:
ret = super().to_representation(instance)
user_object = {
"id": instance.uploaded_by.id,
"name": instance.uploaded_by.name,
"username": instance.uploaded_by.username,
"code": instance.uploaded_by.code,
"email": instance.uploaded_by.email,
"contact_no": instance.uploaded_by.contact_no
}
ret['uploaded_by'] = user_object
ret['file_upload'] = self.context['request'].build_absolute_uri(
instance.file_upload.url.url)
ret['file_upload_id'] = self.context['request'].build_absolute_uri(
instance.file_upload.url
)
return ret
except Exception as e:
ret['uploaded_by'] = user_object
ret['file_upload'] = "none"
return ret
class Meta:
model = models.ChangeRequestFormAttachments
......
......@@ -133,7 +133,16 @@ class ChangeRequestFormHeaderSerializerList(
ret['company'] = instance.requested_to_company.name
ret['department'] = instance.requested_to_department.name
ret['requested_by'] = instance.requested_by_user.name
if instance.status.lower() == 'draft':
can_delete = True
elif instance.status.lower() == 'cancelled' or instance.status.lower() == 'closed':
can_delete = False
else:
can_delete = 'None'
ret['can_delete'] = can_delete
return ret
except Exception as e:
ret['action_required'] = "No"
......
......@@ -437,11 +437,16 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
status=status.HTTP_200_OK)
else:
models.ChangeRequestFormHeader.objects.filter(
form_code=form_code
).update(is_active=False)
return Response(
{"message": "Change request cannot be deleted due to previous transaction/s"},
status=status.HTTP_400_BAD_REQUEST)
{"message": "Draft change request sucessfully archived"},
status=status.HTTP_200_OK)
elif current_status.status.lower() == 'cancelled':
elif current_status.status.lower() == 'cancelled' or current_status.status.lower() == 'closed':
models.ChangeRequestFormHeader.objects.filter(
form_code=form_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