<%= 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 @@
- <%= t "admin.stats.show.summary.visits" %>
+ <%= link_to t("admin.stats.show.summary.visits"),
+ graph_admin_stats_path(id: "visits", count: @visits) %>
<%= number_with_delimiter(@visits) %>
@@ -119,24 +119,14 @@
-
<%= t "admin.stats.show.visits_title" %>
- <%= visits_chart_tag id: "visits" %>
-
-
-
- <% @event_types.each do |event, count| %>
-
<%= event.titleize %> (<%= count %>)
- <%= events_chart_tag event %>
+ <% @event_types.each do |event| %>
+
+ <%= link_to graph_link_text(event),
+ graph_admin_stats_path(event: event) %>
+
<% end %>
- <% if feature?(:spending_proposals) %>
-
-
<%= t "admin.stats.show.spending_proposals_title" %>
- <%= spending_proposals_chart_tag id: "spending_proposals" %>
-
- <% end %>
-
<% if feature?(:budgets) %>
<%= t "admin.stats.show.budgets_title" %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 6b231ce49e4..0f9a82856d3 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -33,7 +33,7 @@
<%= render "layouts/flash" %>
- <%= render "layouts/officing_booth" %>
+ <%= render "layouts/officing_booth" if controller.class.parent == Officing && session[:booth_id].present? %>
<%= yield %>
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index c7c93b89c44..a6bf607699b 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -8,4 +8,8 @@ def track_event(name, properties, options)
event.ip = request.ip
end
end
+
+ def exclude?
+ false
+ end
end
diff --git a/config/initializers/vote_extensions.rb b/config/initializers/vote_extensions.rb
index 548d75350aa..374013e99ba 100644
--- a/config/initializers/vote_extensions.rb
+++ b/config/initializers/vote_extensions.rb
@@ -2,6 +2,7 @@
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
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index ad66ad884a9..f47b0eb19e3 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -1451,13 +1451,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
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index b55e1dae832..c789029150e 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -1450,13 +1450,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
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index c5b35052893..917f1447c0e 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -194,6 +194,10 @@
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
diff --git a/spec/controllers/admin/api/stats_controller_spec.rb b/spec/controllers/admin/api/stats_controller_spec.rb
index d9a2cdeb4eb..291c100d81e 100644
--- a/spec/controllers/admin/api/stats_controller_spec.rb
+++ b/spec/controllers/admin/api/stats_controller_spec.rb
@@ -31,23 +31,13 @@
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 @@
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)
diff --git a/spec/features/admin/stats_spec.rb b/spec/features/admin/stats_spec.rb
index 1e3cb508746..bc5bb3a2cf3 100644
--- a/spec/features/admin/stats_spec.rb
+++ b/spec/features/admin/stats_spec.rb
@@ -97,11 +97,171 @@
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
diff --git a/spec/features/campaigns_spec.rb b/spec/features/campaigns_spec.rb
index 681cd33c1e6..517c95481a3 100644
--- a/spec/features/campaigns_spec.rb
+++ b/spec/features/campaigns_spec.rb
@@ -15,8 +15,13 @@
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 @@
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
\ No newline at end of file
+end