Changed project/setup and project/create to dashboard/setup and dashb…

…oard/create. Small fix to robot identification

app/controllers/dashboard_controller.rb

@@ -9,15 +9,59 @@ 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)
      end
 
    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
 

app/controllers/graphs_controller.rb

@@ -38,15 +38,15 @@ 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, 
     #                 :group =>:config_os,
     #                 :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, 

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

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
-
 
 
 

app/views/projects/setup.html.erb → 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%>

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