Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI

Browse Source
This commit is contained in:
Blade Barringer
2015-05-26 17:18:16 -05:00
parent 0f096bd405
commit 8b347bca8b
3 changed files with 58 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/script/index.coffee
+1 -13
View File
@@ -93,9 +93,7 @@ api.shouldDo = (day, dailyTask, options = {}) ->
return everyXCheck && hasStartedCheck
else if dailyTask.frequency == 'weekly'
dayOfWeekCheck = dailyTask.repeat[api.dayMapping[dayOfWeekNum]]
weeksSinceTaskStartWeek = api.numWeeksApart(day, dailyTask.startDate, o)
everyXCheck = (weeksSinceTaskStartWeek % dailyTask.everyX == 0)
return dayOfWeekCheck && everyXCheck && hasStartedCheck
return dayOfWeekCheck && hasStartedCheck
else
# unexpected frequency string
return false
@@ -106,16 +104,6 @@ api.numDaysApart = (day1, day2, o) ->
numDays = Math.abs(startOfDay1.diff(startOfDay2, 'days'))
return numDays
# weeks between the two days, counting Monday as the start of each week
api.numWeeksApart = (day1, day2, o) ->
startOfDay1 = api.startOfDay(_.defaults {now:day1}, o)
startOfDay2 = api.startOfDay(_.defaults {now:day2}, o)
startWeekOfDay1 = startOfDay1.startOf('week')
startWeekOfDay2 = startOfDay2.startOf('week')
numWeeks = Math.abs(startWeekOfDay1.diff(startWeekOfDay2, 'weeks'))
return numWeeks
###
------------------------------------------------------
Level cap