From c2489e320961a69ab6ef744b115a63a52863ef46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 12 Dec 2018 16:12:08 +0100 Subject: [PATCH 01/82] Increase number of age groups We would now like to differenciate between 70-year-old people and 90-year-old people. --- app/models/concerns/statisticable.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 6548df8c6..28cdd92b6 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -51,9 +51,13 @@ module Statisticable "55 - 59", "60 - 64", "65 - 69", - "70 - 140"].each do |group| + "70 - 74", + "75 - 79", + "80 - 84", + "85 - 89", + "90 - 140"].each do |group| start, finish = group.split(" - ") - group_name = (group == "70 - 140" ? "+ 70" : group) + group_name = (group == "90 - 140" ? "+ 90" : group) groups[group_name] = User.where(id: participants) .where("date_of_birth > ? AND date_of_birth < ?", finish.to_i.years.ago.beginning_of_year, From c1b76a7ebfce16f44b2719864eb41e2896b79bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 13:12:03 +0100 Subject: [PATCH 02/82] Simplify age groups method --- app/models/concerns/statisticable.rb | 39 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 28cdd92b6..f5a605b84 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -40,28 +40,27 @@ module Statisticable def age_groups groups = Hash.new(0) - ["16 - 19", - "20 - 24", - "25 - 29", - "30 - 34", - "35 - 39", - "40 - 44", - "45 - 49", - "50 - 54", - "55 - 59", - "60 - 64", - "65 - 69", - "70 - 74", - "75 - 79", - "80 - 84", - "85 - 89", - "90 - 140"].each do |group| - start, finish = group.split(" - ") - group_name = (group == "90 - 140" ? "+ 90" : group) + [[16, 19], + [20, 24], + [25, 29], + [30, 34], + [35, 39], + [40, 44], + [45, 49], + [50, 54], + [55, 59], + [60, 64], + [65, 69], + [70, 74], + [75, 79], + [80, 84], + [85, 89], + [90, 140]].each do |start, finish| + group_name = (finish == 140 ? "+ 90" : "#{start} - #{finish}") groups[group_name] = User.where(id: participants) .where("date_of_birth > ? AND date_of_birth < ?", - finish.to_i.years.ago.beginning_of_year, - start.to_i.years.ago.end_of_year).count + finish.years.ago.beginning_of_year, + start.years.ago.end_of_year).count end groups end From afa8bf8dbad8ad7fe2e9544e685f1e53c9a4c506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 12 Dec 2018 18:01:34 +0100 Subject: [PATCH 03/82] Add basic headings and navigaton styles for stats --- app/assets/stylesheets/application.scss | 1 + app/assets/stylesheets/stats.scss | 34 +++++++++++++++++++++++++ app/views/polls/_poll_header.html.erb | 2 +- app/views/polls/_poll_subnav.html.erb | 2 +- app/views/polls/stats.html.erb | 16 ++++++++---- 5 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 app/assets/stylesheets/stats.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 85a9ed041..ad1a0dd0b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -12,6 +12,7 @@ @import "legislation"; @import "legislation_process"; @import "community"; +@import "stats"; @import "custom"; @import "c3"; @import "annotator.min"; diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss new file mode 100644 index 000000000..97004acb4 --- /dev/null +++ b/app/assets/stylesheets/stats.scss @@ -0,0 +1,34 @@ +.polls-results-stats { + + .sidebar { + border-right: 1px solid $border; + + > ul { + display: block; + font-size: rem-calc(20); + padding: 0; + + ul { + font-size: rem-calc(15); + list-style-type: none; + margin-left: 0.8rem; + margin-top: 1rem; + } + + li a { + color: $link; + padding: 0; + } + } + } + + h2 { + border-bottom: 1px solid $border; + } + + h3 { + font-size: rem-calc(20); + margin-bottom: 0; + margin-top: rem-calc(30); + } +} diff --git a/app/views/polls/_poll_header.html.erb b/app/views/polls/_poll_header.html.erb index 93f41f9d1..d241e455c 100644 --- a/app/views/polls/_poll_header.html.erb +++ b/app/views/polls/_poll_header.html.erb @@ -7,7 +7,7 @@ <%= link_to t("polls.poll_header.back_to_proposal"), [@poll.related] %> <% end %> -

<%= @poll.name %>

+

<%= @poll.name %>

<%= safe_html_with_links simple_format(@poll.summary) %> diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index e50d64e0a..1fec98bdb 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -15,7 +15,7 @@ <% if @poll.stats_enabled? %> <% if stats_menu? %>
  • -

    <%= t("polls.show.stats_menu") %>

    + <%= t("polls.show.stats_menu") %>
    • <% else %>
  • <%= link_to t("polls.show.stats_menu"), stats_poll_path(id: @poll.slug || @poll.id) %>
    • diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index d472ebc3d..98767e2b6 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -7,15 +7,21 @@
    -

    <%= t("polls.show.stats.title") %>

    - -
    -

    <%= t("polls.show.stats.total_participation") %>

    +

    <%= t("polls.show.stats.title") %>

    +

    <%= t("polls.show.stats.total_participation") %>

    <%= t("polls.show.stats.total_votes") %>
    From 5a3eb70a4622e32662a4a4ac7917ed41fc9cb74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 13 Dec 2018 19:25:32 +0100 Subject: [PATCH 04/82] Use same translations for poll and budget stats --- app/views/budgets/stats/show.html.erb | 4 ++-- app/views/polls/stats.html.erb | 8 ++++---- config/i18n-tasks.yml | 1 + config/locales/en/budgets.yml | 2 -- config/locales/en/general.yml | 2 -- config/locales/en/stats.yml | 4 ++++ config/locales/es/budgets.yml | 2 -- config/locales/es/general.yml | 2 -- config/locales/es/stats.yml | 4 ++++ 9 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 config/locales/en/stats.yml create mode 100644 config/locales/es/stats.yml diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 51c12e292..46c09d574 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -15,7 +15,7 @@

    <%= back_link_to budgets_path %>

    - <%= t("budgets.stats.title") %>
    + <%= t("stats.title") %>
    <%= @budget.name %>

    @@ -42,7 +42,7 @@
    - <%= t("budgets.stats.total_participants") %> + <%= t("stats.total_participants") %>

    <%= @stats[:total_participants] %>

    diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 98767e2b6..d718f2c1b 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -9,10 +9,10 @@
    • - <%= link_to t("polls.show.stats.title"), "#participation_statistics" %> + <%= link_to t("stats.title"), "#participation_statistics" %>
      • - <%= link_to t("polls.show.stats.total_participation"), "#total_participation" %> + <%= link_to t("stats.total_participants"), "#total_participants" %>
      • @@ -20,8 +20,8 @@
    -

    <%= t("polls.show.stats.title") %>

    -

    <%= t("polls.show.stats.total_participation") %>

    +

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

    +

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

    <%= t("polls.show.stats.total_votes") %>
    diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 251efb113..35d06d172 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -45,6 +45,7 @@ data: - config/locales/%{locale}/user_groups.yml - config/locales/%{locale}/i18n.yml - config/locales/%{locale}/milestones.yml + - config/locales/%{locale}/stats.yml # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom: # `i18n-tasks normalize -p` will force move the keys according to these rules diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 8616539fc..b5039aea6 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -192,10 +192,8 @@ en: prev_phase_dates_invalid: "Start date must be later than the start date of the previous enabled phase (%{phase_name})" next_phase_dates_invalid: "End date must be earlier than the end date of the next enabled phase (%{phase_name})" stats: - title: Participation stats link: Stats page_title: "%{budget} - Participation stats" - total_participants: Total Participants total_budget_investments: Total Proposed Investments total_selected_investments: Proposals on final phase total_unfeasible_investments: Unfeasible proposals diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 5773c1c95..49a74c6e6 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -654,8 +654,6 @@ en: stats_menu: "Participation statistics" results_menu: "Poll results" stats: - title: "Participation data" - total_participation: "Total participation" total_votes: "Total amount of given votes" votes: "VOTES" web: "WEB" diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml new file mode 100644 index 000000000..c1f7f1b23 --- /dev/null +++ b/config/locales/en/stats.yml @@ -0,0 +1,4 @@ +en: + stats: + title: "Participation data" + total_participants: "Participants" diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index cc849d1c6..eaa78c1d8 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -192,10 +192,8 @@ es: prev_phase_dates_invalid: "La fecha de inicio debe ser posterior a la fecha de inicio de la anterior fase habilitada (%{phase_name})" next_phase_dates_invalid: "La fecha de fin debe ser anterior a la fecha de fin de la siguiente fase habilitada (%{phase_name})" stats: - title: Estadísticas de participación link: Estadísticas page_title: "%{budget} - Estadísticas de participación" - total_participants: Total participantes total_budget_investments: Total propuestas enviadas total_selected_investments: Propuestas en la fase final total_unfeasible_investments: Propuestas inviables diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 76125ee5a..377768318 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -654,8 +654,6 @@ es: stats_menu: "Estadísticas de participación" results_menu: "Resultados de la votación" stats: - title: "Datos de participación" - total_participation: "Participación total" total_votes: "Nº total de votos emitidos" votes: "VOTOS" web: "WEB" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml new file mode 100644 index 000000000..46c87d551 --- /dev/null +++ b/config/locales/es/stats.yml @@ -0,0 +1,4 @@ +es: + stats: + title: "Estadísticas de participación" + total_participants: "Participantes" From 80486b819396ca1c3ecbf7157613f43f003b1c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 13 Dec 2018 19:27:47 +0100 Subject: [PATCH 05/82] Use section tags in stats This way we can easily see the h3 tag's parent is the h2 tag. --- app/views/polls/stats.html.erb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index d718f2c1b..e7513e3b6 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -20,13 +20,18 @@

    -

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

    -

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

    +
    +

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

    -

    - <%= t("polls.show.stats.total_votes") %>
    - <%= @stats[:total_participants] %> -

    +
    +

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

    + +

    + <%= t("polls.show.stats.total_votes") %>
    + <%= @stats[:total_participants] %> +

    +
    +
    From c0044f4e56ffc28add3d8d6556e800ea76569e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 12:47:23 +0100 Subject: [PATCH 06/82] Extract method to show stats percentage --- app/helpers/stats_helper.rb | 4 ++++ app/views/budgets/stats/show.html.erb | 24 ++++++------------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb index 1bacf1139..5fd42027e 100644 --- a/app/helpers/stats_helper.rb +++ b/app/helpers/stats_helper.rb @@ -30,4 +30,8 @@ module StatsHelper opt[:data][:graph] = admin_api_stats_path(budget_investments: true) content_tag :div, "", opt end + + def number_to_stats_percentage(number, options = {}) + number_to_percentage(number, { strip_insignificant_zeros: true, precision: 2 }.merge(options)) + end end diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 46c09d574..c38852615 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -108,9 +108,7 @@

     <%= t("budgets.stats.total_female_participants").upcase %> - (<%= number_to_percentage(@stats[:female_percentage], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= number_to_stats_percentage(@stats[:female_percentage]) %>)

    <%= @stats[:total_female_participants] %> @@ -121,9 +119,7 @@

     <%= t("budgets.stats.total_male_participants").upcase %> - (<%= number_to_percentage(@stats[:male_percentage], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= number_to_stats_percentage(@stats[:male_percentage]) %>)

    <%= @stats[:total_male_participants] %> @@ -154,17 +150,13 @@ <% percentage_age_count = all_ages_count == 0 ? 0 : (count / all_ages_count * 100) - formatted_percentage_age_count = number_to_percentage(percentage_age_count, - strip_insignificant_zeros: true, - precision: 2) + formatted_percentage_age_count = number_to_stats_percentage(percentage_age_count) %> <%= count %> (<%= formatted_percentage_age_count %>)

    - +
    @@ -217,15 +209,11 @@     <% end %> From be68c8cdbf638e8a2476c6d97a4ab8545664410f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 11:56:38 +0100 Subject: [PATCH 07/82] Add gender stats to polls --- app/assets/stylesheets/participation.scss | 6 --- app/assets/stylesheets/stats.scss | 53 ++++++++++++++++++++++- app/models/poll/stats.rb | 16 ++++--- app/views/polls/stats.html.erb | 27 +++++++++++- config/locales/en/budgets.yml | 1 - config/locales/en/stats.yml | 3 ++ config/locales/es/budgets.yml | 1 - config/locales/es/stats.yml | 3 ++ 8 files changed, 92 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 2e35b8256..11fe4b482 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -2030,10 +2030,4 @@ } } } - - .number { - font-size: rem-calc(60); - font-weight: bold; - line-height: rem-calc(60); - } } diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 97004acb4..418e93def 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -26,9 +26,58 @@ border-bottom: 1px solid $border; } + section section { + clear: both; + margin-top: rem-calc(30); + margin-bottom: rem-calc(30); + overflow: hidden; + } + h3 { font-size: rem-calc(20); - margin-bottom: 0; - margin-top: rem-calc(30); + margin-bottom: rem-calc(12); + } + + .participants { + $background-width: 52px; + + float: left; + margin-left: $background-width; + margin-right: rem-calc(22); + position: relative; + + &::before { + // TODO: change image and move it to a non-custom folder + content: image-url("custom/polls/stats_man.png"); + left: -$background-width; + position: absolute; + } + + .number { + display: block; + font-size: rem-calc(60); + font-weight: bold; + line-height: rem-calc(60); + } + + .info { + color: $dark-gray; + font-style: italic; + } + + &.gender { + + &.male { + &::before { + content: image-url("custom/polls/stats_man.png"); + } + } + + &.female { + &::before { + content: image-url("custom/polls/stats_woman.png"); + } + } + } } } diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index ebba64b35..5a166457e 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -3,15 +3,19 @@ class Poll::Stats alias_method :poll, :resource def self.stats_methods - %i[total_participants total_participants_web total_web_valid total_web_white total_web_null - total_participants_booth total_booth_valid total_booth_white total_booth_null - total_valid_votes total_white_votes total_null_votes valid_percentage_web valid_percentage_booth - total_valid_percentage white_percentage_web white_percentage_booth total_white_percentage - null_percentage_web null_percentage_booth total_null_percentage total_participants_web_percentage - total_participants_booth_percentage] + super + + %i[total_participants_web total_web_valid total_web_white total_web_null + total_participants_booth total_booth_valid total_booth_white total_booth_null + total_valid_votes total_white_votes total_null_votes valid_percentage_web valid_percentage_booth + total_valid_percentage white_percentage_web white_percentage_booth total_white_percentage + null_percentage_web null_percentage_booth total_null_percentage total_participants_web_percentage + total_participants_booth_percentage] end private + def participants + User.where(id: voters.pluck(:user_id)) + end def total_participants total_participants_web + total_participants_booth diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index e7513e3b6..346653654 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -14,6 +14,9 @@
  • <%= link_to t("stats.total_participants"), "#total_participants" %>
    • +
  • + <%= link_to t("stats.by_gender"), "#participants_by_gender" %> +
    • @@ -26,9 +29,29 @@

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

    -

    - <%= t("polls.show.stats.total_votes") %>
    +

    <%= @stats[:total_participants] %> + <%= t("polls.show.stats.total_votes") %>
     +

    +
    + +
    +

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

    + +

    + <%= @stats[:total_male_participants] %> + + <%= I18n.t("stats.men_percentage", + percentage: number_to_stats_percentage(@stats[:male_percentage])) %> + +

    + +

    + <%= @stats[:total_female_participants] %> + + <%= I18n.t("stats.women_percentage", + percentage: number_to_stats_percentage(@stats[:female_percentage])) %> +

    diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index b5039aea6..e1757b7a8 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -202,7 +202,6 @@ en: total_participants_booths: Vote phase booth participants participants: Participants supports: Supports - by_gender: "Participants by gender" total_male_participants: Mens total_female_participants: Women by_age: "Participants by age groups" diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index c1f7f1b23..101419948 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -2,3 +2,6 @@ en: stats: title: "Participation data" total_participants: "Participants" + by_gender: "Participants by gender" + men_percentage: "%{percentage} Men" + women_percentage: "%{percentage} Women" diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index eaa78c1d8..7b5c25b8e 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -203,7 +203,6 @@ es: participants: Participantes supports: Apoyos total: Total - by_gender: "Participación por género" total_male_participants: Hombres total_female_participants: Mujeres by_age: "Participación por grupos de edad" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 46c87d551..3ef82915e 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -2,3 +2,6 @@ es: stats: title: "Estadísticas de participación" total_participants: "Participantes" + by_gender: "Participación por género" + men_percentage: "%{percentage} Hombres" + women_percentage: "%{percentage} Mujeres" From 9a01ff53234ccbab6e865cb8eb5b4b982568d5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 16:39:00 +0100 Subject: [PATCH 08/82] Refactor age groups method We try to make the method return data which is easier to handle in the view. --- app/models/concerns/statisticable.rb | 29 +++++++++++++++++++-------- app/views/budgets/stats/show.html.erb | 28 +++++++++----------------- config/locales/en/budgets.yml | 3 --- config/locales/en/stats.yml | 5 +++++ config/locales/es/budgets.yml | 3 --- config/locales/es/stats.yml | 5 +++++ spec/models/budget/stats_spec.rb | 24 +++++++++++----------- 7 files changed, 52 insertions(+), 45 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index f5a605b84..5ff689641 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -39,7 +39,6 @@ module Statisticable end def age_groups - groups = Hash.new(0) [[16, 19], [20, 24], [25, 29], @@ -55,14 +54,20 @@ module Statisticable [75, 79], [80, 84], [85, 89], - [90, 140]].each do |start, finish| - group_name = (finish == 140 ? "+ 90" : "#{start} - #{finish}") - groups[group_name] = User.where(id: participants) - .where("date_of_birth > ? AND date_of_birth < ?", - finish.years.ago.beginning_of_year, - start.years.ago.end_of_year).count + [90, 300]].reduce({}) do |groups, (start, finish)| + users = User.where(id: participants) + .where("date_of_birth > ? AND date_of_birth < ?", + finish.years.ago.beginning_of_year, + start.years.ago.end_of_year) + + groups.tap do |age_groups| + age_groups["#{start} - #{finish}"] = { + range: range_description(start, finish), + count: users.count, + percentage: calculate_percentage(users.count, total_participants) + } + end end - groups end def calculate_percentage(fraction, total) @@ -70,6 +75,14 @@ module Statisticable (fraction * 100.0 / total).round(3) end + + def range_description(start, finish) + if finish > 200 + I18n.t("stats.age_more_than", start: start) + else + I18n.t("stats.age_range", start: start, finish: finish) + end + end end class_methods do diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index c38852615..5c55be1dd 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -96,7 +96,7 @@
    -

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

    +

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

    @@ -130,7 +130,7 @@
    -

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

    +

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

    - <%= number_to_percentage(@stats[:headings][heading.id]["percentage_participants_#{phase}_phase".to_sym], - strip_insignificant_zeros: true, - precision: 2) %> + <%= number_to_stats_percentage(@stats[:headings][heading.id]["percentage_participants_#{phase}_phase".to_sym]) %> - <%= number_to_percentage(@stats[:headings][heading.id]["percentage_district_population_#{phase}_phase".to_sym], - strip_insignificant_zeros: true, - precision: 2) %> + <%= number_to_stats_percentage(@stats[:headings][heading.id]["percentage_district_population_#{phase}_phase".to_sym]) %>
    @@ -140,23 +140,13 @@ - <% all_ages_count = @stats[:age_groups].values.sum.to_f %> - <% @stats[:age_groups].each do |age_group, count| %> - "> - - + + diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index e1757b7a8..4aa814def 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -204,11 +204,8 @@ en: supports: Supports total_male_participants: Mens total_female_participants: Women - by_age: "Participants by age groups" age: Age total: Total - more_than: More than - years: years by_heading: "Participants by heading" heading: Heading investments_sent_html: "Investment proposals sent" diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 101419948..947e87b11 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -3,5 +3,10 @@ en: title: "Participation data" total_participants: "Participants" by_gender: "Participants by gender" + by_age: "Participants by age" men_percentage: "%{percentage} Men" women_percentage: "%{percentage} Women" + age: "Age" + age_more_than: "%{start} years old and older" + age_range: "%{start} - %{finish} years old" + total: "Total" diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 7b5c25b8e..67599b725 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -205,10 +205,7 @@ es: total: Total total_male_participants: Hombres total_female_participants: Mujeres - by_age: "Participación por grupos de edad" age: Edad - more_than: Más de - years: años by_heading: "Participación por distritos" heading: Distrito investments_sent_html: "Propuestas
    enviadas" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 3ef82915e..926a024f8 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -3,5 +3,10 @@ es: title: "Estadísticas de participación" total_participants: "Participantes" by_gender: "Participación por género" + by_age: "Participación por grupos de edad" men_percentage: "%{percentage} Hombres" women_percentage: "%{percentage} Mujeres" + age: "Edad" + age_more_than: "De %{start} y más años" + age_range: "De %{start} a %{finish} años" + total: "Total" diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 7beafb4e0..aa0a836de 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -151,18 +151,18 @@ describe Budget::Stats do context "#age_groups" do it "returns the age groups hash" do - expect(@stats[:age_groups]["16 - 19"]).to be 0 - expect(@stats[:age_groups]["20 - 24"]).to be 7 - expect(@stats[:age_groups]["25 - 29"]).to be 1 - expect(@stats[:age_groups]["30 - 34"]).to be 0 - expect(@stats[:age_groups]["35 - 39"]).to be 1 - expect(@stats[:age_groups]["40 - 44"]).to be 1 - expect(@stats[:age_groups]["45 - 49"]).to be 0 - expect(@stats[:age_groups]["50 - 54"]).to be 1 - expect(@stats[:age_groups]["55 - 59"]).to be 0 - expect(@stats[:age_groups]["60 - 64"]).to be 0 - expect(@stats[:age_groups]["65 - 69"]).to be 0 - expect(@stats[:age_groups]["70 - 140"]).to be 0 + expect(@stats[:age_groups]["16 - 19"][:count]).to be 0 + expect(@stats[:age_groups]["20 - 24"][:count]).to be 7 + expect(@stats[:age_groups]["25 - 29"][:count]).to be 1 + expect(@stats[:age_groups]["30 - 34"][:count]).to be 0 + expect(@stats[:age_groups]["35 - 39"][:count]).to be 1 + expect(@stats[:age_groups]["40 - 44"][:count]).to be 1 + expect(@stats[:age_groups]["45 - 49"][:count]).to be 0 + expect(@stats[:age_groups]["50 - 54"][:count]).to be 1 + expect(@stats[:age_groups]["55 - 59"][:count]).to be 0 + expect(@stats[:age_groups]["60 - 64"][:count]).to be 0 + expect(@stats[:age_groups]["65 - 69"][:count]).to be 0 + expect(@stats[:age_groups]["70 - 74"][:count]).to be 0 end end From 1a1ca1352561b8567b2e1141e43064a2a333d5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 16:39:16 +0100 Subject: [PATCH 09/82] Add age stats to polls --- app/views/polls/stats.html.erb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 346653654..f1da5ae07 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -17,6 +17,9 @@
  • <%= link_to t("stats.by_gender"), "#participants_by_gender" %>
    • +
  • + <%= link_to t("stats.by_age"), "#participants_by_age" %> +
    • @@ -54,6 +57,32 @@

    + +
    +

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

    + +
    - <%= age_group.gsub("+", t("budgets.stats.more_than")) + " " + t("budgets.stats.years") %> - - - <% - percentage_age_count = all_ages_count == 0 ? 0 : (count / all_ages_count * 100) - formatted_percentage_age_count = number_to_stats_percentage(percentage_age_count) - %> - <%= count %> - (<%= formatted_percentage_age_count %>) - -
    - + <% @stats[:age_groups].values.each do |group| %> +
    <%= group[:range] %> + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> +
    +
    + + + + + + + <% @stats[:age_groups].values.each do |group| %> + + + + + <% end %> + +
    <%= t("stats.age") %><%= t("stats.total") %>
    <%= group[:range] %> + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> + +
    + +
    +
    + From 57a29455900ea6821e567dc868f37d6d4523a8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 16:50:09 +0100 Subject: [PATCH 10/82] Use `let` for stats in budget stats spec The rest of the `before` block still uses instance variables, but at least the rest of the file doesn't use instance variables anymore. --- spec/models/budget/stats_spec.rb | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index aa0a836de..3ff9dfa9f 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" describe Budget::Stats do - before(:each) do + before do @budget = create(:budget) @group = create(:budget_group, budget: @budget) @heading = create(:budget_heading, group: @group, price: 1000) @@ -40,14 +40,14 @@ describe Budget::Stats do @budget_ballot4 = create(:budget_ballot, budget: @budget, physical: true, user: nil) @budget_ballot_line4 = create(:budget_ballot_line, ballot: @budget_ballot4, investment: @investment4) - - @stats = Budget::Stats.new(@budget).generate end + let(:stats) { Budget::Stats.new(@budget).generate } + context "#total_participants" do it "returns the number of total participants" do - expect(@stats[:total_participants]).to be 11 + expect(stats[:total_participants]).to be 11 end end @@ -55,7 +55,7 @@ describe Budget::Stats do context "#total_participants_support_phase" do it "returns the number of total participants in the support phase" do - expect(@stats[:total_participants_support_phase]).to be 2 + expect(stats[:total_participants_support_phase]).to be 2 end end @@ -63,7 +63,7 @@ describe Budget::Stats do context "#total_participants_vote_phase" do it "returns the number of total participants in the votes phase" do - expect(@stats[:total_participants_vote_phase]).to be 4 + expect(stats[:total_participants_vote_phase]).to be 4 end end @@ -71,7 +71,7 @@ describe Budget::Stats do context "#total_participants_web" do it "returns the number of total participants in the votes phase via web" do - expect(@stats[:total_participants_web]).to be 3 + expect(stats[:total_participants_web]).to be 3 end end @@ -79,7 +79,7 @@ describe Budget::Stats do context "#total_participants_booths" do it "returns the number of total participants in the votes phase in booths" do - expect(@stats[:total_participants_booths]).to be 1 + expect(stats[:total_participants_booths]).to be 1 end end @@ -87,7 +87,7 @@ describe Budget::Stats do context "#total_budget_investments" do it "returns the number of total budget investments" do - expect(@stats[:total_budget_investments]).to be 5 + expect(stats[:total_budget_investments]).to be 5 end end @@ -95,7 +95,7 @@ describe Budget::Stats do context "#total_votes" do it "returns the number of total votes" do - expect(@stats[:total_votes]).to be 4 + expect(stats[:total_votes]).to be 4 end end @@ -103,7 +103,7 @@ describe Budget::Stats do context "#total_selected_investments" do it "returns the number of total selected investments" do - expect(@stats[:total_selected_investments]).to be 4 + expect(stats[:total_selected_investments]).to be 4 end end @@ -111,7 +111,7 @@ describe Budget::Stats do context "#total_unfeasible_investments" do it "returns the number of total unfeasible investments" do - expect(@stats[:total_unfeasible_investments]).to be 1 + expect(stats[:total_unfeasible_investments]).to be 1 end end @@ -119,7 +119,7 @@ describe Budget::Stats do context "#total_male_participants" do it "returns the number of total male participants" do - expect(@stats[:total_male_participants]).to be 4 + expect(stats[:total_male_participants]).to be 4 end end @@ -127,7 +127,7 @@ describe Budget::Stats do context "#total_female_participants" do it "returns the number of total female participants" do - expect(@stats[:total_female_participants]).to be 6 + expect(stats[:total_female_participants]).to be 6 end end @@ -135,7 +135,7 @@ describe Budget::Stats do context "#total_supports" do it "returns the number of total supports" do - expect(@stats[:total_supports]).to be 2 + expect(stats[:total_supports]).to be 2 end end @@ -143,7 +143,7 @@ describe Budget::Stats do context "#total_unknown_gender_or_age" do it "returns the number of total unknown participants' gender or age" do - expect(@stats[:total_unknown_gender_or_age]).to be 1 + expect(stats[:total_unknown_gender_or_age]).to be 1 end end @@ -151,18 +151,18 @@ describe Budget::Stats do context "#age_groups" do it "returns the age groups hash" do - expect(@stats[:age_groups]["16 - 19"][:count]).to be 0 - expect(@stats[:age_groups]["20 - 24"][:count]).to be 7 - expect(@stats[:age_groups]["25 - 29"][:count]).to be 1 - expect(@stats[:age_groups]["30 - 34"][:count]).to be 0 - expect(@stats[:age_groups]["35 - 39"][:count]).to be 1 - expect(@stats[:age_groups]["40 - 44"][:count]).to be 1 - expect(@stats[:age_groups]["45 - 49"][:count]).to be 0 - expect(@stats[:age_groups]["50 - 54"][:count]).to be 1 - expect(@stats[:age_groups]["55 - 59"][:count]).to be 0 - expect(@stats[:age_groups]["60 - 64"][:count]).to be 0 - expect(@stats[:age_groups]["65 - 69"][:count]).to be 0 - expect(@stats[:age_groups]["70 - 74"][:count]).to be 0 + expect(stats[:age_groups]["16 - 19"][:count]).to be 0 + expect(stats[:age_groups]["20 - 24"][:count]).to be 7 + expect(stats[:age_groups]["25 - 29"][:count]).to be 1 + expect(stats[:age_groups]["30 - 34"][:count]).to be 0 + expect(stats[:age_groups]["35 - 39"][:count]).to be 1 + expect(stats[:age_groups]["40 - 44"][:count]).to be 1 + expect(stats[:age_groups]["45 - 49"][:count]).to be 0 + expect(stats[:age_groups]["50 - 54"][:count]).to be 1 + expect(stats[:age_groups]["55 - 59"][:count]).to be 0 + expect(stats[:age_groups]["60 - 64"][:count]).to be 0 + expect(stats[:age_groups]["65 - 69"][:count]).to be 0 + expect(stats[:age_groups]["70 - 74"][:count]).to be 0 end end @@ -170,7 +170,7 @@ describe Budget::Stats do context "#male_percentage" do it "returns the percentage of male participants" do - expect(@stats[:male_percentage]).to be 40.0 + expect(stats[:male_percentage]).to be 40.0 end end @@ -178,7 +178,7 @@ describe Budget::Stats do context "#female_percentage" do it "returns the percentage of female participants" do - expect(@stats[:female_percentage]).to be 60.0 + expect(stats[:female_percentage]).to be 60.0 end end @@ -186,7 +186,7 @@ describe Budget::Stats do context "#headings" do it "returns headings data" do - heading_stats = @stats[:headings][@heading.id] + heading_stats = stats[:headings][@heading.id] expect(heading_stats[:total_investments_count]).to be 5 expect(heading_stats[:total_participants_support_phase]).to be 2 expect(heading_stats[:total_participants_vote_phase]).to be 4 From 0037ce55465d7cb5cfcdb3b1fa1b4b2896fdfe7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 17:20:28 +0100 Subject: [PATCH 11/82] Reorder poll stats method names So related methods are on the same line. --- app/models/poll/stats.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 5a166457e..7b5ed28e8 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -4,12 +4,13 @@ class Poll::Stats def self.stats_methods super + - %i[total_participants_web total_web_valid total_web_white total_web_null + %i[total_valid_votes total_white_votes total_null_votes + total_participants_web total_web_valid total_web_white total_web_null total_participants_booth total_booth_valid total_booth_white total_booth_null - total_valid_votes total_white_votes total_null_votes valid_percentage_web valid_percentage_booth - total_valid_percentage white_percentage_web white_percentage_booth total_white_percentage - null_percentage_web null_percentage_booth total_null_percentage total_participants_web_percentage - total_participants_booth_percentage] + total_participants_web_percentage total_participants_booth_percentage + valid_percentage_web valid_percentage_booth total_valid_percentage + white_percentage_web white_percentage_booth total_white_percentage + null_percentage_web null_percentage_booth total_null_percentage] end private From 7ce57f649fb39af9d08a150876500c420b41cc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 20 Dec 2018 18:31:48 +0100 Subject: [PATCH 12/82] Use a `` tag to display age percentages --- app/assets/stylesheets/stats.scss | 25 +++++++++++++++++++++++++ app/views/budgets/stats/show.html.erb | 4 +--- app/views/polls/stats.html.erb | 5 +---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 418e93def..ea1177e6a 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -80,4 +80,29 @@ } } } + + meter { + background: none; + background-color: #ebf0f4; + border-radius: 0.3rem; + display: block; + width: 100%; + } + + meter::-moz-meter-bar { + background: #52a4ee; + border-bottom-left-radius: 0.3rem; + border-top-left-radius: 0.3rem; + } + + meter::-webkit-meter-optimum-value { + background: #52a4ee; + border-bottom-left-radius: 0.3rem; + border-top-left-radius: 0.3rem; + } + + meter::-webkit-meter-bar { + background: #ebf0f4; + border-radius: 0.3rem; + } } diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 5c55be1dd..b7dffce48 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -145,9 +145,7 @@ <% end %> diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index f1da5ae07..ab90f94dd 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -73,10 +73,7 @@ <% end %> From b91b766e96b75ac79e05f20a814f1d3982e24a1b Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 28 Dec 2018 18:00:26 +0100 Subject: [PATCH 13/82] Adds styles and updates html markup to stats --- app/assets/images/stats_man.png | Bin 0 -> 1768 bytes app/assets/images/stats_woman.png | Bin 0 -> 1721 bytes app/assets/stylesheets/participation.scss | 2 +- app/assets/stylesheets/stats.scss | 100 +++++++--------------- app/views/budgets/stats/show.html.erb | 15 ++-- app/views/polls/_poll_subnav.html.erb | 2 +- app/views/polls/stats.html.erb | 57 ++++++------ 7 files changed, 76 insertions(+), 100 deletions(-) create mode 100644 app/assets/images/stats_man.png create mode 100644 app/assets/images/stats_woman.png diff --git a/app/assets/images/stats_man.png b/app/assets/images/stats_man.png new file mode 100644 index 0000000000000000000000000000000000000000..9fb030dbcb58c58c5e3591d1ed1ec628e0f2accb GIT binary patch literal 1768 zcmaJ=c~BEq9A2(+tH?2^P}YDWLdZ#g1i}#(OsGK`kY?yG5|V|aB-u6D5J1ID3kIb{ zM`1*TDHcVr2%Z&CBvJvj<)~UgkVD&As6cHghg#ci5U_ugzS-UP-fzC|`<=TlE_SoM z%~~4(0PJ~ONPzF&_?u$&4*o@^DRO*UgGC9kcq9$eic~NVAwg1Mkf#u(!va_&$=-1r z4gml&Z&`v66Y{sP#E60oh-ncYRqbrmZse(lqqDnvz`C=90qzHznr3eZ}M$T6a^yZ7i zGNsYDX`aRBvv^81CQ^!F9>gZ#IwYA)!eY{)2zo>`6a_KpRBBWJlgaSs;7<^ZN~b_U z)I~0Yh&2jWi7j#^Z@E#+a*YF_Kyl9ytdeEIl4up80Ou2D$(E0Wv#j0%SF(I8k;`() zcravRd;it$MH42jXp1~6 zN`wX6{T1sAxHb-jAi;$|IK&Y^w(rL|oIiJNbp%9&h(w|wX@7ooh07+VJja^{3bv0X z_xu?21yS!70Zsn7vg^i$M;+H^)1D?CwcO(}lbN0y96U92P5Wii*~H>>Ux;}Hm>V{8 zIc4vCD)BL8#aa64Gd=6PyHtBxqLQ3+{1J3jztu#{>k!-Bc}mXKD9?(|bv}I-qb1jy z5B$M6;`LfRQpYK=Llt8g^*c@S$_cF-)^82A$g_|1a7B5y9DKmGPB(qK`Mud}6P!VW8(45IelHLq^;?=p6KmK9o~F)EJU(Xx0V1=qJkcG3E^d{X}VSxLHl) z&}X6R^!pprw$R#&y(XZ%hiTE6*`)_%b!!?rdgxhQc*K_ssK>D-|*++q!4&a^t7Gp4;!DdRm(9WvBcE5bM}l+Vy)C%P{t0rl_Y& zX)|K-BszsuVyEa7YPcWi-!o+Ht1L%~U1zlxmz;U+ox5y{Sin05z!fk{0qk@p&xb9E zD|D4ylUi%vnuL418Qg5DJj}CxgnQcZm2f(uuljbOZ_&u)v(TFsTl$gitujHl2_ELz>JAt8uc|SxE%qsmX{}CatJCEQd}@!nGuGa9zQ4ib z(X)cNF!zmzh*rS#&p!NK-603!fQ_b^=mO+Uo6PY6*H=LC&C#Zn2C}K)*h<4*0KH+E z!hZ7i)L(;4uuS9jTTAlXM8-GWNA(xWyjv}ZbdNg&RwUY_sJEV}(`@%GwY{~^Dr}c2 z=_mJtQ%z^G_q3hg8eVi&IAdMyK55oEJ$pC1AU^!?@wl&&HT62Xjt>jX+bvFFO+i+M z=%LLAS5Kb#B&TgEZ(Dc3Oa~lO!~SmAW?Nv3&>uaJvthieC0DIDamV9L-I!OxOznW~ V3bDU-e3%O0ix(9O)p1fj{s$-Eq!9oB literal 0 HcmV?d00001 diff --git a/app/assets/images/stats_woman.png b/app/assets/images/stats_woman.png new file mode 100644 index 0000000000000000000000000000000000000000..e61ff0ea64c29fc6f1f5dee4da759d051953b200 GIT binary patch literal 1721 zcmaJ?X;2eq7+x?zP*7yhh%#{#5W$d(gj^CK5Rj-r8jeyAU`ZB8A=zcKnBY}pQiUoq zVpUKPtb$w8HwWrkuA&suEh1_Aq{bZ2+J?|bKcp7(i=oh^ut zTH`Wj$s7OxTojRV6|wpfPqL!}@kU;7GKs|l4^O~jkW}0VVK5-mASp1Y&_QXi3WhW} zS=Zno0GQ>gjZMH4lAb?4DFbz3+95ONW2Cpdw zIc!j4S`^nJdeFuQr6Ae3lujspn}QCVrqvrJ%S056ZGuoXm&LKAH07vN{=chEH|=e} zRq#8#|4D3!%|T(d3N|3wn3`x@s+TPkDhb122uHA31j(GLVstu!BZhPY1;fH7ss{Qh zA+=U-Gx|-SluC(0Z@?kF8dk`qbb^Pa)oLVSo?OP0MTo=YfjllZTp$()@a?(N3q zB(ZAq0u|{XN-C(JuOKJd;zGGgbD`PIB&Ye!{u9d~)f6OhQuD!|} zb-b2kcBj{1-|Xd~)!SF`Mw&|*zqU~{M;-AAA>H(WhQHPP_}|_1FeC*Q4mc1pltMd&7eco~mZ#xB`*T!~n(P zp*0abylH-1o!`TBo~K{E4`+K>GgkV=r6Te}>+cs?S&BGDr(odNkk8YV$*D`%-@&`c zPpoI_&CO5Al-5Jkm_ZLpYn8T5!GBY<%t8sKRS6Dt3D@29o|~6z@T}2yKdHX^I^@u? zp@tBI{PO;Zov-f`~M(>zkQH@(3`9UJ4zr2=} z`;1ETj-&g3G*p$KD$|LnPT<$J&%`InM z5rhJ)r3bEuFlfMqOK)zVQc~Z^`JxY5dd~J$t11*bGWL-81xOvu&gfiLbM{s8?d6Gn zC8zc;Ia66iN;|jE?YwV?&f7VHeD82=N+YmI6}Mk7^y>9Uaqx(A-rvvqlEgs2uzplS evtQJW*f{`?N?JI*ABeBoekO|WD7hsxIqx5Uz=PNT literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 11fe4b482..ad447f909 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1996,7 +1996,7 @@ border-right: 1px solid $border; } - .menu { + .menu:not(.vertical) { padding: 0; li a { diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index ea1177e6a..f6d8845c5 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -1,55 +1,34 @@ -.polls-results-stats { +.participation-stats { .sidebar { border-right: 1px solid $border; - > ul { - display: block; - font-size: rem-calc(20); + ul { + margin-left: $line-height / 2; + margin-top: 0; padding: 0; - - ul { - font-size: rem-calc(15); - list-style-type: none; - margin-left: 0.8rem; - margin-top: 1rem; - } - - li a { - color: $link; - padding: 0; - } } } - h2 { + .section-title { + font-size: rem-calc(24); border-bottom: 1px solid $border; } - section section { - clear: both; - margin-top: rem-calc(30); - margin-bottom: rem-calc(30); - overflow: hidden; - } - - h3 { - font-size: rem-calc(20); - margin-bottom: rem-calc(12); + .stats-group { + margin-bottom: $line-height; + margin-top: $line-height; } .participants { - $background-width: 52px; - - float: left; - margin-left: $background-width; - margin-right: rem-calc(22); + display: inline-block; + margin-right: $line-height * 2; + padding-left: $line-height * 2.5; position: relative; &::before { - // TODO: change image and move it to a non-custom folder - content: image-url("custom/polls/stats_man.png"); - left: -$background-width; + content: image-url('stats_man.png'); + left: 0; position: absolute; } @@ -61,48 +40,31 @@ } .info { - color: $dark-gray; + color: $text-medium; font-style: italic; } + } - &.gender { + .gender { - &.male { - &::before { - content: image-url("custom/polls/stats_man.png"); - } - } + &.male::before { + content: image-url('stats_man.png'); + } - &.female { - &::before { - content: image-url("custom/polls/stats_woman.png"); - } - } + &.female::before { + content: image-url('stats_woman.png'); } } - meter { - background: none; - background-color: #ebf0f4; - border-radius: 0.3rem; - display: block; - width: 100%; - } - - meter::-moz-meter-bar { - background: #52a4ee; - border-bottom-left-radius: 0.3rem; - border-top-left-radius: 0.3rem; - } - - meter::-webkit-meter-optimum-value { - background: #52a4ee; - border-bottom-left-radius: 0.3rem; - border-top-left-radius: 0.3rem; - } - - meter::-webkit-meter-bar { + .progress { background: #ebf0f4; - border-radius: 0.3rem; + border-radius: rem-calc(20); + height: $line-height / 2; + } + + .progress-meter { + background: #52a4ee; + border-bottom-left-radius: rem-calc(20); + border-top-left-radius: rem-calc(20); } } diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index b7dffce48..dad8ee5e9 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -9,7 +9,7 @@ <% end %> <% cache [@stats] do %> -
    +
    @@ -135,8 +135,8 @@
    <%= group[:range] %> <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> -
    - -
    +
    <%= group[:range] %> <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> - -
    - -
    +
    - - + + @@ -144,8 +144,13 @@ <% end %> diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index 1fec98bdb..e50d64e0a 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -15,7 +15,7 @@ <% if @poll.stats_enabled? %> <% if stats_menu? %>
  • - <%= t("polls.show.stats_menu") %> +

    <%= t("polls.show.stats_menu") %>

    • <% else %>
  • <%= link_to t("polls.show.stats_menu"), stats_poll_path(id: @poll.slug || @poll.id) %>
    • diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index ab90f94dd..54ad19a59 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -1,16 +1,18 @@ <% provide :title do %><%= @poll.name %><% end %> -
    +
    <%= render "poll_header" %> <%= render "poll_subnav" %>
    -
      -
    • - <%= link_to t("stats.title"), "#participation_statistics" %> -
        +
        +
        +

        <%= link_to t("stats.title"), "#participation_statistics" %>

        +
        • <%= link_to t("stats.total_participants"), "#total_participants" %>
          • @@ -21,25 +23,25 @@ <%= link_to t("stats.by_age"), "#participants_by_age" %>
        - -
      +
    +
    -
    -

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

    +
    +

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

    -
    -

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

    +
    +

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

    <%= @stats[:total_participants] %> - <%= t("polls.show.stats.total_votes") %>
     + <%= t("polls.show.stats.total_votes") %>

    -
    +
    -
    -

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

    +
    +

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

    <%= @stats[:total_male_participants] %> @@ -56,15 +58,17 @@ percentage: number_to_stats_percentage(@stats[:female_percentage])) %>

    -
    +
    -
    -

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

    +
    +

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

    <%= t("budgets.stats.age").upcase %><%= t("budgets.stats.total").upcase %><%= t("budgets.stats.age").upcase %><%= t("budgets.stats.total").upcase %>
    <%= group[:range] %> - <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> - + + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> + +
    + + +
    - - + + + + @@ -72,15 +76,20 @@ <% end %>
    <%= t("stats.age") %><%= t("stats.total") %>
    <%= t("stats.age") %><%= t("stats.total") %>
    <%= group[:range] %> - <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> - + + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> + +
    + + +
    - - +
    +
    From b4a1f0db5134d143b3aeead6d4cad4f6f7c2beb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 28 Dec 2018 19:04:36 +0100 Subject: [PATCH 14/82] Rename file to initialize Foundation Naming it "Dropdown" was misleading. --- app/assets/javascripts/application.js | 4 ++-- .../{dropdown.js.coffee => foundation_extras.js.coffee} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/assets/javascripts/{dropdown.js.coffee => foundation_extras.js.coffee} (67%) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f8903dd30..dbfcfea65 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -27,7 +27,7 @@ //= require app //= require check_all_none //= require comments -//= require dropdown +//= require foundation_extras //= require ie_alert //= require location_changer //= require moderator_comment @@ -93,7 +93,7 @@ var initialize_modules = function() { App.Votes.initialize(); App.AllowParticipation.initialize(); App.Tags.initialize(); - App.Dropdown.initialize(); + App.FoundationExtras.initialize(); App.LocationChanger.initialize(); App.CheckAllNone.initialize(); App.PreventDoubleSubmission.initialize(); diff --git a/app/assets/javascripts/dropdown.js.coffee b/app/assets/javascripts/foundation_extras.js.coffee similarity index 67% rename from app/assets/javascripts/dropdown.js.coffee rename to app/assets/javascripts/foundation_extras.js.coffee index fafa53542..cf1bcb768 100644 --- a/app/assets/javascripts/dropdown.js.coffee +++ b/app/assets/javascripts/foundation_extras.js.coffee @@ -1,4 +1,4 @@ -App.Dropdown = +App.FoundationExtras = initialize: -> $(document).foundation() From f7d4507ebea6ad2915741fb112e7c9c430ccf76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 28 Dec 2018 19:09:11 +0100 Subject: [PATCH 15/82] Keep sticky elements after AJAX requests Turbolinks doesn't get on well with Foundation's Sticky, and so we need to manually trigger the event on Turbolinks' `page:load`. --- app/assets/javascripts/foundation_extras.js.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/foundation_extras.js.coffee b/app/assets/javascripts/foundation_extras.js.coffee index cf1bcb768..720b62047 100644 --- a/app/assets/javascripts/foundation_extras.js.coffee +++ b/app/assets/javascripts/foundation_extras.js.coffee @@ -2,3 +2,4 @@ App.FoundationExtras = initialize: -> $(document).foundation() + $(window).trigger "load.zf.sticky" From 0e2e5a27c3d985cf7934ba57ed33f17bdb9af406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:15:14 +0100 Subject: [PATCH 16/82] Refactor valid, white and null votes calculations --- app/models/poll/stats.rb | 54 ++++++++++++---------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 7b5ed28e8..e61a50541 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -42,72 +42,50 @@ class Poll::Stats voters.where(origin: "web").count - total_web_white end - def valid_percentage_web - calculate_percentage(total_web_valid, total_valid_votes) - end - def total_web_white 0 end - def white_percentage_web - calculate_percentage(total_web_white, total_white_votes) - end - def total_web_null 0 end - def null_percentage_web - calculate_percentage(total_web_null, total_null_votes) - end - def total_booth_valid recounts.sum(:total_amount) end - def valid_percentage_booth - calculate_percentage(total_booth_valid, total_valid_votes) - end - def total_booth_white recounts.sum(:white_amount) end - def white_percentage_booth - calculate_percentage(total_booth_white, total_white_votes) - end - def total_booth_null recounts.sum(:null_amount) end - def null_percentage_booth - calculate_percentage(total_booth_null, total_null_votes) + def valid_percentage_web + calculate_percentage(total_web_valid, total_valid_votes) end - def total_valid_votes - total_web_valid + total_booth_valid + def white_percentage_web + calculate_percentage(total_web_white, total_white_votes) end - def total_valid_percentage - calculate_percentage(total_valid_votes, total_participants) + def null_percentage_web + calculate_percentage(total_web_null, total_null_votes) end - def total_white_votes - total_web_white + total_booth_white - end + %i[valid white null].each do |type| + define_method :"#{type}_percentage_booth" do + calculate_percentage(send(:"total_booth_#{type}"), send(:"total_#{type}_votes")) + end - def total_white_percentage - calculate_percentage(total_white_votes, total_participants) - end + define_method :"total_#{type}_votes" do + send(:"total_web_#{type}") + send(:"total_booth_#{type}") + end - def total_null_votes - total_web_null + total_booth_null - end - - def total_null_percentage - calculate_percentage(total_null_votes, total_participants) + define_method :"total_#{type}_percentage" do + calculate_percentage(send(:"total_#{type}_votes"), total_participants) + end end def voters From 7dbe1dce860250d59cc9c6898dd42850c5fb589e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:15:44 +0100 Subject: [PATCH 17/82] Refactor web and booth votes calculations --- app/models/poll/stats.rb | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index e61a50541..f8ad25560 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -22,20 +22,16 @@ class Poll::Stats total_participants_web + total_participants_booth end - def total_participants_web - total_web_valid + total_web_white + total_web_null - end + %i[web booth].each do |channel| + define_method :"total_participants_#{channel}" do + send(:"total_#{channel}_valid") + + send(:"total_#{channel}_white") + + send(:"total_#{channel}_null") + end - def total_participants_web_percentage - calculate_percentage(total_participants_web, total_participants) - end - - def total_participants_booth - total_booth_valid + total_booth_white + total_booth_null - end - - def total_participants_booth_percentage - calculate_percentage(total_participants_booth, total_participants) + define_method :"total_participants_#{channel}_percentage" do + calculate_percentage(send(:"total_participants_#{channel}"), total_participants) + end end def total_web_valid From 88daaee9fe8f0e45244241f2a1aa0ccea1cf1034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 28 Dec 2018 20:39:01 +0100 Subject: [PATCH 18/82] Simplify code --- app/models/concerns/statisticable.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 5ff689641..300b77387 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -54,20 +54,21 @@ module Statisticable [75, 79], [80, 84], [85, 89], - [90, 300]].reduce({}) do |groups, (start, finish)| - users = User.where(id: participants) - .where("date_of_birth > ? AND date_of_birth < ?", - finish.years.ago.beginning_of_year, - start.years.ago.end_of_year) + [90, 300] + ].map do |start, finish| + users = participants.where("date_of_birth > ? AND date_of_birth < ?", + finish.years.ago.beginning_of_year, + start.years.ago.end_of_year) - groups.tap do |age_groups| - age_groups["#{start} - #{finish}"] = { + [ + "#{start} - #{finish}", + { range: range_description(start, finish), count: users.count, percentage: calculate_percentage(users.count, total_participants) } - end - end + ] + end.to_h end def calculate_percentage(fraction, total) From 573e04ef8f3a7d00fc1a02c400135db14172b700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:17:33 +0100 Subject: [PATCH 19/82] Move common stats to partials --- app/views/polls/stats.html.erb | 76 +------------------ app/views/shared/stats/_links.html.erb | 12 +++ .../shared/stats/_participation.html.erb | 62 +++++++++++++++ 3 files changed, 76 insertions(+), 74 deletions(-) create mode 100644 app/views/shared/stats/_links.html.erb create mode 100644 app/views/shared/stats/_participation.html.erb diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 54ad19a59..e09780af0 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -11,85 +11,13 @@
    -

    <%= link_to t("stats.title"), "#participation_statistics" %>

    -
      -
    • - <%= link_to t("stats.total_participants"), "#total_participants" %> -
      • -
    • - <%= link_to t("stats.by_gender"), "#participants_by_gender" %> -
      • -
    • - <%= link_to t("stats.by_age"), "#participants_by_age" %> -
      • -
    + <%= render "shared/stats/links" %>
    -
    -

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

    - -
    -

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

    - -

    - <%= @stats[:total_participants] %> - <%= t("polls.show.stats.total_votes") %> -

    -
    - -
    -

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

    - -

    - <%= @stats[:total_male_participants] %> - - <%= I18n.t("stats.men_percentage", - percentage: number_to_stats_percentage(@stats[:male_percentage])) %> - -

    - -

    - <%= @stats[:total_female_participants] %> - - <%= I18n.t("stats.women_percentage", - percentage: number_to_stats_percentage(@stats[:female_percentage])) %> - -

    -
    - -
    -

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

    - -
    - - - - - - - - - <% @stats[:age_groups].values.each do |group| %> - - - - - <% end %> - -
    <%= t("stats.age") %><%= t("stats.total") %>
    <%= group[:range] %> - - <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> - -
    - - -
    -
    -
    -
    + <%= render "shared/stats/participation", stats: @stats %> diff --git a/app/views/shared/stats/_links.html.erb b/app/views/shared/stats/_links.html.erb new file mode 100644 index 000000000..7b7d6d7ac --- /dev/null +++ b/app/views/shared/stats/_links.html.erb @@ -0,0 +1,12 @@ +

    <%= link_to t("stats.title"), "#participation_statistics" %>

    +
      +
    • + <%= link_to t("stats.total_participants"), "#total_participants" %> +
      • +
    • + <%= link_to t("stats.by_gender"), "#participants_by_gender" %> +
      • +
    • + <%= link_to t("stats.by_age"), "#participants_by_age" %> +
      • +
    diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb new file mode 100644 index 000000000..cf31920db --- /dev/null +++ b/app/views/shared/stats/_participation.html.erb @@ -0,0 +1,62 @@ +
    +

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

    + +
    +

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

    + +

    + <%= stats[:total_participants] %> + <%= t("polls.show.stats.total_votes") %> +

    +
    + +
    +

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

    + +

    + <%= stats[:total_male_participants] %> + + <%= I18n.t("stats.men_percentage", + percentage: number_to_stats_percentage(stats[:male_percentage])) %> + +

    + +

    + <%= stats[:total_female_participants] %> + + <%= I18n.t("stats.women_percentage", + percentage: number_to_stats_percentage(stats[:female_percentage])) %> + +

    +
    + +
    +

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

    + +
    + + + + + + + + + <% stats[:age_groups].values.each do |group| %> + + + + + <% end %> + +
    <%= t("stats.age") %><%= t("stats.total") %>
    <%= group[:range] %> + + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> + +
    + + +
    +
    +
    +
    From 1c9552b9220a72348564edcacb9ae10f98459268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:18:31 +0100 Subject: [PATCH 20/82] Add number-with-info HTML class to stats So it can be reused in advanced statistics. --- app/assets/stylesheets/stats.scss | 37 ++++++++++--------- .../shared/stats/_participation.html.erb | 6 +-- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index f6d8845c5..27fb84873 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -20,16 +20,30 @@ margin-top: $line-height; } - .participants { + .number-with-info { display: inline-block; margin-right: $line-height * 2; - padding-left: $line-height * 2.5; - position: relative; - &::before { + &.participants { + padding-left: $line-height * 2.5; + position: relative; + + &::before { + left: 0; + position: absolute; + } + } + + &.total-participants::before { content: image-url('stats_man.png'); - left: 0; - position: absolute; + } + + &.male::before { + content: image-url('stats_man.png'); + } + + &.female::before { + content: image-url('stats_woman.png'); } .number { @@ -45,17 +59,6 @@ } } - .gender { - - &.male::before { - content: image-url('stats_man.png'); - } - - &.female::before { - content: image-url('stats_woman.png'); - } - } - .progress { background: #ebf0f4; border-radius: rem-calc(20); diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb index cf31920db..d49fb839b 100644 --- a/app/views/shared/stats/_participation.html.erb +++ b/app/views/shared/stats/_participation.html.erb @@ -4,7 +4,7 @@

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

    -

    +

    <%= stats[:total_participants] %> <%= t("polls.show.stats.total_votes") %>

    @@ -13,7 +13,7 @@

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

    -

    +

    <%= stats[:total_male_participants] %> <%= I18n.t("stats.men_percentage", @@ -21,7 +21,7 @@

    -

    +

    <%= stats[:total_female_participants] %> <%= I18n.t("stats.women_percentage", From 4ade857a1bec0b63afdcfaa241ce9e6abbb0b628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:19:07 +0100 Subject: [PATCH 21/82] Extract method to render number and info We're going to use it in many places, so removing duplication is useful. --- app/helpers/stats_helper.rb | 6 ++++ .../shared/stats/_participation.html.erb | 33 +++++++++---------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb index 5fd42027e..eef463a99 100644 --- a/app/helpers/stats_helper.rb +++ b/app/helpers/stats_helper.rb @@ -34,4 +34,10 @@ module StatsHelper def number_to_stats_percentage(number, options = {}) number_to_percentage(number, { strip_insignificant_zeros: true, precision: 2 }.merge(options)) end + + def number_with_info_tags(number, text, html_class: "") + content_tag :p, class: "number-with-info #{html_class}".strip do + content_tag(:span, number, class: "number") + content_tag(:span, text, class: "info") + end + end end diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb index d49fb839b..a806e2d0a 100644 --- a/app/views/shared/stats/_participation.html.erb +++ b/app/views/shared/stats/_participation.html.erb @@ -4,30 +4,27 @@

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

    -

    - <%= stats[:total_participants] %> - <%= t("polls.show.stats.total_votes") %> -

    + <%= number_with_info_tags( + stats[:total_participants], + t("polls.show.stats.total_votes"), + html_class: "participants total-participants" + ) %>

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

    -

    - <%= stats[:total_male_participants] %> - - <%= I18n.t("stats.men_percentage", - percentage: number_to_stats_percentage(stats[:male_percentage])) %> - -

    + <%= number_with_info_tags( + stats[:total_male_participants], + t("stats.men_percentage", percentage: number_to_stats_percentage(stats[:male_percentage])), + html_class: "participants male" + ) %> -

    - <%= stats[:total_female_participants] %> - - <%= I18n.t("stats.women_percentage", - percentage: number_to_stats_percentage(stats[:female_percentage])) %> - -

    + <%= number_with_info_tags( + stats[:total_female_participants], + t("stats.women_percentage", percentage: number_to_stats_percentage(stats[:female_percentage])), + html_class: "participants female" + ) %>
    From c4c0301f3f11d44d0924f878a8664a8574600e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:19:44 +0100 Subject: [PATCH 22/82] Simplify stats images styles This way we don't need to manually define the width we think the image we insert in the `::before` pseudoclass is going to take. --- app/assets/images/stats_users.png | Bin 0 -> 3725 bytes app/assets/stylesheets/stats.scss | 19 +++++++++---------- app/helpers/stats_helper.rb | 4 +++- 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 app/assets/images/stats_users.png diff --git a/app/assets/images/stats_users.png b/app/assets/images/stats_users.png new file mode 100644 index 0000000000000000000000000000000000000000..76bb80606f80bd5764f676f0a0b87f89e12203a1 GIT binary patch literal 3725 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 27fb84873..6c2cc73c5 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -22,20 +22,14 @@ .number-with-info { display: inline-block; - margin-right: $line-height * 2; - &.participants { - padding-left: $line-height * 2.5; - position: relative; - - &::before { - left: 0; - position: absolute; - } + &::before { + display: inline-block; + margin-right: $line-height / 2; } &.total-participants::before { - content: image-url('stats_man.png'); + content: image-url('stats_users.png'); } &.male::before { @@ -46,6 +40,11 @@ content: image-url('stats_woman.png'); } + .content { + display: inline-block; + margin-right: $line-height * 2; + } + .number { display: block; font-size: rem-calc(60); diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb index eef463a99..d321bce0b 100644 --- a/app/helpers/stats_helper.rb +++ b/app/helpers/stats_helper.rb @@ -37,7 +37,9 @@ module StatsHelper def number_with_info_tags(number, text, html_class: "") content_tag :p, class: "number-with-info #{html_class}".strip do - content_tag(:span, number, class: "number") + content_tag(:span, text, class: "info") + content_tag :span, class: "content" do + content_tag(:span, number, class: "number") + content_tag(:span, text, class: "info") + end end end end From 4d520a3a474d516fac1b46e2f1084f4c28fce8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:20:07 +0100 Subject: [PATCH 23/82] Rename `age_groups` method The name was confusing because it seemed to return a list of age groups. --- app/models/concerns/statisticable.rb | 8 ++++-- app/views/budgets/stats/show.html.erb | 2 +- .../shared/stats/_participation.html.erb | 2 +- spec/models/budget/stats_spec.rb | 26 +++++++++---------- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 300b77387..0a041a851 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -55,7 +55,11 @@ module Statisticable [80, 84], [85, 89], [90, 300] - ].map do |start, finish| + ] + end + + def participants_by_age + age_groups.map do |start, finish| users = participants.where("date_of_birth > ? AND date_of_birth < ?", finish.years.ago.beginning_of_year, start.years.ago.end_of_year) @@ -90,7 +94,7 @@ module Statisticable def stats_methods %i[total_participants total_male_participants total_female_participants total_unknown_gender_or_age - male_percentage female_percentage age_groups] + male_percentage female_percentage participants_by_age] end def stats_cache(*method_names) diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index dad8ee5e9..e156d0d9b 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -140,7 +140,7 @@ - <% @stats[:age_groups].values.each do |group| %> + <% @stats[:participants_by_age].values.each do |group| %> <%= group[:range] %> diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb index a806e2d0a..88faf3575 100644 --- a/app/views/shared/stats/_participation.html.erb +++ b/app/views/shared/stats/_participation.html.erb @@ -39,7 +39,7 @@ - <% stats[:age_groups].values.each do |group| %> + <% stats[:participants_by_age].values.each do |group| %> <%= group[:range] %> diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 3ff9dfa9f..231c90675 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -148,21 +148,21 @@ describe Budget::Stats do end - context "#age_groups" do + context "#participants_by_age" do it "returns the age groups hash" do - expect(stats[:age_groups]["16 - 19"][:count]).to be 0 - expect(stats[:age_groups]["20 - 24"][:count]).to be 7 - expect(stats[:age_groups]["25 - 29"][:count]).to be 1 - expect(stats[:age_groups]["30 - 34"][:count]).to be 0 - expect(stats[:age_groups]["35 - 39"][:count]).to be 1 - expect(stats[:age_groups]["40 - 44"][:count]).to be 1 - expect(stats[:age_groups]["45 - 49"][:count]).to be 0 - expect(stats[:age_groups]["50 - 54"][:count]).to be 1 - expect(stats[:age_groups]["55 - 59"][:count]).to be 0 - expect(stats[:age_groups]["60 - 64"][:count]).to be 0 - expect(stats[:age_groups]["65 - 69"][:count]).to be 0 - expect(stats[:age_groups]["70 - 74"][:count]).to be 0 + expect(stats[:participants_by_age]["16 - 19"][:count]).to be 0 + expect(stats[:participants_by_age]["20 - 24"][:count]).to be 7 + expect(stats[:participants_by_age]["25 - 29"][:count]).to be 1 + expect(stats[:participants_by_age]["30 - 34"][:count]).to be 0 + expect(stats[:participants_by_age]["35 - 39"][:count]).to be 1 + expect(stats[:participants_by_age]["40 - 44"][:count]).to be 1 + expect(stats[:participants_by_age]["45 - 49"][:count]).to be 0 + expect(stats[:participants_by_age]["50 - 54"][:count]).to be 1 + expect(stats[:participants_by_age]["55 - 59"][:count]).to be 0 + expect(stats[:participants_by_age]["60 - 64"][:count]).to be 0 + expect(stats[:participants_by_age]["65 - 69"][:count]).to be 0 + expect(stats[:participants_by_age]["70 - 74"][:count]).to be 0 end end From 1975b6ae7ceb60f16c347edb6772aed3bf6dcba0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 17 Jan 2019 13:28:54 +0100 Subject: [PATCH 24/82] Remove sticky on polls stats links --- app/views/polls/stats.html.erb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index e09780af0..76d75df05 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -7,13 +7,7 @@
    -
    -
    - <%= render "shared/stats/links" %> -
    -
    + <%= render "shared/stats/links" %>
    From 70dbbbd1b99501a8a345522fd68064031fe84f73 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 17 Jan 2019 13:30:35 +0100 Subject: [PATCH 25/82] Add stack class to polls stats table This class improve tables layout on mobile screen sizes. --- app/assets/stylesheets/_consul_settings.scss | 3 +++ app/views/polls/stats.html.erb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 7ffd8ae4f..1275efcfc 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -119,3 +119,6 @@ $tab-content-border: $border; $orbit-bullet-diameter: 0.8rem; $pagination-radius: $global-radius; + +$show-header-for-stacked: true; + diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 76d75df05..f77282b85 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -13,7 +13,7 @@
    <%= render "shared/stats/participation", stats: @stats %> - +
    From a552645e7f99948b7cb2a437339d0cdc27f8c501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 11 Jan 2019 21:37:10 +0100 Subject: [PATCH 26/82] Add tests to poll stats While we already had "one test to rule all stats", testing each method individually makes reading, adding and changing tests easier. Note we need to make all methods being tested public. We could also test them using methods like `stats.generate[:total_valid_votes]` instead of `stats.total_valid_votes`, but then the tests would be more difficult to read. --- app/models/concerns/statisticable.rb | 74 ++++++------- app/models/poll/stats.rb | 133 +++++++++++------------ spec/models/poll/stats_spec.rb | 154 +++++++++++++++++++++++++++ 3 files changed, 258 insertions(+), 103 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 0a041a851..cd24aed8e 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -12,32 +12,49 @@ module Statisticable self.class.stats_methods.map { |stat_name| [stat_name, send(stat_name)] }.to_h end + def total_male_participants + participants.where(gender: "male").count + end + + def total_female_participants + participants.where(gender: "female").count + end + + def total_unknown_gender_or_age + participants.where("gender IS NULL OR date_of_birth is NULL").uniq.count + end + + def male_percentage + calculate_percentage(total_male_participants, total_participants_with_gender) + end + + def female_percentage + calculate_percentage(total_female_participants, total_participants_with_gender) + end + + def participants_by_age + age_groups.map do |start, finish| + users = participants.where("date_of_birth > ? AND date_of_birth < ?", + finish.years.ago.beginning_of_year, + start.years.ago.end_of_year) + + [ + "#{start} - #{finish}", + { + range: range_description(start, finish), + count: users.count, + percentage: calculate_percentage(users.count, total_participants) + } + ] + end.to_h + end + private def total_participants_with_gender participants.where.not(gender: nil).distinct.count end - def total_male_participants - participants.where(gender: "male").count - end - - def total_female_participants - participants.where(gender: "female").count - end - - def total_unknown_gender_or_age - participants.where("gender IS NULL OR date_of_birth is NULL").uniq.count - end - - def male_percentage - calculate_percentage(total_male_participants, total_participants_with_gender) - end - - def female_percentage - calculate_percentage(total_female_participants, total_participants_with_gender) - end - def age_groups [[16, 19], [20, 24], @@ -58,23 +75,6 @@ module Statisticable ] end - def participants_by_age - age_groups.map do |start, finish| - users = participants.where("date_of_birth > ? AND date_of_birth < ?", - finish.years.ago.beginning_of_year, - start.years.ago.end_of_year) - - [ - "#{start} - #{finish}", - { - range: range_description(start, finish), - count: users.count, - percentage: calculate_percentage(users.count, total_participants) - } - ] - end.to_h - end - def calculate_percentage(fraction, total) return 0.0 if total.zero? diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index f8ad25560..21f9fba94 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -13,77 +13,78 @@ class Poll::Stats null_percentage_web null_percentage_booth total_null_percentage] end + def total_participants + total_participants_web + total_participants_booth + end + + %i[web booth].each do |channel| + define_method :"total_participants_#{channel}" do + send(:"total_#{channel}_valid") + + send(:"total_#{channel}_white") + + send(:"total_#{channel}_null") + end + + define_method :"total_participants_#{channel}_percentage" do + calculate_percentage(send(:"total_participants_#{channel}"), total_participants) + end + end + + def total_web_valid + voters.where(origin: "web").count - total_web_white + end + + def total_web_white + 0 + end + + def total_web_null + 0 + end + + def total_booth_valid + recounts.sum(:total_amount) + end + + def total_booth_white + recounts.sum(:white_amount) + end + + def total_booth_null + recounts.sum(:null_amount) + end + + def valid_percentage_web + calculate_percentage(total_web_valid, total_valid_votes) + end + + def white_percentage_web + calculate_percentage(total_web_white, total_white_votes) + end + + def null_percentage_web + calculate_percentage(total_web_null, total_null_votes) + end + + %i[valid white null].each do |type| + define_method :"#{type}_percentage_booth" do + calculate_percentage(send(:"total_booth_#{type}"), send(:"total_#{type}_votes")) + end + + define_method :"total_#{type}_votes" do + send(:"total_web_#{type}") + send(:"total_booth_#{type}") + end + + define_method :"total_#{type}_percentage" do + calculate_percentage(send(:"total_#{type}_votes"), total_participants) + end + end + private + def participants User.where(id: voters.pluck(:user_id)) end - def total_participants - total_participants_web + total_participants_booth - end - - %i[web booth].each do |channel| - define_method :"total_participants_#{channel}" do - send(:"total_#{channel}_valid") + - send(:"total_#{channel}_white") + - send(:"total_#{channel}_null") - end - - define_method :"total_participants_#{channel}_percentage" do - calculate_percentage(send(:"total_participants_#{channel}"), total_participants) - end - end - - def total_web_valid - voters.where(origin: "web").count - total_web_white - end - - def total_web_white - 0 - end - - def total_web_null - 0 - end - - def total_booth_valid - recounts.sum(:total_amount) - end - - def total_booth_white - recounts.sum(:white_amount) - end - - def total_booth_null - recounts.sum(:null_amount) - end - - def valid_percentage_web - calculate_percentage(total_web_valid, total_valid_votes) - end - - def white_percentage_web - calculate_percentage(total_web_white, total_white_votes) - end - - def null_percentage_web - calculate_percentage(total_web_null, total_null_votes) - end - - %i[valid white null].each do |type| - define_method :"#{type}_percentage_booth" do - calculate_percentage(send(:"total_booth_#{type}"), send(:"total_#{type}_votes")) - end - - define_method :"total_#{type}_votes" do - send(:"total_web_#{type}") + send(:"total_booth_#{type}") - end - - define_method :"total_#{type}_percentage" do - calculate_percentage(send(:"total_#{type}_votes"), total_participants) - end - end - def voters poll.voters end diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index b2130a370..5f6e345da 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -1,6 +1,160 @@ require "rails_helper" describe Poll::Stats do + let(:poll) { create(:poll) } + let(:stats) { Poll::Stats.new(poll) } + + describe "total participants" do + before { allow(stats).to receive(:total_web_white).and_return(1) } + + it "supports every channel" do + 3.times { create(:poll_voter, :from_web, poll: poll) } + create(:poll_recount, :from_booth, poll: poll, + total_amount: 8, white_amount: 4, null_amount: 1) + + expect(stats.total_participants_web).to eq(3) + expect(stats.total_participants_booth).to eq(13) + expect(stats.total_participants).to eq(16) + end + end + + describe "#total_participants_booth" do + it "uses recounts even if there are discrepancies when recounting" do + create(:poll_recount, :from_booth, poll: poll, total_amount: 1) + 2.times { create(:poll_voter, :from_booth, poll: poll) } + + expect(stats.total_participants_booth).to eq(1) + end + end + + describe "total participants percentage by channel" do + it "is relative to the total amount of participants" do + create(:poll_voter, :from_web, poll: poll) + create(:poll_recount, :from_booth, poll: poll, total_amount: 5) + + expect(stats.total_participants_web_percentage).to eq(16.667) + expect(stats.total_participants_booth_percentage).to eq(83.333) + end + end + + describe "#total_web_valid" do + before { allow(stats).to receive(:total_web_white).and_return(1) } + + it "returns only valid votes" do + 3.times { create(:poll_voter, :from_web, poll: poll) } + + expect(stats.total_web_valid).to eq(2) + end + end + + describe "#total_web_white" do + pending "Too complex to test" + end + + describe "#total_web_null" do + it "returns 0" do + expect(stats.total_web_null).to eq(0) + end + end + + describe "#total_booth_valid" do + it "sums the total amounts in the recounts" do + create(:poll_recount, :from_booth, poll: poll, total_amount: 3, white_amount: 1) + create(:poll_recount, :from_booth, poll: poll, total_amount: 4, null_amount: 2) + + expect(stats.total_booth_valid).to eq(7) + end + end + + describe "#total_booth_white" do + it "sums the white amounts in the recounts" do + create(:poll_recount, :from_booth, poll: poll, white_amount: 120, total_amount: 3) + create(:poll_recount, :from_booth, poll: poll, white_amount: 203, null_amount: 5) + + expect(stats.total_booth_white).to eq(323) + end + end + + describe "#total_booth_null" do + it "sums the null amounts in the recounts" do + create(:poll_recount, :from_booth, poll: poll, null_amount: 125, total_amount: 3) + create(:poll_recount, :from_booth, poll: poll, null_amount: 34, white_amount: 5) + + expect(stats.total_booth_null).to eq(159) + end + end + + describe "valid percentage by channel" do + it "is relative to the total amount of valid votes" do + create(:poll_recount, :from_booth, poll: poll, total_amount: 2) + create(:poll_voter, :from_web, poll: poll) + + expect(stats.valid_percentage_web).to eq(33.333) + expect(stats.valid_percentage_booth).to eq(66.667) + end + end + + describe "white percentage by channel" do + before { allow(stats).to receive(:total_web_white).and_return(10) } + + it "is relative to the total amount of white votes" do + create(:poll_recount, :from_booth, poll: poll, white_amount: 70) + + expect(stats.white_percentage_web).to eq(12.5) + expect(stats.white_percentage_booth).to eq(87.5) + end + end + + describe "null percentage by channel" do + it "only accepts null votes from booth" do + create(:poll_recount, :from_booth, poll: poll, null_amount: 70) + + expect(stats.null_percentage_web).to eq(0) + expect(stats.null_percentage_booth).to eq(100) + end + end + + describe "#total_valid_votes" do + it "counts valid votes from every channel" do + 2.times { create(:poll_voter, :from_web, poll: poll) } + create(:poll_recount, :from_booth, poll: poll, total_amount: 3, white_amount: 10) + create(:poll_recount, :from_booth, poll: poll, total_amount: 4, null_amount: 20) + + expect(stats.total_valid_votes).to eq(9) + end + end + + describe "#total_white_votes" do + before { allow(stats).to receive(:total_web_white).and_return(9) } + + it "counts white votes on every channel" do + create(:poll_recount, :from_booth, poll: poll, white_amount: 12) + + expect(stats.total_white_votes).to eq(21) + end + end + + describe "#total_null_votes" do + it "only accepts null votes from booth" do + create(:poll_recount, :from_booth, poll: poll, null_amount: 32) + + expect(stats.total_null_votes).to eq(32) + end + end + + describe "total percentage by type" do + before { allow(stats).to receive(:total_web_white).and_return(1) } + + it "is relative to the total amount of votes" do + 3.times { create(:poll_voter, :from_web, poll: poll) } + create(:poll_recount, :from_booth, poll: poll, + total_amount: 8, white_amount: 5, null_amount: 4) + + expect(stats.total_valid_percentage).to eq(50) + expect(stats.total_white_percentage).to eq(30) + expect(stats.total_null_percentage).to eq(20) + end + end describe "#generate" do it "generates the correct stats" do From 49f4a535697bc1609fefa32b22ea410c2b64aaaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 11 Jan 2019 21:44:32 +0100 Subject: [PATCH 27/82] Remove duplication in web percentage stats We didn't use metaprogramming from the start because the `null_percentage_web` method had a particular behaviour. However, the behaviour (due to a typo) didn't really matter because there are no null web votes, and so the `null_percentage_web` is always zero. --- app/models/poll/stats.rb | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 21f9fba94..cc4e5318d 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -53,21 +53,11 @@ class Poll::Stats recounts.sum(:null_amount) end - def valid_percentage_web - calculate_percentage(total_web_valid, total_valid_votes) - end - - def white_percentage_web - calculate_percentage(total_web_white, total_white_votes) - end - - def null_percentage_web - calculate_percentage(total_web_null, total_null_votes) - end - %i[valid white null].each do |type| - define_method :"#{type}_percentage_booth" do - calculate_percentage(send(:"total_booth_#{type}"), send(:"total_#{type}_votes")) + %i[web booth].each do |channel| + define_method :"#{type}_percentage_#{channel}" do + calculate_percentage(send(:"total_#{channel}_#{type}"), send(:"total_#{type}_votes")) + end end define_method :"total_#{type}_votes" do From 90fe746d27c2e0fc9bbe8f7523cae1183e2cf07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 17:08:33 +0100 Subject: [PATCH 28/82] Add geozone stats to polls --- app/models/concerns/statisticable.rb | 24 ++++++++++++++-- app/views/shared/stats/_links.html.erb | 3 ++ .../shared/stats/_participation.html.erb | 24 ++++++++++++++++ config/locales/en/stats.yml | 3 ++ config/locales/es/stats.yml | 3 ++ spec/models/poll/stats_spec.rb | 28 +++++++++++++++++++ 6 files changed, 82 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index cd24aed8e..2d588a59a 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -49,6 +49,23 @@ module Statisticable end.to_h end + def participants_by_geozone + Geozone.all.order("name").map do |geozone| + count = participants.where(geozone: geozone).count + + [ + geozone.name, + { + total: { + count: count, + percentage: calculate_percentage(count, total_participants) + }, + percentage: calculate_percentage(count, geozone.users.count) + } + ] + end.to_h + end + private def total_participants_with_gender @@ -92,9 +109,10 @@ module Statisticable class_methods do def stats_methods - %i[total_participants total_male_participants - total_female_participants total_unknown_gender_or_age - male_percentage female_percentage participants_by_age] + %i[total_participants + total_male_participants total_female_participants total_unknown_gender_or_age + male_percentage female_percentage + participants_by_age participants_by_geozone] end def stats_cache(*method_names) diff --git a/app/views/shared/stats/_links.html.erb b/app/views/shared/stats/_links.html.erb index 7b7d6d7ac..581cce4b2 100644 --- a/app/views/shared/stats/_links.html.erb +++ b/app/views/shared/stats/_links.html.erb @@ -9,4 +9,7 @@
  • <%= link_to t("stats.by_age"), "#participants_by_age" %>
    • +
  • + <%= link_to t("stats.by_geozone"), "#participants_by_geozone" %> +
    • diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb index 88faf3575..ed9119f2a 100644 --- a/app/views/shared/stats/_participation.html.erb +++ b/app/views/shared/stats/_participation.html.erb @@ -56,4 +56,28 @@
    <%= t("polls.show.stats.votes") %>
    + +
    +

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

    + + + + + + + + + + + + <% stats[:participants_by_geozone].each do |geozone, participants| %> + + + + + + <% end %> + +
    <%= t("stats.geozone") %><%= t("stats.total") %><%= t("stats.geozone_participation") %>
    <%= geozone %><%= "#{participants[:total][:count]} (#{number_to_stats_percentage(participants[:total][:percentage])})" %><%= number_to_stats_percentage(participants[:percentage]) %>
    +
    diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 947e87b11..3cb6a3385 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -4,9 +4,12 @@ en: total_participants: "Participants" by_gender: "Participants by gender" by_age: "Participants by age" + by_geozone: "Participants by district" men_percentage: "%{percentage} Men" women_percentage: "%{percentage} Women" age: "Age" age_more_than: "%{start} years old and older" age_range: "%{start} - %{finish} years old" total: "Total" + geozone: "District" + geozone_participation: "% District population participation" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 926a024f8..2055060bf 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -4,9 +4,12 @@ es: total_participants: "Participantes" by_gender: "Participación por género" by_age: "Participación por grupos de edad" + by_geozone: "Participación por distritos" men_percentage: "%{percentage} Hombres" women_percentage: "%{percentage} Mujeres" age: "Edad" age_more_than: "De %{start} y más años" age_range: "De %{start} a %{finish} años" total: "Total" + geozone: "Distrito" + geozone_participation: "% Partipación población del distrito" diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 5f6e345da..2b2fe6c7b 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -156,6 +156,34 @@ describe Poll::Stats do end end + describe "#participants_by_geozone" do + it "groups by geozones in alphabetic order" do + %w[Oceania Eurasia Eastasia].each { |name| create(:geozone, name: name) } + + expect(stats.participants_by_geozone.keys).to eq %w[Eastasia Eurasia Oceania] + end + + it "calculates percentage relative to total participants" do + hobbiton = create(:geozone, name: "Hobbiton") + rivendel = create(:geozone, name: "Rivendel") + + 3.times { create :poll_voter, poll: poll, user: create(:user, :level_two, geozone: hobbiton) } + 2.times { create :poll_voter, poll: poll, user: create(:user, :level_two, geozone: rivendel) } + + expect(stats.participants_by_geozone["Hobbiton"][:total]).to eq(count: 3, percentage: 60.0) + expect(stats.participants_by_geozone["Rivendel"][:total]).to eq(count: 2, percentage: 40.0) + end + + it "calculates percentage relative to the geozone population" do + midgar = create(:geozone, name: "Midgar") + + create(:poll_voter, poll: poll, user: create(:user, :level_two, geozone: midgar)) + 2.times { create :user, :level_two, geozone: midgar } + + expect(stats.participants_by_geozone["Midgar"][:percentage]).to eq(33.333) + end + end + describe "#generate" do it "generates the correct stats" do poll = create(:poll) From a9bb3eba2655d1b89a30f9adcc1322f2ec79e617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 17:19:47 +0100 Subject: [PATCH 29/82] Add headings for advanced statistics --- app/views/polls/stats.html.erb | 151 ++++++++++++++++++--------------- config/locales/en/stats.yml | 3 + config/locales/es/stats.yml | 3 + 3 files changed, 89 insertions(+), 68 deletions(-) diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index f77282b85..db9dfd83d 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -8,79 +8,94 @@
    <%= render "shared/stats/links" %> + +

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

    +
      +
    • + <%= link_to t("stats.polls.vote_by_channel"), "#vote_stats_by_channel" %> +
      • +
    <%= render "shared/stats/participation", stats: @stats %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    <%= t("polls.show.stats.votes") %><%= t("polls.show.stats.web") %><%= t("polls.show.stats.booth") %><%= t("polls.show.stats.total") %>
    <%= t("polls.show.stats.valid") %> - <%= @stats[:total_web_valid] %> - (<%= @stats[:valid_percentage_web].round(2) %>%) - - <%= @stats[:total_booth_valid] %> - (<%= @stats[:valid_percentage_booth].round(2) %>%) - - <%= @stats[:total_valid_votes] %> - (<%= @stats[:total_valid_percentage].round(2) %>%) -
    <%= t("polls.show.stats.white") %> - <%= @stats[:total_web_white] %> - (<%= @stats[:white_percentage_web].round(2) %>%) - - <%= @stats[:total_booth_white] %> - (<%= @stats[:white_percentage_booth].round(2) %>%) - <%= @stats[:total_white_votes] %> - (<%= @stats[:total_white_percentage].round(2) %>%) -
    <%= t("polls.show.stats.null_votes") %> - <%= @stats[:total_web_null] %> - (<%= @stats[:null_percentage_web].round(2) %>%) - - <%= @stats[:total_booth_null] %> - (<%= @stats[:null_percentage_booth].round(2) %>%) - - <%= @stats[:total_null_votes] %> - (<%= @stats[:total_null_percentage].round(2) %>%) -
    <%= t("polls.show.stats.total") %> - <%= @stats[:total_participants_web] %> - (<%= @stats[:total_participants_web_percentage].round(2) %>%) - - <%= @stats[:total_participants_booth] %> - (<%= @stats[:total_participants_booth_percentage].round(2) %>%) - <%= @stats[:total_participants] %>
    +
    +

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

    + +
    +

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

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    <%= t("polls.show.stats.votes") %><%= t("polls.show.stats.web") %><%= t("polls.show.stats.booth") %><%= t("polls.show.stats.total") %>
    <%= t("polls.show.stats.valid") %> + <%= @stats[:total_web_valid] %> + (<%= @stats[:valid_percentage_web].round(2) %>%) + + <%= @stats[:total_booth_valid] %> + (<%= @stats[:valid_percentage_booth].round(2) %>%) + + <%= @stats[:total_valid_votes] %> + (<%= @stats[:total_valid_percentage].round(2) %>%) +
    <%= t("polls.show.stats.white") %> + <%= @stats[:total_web_white] %> + (<%= @stats[:white_percentage_web].round(2) %>%) + + <%= @stats[:total_booth_white] %> + (<%= @stats[:white_percentage_booth].round(2) %>%) + <%= @stats[:total_white_votes] %> + (<%= @stats[:total_white_percentage].round(2) %>%) +
    <%= t("polls.show.stats.null_votes") %> + <%= @stats[:total_web_null] %> + (<%= @stats[:null_percentage_web].round(2) %>%) + + <%= @stats[:total_booth_null] %> + (<%= @stats[:null_percentage_booth].round(2) %>%) + + <%= @stats[:total_null_votes] %> + (<%= @stats[:total_null_percentage].round(2) %>%) +
    <%= t("polls.show.stats.total") %> + <%= @stats[:total_participants_web] %> + (<%= @stats[:total_participants_web_percentage].round(2) %>%) + + <%= @stats[:total_participants_booth] %> + (<%= @stats[:total_participants_booth_percentage].round(2) %>%) + <%= @stats[:total_participants] %>
    +
    +
    diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 3cb6a3385..0b1915fd3 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -1,6 +1,7 @@ en: stats: title: "Participation data" + advanced: "Advanced statistics" total_participants: "Participants" by_gender: "Participants by gender" by_age: "Participants by age" @@ -13,3 +14,5 @@ en: total: "Total" geozone: "District" geozone_participation: "% District population participation" + polls: + vote_by_channel: "Vote type by channel" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 2055060bf..f8f76f211 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -1,6 +1,7 @@ es: stats: title: "Estadísticas de participación" + advanced: "Estadísticas avanzadas" total_participants: "Participantes" by_gender: "Participación por género" by_age: "Participación por grupos de edad" @@ -13,3 +14,5 @@ es: total: "Total" geozone: "Distrito" geozone_participation: "% Partipación población del distrito" + polls: + vote_by_channel: "Votos emitidos por medio" From 8f0bccf5b36ed0d55b0ca0b5b62a90038551237b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 17:27:21 +0100 Subject: [PATCH 30/82] Add mail votes stub to poll stats So far we don't know about implemenation details. --- app/models/poll/stats.rb | 26 ++++++++++--- app/views/polls/stats.html.erb | 70 +++++++++++++++++----------------- 2 files changed, 57 insertions(+), 39 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index cc4e5318d..191139d5a 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -2,22 +2,26 @@ class Poll::Stats include Statisticable alias_method :poll, :resource + CHANNELS = %i[web booth mail] + def self.stats_methods super + %i[total_valid_votes total_white_votes total_null_votes total_participants_web total_web_valid total_web_white total_web_null total_participants_booth total_booth_valid total_booth_white total_booth_null + total_participants_mail total_mail_valid total_mail_white total_mail_null total_participants_web_percentage total_participants_booth_percentage - valid_percentage_web valid_percentage_booth total_valid_percentage - white_percentage_web white_percentage_booth total_white_percentage - null_percentage_web null_percentage_booth total_null_percentage] + total_participants_mail_percentage + valid_percentage_web valid_percentage_booth valid_percentage_mail total_valid_percentage + white_percentage_web white_percentage_booth white_percentage_mail total_white_percentage + null_percentage_web null_percentage_booth null_percentage_mail total_null_percentage] end def total_participants total_participants_web + total_participants_booth end - %i[web booth].each do |channel| + CHANNELS.each do |channel| define_method :"total_participants_#{channel}" do send(:"total_#{channel}_valid") + send(:"total_#{channel}_white") + @@ -53,8 +57,20 @@ class Poll::Stats recounts.sum(:null_amount) end + def total_mail_valid + 0 # TODO + end + + def total_mail_white + 0 # TODO + end + + def total_mail_null + 0 # TODO + end + %i[valid white null].each do |type| - %i[web booth].each do |channel| + CHANNELS.each do |channel| define_method :"#{type}_percentage_#{channel}" do calculate_percentage(send(:"total_#{channel}_#{type}"), send(:"total_#{type}_votes")) end diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index db9dfd83d..a97e5ec43 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -30,51 +30,53 @@ <%= t("polls.show.stats.votes") %> - <%= t("polls.show.stats.web") %> - <%= t("polls.show.stats.booth") %> + <% Poll::Stats::CHANNELS.each do |channel| %> + <%= t("polls.show.stats.#{channel}") %> + <% end %> <%= t("polls.show.stats.total") %> <%= t("polls.show.stats.valid") %> - - <%= @stats[:total_web_valid] %> - (<%= @stats[:valid_percentage_web].round(2) %>%) - - - <%= @stats[:total_booth_valid] %> - (<%= @stats[:valid_percentage_booth].round(2) %>%) - + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <%= @stats[:"total_#{channel}_valid"] %> + (<%= @stats[:"valid_percentage_#{channel}"].round(2) %>%) + + <% end %> + <%= @stats[:total_valid_votes] %> (<%= @stats[:total_valid_percentage].round(2) %>%) + <%= t("polls.show.stats.white") %> - - <%= @stats[:total_web_white] %> - (<%= @stats[:white_percentage_web].round(2) %>%) - - - <%= @stats[:total_booth_white] %> - (<%= @stats[:white_percentage_booth].round(2) %>%) - + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <%= @stats[:"total_#{channel}_white"] %> + (<%= @stats[:"white_percentage_#{channel}"].round(2) %>%) + + <% end %> + <%= @stats[:total_white_votes] %> (<%= @stats[:total_white_percentage].round(2) %>%) <%= t("polls.show.stats.null_votes") %> - - <%= @stats[:total_web_null] %> - (<%= @stats[:null_percentage_web].round(2) %>%) - - - <%= @stats[:total_booth_null] %> - (<%= @stats[:null_percentage_booth].round(2) %>%) - + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <%= @stats[:"total_#{channel}_null"] %> + (<%= @stats[:"null_percentage_#{channel}"].round(2) %>%) + + <% end %> + <%= @stats[:total_null_votes] %> (<%= @stats[:total_null_percentage].round(2) %>%) @@ -82,14 +84,14 @@ <%= t("polls.show.stats.total") %> - - <%= @stats[:total_participants_web] %> - (<%= @stats[:total_participants_web_percentage].round(2) %>%) - - - <%= @stats[:total_participants_booth] %> - (<%= @stats[:total_participants_booth_percentage].round(2) %>%) - + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <%= @stats[:"total_participants_#{channel}"] %> + (<%= @stats[:"total_participants_#{channel}_percentage"].round(2) %>%) + + <% end %> + <%= @stats[:total_participants] %> From 553af8e95b054797d9ff74563ad64a10e87aafc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 17:41:23 +0100 Subject: [PATCH 31/82] Add poll stats by channel Note we currently don't have a way to get the votes by mail, so that section is always blank. --- app/assets/images/stats_booth.png | Bin 0 -> 3082 bytes app/assets/images/stats_mail.png | Bin 0 -> 2362 bytes app/assets/images/stats_web.png | Bin 0 -> 2911 bytes app/assets/stylesheets/stats.scss | 12 ++++++++++++ app/views/polls/stats.html.erb | 17 +++++++++++++++++ config/locales/en/stats.yml | 4 ++++ config/locales/es/stats.yml | 4 ++++ 7 files changed, 37 insertions(+) create mode 100644 app/assets/images/stats_booth.png create mode 100644 app/assets/images/stats_mail.png create mode 100644 app/assets/images/stats_web.png diff --git a/app/assets/images/stats_booth.png b/app/assets/images/stats_booth.png new file mode 100644 index 0000000000000000000000000000000000000000..98d218b1ab60a2e006b9a2e25b5ea0df2fd8100b GIT binary patch literal 3082 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/stats_web.png b/app/assets/images/stats_web.png new file mode 100644 index 0000000000000000000000000000000000000000..e16835b32419bfc64e7857a61e230ca167e73c09 GIT binary patch literal 2911 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 6c2cc73c5..2992e5d05 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -40,6 +40,18 @@ content: image-url('stats_woman.png'); } + &.web::before { + content: image-url('stats_web.png'); + } + + &.booth::before { + content: image-url('stats_booth.png'); + } + + &.mail::before { + content: image-url('stats_mail.png'); + } + .content { display: inline-block; margin-right: $line-height * 2; diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index a97e5ec43..216a1a2e8 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -11,6 +11,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" %>
      • @@ -23,6 +26,20 @@

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

      +
      +

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

      + + <% Poll::Stats::CHANNELS.each do |channel| %> + <%= number_with_info_tags( + @stats[:"total_participants_#{channel}"], + t("stats.polls.#{channel}_percentage", + percentage: number_to_stats_percentage(@stats[:"total_participants_#{channel}_percentage"]) + ), + html_class: channel + ) %> + <% end %> +
      +

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

      diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 0b1915fd3..c53acd9ec 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -15,4 +15,8 @@ en: geozone: "District" geozone_participation: "% District population participation" polls: + by_channel: "Participants by channel" vote_by_channel: "Vote type by channel" + web_percentage: "%{percentage} Web" + booth_percentage: "%{percentage} Booths" + mail_percentage: "%{percentage} Mail" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index f8f76f211..026ae4f45 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -15,4 +15,8 @@ es: geozone: "Distrito" geozone_participation: "% Partipación población del distrito" polls: + by_channel: "Participación por medio" vote_by_channel: "Votos emitidos por medio" + web_percentage: "%{percentage} Web" + booth_percentage: "%{percentage} Urnas" + mail_percentage: "%{percentage} Correo" From 7b408a4b8828afb4d353655f07e8d40e4aee8b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 18:24:06 +0100 Subject: [PATCH 32/82] Add poll stats by gender and channel --- app/assets/stylesheets/stats.scss | 62 ++++++++++++++++++++++++++++ app/models/concerns/statisticable.rb | 4 +- app/models/poll/stats.rb | 23 ++++++++++- app/models/user.rb | 2 + app/views/polls/stats.html.erb | 31 ++++++++++++++ config/locales/en/stats.yml | 6 +++ config/locales/es/stats.yml | 6 +++ spec/models/poll/stats_spec.rb | 39 +++++++++++++++++ 8 files changed, 170 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 2992e5d05..543c01433 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -81,4 +81,66 @@ border-bottom-left-radius: rem-calc(20); border-top-left-radius: rem-calc(20); } + + .gender-and-channel { + thead, + tbody { + border: 0; + } + + thead, + tr, + th { + background-color: transparent; + } + + td, + th { + text-align: center; + text-transform: uppercase; + + &::before { + display: inline-block; + transform: scale(0.6); + vertical-align: middle; + } + } + + th { + font-weight: bold; + font-size: rem-calc(21); + + &.gender { + opacity: 0; + } + + &.web::before { + content: image-url('stats_web.png'); + } + + &.booth::before { + content: image-url('stats_booth.png'); + } + + &.mail::before { + content: image-url('stats_mail.png'); + } + } + + td { + &.gender { + font-weight: bold; + font-size: rem-calc(21); + text-align: left; + } + + &.male::before { + content: image-url('stats_man.png'); + } + + &.female::before { + content: image-url('stats_woman.png'); + } + } + } } diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 2d588a59a..a47826aa3 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -13,11 +13,11 @@ module Statisticable end def total_male_participants - participants.where(gender: "male").count + participants.male.count end def total_female_participants - participants.where(gender: "female").count + participants.female.count end def total_unknown_gender_or_age diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 191139d5a..dda2f74c1 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -14,7 +14,11 @@ class Poll::Stats total_participants_mail_percentage valid_percentage_web valid_percentage_booth valid_percentage_mail total_valid_percentage white_percentage_web white_percentage_booth white_percentage_mail total_white_percentage - null_percentage_web null_percentage_booth null_percentage_mail total_null_percentage] + null_percentage_web null_percentage_booth null_percentage_mail total_null_percentage + total_male_web total_male_booth total_male_mail + total_female_web total_female_booth total_female_mail + male_web_percentage male_booth_percentage male_mail_percentage + female_web_percentage female_booth_percentage female_mail_percentage] end def total_participants @@ -31,6 +35,23 @@ class Poll::Stats define_method :"total_participants_#{channel}_percentage" do calculate_percentage(send(:"total_participants_#{channel}"), total_participants) end + + define_method :"#{channel}_participants" do + User.where(id: voters.where(origin: channel).pluck(:user_id)) + end + + %i[male female].each do |gender| + define_method :"total_#{gender}_#{channel}" do + send(:"#{channel}_participants").public_send(gender).count + end + + define_method :"#{gender}_#{channel}_percentage" do + calculate_percentage( + send(:"total_#{gender}_#{channel}"), + send(:"total_#{gender}_participants") + ) + end + end end def total_web_valid diff --git a/app/models/user.rb b/app/models/user.rb index 35bff958a..948cc4082 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -55,6 +55,8 @@ class User < ApplicationRecord scope :moderators, -> { joins(:moderator) } scope :organizations, -> { joins(:organization) } scope :officials, -> { where("official_level > 0") } + scope :male, -> { where(gender: "male") } + scope :female, -> { where(gender: "female") } scope :newsletter, -> { where(newsletter: true) } scope :for_render, -> { includes(:organization) } scope :by_document, ->(document_type, document_number) do diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 216a1a2e8..7fdbed498 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -14,6 +14,9 @@
    • <%= link_to t("stats.polls.by_channel"), "#stats_by_channel" %>
      • +
    • + <%= link_to t("stats.polls.by_gender_and_channel"), "#stats_by_gender_and_channel" %> +
    • <%= link_to t("stats.polls.vote_by_channel"), "#vote_stats_by_channel" %>
      • @@ -40,6 +43,34 @@ <% end %>
      +
      +

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

      + + + + + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <% end %> + + + + <% %i[male female].each do |gender| %> + + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <% end %> + + <% end %> + +
      <%= t("stats.polls.#{channel}") %>
      <%= t("stats.#{gender}") %> + <%= "#{@stats[:"total_#{gender}_#{channel}"]} + (#{number_to_stats_percentage(@stats[:"#{gender}_#{channel}_percentage"])})" %> +
      +
      +

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

      diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index c53acd9ec..03dd439bf 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -6,6 +6,8 @@ en: by_gender: "Participants by gender" by_age: "Participants by age" by_geozone: "Participants by district" + male: "Male" + female: "Female" men_percentage: "%{percentage} Men" women_percentage: "%{percentage} Women" age: "Age" @@ -16,7 +18,11 @@ en: geozone_participation: "% District population participation" polls: by_channel: "Participants by channel" + by_gender_and_channel: "Participants by gender and channel" vote_by_channel: "Vote type by channel" + web: "Web" + booth: "Booths" + mail: "Mail" web_percentage: "%{percentage} Web" booth_percentage: "%{percentage} Booths" mail_percentage: "%{percentage} Mail" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 026ae4f45..2b23b1619 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -8,6 +8,8 @@ es: by_geozone: "Participación por distritos" men_percentage: "%{percentage} Hombres" women_percentage: "%{percentage} Mujeres" + male: "Hombres" + female: "Mujeres" age: "Edad" age_more_than: "De %{start} y más años" age_range: "De %{start} a %{finish} años" @@ -16,7 +18,11 @@ es: geozone_participation: "% Partipación población del distrito" polls: by_channel: "Participación por medio" + by_gender_and_channel: "Participación por género y medio" vote_by_channel: "Votos emitidos por medio" + web: "Web" + booth: "Urnas" + mail: "Correo" web_percentage: "%{percentage} Web" booth_percentage: "%{percentage} Urnas" mail_percentage: "%{percentage} Correo" diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 2b2fe6c7b..3c3f6a434 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -182,6 +182,45 @@ describe Poll::Stats do expect(stats.participants_by_geozone["Midgar"][:percentage]).to eq(33.333) end + + describe "participants by gender and channel" do + before do + 4.times do + create :poll_voter, :from_web, poll: poll, + user: create(:user, :level_two, gender: "female") + end + + 3.times do + create :poll_voter, :from_web, poll: poll, + user: create(:user, :level_two, gender: "male") + end + + 2.times do + create :poll_voter, :from_booth, poll: poll, + user: create(:user, :level_two, gender: "female") + end + + 1.times do + create :poll_voter, :from_booth, poll: poll, + user: create(:user, :level_two, gender: "male") + end + end + + it "calculates total participants" do + expect(stats.total_female_web).to eq(4) + expect(stats.total_male_web).to eq(3) + expect(stats.total_female_booth).to eq(2) + expect(stats.total_male_booth).to eq(1) + end + + it "calculates percentage relative to the participants for that gender" do + expect(stats.female_web_percentage).to eq(66.667) + expect(stats.female_booth_percentage).to eq(33.333) + + expect(stats.male_web_percentage).to eq(75.0) + expect(stats.male_booth_percentage).to eq(25.0) + end + end end describe "#generate" do From 202fb440080c793e6d445ed1b7fec1300e39de04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 18:51:31 +0100 Subject: [PATCH 33/82] Add poll stats by age and channel --- app/models/concerns/statisticable.rb | 39 ++++++++++++++++++---------- app/models/poll/stats.rb | 9 ++++++- app/models/user.rb | 7 +++++ app/views/polls/stats.html.erb | 38 ++++++++++++++++++++++++++- config/locales/en/stats.yml | 1 + config/locales/es/stats.yml | 1 + spec/models/poll/stats_spec.rb | 39 ++++++++++++++++++++++++++++ 7 files changed, 118 insertions(+), 16 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index a47826aa3..3360dc047 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -33,20 +33,7 @@ module Statisticable end def participants_by_age - age_groups.map do |start, finish| - users = participants.where("date_of_birth > ? AND date_of_birth < ?", - finish.years.ago.beginning_of_year, - start.years.ago.end_of_year) - - [ - "#{start} - #{finish}", - { - range: range_description(start, finish), - count: users.count, - percentage: calculate_percentage(users.count, total_participants) - } - ] - end.to_h + participants_by_age_for(participants) end def participants_by_geozone @@ -92,6 +79,30 @@ module Statisticable ] end + def participants_by_age_for(users, relative_to: :participants) + age_groups.map do |start, finish| + group_count = users.between_ages(start, finish).count + total_count = if relative_to == :participants + total_participants + else + send(relative_to, start, finish).count + end + + [ + "#{start} - #{finish}", + { + range: range_description(start, finish), + count: group_count, + percentage: calculate_percentage(group_count, total_count) + } + ] + end.to_h + end + + def participants_between_ages(from, to) + participants.between_ages(from, to) + end + def calculate_percentage(fraction, total) return 0.0 if total.zero? diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index dda2f74c1..b9938df64 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -18,9 +18,11 @@ class Poll::Stats total_male_web total_male_booth total_male_mail total_female_web total_female_booth total_female_mail male_web_percentage male_booth_percentage male_mail_percentage - female_web_percentage female_booth_percentage female_mail_percentage] + female_web_percentage female_booth_percentage female_mail_percentage + web_participants_by_age booth_participants_by_age mail_participants_by_age] end + def total_participants total_participants_web + total_participants_booth end @@ -40,6 +42,11 @@ class Poll::Stats User.where(id: voters.where(origin: channel).pluck(:user_id)) end + define_method :"#{channel}_participants_by_age" do + participants_by_age_for(send(:"#{channel}_participants"), + relative_to: :participants_between_ages) + end + %i[male female].each do |gender| define_method :"total_#{gender}_#{channel}" do send(:"#{channel}_participants").public_send(gender).count diff --git a/app/models/user.rb b/app/models/user.rb index 948cc4082..3f67b4748 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -72,6 +72,13 @@ class User < ApplicationRecord string = "%#{search_string}%" where("username ILIKE ? OR email ILIKE ? OR document_number ILIKE ?", string, string, string) end + scope :between_ages, -> (from, to) do + where( + "date_of_birth > ? AND date_of_birth < ?", + to.years.ago.beginning_of_year, + from.years.ago.end_of_year + ) + end before_validation :clean_document_number diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 7fdbed498..f30dc7175 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -15,7 +15,10 @@ <%= link_to t("stats.polls.by_channel"), "#stats_by_channel" %>
    • - <%= link_to t("stats.polls.by_gender_and_channel"), "#stats_by_gender_and_channel" %> + <%= link_to t("stats.polls.by_gender_and_channel"), "#stats_by_gender_and_channel"%> +
      • +
    • + <%= link_to t("stats.polls.by_age_and_channel"), "#stats_by_age_and_channel" %>
    • <%= link_to t("stats.polls.vote_by_channel"), "#vote_stats_by_channel" %> @@ -71,6 +74,39 @@
      • +
      +

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

      + + + + + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <% end %> + + + + <% @stats[:participants_by_age].keys.each do |age_range| %> + + + + <% Poll::Stats::CHANNELS.each do |channel| %> + <% group = @stats[:"#{channel}_participants_by_age"][age_range] %> + + <% end %> + + <% end %> + +
      <%= t("stats.age") %><%= t("stats.polls.#{channel}") %>
      <%= @stats[:participants_by_age][age_range][:range] %> +
      + + +
      + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> +
      +
      +

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

      diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 03dd439bf..db3ce9f0e 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -19,6 +19,7 @@ en: polls: by_channel: "Participants by channel" by_gender_and_channel: "Participants by gender and channel" + by_age_and_channel: "Participants by age and channel" vote_by_channel: "Vote type by channel" web: "Web" booth: "Booths" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 2b23b1619..39cca0d47 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -19,6 +19,7 @@ es: polls: by_channel: "Participación por medio" by_gender_and_channel: "Participación por género y medio" + by_age_and_channel: "Participación por edad y medio" vote_by_channel: "Votos emitidos por medio" web: "Web" booth: "Urnas" diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 3c3f6a434..898ee4091 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -221,6 +221,45 @@ describe Poll::Stats do expect(stats.male_booth_percentage).to eq(25.0) end end + + describe "participants by age and channel" do + before do + 4.times do + create :poll_voter, :from_web, poll: poll, + user: create(:user, :level_two, date_of_birth: 37.years.ago) + end + + 3.times do + create :poll_voter, :from_web, poll: poll, + user: create(:user, :level_two, date_of_birth: 52.years.ago) + end + + 2.times do + create :poll_voter, :from_booth, poll: poll, + user: create(:user, :level_two, date_of_birth: 37.years.ago) + end + + 1.times do + create :poll_voter, :from_booth, poll: poll, + user: create(:user, :level_two, date_of_birth: 52.years.ago) + end + end + + it "calculates the count of users by channel and age" do + expect(stats.web_participants_by_age["35 - 39"][:count]).to eq(4) + expect(stats.web_participants_by_age["50 - 54"][:count]).to eq(3) + expect(stats.booth_participants_by_age["35 - 39"][:count]).to eq(2) + expect(stats.booth_participants_by_age["50 - 54"][:count]).to eq(1) + end + + it "calculates percentage relative to the participants for that age" do + expect(stats.web_participants_by_age["35 - 39"][:percentage]).to eq(66.667) + expect(stats.booth_participants_by_age["35 - 39"][:percentage]).to eq(33.333) + + expect(stats.web_participants_by_age["50 - 54"][:percentage]).to eq(75.0) + expect(stats.booth_participants_by_age["50 - 54"][:percentage]).to eq(25.0) + end + end end describe "#generate" do From 8f69113233815710c73bca953a195e1d8e06df70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 4 Jan 2019 19:34:58 +0100 Subject: [PATCH 34/82] Add poll stats by geozone and channel --- app/models/concerns/statisticable.rb | 6 +++- app/models/poll/stats.rb | 16 ++++++++++- app/views/polls/stats.html.erb | 38 ++++++++++++++++++++++++- config/locales/en/stats.yml | 1 + config/locales/es/stats.yml | 1 + spec/models/poll/stats_spec.rb | 42 ++++++++++++++++++++++++++++ 6 files changed, 101 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 3360dc047..5aa952bb4 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -37,7 +37,7 @@ module Statisticable end def participants_by_geozone - Geozone.all.order("name").map do |geozone| + geozones.map do |geozone| count = participants.where(geozone: geozone).count [ @@ -103,6 +103,10 @@ module Statisticable participants.between_ages(from, to) end + def geozones + Geozone.all.order("name") + end + def calculate_percentage(fraction, total) return 0.0 if total.zero? diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index b9938df64..c171d1900 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -19,7 +19,8 @@ class Poll::Stats total_female_web total_female_booth total_female_mail male_web_percentage male_booth_percentage male_mail_percentage female_web_percentage female_booth_percentage female_mail_percentage - web_participants_by_age booth_participants_by_age mail_participants_by_age] + web_participants_by_age booth_participants_by_age mail_participants_by_age + web_participants_by_geozone booth_participants_by_geozone mail_participants_by_geozone] end @@ -47,6 +48,19 @@ class Poll::Stats relative_to: :participants_between_ages) end + define_method :"#{channel}_participants_by_geozone" do + geozones.map do |geozone| + count = send(:"#{channel}_participants").where(geozone: geozone).count + [ + geozone.name, + { + count: count, + percentage: calculate_percentage(count, participants.where(geozone: geozone).count) + } + ] + end.to_h + end + %i[male female].each do |gender| define_method :"total_#{gender}_#{channel}" do send(:"#{channel}_participants").public_send(gender).count diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index f30dc7175..370ace908 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -15,11 +15,14 @@ <%= link_to t("stats.polls.by_channel"), "#stats_by_channel" %>
    • - <%= link_to t("stats.polls.by_gender_and_channel"), "#stats_by_gender_and_channel"%> + <%= link_to t("stats.polls.by_gender_and_channel"), "#stats_by_gender_and_channel" %>
    • <%= link_to t("stats.polls.by_age_and_channel"), "#stats_by_age_and_channel" %>
      • +
    • + <%= link_to t("stats.polls.by_geozone_and_channel"), "#stats_by_geozone_and_channel "%> +
    • <%= link_to t("stats.polls.vote_by_channel"), "#vote_stats_by_channel" %>
      • @@ -107,6 +110,39 @@
      +
      +

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

      + + + + + + <% Poll::Stats::CHANNELS.each do |channel| %> + + <% end %> + + + + <% @stats[:web_participants_by_geozone].keys.each do |name| %> + + + + <% Poll::Stats::CHANNELS.each do |channel| %> + <% group = @stats[:"#{channel}_participants_by_geozone"][name] %> + + <% end %> + + <% end %> + +
      <%= t("stats.geozone") %><%= t("stats.polls.#{channel}") %>
      <%= name %> +
      + + +
      + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> +
      +
      +

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

      diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index db3ce9f0e..577bf03b8 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -20,6 +20,7 @@ en: by_channel: "Participants by channel" by_gender_and_channel: "Participants by gender and channel" by_age_and_channel: "Participants by age and channel" + by_geozone_and_channel: "Participants by district and channel" vote_by_channel: "Vote type by channel" web: "Web" booth: "Booths" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 39cca0d47..d2d2a3e14 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -20,6 +20,7 @@ es: by_channel: "Participación por medio" by_gender_and_channel: "Participación por género y medio" by_age_and_channel: "Participación por edad y medio" + by_geozone_and_channel: "Participación por distrito y medio" vote_by_channel: "Votos emitidos por medio" web: "Web" booth: "Urnas" diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 898ee4091..3b064ccf4 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -260,6 +260,48 @@ describe Poll::Stats do expect(stats.booth_participants_by_age["50 - 54"][:percentage]).to eq(25.0) end end + + describe "participants by geozone and channel" do + before do + atlantis = create(:geozone, name: "Atlantis") + lemuria = create(:geozone, name: "Lemuria") + + 4.times do + create :poll_voter, :from_booth, poll: poll, + user: create(:user, :level_two, geozone: atlantis) + end + + 3.times do + create :poll_voter, :from_booth, poll: poll, + user: create(:user, :level_two, geozone: lemuria) + end + + 2.times do + create :poll_voter, :from_web, poll: poll, + user: create(:user, :level_two, geozone: atlantis) + end + + 1.times do + create :poll_voter, :from_web, poll: poll, + user: create(:user, :level_two, geozone: lemuria) + end + end + + it "calculates the count of users by channel and geozone" do + expect(stats.booth_participants_by_geozone["Atlantis"][:count]).to eq(4) + expect(stats.booth_participants_by_geozone["Lemuria"][:count]).to eq(3) + expect(stats.web_participants_by_geozone["Atlantis"][:count]).to eq(2) + expect(stats.web_participants_by_geozone["Lemuria"][:count]).to eq(1) + end + + it "calculates percentage relative to the participants for that geozone" do + expect(stats.booth_participants_by_geozone["Atlantis"][:percentage]).to eq(66.667) + expect(stats.web_participants_by_geozone["Atlantis"][:percentage]).to eq(33.333) + + expect(stats.booth_participants_by_geozone["Lemuria"][:percentage]).to eq(75.0) + expect(stats.web_participants_by_geozone["Lemuria"][:percentage]).to eq(25.0) + end + end end describe "#generate" do From b2ad1e796f64fc47df9c9ff493c27210725ddd55 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 1 Feb 2019 18:31:24 +0100 Subject: [PATCH 35/82] Replace images with transparent png --- app/assets/images/stats_booth.png | Bin 3082 -> 1701 bytes app/assets/images/stats_mail.png | Bin 2362 -> 1600 bytes app/assets/images/stats_users.png | Bin 3725 -> 1936 bytes app/assets/images/stats_web.png | Bin 2911 -> 1770 bytes app/assets/stylesheets/stats.scss | 2 ++ 5 files changed, 2 insertions(+) diff --git a/app/assets/images/stats_booth.png b/app/assets/images/stats_booth.png index 98d218b1ab60a2e006b9a2e25b5ea0df2fd8100b..3231a75c81fd898a630ba380c13bb19d1205d3f2 100644 GIT binary patch literal 1701 zcmaJ?X;2eq7~XKH9AOZTqDXgwQlR975V8;DOaiEp8S0=2 z6fNi|2$hN!E zYaMKt*#ZFIAP$FP$Ti6P&bJ}I(Bw@GxwsIaQX&>hC3J`e1%wJL1qH<_Bn^#05ryHa z4wOV#dMe|jgj5m<$uSiJG5av|Dx5@`LFh~!P1S*t3K)otUt%dXg+B7dj+U8>>4V-o%G6l4E zNl7K^KoO=vK`z6eE@%4&fIL2f&E*Gh{Cq$Ti|x;3@tJHtI*Sdl_z;T?&O9_SnnsZd z#lT@RvB;f(mQD~j#ANDpI)=`dfoam1Y(AgQWO0}r4xRL%YYl1w(bLsh_gMxQ)yg$W zoKRwF(9DRWVA+I#MrQi11Qq_CR;`_B6WK7P9>JMx2FqO1tfNHo|E?<4dv7ffgMP^O zKZ&(*1{`I^pjs?jBPR!!>TV8&Lm~}|5SS(o!?I?(xGo(dFl{=9gCdc+Ydp|Xg2 z^P$%?N+N;8YAu1N<)|1I&`2JJQmKIagnk@<4v)|F_2;tLq5J@@FDs14W&3eMVWE)c zJBx)edA15w6SG*w2dr>TtXU8$oQw>k8s$b*5vIXZ;B?`Ta_(GsbMnn#6?5kjFejEt zCc`w3_g~|lJt8$^Hs6bv+`N}RswOqBA;ql$Qs$F)##sytC&l&7ng4;&TSQ7Fidl+E7z?B{lawe$HscE_&eEZC!;Sn;t| zSe!dn^@12(IKW}Fev-p4FQvNX)~wvXThfmppHWk7?;LO%9$(+#DJ}NOxgQsu=xg-y zlE$BEU)qHq9lSZwP|*_gthhQm_F^w-s{3?y3FXnl3^igUU9CUEgzP+f(} z$?^HUz{0hi$&~$>#;OHtVjtNKDW*SJ``omy?L*RnRQuk%T{wo~{ zac}d>AqJ&NlzNiWGj)Z_Xk~i=Eh9~jfFjw+FY|7|U$kyR_vumbRe@fk!VJkGQSqU3AD|sZWtAY0wmz6mxxxVy9)oTy)%3Do@?D`t z#wg-ZU*#&t-AI8V{z*ihn7TTgt$$VdvryA z+%2lxlfVShY~9%P7vy~w0Zu`A_P6=5<4wu=iQW8#1uMeeG@LEbg@#kBgiEx&KjRMG zrw%qX-}f$C;Pj2Leq)mjrSYLbf3t4LaVoU literal 3082 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 literal 2362 zcmV-A3B~q_P)jk>HBo#`_@C8&g`@IT6?YaTfeoplygr0_eEN01?EQnAI;#L zGsXxZrfCvFEX!ILrECHnIOop6PsPuib4n?`lx3MQCP{I9B?ix*Fvd9NvMeVv__w04 z$1n_NFG-Sp17bE~zHPt~umKLSEX%L znu?;te90L5{P{Cu3@(QDcyI{0IT6lzPEJmGdOFm=a`8ev)*G@cLs!ePhKGk68X7)) z_`qi*H69RVaL!MhI8jzsmYJF9y!vl5gbjocO6kzh(18O748yS7Nhys9vw0Osl5|}! zDk{2s`7&_~u-^{C2q?-JYiMYI4b&!N29$xz^D0(H z`}g8K@&T&b9Wt*1s6-O>_Vy}@;;?tW&7hPThJoi$D5Pl`roeQPBq8Jgd?~QRG)+pW zq9~NoA3uIThj^AmWxcAZgb)}5C)(o&+N-K6Nm2?5yvya1WqE39N|Gc%C?O;sJpO(Q zbq&K%RW&UwO;it&5)jL>7-LBm*Z)Qg!>}wXEiH|6?(uk_Mq+QkP*qhq=efDLH8nNZ za#1J0}0(2`AX?_xqchn;B#92~tJZbx~F3*@|Cg ztXsG4)~#E4d3hwhE6A+WP`sg(j*gDj)YJrnLB<%c0*Ri2qQN<@sHix4^r+kIRum-? ziMU*@c<2&qhA1(NF<@&b6bb|aj~_n<-vm;rsyg2eX=`iqdcE)onTe5jWF!i3MIko~ zqo=0_UwS;AbLY<0*VhB@WLXwLg*A{ZmSs7kFb0THfM+`=!2FUVty#0?#ful)w{M35 z!C>(1+qb{eO$Mn%A^-UCqu=j8dGh4+^fc#OQItJ<_H=f3W@Tjo&PB0jjOn^A%QEbD z2wzoI1@|^h6U)Kp(9bkYx7%G>T6*Kgjr{z4(=;VXdiCm6MMXtNM+Zzwj8vj$;+!L) zpFDZu^?E;j`ea#_Wmzj%uI%pa_W68@qL`+Mc{NSbG!5M%s#QEQ1VW&a5?fCPlT6cW zX=yog=1h8ex@B34qFlLhrLwYeY-~)Z7ti6bW*}yCT?aG&_U+rwojV^sd?@y;rKP2@ zu~8I3fE&^Vuolk@fCQyfup`D8@LiVW_3PIU4i0YHwhe>F$H%Lxs#;oFD5VHmu~P}m zuy2o|D2PIMKM)Ai*4BRi{vBoB=kq;({(QxX6~GYFG&N1rbzM;u2LuzfAG}pj6j_!d zkqBeV@AqH4crhz03rhF*_wV1oe{gV+QW_42;k{%z6|vDidm>7b6p2KhJ$qJCQZh6& zgs98Q%e#O7{@%TNv9;lF*zIX9%d)KNx@nrrmoM+==%}u)_INy4=)#2y zRaI3J6BCh0gi`8uyDiItD;#n!mW&`Upp94(KaG!%@7uTU&Ye3j)$Mi%0)f`n)+I}p zcs!m+B;uUn_{uO0MNt5WTefVud-v|zwQJ$1U@%x(TH4y$3M2rg!+{7waEJtEh?4{q z2T|_~!@y1hvKkv34TN6+_({}(YX%+JDQ%JmSwr2q2cP)tBV#b z0`hisb#2|cb!21&*@Epy-eVsHsY_tSpPMJ@jv!Ik@4>;rva+(izCM6#etv#iTbtkS z2W=7Ut|AF5S zIeFyBk-EA%#FES9^85X_Z{N<&&PF;BLR>CaC=?P!lMuofD=#kxJixrs(b3}K;zy4j zVG9s!2!~`8`wKJdg;wM}5c%G{d*$WjV`F2`vY?=#v$J#a=FNl5_u>+0&3E?r6p`RAX1ii(Q7 zUa!zzlBAzMe|B_qG&MD$Xad;;mB!3)j`KOlEJ`Lb$lgF=Nu(png~-S^Z{8FZ7Cw0J zAQFiX+ldj-v$wamva<60`SXBLytg-!@U3AO|3QBz_kKEz;ERj~z_ACrrNn0W0`Vl#O3`K%pedGtAS z4A~SV#om5gx^&55U+e@?G#>WeQ!qlo=j}@VIcF5Z#UMbW-GBuV1eh$#hGDo|F5-BM zADbJ3;U>JPnQsv^UXrA6IPAbg$gB*P&z#c6+|;CA5EqJ~piyzqC&~SQmXt3Jb+cPpUG)+tD)KHWmL6|w` zeSLjBJw4%Y7&o+n?W89ASFc{}^?DaCUToJbff;tO>q?`K>tagbyb6x@K^f6kCv}Ah ziBUb3ddJfwp+sGp*#is@;*gWrt~lmc**Leel4SN^C|G30Rv0Fq#Z&xGP zphC$Lx{5Q_U!zm_R||zgc g=cN~tiqE0^3$$PkZYz&t&j0`b07*qoM6N<$f|e<95C8xG diff --git a/app/assets/images/stats_users.png b/app/assets/images/stats_users.png index 76bb80606f80bd5764f676f0a0b87f89e12203a1..d314a75876868aa78c6a0c7e0d7a05c9f60bb479 100644 GIT binary patch literal 1936 zcmaJ?dsGxv7+-+}LpDsnC*m+XOk;Lu_Pr|`!7k_qtHwjt6xrFCS=iX!8D|GsP!Tzy zB9I;+R*#sJXqiV0OS9C&N)kvuPWS+m0#qs=X$4A|QnLc)A0FqNnS1Ydzu)hBpDA6u za6Zp>x-W;r;b|9WlG!!d{f_r$zsg5fXm**##Os+9(!}JUG{K3*Nh1Mht!NgJOrUuF z%F_gk@Z4Zd)iZisk`g1WeAKPOcUUPF&6349C=|;f7{EwmnQbcY-mxYSFyksPU7~|^ zl$yvkFDRgil!Aq+SV0b^z`>Z;foO-4C9o0<3OKA5n_cNpflqjq?A|RFfWQ+KCPxL1 zIHlJu2Gk@?0200w!Vr-hkSX|xL?IW7qW~d{NCmJ$fQTU&QNju(i~yq#$XcUulQLP8 zFlviEslaT8p_BqaUS1wQPsAtbECHfWCPU3BgL~bWe$G_R&PKDHAwQN`UZTfz|4c>xs6VNhbbxRzWg-+6<6}I}!>bhuh)^nvMdGD01c_I~3FAa@a-mQiFP0-} z7#YKAZFUB=VZ@kiGi!Skt9T(+sip~(A?Z|-w2XDZ;%t&3?b##+sMYSO%YavPC}y^~ zg>&468i`v&(B@SHoyuBEuksRAz#VFoqB&R4fr;LQufEC~!B= zGtD$6Vms8meL5QK;puP@Hg=+Dc683ye{++a$U3biHr4UNo$VF5*I>V*fE7M%YzU=v~bN{lW7O&GbEZd3F95TjdWwnw9vb zL%Fl~Uii-59i=`GTp?Yat9x^5=3V7B!}!jg+xNl0ruH_q{Nd=n+P!Pp{CAI(_;9C& zW>L{6zfY^Jbp7G``<1hvo_D-nKSF8V?O#Qm;;iTnhh66;)`T^;w5Db^3?GPq)LoqG z^IG7e6;ZtQ&GL+8QK5BC>#qs)&BCS_*VHrq8`VGE=-?c02`65QaUC9rbb3EdAml}b zB?ufPZk-JsbGFq_&^r!#B&0vO-UiIztjLbOIZd=Kt?B4H+Y+4KUC`Hrq~_Fxq`o2T z**yUpL*(DP_WEMg57*YEcNF#A_{G~9D7(^}|EcQ!PoY%$`^S5aNs4a{1|*bzGPw|Z zHQ-XMjH=D@-n?~t!2KN(56okeC8Hs}uX|v}`iQIKx)gQL- z=}yAiM-@jJ!K(gY%-cdtxV6@s`vzaYuDc{|aeTj=3-L&#L`7{wtf3ctibq zEaQ@)FZLa%C#~j0YK+B0SA62ZD_cHoJJ_C;(){Cw+Hr{x`Wqhig|Rj?w^omm|h8 zMJ`7$_uumeCPYPK;*RJTB5qM^PsS!u=*p^|nS~xuFpLfC=R=I)Mp?b9shWr zy|u2ty>YO*YC*exciGl3Z%dKx-~2UYlYgoHEaSJN#Pq4vOZ}s<$=l9;VBI@QIJjY1 zGrj)vLzZt~y^qs*>rBC=$luEbhbp&=m$wIRd^~Qt;XHS*WkyLGU74G8va>z8bLcY9 zQ<;3BN389d@p8uxmD&p1+xL!F74*(o^0vBp(BR;@Uitd4<8jscySb+m!@Dm1tt-`j z=~ede8E6kQ?RG)t6z%PwTRc}A{MVdY(+RZfDavf%NJaTP%&UCa$y*c9_zwejEYFr4 zK9#{&&`^;Iv_1n4_<2G@d(G9^(E-YU3Ab8sZGa F{{dqE_74C6 literal 3725 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 diff --git a/app/assets/images/stats_web.png b/app/assets/images/stats_web.png index e16835b32419bfc64e7857a61e230ca167e73c09..787f226fb1ee2382ba0bd647500978793357e736 100644 GIT binary patch literal 1770 zcmaJ?do)ye9KU&OdazCpwCEb^wc9+I8FRzzjKPS(B9uI?nH#q;bH~iZ&}wZfc00@2 zI#J4Q6e_D!dTieG*lN9!N{X~SL?jY=tlc|8`$z3P=icA%_dVaw=llBn&i&Ef*K_fL z6$=0WSnMSf1Q4sU=AExce4)3umBeC-yNBX|*hV}FRw4jTf<+^smkf?U0uWe|9DfBN z5ZZQVP$(WM@`1#di~?(XC~BF4KoewKwE`AP5gd$0VodY4qF z$RBjWlnBVAu*hP%gA>T+Q0PpK6T@*8$e__#R2qj$cO=v35RC)T=-|vlBBCiJ8=(M! z$4o5Zoc-6;wKfrYULGQ6&0*SD9?iTZIQ8@ALg2 zu_`E8flvbw6_%hB6NB4mr3s~g+>{86W6B^5i<|ADe=LS$s#r_`y18k(#s=*~uo#tV zjP}zgkqGjVt8iE@M!Wic7cV z*i=r8Y3*>E?00?3z0!QWzhhE3eq^L!74S*#>WWr`TW~urBL8V(RccC}g+XSMZW?+` zmV30_%mfU3{y_iI58-?3_h?Oy$kX%_b*(BDoRnms4P9G*M&)F*l@Id5{&fekk43v|)5n+u@GHqRw3tkzVzZ37s;ZQO5XnhtNe*^P8KsCTEj)WIiyKOBJv}|pd!MehE!=bz7`rIEvd^8CI?zye zqv8D3#5jW&2~mL2cf0!{((bQ(8GkUlT5>Tc{y{^b^b2vZfk2tL0pAlON9;&au`h_=26;6ze*Y zva)2^;O@)KJl~c?O4I#R))`a2jYV$MA)3Vk{z!P9*R{W@c8+YRi|qAqUTUP%6LHNP zhVsp;{By7h{}9#hZFyuAedOvB`S?WdN%FGlV&IL(Xnf0Kn=y8n+WeJXkK%-3vN_tO z3J@lT@7T3sDBrIAo?)uC_uA1sZx50CQ8LruMjY@}ZHbnkD6=p)zE1e+$=Ao${|WbZ zN=o{Smwz4-(~x|1yIHiciR+l~?12Mqi8AL~fySJ&0$j&&E zH4wK7mL+)Cma>e^JlFh|ff=%6_pdAM^2=>JXI+$aBI0a~5x3+{#tZv?3+nT+H<|ZJpxoD|If~_U3VUMvd)o qi^1g@uImQ&LcbB6Y4IW7>Y4zp6~WQ0cB$qc26(yq3Xbukw*CvU(Y7`K literal 2911 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 diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 543c01433..9bab1d5c2 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -83,6 +83,7 @@ } .gender-and-channel { + thead, tbody { border: 0; @@ -128,6 +129,7 @@ } td { + &.gender { font-weight: bold; font-size: rem-calc(21); From cf32dcd6d5fa4d78c863a1146bd5c3c675a9e3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 11 Jan 2019 19:43:26 +0100 Subject: [PATCH 36/82] Use the new stats layout in budget stats So now stats by gender and age are replaced by shared participation stats (which also includes stats by district), reusing the code already used in poll stats, and advanced statistics (which used to be at the top of the page) are now displayed after partipation stats. --- app/assets/images/stats_investments.png | Bin 0 -> 3015 bytes app/assets/stylesheets/stats.scss | 4 + app/views/budgets/stats/show.html.erb | 281 +++++++++--------------- config/locales/en/budgets.yml | 12 - config/locales/en/stats.yml | 10 + config/locales/es/budgets.yml | 12 - config/locales/es/stats.yml | 10 + 7 files changed, 132 insertions(+), 197 deletions(-) create mode 100644 app/assets/images/stats_investments.png diff --git a/app/assets/images/stats_investments.png b/app/assets/images/stats_investments.png new file mode 100644 index 0000000000000000000000000000000000000000..951dfe3933507e08abb6c1cdae4270551783fbe8 GIT binary patch literal 3015 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
      -
      -
      -
      - <%= t("stats.total_participants") %> -

      - <%= @stats[:total_participants] %> -

      +
      +
      + <%= render "shared/stats/links" %> - <%= t("budgets.stats.total_budget_investments") %> -

      - <%= @stats[:total_budget_investments] %> -

      -
      +

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

      +
        +
      • + <%= link_to t("stats.budgets.total_investments"), "#total_investments"%> +
        • +
      • + <%= link_to t("stats.budgets.total_participants_support_phase"), "#stats_by_phase"%> +
        • +
      • + <%= link_to t("stats.budgets.by_heading"), "#stats_by_heading"%> +
        • +
      -
      -

      -   - - <%= t("budgets.stats.total_selected_investments") %>: - <%= @stats[:total_selected_investments] %>
      -       +

      + <%= render "shared/stats/participation", stats: @stats %> -   - - <%= t("budgets.stats.total_unfeasible_investments") %>: - <%= @stats[:total_unfeasible_investments] %>
      -       +
      +

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

      -
      +
      +

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

      -   - <%= t("budgets.stats.total_participants_support_phase") %>: - - <%= @stats[:total_participants_support_phase] %> <%= t("budgets.stats.participants") %>, - <%= @stats[:total_supports] %> <%= t("budgets.stats.supports") %>
      -       + <%= number_with_info_tags( + @stats[:total_budget_investments], + t("stats.budgets.total_investments"), + html_class: "total-investments" + ) %> -
      + <%= number_with_info_tags(@stats[:total_selected_investments], + t("stats.budgets.total_selected_investments")) %> -   - <%= t("budgets.stats.total_participants_web") %>: - - <%= @stats[:total_participants_web] %>
      -       + <%= number_with_info_tags(@stats[:total_unfeasible_investments], + t("stats.budgets.total_unfeasible_investments")) %> +
      -   - <%= t("budgets.stats.total_participants_booths") %>: - - <%= @stats[:total_participants_booths] %>
      -       -

      -
      -
      +
      +

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

      -
      -
      -

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

      -
      + <%= number_with_info_tags(@stats[:total_participants_support_phase], + t("stats.budgets.participants")) %> -
      - <%= image_tag ("budgets/stats/gender.png") %> -
      + <%= number_with_info_tags(@stats[:total_supports], t("stats.budgets.supports")) %> + <%= number_with_info_tags(@stats[:total_participants_web], + t("stats.budgets.total_participants_web")) %> + <%= number_with_info_tags(@stats[:total_participants_booths], + t("stats.budgets.total_participants_booths")) %> -
      -
      -

      - -  <%= t("budgets.stats.total_female_participants").upcase %> - (<%= number_to_stats_percentage(@stats[:female_percentage]) %>) -

      -

      - <%= @stats[:total_female_participants] %> -

      -
      +
      -
      -

      - -  <%= t("budgets.stats.total_male_participants").upcase %> - (<%= number_to_stats_percentage(@stats[:male_percentage]) %>) -

      -

      - <%= @stats[:total_male_participants] %> -

      -
      -
      -
      +
      +

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

      -
      -
      -

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

      + + + + + + + + + + + + + + + + + + + + + + + <% @headings.each do |heading| %> + + + -
      <%= t("budgets.stats.heading") %><%= t("budgets.stats.investments_sent_html") %><%= t("budgets.stats.participants_support_phase") %><%= t("budgets.stats.participants_voting_phase") %><%= t("budgets.stats.participants_total") %>
      <%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %><%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %><%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %>
      + <%= heading.name %> + + <%= @stats[:headings][heading.id][:total_investments_count] %> +
      - - - - - - - - <% @stats[:participants_by_age].values.each do |group| %> - - - - - <% end %> - -
      <%= t("budgets.stats.age").upcase %><%= t("budgets.stats.total").upcase %>
      <%= group[:range] %> - - <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> - -
      - - -
      -
      -
      -
      - -
      -
      -

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

      - - - - - - - - - - - - - - - - - - - - - - - - <% @headings.each do |heading| %> - - - - - <% ["support", "vote", "all"].each do |phase| %> - - - + <% ["support", "vote", "all"].each do |phase| %> + + + + <% end %> + <% end %> - - <% end %> - -
      <%= t("budgets.stats.heading") %><%= t("budgets.stats.investments_sent_html") %><%= t("budgets.stats.participants_support_phase") %><%= t("budgets.stats.participants_voting_phase") %><%= t("budgets.stats.participants_total") %>
      <%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %><%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %><%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %>
      - <%= 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]) %> - + <%= @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]) %> +
      -
      -
      + + +
      +
      -
      -
      -
      -

      - <%= t("budgets.stats.no_demographic_data", total: @stats[:total_unknown_gender_or_age]) %> -

      -

      - <%= t("budgets.stats.participatory_disclaimer") %> -

      -

      - <%= t("budgets.stats.heading_disclaimer") %> -

      +
      +
      +
      +

      + <%= t("budgets.stats.no_demographic_data", total: @stats[:total_unknown_gender_or_age]) %> +

      +

      + <%= t("budgets.stats.participatory_disclaimer") %> +

      +

      + <%= t("budgets.stats.heading_disclaimer") %> +

      +
      +
      -
      +
      <% end %> diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 4aa814def..6eab5a41c 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -194,19 +194,7 @@ en: stats: link: Stats page_title: "%{budget} - Participation stats" - total_budget_investments: Total Proposed Investments - total_selected_investments: Proposals on final phase - total_unfeasible_investments: Unfeasible proposals - total_participants_support_phase: Support phase - total_participants_web: Vote phase web participants - total_participants_booths: Vote phase booth participants - participants: Participants - supports: Supports - total_male_participants: Mens - total_female_participants: Women - age: Age total: Total - by_heading: "Participants by heading" heading: Heading investments_sent_html: "Investment proposals sent" participants_support_phase: Participants support phase diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 577bf03b8..3f876e48b 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -16,6 +16,16 @@ en: total: "Total" geozone: "District" geozone_participation: "% District population participation" + budgets: + total_investments: "Total proposed investments" + total_selected_investments: "Proposals on final phase" + total_unfeasible_investments: "Unfeasible proposals" + total_participants_support_phase: "Support phase" + total_participants_web: "Vote phase web participants" + total_participants_booths: "Vote phase booth participants" + participants: "Participants" + supports: "Supports" + by_heading: "Participants by heading" polls: by_channel: "Participants by channel" by_gender_and_channel: "Participants by gender and channel" diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 67599b725..bbcea750a 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -194,19 +194,7 @@ es: stats: link: Estadísticas page_title: "%{budget} - Estadísticas de participación" - total_budget_investments: Total propuestas enviadas - total_selected_investments: Propuestas en la fase final - total_unfeasible_investments: Propuestas inviables - total_participants_support_phase: Fase de apoyos - total_participants_web: Participantes web en votación final - total_participants_booths: Participantes en urnas votación final - participants: Participantes - supports: Apoyos total: Total - total_male_participants: Hombres - total_female_participants: Mujeres - age: Edad - by_heading: "Participación por distritos" heading: Distrito investments_sent_html: "Propuestas
      enviadas" participants_support_phase: Participación fase apoyos diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index d2d2a3e14..f76d35142 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -16,6 +16,16 @@ es: total: "Total" geozone: "Distrito" geozone_participation: "% Partipación población del distrito" + budgets: + total_investments: "Total propuestas enviadas" + total_selected_investments: "Propuestas en la fase final" + total_unfeasible_investments: "Propuestas inviables" + total_participants_support_phase: "Fase de apoyos" + total_participants_web: "Participantes web en votación final" + total_participants_booths: "Participantes en urnas votación final" + participants: "Participantes" + supports: "Apoyos" + by_heading: "Participación por distritos" polls: by_channel: "Participación por medio" by_gender_and_channel: "Participación por género y medio" From 6ad3bc063cd7cdaa386e4cb628e44bd8525e69dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 11 Jan 2019 19:58:03 +0100 Subject: [PATCH 37/82] Move budget stats translations to stats files We were using custom translations, but now this code is going to be included in the main CONSUL repository. --- app/views/budgets/executions/show.html.erb | 2 +- app/views/budgets/results/show.html.erb | 2 +- app/views/budgets/stats/show.html.erb | 38 +++++++++++----------- config/locales/en/budgets.yml | 14 -------- config/locales/en/stats.yml | 13 ++++++++ config/locales/es/budgets.yml | 14 -------- config/locales/es/stats.yml | 13 ++++++++ 7 files changed, 47 insertions(+), 49 deletions(-) diff --git a/app/views/budgets/executions/show.html.erb b/app/views/budgets/executions/show.html.erb index aa107e3b6..a0e3324bc 100644 --- a/app/views/budgets/executions/show.html.erb +++ b/app/views/budgets/executions/show.html.erb @@ -32,7 +32,7 @@ <%= link_to t("budgets.results.link"), budget_results_path(@budget) %>
    • - <%= link_to t("budgets.stats.link"), budget_stats_path(@budget) %> + <%= link_to t("stats.budgets.link"), budget_stats_path(@budget) %>
    • <%= link_to t("budgets.executions.link"), budget_executions_path(@budget), class: "is-active" %> diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb index 43e403090..58916ae95 100644 --- a/app/views/budgets/results/show.html.erb +++ b/app/views/budgets/results/show.html.erb @@ -32,7 +32,7 @@ <%= link_to t("budgets.results.link"), budget_results_path(@budget), class: "is-active" %>
    • - <%= link_to t("budgets.stats.link"), budget_stats_path(@budget) %> + <%= link_to t("stats.budgets.link"), budget_stats_path(@budget) %>
    • <%= link_to t("budgets.executions.link"), budget_executions_path(@budget) %> diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 6fe5153e3..0c55ae9b7 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -1,5 +1,5 @@ <% provide :title do %> - <%= t("budgets.stats.page_title", budget: @budget.name) %> + <%= t("stats.budgets.page_title", budget: @budget.name) %> <% end %> <% provide :social_media_meta_tags do %> <%= render "shared/social_media_meta_tags", @@ -30,7 +30,7 @@ <%= link_to t("budgets.results.link"), budget_results_path(@budget) %>
    • - <%= link_to t("budgets.stats.link"), budget_stats_path(@budget), class: "is-active" %> + <%= link_to t("stats.budgets.link"), budget_stats_path(@budget), class: "is-active" %>
    • <%= link_to t("budgets.executions.link"), budget_executions_path(@budget) %> @@ -99,22 +99,22 @@ - - - - - + + + + + - - - - - - - - - + + + + + + + + + @@ -153,13 +153,13 @@

      - <%= t("budgets.stats.no_demographic_data", total: @stats[:total_unknown_gender_or_age]) %> + <%= t("stats.budgets.no_demographic_data", total: @stats[:total_unknown_gender_or_age]) %>

      - <%= t("budgets.stats.participatory_disclaimer") %> + <%= t("stats.budgets.participatory_disclaimer") %>

      - <%= t("budgets.stats.heading_disclaimer") %> + <%= t("stats.budgets.heading_disclaimer") %>

      diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 6eab5a41c..d7bd7235d 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -191,17 +191,3 @@ en: dates_range_invalid: "Start date can't be equal or later than End date" prev_phase_dates_invalid: "Start date must be later than the start date of the previous enabled phase (%{phase_name})" next_phase_dates_invalid: "End date must be earlier than the end date of the next enabled phase (%{phase_name})" - stats: - link: Stats - page_title: "%{budget} - Participation stats" - total: Total - heading: Heading - investments_sent_html: "Investment proposals sent" - participants_support_phase: Participants support phase - participants_voting_phase: Participants voting phase - participants_total: Total Participants - percent_total_participants_html: "%
      Total
      Participants" - percent_heading_census_html: "%
      Heading
      Census" - no_demographic_data: "* There is no demographic data for %{total} participants." - participatory_disclaimer: "** The numbers of total participation refer to persons that created, supported or voted investment proposals." - heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on." diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 3f876e48b..9c92ebd10 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -17,6 +17,8 @@ en: geozone: "District" geozone_participation: "% District population participation" budgets: + link: "Stats" + page_title: "%{budget} - Participation stats" total_investments: "Total proposed investments" total_selected_investments: "Proposals on final phase" total_unfeasible_investments: "Unfeasible proposals" @@ -26,6 +28,17 @@ en: participants: "Participants" supports: "Supports" by_heading: "Participants by heading" + total: "Total" + heading: "Heading" + investments_sent_html: "Investment proposals sent" + participants_support_phase: "Participants support phase" + participants_voting_phase: "Participants voting phase" + participants_total: "Total Participants" + percent_total_participants_html: "%
      Total
      Participants" + percent_heading_census_html: "%
      Heading
      Census" + no_demographic_data: "* There is no demographic data for %{total} participants." + participatory_disclaimer: "** The numbers of total participation refer to persons that created, supported or voted investment proposals." + heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on." polls: by_channel: "Participants by channel" by_gender_and_channel: "Participants by gender and channel" diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index bbcea750a..982149b5a 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -191,17 +191,3 @@ es: dates_range_invalid: "La fecha de comienzo no puede ser igual o superior a la de finalización" prev_phase_dates_invalid: "La fecha de inicio debe ser posterior a la fecha de inicio de la anterior fase habilitada (%{phase_name})" next_phase_dates_invalid: "La fecha de fin debe ser anterior a la fecha de fin de la siguiente fase habilitada (%{phase_name})" - stats: - link: Estadísticas - page_title: "%{budget} - Estadísticas de participación" - total: Total - heading: Distrito - investments_sent_html: "Propuestas
      enviadas" - participants_support_phase: Participación fase apoyos - participants_voting_phase: Participación fase votación - participants_total: Participación total - percent_total_participants_html: "%
      Total
      Participantes" - percent_heading_census_html: "%
      Censo
      Distrito" - no_demographic_data: "* No se dispone de los datos demográficos de %{total} participantes." - participatory_disclaimer: "** Las cifras de participación total se refieren a personas que han creado, apoyado o votado propuestas." - heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado." diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index f76d35142..993db1fb9 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -17,6 +17,8 @@ es: geozone: "Distrito" geozone_participation: "% Partipación población del distrito" budgets: + link: "Estadísticas" + page_title: "%{budget} - Estadísticas de participación" total_investments: "Total propuestas enviadas" total_selected_investments: "Propuestas en la fase final" total_unfeasible_investments: "Propuestas inviables" @@ -26,6 +28,17 @@ es: participants: "Participantes" supports: "Apoyos" by_heading: "Participación por distritos" + total: "Total" + heading: "Distrito" + investments_sent_html: "Propuestas
      enviadas" + participants_support_phase: Participación fase apoyos + participants_voting_phase: Participación fase votación + participants_total: Participación total + percent_total_participants_html: "%
      Total
      Participantes" + percent_heading_census_html: "%
      Censo
      Distrito" + no_demographic_data: "* No se dispone de los datos demográficos de %{total} participantes." + participatory_disclaimer: "** Las cifras de participación total se refieren a personas que han creado, apoyado o votado propuestas." + heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado." polls: by_channel: "Participación por medio" by_gender_and_channel: "Participación por género y medio" From 2d7b8bc8df0b124567a9aa0e0e5fa1924b8a33a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 11 Jan 2019 20:14:37 +0100 Subject: [PATCH 38/82] Use new design for advanced budget stats --- app/views/budgets/stats/show.html.erb | 9 ++++----- config/locales/en/stats.yml | 10 +++++----- config/locales/es/stats.yml | 10 +++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 0c55ae9b7..c605ba4be 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -49,7 +49,7 @@ <%= link_to t("stats.budgets.total_investments"), "#total_investments"%>
    • - <%= link_to t("stats.budgets.total_participants_support_phase"), "#stats_by_phase"%> + <%= link_to t("stats.budgets.by_phase"), "#stats_by_phase"%>
    • <%= link_to t("stats.budgets.by_heading"), "#stats_by_heading"%> @@ -72,15 +72,14 @@ html_class: "total-investments" ) %> - <%= number_with_info_tags(@stats[:total_selected_investments], - t("stats.budgets.total_selected_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.total_participants_support_phase") %>

      +

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

      <%= number_with_info_tags(@stats[:total_participants_support_phase], t("stats.budgets.participants")) %> diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 9c92ebd10..68bb5144c 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -19,15 +19,15 @@ en: budgets: link: "Stats" page_title: "%{budget} - Participation stats" - total_investments: "Total proposed investments" - total_selected_investments: "Proposals on final phase" - total_unfeasible_investments: "Unfeasible proposals" - total_participants_support_phase: "Support phase" + total_investments: "Total investment projects" + total_selected_investments: "Projects in final voting phase" + total_unfeasible_investments: "Unfeasible projects" + by_phase: "Participants by phase" total_participants_web: "Vote phase web participants" total_participants_booths: "Vote phase booth participants" participants: "Participants" supports: "Supports" - by_heading: "Participants by heading" + by_heading: "Participants by phase and heading" total: "Total" heading: "Heading" investments_sent_html: "Investment proposals sent" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 993db1fb9..b42af056f 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -19,15 +19,15 @@ es: budgets: link: "Estadísticas" page_title: "%{budget} - Estadísticas de participación" - total_investments: "Total propuestas enviadas" - total_selected_investments: "Propuestas en la fase final" - total_unfeasible_investments: "Propuestas inviables" - total_participants_support_phase: "Fase de apoyos" + total_investments: "Total proyectos de gasto" + total_selected_investments: "Proyectos en la fase final" + total_unfeasible_investments: "Proyectos inviables" + by_phase: "Participación por fases" total_participants_web: "Participantes web en votación final" total_participants_booths: "Participantes en urnas votación final" participants: "Participantes" supports: "Apoyos" - by_heading: "Participación por distritos" + by_heading: "Participación por distritos y fase" total: "Total" heading: "Distrito" investments_sent_html: "Propuestas
      enviadas" From 6410d4c3e5d3efb1e8e4b1c18aec0a857317cfcb Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 11 Feb 2019 15:18:21 +0100 Subject: [PATCH 39/82] Replace data equalizer with css Data equalizer was used to show a border to separate sidebar from the content. Now is the same with only css avoiding use js. --- app/assets/stylesheets/participation.scss | 7 ------- app/assets/stylesheets/stats.scss | 14 +++++++++++++- app/views/budgets/stats/show.html.erb | 8 ++++---- app/views/polls/stats.html.erb | 6 +++--- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index ad447f909..a9b4aca69 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1988,13 +1988,6 @@ .polls-results-stats { .sidebar { - border-bottom: 1px solid $border; - margin-bottom: $line-height; - - @include breakpoint(medium) { - border-bottom: 0; - border-right: 1px solid $border; - } .menu:not(.vertical) { padding: 0; diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 34de4361b..1878f2ed5 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -1,7 +1,19 @@ .participation-stats { + @include breakpoint(medium) { + + .stats-content { + border-left: 1px solid $border; + } + } + .sidebar { - border-right: 1px solid $border; + border-bottom: 1px solid $border; + margin-bottom: $line-height; + + @include breakpoint(medium) { + border-bottom: 0; + } ul { margin-left: $line-height / 2; diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index c605ba4be..34f0f2c75 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -39,8 +39,8 @@
      -
      -
      +
      +
      <%= render "shared/stats/links" %>

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

      @@ -57,7 +57,7 @@
      -
      +
      <%= render "shared/stats/participation", stats: @stats %>
      @@ -164,6 +164,6 @@
      -
      + <% end %> diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 370ace908..37d878c0b 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -5,8 +5,8 @@ <%= render "poll_subnav" %> -
      -
      +
      +
      <%= render "shared/stats/links" %>

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

      @@ -29,7 +29,7 @@
      -
      +
      <%= render "shared/stats/participation", stats: @stats %>
      From bc056d907e7346a89fc68c2e2ec44d97e7e643e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 15 Mar 2019 08:41:21 +0100 Subject: [PATCH 40/82] Add missing translation --- config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 49a74c6e6..91296ea5e 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -657,6 +657,7 @@ en: total_votes: "Total amount of given votes" votes: "VOTES" web: "WEB" + mail: "MAIL" booth: "BOOTH" total: "TOTAL" valid: "Valid" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 377768318..45833ed45 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -658,6 +658,7 @@ es: votes: "VOTOS" web: "WEB" booth: "URNAS" + mail: "CORREO" total: "TOTAL" valid: "Válidos" white: "En blanco" From 7362b8233a0fa221bc5367798a6099838baf50a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 27 Feb 2019 18:09:45 +0100 Subject: [PATCH 41/82] Remove unrelated text The number refers to the total number of participants, and not the total number of votes. --- app/views/shared/stats/_participation.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb index ed9119f2a..eec1b6ba7 100644 --- a/app/views/shared/stats/_participation.html.erb +++ b/app/views/shared/stats/_participation.html.erb @@ -6,7 +6,7 @@ <%= number_with_info_tags( stats[:total_participants], - t("polls.show.stats.total_votes"), + "", html_class: "participants total-participants" ) %>
      From 20b1085dc8c7bcae28750480fd07407f66ad02a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 26 Mar 2019 19:53:28 +0100 Subject: [PATCH 42/82] Simplify budget stats data generation Configuring associations in the factories makes it easier to generate headings, polls and ballots in the tests. --- spec/factories/budgets.rb | 13 ++++++++++--- spec/factories/polls.rb | 5 ++++- spec/models/budget/stats_spec.rb | 18 ++++++------------ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/spec/factories/budgets.rb b/spec/factories/budgets.rb index b53bd8b56..9e1710cf4 100644 --- a/spec/factories/budgets.rb +++ b/spec/factories/budgets.rb @@ -74,13 +74,15 @@ FactoryBot.define do end factory :budget_heading, class: "Budget::Heading" do - association :group, factory: :budget_group sequence(:name) { |n| "Heading #{n}" } price 1000000 population 1234 latitude "40.416775" longitude "-3.703790" + transient { budget nil } + group { association :budget_group, budget: budget || association(:budget) } + trait :drafting_budget do association :group, factory: [:budget_group, :drafting_budget] end @@ -88,7 +90,7 @@ FactoryBot.define do factory :budget_investment, class: "Budget::Investment" do sequence(:title) { |n| "Budget Investment #{n} title" } - association :heading, factory: :budget_heading + heading { association :budget_heading, budget: budget } association :author, factory: :user description "Spend money on this" price 10 @@ -189,8 +191,13 @@ FactoryBot.define do end factory :budget_ballot_line, class: "Budget::Ballot::Line" do - association :ballot, factory: :budget_ballot association :investment, factory: :budget_investment + + transient { user nil } + + ballot do + association :budget_ballot, budget: investment.budget, user: user || association(:user) + end end factory :budget_reclassified_vote, class: "Budget::ReclassifiedVote" do diff --git a/spec/factories/polls.rb b/spec/factories/polls.rb index 5a23e2630..b7a532d82 100644 --- a/spec/factories/polls.rb +++ b/spec/factories/polls.rb @@ -88,10 +88,13 @@ FactoryBot.define do end factory :poll_voter, class: "Poll::Voter" do - poll association :user, :level_two from_web + transient { budget nil } + + poll { budget&.poll || association(:poll, budget: budget) } + trait :from_web do origin "web" token SecureRandom.hex(32) diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 231c90675..247c0c40b 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -4,8 +4,7 @@ describe Budget::Stats do before do @budget = create(:budget) - @group = create(:budget_group, budget: @budget) - @heading = create(:budget_heading, group: @group, price: 1000) + @heading = create(:budget_heading, budget: @budget, price: 1000) @investment1 = create(:budget_investment, :selected, author: create(:user, gender: "female"), heading: @heading, price: 200, ballot_lines_count: 900, winner: true) @@ -22,20 +21,15 @@ describe Budget::Stats do @support1 = create(:vote, votable: @investment1, voter: create(:user, gender: "male")) @support2 = create(:vote, votable: @investment2, voter: create(:user)) - @budget_ballot1 = create(:budget_ballot, budget: @budget, user: create(:user, gender: "female", - date_of_birth: 54.years.ago)) - @budget_ballot2 = create(:budget_ballot, budget: @budget, user: create(:user, gender: "female")) - @budget_ballot3 = create(:budget_ballot, budget: @budget, user: create(:user, gender: "male")) - - @budget_ballot_line1 = create(:budget_ballot_line, ballot: @budget_ballot1, + @budget_ballot_line1 = create(:budget_ballot_line, + user: create(:user, gender: "female", date_of_birth: 54.years.ago), investment: @investment1) - @budget_ballot_line2 = create(:budget_ballot_line, ballot: @budget_ballot2, + @budget_ballot_line2 = create(:budget_ballot_line, user: create(:user, gender: "female"), investment: @investment2) - @budget_ballot_line3 = create(:budget_ballot_line, ballot: @budget_ballot3, + @budget_ballot_line3 = create(:budget_ballot_line, user: create(:user, gender: "male"), investment: @investment3) - @poll = create(:poll, budget: @budget) - @poll_voter = create(:poll_voter, :from_booth, poll: @poll) + @poll_voter = create(:poll_voter, :from_booth, budget: @budget) @budget_ballot4 = create(:budget_ballot, budget: @budget, physical: true, user: nil) @budget_ballot_line4 = create(:budget_ballot_line, ballot: @budget_ballot4, From 0a578f2775e18bb704eea453edf05e0fc92c50ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 26 Mar 2019 20:21:32 +0100 Subject: [PATCH 43/82] Create less records in budget stats specs Creating only the necessary data for each test makes tests easier to read. It also makes tests slightly faster. --- app/models/budget/stats.rb | 8 +- spec/factories/budgets.rb | 2 +- spec/models/budget/stats_spec.rb | 287 ++++++++++++++++--------------- 3 files changed, 158 insertions(+), 139 deletions(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 24ba6fafc..541c56c3b 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -10,6 +10,10 @@ class Budget::Stats total_participants_web total_participants_booths] end + def participants + User.where(id: (authors + voters + balloters + poll_ballot_voters).uniq.compact) + end + private def total_participants @@ -52,10 +56,6 @@ class Budget::Stats supports(budget).count end - def participants - User.where(id: (authors + voters + balloters + poll_ballot_voters).uniq.compact) - end - def authors budget.investments.pluck(:author_id) end diff --git a/spec/factories/budgets.rb b/spec/factories/budgets.rb index 9e1710cf4..0d9faa1ee 100644 --- a/spec/factories/budgets.rb +++ b/spec/factories/budgets.rb @@ -196,7 +196,7 @@ FactoryBot.define do transient { user nil } ballot do - association :budget_ballot, budget: investment.budget, user: user || association(:user) + association :budget_ballot, budget: investment.budget.reload, user: user || association(:user) end end diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 247c0c40b..99044648c 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -1,206 +1,225 @@ require "rails_helper" describe Budget::Stats do + let(:budget) { create(:budget) } + let(:stats) { Budget::Stats.new(budget) } + let(:investment) { create(:budget_investment, :selected, budget: budget) } - before do - @budget = create(:budget) - @heading = create(:budget_heading, budget: @budget, price: 1000) + describe "#participants" do + let(:author) { investment.author } + let(:author_and_voter) { create(:user) } + let(:voter) { create(:user) } + let(:voter_and_balloter) { create(:user) } + let(:balloter) { create(:user) } + let(:poll_balloter) { create(:user, :level_two) } + let(:non_participant) { create(:user, :level_two) } - @investment1 = create(:budget_investment, :selected, author: create(:user, gender: "female"), - heading: @heading, price: 200, ballot_lines_count: 900, winner: true) - @investment2 = create(:budget_investment, :selected, author: create(:user, gender: "female"), - heading: @heading, price: 300, ballot_lines_count: 800, winner: true) - @investment3 = create(:budget_investment, :selected, author: create(:user, gender: "female", - date_of_birth: 40.years.ago), heading: @heading, price: 400, - ballot_lines_count: 880, winner: true) - @investment4 = create(:budget_investment, :selected, author: create(:user, gender: "male"), - heading: @heading, price: 100, ballot_lines_count: 915, winner: true) - @investment5 = create(:budget_investment, :unfeasible, author: create(:user, gender: "male", - date_of_birth: 25.years.ago), heading: @heading) + before do + create(:budget_investment, :selected, budget: budget, author: author_and_voter) - @support1 = create(:vote, votable: @investment1, voter: create(:user, gender: "male")) - @support2 = create(:vote, votable: @investment2, voter: create(:user)) + create(:vote, votable: investment, voter: author_and_voter) + create(:vote, votable: investment, voter: voter) + create(:vote, votable: investment, voter: voter_and_balloter) - @budget_ballot_line1 = create(:budget_ballot_line, - user: create(:user, gender: "female", date_of_birth: 54.years.ago), - investment: @investment1) - @budget_ballot_line2 = create(:budget_ballot_line, user: create(:user, gender: "female"), - investment: @investment2) - @budget_ballot_line3 = create(:budget_ballot_line, user: create(:user, gender: "male"), - investment: @investment3) + create(:budget_ballot_line, investment: investment, user: balloter) + create(:budget_ballot_line, investment: investment, user: voter_and_balloter) - @poll_voter = create(:poll_voter, :from_booth, budget: @budget) + create(:poll_voter, :from_booth, user: poll_balloter, budget: budget) - @budget_ballot4 = create(:budget_ballot, budget: @budget, physical: true, user: nil) - @budget_ballot_line4 = create(:budget_ballot_line, ballot: @budget_ballot4, - investment: @investment4) - end - - let(:stats) { Budget::Stats.new(@budget).generate } - - context "#total_participants" do - - it "returns the number of total participants" do - expect(stats[:total_participants]).to be 11 + create(:poll_voter, :from_booth, user: non_participant, budget: create(:budget)) end + it "returns unique participants, including authors" do + expect(stats.participants).to match_array( + [author, author_and_voter, voter, voter_and_balloter, balloter, poll_balloter] + ) + expect(stats.generate[:total_participants]).to be 6 + end end - context "#total_participants_support_phase" do - + describe "#total_participants_support_phase" do it "returns the number of total participants in the support phase" do - expect(stats[:total_participants_support_phase]).to be 2 + 2.times { create(:vote, votable: investment) } + create(:budget_ballot_line, investment: investment) + + expect(stats.generate[:total_participants_support_phase]).to be 2 end + it "counts a user who is voter and balloter" do + voter_and_balloter = create(:user) + create(:vote, votable: investment, voter: voter_and_balloter) + create(:budget_ballot_line, investment: investment, user: voter_and_balloter) + + expect(stats.generate[:total_participants_support_phase]).to be 1 + end end - context "#total_participants_vote_phase" do - + describe "#total_participants_vote_phase" do it "returns the number of total participants in the votes phase" do - expect(stats[:total_participants_vote_phase]).to be 4 + 2.times { create(:budget_ballot_line, investment: investment) } + create(:vote, votable: investment) + + expect(stats.generate[:total_participants_vote_phase]).to be 2 end + it "counts a user who is voter and balloter" do + voter_and_balloter = create(:user) + create(:vote, votable: investment, voter: voter_and_balloter) + create(:budget_ballot_line, investment: investment, user: voter_and_balloter) + + expect(stats.generate[:total_participants_vote_phase]).to be 1 + end end - context "#total_participants_web" do - + describe "#total_participants_web" do it "returns the number of total participants in the votes phase via web" do - expect(stats[:total_participants_web]).to be 3 - end + 2.times { create(:budget_ballot_line, investment: investment) } + create(:poll_voter, :from_booth, budget: budget) + expect(stats.generate[:total_participants_web]).to be 2 + end end - context "#total_participants_booths" do - + describe "#total_participants_booths" do it "returns the number of total participants in the votes phase in booths" do - expect(stats[:total_participants_booths]).to be 1 - end + 2.times { create(:poll_voter, :from_booth, budget: budget) } + create(:budget_ballot_line, investment: investment) + expect(stats.generate[:total_participants_booths]).to be 2 + end end - context "#total_budget_investments" do - + describe "#total_budget_investments" do it "returns the number of total budget investments" do - expect(stats[:total_budget_investments]).to be 5 - end + 2.times { create(:budget_investment, budget: budget) } + create(:budget_investment, budget: create(:budget)) + expect(stats.generate[:total_budget_investments]).to be 2 + end end - context "#total_votes" do - + describe "#total_votes" do it "returns the number of total votes" do - expect(stats[:total_votes]).to be 4 - end + create(:budget_ballot_line, investment: investment) + create(:budget_ballot_line, investment: create(:budget_investment, :selected, budget: budget)) + expect(stats.generate[:total_votes]).to be 2 + end end - context "#total_selected_investments" do - + describe "#total_selected_investments" do it "returns the number of total selected investments" do - expect(stats[:total_selected_investments]).to be 4 - end + 3.times { create(:budget_investment, :selected, budget: budget) } + create(:budget_investment, :selected, budget: create(:budget)) + create(:budget_investment, :unfeasible, budget: budget) + expect(stats.generate[:total_selected_investments]).to be 3 + end end - context "#total_unfeasible_investments" do - + describe "#total_unfeasible_investments" do it "returns the number of total unfeasible investments" do - expect(stats[:total_unfeasible_investments]).to be 1 - end + 3.times { create(:budget_investment, :unfeasible, budget: budget) } + create(:budget_investment, :unfeasible, budget: create(:budget)) + create(:budget_investment, :selected, budget: budget) + expect(stats.generate[:total_unfeasible_investments]).to be 3 + end end - context "#total_male_participants" do - - it "returns the number of total male participants" do - expect(stats[:total_male_participants]).to be 4 - end - - end - - context "#total_female_participants" do - - it "returns the number of total female participants" do - expect(stats[:total_female_participants]).to be 6 - end - - end - - context "#total_supports" do - + describe "#total_supports" do it "returns the number of total supports" do - expect(stats[:total_supports]).to be 2 - end + 2.times { create(:vote, votable: investment) } + expect(stats.generate[:total_supports]).to be 2 + end end - context "#total_unknown_gender_or_age" do + describe "Participants by gender" do + before do + 3.times { create(:user, gender: "male") } + 2.times { create(:user, gender: "female") } + create(:user, gender: nil) - it "returns the number of total unknown participants' gender or age" do - expect(stats[:total_unknown_gender_or_age]).to be 1 + allow(stats).to receive(:participants).and_return(User.all) end + describe "#total_male_participants" do + it "returns the number of total male participants" do + expect(stats.generate[:total_male_participants]).to be 3 + end + end + + describe "#total_female_participants" do + it "returns the number of total female participants" do + expect(stats.generate[:total_female_participants]).to be 2 + end + end + + describe "#total_unknown_gender_or_age" do + it "returns the number of total unknown participants' gender or age" do + expect(stats.generate[:total_unknown_gender_or_age]).to be 1 + end + end + + describe "#male_percentage" do + it "returns the percentage of male participants" do + expect(stats.generate[:male_percentage]).to be 60.0 + end + end + + describe "#female_percentage" do + it "returns the percentage of female participants" do + expect(stats.generate[:female_percentage]).to be 40.0 + end + end end - context "#participants_by_age" do + describe "#participants_by_age" do + before do + [21, 22, 23, 23, 34, 42, 43, 44, 50, 51].each do |age| + create(:user, date_of_birth: age.years.ago) + end + + allow(stats).to receive(:participants).and_return(User.all) + end it "returns the age groups hash" do - expect(stats[:participants_by_age]["16 - 19"][:count]).to be 0 - expect(stats[:participants_by_age]["20 - 24"][:count]).to be 7 - expect(stats[:participants_by_age]["25 - 29"][:count]).to be 1 - expect(stats[:participants_by_age]["30 - 34"][:count]).to be 0 - expect(stats[:participants_by_age]["35 - 39"][:count]).to be 1 - expect(stats[:participants_by_age]["40 - 44"][:count]).to be 1 - expect(stats[:participants_by_age]["45 - 49"][:count]).to be 0 - expect(stats[:participants_by_age]["50 - 54"][:count]).to be 1 - expect(stats[:participants_by_age]["55 - 59"][:count]).to be 0 - expect(stats[:participants_by_age]["60 - 64"][:count]).to be 0 - expect(stats[:participants_by_age]["65 - 69"][:count]).to be 0 - expect(stats[:participants_by_age]["70 - 74"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["16 - 19"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["20 - 24"][:count]).to be 4 + expect(stats.generate[:participants_by_age]["25 - 29"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["30 - 34"][:count]).to be 1 + expect(stats.generate[:participants_by_age]["35 - 39"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["40 - 44"][:count]).to be 3 + expect(stats.generate[:participants_by_age]["45 - 49"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["50 - 54"][:count]).to be 2 + expect(stats.generate[:participants_by_age]["55 - 59"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["60 - 64"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["65 - 69"][:count]).to be 0 + expect(stats.generate[:participants_by_age]["70 - 74"][:count]).to be 0 end - end - context "#male_percentage" do - - it "returns the percentage of male participants" do - expect(stats[:male_percentage]).to be 40.0 + describe "#headings" do + before do + investment.heading.update_column(:population, 1234) + create(:budget_investment, heading: investment.heading) + 2.times { create(:vote, votable: investment) } + create(:budget_ballot_line, investment: investment) end - end - - context "#female_percentage" do - - it "returns the percentage of female participants" do - expect(stats[:female_percentage]).to be 60.0 - end - - end - - context "#headings" do - it "returns headings data" do - heading_stats = stats[:headings][@heading.id] - expect(heading_stats[:total_investments_count]).to be 5 + heading_stats = stats.generate[:headings][investment.heading.id] + expect(heading_stats[:total_investments_count]).to be 2 expect(heading_stats[:total_participants_support_phase]).to be 2 - expect(heading_stats[:total_participants_vote_phase]).to be 4 - expect(heading_stats[:total_participants_all_phase]).to be 6 + expect(heading_stats[:total_participants_vote_phase]).to be 1 + expect(heading_stats[:total_participants_all_phase]).to be 3 expect(heading_stats[:percentage_participants_support_phase]).to be 100.0 expect(heading_stats[:percentage_district_population_support_phase]).to be 0.162 expect(heading_stats[:percentage_participants_vote_phase]).to be 100.0 - expect(heading_stats[:percentage_district_population_vote_phase]).to be 0.324 - expect(heading_stats[:percentage_participants_all_phase]).to be 100.0 - expect(heading_stats[:percentage_district_population_all_phase]).to be 0.486 - - expect(heading_stats[:total_investments_count]).to be 5 - expect(heading_stats[:total_participants_support_phase]).to be 2 - expect(heading_stats[:total_participants_vote_phase]).to be 4 - expect(heading_stats[:total_participants_all_phase]).to be 6 - expect(heading_stats[:percentage_participants_support_phase]).to be 100.0 - expect(heading_stats[:percentage_participants_vote_phase]).to be 100.0 + expect(heading_stats[:percentage_district_population_vote_phase]).to be 0.081 expect(heading_stats[:percentage_participants_all_phase]).to be 100.0 + expect(heading_stats[:percentage_district_population_all_phase]).to be 0.243 end - end - end From cf32cc940b16a937af4b8cf67071ab1c1007d06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 26 Mar 2019 20:34:03 +0100 Subject: [PATCH 44/82] Exclude nil balloters from vote phase participants The `user_id` can be `nil` for ballots. --- app/models/budget/stats.rb | 2 +- spec/models/budget/stats_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 541c56c3b..7b2e91e74 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -65,7 +65,7 @@ class Budget::Stats end def balloters - budget.ballots.where("ballot_lines_count > ?", 0).pluck(:user_id) + budget.ballots.where("ballot_lines_count > ?", 0).pluck(:user_id).compact end def poll_ballot_voters diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 99044648c..8eb18ae14 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -69,6 +69,14 @@ describe Budget::Stats do expect(stats.generate[:total_participants_vote_phase]).to be 1 end + + it "doesn't count nil user ids" do + create(:budget_ballot_line, investment: investment, + ballot: create(:budget_ballot, budget: budget, user: nil, physical: true) + ) + + expect(stats.generate[:total_participants_vote_phase]).to be 0 + end end describe "#total_participants_web" do From d42454a1a8bc4c839a9befff99a47dabf0af4912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 26 Mar 2019 20:36:12 +0100 Subject: [PATCH 45/82] Include booth users in participants in vote phase We were expecting `balloters` to include `poll_ballot_voters` (that's why we're substracting them to calculate web participants), but reality has proven `poll_ballot_voters` aren't included in `balloters`. --- app/models/budget/stats.rb | 2 +- spec/models/budget/stats_spec.rb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 7b2e91e74..3f834fe5b 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -33,7 +33,7 @@ class Budget::Stats end def total_participants_vote_phase - balloters.uniq.count + (balloters + poll_ballot_voters).uniq.count end def total_budget_investments diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 8eb18ae14..6868434b1 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -70,6 +70,21 @@ describe Budget::Stats do expect(stats.generate[:total_participants_vote_phase]).to be 1 end + it "includes balloters and poll balloters" do + create(:budget_ballot_line, investment: investment) + create(:poll_voter, :from_booth, budget: budget) + + expect(stats.generate[:total_participants_vote_phase]).to be 2 + end + + it "counts once a user who is balloter and poll balloter" do + poller_and_balloter = create(:user, :level_two) + create(:budget_ballot_line, investment: investment, user: poller_and_balloter) + create(:poll_voter, :from_booth, user: poller_and_balloter, budget: budget) + + expect(stats.generate[:total_participants_vote_phase]).to be 1 + end + it "doesn't count nil user ids" do create(:budget_ballot_line, investment: investment, ballot: create(:budget_ballot, budget: budget, user: nil, physical: true) From dc077bb03ca02c48d0f2bbe19c644406478bc6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 15 Mar 2019 07:59:18 +0100 Subject: [PATCH 46/82] Simplify budget stats in voting phase So we only show the total number of participants, and not divided by web participants and booth participants. --- app/models/budget/stats.rb | 15 +-------------- app/views/budgets/stats/show.html.erb | 10 +++------- config/locales/en/stats.yml | 4 ---- config/locales/es/stats.yml | 4 ---- spec/models/budget/stats_spec.rb | 26 -------------------------- 5 files changed, 4 insertions(+), 55 deletions(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 3f834fe5b..e063756c4 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -6,8 +6,7 @@ class Budget::Stats super + %i[total_participants_support_phase total_participants_vote_phase total_budget_investments total_votes total_selected_investments - total_unfeasible_investments total_supports headings - total_participants_web total_participants_booths] + total_unfeasible_investments headings] end def participants @@ -24,14 +23,6 @@ class Budget::Stats voters.uniq.count end - def total_participants_web - (balloters - poll_ballot_voters).uniq.compact.count - end - - def total_participants_booths - poll_ballot_voters.uniq.count - end - def total_participants_vote_phase (balloters + poll_ballot_voters).uniq.count end @@ -52,10 +43,6 @@ class Budget::Stats budget.investments.unfeasible.count end - def total_supports - supports(budget).count - end - def authors budget.investments.pluck(:author_id) end diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 34f0f2c75..d4064ab90 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -82,13 +82,9 @@

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

      <%= number_with_info_tags(@stats[:total_participants_support_phase], - t("stats.budgets.participants")) %> - - <%= number_with_info_tags(@stats[:total_supports], t("stats.budgets.supports")) %> - <%= number_with_info_tags(@stats[:total_participants_web], - t("stats.budgets.total_participants_web")) %> - <%= number_with_info_tags(@stats[:total_participants_booths], - t("stats.budgets.total_participants_booths")) %> + t("stats.budgets.participants_support_phase")) %> + <%= number_with_info_tags(@stats[:total_participants_vote_phase], + t("stats.budgets.participants_voting_phase")) %>
      diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 68bb5144c..585d31955 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -23,10 +23,6 @@ en: total_selected_investments: "Projects in final voting phase" total_unfeasible_investments: "Unfeasible projects" by_phase: "Participants by phase" - total_participants_web: "Vote phase web participants" - total_participants_booths: "Vote phase booth participants" - participants: "Participants" - supports: "Supports" by_heading: "Participants by phase and heading" total: "Total" heading: "Heading" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index b42af056f..5c0383cce 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -23,10 +23,6 @@ es: total_selected_investments: "Proyectos en la fase final" total_unfeasible_investments: "Proyectos inviables" by_phase: "Participación por fases" - total_participants_web: "Participantes web en votación final" - total_participants_booths: "Participantes en urnas votación final" - participants: "Participantes" - supports: "Apoyos" by_heading: "Participación por distritos y fase" total: "Total" heading: "Distrito" diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 6868434b1..f56ba3c1d 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -94,24 +94,6 @@ describe Budget::Stats do end end - describe "#total_participants_web" do - it "returns the number of total participants in the votes phase via web" do - 2.times { create(:budget_ballot_line, investment: investment) } - create(:poll_voter, :from_booth, budget: budget) - - expect(stats.generate[:total_participants_web]).to be 2 - end - end - - describe "#total_participants_booths" do - it "returns the number of total participants in the votes phase in booths" do - 2.times { create(:poll_voter, :from_booth, budget: budget) } - create(:budget_ballot_line, investment: investment) - - expect(stats.generate[:total_participants_booths]).to be 2 - end - end - describe "#total_budget_investments" do it "returns the number of total budget investments" do 2.times { create(:budget_investment, budget: budget) } @@ -150,14 +132,6 @@ describe Budget::Stats do end end - describe "#total_supports" do - it "returns the number of total supports" do - 2.times { create(:vote, votable: investment) } - - expect(stats.generate[:total_supports]).to be 2 - end - end - describe "Participants by gender" do before do 3.times { create(:user, gender: "male") } From a886b8ae59f217a180086919e938dd765215b36b Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 26 Mar 2019 00:46:14 +0100 Subject: [PATCH 47/82] Make stats numbers smaller The number of total participants is still written using a larger font because it's the most important number. --- app/assets/images/stats_man.png | Bin 1768 -> 1557 bytes app/assets/images/stats_woman.png | Bin 1721 -> 1578 bytes app/assets/stylesheets/stats.scss | 14 ++++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/assets/images/stats_man.png b/app/assets/images/stats_man.png index 9fb030dbcb58c58c5e3591d1ed1ec628e0f2accb..a1a0d028a0860282b1f33bee916f36e59c686b4c 100644 GIT binary patch delta 841 zcmV-P1GfC=4V4U#7YaNG1^@s66uJ1|ks-PwF*7(IH#sgbH90skG%O%8FfleSFgY(V zG%YYOIxsmpFfoz+bd#C^WRq$EDU)yl7$7t^LNh@&L^U);G(s^kML9w^IW|EwLoh-z zGc+(kFgBAg0vsSTH$pQ(HbgWuMKnS&F-18-I5{>!G(#{#GBY$VK`=Ix`T;kSsRA~W zQvw^4`T`-7j{+K#H3LC^f z-rOHU%z+QQ=RGs?efQ3}=iGx{KA+Dd*{);~ZmGckUSNsT(epfi)o>+f1}*&kJ@^QY zgDwyUCpk(`*gfzD9MSC<`aA>f$9`^1fe*k}pRmh(0}ovZYyxWvaRoNO?P3MS36jU) zrogWjJhC0dblsf@{&zu{O@Y^WW~6qDudycZh~Gb{ZGi)u0#Cua2>!DmXFHROfo*|b z7QAwi>OO%XUhW`&`vIPCRw>RjWRgxW$7!vw_x35B#qt_d_{3cUqXE9Fpxs0@L%+N(V5}Fs^nHJ!s9+j@zzyvsKkQG)_#iJOrL?Cp z@1=d4DcG}gn@I(x0#kvhKz9N?jnDOxK7&RCPJ;;z;>N*(sd})C3xQoh)95l(NIVCn zHo99~;7bH?pSe|Mwf)u&&V>SdT(sYoz@fnJcf>Y{wkXc=yBKEMA>9XK0)GiRR^Pb= zVqG8|*7pQ|euuowPL^2G-P$j<^`;|}NCfV2Bs&qfBAh{I)yyXEg(~~tQXoa>iDI0_ zHe3ok2swnG2=_{30<$3zdMeB|#su!Nh#)%??v=&_=6DuW@942hfwaFZD#n*XX4p!} zzpfbDNy4d4RWNKNLEw(5EJCKEKS;gjK91PD@6>iAHFMF+j(7Y^|MMuO{S{yUyLsVK TT6`xi00000NkvXXu0mjfX8~>0 delta 1000 zcmVbd%fxB9m$XYm;^YGYBAfZE#IZI!Tko0yUHT0UDDO10j>C0yY6c zli&h70Yj7E0vVGv13`aC&e<~n00UM@L_t(|+U%M=XcR#d$9Ik+pp{sNNQ$5#h)4<% ziy$HvA|jGPQbY?;P!X}Puo6K;EJQ3UEK*vEg{YtwDHMbg#E*zy=v~m{IHD|v96?0x z{148-vfRhM_h#l+nFoIs_I77}J3I5f8!D9&N!LY>~ZJZHeYfHwKsENq8L1h`U%?U*}21F1vajXoQPin(S? zGR2f6?L>sxW=3=awAP%i8Mw#LGwF_6N%LYrraeNFx=4SW<|GMgMh+~bo!$U3*H%JP z(0OQx*v|=QFKa;hxD!1`^-4WwoNe2M%p|VqXO|Q1=m~VjY~2cMKWKc{VG}#M`M8T2 z0MGXDmA9a2Xgvwg__eu=Nzln2aECHxfcnjBp#V-3!kEtTraHjs`Sy;`&Tb0e0pdnr zE|m;z%~*eRNNR^mz;=nFoo|#F_jd)f6-ma;d<%{`00zJS7ytuc01SWu@ZSe44uGRb z0jvotsZ`T_HAs0eY(FEf;7F$j`&jis*r>^iD~{mq>psK#jb#UQYx&O9W@%#71SjG-0O(= zKOHBMEC>Mg=PFItfRYg`+X{8PEEWKM^#S-z02uoKl*H(|55O-1z?u)hh5&HE2Vgzo z|MULcIUt;M9Pz(h`0Z=U&zXm_oG8KtEHfX<+XyZ)?qS!jIe>LvE0_z&i3mS@0xsnp zkn?!Ds(F9Ku}?sbyIA%Ks2%PD!u9vkd5BX$lbcYsU3IU3498oG1jYrVbh!G(#{#GBY$VK`=Ix`T;kSsRA~W zQvw^4`T`-7j{+K#H3LC^8Y|N00007*NklvR)@_#;RI zEs%0i5rI2%it+;Th5kbWG12v?Eu|0M>y!&%*F$X@2 znfHeK@x6P_J?}n)LZMLObJW&&9(6J&2SFe@)C_t-7ob~`220?7AnIhPyGAD`MGz0b zJjk;gaRO4{p7xlUf`i~|kyt64QIf6%TfuUST*v}wQ5Doll74VI!Fe<{Z&V_SZzVkM z0{=121!W3oPzk}6gpzsAa_54xOu2XiGV1q9ugu&9YcU!8fs>?Sbui54SKz2f><~amQw}&}X1#KC~%+_))SCjOrmj*{p-tz)Oue zI77wVcA4n`IR&|2pu@#OQ<}?#Y)pbx7acV<0IwD1-ki&pf17Js(m3Xo#F=1&gf;qvJ+7gI67u*L~!L#$e4}!E>WGw828EqChzC?Vt?o&6D70f~HF!iR1UfR%W o*P!UR!^jm3s{eVU8Rr5F0NOW0v~uIt=l}o!07*qoM6N<$f^M{c&;S4c delta 953 zcmV;q14jI+47m-E7Ybkq1^@s6Z}l*2ks-PwFg7bd%fxB9m$XYm;^YGYBAfZE#IZI!Tko0yUHT0UDDO10j>C0yY6R zli&h70XUQ30vVGv13`bhP0I@a00SpUL_t(|+U%OYYZO5g$9E+JIZ|8^QUsB31c{&` zCj<#mL?nm={|GB9s~{F4hzNp65GxBSs}v$3*s4KOh=nnU9!kh9@d(LrgcKsFa=wQ% zaHxAbGw;2bE9Su$u9)5X?99AhvzxZt?WC724GmB5&;-G$CZ*%xIB1Ljh#q}b60kxHOCu^?iUD#2^*%|!O$Na4 zl9}VgUm3$z7@mIyB)xczm}BwUpVIkv(lJoi)Czb>b$1+6-3{Nx!d*kiu5gloXcs}R zavTT2UV^IBa*LyBI;H|}MHQ^;pk+|T(KN-bE;daCEY;NpCtKIRFgkd#E%8xwC=kuaYL&6kU}hUk({$7Y@U*9_guU_w z7r>JqQ|B2Mz@}-zNi_VAAFdZaA*MEy)Hh4bBnyIoa~!E|*zl;=`9PDJ>b5{{1@_*Y z+UG1b%DjIU@m@zb&t|ZVY%$K>HmJefG;xL;t0Op5K+YL#N&p^a1T0AajxYjNxB>f_ z0mrxx46X?T>S@lVX-NQZfh!KqsC36|SPWmM-sF;S(}edPcU|HsVK^-;M5-=;^B&-| zp1bV9eUByoemr4~fDtePM!*Od0spZ9j|^S^EAM}G?B$$772gLR2i>%UcmVpAGa(sN zEw4GBxNLb8Qt#Hba()QrZZLa0JD^E?YlZ|giEpbR0e1|Ysi*f~&?R0en4yds zq@_un1ZS@m60j)FZ6pjv1>BXYVz>ZXQdNvL>i7BYl0WY~4*v7tUpWBdH>~kwAp#cI bZvh4X;+VfM-B~%v00000NkvXXu0mjfW=oly diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 1878f2ed5..f9a21f72d 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -38,6 +38,7 @@ &::before { display: inline-block; margin-right: $line-height / 2; + vertical-align: top; } &.total-participants::before { @@ -75,15 +76,24 @@ .number { display: block; - font-size: rem-calc(60); + font-size: rem-calc(36); font-weight: bold; - line-height: rem-calc(60); + line-height: rem-calc(36); } .info { color: $text-medium; + font-size: $small-font-size; font-style: italic; } + + &.total-participants { + + .number { + font-size: rem-calc(60); + line-height: rem-calc(60); + } + } } .progress { From 844d2c41dbbf60f0c8f68abb75b5d4dbe57f8072 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 26 Mar 2019 00:46:27 +0100 Subject: [PATCH 48/82] Replace stats web icon --- app/assets/images/stats_web.png | Bin 1770 -> 1296 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/assets/images/stats_web.png b/app/assets/images/stats_web.png index 787f226fb1ee2382ba0bd647500978793357e736..18a9523f243f689fe38fce56902d96fb8bbe09cd 100644 GIT binary patch delta 527 zcmaFGJArFMA>-s(j46||7&RvsFi9vFIk~!+xSE-nn43Er8oF9qI2xI{nVMUg8(6xT zTbLV9Heiy0DKf>W=oh2;F! zZ*INzJ!~MtnxLN4u)#4^pFuc4O<`_>5tHy1=>u#AOwteh0>lcY@Sb3MD8lq={+>DR z>tF7?6dH1}@XyKqkd2Es>0GsRbul=|BJ2YsPP0iTi|tr)!ezx`hkcgMKOIa+xW2=N z^O)RX`Nq1hY~i-M`Rf^~d-mnMdbwk1lZnEbRkvoDiFR0r2t=7|`*~=wQ}-RtgLf6C z*XDg-d~e{st-jkqWUkNZt@pmM9)ESFDWQo|Z3YJ6%sqeoH0k6s&%U=`n`J9w^h4Pp zIC=K&H*)({&y(NnFLBMX+`7bL{e<(c($oF2>P14O!*f~L=QF(6b+zf}+u*DDC8Ckj zVt?7}&;OksxuqfZcA0O$vsdGgo|w^RWB|ym+t-26tg8{swHFLTk)RcrDq>LZK)5?Y1=Gn*zU{? kb-S$Ej0ZO#c{eaJ{A-w3`>NLH2Lljzy85}Sb4q9e05A343jhEB delta 965 zcmV;$13LVW3hE88aRHOu0V0!X0c(?X0y798cx`Y^O*%=F#R4^x`~e!16ayiXsRAzu zG(j{nHZnIxli&h02sA-7GBz?eFq7Z{8Iv^wL4S@WAqxNi16WB!K~#9!?3#^r+At8u zp|1nb4fq(K?gWJiN+u{wP?!KRLD(S91UM4_6JQ2_utD7k=w08bPwzNvge5s9y7%+~ zkwf_DKKwt)&C}`B_(=At@xd$r2jDxi&t*TL*=$~%>vp?+dYK*$hs*_lY0+(#t+_2YaMbJL-Y~G!T@?g9!KCIrNOG#>$U3O;W2n8p=zxF^ucPL&!NbaS zY!35vU;q(;m*-x9;UD#JqmH~}#Z+;ky{|Q!mVSr!(^*JU&djK)`VLj)w_$MFqqK>@jEVCGR?nHWwkiyk)lnJhRq9aY65uB?O=?0Q*Mran9x@^fz009r*^{aIp`09cj>WQb>7S zk(3(koG8-Y4}AkmRq~ljMomSnEj13+Yyd#MrUFEyhoM$+zexG$QLb9cVd>aprso$H zBv)s_dCH0$Viy=b^hmd&qR@72Jl9hfIjo>#A)g~&VI3Q<*lTCN1)<%q2!D9z6d1g$ zjzZ5u+x7PAg+)zWdl;b;A++1nI=VCtoLyV6Y$z=$v?m3jof*ufLQDAdR_~SuHVo}4 z6_=^dI>t07wTEkpq~t>WZcM(jm8WxF^S$eA4PnN>DC8Uk9UbnpwKc?G;?$r@#?Xvp1EokVCam{h? ztmTk5`3}3IPGup@LOb>VJietXb8^%IUu1m6mQNYa{y&?lJfwyD=C6jmC-2S<$h|*4 nTsI3(@dV%i9Dr+Oe+3u-&$CuyHqvVb00000NkvXXu0mjfT-U=A From f6701373c44b9aa5ee37416d0faab8eacab08937 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 26 Mar 2019 00:47:00 +0100 Subject: [PATCH 49/82] Change i18n participation to participants --- config/locales/en/stats.yml | 4 ++-- config/locales/es/stats.yml | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 585d31955..f6126efb0 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -15,7 +15,7 @@ en: age_range: "%{start} - %{finish} years old" total: "Total" geozone: "District" - geozone_participation: "% District population participation" + geozone_participation: "% District population participants" budgets: link: "Stats" page_title: "%{budget} - Participation stats" @@ -33,7 +33,7 @@ en: percent_total_participants_html: "%
      Total
      Participants" percent_heading_census_html: "%
      Heading
      Census" no_demographic_data: "* There is no demographic data for %{total} participants." - participatory_disclaimer: "** The numbers of total participation refer to persons that created, supported or voted investment proposals." + participatory_disclaimer: "** The numbers of total participants refer to persons that created, supported or voted investment proposals." heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on." polls: by_channel: "Participants by channel" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 5c0383cce..99a0c9ae3 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -3,9 +3,9 @@ es: title: "Estadísticas de participación" advanced: "Estadísticas avanzadas" total_participants: "Participantes" - by_gender: "Participación por género" - by_age: "Participación por grupos de edad" - by_geozone: "Participación por distritos" + by_gender: "Participantes por género" + by_age: "Participantes por grupos de edad" + by_geozone: "Participantes por distritos" men_percentage: "%{percentage} Hombres" women_percentage: "%{percentage} Mujeres" male: "Hombres" @@ -15,31 +15,31 @@ es: age_range: "De %{start} a %{finish} años" total: "Total" geozone: "Distrito" - geozone_participation: "% Partipación población del distrito" + geozone_participation: "% Participantes población del distrito" budgets: link: "Estadísticas" page_title: "%{budget} - Estadísticas de participación" total_investments: "Total proyectos de gasto" total_selected_investments: "Proyectos en la fase final" total_unfeasible_investments: "Proyectos inviables" - by_phase: "Participación por fases" - by_heading: "Participación por distritos y fase" + by_phase: "Participantes por fases" + by_heading: "Participantes por distritos y fase" total: "Total" heading: "Distrito" investments_sent_html: "Propuestas
      enviadas" - participants_support_phase: Participación fase apoyos - participants_voting_phase: Participación fase votación - participants_total: Participación total + participants_support_phase: Participantes fase apoyos + participants_voting_phase: Participantes fase votación + participants_total: Total de participantes percent_total_participants_html: "%
      Total
      Participantes" percent_heading_census_html: "%
      Censo
      Distrito" no_demographic_data: "* No se dispone de los datos demográficos de %{total} participantes." - participatory_disclaimer: "** Las cifras de participación total se refieren a personas que han creado, apoyado o votado propuestas." + participatory_disclaimer: "** Las cifras de total de participantes se refieren a personas que han creado, apoyado o votado propuestas." heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado." polls: - by_channel: "Participación por medio" - by_gender_and_channel: "Participación por género y medio" - by_age_and_channel: "Participación por edad y medio" - by_geozone_and_channel: "Participación por distrito y medio" + by_channel: "Participantes por medio" + by_gender_and_channel: "Participantes por género y medio" + by_age_and_channel: "Participantes por edad y medio" + by_geozone_and_channel: "Participantes por distrito y medio" vote_by_channel: "Votos emitidos por medio" web: "Web" booth: "Urnas" From fdeef721897ed61ea4bb9aef5fea0f348b6a96b2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 26 Mar 2019 00:47:50 +0100 Subject: [PATCH 50/82] Fix lint warnings on stats scss --- app/assets/stylesheets/stats.scss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index f9a21f72d..2844989cd 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -42,31 +42,31 @@ } &.total-participants::before { - content: image-url('stats_users.png'); + content: image-url("stats_users.png"); } &.male::before { - content: image-url('stats_man.png'); + content: image-url("stats_man.png"); } &.female::before { - content: image-url('stats_woman.png'); + content: image-url("stats_woman.png"); } &.total-investments::before { - content: image-url('stats_investments.png'); + content: image-url("stats_investments.png"); } &.web::before { - content: image-url('stats_web.png'); + content: image-url("stats_web.png"); } &.booth::before { - content: image-url('stats_booth.png'); + content: image-url("stats_booth.png"); } &.mail::before { - content: image-url('stats_mail.png'); + content: image-url("stats_mail.png"); } .content { @@ -142,15 +142,15 @@ } &.web::before { - content: image-url('stats_web.png'); + content: image-url("stats_web.png"); } &.booth::before { - content: image-url('stats_booth.png'); + content: image-url("stats_booth.png"); } &.mail::before { - content: image-url('stats_mail.png'); + content: image-url("stats_mail.png"); } } @@ -163,11 +163,11 @@ } &.male::before { - content: image-url('stats_man.png'); + content: image-url("stats_man.png"); } &.female::before { - content: image-url('stats_woman.png'); + content: image-url("stats_woman.png"); } } } From e3063cd24fc84cd59d00af4d0c7b3f93d93e3d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 29 Mar 2019 14:03:47 +0100 Subject: [PATCH 51/82] Remove complex poll stats For now we think showing them would be showing too much data and it would be a bit confusing. I've been tempted to just remove the view and keep the methods in the model in case they're used by other institutions using CONSUL. However, it's probably better to wait until we're asked to re-implement them, and in the meantime we don't maintain code nobody uses. The code wasn't that great to start with (I know it because I wrote it). --- app/models/concerns/statisticable.rb | 33 +++----- app/models/poll/stats.rb | 44 +--------- app/views/polls/stats.html.erb | 103 ----------------------- config/locales/en/stats.yml | 8 -- config/locales/es/stats.yml | 8 -- spec/models/poll/stats_spec.rb | 120 --------------------------- 6 files changed, 13 insertions(+), 303 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 5aa952bb4..980bda637 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -33,7 +33,18 @@ module Statisticable end def participants_by_age - participants_by_age_for(participants) + age_groups.map do |start, finish| + count = participants.between_ages(start, finish).count + + [ + "#{start} - #{finish}", + { + range: range_description(start, finish), + count: count, + percentage: calculate_percentage(count, total_participants) + } + ] + end.to_h end def participants_by_geozone @@ -79,26 +90,6 @@ module Statisticable ] end - def participants_by_age_for(users, relative_to: :participants) - age_groups.map do |start, finish| - group_count = users.between_ages(start, finish).count - total_count = if relative_to == :participants - total_participants - else - send(relative_to, start, finish).count - end - - [ - "#{start} - #{finish}", - { - range: range_description(start, finish), - count: group_count, - percentage: calculate_percentage(group_count, total_count) - } - ] - end.to_h - end - def participants_between_ages(from, to) participants.between_ages(from, to) end diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index c171d1900..191139d5a 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -14,16 +14,9 @@ class Poll::Stats total_participants_mail_percentage valid_percentage_web valid_percentage_booth valid_percentage_mail total_valid_percentage white_percentage_web white_percentage_booth white_percentage_mail total_white_percentage - null_percentage_web null_percentage_booth null_percentage_mail total_null_percentage - total_male_web total_male_booth total_male_mail - total_female_web total_female_booth total_female_mail - male_web_percentage male_booth_percentage male_mail_percentage - female_web_percentage female_booth_percentage female_mail_percentage - web_participants_by_age booth_participants_by_age mail_participants_by_age - web_participants_by_geozone booth_participants_by_geozone mail_participants_by_geozone] + null_percentage_web null_percentage_booth null_percentage_mail total_null_percentage] end - def total_participants total_participants_web + total_participants_booth end @@ -38,41 +31,6 @@ class Poll::Stats define_method :"total_participants_#{channel}_percentage" do calculate_percentage(send(:"total_participants_#{channel}"), total_participants) end - - define_method :"#{channel}_participants" do - User.where(id: voters.where(origin: channel).pluck(:user_id)) - end - - define_method :"#{channel}_participants_by_age" do - participants_by_age_for(send(:"#{channel}_participants"), - relative_to: :participants_between_ages) - end - - define_method :"#{channel}_participants_by_geozone" do - geozones.map do |geozone| - count = send(:"#{channel}_participants").where(geozone: geozone).count - [ - geozone.name, - { - count: count, - percentage: calculate_percentage(count, participants.where(geozone: geozone).count) - } - ] - end.to_h - end - - %i[male female].each do |gender| - define_method :"total_#{gender}_#{channel}" do - send(:"#{channel}_participants").public_send(gender).count - end - - define_method :"#{gender}_#{channel}_percentage" do - calculate_percentage( - send(:"total_#{gender}_#{channel}"), - send(:"total_#{gender}_participants") - ) - end - end end def total_web_valid diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 37d878c0b..9ace784dd 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -14,15 +14,6 @@
    • <%= link_to t("stats.polls.by_channel"), "#stats_by_channel" %>
      • -
    • - <%= link_to t("stats.polls.by_gender_and_channel"), "#stats_by_gender_and_channel" %> -
      • -
    • - <%= link_to t("stats.polls.by_age_and_channel"), "#stats_by_age_and_channel" %> -
      • -
    • - <%= link_to t("stats.polls.by_geozone_and_channel"), "#stats_by_geozone_and_channel "%> -
    • <%= link_to t("stats.polls.vote_by_channel"), "#vote_stats_by_channel" %>
      • @@ -49,100 +40,6 @@ <% end %> -
      -

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

      - -
      <%= t("budgets.stats.heading") %><%= t("budgets.stats.investments_sent_html") %><%= t("budgets.stats.participants_support_phase") %><%= t("budgets.stats.participants_voting_phase") %><%= t("budgets.stats.participants_total") %><%= t("stats.budgets.heading") %><%= t("stats.budgets.investments_sent_html") %><%= t("stats.budgets.participants_support_phase") %><%= t("stats.budgets.participants_voting_phase") %><%= t("stats.budgets.participants_total") %>
      <%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %><%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %><%= t("budgets.stats.total") %><%= t("budgets.stats.percent_total_participants_html") %><%= t("budgets.stats.percent_heading_census_html") %><%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %><%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %><%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %>
      - - - - <% Poll::Stats::CHANNELS.each do |channel| %> - - <% end %> - - - - <% %i[male female].each do |gender| %> - - - <% Poll::Stats::CHANNELS.each do |channel| %> - - <% end %> - - <% end %> - -
      <%= t("stats.polls.#{channel}") %>
      <%= t("stats.#{gender}") %> - <%= "#{@stats[:"total_#{gender}_#{channel}"]} - (#{number_to_stats_percentage(@stats[:"#{gender}_#{channel}_percentage"])})" %> -
      -
      • - -
      -

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

      - - - - - - <% Poll::Stats::CHANNELS.each do |channel| %> - - <% end %> - - - - <% @stats[:participants_by_age].keys.each do |age_range| %> - - - - <% Poll::Stats::CHANNELS.each do |channel| %> - <% group = @stats[:"#{channel}_participants_by_age"][age_range] %> - - <% end %> - - <% end %> - -
      <%= t("stats.age") %><%= t("stats.polls.#{channel}") %>
      <%= @stats[:participants_by_age][age_range][:range] %> -
      - - -
      - <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> -
      -
      - -
      -

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

      - - - - - - <% Poll::Stats::CHANNELS.each do |channel| %> - - <% end %> - - - - <% @stats[:web_participants_by_geozone].keys.each do |name| %> - - - - <% Poll::Stats::CHANNELS.each do |channel| %> - <% group = @stats[:"#{channel}_participants_by_geozone"][name] %> - - <% end %> - - <% end %> - -
      <%= t("stats.geozone") %><%= t("stats.polls.#{channel}") %>
      <%= name %> -
      - - -
      - <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> -
      -
      -

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

      diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index f6126efb0..2c64e70b3 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -6,8 +6,6 @@ en: by_gender: "Participants by gender" by_age: "Participants by age" by_geozone: "Participants by district" - male: "Male" - female: "Female" men_percentage: "%{percentage} Men" women_percentage: "%{percentage} Women" age: "Age" @@ -37,13 +35,7 @@ en: heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on." polls: by_channel: "Participants by channel" - by_gender_and_channel: "Participants by gender and channel" - by_age_and_channel: "Participants by age and channel" - by_geozone_and_channel: "Participants by district and channel" vote_by_channel: "Vote type by channel" - web: "Web" - booth: "Booths" - mail: "Mail" web_percentage: "%{percentage} Web" booth_percentage: "%{percentage} Booths" mail_percentage: "%{percentage} Mail" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 99a0c9ae3..1e6827a97 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -8,8 +8,6 @@ es: by_geozone: "Participantes por distritos" men_percentage: "%{percentage} Hombres" women_percentage: "%{percentage} Mujeres" - male: "Hombres" - female: "Mujeres" age: "Edad" age_more_than: "De %{start} y más años" age_range: "De %{start} a %{finish} años" @@ -37,13 +35,7 @@ es: heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado." polls: by_channel: "Participantes por medio" - by_gender_and_channel: "Participantes por género y medio" - by_age_and_channel: "Participantes por edad y medio" - by_geozone_and_channel: "Participantes por distrito y medio" vote_by_channel: "Votos emitidos por medio" - web: "Web" - booth: "Urnas" - mail: "Correo" web_percentage: "%{percentage} Web" booth_percentage: "%{percentage} Urnas" mail_percentage: "%{percentage} Correo" diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 3b064ccf4..2b2fe6c7b 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -182,126 +182,6 @@ describe Poll::Stats do expect(stats.participants_by_geozone["Midgar"][:percentage]).to eq(33.333) end - - describe "participants by gender and channel" do - before do - 4.times do - create :poll_voter, :from_web, poll: poll, - user: create(:user, :level_two, gender: "female") - end - - 3.times do - create :poll_voter, :from_web, poll: poll, - user: create(:user, :level_two, gender: "male") - end - - 2.times do - create :poll_voter, :from_booth, poll: poll, - user: create(:user, :level_two, gender: "female") - end - - 1.times do - create :poll_voter, :from_booth, poll: poll, - user: create(:user, :level_two, gender: "male") - end - end - - it "calculates total participants" do - expect(stats.total_female_web).to eq(4) - expect(stats.total_male_web).to eq(3) - expect(stats.total_female_booth).to eq(2) - expect(stats.total_male_booth).to eq(1) - end - - it "calculates percentage relative to the participants for that gender" do - expect(stats.female_web_percentage).to eq(66.667) - expect(stats.female_booth_percentage).to eq(33.333) - - expect(stats.male_web_percentage).to eq(75.0) - expect(stats.male_booth_percentage).to eq(25.0) - end - end - - describe "participants by age and channel" do - before do - 4.times do - create :poll_voter, :from_web, poll: poll, - user: create(:user, :level_two, date_of_birth: 37.years.ago) - end - - 3.times do - create :poll_voter, :from_web, poll: poll, - user: create(:user, :level_two, date_of_birth: 52.years.ago) - end - - 2.times do - create :poll_voter, :from_booth, poll: poll, - user: create(:user, :level_two, date_of_birth: 37.years.ago) - end - - 1.times do - create :poll_voter, :from_booth, poll: poll, - user: create(:user, :level_two, date_of_birth: 52.years.ago) - end - end - - it "calculates the count of users by channel and age" do - expect(stats.web_participants_by_age["35 - 39"][:count]).to eq(4) - expect(stats.web_participants_by_age["50 - 54"][:count]).to eq(3) - expect(stats.booth_participants_by_age["35 - 39"][:count]).to eq(2) - expect(stats.booth_participants_by_age["50 - 54"][:count]).to eq(1) - end - - it "calculates percentage relative to the participants for that age" do - expect(stats.web_participants_by_age["35 - 39"][:percentage]).to eq(66.667) - expect(stats.booth_participants_by_age["35 - 39"][:percentage]).to eq(33.333) - - expect(stats.web_participants_by_age["50 - 54"][:percentage]).to eq(75.0) - expect(stats.booth_participants_by_age["50 - 54"][:percentage]).to eq(25.0) - end - end - - describe "participants by geozone and channel" do - before do - atlantis = create(:geozone, name: "Atlantis") - lemuria = create(:geozone, name: "Lemuria") - - 4.times do - create :poll_voter, :from_booth, poll: poll, - user: create(:user, :level_two, geozone: atlantis) - end - - 3.times do - create :poll_voter, :from_booth, poll: poll, - user: create(:user, :level_two, geozone: lemuria) - end - - 2.times do - create :poll_voter, :from_web, poll: poll, - user: create(:user, :level_two, geozone: atlantis) - end - - 1.times do - create :poll_voter, :from_web, poll: poll, - user: create(:user, :level_two, geozone: lemuria) - end - end - - it "calculates the count of users by channel and geozone" do - expect(stats.booth_participants_by_geozone["Atlantis"][:count]).to eq(4) - expect(stats.booth_participants_by_geozone["Lemuria"][:count]).to eq(3) - expect(stats.web_participants_by_geozone["Atlantis"][:count]).to eq(2) - expect(stats.web_participants_by_geozone["Lemuria"][:count]).to eq(1) - end - - it "calculates percentage relative to the participants for that geozone" do - expect(stats.booth_participants_by_geozone["Atlantis"][:percentage]).to eq(66.667) - expect(stats.web_participants_by_geozone["Atlantis"][:percentage]).to eq(33.333) - - expect(stats.booth_participants_by_geozone["Lemuria"][:percentage]).to eq(75.0) - expect(stats.web_participants_by_geozone["Lemuria"][:percentage]).to eq(25.0) - end - end end describe "#generate" do From eba30d158598002c18f4bbfbb5d417e4bc17a95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 3 Apr 2019 11:32:46 +0200 Subject: [PATCH 52/82] Use "Fully blank" instead of "white votes" We were mistranslating the Spanish word "blanco", which can mean "blank" or "white". We've also decided to use "fully blank" because polls may have many questions, and only votes leaving everything blank count as blank votes. --- config/locales/en/general.yml | 2 +- config/locales/es/general.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 91296ea5e..5a78c6a1f 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -661,7 +661,7 @@ en: booth: "BOOTH" total: "TOTAL" valid: "Valid" - white: "White votes" + white: "Fully blank" null_votes: "Invalid" results: title: "Questions" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 45833ed45..02754ee21 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -661,7 +661,7 @@ es: mail: "CORREO" total: "TOTAL" valid: "Válidos" - white: "En blanco" + white: "Totalmente en blanco" null_votes: "Nulos" results: title: "Preguntas" From 76c7827cf42e0cf9a387393857314802fe3c983d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 18 Mar 2019 15:38:53 +0100 Subject: [PATCH 53/82] Use stats objects instead of hashes It will make it far easier to call other methods on the stats object, and we're already caching the methods. We had to remove the view fragment caching because the stats object isn't as easy to cache. The good thing about it is the view will automatically be updated when we change logic regarding which stats to show, and the methods taking long to execute are cached in the model. --- app/controllers/budgets/stats_controller.rb | 6 +- app/controllers/polls_controller.rb | 2 +- app/models/budget/stats.rb | 102 +++---- app/models/concerns/statisticable.rb | 2 +- app/views/budgets/stats/show.html.erb | 272 +++++++++--------- app/views/polls/stats.html.erb | 34 +-- .../shared/stats/_participation.html.erb | 14 +- spec/models/budget/stats_spec.rb | 60 ++-- spec/models/poll/stats_spec.rb | 42 +-- 9 files changed, 244 insertions(+), 290 deletions(-) diff --git a/app/controllers/budgets/stats_controller.rb b/app/controllers/budgets/stats_controller.rb index 080bf0ef9..d8ac1e267 100644 --- a/app/controllers/budgets/stats_controller.rb +++ b/app/controllers/budgets/stats_controller.rb @@ -6,16 +6,12 @@ module Budgets def show authorize! :read_stats, @budget - @stats = load_stats + @stats = Budget::Stats.new(@budget) @headings = @budget.headings.sort_by_name end private - def load_stats - Budget::Stats.new(@budget).generate - end - def load_budget @budget = Budget.find_by(slug: params[:budget_id]) || Budget.find_by(id: params[:budget_id]) end diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index 790045b0f..60e1e4eff 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -33,7 +33,7 @@ class PollsController < ApplicationController end def stats - @stats = Poll::Stats.new(@poll).generate + @stats = Poll::Stats.new(@poll) end def results diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index e063756c4..a61013fe6 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -13,36 +13,59 @@ class Budget::Stats User.where(id: (authors + voters + balloters + poll_ballot_voters).uniq.compact) end + def total_participants + participants.distinct.count + end + + def total_participants_support_phase + voters.uniq.count + end + + def total_participants_vote_phase + (balloters + poll_ballot_voters).uniq.count + end + + def total_budget_investments + budget.investments.count + end + + def total_votes + budget.ballots.pluck(:ballot_lines_count).inject(0) { |sum, x| sum + x } + end + + def total_selected_investments + budget.investments.selected.count + end + + def total_unfeasible_investments + budget.investments.unfeasible.count + end + + def headings + groups = Hash.new(0) + budget.headings.order("id ASC").each do |heading| + groups[heading.id] = Hash.new(0).merge(calculate_heading_totals(heading)) + end + + groups[:total] = Hash.new(0) + groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum + groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum + groups[:total][:total_participants_vote_phase] = groups.collect {|_k, v| v[:total_participants_vote_phase]}.sum + groups[:total][:total_participants_all_phase] = groups.collect {|_k, v| v[:total_participants_all_phase]}.sum + + budget.headings.each do |heading| + groups[heading.id].merge!(calculate_heading_stats_with_totals(groups[heading.id], groups[:total], heading.population)) + end + + groups[:total][:percentage_participants_support_phase] = groups.collect {|_k, v| v[:percentage_participants_support_phase]}.sum + groups[:total][:percentage_participants_vote_phase] = groups.collect {|_k, v| v[:percentage_participants_vote_phase]}.sum + groups[:total][:percentage_participants_all_phase] = groups.collect {|_k, v| v[:percentage_participants_all_phase]}.sum + + groups + end + private - def total_participants - participants.distinct.count - end - - def total_participants_support_phase - voters.uniq.count - end - - def total_participants_vote_phase - (balloters + poll_ballot_voters).uniq.count - end - - def total_budget_investments - budget.investments.count - end - - def total_votes - budget.ballots.pluck(:ballot_lines_count).inject(0) { |sum, x| sum + x } - end - - def total_selected_investments - budget.investments.selected.count - end - - def total_unfeasible_investments - budget.investments.unfeasible.count - end - def authors budget.investments.pluck(:author_id) end @@ -71,29 +94,6 @@ class Budget::Stats end end - def headings - groups = Hash.new(0) - budget.headings.order("id ASC").each do |heading| - groups[heading.id] = Hash.new(0).merge(calculate_heading_totals(heading)) - end - - groups[:total] = Hash.new(0) - groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum - groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum - groups[:total][:total_participants_vote_phase] = groups.collect {|_k, v| v[:total_participants_vote_phase]}.sum - groups[:total][:total_participants_all_phase] = groups.collect {|_k, v| v[:total_participants_all_phase]}.sum - - budget.headings.each do |heading| - groups[heading.id].merge!(calculate_heading_stats_with_totals(groups[heading.id], groups[:total], heading.population)) - end - - groups[:total][:percentage_participants_support_phase] = groups.collect {|_k, v| v[:percentage_participants_support_phase]}.sum - groups[:total][:percentage_participants_vote_phase] = groups.collect {|_k, v| v[:percentage_participants_vote_phase]}.sum - groups[:total][:percentage_participants_all_phase] = groups.collect {|_k, v| v[:percentage_participants_all_phase]}.sum - - groups - end - def calculate_heading_totals(heading) { total_investments_count: heading.investments.count, diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 980bda637..411bec21c 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -9,7 +9,7 @@ module Statisticable end def generate - self.class.stats_methods.map { |stat_name| [stat_name, send(stat_name)] }.to_h + self.class.stats_methods.each { |stat_name| send(stat_name) } end def total_male_participants diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index d4064ab90..7edf44342 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -8,158 +8,156 @@ social_description: @budget.description_finished %> <% end %> -<% cache [@stats] do %> -
      -
      -
      -
      - <%= back_link_to budgets_path %> -

      - <%= t("stats.title") %>
      - <%= @budget.name %> -

      -
      -
      -
      - -
      +
      +
      +
      -
        -
      • - <%= t("shared.you_are_in") %> - <%= link_to t("budgets.results.link"), budget_results_path(@budget) %> -
        • -
      • - <%= link_to t("stats.budgets.link"), budget_stats_path(@budget), class: "is-active" %> -
        • -
      • - <%= link_to t("budgets.executions.link"), budget_executions_path(@budget) %> -
        • -
      + <%= back_link_to budgets_path %> +

      + <%= t("stats.title") %>
      + <%= @budget.name %> +

      +
      -
      -
      - <%= render "shared/stats/links" %> +
      +
      +
        +
      • + <%= t("shared.you_are_in") %> + <%= link_to t("budgets.results.link"), budget_results_path(@budget) %> +
        • +
      • + <%= link_to t("stats.budgets.link"), budget_stats_path(@budget), class: "is-active" %> +
        • +
      • + <%= link_to t("budgets.executions.link"), budget_executions_path(@budget) %> +
        • +
      +
      +
      -

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

      -
        -
      • - <%= link_to t("stats.budgets.total_investments"), "#total_investments"%> -
        • -
      • - <%= link_to t("stats.budgets.by_phase"), "#stats_by_phase"%> -
        • -
      • - <%= link_to t("stats.budgets.by_heading"), "#stats_by_heading"%> -
        • -
      -
      +
      +
      + <%= render "shared/stats/links" %> -
      - <%= render "shared/stats/participation", stats: @stats %> +

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

      +
        +
      • + <%= link_to t("stats.budgets.total_investments"), "#total_investments" %> +
        • +
      • + <%= link_to t("stats.budgets.by_phase"), "#stats_by_phase" %> +
        • +
      • + <%= link_to t("stats.budgets.by_heading"), "#stats_by_heading" %> +
        • +
      +
      -
      -

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

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

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

      +
      +

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

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

      <%= t("stats.budgets.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")) %> -
      + <%= number_with_info_tags( + @stats.total_budget_investments, + t("stats.budgets.total_investments"), + html_class: "total-investments" + ) %> -
      -

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

      - - <%= number_with_info_tags(@stats[:total_participants_support_phase], - t("stats.budgets.participants_support_phase")) %> - <%= number_with_info_tags(@stats[:total_participants_vote_phase], - t("stats.budgets.participants_voting_phase")) %> - -
      - -
      -

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

      - - - - - - - - - - - - - - - - - - - - - - - - <% @headings.each do |heading| %> - - - - - <% ["support", "vote", "all"].each do |phase| %> - - - - <% end %> - - <% end %> - -
      <%= t("stats.budgets.heading") %><%= t("stats.budgets.investments_sent_html") %><%= t("stats.budgets.participants_support_phase") %><%= t("stats.budgets.participants_voting_phase") %><%= t("stats.budgets.participants_total") %>
      <%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %><%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %><%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %>
      - <%= 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]) %> -
      -
      + <%= 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.no_demographic_data", total: @stats[:total_unknown_gender_or_age]) %> -

      -

      - <%= t("stats.budgets.participatory_disclaimer") %> -

      -

      - <%= t("stats.budgets.heading_disclaimer") %> -

      -
      +
      +

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

      + + <%= number_with_info_tags(@stats.total_participants_support_phase, + t("stats.budgets.participants_support_phase")) %> + <%= number_with_info_tags(@stats.total_participants_vote_phase, + t("stats.budgets.participants_voting_phase")) %> + +
      + +
      +

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

      + + + + + + + + + + + + + + + + + + + + + + + + <% @headings.each do |heading| %> + + + + + <% ["support", "vote", "all"].each do |phase| %> + + + + <% end %> + + <% end %> + +
      <%= t("stats.budgets.heading") %><%= t("stats.budgets.investments_sent_html") %><%= t("stats.budgets.participants_support_phase") %><%= t("stats.budgets.participants_voting_phase") %><%= t("stats.budgets.participants_total") %>
      <%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %><%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %><%= t("stats.budgets.total") %><%= t("stats.budgets.percent_total_participants_html") %><%= t("stats.budgets.percent_heading_census_html") %>
      + <%= 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]) %> +
      +
      +
      + +
      +
      +
      +

      + <%= t("stats.budgets.no_demographic_data", total: @stats.total_unknown_gender_or_age) %> +

      +

      + <%= t("stats.budgets.participatory_disclaimer") %> +

      +

      + <%= t("stats.budgets.heading_disclaimer") %> +

      -<% end %> +
      diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 9ace784dd..55d103c97 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -31,9 +31,9 @@ <% Poll::Stats::CHANNELS.each do |channel| %> <%= number_with_info_tags( - @stats[:"total_participants_#{channel}"], + @stats.send("total_participants_#{channel}"), t("stats.polls.#{channel}_percentage", - percentage: number_to_stats_percentage(@stats[:"total_participants_#{channel}_percentage"]) + percentage: number_to_stats_percentage(@stats.send(:"total_participants_#{channel}_percentage")) ), html_class: channel ) %> @@ -59,14 +59,14 @@ <% Poll::Stats::CHANNELS.each do |channel| %> - <%= @stats[:"total_#{channel}_valid"] %> - (<%= @stats[:"valid_percentage_#{channel}"].round(2) %>%) + <%= @stats.send(:"total_#{channel}_valid") %> + (<%= @stats.send(:"valid_percentage_#{channel}").round(2) %>%) <% end %> - <%= @stats[:total_valid_votes] %> - (<%= @stats[:total_valid_percentage].round(2) %>%) + <%= @stats.total_valid_votes %> + (<%= @stats.total_valid_percentage.round(2) %>%) @@ -75,13 +75,13 @@ <% Poll::Stats::CHANNELS.each do |channel| %> - <%= @stats[:"total_#{channel}_white"] %> - (<%= @stats[:"white_percentage_#{channel}"].round(2) %>%) + <%= @stats.send(:"total_#{channel}_white") %> + (<%= @stats.send(:"white_percentage_#{channel}").round(2) %>%) <% end %> - <%= @stats[:total_white_votes] %> - (<%= @stats[:total_white_percentage].round(2) %>%) + <%= @stats.total_white_votes %> + (<%= @stats.total_white_percentage.round(2) %>%) @@ -89,14 +89,14 @@ <% Poll::Stats::CHANNELS.each do |channel| %> - <%= @stats[:"total_#{channel}_null"] %> - (<%= @stats[:"null_percentage_#{channel}"].round(2) %>%) + <%= @stats.send(:"total_#{channel}_null") %> + (<%= @stats.send(:"null_percentage_#{channel}").round(2) %>%) <% end %> - <%= @stats[:total_null_votes] %> - (<%= @stats[:total_null_percentage].round(2) %>%) + <%= @stats.total_null_votes %> + (<%= @stats.total_null_percentage.round(2) %>%) @@ -104,12 +104,12 @@ <% Poll::Stats::CHANNELS.each do |channel| %> - <%= @stats[:"total_participants_#{channel}"] %> - (<%= @stats[:"total_participants_#{channel}_percentage"].round(2) %>%) + <%= @stats.send(:"total_participants_#{channel}") %> + (<%= @stats.send(:"total_participants_#{channel}_percentage").round(2) %>%) <% end %> - <%= @stats[:total_participants] %> + <%= @stats.total_participants %> diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb index eec1b6ba7..0a4bd2f06 100644 --- a/app/views/shared/stats/_participation.html.erb +++ b/app/views/shared/stats/_participation.html.erb @@ -5,7 +5,7 @@

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

      <%= number_with_info_tags( - stats[:total_participants], + stats.total_participants, "", html_class: "participants total-participants" ) %> @@ -15,14 +15,14 @@

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

      <%= number_with_info_tags( - stats[:total_male_participants], - t("stats.men_percentage", percentage: number_to_stats_percentage(stats[:male_percentage])), + stats.total_male_participants, + t("stats.men_percentage", percentage: number_to_stats_percentage(stats.male_percentage)), html_class: "participants male" ) %> <%= number_with_info_tags( - stats[:total_female_participants], - t("stats.women_percentage", percentage: number_to_stats_percentage(stats[:female_percentage])), + stats.total_female_participants, + t("stats.women_percentage", percentage: number_to_stats_percentage(stats.female_percentage)), html_class: "participants female" ) %>
      @@ -39,7 +39,7 @@ - <% stats[:participants_by_age].values.each do |group| %> + <% stats.participants_by_age.values.each do |group| %> <%= group[:range] %> @@ -70,7 +70,7 @@ - <% stats[:participants_by_geozone].each do |geozone, participants| %> + <% stats.participants_by_geozone.each do |geozone, participants| %> <%= geozone %> <%= "#{participants[:total][:count]} (#{number_to_stats_percentage(participants[:total][:percentage])})" %> diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index f56ba3c1d..2f7091b9b 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -33,7 +33,7 @@ describe Budget::Stats do expect(stats.participants).to match_array( [author, author_and_voter, voter, voter_and_balloter, balloter, poll_balloter] ) - expect(stats.generate[:total_participants]).to be 6 + expect(stats.total_participants).to be 6 end end @@ -42,7 +42,7 @@ describe Budget::Stats do 2.times { create(:vote, votable: investment) } create(:budget_ballot_line, investment: investment) - expect(stats.generate[:total_participants_support_phase]).to be 2 + expect(stats.total_participants_support_phase).to be 2 end it "counts a user who is voter and balloter" do @@ -50,7 +50,7 @@ describe Budget::Stats do create(:vote, votable: investment, voter: voter_and_balloter) create(:budget_ballot_line, investment: investment, user: voter_and_balloter) - expect(stats.generate[:total_participants_support_phase]).to be 1 + expect(stats.total_participants_support_phase).to be 1 end end @@ -59,7 +59,7 @@ describe Budget::Stats do 2.times { create(:budget_ballot_line, investment: investment) } create(:vote, votable: investment) - expect(stats.generate[:total_participants_vote_phase]).to be 2 + expect(stats.total_participants_vote_phase).to be 2 end it "counts a user who is voter and balloter" do @@ -67,14 +67,14 @@ describe Budget::Stats do create(:vote, votable: investment, voter: voter_and_balloter) create(:budget_ballot_line, investment: investment, user: voter_and_balloter) - expect(stats.generate[:total_participants_vote_phase]).to be 1 + expect(stats.total_participants_vote_phase).to be 1 end it "includes balloters and poll balloters" do create(:budget_ballot_line, investment: investment) create(:poll_voter, :from_booth, budget: budget) - expect(stats.generate[:total_participants_vote_phase]).to be 2 + expect(stats.total_participants_vote_phase).to be 2 end it "counts once a user who is balloter and poll balloter" do @@ -82,7 +82,7 @@ describe Budget::Stats do create(:budget_ballot_line, investment: investment, user: poller_and_balloter) create(:poll_voter, :from_booth, user: poller_and_balloter, budget: budget) - expect(stats.generate[:total_participants_vote_phase]).to be 1 + expect(stats.total_participants_vote_phase).to be 1 end it "doesn't count nil user ids" do @@ -90,7 +90,7 @@ describe Budget::Stats do ballot: create(:budget_ballot, budget: budget, user: nil, physical: true) ) - expect(stats.generate[:total_participants_vote_phase]).to be 0 + expect(stats.total_participants_vote_phase).to be 0 end end @@ -99,7 +99,7 @@ describe Budget::Stats do 2.times { create(:budget_investment, budget: budget) } create(:budget_investment, budget: create(:budget)) - expect(stats.generate[:total_budget_investments]).to be 2 + expect(stats.total_budget_investments).to be 2 end end @@ -108,7 +108,7 @@ describe Budget::Stats do create(:budget_ballot_line, investment: investment) create(:budget_ballot_line, investment: create(:budget_investment, :selected, budget: budget)) - expect(stats.generate[:total_votes]).to be 2 + expect(stats.total_votes).to be 2 end end @@ -118,7 +118,7 @@ describe Budget::Stats do create(:budget_investment, :selected, budget: create(:budget)) create(:budget_investment, :unfeasible, budget: budget) - expect(stats.generate[:total_selected_investments]).to be 3 + expect(stats.total_selected_investments).to be 3 end end @@ -128,7 +128,7 @@ describe Budget::Stats do create(:budget_investment, :unfeasible, budget: create(:budget)) create(:budget_investment, :selected, budget: budget) - expect(stats.generate[:total_unfeasible_investments]).to be 3 + expect(stats.total_unfeasible_investments).to be 3 end end @@ -143,31 +143,31 @@ describe Budget::Stats do describe "#total_male_participants" do it "returns the number of total male participants" do - expect(stats.generate[:total_male_participants]).to be 3 + expect(stats.total_male_participants).to be 3 end end describe "#total_female_participants" do it "returns the number of total female participants" do - expect(stats.generate[:total_female_participants]).to be 2 + expect(stats.total_female_participants).to be 2 end end describe "#total_unknown_gender_or_age" do it "returns the number of total unknown participants' gender or age" do - expect(stats.generate[:total_unknown_gender_or_age]).to be 1 + expect(stats.total_unknown_gender_or_age).to be 1 end end describe "#male_percentage" do it "returns the percentage of male participants" do - expect(stats.generate[:male_percentage]).to be 60.0 + expect(stats.male_percentage).to be 60.0 end end describe "#female_percentage" do it "returns the percentage of female participants" do - expect(stats.generate[:female_percentage]).to be 40.0 + expect(stats.female_percentage).to be 40.0 end end end @@ -182,18 +182,18 @@ describe Budget::Stats do end it "returns the age groups hash" do - expect(stats.generate[:participants_by_age]["16 - 19"][:count]).to be 0 - expect(stats.generate[:participants_by_age]["20 - 24"][:count]).to be 4 - expect(stats.generate[:participants_by_age]["25 - 29"][:count]).to be 0 - expect(stats.generate[:participants_by_age]["30 - 34"][:count]).to be 1 - expect(stats.generate[:participants_by_age]["35 - 39"][:count]).to be 0 - expect(stats.generate[:participants_by_age]["40 - 44"][:count]).to be 3 - expect(stats.generate[:participants_by_age]["45 - 49"][:count]).to be 0 - expect(stats.generate[:participants_by_age]["50 - 54"][:count]).to be 2 - expect(stats.generate[:participants_by_age]["55 - 59"][:count]).to be 0 - expect(stats.generate[:participants_by_age]["60 - 64"][:count]).to be 0 - expect(stats.generate[:participants_by_age]["65 - 69"][:count]).to be 0 - expect(stats.generate[:participants_by_age]["70 - 74"][:count]).to be 0 + expect(stats.participants_by_age["16 - 19"][:count]).to be 0 + expect(stats.participants_by_age["20 - 24"][:count]).to be 4 + expect(stats.participants_by_age["25 - 29"][:count]).to be 0 + expect(stats.participants_by_age["30 - 34"][:count]).to be 1 + expect(stats.participants_by_age["35 - 39"][:count]).to be 0 + expect(stats.participants_by_age["40 - 44"][:count]).to be 3 + expect(stats.participants_by_age["45 - 49"][:count]).to be 0 + expect(stats.participants_by_age["50 - 54"][:count]).to be 2 + expect(stats.participants_by_age["55 - 59"][:count]).to be 0 + expect(stats.participants_by_age["60 - 64"][:count]).to be 0 + expect(stats.participants_by_age["65 - 69"][:count]).to be 0 + expect(stats.participants_by_age["70 - 74"][:count]).to be 0 end end @@ -206,7 +206,7 @@ describe Budget::Stats do end it "returns headings data" do - heading_stats = stats.generate[:headings][investment.heading.id] + heading_stats = stats.headings[investment.heading.id] expect(heading_stats[:total_investments_count]).to be 2 expect(heading_stats[:total_participants_support_phase]).to be 2 expect(heading_stats[:total_participants_vote_phase]).to be 1 diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 2b2fe6c7b..720d70a8a 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -183,44 +183,4 @@ describe Poll::Stats do expect(stats.participants_by_geozone["Midgar"][:percentage]).to eq(33.333) end end - - describe "#generate" do - it "generates the correct stats" do - poll = create(:poll) - 2.times { create(:poll_voter, :from_web, poll: poll) } - 3.times { create(:poll_voter, :from_booth, poll: poll) } - create(:poll_recount, :from_booth, poll: poll, - white_amount: 1, null_amount: 0, total_amount: 2) - - stats = Poll::Stats.new(poll).generate - - expect(stats[:total_participants]).to eq(5) - expect(stats[:total_participants_web]).to eq(2) - expect(stats[:total_participants_booth]).to eq(3) - expect(stats[:total_valid_votes]).to eq(4) - expect(stats[:total_white_votes]).to eq(1) - expect(stats[:total_null_votes]).to eq(0) - - expect(stats[:total_web_valid]).to eq(2) - expect(stats[:total_web_white]).to eq(0) - expect(stats[:total_web_null]).to eq(0) - - expect(stats[:total_booth_valid]).to eq(2) - expect(stats[:total_booth_white]).to eq(1) - expect(stats[:total_booth_null]).to eq(0) - - expect(stats[:total_participants_web_percentage]).to eq(40) - expect(stats[:total_participants_booth_percentage]).to eq(60) - expect(stats[:valid_percentage_web]).to eq(50) - expect(stats[:white_percentage_web]).to eq(0) - expect(stats[:null_percentage_web]).to eq(0) - expect(stats[:valid_percentage_booth]).to eq(50) - expect(stats[:white_percentage_booth]).to eq(100) - expect(stats[:null_percentage_booth]).to eq(0) - expect(stats[:total_valid_percentage]).to eq(80) - expect(stats[:total_white_percentage]).to eq(20) - expect(stats[:total_null_percentage]).to eq(0) - end - end - -end \ No newline at end of file +end From 793bfed37298fdb96048efa53e7c9396c511fb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 18 Mar 2019 18:07:09 +0100 Subject: [PATCH 54/82] Display only existing stats So if we don't have information regarding gender, age or geozone, stats regarding those topics will not be shown. Note we're using `spec/models/statisticable_spec.rb` because having the same file in `spec/models/concerns` caused the tests to be executed twice. Also note the implementation behind the `gender?`, `age?` and `geozone?` methods is a bit primitive. We might need to make it more robust in the future. --- app/models/concerns/statisticable.rb | 57 ++++++- app/views/budgets/stats/show.html.erb | 2 +- app/views/polls/stats.html.erb | 2 +- app/views/shared/stats/_age.html.erb | 28 ++++ app/views/shared/stats/_gender.html.erb | 15 ++ app/views/shared/stats/_geozone.html.erb | 23 +++ app/views/shared/stats/_links.html.erb | 15 +- .../shared/stats/_participation.html.erb | 72 +-------- spec/models/statisticable_spec.rb | 148 ++++++++++++++++++ 9 files changed, 277 insertions(+), 85 deletions(-) create mode 100644 app/views/shared/stats/_age.html.erb create mode 100644 app/views/shared/stats/_gender.html.erb create mode 100644 app/views/shared/stats/_geozone.html.erb create mode 100644 spec/models/statisticable_spec.rb diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 411bec21c..5c6289ed1 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -1,5 +1,6 @@ module Statisticable extend ActiveSupport::Concern + PARTICIPATIONS = %w[gender age geozone] included do attr_reader :resource @@ -9,7 +10,27 @@ module Statisticable end def generate - self.class.stats_methods.each { |stat_name| send(stat_name) } + stats_methods.each { |stat_name| send(stat_name) } + end + + def stats_methods + base_stats_methods + participation_methods + end + + def participations + PARTICIPATIONS.select { |participation| send("#{participation}?") } + end + + def gender? + participants.male.any? || participants.female.any? + end + + def age? + participants.between_ages(age_groups.flatten.min, age_groups.flatten.max).any? + end + + def geozone? + participants.where(geozone: geozones).any? end def total_male_participants @@ -66,6 +87,14 @@ module Statisticable private + def base_stats_methods + self.class.base_stats_methods + end + + def participation_methods + participations.map { |participation| self.class.send("#{participation}_methods") }.flatten + end + def total_participants_with_gender participants.where.not(gender: nil).distinct.count end @@ -115,10 +144,28 @@ module Statisticable class_methods do def stats_methods - %i[total_participants - total_male_participants total_female_participants total_unknown_gender_or_age - male_percentage female_percentage - participants_by_age participants_by_geozone] + base_stats_methods + gender_methods + age_methods + geozone_methods + end + + def base_stats_methods + %i[total_participants participations] + participation_check_methods + end + + def participation_check_methods + PARTICIPATIONS.map { |participation| :"#{participation}?" } + end + + def gender_methods + %i[total_male_participants total_female_participants total_unknown_gender_or_age + male_percentage female_percentage] + end + + def age_methods + [:participants_by_age] + end + + def geozone_methods + [:participants_by_geozone] end def stats_cache(*method_names) diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 7edf44342..5ce48bd88 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -40,7 +40,7 @@
      - <%= render "shared/stats/links" %> + <%= render "shared/stats/links", stats: @stats %>

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

        diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 55d103c97..da2a8351c 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -7,7 +7,7 @@
        - <%= render "shared/stats/links" %> + <%= render "shared/stats/links", stats: @stats %>

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

          diff --git a/app/views/shared/stats/_age.html.erb b/app/views/shared/stats/_age.html.erb new file mode 100644 index 000000000..5114c8b8c --- /dev/null +++ b/app/views/shared/stats/_age.html.erb @@ -0,0 +1,28 @@ +
          +

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

          + + + + + + + + + + + <% stats.participants_by_age.values.each do |group| %> + + + + + <% end %> + +
          <%= t("stats.age") %><%= t("stats.total") %>
          <%= group[:range] %> + + <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> + +
          + +
          +
          +
          diff --git a/app/views/shared/stats/_gender.html.erb b/app/views/shared/stats/_gender.html.erb new file mode 100644 index 000000000..7c34acce7 --- /dev/null +++ b/app/views/shared/stats/_gender.html.erb @@ -0,0 +1,15 @@ +
          +

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

          + + <%= number_with_info_tags( + stats.total_male_participants, + t("stats.men_percentage", percentage: number_to_stats_percentage(stats.male_percentage)), + html_class: "participants male" + ) %> + + <%= number_with_info_tags( + stats.total_female_participants, + t("stats.women_percentage", percentage: number_to_stats_percentage(stats.female_percentage)), + html_class: "participants female" + ) %> +
          diff --git a/app/views/shared/stats/_geozone.html.erb b/app/views/shared/stats/_geozone.html.erb new file mode 100644 index 000000000..683ae951e --- /dev/null +++ b/app/views/shared/stats/_geozone.html.erb @@ -0,0 +1,23 @@ +
          +

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

          + + + + + + + + + + + + <% stats.participants_by_geozone.each do |geozone, participants| %> + + + + + + <% end %> + +
          <%= t("stats.geozone") %><%= t("stats.total") %><%= t("stats.geozone_participation") %>
          <%= geozone %><%= "#{participants[:total][:count]} (#{number_to_stats_percentage(participants[:total][:percentage])})" %><%= number_to_stats_percentage(participants[:percentage]) %>
          +
          diff --git a/app/views/shared/stats/_links.html.erb b/app/views/shared/stats/_links.html.erb index 581cce4b2..8e869c45a 100644 --- a/app/views/shared/stats/_links.html.erb +++ b/app/views/shared/stats/_links.html.erb @@ -3,13 +3,10 @@
        • <%= link_to t("stats.total_participants"), "#total_participants" %>
          • -
        • - <%= link_to t("stats.by_gender"), "#participants_by_gender" %> -
          • -
        • - <%= link_to t("stats.by_age"), "#participants_by_age" %> -
          • -
        • - <%= link_to t("stats.by_geozone"), "#participants_by_geozone" %> -
          • + + <% stats.participations.each do |stat| %> +
        • + <%= link_to t("stats.by_#{stat}"), "#participants_by_#{stat}" %> +
          • + <% end %>
        diff --git a/app/views/shared/stats/_participation.html.erb b/app/views/shared/stats/_participation.html.erb index 0a4bd2f06..d15123dc2 100644 --- a/app/views/shared/stats/_participation.html.erb +++ b/app/views/shared/stats/_participation.html.erb @@ -11,73 +11,7 @@ ) %>
        -
        -

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

        - - <%= number_with_info_tags( - stats.total_male_participants, - t("stats.men_percentage", percentage: number_to_stats_percentage(stats.male_percentage)), - html_class: "participants male" - ) %> - - <%= number_with_info_tags( - stats.total_female_participants, - t("stats.women_percentage", percentage: number_to_stats_percentage(stats.female_percentage)), - html_class: "participants female" - ) %> -
        - -
        -

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

        - - - - - - - - - - - <% stats.participants_by_age.values.each do |group| %> - - - - - <% end %> - -
        <%= t("stats.age") %><%= t("stats.total") %>
        <%= group[:range] %> - - <%= "#{group[:count]} (#{number_to_stats_percentage(group[:percentage])})" %> - -
        - - -
        -
        -
        - -
        -

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

        - - - - - - - - - - - - <% stats.participants_by_geozone.each do |geozone, participants| %> - - - - - - <% end %> - -
        <%= t("stats.geozone") %><%= t("stats.total") %><%= t("stats.geozone_participation") %>
        <%= geozone %><%= "#{participants[:total][:count]} (#{number_to_stats_percentage(participants[:total][:percentage])})" %><%= number_to_stats_percentage(participants[:percentage]) %>
        -
        + <% stats.participations.each do |participation| %> + <%= render "shared/stats/#{participation}", stats: stats %> + <% end %>
        diff --git a/spec/models/statisticable_spec.rb b/spec/models/statisticable_spec.rb new file mode 100644 index 000000000..9794ef7bc --- /dev/null +++ b/spec/models/statisticable_spec.rb @@ -0,0 +1,148 @@ +require "rails_helper" + +describe Statisticable do + class DummyStats + include Statisticable + + def participants + User.all + end + end + + let(:stats) { DummyStats.new(nil) } + + describe "#gender?" do + context "No participants" do + it "is false" do + expect(stats.gender?).to be false + end + end + + context "All participants have no defined gender" do + before { create(:user, gender: nil) } + + it "is false" do + expect(stats.gender?).to be false + end + end + + context "There's a male participant" do + before { create(:user, gender: "male") } + + it "is true" do + expect(stats.gender?).to be true + end + end + + context "There's a female participant" do + before { create(:user, gender: "female") } + + it "is true" do + expect(stats.gender?).to be true + end + end + end + + describe "#age?" do + context "No participants" do + it "is false" do + expect(stats.age?).to be false + end + end + + context "All participants have no defined age" do + before { create(:user, date_of_birth: nil) } + + it "is false" do + expect(stats.age?).to be false + end + end + + context "All participants have impossible ages" do + before do + create(:user, date_of_birth: 3.seconds.ago) + create(:user, date_of_birth: 3000.years.ago) + end + + it "is false" do + expect(stats.age?).to be false + end + end + + context "There's a participant with a defined age" do + before { create(:user, date_of_birth: 30.years.ago) } + + it "is true" do + expect(stats.age?).to be true + end + end + end + + describe "#geozone?" do + context "No participants" do + it "is false" do + expect(stats.geozone?).to be false + end + end + + context "All participants have no defined geozone" do + before { create(:user, geozone: nil) } + + it "is false" do + expect(stats.geozone?).to be false + end + end + + context "There's a participant with a defined geozone" do + before { create(:user, geozone: create(:geozone)) } + + it "is true" do + expect(stats.geozone?).to be true + end + end + end + + describe "#stats_methods" do + it "includes total participants" do + expect(stats.stats_methods).to include(:total_participants) + end + + context "no gender stats" do + before { allow(stats).to receive(:gender?).and_return(false) } + + it "doesn't include gender methods" do + expect(stats.stats_methods).not_to include(:total_male_participants) + end + end + + context "no age stats" do + before { allow(stats).to receive(:age?).and_return(false) } + + it "doesn't include age methods" do + expect(stats.stats_methods).not_to include(:participants_by_age) + end + end + + context "no geozone stats" do + before { allow(stats).to receive(:geozone?).and_return(false) } + + it "doesn't include age methods" do + expect(stats.stats_methods).not_to include(:participants_by_geozone) + end + end + + context "all gender, age and geozone stats" do + before do + allow(stats).to receive(:gender?).and_return(true) + allow(stats).to receive(:age?).and_return(true) + allow(stats).to receive(:geozone?).and_return(true) + end + + it "includes all stats methods" do + expect(stats.stats_methods).to include(:total_male_participants) + expect(stats.stats_methods).to include(:participants_by_age) + expect(stats.stats_methods).to include(:participants_by_geozone) + end + end + end +end From 4843959c7d7742b05892c4208de83f610a697cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 18 Mar 2019 19:34:02 +0100 Subject: [PATCH 55/82] Use poll voters valid origins as stats channels They're the same thing, and duplicating them led into a typo saying "mail" instead of "letter". --- app/models/poll/stats.rb | 18 +++++++++--------- config/locales/en/stats.yml | 2 +- config/locales/es/stats.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 191139d5a..9cc13c726 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -2,19 +2,19 @@ class Poll::Stats include Statisticable alias_method :poll, :resource - CHANNELS = %i[web booth mail] + CHANNELS = Poll::Voter::VALID_ORIGINS def self.stats_methods super + %i[total_valid_votes total_white_votes total_null_votes total_participants_web total_web_valid total_web_white total_web_null total_participants_booth total_booth_valid total_booth_white total_booth_null - total_participants_mail total_mail_valid total_mail_white total_mail_null + total_participants_letter total_letter_valid total_letter_white total_letter_null total_participants_web_percentage total_participants_booth_percentage - total_participants_mail_percentage - valid_percentage_web valid_percentage_booth valid_percentage_mail total_valid_percentage - white_percentage_web white_percentage_booth white_percentage_mail total_white_percentage - null_percentage_web null_percentage_booth null_percentage_mail total_null_percentage] + total_participants_letter_percentage + valid_percentage_web valid_percentage_booth valid_percentage_letter total_valid_percentage + white_percentage_web white_percentage_booth white_percentage_letter total_white_percentage + null_percentage_web null_percentage_booth null_percentage_letter total_null_percentage] end def total_participants @@ -57,15 +57,15 @@ class Poll::Stats recounts.sum(:null_amount) end - def total_mail_valid + def total_letter_valid 0 # TODO end - def total_mail_white + def total_letter_white 0 # TODO end - def total_mail_null + def total_letter_null 0 # TODO end diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 2c64e70b3..df2bd9549 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -38,4 +38,4 @@ en: vote_by_channel: "Vote type by channel" web_percentage: "%{percentage} Web" booth_percentage: "%{percentage} Booths" - mail_percentage: "%{percentage} Mail" + letter_percentage: "%{percentage} Mail" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 1e6827a97..de363b7e2 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -38,4 +38,4 @@ es: vote_by_channel: "Votos emitidos por medio" web_percentage: "%{percentage} Web" booth_percentage: "%{percentage} Urnas" - mail_percentage: "%{percentage} Correo" + letter_percentage: "%{percentage} Correo" From 6b0b9db9694bbfea3632cca1e63993bf5c15b7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 18 Mar 2019 19:43:44 +0100 Subject: [PATCH 56/82] Display only poll stats for used channels So if there's no vote using by mail (which is the case in some places), no stats related to voting via mail are displayed. --- app/models/poll/stats.rb | 6 ++++- app/views/polls/stats.html.erb | 12 ++++----- spec/models/poll/stats_spec.rb | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 9cc13c726..62b53a15b 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -21,6 +21,10 @@ class Poll::Stats total_participants_web + total_participants_booth end + def channels + CHANNELS.select { |channel| send(:"total_participants_#{channel}") > 0 } + end + CHANNELS.each do |channel| define_method :"total_participants_#{channel}" do send(:"total_#{channel}_valid") + @@ -58,7 +62,7 @@ class Poll::Stats end def total_letter_valid - 0 # TODO + voters.where(origin: "letter").count # TODO: count only valid votes end def total_letter_white diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index da2a8351c..7fb485e83 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -29,7 +29,7 @@

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

        - <% Poll::Stats::CHANNELS.each do |channel| %> + <% @stats.channels.each do |channel| %> <%= number_with_info_tags( @stats.send("total_participants_#{channel}"), t("stats.polls.#{channel}_percentage", @@ -47,7 +47,7 @@ <%= t("polls.show.stats.votes") %> - <% Poll::Stats::CHANNELS.each do |channel| %> + <% @stats.channels.each do |channel| %> <%= t("polls.show.stats.#{channel}") %> <% end %> <%= t("polls.show.stats.total") %> @@ -57,7 +57,7 @@ <%= t("polls.show.stats.valid") %> - <% Poll::Stats::CHANNELS.each do |channel| %> + <% @stats.channels.each do |channel| %> <%= @stats.send(:"total_#{channel}_valid") %> (<%= @stats.send(:"valid_percentage_#{channel}").round(2) %>%) @@ -73,7 +73,7 @@ <%= t("polls.show.stats.white") %> - <% Poll::Stats::CHANNELS.each do |channel| %> + <% @stats.channels.each do |channel| %> <%= @stats.send(:"total_#{channel}_white") %> (<%= @stats.send(:"white_percentage_#{channel}").round(2) %>%) @@ -87,7 +87,7 @@ <%= t("polls.show.stats.null_votes") %> - <% Poll::Stats::CHANNELS.each do |channel| %> + <% @stats.channels.each do |channel| %> <%= @stats.send(:"total_#{channel}_null") %> (<%= @stats.send(:"null_percentage_#{channel}").round(2) %>%) @@ -102,7 +102,7 @@ <%= t("polls.show.stats.total") %> - <% Poll::Stats::CHANNELS.each do |channel| %> + <% @stats.channels.each do |channel| %> <%= @stats.send(:"total_participants_#{channel}") %> (<%= @stats.send(:"total_participants_#{channel}_percentage").round(2) %>%) diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 720d70a8a..8199a593c 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -183,4 +183,50 @@ describe Poll::Stats do expect(stats.participants_by_geozone["Midgar"][:percentage]).to eq(33.333) end end + + describe "#channels" do + context "no participants" do + it "returns no channels" do + expect(stats.channels).to eq [] + end + end + + context "only participants from web" do + before { create(:poll_voter, :from_web, poll: poll) } + + it "returns the web channel" do + expect(stats.channels).to eq ["web"] + end + end + + context "only participants from booth" do + before do + create(:poll_recount, :from_booth, poll: poll, total_amount: 1) + end + + it "returns the booth channel" do + expect(stats.channels).to eq ["booth"] + end + end + + context "only participants from letter" do + before { create(:poll_voter, origin: "letter", poll: poll) } + + it "returns the web channel" do + expect(stats.channels).to eq ["letter"] + end + end + + context "participants from all channels" do + before do + create(:poll_voter, :from_web, poll: poll) + create(:poll_recount, :from_booth, poll: poll, total_amount: 1) + create(:poll_voter, origin: "letter", poll: poll) + end + + it "returns all channels" do + expect(stats.channels).to eq %w[web booth letter] + end + end + end end From 875cfac406dbbbd95c008c949290019e44d7f7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 19 Mar 2019 20:06:21 +0100 Subject: [PATCH 57/82] Cache poll participants It looks like generating the poll takes sometime due to that method. --- app/models/poll/stats.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 62b53a15b..4191f0715 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -104,7 +104,7 @@ class Poll::Stats end stats_cache(*stats_methods) - stats_cache :voters, :recounts + stats_cache :participants, :voters, :recounts def stats_cache(key, &block) Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/v12", &block) From 7a79c36137f3b972fbc1b5783ac6aadce38c8b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 20 Mar 2019 13:55:49 +0100 Subject: [PATCH 58/82] Select only distinct voters/balloters in stats It is way more efficient because we're caching the result of that method, and this way we only store each voter once in the cache. We were storing many voters several times and then we were filtering them with `uniq`. --- app/models/budget/stats.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index a61013fe6..7cd4d40f1 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -18,7 +18,7 @@ class Budget::Stats end def total_participants_support_phase - voters.uniq.count + voters.count end def total_participants_vote_phase @@ -71,11 +71,11 @@ class Budget::Stats end def voters - supports(budget).pluck(:voter_id) + supports(budget).distinct.pluck(:voter_id) end def balloters - budget.ballots.where("ballot_lines_count > ?", 0).pluck(:user_id).compact + budget.ballots.where("ballot_lines_count > ?", 0).distinct.pluck(:user_id).compact end def poll_ballot_voters @@ -84,21 +84,23 @@ class Budget::Stats def balloters_by_heading(heading_id) stats_cache("balloters_by_heading_#{heading_id}") do - budget.ballots.joins(:lines).where(budget_ballot_lines: {heading_id: heading_id}).pluck(:user_id) + budget.ballots.joins(:lines) + .where(budget_ballot_lines: { heading_id: heading_id} ) + .distinct.pluck(:user_id) end end def voters_by_heading(heading) stats_cache("voters_by_heading_#{heading.id}") do - supports(heading).pluck(:voter_id) + supports(heading).distinct.pluck(:voter_id) end end def calculate_heading_totals(heading) { total_investments_count: heading.investments.count, - total_participants_support_phase: voters_by_heading(heading).uniq.count, - total_participants_vote_phase: balloters_by_heading(heading.id).uniq.count, + total_participants_support_phase: voters_by_heading(heading).count, + total_participants_vote_phase: balloters_by_heading(heading.id).count, total_participants_all_phase: voters_and_balloters_by_heading(heading) } end From a13a8a2270610e2db9028d6a53a6c81b557d85f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 20 Mar 2019 14:00:05 +0100 Subject: [PATCH 59/82] Simplify code to calculate supports The code is easier to read now, it returns the same results it used to return, and performance-wise it's probably the same thing, but if it's not, we'll trust Rails will do optimizations that we don't when we manually pluck the IDs. --- app/models/budget/stats.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 7cd4d40f1..513fc0af4 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -130,7 +130,7 @@ class Budget::Stats end def supports(supportable) - ActsAsVotable::Vote.where(votable_type: "Budget::Investment", votable_id: supportable.investments.pluck(:id)) + Vote.where(votable: supportable.investments) end stats_cache(*stats_methods) From 558070d53087a372b2617faa0a103bd69565e86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 19 Mar 2019 12:38:27 +0100 Subject: [PATCH 60/82] Remove geozone participation percentage We currently don't store geozone population. --- app/models/concerns/statisticable.rb | 7 ++----- app/views/shared/stats/_geozone.html.erb | 4 +--- config/locales/en/stats.yml | 1 - config/locales/es/stats.yml | 1 - spec/models/poll/stats_spec.rb | 15 ++++----------- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 5c6289ed1..a19d9d962 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -75,11 +75,8 @@ module Statisticable [ geozone.name, { - total: { - count: count, - percentage: calculate_percentage(count, total_participants) - }, - percentage: calculate_percentage(count, geozone.users.count) + count: count, + percentage: calculate_percentage(count, total_participants) } ] end.to_h diff --git a/app/views/shared/stats/_geozone.html.erb b/app/views/shared/stats/_geozone.html.erb index 683ae951e..62828dc73 100644 --- a/app/views/shared/stats/_geozone.html.erb +++ b/app/views/shared/stats/_geozone.html.erb @@ -6,7 +6,6 @@ <%= t("stats.geozone") %> <%= t("stats.total") %> - <%= t("stats.geozone_participation") %> @@ -14,8 +13,7 @@ <% stats.participants_by_geozone.each do |geozone, participants| %> <%= geozone %> - <%= "#{participants[:total][:count]} (#{number_to_stats_percentage(participants[:total][:percentage])})" %> - <%= number_to_stats_percentage(participants[:percentage]) %> + <%= "#{participants[:count]} (#{number_to_stats_percentage(participants[:percentage])})" %> <% end %> diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index df2bd9549..f02b4360c 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -13,7 +13,6 @@ en: age_range: "%{start} - %{finish} years old" total: "Total" geozone: "District" - geozone_participation: "% District population participants" budgets: link: "Stats" page_title: "%{budget} - Participation stats" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index de363b7e2..323d026a3 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -13,7 +13,6 @@ es: age_range: "De %{start} a %{finish} años" total: "Total" geozone: "Distrito" - geozone_participation: "% Participantes población del distrito" budgets: link: "Estadísticas" page_title: "%{budget} - Estadísticas de participación" diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 8199a593c..e55d51169 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -170,17 +170,10 @@ describe Poll::Stats do 3.times { create :poll_voter, poll: poll, user: create(:user, :level_two, geozone: hobbiton) } 2.times { create :poll_voter, poll: poll, user: create(:user, :level_two, geozone: rivendel) } - expect(stats.participants_by_geozone["Hobbiton"][:total]).to eq(count: 3, percentage: 60.0) - expect(stats.participants_by_geozone["Rivendel"][:total]).to eq(count: 2, percentage: 40.0) - end - - it "calculates percentage relative to the geozone population" do - midgar = create(:geozone, name: "Midgar") - - create(:poll_voter, poll: poll, user: create(:user, :level_two, geozone: midgar)) - 2.times { create :user, :level_two, geozone: midgar } - - expect(stats.participants_by_geozone["Midgar"][:percentage]).to eq(33.333) + expect(stats.participants_by_geozone["Hobbiton"][:count]).to eq 3 + expect(stats.participants_by_geozone["Hobbiton"][:percentage]).to eq 60.0 + expect(stats.participants_by_geozone["Rivendel"][:count]).to eq 2 + expect(stats.participants_by_geozone["Rivendel"][:percentage]).to eq 40.0 end end From 383909e16cfed5d76d0c543c693275e94ef6e40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 19 Mar 2019 13:04:38 +0100 Subject: [PATCH 61/82] Extract class to manage GeozoneStats Even if this class looks very simple now, we're trying a few things related to these stats. Having a class for it makes future changes easier and, if there weren't any future changes, at least it makes current experiments easier. Note we keep the method `participants_by_geozone` to return a hash because we're caching the stats and storing GeozoneStats objects would need a lot more memory and we would get an error. --- app/models/concerns/statisticable.rb | 20 ++++++------- lib/geozone_stats.rb | 24 +++++++++++++++ lib/percentage_calculator.rb | 7 +++++ spec/lib/geozone_stats_spec.rb | 44 ++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 lib/geozone_stats.rb create mode 100644 lib/percentage_calculator.rb create mode 100644 spec/lib/geozone_stats_spec.rb diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index a19d9d962..5e62e31a2 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -69,19 +69,21 @@ module Statisticable end def participants_by_geozone - geozones.map do |geozone| - count = participants.where(geozone: geozone).count - + geozone_stats.map do |stats| [ - geozone.name, + stats.name, { - count: count, - percentage: calculate_percentage(count, total_participants) + count: stats.count, + percentage: stats.percentage } ] end.to_h end + def calculate_percentage(fraction, total) + PercentageCalculator.calculate(fraction, total) + end + private def base_stats_methods @@ -124,10 +126,8 @@ module Statisticable Geozone.all.order("name") end - def calculate_percentage(fraction, total) - return 0.0 if total.zero? - - (fraction * 100.0 / total).round(3) + def geozone_stats + geozones.map { |geozone| GeozoneStats.new(geozone, participants) } end def range_description(start, finish) diff --git a/lib/geozone_stats.rb b/lib/geozone_stats.rb new file mode 100644 index 000000000..6b7971610 --- /dev/null +++ b/lib/geozone_stats.rb @@ -0,0 +1,24 @@ +class GeozoneStats + attr_reader :geozone, :participants + + def initialize(geozone, participants) + @geozone = geozone + @participants = participants + end + + def geozone_participants + participants.where(geozone: geozone) + end + + def name + geozone.name + end + + def count + geozone_participants.count + end + + def percentage + PercentageCalculator.calculate(count, participants.count) + end +end diff --git a/lib/percentage_calculator.rb b/lib/percentage_calculator.rb new file mode 100644 index 000000000..bb8f3d355 --- /dev/null +++ b/lib/percentage_calculator.rb @@ -0,0 +1,7 @@ +module PercentageCalculator + def self.calculate(fraction, total) + return 0.0 if total.zero? + + (fraction * 100.0 / total).round(3) + end +end diff --git a/spec/lib/geozone_stats_spec.rb b/spec/lib/geozone_stats_spec.rb new file mode 100644 index 000000000..570315406 --- /dev/null +++ b/spec/lib/geozone_stats_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +describe GeozoneStats do + let(:winterfell) { create(:geozone, name: "Winterfell") } + let(:riverlands) { create(:geozone, name: "Riverlands") } + + describe "#name" do + let(:stats) { GeozoneStats.new(winterfell, []) } + + it "returns the geozone name" do + expect(stats.name).to eq "Winterfell" + end + end + + describe "#count" do + before do + 2.times { create(:user, geozone: winterfell) } + 1.times { create(:user, geozone: riverlands) } + end + + let(:winterfell_stats) { GeozoneStats.new(winterfell, User.all) } + let(:riverlands_stats) { GeozoneStats.new(riverlands, User.all) } + + it "counts participants from the geozone" do + expect(winterfell_stats.count).to eq 2 + expect(riverlands_stats.count).to eq 1 + end + end + + describe "#percentage" do + before do + 2.times { create(:user, geozone: winterfell) } + 1.times { create(:user, geozone: riverlands) } + end + + let(:winterfell_stats) { GeozoneStats.new(winterfell, User.all) } + let(:riverlands_stats) { GeozoneStats.new(riverlands, User.all) } + + it "calculates percentage relative to the amount of participants" do + expect(winterfell_stats.percentage).to eq 66.667 + expect(riverlands_stats.percentage).to eq 33.333 + end + end +end From ae4cd06c2409442cd51b63c46b3193baca2e3f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 3 Apr 2019 20:02:58 +0200 Subject: [PATCH 62/82] Include no geozone in no demographic data --- app/models/concerns/statisticable.rb | 9 ++++---- app/views/budgets/stats/show.html.erb | 4 ++-- app/views/polls/stats.html.erb | 6 +++++ config/locales/en/stats.yml | 2 +- config/locales/es/stats.yml | 2 +- spec/models/budget/stats_spec.rb | 6 ----- spec/models/statisticable_spec.rb | 32 +++++++++++++++++++++++++++ 7 files changed, 46 insertions(+), 15 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 5e62e31a2..8eed2e0ca 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -41,8 +41,8 @@ module Statisticable participants.female.count end - def total_unknown_gender_or_age - participants.where("gender IS NULL OR date_of_birth is NULL").uniq.count + def total_no_demographic_data + participants.where("gender IS NULL OR date_of_birth IS NULL OR geozone_id IS NULL").count end def male_percentage @@ -153,8 +153,7 @@ module Statisticable end def gender_methods - %i[total_male_participants total_female_participants total_unknown_gender_or_age - male_percentage female_percentage] + %i[total_male_participants total_female_participants male_percentage female_percentage] end def age_methods @@ -162,7 +161,7 @@ module Statisticable end def geozone_methods - [:participants_by_geozone] + %i[participants_by_geozone total_no_demographic_data] end def stats_cache(*method_names) diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 5ce48bd88..0f19d2d41 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -145,9 +145,9 @@
        -
        +

        - <%= t("stats.budgets.no_demographic_data", total: @stats.total_unknown_gender_or_age) %> + <%= t("stats.no_demographic_data", total: @stats.total_no_demographic_data) %>

        <%= t("stats.budgets.participatory_disclaimer") %> diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 7fb485e83..d6ebc71b4 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -114,6 +114,12 @@

        + +
        +

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

        +
        diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index f02b4360c..99bcdf99e 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -13,6 +13,7 @@ en: age_range: "%{start} - %{finish} years old" total: "Total" geozone: "District" + no_demographic_data: "* There is no demographic data for %{total} participants." budgets: link: "Stats" page_title: "%{budget} - Participation stats" @@ -29,7 +30,6 @@ en: participants_total: "Total Participants" percent_total_participants_html: "%
        Total
        Participants" percent_heading_census_html: "%
        Heading
        Census" - no_demographic_data: "* There is no demographic data for %{total} participants." participatory_disclaimer: "** The numbers of total participants refer to persons that created, supported or voted investment proposals." heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on." polls: diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 323d026a3..dac0beee0 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -13,6 +13,7 @@ es: age_range: "De %{start} a %{finish} años" total: "Total" geozone: "Distrito" + no_demographic_data: "* No se dispone de los datos demográficos de %{total} participantes." budgets: link: "Estadísticas" page_title: "%{budget} - Estadísticas de participación" @@ -29,7 +30,6 @@ es: participants_total: Total de participantes percent_total_participants_html: "%
        Total
        Participantes" percent_heading_census_html: "%
        Censo
        Distrito" - no_demographic_data: "* No se dispone de los datos demográficos de %{total} participantes." participatory_disclaimer: "** Las cifras de total de participantes se refieren a personas que han creado, apoyado o votado propuestas." heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado." polls: diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 2f7091b9b..71630e21e 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -153,12 +153,6 @@ describe Budget::Stats do end end - describe "#total_unknown_gender_or_age" do - it "returns the number of total unknown participants' gender or age" do - expect(stats.total_unknown_gender_or_age).to be 1 - end - end - describe "#male_percentage" do it "returns the percentage of male participants" do expect(stats.male_percentage).to be 60.0 diff --git a/spec/models/statisticable_spec.rb b/spec/models/statisticable_spec.rb index 9794ef7bc..3757d3db8 100644 --- a/spec/models/statisticable_spec.rb +++ b/spec/models/statisticable_spec.rb @@ -102,6 +102,38 @@ describe Statisticable do end end + describe "#total_no_demographic_data" do + it "returns users with no defined gender" do + create(:user, gender: nil) + + expect(stats.total_no_demographic_data).to be 1 + end + + it "returns users with no defined age" do + create(:user, gender: "female", date_of_birth: nil) + + expect(stats.total_no_demographic_data).to be 1 + end + + it "returns users with no defined geozone" do + create(:user, gender: "female", geozone: nil) + + expect(stats.total_no_demographic_data).to be 1 + end + + it "returns users with no defined gender, age nor geozone" do + create(:user, gender: nil, date_of_birth: nil, geozone: nil) + + expect(stats.total_no_demographic_data).to be 1 + end + + it "doesn't return users with defined gender, age and geozone" do + create(:user, gender: "male", date_of_birth: 20.years.ago, geozone: create(:geozone)) + + expect(stats.total_no_demographic_data).to be 0 + end + end + describe "#stats_methods" do it "includes total participants" do expect(stats.stats_methods).to include(:total_participants) From e146fafb605c771198ed295aa76556a7c9a140b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 4 Apr 2019 13:34:30 +0200 Subject: [PATCH 63/82] Only show "no demographic data" when necessary If there's demographic data for all participants, it doesn't make sense to show the message. We're using translations instead of an `if` in the view because the text is also different when there's only one participant. In some languages the text might also be different depending on how many people with no demographic data participated. Another possibility would be to use an `if` in the view so we don't display an empty paragraph when the cont is zero, and then using translation for `one` and `other`. I haven't gone that way because I thought the logic would be more complex and the benefits wouldn't be that great. --- app/views/budgets/stats/show.html.erb | 2 +- app/views/polls/stats.html.erb | 2 +- config/locales/en/stats.yml | 5 ++++- config/locales/es/stats.yml | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 0f19d2d41..f17685f97 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -147,7 +147,7 @@

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

        <%= t("stats.budgets.participatory_disclaimer") %> diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index d6ebc71b4..1284b26fa 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -117,7 +117,7 @@

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

        diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 99bcdf99e..cd6eae23f 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -13,7 +13,10 @@ en: age_range: "%{start} - %{finish} years old" total: "Total" geozone: "District" - no_demographic_data: "* There is no demographic data for %{total} participants." + no_demographic_data: + zero: "" + one: "* There is no demographic data for 1 participant." + other: "* There is no demographic data for %{count} participants." budgets: link: "Stats" page_title: "%{budget} - Participation stats" diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index dac0beee0..0425c7ec8 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -13,7 +13,10 @@ es: age_range: "De %{start} a %{finish} años" total: "Total" geozone: "Distrito" - no_demographic_data: "* No se dispone de los datos demográficos de %{total} participantes." + no_demographic_data: + zero: "" + one: "* No se dispone de los datos demográficos de 1 participante." + other: "* No se dispone de los datos demográficos de %{count} participantes." budgets: link: "Estadísticas" page_title: "%{budget} - Estadísticas de participación" From 2215971a6bbca37d07c8841e0f676eddf7efcce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 20 Mar 2019 17:09:56 +0100 Subject: [PATCH 64/82] Remove unused code --- spec/models/budget/phase_spec.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/spec/models/budget/phase_spec.rb b/spec/models/budget/phase_spec.rb index 81c3c9a63..e88d42b02 100644 --- a/spec/models/budget/phase_spec.rb +++ b/spec/models/budget/phase_spec.rb @@ -7,17 +7,8 @@ describe Budget::Phase do let(:second_phase) { budget.phases.informing } let(:third_phase) { budget.phases.accepting } let(:fourth_phase) { budget.phases.reviewing } - let(:fifth_phase) { budget.phases.selecting } let(:final_phase) { budget.phases.finished} - before do - first_phase.update_attributes(starts_at: Date.current - 3.days, ends_at: Date.current - 1.day) - second_phase.update_attributes(starts_at: Date.current - 1.days, ends_at: Date.current + 1.day) - third_phase.update_attributes(starts_at: Date.current + 1.days, ends_at: Date.current + 3.day) - fourth_phase.update_attributes(starts_at: Date.current + 3.days, ends_at: Date.current + 5.day) - fifth_phase.update_attributes(starts_at: Date.current + 5.days, ends_at: Date.current + 7.day) - end - describe "validates" do it "is not valid without a budget" do expect(build(:budget_phase, budget: nil)).not_to be_valid From 005a708adc462931e684641d566aae11f824a707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 21 Mar 2019 11:22:00 +0100 Subject: [PATCH 65/82] Don't use `find_by` in scopes As the Rails guides say: > All scope methods will return an ActiveRecord::Relation object That means `find_by_kind` will return a relation when nothing is found; the expected behaviour is to return `nil`, like all `find_by` methods do. Using scopes also means strange things happen when we try to chain scopes like `phases.published.drafting`. With scopes, the `drafting` part would be ignored and all published phases would be returned. --- app/models/budget/phase.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index 5912a1453..b10bd4837 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -28,16 +28,10 @@ class Budget scope :enabled, -> { where(enabled: true) } scope :published, -> { enabled.where.not(kind: "drafting") } - scope :drafting, -> { find_by_kind("drafting") } - scope :informing, -> { find_by_kind("informing") } - scope :accepting, -> { find_by_kind("accepting")} - scope :reviewing, -> { find_by_kind("reviewing")} - scope :selecting, -> { find_by_kind("selecting")} - scope :valuating, -> { find_by_kind("valuating")} - scope :publishing_prices, -> { find_by_kind("publishing_prices")} - scope :balloting, -> { find_by_kind("balloting")} - scope :reviewing_ballots, -> { find_by_kind("reviewing_ballots")} - scope :finished, -> { find_by_kind("finished")} + + PHASE_KINDS.each do |phase| + define_singleton_method(phase) { find_by_kind(phase) } + end def next_enabled_phase next_phase&.enabled? ? next_phase : next_phase&.next_enabled_phase From c8146e13db60c333739b3a6e60320052b2a7283c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 21 Mar 2019 11:40:52 +0100 Subject: [PATCH 66/82] Indent private methods following our syntax rules --- app/models/budget/phase.rb | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index b10bd4837..5204d217a 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -49,40 +49,40 @@ class Budget private - def adjust_date_ranges - if enabled? - next_enabled_phase&.update_column(:starts_at, ends_at) - prev_enabled_phase&.update_column(:ends_at, starts_at) - elsif enabled_changed? - next_enabled_phase&.update_column(:starts_at, starts_at) - end - end - - def touch_budget - budget.touch - end - - def prev_phase_dates_valid? - if enabled? && starts_at.present? && prev_enabled_phase.present? - prev_enabled_phase.assign_attributes(ends_at: starts_at) - if prev_enabled_phase.invalid_dates_range? - phase_name = I18n.t("budgets.phase.#{prev_enabled_phase.kind}") - error = I18n.t("budgets.phases.errors.prev_phase_dates_invalid", phase_name: phase_name) - errors.add(:starts_at, error) + def adjust_date_ranges + if enabled? + next_enabled_phase&.update_column(:starts_at, ends_at) + prev_enabled_phase&.update_column(:ends_at, starts_at) + elsif enabled_changed? + next_enabled_phase&.update_column(:starts_at, starts_at) end end - end - def next_phase_dates_valid? - if enabled? && ends_at.present? && next_enabled_phase.present? - next_enabled_phase.assign_attributes(starts_at: ends_at) - if next_enabled_phase.invalid_dates_range? - phase_name = I18n.t("budgets.phase.#{next_enabled_phase.kind}") - error = I18n.t("budgets.phases.errors.next_phase_dates_invalid", phase_name: phase_name) - errors.add(:ends_at, error) + def touch_budget + budget.touch + end + + def prev_phase_dates_valid? + if enabled? && starts_at.present? && prev_enabled_phase.present? + prev_enabled_phase.assign_attributes(ends_at: starts_at) + if prev_enabled_phase.invalid_dates_range? + phase_name = I18n.t("budgets.phase.#{prev_enabled_phase.kind}") + error = I18n.t("budgets.phases.errors.prev_phase_dates_invalid", phase_name: phase_name) + errors.add(:starts_at, error) + end + end + end + + def next_phase_dates_valid? + if enabled? && ends_at.present? && next_enabled_phase.present? + next_enabled_phase.assign_attributes(starts_at: ends_at) + if next_enabled_phase.invalid_dates_range? + phase_name = I18n.t("budgets.phase.#{next_enabled_phase.kind}") + error = I18n.t("budgets.phases.errors.next_phase_dates_invalid", phase_name: phase_name) + errors.add(:ends_at, error) + end end end - end end end From 1f225c59ed142462a0d64a6acc1fe3844c741a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 20 Mar 2019 17:53:24 +0100 Subject: [PATCH 67/82] Use PHASE_KINDS to calculate "or_later?" methods This implementation is a bit more robust because we don't have to change any of the "or_later?" methods if we add or remove a new phase. We could also use metaprogramming to reduce code duplication in these methods. So far, I've decided to keep the code simple since the duplication seems reasonable. --- app/models/budget.rb | 4 ++-- app/models/budget/phase.rb | 12 ++++++++++ spec/models/budget_spec.rb | 49 +++++++++++++++++++++----------------- 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/app/models/budget.rb b/app/models/budget.rb index 8cc5c9b8f..19cc85a10 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -126,7 +126,7 @@ class Budget < ApplicationRecord end def publishing_prices_or_later? - publishing_prices? || balloting_or_later? + current_phase&.publishing_prices_or_later? end def balloting_process? @@ -134,7 +134,7 @@ class Budget < ApplicationRecord end def balloting_or_later? - balloting_process? || finished? + current_phase&.balloting_or_later? end def heading_price(heading) diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index 5204d217a..cbacefa60 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -47,6 +47,14 @@ class Budget end end + def publishing_prices_or_later? + in_phase_or_later?("publishing_prices") + end + + def balloting_or_later? + in_phase_or_later?("balloting") + end + private def adjust_date_ranges @@ -84,5 +92,9 @@ class Budget end end + def in_phase_or_later?(phase) + PHASE_KINDS.index(kind) >= PHASE_KINDS.index(phase) + end + end end diff --git a/spec/models/budget_spec.rb b/spec/models/budget_spec.rb index da069f558..d5fc6ffc4 100644 --- a/spec/models/budget_spec.rb +++ b/spec/models/budget_spec.rb @@ -97,33 +97,38 @@ describe Budget do expect(budget).to be_finished end - it "balloting_or_later?" do - budget.phase = "drafting" - expect(budget).not_to be_balloting_or_later + describe "#publishing_prices_or_later?" do + it "returns false before publishing prices" do + budget.phase = "valuating" + expect(budget).not_to be_publishing_prices_or_later + end - budget.phase = "accepting" - expect(budget).not_to be_balloting_or_later + it "returns true while publishing prices" do + budget.phase = "publishing_prices" + expect(budget).to be_publishing_prices_or_later + end - budget.phase = "reviewing" - expect(budget).not_to be_balloting_or_later + it "returns true after publishing prices" do + budget.phase = "balloting" + expect(budget).to be_publishing_prices_or_later + end + end - budget.phase = "selecting" - expect(budget).not_to be_balloting_or_later + describe "#balloting_or_later?" do + it "returns false before balloting" do + budget.phase = "publishing_prices" + expect(budget).not_to be_balloting_or_later + end - budget.phase = "valuating" - expect(budget).not_to be_balloting_or_later + it "returns true while balloting" do + budget.phase = "balloting" + expect(budget).to be_balloting_or_later + end - budget.phase = "publishing_prices" - expect(budget).not_to be_balloting_or_later - - budget.phase = "balloting" - expect(budget).to be_balloting_or_later - - budget.phase = "reviewing_ballots" - expect(budget).to be_balloting_or_later - - budget.phase = "finished" - expect(budget).to be_balloting_or_later + it "returns true after balloting" do + budget.phase = "finished" + expect(budget).to be_balloting_or_later + end end end From 8bb0fa472668be31278ecdcaa94e9d83c614b17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 20 Mar 2019 18:12:08 +0100 Subject: [PATCH 68/82] Add Budget#valuating_or_later? method We're going to use it so we know if a budget has finished its support phase. --- app/models/budget.rb | 4 ++++ app/models/budget/phase.rb | 4 ++++ spec/models/budget_spec.rb | 17 +++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/app/models/budget.rb b/app/models/budget.rb index 19cc85a10..8d65d63e3 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -125,6 +125,10 @@ class Budget < ApplicationRecord Budget::Phase::PUBLISHED_PRICES_PHASES.include?(phase) end + def valuating_or_later? + current_phase&.valuating_or_later? + end + def publishing_prices_or_later? current_phase&.publishing_prices_or_later? end diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index cbacefa60..125368ccd 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -47,6 +47,10 @@ class Budget end end + def valuating_or_later? + in_phase_or_later?("valuating") + end + def publishing_prices_or_later? in_phase_or_later?("publishing_prices") end diff --git a/spec/models/budget_spec.rb b/spec/models/budget_spec.rb index d5fc6ffc4..87063b549 100644 --- a/spec/models/budget_spec.rb +++ b/spec/models/budget_spec.rb @@ -97,6 +97,23 @@ describe Budget do expect(budget).to be_finished end + describe "#valuating_or_later?" do + it "returns false before valuating" do + budget.phase = "selecting" + expect(budget).not_to be_valuating_or_later + end + + it "returns true while valuating" do + budget.phase = "valuating" + expect(budget).to be_valuating_or_later + end + + it "returns true after valuating" do + budget.phase = "publishing_prices" + expect(budget).to be_valuating_or_later + end + end + describe "#publishing_prices_or_later?" do it "returns false before publishing prices" do budget.phase = "valuating" From ba67bb2f9859d58556d77fb3c87d549433a9e131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 4 Apr 2019 14:54:16 +0200 Subject: [PATCH 69/82] Move survey district styles to stats stylesheet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So these styles are available in CONSUL. Note we're not including these styles inside `.participation-stats` because this class is used in Plaza de España's statistics. --- app/assets/stylesheets/stats.scss | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index 2844989cd..be084755b 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -172,3 +172,46 @@ } } } + +table { + + &.survey-districts { + + @include breakpoint(medium down) { + thead { + font-size: rem-calc(12); + + th { + width: 25%; + word-break: break-all; + } + } + } + + tr th { + border: 1px solid $border; + padding-left: 0; + padding-right: 0; + text-align: center; + } + + .tiny { + font-size: rem-calc(11); + font-weight: normal; + } + + .success { + background: #c1fdd2; + } + + .border-left-success { + background: #c1fdd2; + border-left: 2px solid #58ff87; + } + + .border-right-success { + background: #c1fdd2; + border-right: 2px solid #58ff87; + } + } +} From bf2292ba189d2f66e647b78cb93721b9b7fee408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 19 Mar 2019 13:36:04 +0100 Subject: [PATCH 70/82] Rename budget stats "all phase" to "every phase" "All phase" doesn't sound right in English, and we're going to refactor the code related to the phases. --- app/models/budget/stats.rb | 10 +++++----- app/views/budgets/stats/show.html.erb | 2 +- spec/models/budget/stats_spec.rb | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 513fc0af4..536c99b12 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -51,7 +51,7 @@ class Budget::Stats groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum groups[:total][:total_participants_vote_phase] = groups.collect {|_k, v| v[:total_participants_vote_phase]}.sum - groups[:total][:total_participants_all_phase] = groups.collect {|_k, v| v[:total_participants_all_phase]}.sum + groups[:total][:total_participants_every_phase] = groups.collect {|_k, v| v[:total_participants_every_phase]}.sum budget.headings.each do |heading| groups[heading.id].merge!(calculate_heading_stats_with_totals(groups[heading.id], groups[:total], heading.population)) @@ -59,7 +59,7 @@ class Budget::Stats groups[:total][:percentage_participants_support_phase] = groups.collect {|_k, v| v[:percentage_participants_support_phase]}.sum groups[:total][:percentage_participants_vote_phase] = groups.collect {|_k, v| v[:percentage_participants_vote_phase]}.sum - groups[:total][:percentage_participants_all_phase] = groups.collect {|_k, v| v[:percentage_participants_all_phase]}.sum + groups[:total][:percentage_participants_every_phase] = groups.collect {|_k, v| v[:percentage_participants_every_phase]}.sum groups end @@ -101,7 +101,7 @@ class Budget::Stats total_investments_count: heading.investments.count, total_participants_support_phase: voters_by_heading(heading).count, total_participants_vote_phase: balloters_by_heading(heading.id).count, - total_participants_all_phase: voters_and_balloters_by_heading(heading) + total_participants_every_phase: voters_and_balloters_by_heading(heading) } end @@ -111,8 +111,8 @@ class Budget::Stats percentage_district_population_support_phase: population_percent(population, heading_totals[:total_participants_support_phase]), percentage_participants_vote_phase: participants_percent(heading_totals, groups_totals, :total_participants_vote_phase), percentage_district_population_vote_phase: population_percent(population, heading_totals[:total_participants_vote_phase]), - percentage_participants_all_phase: participants_percent(heading_totals, groups_totals, :total_participants_all_phase), - percentage_district_population_all_phase: population_percent(population, heading_totals[:total_participants_all_phase]) + percentage_participants_every_phase: participants_percent(heading_totals, groups_totals, :total_participants_every_phase), + percentage_district_population_every_phase: population_percent(population, heading_totals[:total_participants_every_phase]) } end diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index f17685f97..b944fe893 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -122,7 +122,7 @@ <%= @stats.headings[heading.id][:total_investments_count] %> - <% ["support", "vote", "all"].each do |phase| %> + <% ["support", "vote", "every"].each do |phase| %> <%= @stats.headings[heading.id]["total_participants_#{phase}_phase".to_sym] %> diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 71630e21e..3e293a410 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -204,13 +204,13 @@ describe Budget::Stats do expect(heading_stats[:total_investments_count]).to be 2 expect(heading_stats[:total_participants_support_phase]).to be 2 expect(heading_stats[:total_participants_vote_phase]).to be 1 - expect(heading_stats[:total_participants_all_phase]).to be 3 + expect(heading_stats[:total_participants_every_phase]).to be 3 expect(heading_stats[:percentage_participants_support_phase]).to be 100.0 expect(heading_stats[:percentage_district_population_support_phase]).to be 0.162 expect(heading_stats[:percentage_participants_vote_phase]).to be 100.0 expect(heading_stats[:percentage_district_population_vote_phase]).to be 0.081 - expect(heading_stats[:percentage_participants_all_phase]).to be 100.0 - expect(heading_stats[:percentage_district_population_all_phase]).to be 0.243 + expect(heading_stats[:percentage_participants_every_phase]).to be 100.0 + expect(heading_stats[:percentage_district_population_every_phase]).to be 0.243 end end end From 66ecb2835bced218eef8615aa633473b8de223eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 20 Mar 2019 20:36:42 +0100 Subject: [PATCH 71/82] Show only available budget stats phases This way we can show statistics for the supports phase before the vote phase is over. --- app/assets/stylesheets/stats.scss | 4 +- app/models/abilities/administrator.rb | 1 - app/models/abilities/everyone.rb | 2 +- app/models/budget/stats.rb | 50 ++++++++++++++++-- app/views/budgets/stats/show.html.erb | 36 ++++++------- config/i18n-tasks.yml | 1 + config/locales/en/stats.yml | 8 +-- config/locales/es/stats.yml | 8 +-- spec/features/budgets/stats_spec.rb | 17 ++----- spec/models/budget/stats_spec.rb | 73 ++++++++++++++++++++++++++- 10 files changed, 150 insertions(+), 50 deletions(-) diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index be084755b..61b86e1dd 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -190,12 +190,10 @@ table { tr th { border: 1px solid $border; - padding-left: 0; - padding-right: 0; text-align: center; } - .tiny { + .phase-subheader { font-size: rem-calc(11); font-weight: normal; } diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 9f8c7e965..a72997dbf 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -66,7 +66,6 @@ module Abilities can [:hide, :update, :toggle_selection], Budget::Investment can [:valuate, :comment_valuation], Budget::Investment can :create, Budget::ValuatorAssignment - can :read_stats, Budget, phase: "reviewing_ballots" can [:search, :edit, :update, :create, :index, :destroy], Banner diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 626be1c0a..46dc19585 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -21,7 +21,7 @@ module Abilities can [:read], Budget::Group can [:read, :print, :json_data], Budget::Investment can [:read_results, :read_executions], Budget, phase: "finished" - can :read_stats, Budget, phase: "finished" + can(:read_stats, Budget) { |budget| budget.valuating_or_later? } can :new, DirectMessage can [:read, :debate, :draft_publication, :allegations, :result_publication, :proposals, :milestones], Legislation::Process, published: true diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 536c99b12..f627c59e7 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -3,14 +3,42 @@ class Budget::Stats alias_method :budget, :resource def self.stats_methods - super + - %i[total_participants_support_phase total_participants_vote_phase - total_budget_investments total_votes total_selected_investments - total_unfeasible_investments headings] + super + support_phase_methods + vote_phase_methods + end + + def self.support_phase_methods + %i[total_participants_support_phase total_budget_investments + total_selected_investments total_unfeasible_investments headings] + end + + def self.vote_phase_methods + %i[total_votes total_participants_vote_phase] + end + + def stats_methods + base_stats_methods + participation_methods + phase_methods + end + + def phases + %w[support vote].select { |phase| send("#{phase}_phase_finished?") } + end + + def all_phases + return phases unless phases.many? + + [*phases, "every"] + end + + def support_phase_finished? + budget.valuating_or_later? + end + + def vote_phase_finished? + budget.finished? end def participants - User.where(id: (authors + voters + balloters + poll_ballot_voters).uniq.compact) + User.where(id: phases.map { |phase| send("participant_ids_#{phase}_phase") }.flatten.uniq) end def total_participants @@ -66,6 +94,18 @@ class Budget::Stats private + def phase_methods + phases.map { |phase| self.class.send("#{phase}_phase_methods") }.flatten + end + + def participant_ids_support_phase + (authors + voters).uniq + end + + def participant_ids_vote_phase + (balloters + poll_ballot_voters).uniq + end + def authors budget.investments.pluck(:author_id) end diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index b944fe893..65430a026 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -80,11 +80,12 @@

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

        - <%= number_with_info_tags(@stats.total_participants_support_phase, - t("stats.budgets.participants_support_phase")) %> - <%= number_with_info_tags(@stats.total_participants_vote_phase, - t("stats.budgets.participants_voting_phase")) %> - + <% @stats.phases.each do |phase| %> + <%= number_with_info_tags( + @stats.send("total_participants_#{phase}_phase"), + t("stats.budgets.participants_#{phase}_phase") + ) %> + <% end %>
        @@ -95,20 +96,19 @@ <%= t("stats.budgets.heading") %> <%= t("stats.budgets.investments_sent_html") %> - <%= t("stats.budgets.participants_support_phase") %> - <%= t("stats.budgets.participants_voting_phase") %> - <%= t("stats.budgets.participants_total") %> + + <% @stats.all_phases.each do |phase| %> + + <%= t("stats.budgets.participants_#{phase}_phase") %> + + <% end %> - <%= t("stats.budgets.total") %> - <%= t("stats.budgets.percent_total_participants_html") %> - <%= t("stats.budgets.percent_heading_census_html") %> - <%= t("stats.budgets.total") %> - <%= t("stats.budgets.percent_total_participants_html") %> - <%= t("stats.budgets.percent_heading_census_html") %> - <%= t("stats.budgets.total") %> - <%= t("stats.budgets.percent_total_participants_html") %> - <%= t("stats.budgets.percent_heading_census_html") %> + <% @stats.all_phases.each do %> + <%= t("stats.budgets.total") %> + <%= t("stats.budgets.percent_total_participants") %> + <%= t("stats.budgets.percent_heading_census") %> + <% end %> @@ -122,7 +122,7 @@ <%= @stats.headings[heading.id][:total_investments_count] %> - <% ["support", "vote", "every"].each do |phase| %> + <% @stats.all_phases.each do |phase| %> <%= @stats.headings[heading.id]["total_participants_#{phase}_phase".to_sym] %> diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 35d06d172..736f12c0d 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -194,6 +194,7 @@ ignore_unused: - "admin.site_customization.pages.page.status_*" - "admin.legislation.processes.process.*" - "legislation.processes.index.*" + - "stats.budgets.participants_*_phase" - "votes.budget_investments.different_heading_assigned*" - "*.form.map_skip_checkbox" # - "{devise,kaminari,will_paginate}.*" diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index cd6eae23f..3e38d765b 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -29,10 +29,10 @@ en: heading: "Heading" investments_sent_html: "Investment proposals sent" participants_support_phase: "Participants support phase" - participants_voting_phase: "Participants voting phase" - participants_total: "Total Participants" - percent_total_participants_html: "%
        Total
        Participants" - percent_heading_census_html: "%
        Heading
        Census" + participants_vote_phase: "Participants voting phase" + participants_every_phase: "Total Participants" + percent_total_participants: "% Total Participants" + percent_heading_census: "% Heading Census" participatory_disclaimer: "** The numbers of total participants refer to persons that created, supported or voted investment proposals." heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on." polls: diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 0425c7ec8..82a4ee801 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -29,10 +29,10 @@ es: heading: "Distrito" investments_sent_html: "Propuestas
        enviadas" participants_support_phase: Participantes fase apoyos - participants_voting_phase: Participantes fase votación - participants_total: Total de participantes - percent_total_participants_html: "%
        Total
        Participantes" - percent_heading_census_html: "%
        Censo
        Distrito" + participants_vote_phase: Participantes fase votación + participants_every_phase: Total de participantes + percent_total_participants: "% Total Participantes" + percent_heading_census: "% Censo Distrito" participatory_disclaimer: "** Las cifras de total de participantes se refieren a personas que han creado, apoyado o votado propuestas." heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado." polls: diff --git a/spec/features/budgets/stats_spec.rb b/spec/features/budgets/stats_spec.rb index ce1982cdf..6318b1cea 100644 --- a/spec/features/budgets/stats_spec.rb +++ b/spec/features/budgets/stats_spec.rb @@ -8,25 +8,16 @@ feature "Stats" do describe "Show" do - it "is not accessible to normal users if phase is not 'finished'" do - budget.update(phase: "reviewing_ballots") + it "is not accessible if supports phase is not finished" do + budget.update(phase: "selecting") visit budget_stats_path(budget.id) expect(page).to have_content "You do not have permission to carry out the action "\ "'read_stats' on budget." end - it "is accessible to normal users if phase is 'finished'" do - budget.update(phase: "finished") - - visit budget_stats_path(budget.id) - expect(page).to have_content "Stats" - end - - it "is accessible to administrators when budget has phase 'reviewing_ballots'" do - budget.update(phase: "reviewing_ballots") - - login_as(create(:administrator).user) + it "is accessible if supports phase is finished" do + budget.update(phase: "valuating") visit budget_stats_path(budget.id) expect(page).to have_content "Stats" diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 3e293a410..2a154f448 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -1,7 +1,7 @@ require "rails_helper" describe Budget::Stats do - let(:budget) { create(:budget) } + let(:budget) { create(:budget, :finished) } let(:stats) { Budget::Stats.new(budget) } let(:investment) { create(:budget_investment, :selected, budget: budget) } @@ -213,4 +213,75 @@ describe Budget::Stats do expect(heading_stats[:percentage_district_population_every_phase]).to be 0.243 end end + + describe "#support_phase_finished?" do + context "support phase isn't finished" do + before { budget.phase = "selecting" } + + it "is false" do + expect(stats.support_phase_finished?).to be false + end + end + + context "support phase is finished" do + before { budget.phase = "valuating" } + + it "is false" do + expect(stats.support_phase_finished?).to be true + end + end + end + + describe "#vote_phase_finished" do + context "support phase isn't finished" do + before { budget.phase = "reviewing_ballots" } + + it "is false" do + expect(stats.vote_phase_finished?).to be false + end + end + + context "vote phase is finished" do + before { budget.phase = "finished" } + + it "is false" do + expect(stats.vote_phase_finished?).to be true + end + end + end + + describe "#all_phases" do + context "no phases are finished" do + before do + allow(stats).to receive(:support_phase_finished?).and_return(false) + allow(stats).to receive(:vote_phase_finished?).and_return(false) + end + + it "returns an empty array" do + expect(stats.all_phases).to eq [] + end + end + + context "one phase is finished" do + before do + allow(stats).to receive(:support_phase_finished?).and_return(true) + allow(stats).to receive(:vote_phase_finished?).and_return(false) + end + + it "returns the finished phase" do + expect(stats.all_phases).to eq ["support"] + end + end + + context "all phases are finished" do + before do + allow(stats).to receive(:support_phase_finished?).and_return(true) + allow(stats).to receive(:vote_phase_finished?).and_return(true) + end + + it "returns the finished phases and a total phase" do + expect(stats.all_phases).to eq ["support", "vote", "every"] + end + end + end end From 04a5e38874ea841caea00111a22d73fd65c42789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 22 Mar 2019 14:11:33 +0100 Subject: [PATCH 72/82] Expire budget stats cache when a phase is finished This way we recalculate all data including the participants in the phase which has just finished. --- app/models/budget/stats.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index f627c59e7..91ec12a86 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -178,6 +178,6 @@ class Budget::Stats stats_cache :voters, :participants, :authors, :balloters, :poll_ballot_voters def stats_cache(key, &block) - Rails.cache.fetch("budgets_stats/#{budget.id}/#{key}/v10", &block) + Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/v10", &block) end end From 944bd2d418735a089795d103f8c49607bc34b94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 26 Mar 2019 12:27:44 +0100 Subject: [PATCH 73/82] Don't capitalize common nouns --- config/locales/en/stats.yml | 6 +++--- config/locales/es/stats.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/en/stats.yml b/config/locales/en/stats.yml index 3e38d765b..0c0b41f70 100644 --- a/config/locales/en/stats.yml +++ b/config/locales/en/stats.yml @@ -30,9 +30,9 @@ en: investments_sent_html: "Investment proposals sent" participants_support_phase: "Participants support phase" participants_vote_phase: "Participants voting phase" - participants_every_phase: "Total Participants" - percent_total_participants: "% Total Participants" - percent_heading_census: "% Heading Census" + participants_every_phase: "Total participants" + percent_total_participants: "% Total participants" + percent_heading_census: "% Heading census" participatory_disclaimer: "** The numbers of total participants refer to persons that created, supported or voted investment proposals." heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on." polls: diff --git a/config/locales/es/stats.yml b/config/locales/es/stats.yml index 82a4ee801..2b1670378 100644 --- a/config/locales/es/stats.yml +++ b/config/locales/es/stats.yml @@ -31,8 +31,8 @@ es: participants_support_phase: Participantes fase apoyos participants_vote_phase: Participantes fase votación participants_every_phase: Total de participantes - percent_total_participants: "% Total Participantes" - percent_heading_census: "% Censo Distrito" + percent_total_participants: "% Total participantes" + percent_heading_census: "% Censo distrito" participatory_disclaimer: "** Las cifras de total de participantes se refieren a personas que han creado, apoyado o votado propuestas." heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado." polls: From 1f4707facd3df566c6068d7305b112b9d825d204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 4 Apr 2019 18:30:52 +0200 Subject: [PATCH 74/82] Extract method to get stats participant_ids This way we can share the `participants` method between budget and poll stats. --- app/models/budget/stats.rb | 8 ++++---- app/models/concerns/statisticable.rb | 4 ++++ app/models/poll/stats.rb | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 91ec12a86..783536920 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -37,10 +37,6 @@ class Budget::Stats budget.finished? end - def participants - User.where(id: phases.map { |phase| send("participant_ids_#{phase}_phase") }.flatten.uniq) - end - def total_participants participants.distinct.count end @@ -98,6 +94,10 @@ class Budget::Stats phases.map { |phase| self.class.send("#{phase}_phase_methods") }.flatten end + def participant_ids + phases.map { |phase| send("participant_ids_#{phase}_phase") }.flatten.uniq + end + def participant_ids_support_phase (authors + voters).uniq end diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 8eed2e0ca..cb1860c9d 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -33,6 +33,10 @@ module Statisticable participants.where(geozone: geozones).any? end + def participants + User.where(id: participant_ids) + end + def total_male_participants participants.male.count end diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 4191f0715..12d1b800d 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -91,8 +91,8 @@ class Poll::Stats private - def participants - User.where(id: voters.pluck(:user_id)) + def participant_ids + voters.pluck(:user_id) end def voters From 9335c51cfcf9f2d57caec4f3b922de6e2ef584d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 4 Apr 2019 18:38:28 +0200 Subject: [PATCH 75/82] Include hidden users in stats If users participated and were hidden after participating, we should still count them in the participants stats. In the tests, we set users' `hidden_at` attribute before they vote. Although in real life they would vote first and then they would be hidden, I've written the tests like this for the sake of simplicity. --- app/models/concerns/statisticable.rb | 2 +- spec/models/budget/stats_spec.rb | 6 +++--- spec/models/poll/stats_spec.rb | 9 +++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index cb1860c9d..05a8c8bff 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -34,7 +34,7 @@ module Statisticable end def participants - User.where(id: participant_ids) + User.unscoped.where(id: participant_ids) end def total_male_participants diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index 2a154f448..b67d23ddf 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -7,10 +7,10 @@ describe Budget::Stats do describe "#participants" do let(:author) { investment.author } - let(:author_and_voter) { create(:user) } + let(:author_and_voter) { create(:user, hidden_at: Time.current) } let(:voter) { create(:user) } let(:voter_and_balloter) { create(:user) } - let(:balloter) { create(:user) } + let(:balloter) { create(:user, hidden_at: Time.current) } let(:poll_balloter) { create(:user, :level_two) } let(:non_participant) { create(:user, :level_two) } @@ -29,7 +29,7 @@ describe Budget::Stats do create(:poll_voter, :from_booth, user: non_participant, budget: create(:budget)) end - it "returns unique participants, including authors" do + it "returns unique participants, including authors and hidden users" do expect(stats.participants).to match_array( [author, author_and_voter, voter, voter_and_balloter, balloter, poll_balloter] ) diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index e55d51169..335d72181 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -4,6 +4,15 @@ describe Poll::Stats do let(:poll) { create(:poll) } let(:stats) { Poll::Stats.new(poll) } + describe "#participants" do + it "includes hidden users" do + create(:poll_voter, poll: poll) + create(:poll_voter, poll: poll, user: create(:user, :level_two, hidden_at: Time.current)) + + expect(stats.participants.count).to eq(2) + end + end + describe "total participants" do before { allow(stats).to receive(:total_web_white).and_return(1) } From 7c0e499eeefc561feb567cc8ce14f57fbf8bfd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 8 Apr 2019 16:22:23 +0200 Subject: [PATCH 76/82] Add table to store stats versions We need a way to manually expire the cache for a budget or poll without expiring the cache of every budget or poll. Using the `updated_at` column would be dangerous because most of the times we update a budget or a poll, we don't need to regenerate their stats. We've considered adding a `stats_updated_at` column to each of these tables. However, in that case we would also need to add a similar column in the future to every process type whose stats we want to generate. --- app/models/budget.rb | 1 + app/models/budget/stats.rb | 2 +- app/models/concerns/statisticable.rb | 4 +++ app/models/concerns/stats_versionable.rb | 11 ++++++++ app/models/poll.rb | 1 + app/models/poll/stats.rb | 2 +- app/models/stats_version.rb | 5 ++++ .../20190408133956_create_stats_versions.rb | 8 ++++++ db/schema.rb | 8 ++++++ spec/models/poll/stats_spec.rb | 26 +++++++++++++++++++ spec/models/stats_version_spec.rb | 13 ++++++++++ 11 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 app/models/concerns/stats_versionable.rb create mode 100644 app/models/stats_version.rb create mode 100644 db/migrate/20190408133956_create_stats_versions.rb create mode 100644 spec/models/stats_version_spec.rb diff --git a/app/models/budget.rb b/app/models/budget.rb index 8d65d63e3..f11c378ff 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -2,6 +2,7 @@ class Budget < ApplicationRecord include Measurable include Sluggable + include StatsVersionable translates :name, touch: true include Globalizable diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 783536920..766e6ef77 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -178,6 +178,6 @@ class Budget::Stats stats_cache :voters, :participants, :authors, :balloters, :poll_ballot_voters def stats_cache(key, &block) - Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/v10", &block) + Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/#{version}", &block) end end diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 05a8c8bff..14cb1fa9d 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -88,6 +88,10 @@ module Statisticable PercentageCalculator.calculate(fraction, total) end + def version + "v#{resource.find_or_create_stats_version.updated_at.to_i}" + end + private def base_stats_methods diff --git a/app/models/concerns/stats_versionable.rb b/app/models/concerns/stats_versionable.rb new file mode 100644 index 000000000..5f1d94ffd --- /dev/null +++ b/app/models/concerns/stats_versionable.rb @@ -0,0 +1,11 @@ +module StatsVersionable + extend ActiveSupport::Concern + + included do + has_one :stats_version, as: :process + end + + def find_or_create_stats_version + stats_version || create_stats_version + end +end diff --git a/app/models/poll.rb b/app/models/poll.rb index 7e9cef89a..5a9284d42 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -6,6 +6,7 @@ class Poll < ApplicationRecord include ActsAsParanoidAliases include Notifiable include Sluggable + include StatsVersionable translates :name, touch: true translates :summary, touch: true diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 12d1b800d..a6be63640 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -107,7 +107,7 @@ class Poll::Stats stats_cache :participants, :voters, :recounts def stats_cache(key, &block) - Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/v12", &block) + Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/#{version}", &block) end end diff --git a/app/models/stats_version.rb b/app/models/stats_version.rb new file mode 100644 index 000000000..f47ddea44 --- /dev/null +++ b/app/models/stats_version.rb @@ -0,0 +1,5 @@ +class StatsVersion < ApplicationRecord + validates :process, presence: true + + belongs_to :process, polymorphic: true +end diff --git a/db/migrate/20190408133956_create_stats_versions.rb b/db/migrate/20190408133956_create_stats_versions.rb new file mode 100644 index 000000000..155731fbd --- /dev/null +++ b/db/migrate/20190408133956_create_stats_versions.rb @@ -0,0 +1,8 @@ +class CreateStatsVersions < ActiveRecord::Migration[4.2] + def change + create_table :stats_versions do |t| + t.references :process, polymorphic: true, index: true + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 857082f44..a3bff9ed4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1339,6 +1339,14 @@ ActiveRecord::Schema.define(version: 20190411090023) do t.index ["tsv"], name: "index_spending_proposals_on_tsv", using: :gin end + create_table "stats_versions", force: :cascade do |t| + t.string "process_type" + t.integer "process_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["process_type", "process_id"], name: "index_stats_versions_on_process_type_and_process_id", using: :btree + end + create_table "taggings", force: :cascade do |t| t.integer "tag_id" t.integer "taggable_id" diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 335d72181..0f0957dd5 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -231,4 +231,30 @@ describe Poll::Stats do end end end + + describe "#version", :with_frozen_time do + context "record with no stats" do + it "returns a string based on the current time" do + expect(stats.version).to eq "v#{Time.current.to_i}" + end + + it "doesn't overwrite the timestamp when called multiple times" do + time = Time.current + + expect(stats.version).to eq "v#{time.to_i}" + + travel_to 2.seconds.from_now do + expect(stats.version).to eq "v#{time.to_i}" + end + end + end + + context "record with stats" do + before { poll.create_stats_version(updated_at: 1.day.ago) } + + it "returns the version of the existing stats" do + expect(stats.version).to eq "v#{1.day.ago.to_i}" + end + end + end end diff --git a/spec/models/stats_version_spec.rb b/spec/models/stats_version_spec.rb new file mode 100644 index 000000000..eb875ed09 --- /dev/null +++ b/spec/models/stats_version_spec.rb @@ -0,0 +1,13 @@ +require "rails_helper" + +describe StatsVersion do + describe "validations" do + it "is valid with a process" do + expect(StatsVersion.new(process: Budget.new)).to be_valid + end + + it "is not valid without a process" do + expect(StatsVersion.new(process: nil)).not_to be_valid + end + end +end From aa0e813970178a85740a133e3414f3d9a183aa26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 10 Apr 2019 15:07:51 +0200 Subject: [PATCH 77/82] Use ruby cache for stats helper methods These methods are only used while stats are being generated; once stats are generated, they aren't used anymore. So there's no need to store them using the Dalli cache. Furthermore, there are polls (and even budgets) with hundreds of thousands of participants. Calculating stats for them takes a very long time because we can't store all those records in the Dalli cache. However, since these records aren't used once the stats are generated, we can store them in an instance variable while we generate the stats, speeding up the process. --- app/models/budget/stats.rb | 10 ++++------ app/models/concerns/statisticable.rb | 4 ++-- app/models/poll/stats.rb | 5 ++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/models/budget/stats.rb b/app/models/budget/stats.rb index 766e6ef77..cd9bff741 100644 --- a/app/models/budget/stats.rb +++ b/app/models/budget/stats.rb @@ -107,19 +107,19 @@ class Budget::Stats end def authors - budget.investments.pluck(:author_id) + @authors ||= budget.investments.pluck(:author_id) end def voters - supports(budget).distinct.pluck(:voter_id) + @voters ||= supports(budget).distinct.pluck(:voter_id) end def balloters - budget.ballots.where("ballot_lines_count > ?", 0).distinct.pluck(:user_id).compact + @balloters ||= budget.ballots.where("ballot_lines_count > ?", 0).distinct.pluck(:user_id).compact end def poll_ballot_voters - budget&.poll ? budget.poll.voters.pluck(:user_id) : [] + @poll_ballot_voters ||= budget.poll ? budget.poll.voters.pluck(:user_id) : [] end def balloters_by_heading(heading_id) @@ -174,8 +174,6 @@ class Budget::Stats end stats_cache(*stats_methods) - stats_cache :total_participants_with_gender - stats_cache :voters, :participants, :authors, :balloters, :poll_ballot_voters def stats_cache(key, &block) Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/#{version}", &block) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 14cb1fa9d..0839f32fa 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -34,7 +34,7 @@ module Statisticable end def participants - User.unscoped.where(id: participant_ids) + @participants ||= User.unscoped.where(id: participant_ids) end def total_male_participants @@ -103,7 +103,7 @@ module Statisticable end def total_participants_with_gender - participants.where.not(gender: nil).distinct.count + @total_participants_with_gender ||= participants.where.not(gender: nil).distinct.count end def age_groups diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index a6be63640..ea075e6c9 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -96,15 +96,14 @@ class Poll::Stats end def voters - poll.voters + @voters ||= poll.voters end def recounts - poll.recounts + @recounts ||= poll.recounts end stats_cache(*stats_methods) - stats_cache :participants, :voters, :recounts def stats_cache(key, &block) Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/#{version}", &block) From 13dd77dd1ba8f53ac14a3f8d64e8e66b3f6d326d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 8 Apr 2019 16:27:23 +0200 Subject: [PATCH 78/82] Add tasks to generate and expire stats cache We're generating stats every 2 hours because it's less than the time it will take to generate stats for every process. Once stats are generated, this task should take less than a second. The regenerate task has been added so we can manually execute it. --- config/schedule.rb | 4 ++++ lib/tasks/stats.rake | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 lib/tasks/stats.rake diff --git a/config/schedule.rb b/config/schedule.rb index 25d5bf0c9..353190e5a 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -27,6 +27,10 @@ every 1.day, at: "5:00 am" do rake "-s sitemap:refresh" end +every 2.hours do + rake "-s stats:generate" +end + # Temporally not send dashboard's notifications # every 1.day, at: "7:00 am" do # rake "dashboards:send_notifications" diff --git a/lib/tasks/stats.rake b/lib/tasks/stats.rake new file mode 100644 index 000000000..a454d88cd --- /dev/null +++ b/lib/tasks/stats.rake @@ -0,0 +1,24 @@ +namespace :stats do + desc "Generates stats which are not cached yet" + task generate: :environment do + Budget.find_each do |budget| + Budget::Stats.new(budget).generate + print "." + end + + Poll.find_each do |poll| + Poll::Stats.new(poll).generate + print "." + end + end + + desc "Expires stats cache" + task expire_cache: :environment do + [Budget, Poll].each do |model_class| + model_class.find_each { |record| record.find_or_create_stats_version.touch } + end + end + + desc "Deletes stats cache and generates it again" + task regenerate: [:expire_cache, :generate] +end From e2a3398ec06b7ca29b2900db42c09b745ce393e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 11 Apr 2019 11:17:51 +0200 Subject: [PATCH 79/82] Increase poll stats performance Using SQL's `select` instead of converting the records to a ruby array increases performance dramatically when there are thousands of records. For a poll with 200000 voters, calculating stats took more than 7 minutes, and now it takes less than 2 minutes. --- app/models/poll/stats.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index ea075e6c9..d7c9826c5 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -92,11 +92,11 @@ class Poll::Stats private def participant_ids - voters.pluck(:user_id) + voters end def voters - @voters ||= poll.voters + @voters ||= poll.voters.select(:user_id) end def recounts From 483ebffb4777510d02e8edf5a7af603091b5c721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 11 Apr 2019 15:44:49 +0200 Subject: [PATCH 80/82] Fix statisticable concern definition Methods defined inside "included" cannot be called using `super` from a class including the module. --- app/models/concerns/statisticable.rb | 282 +++++++++++++-------------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 0839f32fa..acb5d00c9 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -4,149 +4,149 @@ module Statisticable included do attr_reader :resource - - def initialize(resource) - @resource = resource - end - - def generate - stats_methods.each { |stat_name| send(stat_name) } - end - - def stats_methods - base_stats_methods + participation_methods - end - - def participations - PARTICIPATIONS.select { |participation| send("#{participation}?") } - end - - def gender? - participants.male.any? || participants.female.any? - end - - def age? - participants.between_ages(age_groups.flatten.min, age_groups.flatten.max).any? - end - - def geozone? - participants.where(geozone: geozones).any? - end - - def participants - @participants ||= User.unscoped.where(id: participant_ids) - end - - def total_male_participants - participants.male.count - end - - def total_female_participants - participants.female.count - end - - def total_no_demographic_data - participants.where("gender IS NULL OR date_of_birth IS NULL OR geozone_id IS NULL").count - end - - def male_percentage - calculate_percentage(total_male_participants, total_participants_with_gender) - end - - def female_percentage - calculate_percentage(total_female_participants, total_participants_with_gender) - end - - def participants_by_age - age_groups.map do |start, finish| - count = participants.between_ages(start, finish).count - - [ - "#{start} - #{finish}", - { - range: range_description(start, finish), - count: count, - percentage: calculate_percentage(count, total_participants) - } - ] - end.to_h - end - - def participants_by_geozone - geozone_stats.map do |stats| - [ - stats.name, - { - count: stats.count, - percentage: stats.percentage - } - ] - end.to_h - end - - def calculate_percentage(fraction, total) - PercentageCalculator.calculate(fraction, total) - end - - def version - "v#{resource.find_or_create_stats_version.updated_at.to_i}" - end - - private - - def base_stats_methods - self.class.base_stats_methods - end - - def participation_methods - participations.map { |participation| self.class.send("#{participation}_methods") }.flatten - end - - def total_participants_with_gender - @total_participants_with_gender ||= participants.where.not(gender: nil).distinct.count - end - - def age_groups - [[16, 19], - [20, 24], - [25, 29], - [30, 34], - [35, 39], - [40, 44], - [45, 49], - [50, 54], - [55, 59], - [60, 64], - [65, 69], - [70, 74], - [75, 79], - [80, 84], - [85, 89], - [90, 300] - ] - end - - def participants_between_ages(from, to) - participants.between_ages(from, to) - end - - def geozones - Geozone.all.order("name") - end - - def geozone_stats - geozones.map { |geozone| GeozoneStats.new(geozone, participants) } - end - - def range_description(start, finish) - if finish > 200 - I18n.t("stats.age_more_than", start: start) - else - I18n.t("stats.age_range", start: start, finish: finish) - end - end end + def initialize(resource) + @resource = resource + end + + def generate + stats_methods.each { |stat_name| send(stat_name) } + end + + def stats_methods + base_stats_methods + participation_methods + end + + def participations + PARTICIPATIONS.select { |participation| send("#{participation}?") } + end + + def gender? + participants.male.any? || participants.female.any? + end + + def age? + participants.between_ages(age_groups.flatten.min, age_groups.flatten.max).any? + end + + def geozone? + participants.where(geozone: geozones).any? + end + + def participants + @participants ||= User.unscoped.where(id: participant_ids) + end + + def total_male_participants + participants.male.count + end + + def total_female_participants + participants.female.count + end + + def total_no_demographic_data + participants.where("gender IS NULL OR date_of_birth IS NULL OR geozone_id IS NULL").count + end + + def male_percentage + calculate_percentage(total_male_participants, total_participants_with_gender) + end + + def female_percentage + calculate_percentage(total_female_participants, total_participants_with_gender) + end + + def participants_by_age + age_groups.map do |start, finish| + count = participants.between_ages(start, finish).count + + [ + "#{start} - #{finish}", + { + range: range_description(start, finish), + count: count, + percentage: calculate_percentage(count, total_participants) + } + ] + end.to_h + end + + def participants_by_geozone + geozone_stats.map do |stats| + [ + stats.name, + { + count: stats.count, + percentage: stats.percentage + } + ] + end.to_h + end + + def calculate_percentage(fraction, total) + PercentageCalculator.calculate(fraction, total) + end + + def version + "v#{resource.find_or_create_stats_version.updated_at.to_i}" + end + + private + + def base_stats_methods + self.class.base_stats_methods + end + + def participation_methods + participations.map { |participation| self.class.send("#{participation}_methods") }.flatten + end + + def total_participants_with_gender + @total_participants_with_gender ||= participants.where.not(gender: nil).distinct.count + end + + def age_groups + [[16, 19], + [20, 24], + [25, 29], + [30, 34], + [35, 39], + [40, 44], + [45, 49], + [50, 54], + [55, 59], + [60, 64], + [65, 69], + [70, 74], + [75, 79], + [80, 84], + [85, 89], + [90, 300] + ] + end + + def participants_between_ages(from, to) + participants.between_ages(from, to) + end + + def geozones + Geozone.all.order("name") + end + + def geozone_stats + geozones.map { |geozone| GeozoneStats.new(geozone, participants) } + end + + def range_description(start, finish) + if finish > 200 + I18n.t("stats.age_more_than", start: start) + else + I18n.t("stats.age_range", start: start, finish: finish) + end + end + class_methods do def stats_methods base_stats_methods + gender_methods + age_methods + geozone_methods From 42a25ded3f5cbc2f409cc9b3f2fa5b460131fff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 11 Apr 2019 15:59:26 +0200 Subject: [PATCH 81/82] Fix booth recounts poll stats discrepancies Due to technical issues, sometimes users voted in booths and their vote couldn't be added to the database. So we're including them in the users with no demographic data. --- app/models/poll/stats.rb | 12 ++++++++++++ spec/models/poll/stats_spec.rb | 28 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index d7c9826c5..d7e0031da 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -89,6 +89,10 @@ class Poll::Stats end end + def total_no_demographic_data + super + total_unregistered_booth + end + private def participant_ids @@ -103,6 +107,14 @@ class Poll::Stats @recounts ||= poll.recounts end + def total_registered_booth + voters.where(origin: "booth").count + end + + def total_unregistered_booth + [total_participants_booth - total_registered_booth, 0].max + end + stats_cache(*stats_methods) def stats_cache(key, &block) diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index 0f0957dd5..8f8b3583d 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -186,6 +186,34 @@ describe Poll::Stats do end end + describe "#total_no_demographic_data" do + before do + create(:poll_voter, :from_web, poll: poll, user: create(:user, :level_two, gender: nil)) + end + + context "more registered participants than participants in recounts" do + before do + create(:poll_recount, :from_booth, poll: poll, total_amount: 1) + 2.times { create(:poll_voter, :from_booth, poll: poll) } + end + + it "returns registered users with no demographic data" do + expect(stats.total_no_demographic_data).to eq 1 + end + end + + context "more participants in recounts than registered participants" do + before do + create(:poll_recount, :from_booth, poll: poll, total_amount: 3) + 2.times { create(:poll_voter, :from_booth, poll: poll) } + end + + it "returns registered users with no demographic data plus users not registered" do + expect(stats.total_no_demographic_data).to eq 2 + end + end + end + describe "#channels" do context "no participants" do it "returns no channels" do From dc8c4a998f4b9b25a5580e3b62578264ad20c4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 20 May 2019 20:17:29 +0200 Subject: [PATCH 82/82] Fix budget stats social meta tags We had forgotten to update these tags for stats after updating them for budget results in commit 153b46b4 and commit a6baaa93. --- app/views/budgets/stats/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 65430a026..0ad241529 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -3,9 +3,9 @@ <% end %> <% provide :social_media_meta_tags do %> <%= render "shared/social_media_meta_tags", - social_url: budget_url(@budget), + social_url: budget_stats_url(@budget), social_title: @budget.name, - social_description: @budget.description_finished %> + social_description: @budget.description_for_phase("finished") %> <% end %>