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

* commit 'f0c89196':
  postman

app/businesslayer/changerequest/change_request.py

@@ -32,11 +32,11 @@ def list_by_user(user_id_number):
         ).values('group_pivots')
         
         return_queryset = models.ChangeRequestFormHeader.objects.filter(
-            Q(is_active=True) |
             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') &
                 ~Q(requested_by_user=user_id_number)
@@ -59,6 +59,7 @@ 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_stakes__user__code=user_id_number) |
             Q(requested_by_user=user_id_number) |
@@ -85,8 +86,7 @@ def list_by_user_without_dept(user_id_number):
             Q(requested_by_user=user_id_number)
         ).exclude(
                 Q(status__icontains='Draft') &
-                ~Q(requested_by_user=user_id_number) |
-                Q(status__icontains='Archived')
+                ~Q(requested_by_user=user_id_number)
         ).distinct()
         
         return return_queryset