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

* commit '4935b143':
  dash

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

@@ -189,8 +189,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             requested_to_priority='Normal'
         ).count()
 
-        # self.queryset = change_request.list_by_user_without_dept(
-        #     id_number)
+        self.queryset = change_request.list_by_user_without_dept(
+            id_number)
 
         awaiting_filtered = change_request.filter_awaiting(self.queryset, id_number)
 
@@ -278,7 +278,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
         id_number = self.request.user.code
 
-        self.queryset = change_request.list_by_user(
+        self.queryset = change_request.list_by_user_without_dept(
             id_number)
 
         self.queryset = change_request.filter_overdue(self.queryset)

app/businesslayer/changerequest/change_request.py

@@ -164,7 +164,7 @@ def filter_overdue(base_queryset):
     return_queryset = base_queryset
 
     try:
-        exclude_status = ['Cancelled', 'Completed & Accepted', 'Closed']
+        exclude_status = ['Cancelled', 'Completed & Accepted', 'Closed', 'Draft']
         now = datetime.now()
         overdue = []