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

fix bug introduced by last commit and add test for it

Browse source 
also refactor check_for_next_todo a bit to depend less on globals
This commit is contained in:
Reinier Balt 2008-10-14 22:49:17 +02:00
parent 1a2cdc7585
commit ce671f23f4
8 changed files with 99 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/todos_controller.rb
View file

@ -134,7 +134,7 @@ class TodosController < ApplicationController
@saved = @todo.toggle_completion!
# check if this todo has a related recurring_todo. If so, create next todo
check_for_next_todo if @saved
@new_recurring_todo = check_for_next_todo(@todo) if @saved
respond_to do |format|
format.js do
@ -279,7 +279,7 @@ class TodosController < ApplicationController
@project_id = @todo.project_id
# check if this todo has a related recurring_todo. If so, create next todo
check_for_next_todo
@new_recurring_todo = check_for_next_todo(@todo)
@saved = @todo.destroy
@ -771,22 +771,22 @@ class TodosController < ApplicationController
['rss','atom','txt','ics'].include?(req.parameters[:format])
end
def check_for_next_todo
def check_for_next_todo(todo)
# check if this todo has a related recurring_todo. If so, create next todo
@new_recurring_todo = nil
@recurring_todo = nil
if @todo.from_recurring_todo?
@recurring_todo = current_user.recurring_todos.find(@todo.recurring_todo_id)
new_recurring_todo = nil
recurring_todo = nil
if todo.from_recurring_todo?
recurring_todo = current_user.recurring_todos.find(todo.recurring_todo_id)
# check for next todo either from the due date or the show_from date
date_to_check = @todo.due.nil? ? @todo.show_from : @todo.due
date_to_check = todo.due.nil? ? todo.show_from : todo.due
# if both due and show_from are nil, check for a next todo with yesterday
# as reference point. We pick yesterday so that new todos for today will
# be created instead of new todos for tomorrow.
date_to_check = Time.zone.now-1.day if date_to_check.nil?
if @recurring_todo.active? && @recurring_todo.has_next_todo(date_to_check)
if recurring_todo.active? && recurring_todo.has_next_todo(date_to_check)
# shift the reference date to yesterday if date_to_check is furher in
# the past. This is to make sure we do not get older todos for overdue
@ -795,9 +795,10 @@ class TodosController < ApplicationController
# date. Discard the time part in the compare
date = date_to_check.at_midnight >= Time.zone.now.at_midnight ? date_to_check : Time.zone.now-1.day
@new_recurring_todo = create_todo_from_recurring_todo(@recurring_todo, date)
new_recurring_todo = create_todo_from_recurring_todo(recurring_todo, date)
end
end
end
return new_recurring_todo
end
def get_due_id_for_calendar(due)

2
app/models/recurring_todo.rb
View file

@ -523,7 +523,7 @@ class RecurringTodo < ActiveRecord::Base
case self.recurrence_selector
when 0 # specific day of a specific month
if start.month > month || (start.month == month && start.day > day)
if start.month > month || (start.month == month && start.day >= day)
# if there is no next month n and day m in this year, search in next year
start = Time.zone.local(start.year+1, month, 1)
else