Calculate intersection between time tracking and timetable

2015-03-15 19:42:49 -04:00
parent 084272c60e
commit 3c8736c1fe
3 changed files with 80 additions and 4 deletions
--- a/app/Model/SubtaskTimeTracking.php
+++ b/app/Model/SubtaskTimeTracking.php
@@ -138,6 +138,8 @@ class SubtaskTimeTracking extends Base
                       ->addCondition($this->getCalendarCondition($start, $end))
                       ->findAll();

+        $result = $this->timetable->calculateEventsIntersect($user_id, $result, $start, $end);
+
        return $this->toCalendarEvents($result);
    }