sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 04:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move dailyTask.repeat error handling to correct location; add dailyTask.everyX error handling (might not be needed)

Browse source
This commit is contained in:
Alys 2015-06-24 13:58:45 +10:00
parent bacd35b895
commit f6cdc57228
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/script/index.coffee
View file

@ -75,7 +75,7 @@ api.daysSince = (yesterday, options = {}) ->
Should the user do this task on this date, given the task's repeat options and user.preferences.dayStart?
###
api.shouldDo = (day, dailyTask, options = {}) ->
return false unless dailyTask.type == 'daily' && dailyTask.repeat
return false unless dailyTask.type == 'daily'
if !dailyTask.startDate
dailyTask.startDate = moment().toDate()
if dailyTask.startDate instanceof String
@ -88,10 +88,14 @@ api.shouldDo = (day, dailyTask, options = {}) ->
return false # Daily starts in the future
if dailyTask.frequency == 'daily'
if !dailyTask.everyX
return false # error condition
daysSinceTaskStart = api.numDaysApart(day.startOf('day'), dailyTask.startDate, o)
everyXCheck = (daysSinceTaskStart % dailyTask.everyX == 0)
return everyXCheck
else if dailyTask.frequency == 'weekly'
if !dailyTask.repeat
return false # error condition
dayOfWeekCheck = dailyTask.repeat[api.dayMapping[dayOfWeekNum]]
return dayOfWeekCheck
else