Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-07 21:22:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix case with future start_from for other recurrence periods too

Browse source 
this patch belongs to previous
This commit is contained in:
Reinier Balt 2008-08-19 22:04:53 +02:00
parent f4378ffde1
commit 88ea02d29a
2 changed files with 62 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

49
app/models/recurring_todo.rb
View file

@ -394,11 +394,19 @@ class RecurringTodo < ActiveRecord::Base
# the due date in time)
#
# assumes self.recurring_period == 'daily'
# determine start
if previous.nil?
start = self.start_from.nil? ? Time.now.utc : self.start_from
else
# use the next day
start = previous + 1.day
unless self.start_from.nil?
# check if the start_from date is later than previous. If so, use
# start_from as start to search for next date
start = self.start_from if self.start_from > previous
end
end
if self.only_work_days
@ -419,6 +427,7 @@ class RecurringTodo < ActiveRecord::Base
end
def get_weekly_date(previous)
# determine start
if previous == nil
start = self.start_from.nil? ? Time.now.utc : self.start_from
else
@ -428,7 +437,13 @@ class RecurringTodo < ActiveRecord::Base
# that week
start += self.every_other1.week
end
unless self.start_from.nil?
# check if the start_from date is later than previous. If so, use
# start_from as start to search for next date
start = self.start_from if self.start_from > previous
end
end
# check if there are any days left this week for the next todo
start.wday().upto 6 do |i|
return start + (i-start.wday()).days unless self.every_day[i,1] == ' '
@ -447,11 +462,8 @@ class RecurringTodo < ActiveRecord::Base
end
def get_monthly_date(previous)
if previous.nil?
start = self.start_from.nil? ? Time.now.utc : self.start_from
else
start = previous
end
start = determine_start(previous)
day = self.every_other1
n = self.every_other2
@ -505,18 +517,8 @@ class RecurringTodo < ActiveRecord::Base
end
def get_yearly_date(previous)
if previous.nil?
start = self.start_from.nil? ? Time.now.utc : self.start_from
else
if self.start_from.nil?
start = previous
else
# check if the start_from date is later than previous. If so, use
# start_from as start to search for next date
start = self.start_from > previous ? self.start_from : previous
end
end
start = determine_start(previous)
day = self.every_other1
month = self.every_other2
@ -598,4 +600,19 @@ class RecurringTodo < ActiveRecord::Base
errors.add("", "At least one day must be selected in the weekly pattern") if self.every_day == ' '
end
def determine_start(previous)
if previous.nil?
start = self.start_from.nil? ? Time.now.utc : self.start_from
else
start = previous
unless self.start_from.nil?
# check if the start_from date is later than previous. If so, use
# start_from as start to search for next date
start = self.start_from if self.start_from > previous
end
end
return start
end
end