From 91a5ec08856f5ef6a64d181ef4de700c0436026b Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 3 Apr 2015 17:57:19 -0400
Subject: Fix issue with subtask forecast

---
 app/Model/SubtaskForecast.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/Model/SubtaskForecast.php b/app/Model/SubtaskForecast.php
index cb86f6d7..0cb3175d 100644
--- a/app/Model/SubtaskForecast.php
+++ b/app/Model/SubtaskForecast.php
@@ -81,7 +81,13 @@ class SubtaskForecast extends Base
             $start = $slot[0]->getTimestamp();
 
             if ($slot[0] < $start_date) {
-                continue;
+
+                if (! $this->dateParser->withinDateRange($start_date, $slot[0], $slot[1])) {
+                    continue;
+                }
+
+                $interval = $this->dateParser->getHours(new DateTime, $slot[1]);
+                $start = time();
             }
 
             while ($offset < $total) {
-- 
cgit v1.2.3