Skip to content

Commit

Permalink
Cleanup similar code in triggered_mandatory_questions and triggered_r…
Browse files Browse the repository at this point in the history
…equirements
  • Loading branch information
pezholio committed Jun 6, 2014
1 parent 7455997 commit 9390797
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions app/models/response_set.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,12 @@ def incomplete_triggered_mandatory_questions

def triggered_mandatory_questions

@triggered_mandatory_questions ||= survey.mandatory_questions.select do |r|
r.dependency.nil? ?
true : depends[r.dependency.id]
end

@triggered_mandatory_questions ||= select_triggered(survey.mandatory_questions)
# @triggered_mandatory_questions ||= self.survey.mandatory_questions.select { |q| q.triggered?(self) }
end

def triggered_requirements
@triggered_requirements ||= survey.requirements.select do |r|
r.dependency.nil? ?
true :
depends[r.dependency.id]
end

@triggered_requirements ||= select_triggered(survey.requirements)
# @triggered_requirements ||= survey.requirements.select { |r| r.triggered?(self) }
end

Expand Down Expand Up @@ -354,4 +345,12 @@ def value_for reference_identifier, value = :to_s
responses.joins(:question).where(questions: {reference_identifier: survey.meta_map[reference_identifier]}).first.try(value)
end

def select_triggered(selector)
selector.select do |r|
r.dependency.nil? ?
true :
depends[r.dependency.id]
end
end

end

0 comments on commit 9390797

Please sign in to comment.