overdue dashboard added filter

app/applicationlayer/cms/form/approver/serializers.py

@@ -32,7 +32,7 @@ class ChangeRequestFormApproversSerializer(
                         ret['editable_comp'] = False
                     else:
                         ret['editable_comp'] = True
-
+                    
                     if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
                         ret['editable_dept'] = False
                     else:

app/businesslayer/changerequest/change_request.py

@@ -164,17 +164,17 @@ def filter_overdue(base_queryset):
     return_queryset = base_queryset
 
     try:
-
+        exclude_status = ['Cancelled', 'Completed & Accepted']
         now = datetime.now()
         overdue = []
         
         for query in return_queryset:
             if (query.requested_to_target_date < now):
                 overdue.append(query.form_code)
-
+            
         return_queryset = return_queryset.filter(
             form_code__in=overdue
-        )
+        ).exclude(status__in=exclude_status)
 
     except Exception as e:
         pass