Entries now loaded 25 at a time. More loaded by link at the bottom

app/controllers/entries_controller.rb

@@ -4,7 +4,12 @@ class EntriesController < ApplicationController
   before_filter :find_entry, :except => [:index, :new, :create, :report]
 
   def index
-    @entries = (@project || @logged_user).entries.find(:all)
+    last_id = (params[:last_id] || '0').to_i
+    @entries = (@project || @logged_user).entries.find(:all, 
+      :conditions => last_id > 0 ? ['id < ?', last_id] : {}, 
+      :limit => 25, 
+      :order => 'start_date DESC')
+    @last_entry = @entries.length > 0 ? @entries[-1].id : 0
   end
 
   def new

app/controllers/projects_controller.rb

@@ -10,9 +10,22 @@ def index
 
   def entries
     @projects = @logged_user.projects
-    @entries = @logged_user.entries.find(:all, :conditions => {:project_id => @logged_user.project_ids}, :order => 'start_date DESC')
+    last_id = (params[:last_id] || '0').to_i
+    conds = if last_id > 0
+      ['project_id IN (?) AND id < ?', @logged_user.project_ids, last_id]
+    else
+      ['project_id IN (?)', @logged_user.project_ids]
+    end
+
+    @entries = @logged_user.entries.find(:all, 
+      :conditions => conds, 
+      :limit => 25, 
+      :order => 'start_date DESC')
+    @last_entry = @entries.length > 0 ? @entries[-1].id : 0
+
     respond_to do |f|
       f.html {render 'entries/index'}
+      f.js {render 'entries/index'}
     end
   end
 
@@ -57,9 +70,16 @@ def destroy
   end
 
   def show
-    @entries = @project.entries
+    last_id = (params[:last_id] || '0').to_i
+    @entries = @project.entries.find(:all, 
+      :conditions => last_id > 0 ? ['id < ?', last_id] : {}, 
+      :limit => 25, 
+      :order => 'start_date DESC')
+    @last_entry = @entries.length > 0 ? @entries[-1].id : 0
+
     respond_to do |f|
       f.html {render 'entries/index'}
+      f.js {render 'entries/index'}
     end
   end
 

app/controllers/services_controller.rb

@@ -46,9 +46,16 @@ def destroy
   end
 
   def show
-    @entries = @service.entries
+    last_id = (params[:last_id] || '0').to_i
+    @entries = @service.entries.find(:all, 
+      :conditions => last_id > 0 ? ['id < ?', last_id] : {}, 
+      :limit => 25, 
+      :order => 'start_date DESC')
+    @last_entry = @entries.length > 0 ? @entries[-1].id : 0
+
     respond_to do |f|
       f.html {render 'entries/index'}
+      f.js {render 'entries/index'}
     end
   end
 

app/helpers/entries_helper.rb

@@ -37,6 +37,19 @@ def entry_service_tag(tag)
     "<span class=\"service\">\##{tag}</span>"
   end
 
+  def more_entries_link(num, last_id)
+    path_name = if @project
+      project_path(@project, :last_id => last_id)
+    elsif @service
+      service_path(@service, :last_id => last_id)
+    elsif @projects
+      entries_projects_path(:last_id => last_id)
+    else
+      entries_path(:last_id => last_id)
+    end
+    link_to_remote t('.display_x_more_entries', :num => num), :url => path_name, :method => :get
+  end
+
   def entry_bar_report(id, values, labels)
     js_labels = labels.map{|l| "'#{l}'"}
     "<div id=\"#{id}\" style=\"width:300px; height: 200px;\"></div>" +

app/views/entries/_more.haml

@@ -0,0 +1,2 @@
+#entries_more.hint
+  = more_entries_link(num, @last_entry)

app/views/entries/index.haml

@@ -10,6 +10,8 @@
 
 #entries
   = render :partial => 'entries/entry', :collection => @entries
+  - if @entries.length >= 25
+    = render :partial => 'entries/more', :locals => {:num => 25}
 
 - content_for :js_templates do
   = "Timer.init();"

app/views/entries/index.js.rjs

@@ -0,0 +1,10 @@
+@entries.each do |entry|
+  page.insert_html :before, "entries_more", :partial => 'entries/entry', :object => entry
+  page.call "Timer.register", entry.id unless entry.terminated?
+end
+
+if @entries.length < 25
+  page.remove "entries_more"
+else
+  page.replace "entries_more", :partial => 'entries/more', :locals => {:num => 25}
+end

config/locales/en.yml

@@ -58,6 +58,8 @@ en:
     what_in_project: "What are you doing in {{project}}?"
     what_in_service: "What {{service}} are you working on?"
     what_status: "What are you doing? (<a href=\"/taglist.html\" target=\"_blank\">Help?</a>)"
+    more:
+      display_x_more_entries: "Display {{num}} more entries"
   projects:
     create: Create
     update: Update