Display subtask estimates in the user calendar according to the timetable

2015-03-26 20:49:37 -04:00
parent 626ad566f7
commit d3ae8d2acb
25 changed files with 161 additions and 5 deletions
--- 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));
    }

    /**