Detailed survey report now correctly sorts answer options by position

myapnea · May 12, 2016 · dc52216 · dc52216
1 parent 292c0b0
commit dc52216
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@
   - Blog posts are now viewable on the landing page
 - **Research Topics**
   - Removed requirement to do a research tutorial before casting votes
+- **Survey Changes**
+  - Detailed survey report now correctly sorts answer options by position
 - **Gem Changes**
   - Updated to Ruby 2.3.1
   - Updated to devise 4.1.0

diff --git a/app/views/surveys/reports/_question_and_answer.html.haml b/app/views/surveys/reports/_question_and_answer.html.haml
@@ -27,8 +27,8 @@
           %th Option
           %th.text-right Percentage
         %tbody
-          - all_counts.each do |answer_option_id, count|
-            - answer_option = AnswerOption.find_by_id(answer_option_id)
+          - answer_template.answer_options.each do |answer_option|
+            - count = all_counts[answer_option.id] || 0
             - selected_response = (user_answer_values and user_answer_values.pluck(:answer_option_id).include?(answer_option.id))
             - name = answer_option.text
             - percent = (count * 100 / total_count rescue 0)