#{count_undone_todos_phrase(p)}. " - project_description += t('projects.project_state', :state => project.state) - project_description += "
" - project_description - end - end diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 7bb6d0ed..6ad84bf3 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -7,9 +7,9 @@ class TodosController < ApplicationController append_before_filter :find_and_activate_ready, :only => [:index, :list_deferred] # TODO: replace :except with :only - append_before_filter :init, :except => [ :tag, :tags, :destroy, :completed, - :completed_archive, :check_deferred, :toggle_check, :toggle_star, - :edit, :update, :defer, :create, :calendar, :auto_complete_for_predecessor, :remove_predecessor, :add_predecessor] + append_before_filter :init, :except => [ :tag, :tags, :destroy, :done, + :check_deferred, :toggle_check, :toggle_star, :edit, :update, :defer, :create, + :calendar, :auto_complete_for_predecessor, :remove_predecessor, :add_predecessor] protect_from_forgery :except => :check_deferred @@ -349,7 +349,7 @@ class TodosController < ApplicationController determine_remaining_in_context_count(@original_item_context_id) respond_to do |format| - format.js {render :action => :update } + format.js { render :action => :update } format.xml { render :xml => @todo.to_xml( :except => :user_id ) } end end @@ -468,21 +468,16 @@ class TodosController < ApplicationController end end - def completed + def done + @source_view = 'done' @page_title = t('todos.completed_tasks_title') - @done = current_user.completed_todos - @done_today = @done.completed_within Time.zone.now - 1.day - @done_this_week = @done.completed_within Time.zone.now - 1.week - @done_this_month = @done.completed_within Time.zone.now - 4.week + completed_todos = current_user.todos.completed + @done_today = completed_todos.completed_after(Time.zone.now.beginning_of_day) + @done_this_week = completed_todos.completed_after(Time.zone.now.beginning_of_week)-@done_today + @done_this_month = completed_todos.completed_after(Time.zone.now.beginning_of_month)-@done_this_week + @done_previous_month = completed_todos.completed_after( (Time.zone.now.beginning_of_month - 1.day).beginning_of_month)-@done_this_month @count = @done_today.size + @done_this_week.size + @done_this_month.size end - - def completed_archive - @page_title = t('todos.archived_tasks_title') - @done = current_user.completed_todos - @count = @done.size - @done_archive = @done.completed_more_than Time.zone.now - 28.days - end def list_deferred @source_view = 'deferred' @@ -490,7 +485,7 @@ class TodosController < ApplicationController @contexts_to_show = @contexts = current_user.contexts.find(:all) - @not_done_todos = current_user.deferred_todos(:include => [:tags, :taggings, :projects]) + current_user.pending_todos(:include => [:tags, :taggings, :projects]) + @not_done_todos = current_user.todos.deferred(:include => [:tags, :taggings, :projects]) + current_user.todos.pending(:include => [:tags, :taggings, :projects]) @down_count = @count = @not_done_todos.size respond_to do |format| diff --git a/app/helpers/contexts_helper.rb b/app/helpers/contexts_helper.rb index 16058ff0..1b512689 100644 --- a/app/helpers/contexts_helper.rb +++ b/app/helpers/contexts_helper.rb @@ -1,25 +1,30 @@ module ContextsHelper - def get_listing_sortable_options - { - :tag => 'div', - :handle => 'handle', - :complete => visual_effect(:highlight, 'list-contexts'), - :url => order_contexts_path - } - end +def get_listing_sortable_options + { + :tag => 'div', + :handle => 'handle', + :complete => visual_effect(:highlight, 'list-contexts'), + :url => order_contexts_path + } +end + +def link_to_delete_context(context, descriptor = sanitize(context.name)) + link_to( + descriptor, + context_path(context, :format => 'js'), + { + :id => "delete_context_#{context.id}", + :class => "delete_context_button", + :x_confirm_message => t('contexts.delete_context_confirmation', :name => context.name), + :title => t('contexts.delete_context_title') + } + ) +end + +def summary(context, undone_todo_count) + content_tag(:p, "#{undone_todo_count}. Context is #{context.hidden? ? 'Hidden' : 'Active'}.") +end - def link_to_delete_context(context, descriptor = sanitize(context.name)) - link_to( - descriptor, - context_path(context, :format => 'js'), - { - :id => "delete_context_#{context.id}", - :class => "delete_context_button", - :x_confirm_message => t('contexts.delete_context_confirmation', :name => context.name), - :title => t('contexts.delete_context_title') - } - ) - end end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 587ea435..5773e5c8 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -57,5 +57,14 @@ module ProjectsHelper } ) end - + + def summary(project) + project_description = '' + project_description += sanitize(markdown( project.description )) unless project.description.blank? + project_description += content_tag(:p, + "#{count_undone_todos_phrase(p)}. " + t('projects.project_state', :state => project.state) + ) + project_description + end + end diff --git a/app/models/context.rb b/app/models/context.rb index a7d79f72..cfc20eb4 100644 --- a/app/models/context.rb +++ b/app/models/context.rb @@ -19,6 +19,7 @@ class Context < ActiveRecord::Base validates_does_not_contain :name, :string => ',', :message => "cannot contain the comma (',') character" def self.feed_options(user) + # TODO: move to view or helper { :title => 'Tracks Contexts', :description => "Lists all the contexts for #{user.display_name}" @@ -36,14 +37,7 @@ class Context < ActiveRecord::Base def title name end - - def summary(undone_todo_count) - s = "#{undone_todo_count}. " - s += "Context is #{hidden? ? 'Hidden' : 'Active'}." - s += "
" - s - end - + def new_record_before_save? @new_record_before_save end diff --git a/app/models/project.rb b/app/models/project.rb index 13819cf2..5cb0ed9a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1,28 +1,5 @@ class Project < ActiveRecord::Base has_many :todos, :dependent => :delete_all - - # TODO: remove these scopes. Can be replaced by the named scopes on the todo relation - has_many :not_done_todos, - :include => [:context,:tags,:project], - :class_name => 'Todo', - :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", - :conditions => ["todos.state = ?", 'active'] - has_many :done_todos, - :include => [:context,:tags,:project], - :class_name => 'Todo', - :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", - :conditions => ["todos.state = ?", 'completed'] - has_many :deferred_todos, - :include => [:context,:tags,:project], - :class_name => 'Todo', - :conditions => ["todos.state = ? ", "deferred"], - :order => "show_from" - has_many :pending_todos, - :include => [:context,:tags,:project], - :class_name => 'Todo', - :conditions => ["todos.state = ? ", "pending"], - :order => "show_from" - has_many :notes, :dependent => :delete_all, :order => "created_at DESC" has_many :recurring_todos diff --git a/app/models/todo.rb b/app/models/todo.rb index a6cf3309..8eafaa48 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -1,5 +1,8 @@ class Todo < ActiveRecord::Base + after_save :save_predecessors + + # relations belongs_to :context belongs_to :project belongs_to :user @@ -13,20 +16,17 @@ class Todo < ActiveRecord::Base :source => :predecessor, :conditions => ['NOT (todos.state = ?)', 'completed'] has_many :pending_successors, :through => :predecessor_dependencies, :source => :successor, :conditions => ['todos.state = ?', 'pending'] - - after_save :save_predecessors + # scopes for states of this todo named_scope :active, :conditions => { :state => 'active' } named_scope :active_or_hidden, :conditions => ["todos.state = ? OR todos.state = ?", 'active', 'project_hidden'] - named_scope :not_completed, :conditions => ['NOT (todos.state = ? )', 'completed'] - named_scope :completed, :conditions => ["NOT(todos.completed_at IS NULL)"] - named_scope :are_due, :conditions => ['NOT (todos.due IS NULL)'] - named_scope :deferred, :conditions => ["todos.completed_at IS NULL AND NOT(todos.show_from IS NULL)"] + named_scope :not_completed, :conditions => ['NOT (todos.state = ?)', 'completed'] + named_scope :completed, :conditions => ["NOT (todos.completed_at IS NULL)"] + named_scope :deferred, :conditions => ["todos.completed_at IS NULL AND NOT (todos.show_from IS NULL)"] named_scope :blocked, :conditions => ['todos.state = ?', 'pending'] + named_scope :pending, :conditions => ['todos.state = ?', 'pending'] named_scope :deferred_or_blocked, :conditions => ["(todos.completed_at IS NULL AND NOT(todos.show_from IS NULL)) OR (todos.state = ?)", "pending"] named_scope :not_deferred_or_blocked, :conditions => ["todos.completed_at IS NULL AND todos.show_from IS NULL AND NOT(todos.state = ?)", "pending"] - named_scope :with_tag, lambda { |tag| {:joins => :taggings, :conditions => ["taggings.tag_id = ? ", tag.id] } } - named_scope :of_user, lambda { |user_id| {:conditions => ["todos.user_id = ? ", user_id] } } named_scope :hidden, :joins => :context, :conditions => ["todos.state = ? OR (contexts.hide = ? AND (todos.state = ? OR todos.state = ? OR todos.state = ?))", @@ -36,6 +36,13 @@ class Todo < ActiveRecord::Base :conditions => ['NOT(todos.state = ? OR (contexts.hide = ? AND (todos.state = ? OR todos.state = ? OR todos.state = ?)))', 'project_hidden', true, 'active', 'deferred', 'pending'] + # other scopes + named_scope :are_due, :conditions => ['NOT (todos.due IS NULL)'] + named_scope :with_tag, lambda { |tag| {:joins => :taggings, :conditions => ["taggings.tag_id = ? ", tag.id] } } + named_scope :of_user, lambda { |user_id| {:conditions => ["todos.user_id = ? ", user_id] } } + named_scope :completed_after, lambda { |date| {:conditions => ["todos.completed_at > ? ", date] } } + named_scope :completed_before, lambda { |date| {:conditions => ["todos.completed_at < ? ", date] } } + STARRED_TAG_NAME = "starred" # regular expressions for dependencies @@ -302,7 +309,7 @@ class Todo < ActiveRecord::Base context_id = default_context_id unless(context.nil?) - found_context = user.active_contexts.find_by_namepart(context) + found_context = user.contexts.active.find_by_namepart(context) found_context = user.contexts.find_by_namepart(context) if found_context.nil? context_id = found_context.id unless found_context.nil? end @@ -318,7 +325,7 @@ class Todo < ActiveRecord::Base found_project.name = project[4..255+4].strip found_project.save! else - found_project = user.active_projects.find_by_namepart(project) + found_project = user.projects.active.find_by_namepart(project) found_project = user.projects.find_by_namepart(project) if found_project.nil? end project_id = found_project.id unless found_project.nil? diff --git a/app/models/user.rb b/app/models/user.rb index 1da1f0ba..43bc9b41 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -79,19 +79,9 @@ class User < ActiveRecord::Base return find(:all, :conditions => scope_conditions) end end - has_many :active_projects, - :class_name => 'Project', - :order => 'projects.position ASC', - :conditions => [ 'state = ?', 'active' ] - has_many :active_contexts, - :class_name => 'Context', - :order => 'position ASC', - :conditions => [ 'hide = ?', false ] has_many :todos, :order => 'todos.completed_at DESC, todos.created_at DESC', :dependent => :delete_all - has_many :project_hidden_todos, - :conditions => ['(state = ? OR state = ?)', 'project_hidden', 'active'] has_many :recurring_todos, :order => 'recurring_todos.completed_at DESC, recurring_todos.created_at DESC', :dependent => :delete_all @@ -103,23 +93,6 @@ class User < ActiveRecord::Base find(:all, :conditions => ['show_from <= ?', Time.zone.now ]).collect { |t| t.activate! } end end - has_many :pending_todos, - :class_name => 'Todo', - :conditions => [ 'state = ?', 'pending' ], - :order => 'show_from ASC, todos.created_at DESC' - has_many :completed_todos, - :class_name => 'Todo', - :conditions => ['todos.state = ? AND NOT(todos.completed_at IS NULL)', 'completed'], - :order => 'todos.completed_at DESC', - :include => [ :project, :context ] do - def completed_within( date ) - reject { |x| x.completed_at < date } - end - - def completed_more_than( date ) - reject { |x| x.completed_at > date } - end - end has_many :notes, :order => "created_at DESC", :dependent => :delete_all has_one :preference, :dependent => :destroy diff --git a/app/views/todos/completed.html.erb b/app/views/todos/completed.html.erb deleted file mode 100644 index 40682bea..00000000 --- a/app/views/todos/completed.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -<%= t('todos.completed_today', :count => @due_tickles.nil? ? 0 : @due_tickles.length) %>
-<%= t('todos.older_completed_items') %>: <%= link_to( t('todos.older_than_days', :count => 31), done_archive_path ) %>
-<%= t('todos.completed_in_archive', :count => @done_archive.length) %>
-#{undone_todo_count}. Context is Active.
", @agenda.summary(undone_todo_count) - @agenda.hide = true - @agenda.save! - assert_equal "#{undone_todo_count}. Context is Hidden.
", @agenda.summary(undone_todo_count) - end - def test_null_object c = Context.null_object assert c.nil? diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 76f61cec..70a518b9 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -100,27 +100,27 @@ class ProjectTest < ActiveSupport::TestCase end def test_not_done_todos - assert_equal 2, @timemachine.not_done_todos.size - t = @timemachine.not_done_todos[0] + assert_equal 3, @timemachine.todos.not_completed.size + t = @timemachine.todos.not_completed[0] t.complete! t.save! - assert_equal 1, Project.find(@timemachine.id).not_done_todos.size + assert_equal 2, Project.find(@timemachine.id).todos.not_completed.size end def test_done_todos - assert_equal 0, @timemachine.done_todos.size - t = @timemachine.not_done_todos[0] + assert_equal 0, @timemachine.todos.completed.size + t = @timemachine.todos.not_completed[0] t.complete! t.save! - assert_equal 1, Project.find(@timemachine.id).done_todos.size + assert_equal 1, Project.find(@timemachine.id).todos.completed.size end def test_deferred_todos - assert_equal 1, @timemachine.deferred_todos.size - t = @timemachine.not_done_todos[0] + assert_equal 1, @timemachine.todos.deferred.size + t = @timemachine.todos.not_completed[0] t.show_from = 1.days.from_now.utc t.save! - assert_equal 2, Project.find(@timemachine.id).deferred_todos.size + assert_equal 2, Project.find(@timemachine.id).todos.deferred.size end def test_to_param_returns_id @@ -157,25 +157,28 @@ class ProjectTest < ActiveSupport::TestCase end def test_deferred_todo_count - assert_equal 1, @timemachine.deferred_todos.count - assert_equal 0, @moremoney.deferred_todos.count - @moremoney.todos[0].show_from = next_week + assert_equal 1, @timemachine.todos.deferred.count + assert_equal 0, @moremoney.todos.deferred.count + + first_todo = @moremoney.todos[0] + first_todo.show_from = next_week assert_equal :deferred, @moremoney.todos[0].aasm_current_state - assert_equal 1, @moremoney.deferred_todos.count + + assert_equal 1, @moremoney.todos.deferred.count end def test_done_todo_count - assert_equal 0, @timemachine.done_todos.count - assert_equal 0, @moremoney.done_todos.count + assert_equal 0, @timemachine.todos.completed.count + assert_equal 0, @moremoney.todos.completed.count @moremoney.todos[0].complete! - assert_equal 1, @moremoney.done_todos.count + assert_equal 1, @moremoney.todos.completed.count end def test_not_done_todo_count - assert_equal 2, @timemachine.not_done_todos.count - assert_equal 4, @moremoney.not_done_todos.count + assert_equal 3, @timemachine.todos.not_completed.count + assert_equal 4, @moremoney.todos.not_completed.count @moremoney.todos[0].complete! - assert_equal 3, @moremoney.not_done_todos.count + assert_equal 3, @moremoney.todos.not_completed.count end def test_default_context_name diff --git a/test/views/context_helper_test.rb b/test/views/context_helper_test.rb new file mode 100644 index 00000000..8aa0bd4b --- /dev/null +++ b/test/views/context_helper_test.rb @@ -0,0 +1,7 @@ + def test_summary + undone_todo_count = '5 actions' + assert_equal "#{undone_todo_count}. Context is Active.
", @agenda.summary(undone_todo_count) + @agenda.hide = true + @agenda.save! + assert_equal "#{undone_todo_count}. Context is Hidden.
", @agenda.summary(undone_todo_count) + end diff --git a/test/views/todos_helper_test.rb b/test/views/todos_helper_test.rb index b65f06e2..dede1b62 100644 --- a/test/views/todos_helper_test.rb +++ b/test/views/todos_helper_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TodosHelperTest < Test::Rails::HelperTestCase +class TodosHelperTest < ActiveSupport::HelperTestCase fixtures :users def setup