Commit 6d21ea94 authored by Gladys Forte's avatar Gladys Forte

Merge pull request #195 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '628964d1':
  comment
parents 1bd7b80c 628964d1
...@@ -559,7 +559,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -559,7 +559,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
delegation='Vendor/Implementor' delegation='Vendor/Implementor'
).first() ).first()
print(the_last_vendor) print(the_last_vendor) #comment
elif action.lower() == 'rejected': elif action.lower() == 'rejected':
...@@ -862,11 +862,6 @@ class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet): ...@@ -862,11 +862,6 @@ class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet):
self.queryset = QuerySetHelper.Sort(self) self.queryset = QuerySetHelper.Sort(self)
return super(ChangeRequestFormApproversViewset, self).list(request) return super(ChangeRequestFormApproversViewset, self).list(request)
# def retrieve(self, request, *args, **kwargs):
# instance = self.queryset.filter(archived_at=None).first()
# serializer = self.get_serializer(instance)
# return Response(serializer.data)
class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet): class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet):
queryset = models.ChangeRequestFormAttachments.objects.all() queryset = models.ChangeRequestFormAttachments.objects.all()
...@@ -874,51 +869,12 @@ class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet): ...@@ -874,51 +869,12 @@ class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet):
pagination_class = paginators.SimplePageNumberPagination pagination_class = paginators.SimplePageNumberPagination
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
# self.queryset = self.queryset.filter(archived_at=None)
self.queryset = QuerySetHelper.Sort(self) self.queryset = QuerySetHelper.Sort(self)
self.queryset = QuerySetHelper.Filter(self) self.queryset = QuerySetHelper.Filter(self)
return super( return super(
ChangeRequestFormAttachmentsViewset, self ChangeRequestFormAttachmentsViewset, self
).list(request) ).list(request)
# def create(self, request, *args, **kwargs):
# attachment_no = request.data.get('attachment_no')
# ObjectId = request.data.get('id')
# serializer = self.get_serializer(data=request.data)
# serializer.is_valid(raise_exception=True)
# if ObjectId:
# dbExisting = models.ChangeRequestFormAttachments.objects.filter(
# id=ObjectId).first()
# if dbExisting:
# dbExisting.archived_at = datetime.now()
# dbExisting.save()
# self.perform_create(serializer)
# if not attachment_no:
# id = serializer.data['id']
# db_counter = models.ChangeRequestFormAttachments.objects.all().count()
# db_counter = db_counter + 1
# models.ChangeRequestFormAttachments.objects.filter(id=id).update(
# set__attachment_no=number_generator(
# "ATCH", db_counter
# )
# )
# headers = self.get_success_headers(serializer.data)
# return Response(
# serializer.data,
# status=status.HTTP_201_CREATED,
# headers=headers
# )
# def retrieve(self, request, *args, **kwargs):
# instance = self.queryset.filter(archived_at=None).first()
# serializer = self.get_serializer(instance)
# return Response(serializer.data)
class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet): class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet):
...@@ -927,37 +883,10 @@ class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet): ...@@ -927,37 +883,10 @@ class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet):
pagination_class = paginators.SimplePageNumberPagination pagination_class = paginators.SimplePageNumberPagination
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
# self.queryset = self.queryset.filter(archived_at=None)
self.queryset = QuerySetHelper.Sort(self) self.queryset = QuerySetHelper.Sort(self)
self.queryset = QuerySetHelper.Filter(self) self.queryset = QuerySetHelper.Filter(self)
return super(ChangeRequestFormStakeHoldersViewset, self).list(request) return super(ChangeRequestFormStakeHoldersViewset, self).list(request)
# def create(self, request, *args, **kwargs):
# ObjectId = request.data.get('id')
# serializer = self.get_serializer(data=request.data)
# serializer.is_valid(raise_exception=True)
# if ObjectId:
# dbExisting = models.ChangeRequestFormStakeHolders.objects.filter(
# id=ObjectId).first()
# if dbExisting:
# dbExisting.save()
# self.perform_create(serializer)
# headers = self.get_success_headers(serializer.data)
# return Response(
# serializer.data,
# status=status.HTTP_201_CREATED,
# headers=headers
# )
# def retrieve(self, request, *args, **kwargs):
# instance = self.queryset.filter(archived_at=None).first()
# serializer = self.get_serializer(instance)
# return Response(serializer.data)
class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet): class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet):
...@@ -966,37 +895,10 @@ class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet): ...@@ -966,37 +895,10 @@ class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet):
pagination_class = paginators.SimplePageNumberPagination pagination_class = paginators.SimplePageNumberPagination
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
# self.queryset = self.queryset.filter(archived_at=None)
self.queryset = QuerySetHelper.Sort(self) self.queryset = QuerySetHelper.Sort(self)
self.queryset = QuerySetHelper.Filter(self) self.queryset = QuerySetHelper.Filter(self)
return super(ChangeRequestFormDetailsViewset, self).list(request) return super(ChangeRequestFormDetailsViewset, self).list(request)
# def create(self, request, *args, **kwargs):
# ObjectId = request.data.get('id')
# serializer = self.get_serializer(data=request.data)
# serializer.is_valid(raise_exception=True)
# if ObjectId:
# dbExisting = models.ChangeRequestFormDetails.objects.filter(
# id=ObjectId).first()
# if dbExisting:
# dbExisting.save()
# self.perform_create(serializer)
# headers = self.get_success_headers(serializer.data)
# return Response(
# serializer.data,
# status=status.HTTP_201_CREATED,
# headers=headers
# )
# def retrieve(self, request, *args, **kwargs):
# instance = self.queryset.filter(archived_at=None).first()
# serializer = self.get_serializer(instance)
# return Response(serializer.data)
class ChangeRequestFormPost(APIView): class ChangeRequestFormPost(APIView):
......
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