From f294743a2de4d8c237e7c520f2ebb0a7218f6710 Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 4 Feb 2015 22:40:04 -0700 Subject: add charts. --- app/controllers/agents/events_controller.rb | 2 +- app/views/agents/events/index.html.erb | 10 ++++++++++ app/views/layouts/application.html.erb | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/controllers/agents/events_controller.rb b/app/controllers/agents/events_controller.rb index 630f4df..33dcb7f 100644 --- a/app/controllers/agents/events_controller.rb +++ b/app/controllers/agents/events_controller.rb @@ -3,7 +3,7 @@ module Agents before_action :load_agent def index - @events = Event.all.order(created_at: :desc) + @events = @agent.events.order(created_at: :desc) end def new diff --git a/app/views/agents/events/index.html.erb b/app/views/agents/events/index.html.erb index fb7afc9..6143c15 100644 --- a/app/views/agents/events/index.html.erb +++ b/app/views/agents/events/index.html.erb @@ -31,4 +31,14 @@ + +
+

Events per minute

+ <%= line_chart @agent.events.group_by_minute(:created_at).count %> +
+ +
+

Events by category

+ <%= pie_chart @agent.events.group(:name).count %> +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 00fb7fa..5031340 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,7 @@ <%= stylesheet_link_tag "application" %> <%= javascript_include_tag "vendor/modernizr" %> <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %> <%= csrf_meta_tags %> -- cgit v1.2.3