Merge 299bc48 into 36bd911

dbca-wa · Aug 21, 2017 · 2ce6c6e · 2ce6c6e
2 parents 36bd911 + 299bc48
commit 2ce6c6e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/prs2/referral/api.py b/prs2/referral/api.py
@@ -65,15 +65,20 @@ class OrganisationResource(ModelResource):
 
 
 class TaskStateResource(ModelResource):
-    Meta = generate_meta(
-        TaskState, overrides={'queryset': TaskState.objects.current().filter(public=True)})
+    Meta = generate_meta(TaskState, overrides={
+        'queryset': TaskState.objects.current().filter(public=True),
+        'excludes': ['created', 'effective_to', 'modified']
+    })
     task_type = fields.ToOneField(
         'referral.api.TaskTypeResource', attribute='task_type', full=False,
         null=True, blank=True)
 
 
 class TaskTypeResource(ModelResource):
-    Meta = generate_meta(TaskType, overrides={'queryset': TaskType.objects.current().filter(public=True)})
+    Meta = generate_meta(TaskType, overrides={
+        'queryset': TaskType.objects.current(),
+        'excludes': ['created', 'effective_to', 'modified']
+    })
     initial_state = fields.ToOneField(
         'referral.api.TaskStateResource', attribute='initial_state', full=False,
         null=True, blank=True)
@@ -255,6 +260,10 @@ def build_filters(self, filters=None, ignore_bad_filters=False):
             orm_filters['task__referral__regions__id__in'] = task_ref_region
         if task_state:
             orm_filters['task__state__id'] = task_state
+        if 'task__start_date__gte' in filters:
+            orm_filters['task__start_date__gte'] = filters['task__start_date__gte']
+        if 'task__start_date__lte' in filters:
+            orm_filters['task__start_date__lte'] = filters['task__start_date__lte']
 
         return orm_filters