Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-28 10:04:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

start modifying done view and do some refactoring

Browse source
This commit is contained in:
Reinier Balt 2011-05-01 12:48:32 +02:00
parent de7b8e329d
commit 01057af684
19 changed files with 160 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/contexts_controller.rb
View file

@ -212,14 +212,14 @@ class ContextsController < ApplicationController
def render_contexts_rss_feed
lambda do
render_rss_feed_for current_user.contexts.all, :feed => feed_options,
:item => { :description => lambda { |c| c.summary(count_undone_todos_phrase(c)) } }
:item => { :description => lambda { |c| @template.summary(c, count_undone_todos_phrase(c)) } }
end
end
def render_contexts_atom_feed
lambda do
render_atom_feed_for current_user.contexts.all, :feed => feed_options,
:item => { :description => lambda { |c| c.summary(count_undone_todos_phrase(c)) },
:item => { :description => lambda { |c| @template.summary(c, count_undone_todos_phrase(c)) },
:author => lambda { |c| nil } }
end
end

17
app/controllers/projects_controller.rb
View file

@ -48,8 +48,8 @@ class ProjectsController < ApplicationController
@page_title = t('projects.page_title', :project => @project.name)
@not_done = @project.todos.active_or_hidden(:include => [:tags, :context, :predecessors])
@deferred = @project.deferred_todos(:include => [:tags, :context, :predecessors])
@pending = @project.pending_todos(:include => [:tags, :context, :predecessors])
@deferred = @project.todos.deferred(:include => [:tags, :context, :predecessors])
@pending = @project.todos.pending(:include => [:tags, :context, :predecessors])
@done = @project.todos.find_in_state(:all, :completed,
:order => "todos.completed_at DESC", :limit => current_user.prefs.show_number_completed, :include => [:context, :tags, :predecessors])
@ -274,14 +274,14 @@ class ProjectsController < ApplicationController
lambda do
render_rss_feed_for @projects, :feed => feed_options,
:title => :name,
:item => { :description => lambda { |p| summary(p) } }
:item => { :description => lambda { |p| @template.summary(p) } }
end
end
def render_atom_feed
lambda do
render_atom_feed_for @projects, :feed => feed_options,
:item => { :description => lambda { |p| summary(p) },
:item => { :description => lambda { |p| @template.summary(p) },
:title => :name,
:author => lambda { |p| nil } }
end
@ -319,13 +319,4 @@ class ProjectsController < ApplicationController
end
end
def summary(project)
project_description = ''
project_description += sanitize(markdown( project.description )) unless project.description.blank?
project_description += "<p>#{count_undone_todos_phrase(p)}. "
project_description += t('projects.project_state', :state => project.state)
project_description += "</p>"
project_description
end
end

29
app/controllers/todos_controller.rb
View file

@ -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|