danamir/plugin-calendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve rendering of tasks with due time

Browse Source
This commit is contained in:
Frederic Guillot
2017-11-08 15:35:21 -08:00
parent 2c7f8ba4b1
commit 99642d96d2
7 changed files with 102 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Controller/CalendarController.php
View File

@@ -4,6 +4,7 @@ namespace Kanboard\Plugin\Calendar\Controller;
use Kanboard\Controller\BaseController;
use Kanboard\Filter\TaskAssigneeFilter;
use Kanboard\Filter\TaskDueDateRangeFilter;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Filter\TaskStatusFilter;
use Kanboard\Model\TaskModel;
@@ -11,17 +12,12 @@ use Kanboard\Model\TaskModel;
/**
* Calendar Controller
*
* @package Kanboard\Controller
* @package Kanboard\Plugin\Calendar\Controller
* @author Frederic Guillot
* @author Timo Litzbarski
*/
class CalendarController extends BaseController
{
/**
* Show calendar view for a user
*
* @access public
*/
public function user()
{
$user = $this->getUser();
@@ -31,11 +27,6 @@ class CalendarController extends BaseController
)));
}
/**
* Show calendar view for a project
*
* @access public
*/
public function project()
{
$project = $this->getProject();
@@ -47,66 +38,75 @@ class CalendarController extends BaseController
)));
}
/**
* Get tasks to display on the calendar (project view)
*
* @access public
*/
public function projectEvents()
{
$project_id = $this->request->getIntegerParam('project_id');
$start = $this->request->getStringParam('start');
$end = $this->request->getStringParam('end');
$search = $this->userSession->getFilters($project_id);
$queryBuilder = $this->taskLexer->build($search)->withFilter(new TaskProjectFilter($project_id));
$projectId = $this->request->getIntegerParam('project_id');
$startRange = $this->request->getStringParam('start');
$endRange = $this->request->getStringParam('end');
$search = $this->userSession->getFilters($projectId);
$startColumn = $this->configModel->get('calendar_project_tasks', 'date_started');
$events = $this->helper->calendar->getTaskDateDueEvents(clone($queryBuilder), $start, $end);
$events = array_merge($events, $this->helper->calendar->getTaskEvents(clone($queryBuilder), $start, $end));
$dueDateOnlyEvents = $this->taskLexer->build($search)
->withFilter(new TaskProjectFilter($projectId))
->withFilter(new TaskDueDateRangeFilter(array($startRange, $endRange)))
->format($this->taskCalendarFormatter->setColumns('date_due'));
$startAndDueDateQueryBuilder = $this->taskLexer->build($search)
->withFilter(new TaskProjectFilter($projectId));
$startAndDueDateQueryBuilder
->getQuery()
->addCondition($this->getConditionForTasksWithStartAndDueDate($startRange, $endRange, $startColumn, 'date_due'));
$startAndDueDateEvents = $startAndDueDateQueryBuilder
->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due'));
$events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents);
$events = $this->hook->merge('controller:calendar:project:events', $events, array(
'project_id' => $project_id,
'start' => $start,
'end' => $end,
'project_id' => $projectId,
'start' => $startRange,
'end' => $endRange,
));
$this->response->json($events);
}
/**
* Get tasks to display on the calendar (user view)
*
* @access public
*/
public function userEvents()
{
$user_id = $this->request->getIntegerParam('user_id');
$start = $this->request->getStringParam('start');
$end = $this->request->getStringParam('end');
$queryBuilder = $this->taskQuery
$startRange = $this->request->getStringParam('start');
$endRange = $this->request->getStringParam('end');
$startColumn = $this->configModel->get('calendar_project_tasks', 'date_started');
$dueDateOnlyEvents = $this->taskQuery
->withFilter(new TaskAssigneeFilter($user_id))
->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN))
->withFilter(new TaskDueDateRangeFilter(array($startRange, $endRange)))
->format($this->taskCalendarFormatter->setColumns('date_due'));
$startAndDueDateQueryBuilder = $this->taskQuery
->withFilter(new TaskAssigneeFilter($user_id))
->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN));
$events = $this->helper->calendar->getTaskDateDueEvents(clone($queryBuilder), $start, $end);
$events = array_merge($events, $this->helper->calendar->getTaskEvents(clone($queryBuilder), $start, $end));
$startAndDueDateQueryBuilder
->getQuery()
->addCondition($this->getConditionForTasksWithStartAndDueDate($startRange, $endRange, $startColumn, 'date_due'));
if ($this->configModel->get('calendar_user_subtasks_time_tracking') == 1) {
$events = array_merge($events, $this->helper->calendar->getSubtaskTimeTrackingEvents($user_id, $start, $end));
}
$startAndDueDateEvents = $startAndDueDateQueryBuilder
->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due'));
$events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents);
$events = $this->hook->merge('controller:calendar:user:events', $events, array(
'user_id' => $user_id,
'start' => $start,
'end' => $end,
'start' => $startRange,
'end' => $endRange,
));
$this->response->json($events);
}
/**
* Update task due date
*
* @access public
*/
public function save()
{
if ($this->request->isAjax() && $this->request->isPost()) {
@@ -118,4 +118,20 @@ class CalendarController extends BaseController
));
}
}
protected function getConditionForTasksWithStartAndDueDate($startTime, $endTime, $startColumn, $endColumn)
{
$startTime = strtotime($startTime);
$endTime = strtotime($endTime);
$startColumn = $this->db->escapeIdentifier($startColumn);
$endColumn = $this->db->escapeIdentifier($endColumn);
$conditions = array(
"($startColumn >= '$startTime' AND $startColumn <= '$endTime')",
"($startColumn <= '$startTime' AND $endColumn >= '$startTime')",
"($startColumn <= '$startTime' AND ($endColumn = '0' OR $endColumn IS NULL))",
);
return $startColumn.' IS NOT NULL AND '.$startColumn.' > 0 AND ('.implode(' OR ', $conditions).')';
}
}