From f29371b9d280ca3238a82372e95bca7cd35fe411 Mon Sep 17 00:00:00 2001 From: rosario Date: Thu, 9 Apr 2009 23:21:38 +0100 Subject: [PATCH] Changed project/setup and project/create to dashboard/setup and dashboard/create. Small fix to robot identification --- app/controllers/dashboard_controller.rb | 46 ++++++++++++++++++- app/controllers/graphs_controller.rb | 4 +- app/controllers/login_controller.rb | 5 +- app/controllers/projects_controller.rb | 45 ------------------ .../{projects => dashboard}/setup.html.erb | 4 +- lib/parser.rb | 2 +- 6 files changed, 53 insertions(+), 53 deletions(-) rename app/views/{projects => dashboard}/setup.html.erb (78%) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 8734699..8fd69f8 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -9,7 +9,7 @@ def index u = User.find(session[:user_id]) pid = u.project_id if pid.nil? - redirect_to :controller =>'projects', :action=> 'setup' + redirect_to :controller =>'dashboard', :action=> 'setup' else session[:project_id] = pid redirect_to project_overview_url(:id =>pid) @@ -17,7 +17,51 @@ def index end + def setup + + + end + def create + u = User.find(session[:user_id]) + project_name = params[:project_name] + + + if u.project_id.nil? + p = Project.create(:name=>project_name) + u.project_id = p.id + u.save + + # Testing, add the actions + urls = ["http://0.0.0.0:3000/website/page1", + "http://0.0.0.0:3000/website/page2", + "http://0.0.0.0:3000/website/page3", + "http://0.0.0.0:3000/website/page4", + "http://0.0.0.0:3000/website/page5"] + as = [] + for u in urls + p.add_action(Action.new(:url=>"#{u}", :url_id=> Digest::MD5.hexdigest(u), :kind => rand(2))) + end + + + # Randomly create 500 visitors. Useful for graphs generation + 500.times do + v = Visitor.create_random + v.add_random_actions(p.actions) + p.visitors << v + end + + + else + p= Project.find(u.project_id) + end + session[:project_id]= p.id + + + + redirect_to project_overview_url(:id => p.id) + end + end diff --git a/app/controllers/graphs_controller.rb b/app/controllers/graphs_controller.rb index 9936bb3..8fd4205 100644 --- a/app/controllers/graphs_controller.rb +++ b/app/controllers/graphs_controller.rb @@ -38,7 +38,7 @@ def graph1 # :conditions => conditions).sort_by{|x,y| y}.reverse # - @browsers =vs.group_by{|v| v.config_browser_name}.map{|k,v| [k,v.size]}.sort_by{|x,y| y}.reverse + @browsers =vs.group_by{|v| v.config_browser_name}.map{|k,v| [k,v.size]}.sort_by{|x,y| y}.reverse.first(9) # @config_os = p.visitors.count(:id, @@ -46,7 +46,7 @@ def graph1 # :conditions => conditions).sort_by{|x,y| y}.reverse # - @config_os = vs.group_by{|v| v.config_os}.map{|k,v| [k,v.size]}.sort_by{|x,y| y}.reverse + @config_os = vs.group_by{|v| v.config_os}.map{|k,v| [k,v.size]}.sort_by{|x,y| y}.reverse.first(9) # @hours_by_servertime = p.visitors.count(:id, diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index e4c568f..0eac419 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -27,8 +27,9 @@ def login def logout - session[:user_id] = nil - session[:events_loaded] = nil + session[:user_id] = nil + session[:project_id] = nil + #session[:events_loaded] = nil flash[:notice] = "Logged out" redirect_to(:action => "login") end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ecd16a8..d06698f 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -17,51 +17,6 @@ def overview end - def setup - - end - - def create - u = User.find(session[:user_id]) - project_name = params[:project_name] - - - if u.project_id.nil? - p = Project.create(:name=>project_name) - u.project_id = p.id - u.save - - # Testing, add the actions - urls = ["http://0.0.0.0:3000/website/page1", - "http://0.0.0.0:3000/website/page2", - "http://0.0.0.0:3000/website/page3", - "http://0.0.0.0:3000/website/page4", - "http://0.0.0.0:3000/website/page5"] - as = [] - for u in urls - p.add_action(Action.new(:url=>"#{u}", :url_id=> Digest::MD5.hexdigest(u), :kind => rand(2))) - end - - - # Randomly create 500 visitors. Useful for graphs generation - 500.times do - v = Visitor.create_random - v.add_random_actions(p.actions) - p.visitors << v - end - - - - else - p= Project.find(u.project_id) - end - session[:project_id]= p.id - - - - redirect_to project_overview_url(:id => p.id) - end - diff --git a/app/views/projects/setup.html.erb b/app/views/dashboard/setup.html.erb similarity index 78% rename from app/views/projects/setup.html.erb rename to app/views/dashboard/setup.html.erb index 7b3d831..2e4b1a9 100644 --- a/app/views/projects/setup.html.erb +++ b/app/views/dashboard/setup.html.erb @@ -1,4 +1,4 @@ -Create New Project +Create New Project (Dentro Dashboard) @@ -9,4 +9,4 @@ Create New Project <%= submit_tag 'Create' %> -<%end%> +<%end%> \ No newline at end of file diff --git a/lib/parser.rb b/lib/parser.rb index fa56692..2d7fb18 100644 --- a/lib/parser.rb +++ b/lib/parser.rb @@ -238,7 +238,7 @@ def self.browser_info(user_agent) if robot browser[:type] = robot else - browser[:type] = "Other" + browser[:type] = "Robot" end end