0
@@ -14,7 +14,7 @@ class TodosController < ApplicationController
0
@projects = current_user.projects.find(:all, :include => [:default_context])
0
@contexts = current_user.contexts.find(:all)
0
- @contexts_to_show =
@contexts.reject {|x| x.hide? } 0
+ @contexts_to_show =
current_user.contexts.active0
format.html &render_todos_html
0
@@ -28,7 +28,7 @@ class TodosController < ApplicationController
0
- @projects = current_user.projects.
select { |p| p.active? }0
+ @projects = current_user.projects.
active0
@contexts = current_user.contexts.find(:all)
0
@@ -116,7 +116,7 @@ class TodosController < ApplicationController
0
- @projects = current_user.projects.
select { |p| p.active? }0
+ @projects = current_user.projects.
active0
@contexts = current_user.contexts.find(:all)
0
@return_path=cookies[:mobile_url]
0
@@ -442,33 +442,33 @@ class TodosController < ApplicationController
0
due_next_week_date = due_this_week_date + 7.days
0
due_this_month_date = Time.zone.now.end_of_month
0
- @due_today = current_user.todos.
find(:all, 0
+ @due_today = current_user.todos.
not_completed.find(:all,0
:include => [:taggings, :tags],
0
- :conditions => ['
(todos.state = ? OR todos.state = ?) AND todos.due <= ?', 'active', 'deferred', due_today_date],
0
+ :conditions => ['
todos.due <= ?', due_today_date],
0
- @due_this_week = current_user.todos.
find(:all, 0
+ @due_this_week = current_user.todos.
not_completed.find(:all,0
:include => [:taggings, :tags],
0
- :conditions => ['
(todos.state = ? OR todos.state = ?) AND todos.due > ? AND todos.due <= ?', 'active', 'deferred', due_today_date, due_this_week_date],
0
+ :conditions => ['
todos.due > ? AND todos.due <= ?', due_today_date, due_this_week_date],
0
- @due_next_week = current_user.todos.
find(:all, 0
+ @due_next_week = current_user.todos.
not_completed.find(:all,0
:include => [:taggings, :tags],
0
- :conditions => ['
(todos.state = ? OR todos.state = ?) AND todos.due > ? AND todos.due <= ?', 'active', 'deferred', due_this_week_date, due_next_week_date],
0
+ :conditions => ['
todos.due > ? AND todos.due <= ?', due_this_week_date, due_next_week_date],
0
- @due_this_month = current_user.todos.
find(:all, 0
+ @due_this_month = current_user.todos.
not_completed.find(:all,0
:include => [:taggings, :tags],
0
- :conditions => ['
(todos.state = ? OR todos.state = ?) AND todos.due > ? AND todos.due <= ?', 'active', 'deferred', due_next_week_date, due_this_month_date],
0
+ :conditions => ['
todos.due > ? AND todos.due <= ?', due_next_week_date, due_this_month_date],
0
- @due_after_this_month = current_user.todos.
find(:all, 0
+ @due_after_this_month = current_user.todos.
not_completed.find(:all,0
:include => [:taggings, :tags],
0
- :conditions => ['
(todos.state = ? OR todos.state = ?) AND todos.due > ?', 'active', 'deferred', due_this_month_date],
0
+ :conditions => ['
todos.due > ?', due_this_month_date],
0
+ @count = current_user.todos.not_completed.are_due.count
0
- @due_all = current_user.todos.find(:all,
0
- :conditions => ['(todos.state = ? OR todos.state = ?) AND NOT todos.due IS NULL', 'active', 'deferred'],
0
+ @due_all = current_user.todos.not_completed.are_due.find(:all, :order => "due")
0
render :action => 'calendar', :layout => false, :content_type => Mime::ICS
0
@@ -834,20 +834,20 @@ class TodosController < ApplicationController
0
due_this_month_date = Time.zone.now.end_of_month
0
- return 0 == current_user.todos.count(:all,
0
- :conditions => ['(todos.state = ? OR todos.state = ?) AND todos.due <= ?', 'active', 'deferred', due_today_date])
0
+ return 0 == current_user.todos.not_completed.count(:all,
0
+ :conditions => ['todos.due <= ?', due_today_date])
0
- return 0 == current_user.todos.count(:all,
0
- :conditions => ['(todos.state = ? OR todos.state = ?) AND todos.due > ? AND todos.due <= ?', 'active', 'deferred', due_today_date, due_this_week_date])
0
+ return 0 == current_user.todos.not_completed.count(:all,
0
+ :conditions => ['todos.due > ? AND todos.due <= ?', due_today_date, due_this_week_date])
0
- return 0 == current_user.todos.count(:all,
0
- :conditions => ['(todos.state = ? OR todos.state = ?) AND todos.due > ? AND todos.due <= ?', 'active', 'deferred', due_this_week_date, due_next_week_date])
0
+ return 0 == current_user.todos.not_completed.count(:all,
0
+ :conditions => ['todos.due > ? AND todos.due <= ?', due_this_week_date, due_next_week_date])
0
- return 0 == current_user.todos.count(:all,
0
- :conditions => ['(todos.state = ? OR todos.state = ?) AND todos.due > ? AND todos.due <= ?', 'active', 'deferred', due_next_week_date, due_this_month_date])
0
+ return 0 == current_user.todos.not_completed.count(:all,
0
+ :conditions => ['todos.due > ? AND todos.due <= ?', due_next_week_date, due_this_month_date])
0
when "due_after_this_month"
0
- return 0 == current_user.todos.count(:all,
0
- :conditions => ['(todos.state = ? OR todos.state = ?) AND todos.due > ?', 'active', 'deferred', due_this_month_date])
0
+ return 0 == current_user.todos.not_completed.count(:all,
0
+ :conditions => ['todos.due > ?', due_this_month_date])
0
raise Exception.new, "unknown due id for calendar: '#{id}'"