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

* commit '023e06bc':
  archive

app/applicationlayer/cms/form/header/views.py

@@ -1129,6 +1129,31 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             status=status.HTTP_200_OK
         )
 
+    #restore archived CR
+    def partial_update(self, request, *args, **kwargs):
+        try:
+            kwargs['partial'] = True
+            form_code = self.kwargs['form_code']
+            instance = models.ChangeRequestFormHeader.objects.filter(
+                form_code=form_code
+            )
+            instance.update(is_active=True)
+            message = status_message_response(
+                200, 'success',
+                'Archived Change Request restored',
+                ''
+            )
+            
+            return Response(message, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            message = status_message_response(
+                            500, 'failed',
+                            'Request was not able to process' + str(e), []
+                        )
+            return Response(message,
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
 class ChangeRequestFormPost(APIView):
 
     @transaction.atomic()

app/businesslayer/changerequest/change_request.py

@@ -32,10 +32,10 @@ def list_by_user(user_id_number):
         ).values('group_pivots')
         
         return_queryset = models.ChangeRequestFormHeader.objects.filter(
-            Q(frm_approvers__user__code=user_id_number) |
+            (Q(frm_approvers__user__code=user_id_number) |
             Q(frm_stakes__user__code=user_id_number) |
             Q(requested_by_user=user_id_number) |
-            Q(requested_to_department__in=priviledgeCrs) |
+            Q(requested_to_department__in=priviledgeCrs)) &
             Q(is_active=True)
         ).exclude(
                 Q(status__icontains='Draft') &
@@ -59,11 +59,11 @@ def list_by_user_archived(user_id_number):
         ).values('group_pivots')
         
         return_queryset = models.ChangeRequestFormHeader.objects.filter(
-            Q(is_active=False) |
-            Q(frm_approvers__user__code=user_id_number) |
+            (Q(frm_approvers__user__code=user_id_number) |
             Q(frm_stakes__user__code=user_id_number) |
             Q(requested_by_user=user_id_number) |
-            Q(requested_to_department__in=priviledgeCrs)
+            Q(requested_to_department__in=priviledgeCrs)) &
+            Q(is_active=False)
         ).exclude(
                 Q(status__icontains='Draft') &
                 ~Q(requested_by_user=user_id_number)
@@ -80,10 +80,10 @@ def list_by_user_archived(user_id_number):
 def list_by_user_without_dept(user_id_number):
     try:
         return_queryset = models.ChangeRequestFormHeader.objects.filter(
-            Q(is_active=True) |
-            Q(frm_approvers__user__code=user_id_number) |
+            (Q(frm_approvers__user__code=user_id_number) |
             Q(frm_stakes__user__code=user_id_number) |
-            Q(requested_by_user=user_id_number)
+            Q(requested_by_user=user_id_number)) &
+            Q(is_active=True)
         ).exclude(
                 Q(status__icontains='Draft') &
                 ~Q(requested_by_user=user_id_number)