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

improve test of daily repeat pattern

Browse source
This commit is contained in:
Reinier Balt 2014-03-03 21:48:25 +01:00
parent a9fa955c33
commit 0c153ef28c
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/recurring_todos/daily_repeat_pattern.rb
View file

@ -18,7 +18,7 @@ module RecurringTodos
if only_work_days?
I18n.t("todos.recurrence.pattern.on_work_days")
elsif every_x_days > 1
I18n.t("todos.recurrence.pattern.every_n", :n => every_x_days) + " " + I18n.t("common.days_midsentence.other")
I18n.t("todos.recurrence.pattern.every_n_days", :n => every_x_days)
else
I18n.t("todos.recurrence.pattern.every_day")
end
@ -37,10 +37,11 @@ module RecurringTodos
start = determine_start(previous, 1.day)
if only_work_days?
# jump over weekend if necessary
return start + 2.day if start.wday() == 6 # saturday
return start + 1.day if start.wday() == 0 # sunday
return start
else # every nth day; n = every_other1
else
# if there was no previous todo, do not add n: the first todo starts on
# today or on start_from
return previous == nil ? start : start+every_x_days.day-1.day