Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-24 03:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix regression. Still need to add test to controller tests

Browse source
This commit is contained in:
Reinier Balt 2014-01-09 08:05:14 +01:00
parent 908149ea61
commit def136374c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/todos_controller.rb
View file

@ -1264,18 +1264,18 @@ end
completed_todos.completed_after(start_of_this_day).includes(includes[:include])
end
def get_done_in_period(before, after, includes = {:include => Todo::DEFAULT_INCLUDES})
def get_done_in_period(completed_todos, before, after, includes = {:include => Todo::DEFAULT_INCLUDES})
completed_todos.completed_before(before).completed_after(after).includes(includes[:include])
end
# all completed todos [begin_of_week, start_of_today]
def get_done_rest_of_week(completed_todos, includes = {:include => Todo::DEFAULT_INCLUDES})
get_done_in_period(Time.zone.now.beginning_of_day, Time.zone.now.beginning_of_week)
get_done_in_period(completed_todos, Time.zone.now.beginning_of_day, Time.zone.now.beginning_of_week)
end
# all completed todos [begin_of_month, begin_of_week]
def get_done_rest_of_month(completed_todos, includes = {:include => Todo::DEFAULT_INCLUDES})
get_done_in_period(Time.zone.now.beginning_of_week, Time.zone.now.beginning_of_month)
get_done_in_period(completed_todos, Time.zone.now.beginning_of_week, Time.zone.now.beginning_of_month)
end
def get_not_done_todos