From e2610e15e71f3f99952778ba1937159b6c45644c Mon Sep 17 00:00:00 2001
From: inobcr
Date: Mon, 21 Mar 2016 14:17:45 +0100
Subject: [PATCH] Add_stats_for_Investment_Proyect_#918
---
app/controllers/admin/api/stats_controller.rb | 9 +++++++--
app/controllers/admin/stats_controller.rb | 2 +-
app/helpers/stats_helper.rb | 6 ++++++
app/views/admin/stats/show.html.erb | 19 +++++++++++++++++++
config/locales/admin.en.yml | 4 +++-
config/locales/admin.es.yml | 2 ++
6 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/app/controllers/admin/api/stats_controller.rb b/app/controllers/admin/api/stats_controller.rb
index dfedb1c54..e58d9d754 100644
--- a/app/controllers/admin/api/stats_controller.rb
+++ b/app/controllers/admin/api/stats_controller.rb
@@ -1,7 +1,9 @@
class Admin::Api::StatsController < Admin::Api::BaseController
def show
- unless params[:events].present? || params[:visits].present?
+ unless params[:events].present? ||
+ params[:visits].present? ||
+ params[:spending_proposals].present?
return render json: {}, status: :bad_request
end
@@ -18,7 +20,10 @@ class Admin::Api::StatsController < Admin::Api::BaseController
ds.add "Visits", Visit.group_by_day(:started_at).count
end
+ if params[:spending_proposals].present?
+ ds.add "Spending proposals", SpendingProposal.group_by_day(:created_at).count
+ end
+
render json: ds.build
end
-
end
diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb
index ec5c2d19d..7183c3767 100644
--- a/app/controllers/admin/stats_controller.rb
+++ b/app/controllers/admin/stats_controller.rb
@@ -18,6 +18,6 @@ class Admin::StatsController < Admin::BaseController
@verified_users = User.with_hidden.level_two_or_three_verified.count
@unverified_users = User.with_hidden.unverified.count
@users = User.with_hidden.count
+ @spending_proposals = SpendingProposal.count
end
-
end
diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb
index 5116b60dd..097711b88 100644
--- a/app/helpers/stats_helper.rb
+++ b/app/helpers/stats_helper.rb
@@ -14,4 +14,10 @@ module StatsHelper
content_tag :div, "", opt
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
+ end
end
diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb
index 84abd7be9..1966cd586 100644
--- a/app/views/admin/stats/show.html.erb
+++ b/app/views/admin/stats/show.html.erb
@@ -77,6 +77,13 @@
<%= number_with_delimiter(@user_level_three) %>
+
+
+
+ <%= t "admin.stats.show.summary.spending_proposals" %>
+ <%= number_with_delimiter(@spending_proposals) %>
+
+
@@ -90,6 +97,18 @@
<%= events_chart_tag event %>
<% end %>
+
+
+
<%= t "admin.stats.show.spending_proposals_title" %>
+ <%= spending_proposals_chart_tag id: "spending_proposals" %>
+
+
+
+ <% @event_types.each do |event, count| %>
+
<%= event.titleize %> (<%= count %>)
+ <%= events_chart_tag event %>
+ <% end %>
+
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index b38a069aa..dfa937a23 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -194,6 +194,7 @@ en:
debates: Debates
proposal_votes: Proposal votes
proposals: Proposals
+ spending_proposals: Spending Proposals
unverified_users: Unverified users
user_level_three: Level three users
user_level_two: Level two users
@@ -201,6 +202,7 @@ en:
verified_users: Verified users
visits: Visits
votes: Total votes
+ spending_proposals_title: Spending Proposals
visits_title: Visits
tags:
create: Create Topic
@@ -230,4 +232,4 @@ en:
index:
phone_not_given: Phone not given
sms_code_not_confirmed: Has not confirmed the sms code
- title: Incomplete verifications
+ title: Incomplete verifications
\ No newline at end of file
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 67c846158..0b1418fcd 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -194,6 +194,7 @@ es:
debates: Debates
proposal_votes: Votos en propuestas
proposals: Propuestas
+ spending_proposals: Propuestas de inversión
unverified_users: Usuarios sin verificar
user_level_three: Usuarios de nivel tres
user_level_two: Usuarios de nivel dos
@@ -201,6 +202,7 @@ es:
verified_users: Usuarios verificados
visits: Visitas
votes: Votos
+ spending_proposals_title: Propuestas de inversión
visits_title: Visitas
tags:
create: Crear Tema