AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display subtask estimates in the user calendar according to the timetable

Browse Source
This commit is contained in:
Frederic Guillot
2015-03-26 20:49:37 -04:00
parent 626ad566f7
commit d3ae8d2acb
25 changed files with 161 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/Calendar.php
View File

@@ -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));
}
/**

2
app/Controller/Config.php
View File

@@ -41,7 +41,7 @@ class Config extends Base
$values = $this->request->getValues();
if ($redirect === 'board') {
$values += array('subtask_restriction' => 0, 'subtask_time_tracking' => 0);
$values += array('subtask_restriction' => 0, 'subtask_time_tracking' => 0, 'subtask_forecast' => 0);
}
if ($this->config->save($values)) {