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

Use completion or due date for the event end

Browse Source
This commit is contained in:
Baudouin Feildel
2018-03-02 15:30:26 +01:00
committed by Frédéric Guillot
parent 9f30934369
commit 5905bf4974
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Controller/CalendarController.php
View File

@@ -56,10 +56,10 @@ class CalendarController extends BaseController
$startAndDueDateQueryBuilder $startAndDueDateQueryBuilder
->getQuery() ->getQuery()
->addCondition($this->getConditionForTasksWithStartAndDueDate($startRange, $endRange, $startColumn, 'date_due')); ->addCondition($this->getConditionForTasksWithStartAndDueDate($startRange, $endRange, $startColumn, 'date_due', 'date_completed'));
$startAndDueDateEvents = $startAndDueDateQueryBuilder $startAndDueDateEvents = $startAndDueDateQueryBuilder
->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due')); ->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due', 'date_completed'));
$events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents); $events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents);
@@ -91,10 +91,10 @@ class CalendarController extends BaseController
$startAndDueDateQueryBuilder $startAndDueDateQueryBuilder
->getQuery() ->getQuery()
->addCondition($this->getConditionForTasksWithStartAndDueDate($startRange, $endRange, $startColumn, 'date_due')); ->addCondition($this->getConditionForTasksWithStartAndDueDate($startRange, $endRange, $startColumn, 'date_due', 'date_completed'));
$startAndDueDateEvents = $startAndDueDateQueryBuilder $startAndDueDateEvents = $startAndDueDateQueryBuilder
->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due')); ->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due', 'date_completed'));
$events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents); $events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents);
@@ -119,17 +119,18 @@ class CalendarController extends BaseController
} }
} }
protected function getConditionForTasksWithStartAndDueDate($startTime, $endTime, $startColumn, $endColumn) protected function getConditionForTasksWithStartAndDueDate($startTime, $endTime, $startColumn, $expectedEndColumn, $effectiveEndColumn)
{ {
$startTime = strtotime($startTime); $startTime = strtotime($startTime);
$endTime = strtotime($endTime); $endTime = strtotime($endTime);
$startColumn = $this->db->escapeIdentifier($startColumn); $startColumn = $this->db->escapeIdentifier($startColumn);
$endColumn = $this->db->escapeIdentifier($endColumn); $expectedEndColumn = $this->db->escapeIdentifier($expectedEndColumn);
$effectiveEndColumn = $this->db->escapeIdentifier($effectiveEndColumn);
$conditions = array( $conditions = array(
"($startColumn >= '$startTime' AND $startColumn <= '$endTime')", "($startColumn >= '$startTime' AND $startColumn <= '$endTime')",
"($startColumn <= '$startTime' AND $endColumn >= '$startTime')", "($startColumn <= '$startTime' AND ($expectedEndColumn >= '$startTime' OR $effectiveEndColumn >= '$startTime'))",
"($startColumn <= '$startTime' AND ($endColumn = '0' OR $endColumn IS NULL))", "($startColumn <= '$startTime' AND ($expectedEndColumn = '0' OR $expectedEndColumn IS NULL) AND ($effectiveEndColumn = '0' OR $effectiveEndColumn IS NULL))",
); );
return $startColumn.' IS NOT NULL AND '.$startColumn.' > 0 AND ('.implode(' OR ', $conditions).')'; return $startColumn.' IS NOT NULL AND '.$startColumn.' > 0 AND ('.implode(' OR ', $conditions).')';

30
Formatter/TaskCalendarFormatter.php
View File

@@ -23,25 +23,35 @@ class TaskCalendarFormatter extends BaseFormatter implements FormatterInterface
protected $startColumn = ''; protected $startColumn = '';
/** /**
* Column used for event end date * Column used for event expected end date
* *
* @access protected * @access protected
* @var string * @var string
*/ */
protected $endColumn = ''; protected $expectedEndColumn = '';
/**
* Column used for event effective end date
*
* @access protected
* @var string
*/
protected $effectiveEndColumn = '';
/** /**
* Transform results to calendar events * Transform results to calendar events
* *
* @access public * @access public
* @param string $start_column Column name for the start date * @param string $start_column Column name for the start date
* @param string $end_column Column name for the end date * @param string $expected_end_column Column name for the expected end date
* @param string $effective_end_column Column name for the effective end date
* @return $this * @return $this
*/ */
public function setColumns($start_column, $end_column = '') public function setColumns($start_column, $expected_end_column = '', $effective_end_column = '')
{ {
$this->startColumn = $start_column; $this->startColumn = $start_column;
$this->endColumn = $end_column ?: $start_column; $this->expectedEndColumn = $expected_end_column ?: $start_column;
$this->effectiveEndColumn = $effective_end_column ?: $this->expectedEndColumn;
return $this; return $this;
} }
@@ -60,8 +70,14 @@ class TaskCalendarFormatter extends BaseFormatter implements FormatterInterface
$startDate->setTimestamp($task[$this->startColumn]); $startDate->setTimestamp($task[$this->startColumn]);
$endDate = new DateTime(); $endDate = new DateTime();
if (! empty($task[$this->endColumn])) { if (! empty($task[$this->expectedEndColumn])) {
$endDate->setTimestamp($task[$this->endColumn]); $endDate->setTimestamp($task[$this->expectedEndColumn]);
}
if ($this->expectedEndColumn != $this->effectiveEndColumn &&
! empty($task[$this->effectiveEndColumn]) &&
$task[$this->effectiveEndColumn] != $task[$this->expectedEndColumn]) {
$endDate->setTimestamp($task[$this->effectiveEndColumn]);
} }
$allDay = $startDate == $endDate && $endDate->format('Hi') == '0000'; $allDay = $startDate == $endDate && $endDate->format('Hi') == '0000';