+
+
<%= user_count.to_i %> Total users
-
+
<%= plan_count.to_i %> Total plans
+
+
+
+
+ <% if current_user.can_super_admin? %>
+ <%= link_to usage_global_statistics_path(sep: ","), class: 'stat btn btn-default', role: 'button', target: '_blank' do %>
+ <%= _('Download global usage') %>
+ <% end %>
+ <% end %>
+
+
+ <%= link_to usage_org_statistics_path(sep: ","), class: 'stat btn btn-default pull-right', role: 'button', target: '_blank' do %>
+ <%= _('Download Monthly Usage') %>
+ <% end %>
+
diff --git a/app/views/usage/_user_statistics.html.erb b/app/views/usage/_user_statistics.html.erb
new file mode 100644
index 0000000..424b688
--- /dev/null
+++ b/app/views/usage/_user_statistics.html.erb
@@ -0,0 +1,127 @@
+<%# locals: expanded %>
+
+
+
+
+
+
+ <%= _('Statistics on your Users') %>
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= _('The graphs display new users and plans for your organisation over the past year. You can download a CSV report for each graph.')%>
+
+
+
+
+
+
+
+
* <%= _('Move the mouse pointer over the bars of a chart to see numbers.') %>
+
+
+
+
+
+
+
<%= _('No. users joined during last year') %>
+
+
+ <%= link_to usage_yearly_users_path(sep: ","), class: 'stat btn btn-default', role: 'button', target: '_blank' do %>
+ <%= _('Download') %>
+ <% end %>
+
+
+
+ <%= render partial: 'usage/users_joined_chart',
+ locals: { data: @users_per_month } %>
+
+
+
+
+
<%= _('No. plans during last year') %>
+
+
+ <%= link_to usage_yearly_plans_path(sep: ","), class: 'stat btn btn-default', role: 'button', target: '_blank' do %>
+ <%= _('Download') %>
+ <% end %>
+
+
+
+ <%= render partial: 'usage/plans_created_chart',
+ locals: { data: @plans_per_month } %>
+
+
+
+
+
+
+
+
+
<%= _('No. plans by template') %>
+
+
+
+
+
+
+ -
+ <%= form_for :usage, url: usage_plans_by_template_path, remote: true do |f| %>
+
+ <% end %>
+
+ -
+
+ <%= link_to usage_all_plans_by_template_path(sep: ","), class: 'btn btn-default stat', role: 'button', target: '_blank' do %>
+ <%= _('Download all') %>
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+ <%# pp @plans_per_month %>
+ <%= render partial: 'usage/plans_by_template_chart',
+ locals: { data: @plans_per_month } %>
+
+
+
+
+
+
+
+
diff --git a/app/views/usage/index.html.erb b/app/views/usage/index.html.erb
index 7ed3381..65446a0 100644
--- a/app/views/usage/index.html.erb
+++ b/app/views/usage/index.html.erb
@@ -1,98 +1,21 @@
<% title _('Usage statistics') %>
+
+
+
<%=_('Usage statistics')%>
+
+
+
<%= render partial: 'usage/total_usage',
- locals: { user_count: @total_org_users, plan_count: @total_org_plans, separators: @separators } %>
+ locals: { user_count: @total_org_users,
+ plan_count: @total_org_plans,
+ separators: @separators } %>
+
+
+
+ <%= render partial: 'usage/template_statistics', locals: {expanded: @funder.present?} %>
+ <%= render partial: 'usage/user_statistics', locals: {expanded: !@funder.present?} %>
+
+
<%= render partial: 'usage/filter' %>
-
-
-
-
-
* <%= _('Move the mouse pointer over the bars of a chart to see numbers.') %>
-
-
-
-
-
-
-
<%= _('No. users joined during last year') %>
-
-
- <%= link_to usage_yearly_users_path(sep: ","), class: 'stat btn btn-default', role: 'button', target: '_blank' do %>
- <%= _('Download') %>
- <% end %>
-
-
-
- <%= render partial: 'usage/users_joined_chart',
- locals: { data: @users_per_month } %>
-
-
-
-
-
<%= _('No. plans during last year') %>
-
-
- <%= link_to usage_yearly_plans_path(sep: ","), class: 'stat btn btn-default', role: 'button', target: '_blank' do %>
- <%= _('Download') %>
- <% end %>
-
-
-
- <%= render partial: 'usage/plans_created_chart',
- locals: { data: @plans_per_month } %>
-
-
-
-
-
-
-
-
-
<%= _('No. plans by template') %>
-
-
-
-
-
-
- -
- <%= form_for :usage, url: usage_plans_by_template_path, remote: true do |f| %>
-
- <% end %>
-
- -
-
- <%= link_to usage_all_plans_by_template_path(sep: ","), class: 'btn btn-default stat', role: 'button', target: '_blank' do %>
- <%= _('Download all') %>
- <% end %>
-
-
-
-
-
-
-
-
-
-
- <%# pp @plans_per_month %>
- <%= render partial: 'usage/plans_by_template_chart',
- locals: { data: @plans_per_month } %>
-
-
-
diff --git a/spec/controllers/usage_controller_spec.rb b/spec/controllers/usage_controller_spec.rb
index da77804..a9ac495 100644
--- a/spec/controllers/usage_controller_spec.rb
+++ b/spec/controllers/usage_controller_spec.rb
@@ -6,7 +6,7 @@
before(:each) do
@date = Date.today.last_month.end_of_month
@org = create(:org, :organisation)
- @details = { "by_template": [stat_details] }
+ @details = { "by_template": [stat_details], "using_template": [] }
@plan_stat = create(:stat_created_plan, date: @date, org: @org, details: @details)
@user_stat = create(:stat_joined_user, date: @date, org: @org)
@@ -156,6 +156,7 @@
def obj_to_hash(obj:)
hash = { "count": obj.count, "date": obj.date.strftime("%Y-%m-%d") }
hash["by_template"] = obj.details.fetch("by_template", []) if obj.details.present?
+ hash["using_template"] = obj.details.fetch("using_template", []) if obj.details.present?
[hash.to_json]
end
diff --git a/spec/services/org/create_created_plan_service_spec.rb b/spec/services/org/create_created_plan_service_spec.rb
index dbd3e61..3a50725 100644
--- a/spec/services/org/create_created_plan_service_spec.rb
+++ b/spec/services/org/create_created_plan_service_spec.rb
@@ -6,6 +6,9 @@
let(:org) do
FactoryBot.create(:org, created_at: DateTime.new(2018, 4, 1))
end
+ let(:org2) do
+ FactoryBot.create(:org, created_at: DateTime.new(2018, 4, 1))
+ end
let(:template) do
FactoryBot.create(:template, org: org)
end
@@ -18,7 +21,9 @@
let(:user2) do
FactoryBot.create(:user, org: org)
end
-
+ let(:user3) do
+ FactoryBot.create(:user, org: org2)
+ end
before(:each) do
plan = FactoryBot.create(:plan,
template: template,
@@ -35,6 +40,9 @@
plan5 = FactoryBot.create(:plan,
template: template2,
created_at: DateTime.new(2018, 6, 3))
+ plan6 = FactoryBot.create(:plan,
+ template: template2,
+ created_at: DateTime.new(2018, 6, 3))
FactoryBot.create(:role,
:creator,
plan: plan,
@@ -59,6 +67,10 @@
:administrator,
plan: plan5,
user: user2)
+ FactoryBot.create(:role,
+ :creator,
+ plan: plan6,
+ user: user3)
end
def find_by_dates(dates:, org_id:)
diff --git a/spec/services/org/create_last_month_created_plan_service_spec.rb b/spec/services/org/create_last_month_created_plan_service_spec.rb
index a20807d..765243d 100644
--- a/spec/services/org/create_last_month_created_plan_service_spec.rb
+++ b/spec/services/org/create_last_month_created_plan_service_spec.rb
@@ -6,6 +6,9 @@
let(:org) do
FactoryBot.create(:org, created_at: DateTime.new(2018, 04, 01))
end
+ let(:org2) do
+ FactoryBot.create(:org)
+ end
let(:template) do
FactoryBot.create(:template, org: org)
end
@@ -18,6 +21,9 @@
let(:user2) do
FactoryBot.create(:user, org: org)
end
+ let(:user3) do
+ FactoryBot.create(:user, org: org2)
+ end
let(:creator) { Role.access_values_for(:creator).first }
let(:administrator) { Role.access_values_for(:administrator).first }
before(:each) do
@@ -30,10 +36,14 @@
plan3 = FactoryBot.create(:plan,
template: template2,
created_at: Date.today.last_month)
+ plan4 = FactoryBot.create(:plan,
+ template: template2,
+ created_at: Date.today.last_month)
FactoryBot.create(:role, :creator, plan: plan, user: user1)
FactoryBot.create(:role, :administrator, plan: plan, user: user1)
FactoryBot.create(:role, :creator, plan: plan2, user: user1)
FactoryBot.create(:role, :creator, plan: plan3, user: user2)
+ FactoryBot.create(:role, :creator, plan: plan4, user: user3)
end
describe ".call" do
@@ -52,16 +62,31 @@
last_month_details = StatCreatedPlan.find_by(
date: Date.today.last_month.end_of_month,
- org_id: org.id).details
+ org_id: org.id).by_template
expect(last_month_details).to match_array(
- "by_template" => [
+ [
{ "name" => template.title, "count" => 2 },
{ "name" => template2.title, "count" => 1 },
]
)
end
+ it "generates counts by template from today's last month" do
+ described_class.call(org)
+
+ last_month_details = StatCreatedPlan.find_by(
+ date: Date.today.last_month.end_of_month,
+ org_id: org.id).using_template
+
+ expect(last_month_details).to match_array(
+ [
+ { "name" => template.title, "count" => 2 },
+ { "name" => template2.title, "count" => 2 },
+ ]
+ )
+ end
+
it "monthly records are either created or updated" do
described_class.call(org)
@@ -108,16 +133,33 @@
last_month_details = StatCreatedPlan.find_by(
date: Date.today.last_month.end_of_month,
- org_id: org.id).details
+ org_id: org.id).by_template
expect(last_month_details).to match_array(
- "by_template" => [
+ [
{ "name" => template.title, "count" => 2 },
{ "name" => template2.title, "count" => 1 },
]
)
end
+ it "generates counts using template from today's last month" do
+ Org.expects(:all).returns([org])
+
+ described_class.call
+
+ last_month_details = StatCreatedPlan.find_by(
+ date: Date.today.last_month.end_of_month,
+ org_id: org.id).using_template
+
+ expect(last_month_details).to match_array(
+ [
+ { "name" => template.title, "count" => 2 },
+ { "name" => template2.title, "count" => 2 },
+ ]
+ )
+ end
+
it "monthly records are either created or updated" do
Org.stubs(:all).returns([org])