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

Merge pull request #3499 from consul/backport-admin_stats

Browse Source 
Add admin budget stats
This commit is contained in:
Javier Martín
2019-05-16 20:41:39 +02:00
committed by GitHub
parent c39a3d7525 d5c7858f6c
commit 668b6cfd73
20 changed files with 450 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/admin/api/stats_controller.rb
View File

@@ -1,20 +1,18 @@
class Admin::Api::StatsController < Admin::Api::BaseController
def show
unless params[:events].present? ||
unless params[:event].present? ||
params[:visits].present? ||
params[:spending_proposals].present? ||
params[:budget_investments].present?
params[:budget_investments].present? ||
params[:user_supported_budgets].present?
return render json: {}, status: :bad_request
end
ds = Ahoy::DataSource.new
if params[:events].present?
event_types = params[:events].split ","
event_types.each do |event|
ds.add event.titleize, Ahoy::Event.where(name: event).group_by_day(:time).count
end
if params[:event].present?
ds.add params[:event].titleize, Ahoy::Event.where(name: params[:event]).group_by_day(:time).count
end
if params[:visits].present?
@@ -29,6 +27,9 @@ class Admin::Api::StatsController < Admin::Api::BaseController
ds.add "Budget Investments", Budget::Investment.group_by_day(:created_at).count
end
if params[:user_supported_budgets].present?
ds.add "User supported budgets", Vote.where(votable_type: "Budget::Investment").group_by_day(:updated_at).count
end
render json: ds.build
end
end

54
app/controllers/admin/stats_controller.rb
View File

@@ -1,7 +1,7 @@
class Admin::StatsController < Admin::BaseController
def show
@event_types = Ahoy::Event.group(:name).count
@event_types = Ahoy::Event.pluck(:name).uniq.sort
@visits = Visit.count
@debates = Debate.with_hidden.count
@@ -31,6 +31,17 @@ class Admin::StatsController < Admin::BaseController
@investments = Budget::Investment.where(budget_id: budgets_ids).count
end
def graph
@name = params[:id]
@event = params[:event]
if params[:event]
@count = Ahoy::Event.where(name: params[:event]).count
else
@count = params[:count]
end
end
def proposal_notifications
@proposal_notifications = ProposalNotification.all
@proposals_with_notifications = @proposal_notifications.select(:proposal_id).distinct.count
@@ -41,9 +52,50 @@ class Admin::StatsController < Admin::BaseController
@users_who_have_sent_message = DirectMessage.select(:sender_id).distinct.count
end
def budgets
@budgets = Budget.all
end
def budget_supporting
@budget = Budget.find(params[:budget_id])
heading_ids = @budget.heading_ids
votes = Vote.where(votable_type: "Budget::Investment").
includes(:budget_investment).
where(budget_investments: { heading_id: heading_ids })
@vote_count = votes.count
@user_count = votes.select(:voter_id).distinct.count
@voters_in_heading = {}
@budget.headings.each do |heading|
@voters_in_heading[heading] = voters_in_heading(heading)
end
end
def budget_balloting
@budget = Budget.find(params[:budget_id])
@user_count = @budget.ballots.select {|ballot| ballot.lines.any? }.count
@vote_count = @budget.lines.count
@vote_count_by_heading = @budget.lines.group(:heading_id).count.collect {|k,v| [Budget::Heading.find(k).name, v]}.sort
@user_count_by_district = User.where.not(balloted_heading_id: nil).group(:balloted_heading_id).count.collect {|k,v| [Budget::Heading.find(k).name, v]}.sort
end
def polls
@polls = ::Poll.current
@participants = ::Poll::Voter.where(poll: @polls)
end
private
def voters_in_heading(heading)
Vote.where(votable_type: "Budget::Investment").
includes(:budget_investment).
where(budget_investments: { heading_id: heading.id }).
select("votes.voter_id").distinct.count
end
end

4
app/helpers/budgets_helper.rb
View File

@@ -44,10 +44,6 @@ module BudgetsHelper
end
end
def display_budget_countdown?(budget)
budget.balloting?
end
def css_for_ballot_heading(heading)
return "" if current_ballot.blank? || @current_filter == "unfeasible"
current_ballot.has_lines_in_heading?(heading) ? "is-active" : ""

29
app/helpers/stats_helper.rb
View File

@@ -1,24 +1,27 @@
module StatsHelper
def events_chart_tag(events, opt = {})
events = events.join(",") if events.is_a? Array
def chart_tag(opt = {})
opt[:data] ||= {}
opt[:data][:graph] = admin_api_stats_path(events: events)
opt[:data][:graph] = admin_api_stats_path(chart_data(opt))
content_tag :div, "", opt
end
def visits_chart_tag(opt = {})
events = events.join(",") if events.is_a? Array
opt[:data] ||= {}
opt[:data][:graph] = admin_api_stats_path(visits: true)
content_tag :div, "", opt
def chart_data(opt = {})
data = nil
if opt[:id].present?
data = { opt[:id] => true }
elsif opt[:event].present?
data = { event: opt[:event] }
end
data
end
def spending_proposals_chart_tag(opt = {})
events = events.join(",") if events.is_a? Array
opt[:data] ||= {}
opt[:data][:graph] = admin_api_stats_path(spending_proposals: true)
content_tag :div, "", opt
def graph_link_text(event)
text = t("admin.stats.graph.#{event}")
if text.to_s.match(/translation missing/)
text = event
end
text
end
def budget_investments_chart_tag(opt = {})

1
app/models/budget.rb
View File

@@ -31,6 +31,7 @@ class Budget < ApplicationRecord
has_many :ballots, dependent: :destroy
has_many :groups, dependent: :destroy
has_many :headings, through: :groups
has_many :lines, through: :ballots, class_name: "Budget::Ballot::Line"
has_many :phases, class_name: Budget::Phase
has_one :poll

6
app/views/admin/stats/_graph.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<%= back_link_to %>
<div id="graph" class="small-12 column">
<h2><%= t "admin.stats.graph.#{name || event}" %> (<%= count %>)</h2>
<%= chart_tag id: name, event: event %>
</div>

57
app/views/admin/stats/budget_balloting.html.erb Normal file
View File

@@ -0,0 +1,57 @@
<%= back_link_to budgets_admin_stats_path %>
<h2><%= @budget.name %> - <%= t("admin.stats.budget_balloting.title") %></h2>
<div class="stats">
<div class="row stats-numbers">
<div class="small-12 medium-3 column">
<p class="featured">
<%= t("admin.stats.budget_balloting.vote_count") %>
<br>
<span id="total_votes_count" class="number">
<%= @vote_count %>
</span>
</p>
</div>
<div class="small-12 medium-6 column end">
<p>
<%= t("admin.stats.budget_balloting.participant_count") %>
<br>
<span id="total_participants_count" class="number">
<%= @user_count %>
</span>
</p>
</div>
</div>
</div>
<table class="investment-projects-summary">
<th colspan="2"><%= t("admin.stats.budget_balloting.votes_per_heading") %></th>
<% @vote_count_by_heading.each do |heading_name, count| %>
<tr id="vote_count_<%= heading_name.parameterize %>">
<td class="name">
<%= heading_name %>
</td>
<td class="name">
<%= number_with_delimiter count %>
</td>
</tr>
<% end %>
</table>
<table class="investment-projects-summary">
<th colspan="2"><%= t("admin.stats.budget_balloting.participants_per_district") %></th>
<% @user_count_by_district.each do |heading_name, count| %>
<tr id="user_count_<%= heading_name.parameterize %>">
<td class="name">
<%= heading_name %>
</td>
<td class="name">
<%= number_with_delimiter count %>
</td>
</tr>
<% end %>
</table>

49
app/views/admin/stats/budget_supporting.html.erb Normal file
View File

@@ -0,0 +1,49 @@
<% content_for :head do %>
<%= javascript_include_tag "stat_graphs", "data-turbolinks-track" => true %>
<% end %>
<%= back_link_to budgets_admin_stats_path %>
<h2><%= @budget.name %> - <%= t("admin.stats.budget_supporting.title") %></h2>
<div class="stats">
<div class="row stats-numbers">
<div class="small-12 medium-3 column">
<p class="featured">
<%= t("admin.stats.budget_supporting.vote_count") %>
<br>
<span id="total_votes_count" class="number">
<%= @vote_count %>
</span>
</p>
</div>
<div class="small-12 medium-6 column end">
<p>
<%= t("admin.stats.budget_supporting.participant_count") %>
<br>
<span id="total_participants_count" class="number">
<%= @user_count %>
</span>
</p>
</div>
</div>
</div>
<%= render "graph", name: "user_supported_budgets", event: "", count: @user_count %>
<table class="investment-projects-summary">
<th><%= t("admin.stats.budget_supporting.headings") %></th>
<th><%= t("admin.stats.budget_supporting.users") %></th>
<% @voters_in_heading.each do |heading, count| %>
<tr id="<%= dom_id(heading) %>">
<td class="name">
<%= heading.name %>
</td>
<td class="name">
<%= number_with_delimiter count %>
</td>
</tr>
<% end %>
</table>

17
app/views/admin/stats/budgets.html.erb Normal file
View File

@@ -0,0 +1,17 @@
<%= back_link_to admin_stats_path %>
<h2><%= t("admin.stats.budgets.title") %></h2>
<% @budgets.each do |budget| %>
<table>
<tr id="<%= dom_id(budget) %>">
<td>
<strong><%= budget.name %></strong>
</td>
<td>
<%= link_to t("admin.stats.budgets.supporting_phase"), budget_supporting_admin_stats_path(budget_id: budget.id), class: "button hollow" %>
<%= link_to t("admin.stats.budgets.balloting_phase"), budget_balloting_admin_stats_path(budget_id: budget.id), class: "button hollow" %>
</td>
</tr>
</table>
<% end %>

5
app/views/admin/stats/graph.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<% content_for :head do %>
<%= javascript_include_tag "stat_graphs", 'data-turbolinks-track' => true %>
<% end %>
<%= render 'graph', name: @name, event: @event, count: @count %>

30
app/views/admin/stats/show.html.erb
View File

@@ -1,7 +1,4 @@
<% content_for :head do %>
<%= javascript_include_tag "stat_graphs", "data-turbolinks-track" => true %>
<% end %>
<div class="stats">
<div id="stats" class="stats">
<div class="row">
<div class="small-12 column">
<h1 class="inline-block"><%= t "admin.stats.show.stats_title" %></h1>
@@ -9,6 +6,8 @@
<div class="float-right clear">
<%= link_to t("admin.stats.show.polls"),
polls_admin_stats_path, class: "button hollow" %>
<%= link_to t("admin.stats.show.participatory_budgets"),
budgets_admin_stats_path, class: "button hollow" %>
<%= link_to t("admin.stats.show.direct_messages"),
direct_messages_admin_stats_path, class: "button hollow" %>
<%= link_to t("admin.stats.show.proposal_notifications"),
@@ -22,7 +21,8 @@
<div class="row stats-numbers">
<div class="small-12 medium-3 column">
<p class="featured">
<%= t "admin.stats.show.summary.visits" %> <br>
<%= link_to t("admin.stats.show.summary.visits"),
graph_admin_stats_path(id: "visits", count: @visits) %> <br>
<span class="number"><%= number_with_delimiter(@visits) %></span>
</p>
@@ -119,24 +119,14 @@
</div>
<div class="small-12 column">
<h2><%= t "admin.stats.show.visits_title" %></h2>
<%= visits_chart_tag id: "visits" %>
</div>
<div class="small-12 column">
<% @event_types.each do |event, count| %>
<h2><%= event.titleize %> (<%= count %>)</h2>
<%= events_chart_tag event %>
<% @event_types.each do |event| %>
<h3>
<%= link_to graph_link_text(event),
graph_admin_stats_path(event: event) %>
</h3>
<% end %>
</div>
<% if feature?(:spending_proposals) %>
<div class="small-12 column">
<h2><%= t "admin.stats.show.spending_proposals_title" %></h2>
<%= spending_proposals_chart_tag id: "spending_proposals" %>
</div>
<% end %>
<% if feature?(:budgets) %>
<div class="small-12 column">
<h2><%= t "admin.stats.show.budgets_title" %></h2>

2
app/views/layouts/admin.html.erb
View File

@@ -33,7 +33,7 @@
<div class="admin-content small-12 medium-9 column" data-equalizer-watch>
<%= render "layouts/flash" %>
<%= render "layouts/officing_booth" %>
<%= render "layouts/officing_booth" if controller.class.parent == Officing && session[:booth_id].present? %>
<%= yield %>
</div>
</div>

4
config/initializers/ahoy.rb
View File

@@ -8,4 +8,8 @@ class Ahoy::Store < Ahoy::Stores::ActiveRecordStore
event.ip = request.ip
end
end
def exclude?
false
end
end

1
config/initializers/vote_extensions.rb
View File

@@ -2,6 +2,7 @@ ActsAsVotable::Vote.class_eval do
include Graphqlable
belongs_to :signature
belongs_to :budget_investment, foreign_key: "votable_id", class_name: "Budget::Investment"
scope :public_for_api, -> do
where(%{(votes.votable_type = 'Debate' and votes.votable_id in (?)) or

25
config/locales/en/admin.yml
View File

@@ -1452,13 +1452,34 @@ en:
verified_users_who_didnt_vote_proposals: Verified users who didn't votes proposals
visits: Visits
votes: Total votes
spending_proposals_title: Spending Proposals
budgets_title: Participatory budgeting
visits_title: Visits
participatory_budgets: Participatory Budgets
direct_messages: Direct messages
proposal_notifications: Proposal notifications
incomplete_verifications: Incomplete verifications
polls: Polls
graph:
debate_created: Debates
spending_proposals: Investment projects
visit: Visits
level_2_user: Level 2 users
proposal_created: Citizen proposals
budgets:
title: "Participatory Budgets - Participation stats"
supporting_phase: Supporting phase
balloting_phase: Final voting
budget_balloting:
title: "Final voting stats"
vote_count: Votes
participant_count: Participants
votes_per_heading: Votes per heading
participants_per_district: Participants per district
budget_supporting:
title: "Supporting phase stats"
headings: Headings
users: Users
vote_count: Votes
participant_count: Participants
direct_messages:
title: Direct messages
total: Total

25
config/locales/es/admin.yml
View File

@@ -1451,13 +1451,34 @@ es:
verified_users_who_didnt_vote_proposals: Usuarios verificados que no han votado propuestas
visits: Visitas
votes: Votos
spending_proposals_title: Propuestas de inversión
budgets_title: Presupuestos participativos
visits_title: Visitas
participatory_budgets: Presupuestos Participativos
direct_messages: Mensajes directos
proposal_notifications: Notificaciones de propuestas
incomplete_verifications: Verificaciones incompletas
polls: Votaciones
graph:
debate_created: Debates
spending_proposals: Propuestas de inversión
visit: Visitas
level_2_user: Usuarios nivel 2
proposal_created: Propuestas Ciudadanas
budgets:
title: "Presupuestos participativos - Estadisticas de participación"
supporting_phase: Fase de apoyos
balloting_phase: Votación final
budget_balloting:
title: "Estadísticas votación final"
vote_count: Votos
participant_count: Participantes
votes_per_heading: Votos por partida
participants_per_district: Participantes por distrito
budget_supporting:
title: "Estadísticas fase de apoyos"
headings: Partidas
users: Usuarios
vote_count: Votos
participant_count: Participantes
direct_messages:
title: Mensajes directos
total: Total

4
config/routes/admin.rb
View File

@@ -194,6 +194,10 @@ namespace :admin do
end
resource :stats, only: :show do
get :graph, on: :member
get :budgets, on: :collection
get :budget_supporting, on: :member
get :budget_balloting, on: :member
get :proposal_notifications, on: :collection
get :direct_messages, on: :collection
get :polls, on: :collection

35
spec/controllers/admin/api/stats_controller_spec.rb
View File

@@ -31,23 +31,13 @@ describe Admin::Api::StatsController do
it "returns single events formated for working with c3.js" do
sign_in user
get :show, params: { events: "foo" }
get :show, params: { event: "foo" }
expect(response).to be_ok
data = JSON.parse(response.body)
expect(data).to eq "x" => ["2015-01-01", "2015-01-02"], "Foo" => [2, 1]
end
it "returns combined comma separated events formated for working with c3.js" do
sign_in user
get :show, params: { events: "foo,bar" }
expect(response).to be_ok
data = JSON.parse(response.body)
expect(data).to eq "x" => ["2015-01-01", "2015-01-02", "2015-01-03"], "Foo" => [2, 1, 0], "Bar" => [1, 0, 2]
end
end
context "visits present" do
@@ -69,29 +59,6 @@ describe Admin::Api::StatsController do
end
end
context "visits and events present" do
it "returns combined events and visits formated for working with c3.js" do
time_1 = Time.zone.local(2015, 01, 01)
time_2 = Time.zone.local(2015, 01, 02)
create :ahoy_event, name: "foo", time: time_1
create :ahoy_event, name: "foo", time: time_2
create :ahoy_event, name: "foo", time: time_2
create :visit, started_at: time_1
create :visit, started_at: time_1
create :visit, started_at: time_2
sign_in user
get :show, params: { events: "foo", visits: true }
expect(response).to be_ok
data = JSON.parse(response.body)
expect(data).to eq "x" => ["2015-01-01", "2015-01-02"], "Foo" => [1, 2], "Visits" => [2, 1]
end
end
context "budget investments present" do
it "returns budget investments formated for working with c3.js" do
time_1 = Time.zone.local(2017, 04, 01)

162
spec/features/admin/stats_spec.rb
View File

@@ -97,11 +97,171 @@ feature "Stats" do
visit admin_stats_path
expect(page).to have_content "Level 2 User (1)"
expect(page).to have_content "Level two users 1"
end
end
describe "Budget investments" do
context "Supporting phase" do
background do
@budget = create(:budget)
@group_all_city = create(:budget_group, budget: @budget)
@heading_all_city = create(:budget_heading, group: @group_all_city)
end
scenario "Number of supports in investment projects" do
group_2 = create(:budget_group, budget: @budget)
investment1 = create(:budget_investment, heading: create(:budget_heading, group: group_2))
investment2 = create(:budget_investment, heading: @heading_all_city)
1.times { create(:vote, votable: investment1) }
2.times { create(:vote, votable: investment2) }
visit admin_stats_path
click_link "Participatory Budgets"
within("#budget_#{@budget.id}") do
click_link "Supporting phase"
end
expect(page).to have_content "Votes 3"
end
scenario "Number of users that have supported an investment project" do
user1 = create(:user, :level_two)
user2 = create(:user, :level_two)
user3 = create(:user, :level_two)
group_2 = create(:budget_group, budget: @budget)
investment1 = create(:budget_investment, heading: create(:budget_heading, group: group_2))
investment2 = create(:budget_investment, heading: @heading_all_city)
create(:vote, votable: investment1, voter: user1)
create(:vote, votable: investment1, voter: user2)
create(:vote, votable: investment2, voter: user1)
visit admin_stats_path
click_link "Participatory Budgets"
within("#budget_#{@budget.id}") do
click_link "Supporting phase"
end
expect(page).to have_content "Participants 2"
end
scenario "Number of users that have supported investments projects per geozone" do
budget = create(:budget)
group_all_city = create(:budget_group, budget: budget)
group_districts = create(:budget_group, budget: budget)
all_city = create(:budget_heading, group: group_all_city)
carabanchel = create(:budget_heading, group: group_districts)
barajas = create(:budget_heading, group: group_districts)
all_city_investment = create(:budget_investment, heading: all_city)
carabanchel_investment = create(:budget_investment, heading: carabanchel)
carabanchel_investment = create(:budget_investment, heading: carabanchel)
Budget::Investment.all.each do |investment|
create(:vote, votable: investment)
end
visit admin_stats_path
click_link "Participatory Budgets"
within("#budget_#{budget.id}") do
click_link "Supporting phase"
end
within("#budget_heading_#{all_city.id}") do
expect(page).to have_content all_city.name
expect(page).to have_content 1
end
within("#budget_heading_#{carabanchel.id}") do
expect(page).to have_content carabanchel.name
expect(page).to have_content 2
end
within("#budget_heading_#{barajas.id}") do
expect(page).to have_content barajas.name
expect(page).to have_content 0
end
end
end
context "Balloting phase" do
background do
@budget = create(:budget, :balloting)
@group = create(:budget_group, budget: @budget)
@heading = create(:budget_heading, group: @group)
@investment = create(:budget_investment, :feasible, :selected, heading: @heading)
end
scenario "Number of votes in investment projects" do
ballot_1 = create(:budget_ballot, budget: @budget)
ballot_2 = create(:budget_ballot, budget: @budget)
group_2 = create(:budget_group, budget: @budget)
heading_2 = create(:budget_heading, group: group_2)
investment_2 = create(:budget_investment, :feasible, :selected, heading: heading_2)
create(:budget_ballot_line, ballot: ballot_1, investment: @investment)
create(:budget_ballot_line, ballot: ballot_1, investment: investment_2)
create(:budget_ballot_line, ballot: ballot_2, investment: investment_2)
visit admin_stats_path
click_link "Participatory Budgets"
within("#budget_#{@budget.id}") do
click_link "Final voting"
end
expect(page).to have_content "Votes 3"
end
scenario "Number of users that have voted a investment project" do
user_1 = create(:user, :level_two)
user_2 = create(:user, :level_two)
user_3 = create(:user, :level_two)
ballot_1 = create(:budget_ballot, budget: @budget, user: user_1)
ballot_2 = create(:budget_ballot, budget: @budget, user: user_2)
ballot_3 = create(:budget_ballot, budget: @budget, user: user_3)
create(:budget_ballot_line, ballot: ballot_1, investment: @investment)
create(:budget_ballot_line, ballot: ballot_2, investment: @investment)
visit admin_stats_path
click_link "Participatory Budgets"
within("#budget_#{@budget.id}") do
click_link "Final voting"
end
expect(page).to have_content "Participants 2"
end
end
end
context "graphs" do
scenario "event graphs", :js do
campaign = create(:campaign)
visit root_path(track_id: campaign.track_id)
visit admin_stats_path
within("#stats") do
click_link campaign.name
end
expect(page).to have_content "#{campaign.name} (1)"
within("#graph") do
event_created_at = Ahoy::Event.where(name: campaign.name).first.time
expect(page).to have_content event_created_at.strftime("%Y-%m-%d")
end
end
end
context "Proposal notifications" do
scenario "Summary stats" do

11
spec/features/campaigns_spec.rb
View File

@@ -15,8 +15,13 @@ feature "Email campaigns" do
5.times { visit root_url(track_id: @campaign2.track_id) }
visit admin_stats_path
click_link @campaign1.name
expect(page).to have_content "#{@campaign1.name} (3)"
click_link "Go back"
click_link @campaign2.name
expect(page).to have_content "#{@campaign2.name} (5)"
end
@@ -25,9 +30,13 @@ feature "Email campaigns" do
visit root_url(track_id: "999")
visit admin_stats_path
click_link @campaign1.name
expect(page).to have_content "#{@campaign1.name} (1)"
click_link "Go back"
expect(page).not_to have_content @campaign2.name.to_s
end
end
end