diff --git a/tracks/app/controllers/context_controller.rb b/tracks/app/controllers/context_controller.rb index 3242e4c1..641b1cbe 100644 --- a/tracks/app/controllers/context_controller.rb +++ b/tracks/app/controllers/context_controller.rb @@ -44,7 +44,8 @@ class ContextController < ApplicationController @places = Context.find_all @projects = Project.find_all @page_title = "Context: #{@context.name.capitalize}" - @not_done = Todo.find_all( "context_id=#{@context.id} AND done=0", "created DESC" ) + @not_done = Todo.find_all( "context_id=#{@context.id} AND done=0", "created ASC" ) + @count = Todo.count( "context_id=#{@context.id} AND done=0" ) end diff --git a/tracks/app/controllers/project_controller.rb b/tracks/app/controllers/project_controller.rb index c48a01eb..3edffa12 100644 --- a/tracks/app/controllers/project_controller.rb +++ b/tracks/app/controllers/project_controller.rb @@ -26,6 +26,7 @@ class ProjectController < ApplicationController @places = Context.find_all @page_title = "Project: #{@project.name}" @not_done = Todo.find_all( "project_id=#{@project.id} AND done=0", "created DESC" ) + @count = Todo.count( "project_id=#{@project.id} AND done=0" ) end diff --git a/tracks/app/controllers/todo_controller.rb b/tracks/app/controllers/todo_controller.rb index 3c8d0918..6fa630bd 100644 --- a/tracks/app/controllers/todo_controller.rb +++ b/tracks/app/controllers/todo_controller.rb @@ -3,7 +3,6 @@ class TodoController < ApplicationController helper :todo model :context, :project - scaffold :todo before_filter :login_required caches_action :list, :completed layout "standard" @@ -16,6 +15,7 @@ class TodoController < ApplicationController @places = Context.find_all @projects = Project.find_all @done = Todo.find_all( "done=1", "completed DESC", 5 ) + @count = Todo.count( "done=0" ) end @@ -102,7 +102,7 @@ class TodoController < ApplicationController def toggle_check item = Todo.find(@params['id']) - item.toggle('done') + item.toggle!('done') if item.save flash["confirmation"] = "Next action marked as completed" diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml index f5f9e2c7..9f126640 100644 --- a/tracks/app/views/layouts/standard.rhtml +++ b/tracks/app/views/layouts/standard.rhtml @@ -12,8 +12,8 @@

- <% if @not_done %> - <%= @not_done.length %> + <% if @count %> + <%= @count %> <% end %> <%= today = Time.now; datestamp = today.strftime("%A, %e %B %Y") %>

diff --git a/tracks/app/views/todo/list.rhtml b/tracks/app/views/todo/list.rhtml index 993be37e..62cd959e 100644 --- a/tracks/app/views/todo/list.rhtml +++ b/tracks/app/views/todo/list.rhtml @@ -10,7 +10,7 @@ <% end %> <% end %> - +

Last 5 completed actions