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/Controller/Calendar.php
+++ b/app/Controller/Calendar.php
@@ -14,7 +14,7 @@ use Model\Task as TaskModel;
 class Calendar extends Base
 {
    /**
-     * Show calendar view
+     * Show calendar view for projects
     *
     * @access public
     */
@@ -59,9 +59,7 @@ class Calendar extends Base
            ->filterByDueDateRange($start, $end)
            ->toCalendarEvents();

-        $subtask_timeslots = $this->subtaskTimeTracking->getProjectCalendarEvents($project_id, $start, $end);
-
-        $this->response->json(array_merge($due_tasks, $subtask_timeslots));
+        $this->response->json($due_tasks);
    }

    /**