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

Recurring tasks (#847): move hardcoded conditions to event subscriber + refactoring

Browse Source
This commit is contained in:
Frederic Guillot
2015-05-10 15:15:58 -04:00
parent c9dcd70617
commit bd3c44c3d3
6 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Model/TaskDuplication.php
View File

@@ -52,39 +52,40 @@ class TaskDuplication extends Base
}
/**
* Create task recurrence to the same project
* Duplicate recurring task
*
* @access public
* @param integer $task_id Task id
* @return boolean|integer Recurrence task id
*/
public function createRecurrence($task_id)
public function duplicateRecurringTask($task_id)
{
$values = $this->copyFields($task_id);
if ($values['recurrence_status'] == Task::RECURE_STATUS_PENDING)
{
if ($values['recurrence_status'] == Task::RECURE_STATUS_PENDING) {
$values['recurrence_parent'] = $task_id;
$values['column_id'] = $this->board->getFirstColumn($values['project_id']);
$this->recurrenceDateDue($values);
$recuretask = $this->save($task_id, $values);
$this->calculateRecurringTaskDueDate($values);
if ($recuretask)
{
$recurrenceStatusUpdate = $this->db
$recurring_task_id = $this->save($task_id, $values);
if ($recurring_task_id > 0) {
$parent_update = $this->db
->table(Task::TABLE)
->eq('id',$task_id)
->eq('id', $task_id)
->update(array(
'recurrence_status' => Task::RECURE_STATUS_PROCESSED,
'recurrence_child' => $recuretask,
'recurrence_child' => $recurring_task_id,
));
if($recurrenceStatusUpdate)
{
return $recuretask;
if ($parent_update) {
return $recurring_task_id;
}
}
}
return false;
}
@@ -176,7 +177,7 @@ class TaskDuplication extends Base
* @access private
* @param array $values
*/
private function recurrenceDateDue(array &$values)
private function calculateRecurringTaskDueDate(array &$values)
{
if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {

15
app/Model/TaskPosition.php
View File

@@ -39,19 +39,6 @@ class TaskPosition extends Base
if ($fire_events) {
$this->fireEvents($original_task, $column_id, $position, $swimlane_id);
}
if ($original_task['recurrence_status'] == Task::RECURE_STATUS_PENDING
&& $original_task['column_id'] != $column_id
&& (
($original_task['column_id'] == $this->board->getFirstColumn($project_id)
&& $original_task['recurrence_trigger'] == Task::RECURE_TRIGGER_FIRST)
|| ($column_id == $this->board->getLastColumn($project_id)
&& $original_task['recurrence_trigger'] == Task::RECURE_TRIGGER_LAST)
)
)
{
$this->taskDuplication->createRecurrence($task_id);
}
}
return $result;
@@ -159,6 +146,8 @@ class TaskPosition extends Base
'src_column_id' => $task['column_id'],
'dst_column_id' => $new_column_id,
'date_moved' => $task['date_moved'],
'recurrence_status' => $task['recurrence_status'],
'recurrence_trigger' => $task['recurrence_trigger'],
);
if ($task['swimlane_id'] != $new_swimlane_id) {

11
app/Model/TaskStatus.php
View File

@@ -89,9 +89,7 @@ class TaskStatus extends Base
*/
private function changeStatus($task_id, $status, $date_completed, $event)
{
$task = $this->taskFinder->getById($task_id);
if (!$task['id']) {
if (! $this->taskFinder->exists($task_id)) {
return false;
}
@@ -109,13 +107,6 @@ class TaskStatus extends Base
$event,
new TaskEvent(array('task_id' => $task_id) + $this->taskFinder->getById($task_id))
);
if ($status == Task::STATUS_CLOSED
&& $task['recurrence_status'] == Task::RECURE_STATUS_PENDING
&& $task['recurrence_trigger'] == Task::RECURE_TRIGGER_CLOSE)
{
$this->taskDuplication->createRecurrence($task_id);
}
}
return $result;