From 3c8736c1fe593fe2ea30b09fa99ec2e34ca8c65a Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 15 Mar 2015 19:42:49 -0400 Subject: Calculate intersection between time tracking and timetable --- app/Model/SubtaskTimeTracking.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Model/SubtaskTimeTracking.php') diff --git a/app/Model/SubtaskTimeTracking.php b/app/Model/SubtaskTimeTracking.php index ab0d7c54..a984533f 100644 --- 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); } -- cgit v1.2.3