diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-03-15 19:42:49 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-03-15 19:42:49 -0400 |
| commit | 3c8736c1fe593fe2ea30b09fa99ec2e34ca8c65a (patch) | |
| tree | 16ec59c17982648939155cedecf817a50781001d /app/Model/SubtaskTimeTracking.php | |
| parent | 084272c60ea97f3a835cfccbb3303227d00085e8 (diff) | |
Calculate intersection between time tracking and timetable
Diffstat (limited to 'app/Model/SubtaskTimeTracking.php')
| -rw-r--r-- | app/Model/SubtaskTimeTracking.php | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |