diff --git a/app/views/budgets/stats/_advanced_stats.html.erb b/app/views/budgets/stats/_advanced_stats.html.erb new file mode 100644 index 000000000..d8424a111 --- /dev/null +++ b/app/views/budgets/stats/_advanced_stats.html.erb @@ -0,0 +1,83 @@ +
+

<%= t("stats.advanced") %>

+ +
+

<%= t("stats.budgets.total_investments") %>

+ + <%= number_with_info_tags( + stats.total_budget_investments, + t("stats.budgets.total_investments"), + html_class: "total-investments" + ) %> + + <%= number_with_info_tags(stats.total_unfeasible_investments, + t("stats.budgets.total_unfeasible_investments")) %> + <%= number_with_info_tags(stats.total_selected_investments, + t("stats.budgets.total_selected_investments")) %> +
+ +
+

<%= t("stats.budgets.by_phase") %>

+ + <% stats.phases.each do |phase| %> + <%= number_with_info_tags( + stats.send("total_participants_#{phase}_phase"), + t("stats.budgets.participants_#{phase}_phase") + ) %> + <% end %> +
+ +
+

<%= t("stats.budgets.by_heading") %>

+ + + + + + + + <% stats.all_phases.each do |phase| %> + + <% end %> + + + <% stats.all_phases.each do %> + + + + <% end %> + + + + <% @headings.each do |heading| %> + + + + + <% stats.all_phases.each do |phase| %> + + + + <% end %> + + <% end %> + +
<%= t("stats.budgets.heading") %><%= t("stats.budgets.investments_sent_html") %> + <%= t("stats.budgets.participants_#{phase}_phase") %> +
<%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants") %><%= t("stats.budgets.percent_heading_census") %>
+ <%= heading.name %> + + <%= stats.headings[heading.id][:total_investments_count] %> + + <%= stats.headings[heading.id]["total_participants_#{phase}_phase".to_sym] %> + + <%= number_to_stats_percentage(stats.headings[heading.id]["percentage_participants_#{phase}_phase".to_sym]) %> + + <%= number_to_stats_percentage(stats.headings[heading.id]["percentage_district_population_#{phase}_phase".to_sym]) %> +
+
+
diff --git a/app/views/budgets/stats/_advanced_stats_links.html.erb b/app/views/budgets/stats/_advanced_stats_links.html.erb new file mode 100644 index 000000000..7e508d2f1 --- /dev/null +++ b/app/views/budgets/stats/_advanced_stats_links.html.erb @@ -0,0 +1,12 @@ +

<%= link_to t("stats.advanced"), "#advanced_statistics" %>

+ diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 0ad241529..f4ad25de8 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -41,107 +41,12 @@
<%= render "shared/stats/links", stats: @stats %> - -

<%= link_to t("stats.advanced"), "#advanced_statistics" %>

- + <%= render "advanced_stats_links" %>
<%= render "shared/stats/participation", stats: @stats %> - -
-

<%= t("stats.advanced") %>

- -
-

<%= t("stats.budgets.total_investments") %>

- - <%= number_with_info_tags( - @stats.total_budget_investments, - t("stats.budgets.total_investments"), - html_class: "total-investments" - ) %> - - <%= number_with_info_tags(@stats.total_unfeasible_investments, - t("stats.budgets.total_unfeasible_investments")) %> - <%= number_with_info_tags(@stats.total_selected_investments, - t("stats.budgets.total_selected_investments")) %> -
- -
-

<%= t("stats.budgets.by_phase") %>

- - <% @stats.phases.each do |phase| %> - <%= number_with_info_tags( - @stats.send("total_participants_#{phase}_phase"), - t("stats.budgets.participants_#{phase}_phase") - ) %> - <% end %> -
- -
-

<%= t("stats.budgets.by_heading") %>

- - - - - - - - <% @stats.all_phases.each do |phase| %> - - <% end %> - - - <% @stats.all_phases.each do %> - - - - <% end %> - - - - <% @headings.each do |heading| %> - - - - - <% @stats.all_phases.each do |phase| %> - - - - <% end %> - - <% end %> - -
<%= t("stats.budgets.heading") %><%= t("stats.budgets.investments_sent_html") %> - <%= t("stats.budgets.participants_#{phase}_phase") %> -
<%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants") %><%= t("stats.budgets.percent_heading_census") %>
- <%= heading.name %> - - <%= @stats.headings[heading.id][:total_investments_count] %> - - <%= @stats.headings[heading.id]["total_participants_#{phase}_phase".to_sym] %> - - <%= number_to_stats_percentage(@stats.headings[heading.id]["percentage_participants_#{phase}_phase".to_sym]) %> - - <%= number_to_stats_percentage(@stats.headings[heading.id]["percentage_district_population_#{phase}_phase".to_sym]) %> -
-
-
+ <%= render "advanced_stats", stats: @stats %>
diff --git a/app/views/polls/_advanced_stats.html.erb b/app/views/polls/_advanced_stats.html.erb new file mode 100644 index 000000000..5b66db75a --- /dev/null +++ b/app/views/polls/_advanced_stats.html.erb @@ -0,0 +1,92 @@ +
+

<%= t("stats.advanced") %>

+ +
+

<%= t("stats.polls.by_channel") %>

+ + <% stats.channels.each do |channel| %> + <%= number_with_info_tags( + stats.send("total_participants_#{channel}"), + t("stats.polls.#{channel}_percentage", + percentage: number_to_stats_percentage(stats.send(:"total_participants_#{channel}_percentage")) + ), + html_class: channel + ) %> + <% end %> +
+ +
+

<%= t("stats.polls.vote_by_channel") %>

+ + + + + + <% stats.channels.each do |channel| %> + + <% end %> + + + + + + + + <% stats.channels.each do |channel| %> + + <% end %> + + + + + + + + <% stats.channels.each do |channel| %> + + <% end %> + + + + + + + <% stats.channels.each do |channel| %> + + <% end %> + + + + + + + <% stats.channels.each do |channel| %> + + <% end %> + + + + +
<%= t("polls.show.stats.votes") %><%= t("polls.show.stats.#{channel}") %><%= t("polls.show.stats.total") %>
<%= t("polls.show.stats.valid") %> + <%= stats.send(:"total_#{channel}_valid") %> + (<%= stats.send(:"valid_percentage_#{channel}").round(2) %>%) + + <%= stats.total_valid_votes %> + (<%= stats.total_valid_percentage.round(2) %>%) +
<%= t("polls.show.stats.white") %> + <%= stats.send(:"total_#{channel}_white") %> + (<%= stats.send(:"white_percentage_#{channel}").round(2) %>%) + <%= stats.total_white_votes %> + (<%= stats.total_white_percentage.round(2) %>%) +
<%= t("polls.show.stats.null_votes") %> + <%= stats.send(:"total_#{channel}_null") %> + (<%= stats.send(:"null_percentage_#{channel}").round(2) %>%) + + <%= stats.total_null_votes %> + (<%= stats.total_null_percentage.round(2) %>%) +
<%= t("polls.show.stats.total") %> + <%= stats.send(:"total_participants_#{channel}") %> + (<%= stats.send(:"total_participants_#{channel}_percentage").round(2) %>%) + <%= stats.total_participants %>
+
+
diff --git a/app/views/polls/_advanced_stats_links.html.erb b/app/views/polls/_advanced_stats_links.html.erb new file mode 100644 index 000000000..2349d984b --- /dev/null +++ b/app/views/polls/_advanced_stats_links.html.erb @@ -0,0 +1,9 @@ +

<%= link_to t("stats.advanced"), "#advanced_statistics" %>

+
    +
  • + <%= link_to t("stats.polls.by_channel"), "#stats_by_channel" %> +
    • +
  • + <%= link_to t("stats.polls.vote_by_channel"), "#vote_stats_by_channel" %> +
    • +
diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 1284b26fa..0c2f2226b 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -8,118 +8,17 @@
<%= render "shared/stats/links", stats: @stats %> - -

<%= link_to t("stats.advanced"), "#advanced_statistics" %>

-
    -
  • - <%= link_to t("stats.polls.by_channel"), "#stats_by_channel" %> -
    • -
  • - <%= link_to t("stats.polls.vote_by_channel"), "#vote_stats_by_channel" %> -
    • -
+ <%= render "advanced_stats_links" %>
<%= render "shared/stats/participation", stats: @stats %> + <%= render "advanced_stats", stats: @stats %> -
-

<%= t("stats.advanced") %>

- -
-

<%= t("stats.polls.by_channel") %>

- - <% @stats.channels.each do |channel| %> - <%= number_with_info_tags( - @stats.send("total_participants_#{channel}"), - t("stats.polls.#{channel}_percentage", - percentage: number_to_stats_percentage(@stats.send(:"total_participants_#{channel}_percentage")) - ), - html_class: channel - ) %> - <% end %> -
- -
-

<%= t("stats.polls.vote_by_channel") %>

- - - - - - <% @stats.channels.each do |channel| %> - - <% end %> - - - - - - - - <% @stats.channels.each do |channel| %> - - <% end %> - - - - - - - - <% @stats.channels.each do |channel| %> - - <% end %> - - - - - - - <% @stats.channels.each do |channel| %> - - <% end %> - - - - - - - <% @stats.channels.each do |channel| %> - - <% end %> - - - - -
<%= t("polls.show.stats.votes") %><%= t("polls.show.stats.#{channel}") %><%= t("polls.show.stats.total") %>
<%= t("polls.show.stats.valid") %> - <%= @stats.send(:"total_#{channel}_valid") %> - (<%= @stats.send(:"valid_percentage_#{channel}").round(2) %>%) - - <%= @stats.total_valid_votes %> - (<%= @stats.total_valid_percentage.round(2) %>%) -
<%= t("polls.show.stats.white") %> - <%= @stats.send(:"total_#{channel}_white") %> - (<%= @stats.send(:"white_percentage_#{channel}").round(2) %>%) - <%= @stats.total_white_votes %> - (<%= @stats.total_white_percentage.round(2) %>%) -
<%= t("polls.show.stats.null_votes") %> - <%= @stats.send(:"total_#{channel}_null") %> - (<%= @stats.send(:"null_percentage_#{channel}").round(2) %>%) - - <%= @stats.total_null_votes %> - (<%= @stats.total_null_percentage.round(2) %>%) -
<%= t("polls.show.stats.total") %> - <%= @stats.send(:"total_participants_#{channel}") %> - (<%= @stats.send(:"total_participants_#{channel}_percentage").round(2) %>%) - <%= @stats.total_participants %>
-
- -
-

- <%= t("stats.no_demographic_data", count: @stats.total_no_demographic_data) %> -

-
+
+

+ <%= t("stats.no_demographic_data", count: @stats.total_no_demographic_data) %> +