consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3511 from consul/backport-gender_participants

Browse Source 
Refactor gender and age stats methods
This commit is contained in:
Javier Martín
2019-05-21 17:17:53 +02:00
committed by GitHub
parent 07d55116ef e4a032ee68
commit f4891819db
5 changed files with 68 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/stats_helper.rb
View File

@@ -30,9 +30,4 @@ module StatsHelper
opt[:data][:graph] = admin_api_stats_path(budget_investments: true)
content_tag :div, "", opt
end
def calculate_percentage(fraction, total)
percent = fraction / total.to_f
percent.nan? ? 0.0 : (percent * 100).round(3)
end
end

63
app/models/budget/stats.rb
View File

@@ -3,11 +3,11 @@ class Budget::Stats
alias_method :budget, :resource
def self.stats_methods
%i[total_participants total_participants_support_phase total_participants_vote_phase
total_budget_investments total_votes total_selected_investments
total_unfeasible_investments total_male_participants total_female_participants
total_supports total_unknown_gender_or_age age_groups male_percentage
female_percentage headings total_participants_web total_participants_booths]
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]
end
private
@@ -48,54 +48,10 @@ class Budget::Stats
budget.investments.unfeasible.count
end
def total_male_participants
participants.where(gender: "male").count
end
def total_female_participants
participants.where(gender: "female").count
end
def total_supports
supports(budget).count
end
def total_unknown_gender_or_age
participants.where("gender IS NULL OR date_of_birth is NULL").uniq.count
end
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 - 140"].each do |group|
start, finish = group.split(" - ")
group_name = (group == "70 - 140" ? "+ 70" : group)
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
end
groups
end
def male_percentage
total_male_participants / total_participants_with_gender.to_f * 100
end
def female_percentage
total_female_participants / total_participants_with_gender.to_f * 100
end
def participants
User.where(id: (authors + voters + balloters + poll_ballot_voters).uniq.compact)
end
@@ -116,10 +72,6 @@ class Budget::Stats
budget&.poll ? budget.poll.voters.pluck(:user_id) : []
end
def total_participants_with_gender
participants.where.not(gender: nil).distinct.count
end
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)
@@ -188,11 +140,6 @@ class Budget::Stats
calculate_percentage(participants, population)
end
def calculate_percentage(fraction, total)
percent = fraction / total.to_f
percent.nan? ? 0.0 : (percent * 100).round(3)
end
def supports(supportable)
ActsAsVotable::Vote.where(votable_type: "Budget::Investment", votable_id: supportable.investments.pluck(:id))
end

62
app/models/concerns/statisticable.rb
View File

@@ -11,9 +11,71 @@ module Statisticable
def generate
self.class.stats_methods.map { |stat_name| [stat_name, send(stat_name)] }.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
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 - 140"].each do |group|
start, finish = group.split(" - ")
group_name = (group == "70 - 140" ? "+ 70" : group)
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
end
groups
end
def calculate_percentage(fraction, total)
return 0.0 if total.zero?
(fraction * 100.0 / total).round(3)
end
end
class_methods do
def stats_methods
%i[total_participants total_male_participants
total_female_participants total_unknown_gender_or_age
male_percentage female_percentage age_groups]
end
def stats_cache(*method_names)
method_names.each do |method_name|
alias_method :"raw_#{method_name}", method_name

1
app/models/poll/stats.rb
View File

@@ -1,6 +1,5 @@
class Poll::Stats
include Statisticable
include StatsHelper
alias_method :poll, :resource
def self.stats_methods

2
app/views/polls/stats.html.erb
View File

@@ -86,7 +86,7 @@
<%= @stats[:total_participants_booth] %>
<small><em>(<%= @stats[:total_participants_booth_percentage].round(2) %>%)</em></small>
</td>
<td><%= @stats[:total_participants_web] + @stats[:total_participants_booth] %></td>
<td><%= @stats[:total_participants] %></td>
</tr>
</tbody>
</table>