diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-03-26 20:49:37 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-03-26 20:49:37 -0400 |
| commit | d3ae8d2acb218c8e1bc50ed1b92c19016e9214ee (patch) | |
| tree | 1fbf207bb2e1f681f8477f4273f084ce9c64f727 /app/Controller/Calendar.php | |
| parent | 626ad566f718e0c0f63034ecc76604d22d4b2a06 (diff) | |
Display subtask estimates in the user calendar according to the timetable
Diffstat (limited to 'app/Controller/Calendar.php')
| -rw-r--r-- | app/Controller/Calendar.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/Controller/Calendar.php b/app/Controller/Calendar.php index 6cfa2bad..49c7f56e 100644 --- a/app/Controller/Calendar.php +++ b/app/Controller/Calendar.php @@ -82,7 +82,9 @@ class Calendar extends Base $subtask_timeslots = $this->subtaskTimeTracking->getUserCalendarEvents($user_id, $start, $end); - $this->response->json(array_merge($due_tasks, $subtask_timeslots)); + $subtask_forcast = $this->config->get('subtask_forecast') == 1 ? $this->subtaskForecast->getCalendarEvents($user_id, $end) : array(); + + $this->response->json(array_merge($due_tasks, $subtask_timeslots, $subtask_forcast)); } /** |