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

Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo.

Browse source
This commit is contained in:
Allen Pan 2015-05-23 00:19:52 -07:00
parent b25fa06019
commit 90dd078a6a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/script/index.coffee
View file

@ -76,23 +76,23 @@ api.daysSince = (yesterday, options = {}) ->
###
api.shouldDo = (day, dailyTask, options = {}) ->
return false unless dailyTask.type == 'daily' && dailyTask.repeat
day = moment(day).startOf('day')
if !dailyTask.startDate
dailyTask.startDate = moment().toDate()
if dailyTask.startDate instanceof String
dailyTask.startDate = moment(dailyTask.startDate).toDate()
o = sanitizeOptions options
dayOfWeek = api.startOfDay(_.defaults {now:day}, o).day()
day = api.startOfDay(_.defaults {now:day}, o)
dayOfWeekNum = day.day() # e.g. 1 for Monday if week starts on Mon
# check if event is today or in the future
hasStartedCheck = day >= moment(dailyTask.startDate).startOf('day')
hasStartedCheck = day >= api.startOfDay(_.defaults {now:dailyTask.startDate}, o)
if dailyTask.frequency == 'daily'
daysSinceTaskStart = api.numDaysApart(day, dailyTask.startDate, o)
everyXCheck = (daysSinceTaskStart % dailyTask.everyX == 0)
return everyXCheck && hasStartedCheck
else if dailyTask.frequency == 'weekly'
dayOfWeekCheck = dailyTask.repeat[api.dayMapping[dayOfWeek]]
dayOfWeekCheck = dailyTask.repeat[api.dayMapping[dayOfWeekNum]]
weeksSinceTaskStartWeek = api.numWeeksApart(day, dailyTask.startDate, o)
everyXCheck = (weeksSinceTaskStartWeek % dailyTask.everyX == 0)
return dayOfWeekCheck && everyXCheck && hasStartedCheck