From bacd35b89503c87904689e8ea411b3220d8fc73c Mon Sep 17 00:00:00 2001
From: Alys <alice.harris@oldgods.net>
Date: Wed, 24 Jun 2015 09:06:53 +1000
Subject: [PATCH] refactor shouldDo check for Daily's startDate being in the
 future

---
 common/script/index.coffee | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/script/index.coffee b/common/script/index.coffee
index 45ed81d3e8..d99a1e57ad 100644
--- a/common/script/index.coffee
+++ b/common/script/index.coffee
@@ -84,16 +84,16 @@ api.shouldDo = (day, dailyTask, options = {}) ->
   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 >= api.startOfDay(_.defaults {now:dailyTask.startDate}, o)
+  if day < api.startOfDay(_.defaults {now:dailyTask.startDate}, o)
+    return false # Daily starts in the future
 
   if dailyTask.frequency == 'daily'
     daysSinceTaskStart = api.numDaysApart(day.startOf('day'), dailyTask.startDate, o)
     everyXCheck = (daysSinceTaskStart % dailyTask.everyX == 0)
-    return everyXCheck && hasStartedCheck
+    return everyXCheck
   else if dailyTask.frequency == 'weekly'
     dayOfWeekCheck = dailyTask.repeat[api.dayMapping[dayOfWeekNum]]
-    return dayOfWeekCheck && hasStartedCheck
+    return dayOfWeekCheck
   else
     # unexpected frequency string
     return false