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

* commit 'd2b073f1':
  comment
  fix date range filter

app/businesslayer/changerequest/change_request.py

@@ -125,41 +125,31 @@ def filter_base(base_queryset,
             return_queryset = return_queryset.filter(status='Closed')
 
         date_modified = []
-        date_modified_not = []
-    
+        #comment
         if date_modified_from and date_modified_to:        
             for query in return_queryset:
                 created = datetime.strftime(query.created, "%Y-%m-%d")
                 
                 if created >= date_modified_from and created <= date_modified_to:
                     date_modified.append(query.id)
-                    return_queryset = return_queryset.filter(id__in=date_modified)
-                else:      
-                    date_modified_not.append(query.id)
-                    return_queryset = return_queryset.all().exclude(id__in=date_modified_not)
-    
-        date_required = []
-        date_required_not = []
 
+            return_queryset = return_queryset.filter(id__in=date_modified)
+            
+        date_required = []
+        
         if date_required_from and date_required_to:
             for query in return_queryset:
                 if query.requested_to_target_date:
-                    
                     requested_to_target_date = datetime.strftime(
                         query.requested_to_target_date,
                         "%Y-%m-%d")
                     
                     if requested_to_target_date >= date_required_from and requested_to_target_date <= date_required_to:
-                        
                         date_required.append(query.id)
-                        return_queryset = return_queryset.filter(id__in=date_required)
-                    else:
-                        date_required_not.append(query.id)
-                        return_queryset = return_queryset.all().exclude(id__in=date_required_not)
-                else:
-                    
-                    date_required_not.append(query.id)
-                    return_queryset = return_queryset.all().exclude(id__in=date_required_not)
+
+            return_queryset = return_queryset.filter(
+                id__in=date_required
+            )
                 
         return_queryset