summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-04-03 17:57:19 -0400
committerFrederic Guillot <fred@kanboard.net>2015-04-03 17:57:19 -0400
commit91a5ec08856f5ef6a64d181ef4de700c0436026b (patch)
tree39ff54436dd7bf466dd81d342cf0de3e16c7c34c /app
parente5f6e364f184eaa535c6b29cbafe3418ea83d53f (diff)
Fix issue with subtask forecast
Diffstat (limited to 'app')
-rw-r--r--app/Model/SubtaskForecast.php8
1 files changed, 7 insertions, 1 deletions
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) {