diff --git a/app/views/admin/poll/results/_result.html.erb b/app/views/admin/poll/results/_result.html.erb new file mode 100644 index 000000000..074c26ebf --- /dev/null +++ b/app/views/admin/poll/results/_result.html.erb @@ -0,0 +1,37 @@ + + + + + + + + + + + + + +
<%= t("admin.results.index.table_whites") %><%= t("admin.results.index.table_nulls") %><%= t("admin.results.index.table_total") %>
<%= @poll.recounts.sum(:white_amount) %><%= @poll.recounts.sum(:null_amount) %><%= @poll.recounts.sum(:total_amount) %>
+ + +<% by_question = @partial_results.group_by(&:question_id) %> +<% @poll.questions.each do |question| %> +

<%= question.title %>

+ + + + + + + + + <% question.question_answers.each_with_index do |answer, i| %> + <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %> + + + + + <% end %> + +
<%= t("admin.results.index.table_answer") %><%= t("admin.results.index.table_votes") %>
<%= answer.title %><%= by_answer[answer.title].present? ? by_answer[answer.title].sum(&:amount) : 0 %>
+<% end %> \ No newline at end of file diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb index ab4e94857..e80a20f2b 100644 --- a/app/views/admin/poll/results/index.html.erb +++ b/app/views/admin/poll/results/index.html.erb @@ -9,44 +9,6 @@ <%= t("admin.results.index.no_results") %> <% else %> - - - - - - - - - - - - - - -
<%= t("admin.results.index.table_whites") %><%= t("admin.results.index.table_nulls") %><%= t("admin.results.index.table_total") %>
<%= @poll.recounts.sum(:white_amount) %><%= @poll.recounts.sum(:null_amount) %><%= @poll.recounts.sum(:total_amount) %>
- - - <% by_question = @partial_results.group_by(&:question_id) %> - <% @poll.questions.each do |question| %> -

<%= question.title %>

- - - - - - - - - <% question.question_answers.each_with_index do |answer, i| %> - <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %> - - - - - <% end %> - -
<%= t("admin.results.index.table_answer") %><%= t("admin.results.index.table_votes") %>
<%= answer.title %><%= by_answer[answer.title].present? ? by_answer[answer.title].sum(&:amount) : 0 %>
- <% end %> - + <%= render "result" %> <% end %>