Merge pull request #1502 from sparc-request/kg-response_filter_incomp…

…lete_form_bug KG - Response Filter Include Incomplete Bug
sparc-request · Aug 21, 2018 · 7098f3e · 7098f3e
2 parents f8fa320 + 2f6dc7c
commit 7098f3e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/controllers/surveyor/responses_controller.rb b/app/controllers/surveyor/responses_controller.rb
@@ -191,10 +191,10 @@ def get_incomplete_form_responses
       p.sub_service_requests.each do |ssr|
         ssr.forms_to_complete.select do |f|
           # Apply the State, Survey/Form, and Start/End Date filters manually
-          (@filterrific.with_state.try(&:empty?) || (@filterrific.with_state.try(&:any?) && @filterrific.with_state.exclude?(f.active))) &&
-          (@filterrific.with_survey.try(&:empty?) || (@filterrific.with_survey.try(&:any?) && @filterrific.with_survey.exclude?(f.id))) &&
-          (@filterrific.start_date.nil? || (@filterrific.start_date && f.updated_at < @filterrific.start_date)) &&
-          (@filterrific.end_date.nil? || (@filterrific.end_date && f.updated_at > @filterrific.end_date))
+          (@filterrific.with_state.try(&:empty?) || (@filterrific.with_state.try(&:any?) && @filterrific.with_state.include?(f.active))) &&
+          (@filterrific.with_survey.try(&:empty?) || (@filterrific.with_survey.try(&:any?) && @filterrific.with_survey.include?(f.id))) &&
+          (@filterrific.start_date.nil? || (@filterrific.start_date && f.updated_at >= @filterrific.start_date)) &&
+          (@filterrific.end_date.nil? || (@filterrific.end_date && f.updated_at <= @filterrific.end_date))
         end.each do |f|
           responses << Response.new(survey: f,respondable: ssr)
         end