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

45
Formatter/BaseTaskCalendarFormatter.php
View File

@@ -1,45 +0,0 @@
<?php
namespace Kanboard\Plugin\Calendar\Formatter;
use Kanboard\Formatter\BaseFormatter;
/**
* Common class to handle calendar events
*
* @package formatter
* @author Frederic Guillot
*/
abstract class BaseTaskCalendarFormatter extends BaseFormatter
{
/**
* Column used for event start date
*
* @access protected
* @var string
*/
protected $startColumn = 'date_started';
/**
* Column used for event end date
*
* @access protected
* @var string
*/
protected $endColumn = 'date_completed';
/**
* Transform results to calendar events
*
* @access public
* @param string $start_column Column name for the start date
* @param string $end_column Column name for the end date
* @return $this
*/
public function setColumns($start_column, $end_column = '')
{
$this->startColumn = $start_column;
$this->endColumn = $end_column ?: $start_column;
return $this;
}
}

63
Formatter/TaskCalendarFormatter.php
View File

@@ -2,33 +2,46 @@
namespace Kanboard\Plugin\Calendar\Formatter;
use DateTime;
use Kanboard\Core\Filter\FormatterInterface;
use Kanboard\Formatter\BaseFormatter;
/**
* Calendar event formatter for task filter
*
* @package formatter
* @package Kanboard\Plugin\Calendar\Formatter
* @author Frederic Guillot
*/
class TaskCalendarFormatter extends BaseTaskCalendarFormatter implements FormatterInterface
class TaskCalendarFormatter extends BaseFormatter implements FormatterInterface
{
/**
* Full day event flag
* Column used for event start date
*
* @access private
* @var boolean
* @access protected
* @var string
*/
private $fullDay = false;
protected $startColumn = '';
/**
* When called calendar events will be full day
* Column used for event end date
*
* @access protected
* @var string
*/
protected $endColumn = '';
/**
* Transform results to calendar events
*
* @access public
* @return FormatterInterface
* @param string $start_column Column name for the start date
* @param string $end_column Column name for the end date
* @return $this
*/
public function setFullDay()
public function setColumns($start_column, $end_column = '')
{
$this->fullDay = true;
$this->startColumn = $start_column;
$this->endColumn = $end_column ?: $start_column;
return $this;
}
@@ -43,6 +56,17 @@ class TaskCalendarFormatter extends BaseTaskCalendarFormatter implements Formatt
$events = array();
foreach ($this->query->findAll() as $task) {
$startDate = new DateTime();
$startDate->setTimestamp($task[$this->startColumn]);
$endDate = new DateTime();
if (! empty($task[$this->endColumn])) {
$endDate->setTimestamp($task[$this->endColumn]);
}
$allDay = $startDate == $endDate && $endDate->format('Hi') == '0000';
$format = $allDay ? 'Y-m-d' : 'Y-m-d\TH:i:s';
$events[] = array(
'timezoneParam' => $this->timezoneModel->getCurrentTimezone(),
'id' => $task['id'],
@@ -51,24 +75,13 @@ class TaskCalendarFormatter extends BaseTaskCalendarFormatter implements Formatt
'borderColor' => $this->colorModel->getBorderColor($task['color_id']),
'textColor' => 'black',
'url' => $this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
'start' => date($this->getDateTimeFormat(), $task[$this->startColumn]),
'end' => date($this->getDateTimeFormat(), $task[$this->endColumn] ?: time()),
'editable' => $this->fullDay,
'allday' => $this->fullDay,
'start' => $startDate->format($format),
'end' => $endDate->format($format),
'editable' => $allDay,
'allday' => $allDay,
);
}
return $events;
}
/**
* Get DateTime format for event
*
* @access private
* @return string
*/
private function getDateTimeFormat()
{
return $this->fullDay ? 'Y-m-d' : 'Y-m-d\TH:i:s';
}
}