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

Handle tags and tasks move/duplication to another project

Browse Source
This commit is contained in:
Frederic Guillot
2016-07-02 14:44:26 -04:00
parent 853189a43f
commit 3fcc0cb918
19 changed files with 1121 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Action/TaskDuplicateAnotherProject.php
View File

@@ -76,7 +76,7 @@ class TaskDuplicateAnotherProject extends Base
public function doAction(array $data)
{
$destination_column_id = $this->columnModel->getFirstColumnId($this->getParam('project_id'));
return (bool) $this->taskDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
return (bool) $this->taskProjectDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
}
/**

2
app/Action/TaskMoveAnotherProject.php
View File

@@ -75,7 +75,7 @@ class TaskMoveAnotherProject extends Base
*/
public function doAction(array $data)
{
return $this->taskDuplicationModel->moveToProject($data['task_id'], $this->getParam('project_id'));
return $this->taskProjectMoveModel->moveToProject($data['task_id'], $this->getParam('project_id'));
}
/**

4
app/Api/Procedure/TaskProcedure.php
View File

@@ -77,13 +77,13 @@ class TaskProcedure extends BaseProcedure
public function moveTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
{
ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'moveTaskToProject', $project_id);
return $this->taskDuplicationModel->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
return $this->taskProjectMoveModel->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
}
public function duplicateTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
{
ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'duplicateTaskToProject', $project_id);
return $this->taskDuplicationModel->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
return $this->taskProjectDuplicationModel->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
}
public function createTask($title, $project_id, $color_id = '', $column_id = 0, $owner_id = 0, $creator_id = 0,

4
app/Controller/TaskDuplicationController.php
View File

@@ -50,7 +50,7 @@ class TaskDuplicationController extends BaseController
$values = $this->request->getValues();
list($valid, ) = $this->taskValidator->validateProjectModification($values);
if ($valid && $this->taskDuplicationModel->moveToProject($task['id'],
if ($valid && $this->taskProjectMoveModel->moveToProject($task['id'],
$values['project_id'],
$values['swimlane_id'],
$values['column_id'],
@@ -80,7 +80,7 @@ class TaskDuplicationController extends BaseController
list($valid, ) = $this->taskValidator->validateProjectModification($values);
if ($valid) {
$task_id = $this->taskDuplicationModel->duplicateToProject(
$task_id = $this->taskProjectDuplicationModel->duplicateToProject(
$task['id'], $values['project_id'], $values['swimlane_id'],
$values['column_id'], $values['category_id'], $values['owner_id']
);

4
app/Core/Base.php
View File

@@ -90,11 +90,15 @@ use Pimple\Container;
* @property \Kanboard\Model\SubtaskModel $subtaskModel
* @property \Kanboard\Model\SubtaskTimeTrackingModel $subtaskTimeTrackingModel
* @property \Kanboard\Model\SwimlaneModel $swimlaneModel
* @property \Kanboard\Model\TagDuplicationModel $tagDuplicationModel
* @property \Kanboard\Model\TagModel $tagModel
* @property \Kanboard\Model\TaskModel $taskModel
* @property \Kanboard\Model\TaskAnalyticModel $taskAnalyticModel
* @property \Kanboard\Model\TaskCreationModel $taskCreationModel
* @property \Kanboard\Model\TaskDuplicationModel $taskDuplicationModel
* @property \Kanboard\Model\TaskProjectDuplicationModel $taskProjectDuplicationModel
* @property \Kanboard\Model\TaskProjectMoveModel $taskProjectMoveModel
* @property \Kanboard\Model\TaskRecurrenceModel $taskRecurrenceModel
* @property \Kanboard\Model\TaskExternalLinkModel $taskExternalLinkModel
* @property \Kanboard\Model\TaskFinderModel $taskFinderModel
* @property \Kanboard\Model\TaskLinkModel $taskLinkModel

67
app/Model/TagDuplicationModel.php Normal file
View File

@@ -0,0 +1,67 @@
<?php
namespace Kanboard\Model;
use Kanboard\Core\Base;
/**
* Tag Duplication
*
* @package Kanboard\Model
* @author Frederic Guillot
*/
class TagDuplicationModel extends Base
{
/**
* Link tags to the new tasks
*
* @access public
* @param integer $src_task_id
* @param integer $dst_task_id
* @param integer $dst_project_id
*/
public function duplicateTaskTagsToAnotherProject($src_task_id, $dst_task_id, $dst_project_id)
{
$tags = $this->taskTagModel->getTagsByTask($src_task_id);
foreach ($tags as $tag) {
$tag_id = $this->tagModel->getIdByName($dst_project_id, $tag['name']);
if ($tag_id) {
$this->taskTagModel->associateTag($dst_task_id, $tag_id);
}
}
}
/**
* Duplicate tags to the new task
*
* @access public
* @param integer $src_task_id
* @param integer $dst_task_id
*/
public function duplicateTaskTags($src_task_id, $dst_task_id)
{
$tags = $this->taskTagModel->getTagsByTask($src_task_id);
foreach ($tags as $tag) {
$this->taskTagModel->associateTag($dst_task_id, $tag['id']);
}
}
/**
* Remove tags that are not available in destination project
*
* @access public
* @param integer $task_id
* @param integer $dst_project_id
*/
public function syncTaskTagsToAnotherProject($task_id, $dst_project_id)
{
$tag_ids = $this->taskTagModel->getTagIdsByTaskNotAvailableInProject($task_id, $dst_project_id);
foreach ($tag_ids as $tag_id) {
$this->taskTagModel->dissociateTag($task_id, $tag_id);
}
}
}

156
app/Model/TaskDuplicationModel.php
View File

@@ -2,10 +2,7 @@
namespace Kanboard\Model;
use DateTime;
use DateInterval;
use Kanboard\Core\Base;
use Kanboard\Event\TaskEvent;
/**
* Task Duplication
@@ -18,10 +15,10 @@ class TaskDuplicationModel extends Base
/**
* Fields to copy when duplicating a task
*
* @access private
* @var array
* @access protected
* @var string[]
*/
private $fields_to_duplicate = array(
protected $fields_to_duplicate = array(
'title',
'description',
'date_due',
@@ -49,106 +46,13 @@ class TaskDuplicationModel extends Base
*/
public function duplicate($task_id)
{
return $this->save($task_id, $this->copyFields($task_id));
}
$new_task_id = $this->save($task_id, $this->copyFields($task_id));
/**
* Duplicate recurring task
*
* @access public
* @param integer $task_id Task id
* @return boolean|integer Recurrence task id
*/
public function duplicateRecurringTask($task_id)
{
$values = $this->copyFields($task_id);
if ($values['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
$values['recurrence_parent'] = $task_id;
$values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']);
$this->calculateRecurringTaskDueDate($values);
$recurring_task_id = $this->save($task_id, $values);
if ($recurring_task_id > 0) {
$parent_update = $this->db
->table(TaskModel::TABLE)
->eq('id', $task_id)
->update(array(
'recurrence_status' => TaskModel::RECURRING_STATUS_PROCESSED,
'recurrence_child' => $recurring_task_id,
));
if ($parent_update) {
return $recurring_task_id;
}
}
if ($new_task_id !== false) {
$this->tagDuplicationModel->duplicateTaskTags($task_id, $new_task_id);
}
return false;
}
/**
* Duplicate a task to another project
*
* @access public
* @param integer $task_id
* @param integer $project_id
* @param integer $swimlane_id
* @param integer $column_id
* @param integer $category_id
* @param integer $owner_id
* @return boolean|integer
*/
public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
{
$values = $this->copyFields($task_id);
$values['project_id'] = $project_id;
$values['column_id'] = $column_id !== null ? $column_id : $values['column_id'];
$values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id'];
$values['category_id'] = $category_id !== null ? $category_id : $values['category_id'];
$values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id'];
$this->checkDestinationProjectValues($values);
return $this->save($task_id, $values);
}
/**
* Move a task to another project
*
* @access public
* @param integer $task_id
* @param integer $project_id
* @param integer $swimlane_id
* @param integer $column_id
* @param integer $category_id
* @param integer $owner_id
* @return boolean
*/
public function moveToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
{
$task = $this->taskFinderModel->getById($task_id);
$values = array();
$values['is_active'] = 1;
$values['project_id'] = $project_id;
$values['column_id'] = $column_id !== null ? $column_id : $task['column_id'];
$values['position'] = $this->taskFinderModel->countByColumnId($project_id, $values['column_id']) + 1;
$values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id'];
$values['category_id'] = $category_id !== null ? $category_id : $task['category_id'];
$values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id'];
$this->checkDestinationProjectValues($values);
if ($this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values)) {
$this->container['dispatcher']->dispatch(
TaskModel::EVENT_MOVE_PROJECT,
new TaskEvent(array_merge($task, $values, array('task_id' => $task['id'])))
);
}
return true;
return $new_task_id;
}
/**
@@ -194,50 +98,14 @@ class TaskDuplicationModel extends Base
return $values;
}
/**
* Calculate new due date for new recurrence task
*
* @access public
* @param array $values Task fields
*/
public function calculateRecurringTaskDueDate(array &$values)
{
if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {
if ($values['recurrence_basedate'] == TaskModel::RECURRING_BASEDATE_TRIGGERDATE) {
$values['date_due'] = time();
}
$factor = abs($values['recurrence_factor']);
$subtract = $values['recurrence_factor'] < 0;
switch ($values['recurrence_timeframe']) {
case TaskModel::RECURRING_TIMEFRAME_MONTHS:
$interval = 'P' . $factor . 'M';
break;
case TaskModel::RECURRING_TIMEFRAME_YEARS:
$interval = 'P' . $factor . 'Y';
break;
default:
$interval = 'P' . $factor . 'D';
}
$date_due = new DateTime();
$date_due->setTimestamp($values['date_due']);
$subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval));
$values['date_due'] = $date_due->getTimestamp();
}
}
/**
* Duplicate fields for the new task
*
* @access private
* @access protected
* @param integer $task_id Task id
* @return array
*/
private function copyFields($task_id)
protected function copyFields($task_id)
{
$task = $this->taskFinderModel->getById($task_id);
$values = array();
@@ -252,16 +120,16 @@ class TaskDuplicationModel extends Base
/**
* Create the new task and duplicate subtasks
*
* @access private
* @access protected
* @param integer $task_id Task id
* @param array $values Form values
* @return boolean|integer
*/
private function save($task_id, array $values)
protected function save($task_id, array $values)
{
$new_task_id = $this->taskCreationModel->create($values);
if ($new_task_id) {
if ($new_task_id !== false) {
$this->subtaskModel->duplicate($task_id, $new_task_id);
}

2
app/Model/TaskModel.php
View File

@@ -215,7 +215,7 @@ class TaskModel extends Base
$task_ids = $this->taskFinderModel->getAllIds($src_project_id, array(TaskModel::STATUS_OPEN, TaskModel::STATUS_CLOSED));
foreach ($task_ids as $task_id) {
if (! $this->taskDuplicationModel->duplicateToProject($task_id, $dst_project_id)) {
if (! $this->taskProjectDuplicationModel->duplicateToProject($task_id, $dst_project_id)) {
return false;
}
}

60
app/Model/TaskProjectDuplicationModel.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
namespace Kanboard\Model;
/**
* Task Project Duplication
*
* @package Kanboard\Model
* @author Frederic Guillot
*/
class TaskProjectDuplicationModel extends TaskDuplicationModel
{
/**
* Duplicate a task to another project
*
* @access public
* @param integer $task_id
* @param integer $project_id
* @param integer $swimlane_id
* @param integer $column_id
* @param integer $category_id
* @param integer $owner_id
* @return boolean|integer
*/
public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
{
$values = $this->prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id);
$this->checkDestinationProjectValues($values);
$new_task_id = $this->save($task_id, $values);
if ($new_task_id !== false) {
$this->tagDuplicationModel->duplicateTaskTagsToAnotherProject($task_id, $new_task_id, $project_id);
}
return $new_task_id;
}
/**
* Prepare values before duplication
*
* @access protected
* @param integer $task_id
* @param integer $project_id
* @param integer $swimlane_id
* @param integer $column_id
* @param integer $category_id
* @param integer $owner_id
* @return array
*/
protected function prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id)
{
$values = $this->copyFields($task_id);
$values['project_id'] = $project_id;
$values['column_id'] = $column_id !== null ? $column_id : $values['column_id'];
$values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id'];
$values['category_id'] = $category_id !== null ? $category_id : $values['category_id'];
$values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id'];
return $values;
}
}

67
app/Model/TaskProjectMoveModel.php Normal file
View File

@@ -0,0 +1,67 @@
<?php
namespace Kanboard\Model;
use Kanboard\Event\TaskEvent;
/**
* Task Project Move
*
* @package Kanboard\Model
* @author Frederic Guillot
*/
class TaskProjectMoveModel extends TaskDuplicationModel
{
/**
* Move a task to another project
*
* @access public
* @param integer $task_id
* @param integer $project_id
* @param integer $swimlane_id
* @param integer $column_id
* @param integer $category_id
* @param integer $owner_id
* @return boolean
*/
public function moveToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null)
{
$task = $this->taskFinderModel->getById($task_id);
$values = $this->prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, $task);
$this->checkDestinationProjectValues($values);
$this->tagDuplicationModel->syncTaskTagsToAnotherProject($task_id, $project_id);
if ($this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values)) {
$event = new TaskEvent(array_merge($task, $values, array('task_id' => $task['id'])));
$this->dispatcher->dispatch(TaskModel::EVENT_MOVE_PROJECT, $event);
}
return true;
}
/**
* Prepare new task values
*
* @access protected
* @param integer $project_id
* @param integer $swimlane_id
* @param integer $column_id
* @param integer $category_id
* @param integer $owner_id
* @param array $task
* @return array
*/
protected function prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, array $task)
{
$values = array();
$values['is_active'] = 1;
$values['project_id'] = $project_id;
$values['column_id'] = $column_id !== null ? $column_id : $task['column_id'];
$values['position'] = $this->taskFinderModel->countByColumnId($project_id, $values['column_id']) + 1;
$values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id'];
$values['category_id'] = $category_id !== null ? $category_id : $task['category_id'];
$values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id'];
return $values;
}
}

87
app/Model/TaskRecurrenceModel.php Normal file
View File

@@ -0,0 +1,87 @@
<?php
namespace Kanboard\Model;
use DateInterval;
use DateTime;
/**
* Task Recurrence
*
* @package Kanboard\Model
* @author Frederic Guillot
*/
class TaskRecurrenceModel extends TaskDuplicationModel
{
/**
* Duplicate recurring task
*
* @access public
* @param integer $task_id Task id
* @return boolean|integer Recurrence task id
*/
public function duplicateRecurringTask($task_id)
{
$values = $this->copyFields($task_id);
if ($values['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
$values['recurrence_parent'] = $task_id;
$values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']);
$this->calculateRecurringTaskDueDate($values);
$recurring_task_id = $this->save($task_id, $values);
if ($recurring_task_id > 0) {
$parent_update = $this->db
->table(TaskModel::TABLE)
->eq('id', $task_id)
->update(array(
'recurrence_status' => TaskModel::RECURRING_STATUS_PROCESSED,
'recurrence_child' => $recurring_task_id,
));
if ($parent_update) {
return $recurring_task_id;
}
}
}
return false;
}
/**
* Calculate new due date for new recurrence task
*
* @access public
* @param array $values Task fields
*/
public function calculateRecurringTaskDueDate(array &$values)
{
if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {
if ($values['recurrence_basedate'] == TaskModel::RECURRING_BASEDATE_TRIGGERDATE) {
$values['date_due'] = time();
}
$factor = abs($values['recurrence_factor']);
$subtract = $values['recurrence_factor'] < 0;
switch ($values['recurrence_timeframe']) {
case TaskModel::RECURRING_TIMEFRAME_MONTHS:
$interval = 'P' . $factor . 'M';
break;
case TaskModel::RECURRING_TIMEFRAME_YEARS:
$interval = 'P' . $factor . 'Y';
break;
default:
$interval = 'P' . $factor . 'D';
}
$date_due = new DateTime();
$date_due->setTimestamp($values['date_due']);
$subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval));
$values['date_due'] = $date_due->getTimestamp();
}
}
}

17
app/Model/TaskTagModel.php
View File

@@ -19,6 +19,23 @@ class TaskTagModel extends Base
*/
const TABLE = 'task_has_tags';
/**
* Get all tags not available in a project
*
* @access public
* @param integer $task_id
* @param integer $project_id
* @return array
*/
public function getTagIdsByTaskNotAvailableInProject($task_id, $project_id)
{
return $this->db->table(TagModel::TABLE)
->eq(self::TABLE.'.task_id', $task_id)
->notIn(TagModel::TABLE.'.project_id', array(0, $project_id))
->join(self::TABLE, 'tag_id', 'id')
->findAllByColumn(TagModel::TABLE.'.id');
}
/**
* Get all tags associated to a task
*

4
app/ServiceProvider/ClassProvider.php
View File

@@ -60,11 +60,15 @@ class ClassProvider implements ServiceProviderInterface
'SubtaskModel',
'SubtaskTimeTrackingModel',
'SwimlaneModel',
'TagDuplicationModel',
'TagModel',
'TaskModel',
'TaskAnalyticModel',
'TaskCreationModel',
'TaskDuplicationModel',
'TaskProjectDuplicationModel',
'TaskProjectMoveModel',
'TaskRecurrenceModel',
'TaskExternalLinkModel',
'TaskFinderModel',
'TaskFileModel',

6
app/Subscriber/RecurringTaskSubscriber.php
View File

@@ -22,9 +22,9 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) {
if ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_FIRST_COLUMN && $this->columnModel->getFirstColumnId($event['project_id']) == $event['src_column_id']) {
$this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
$this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
} elseif ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_LAST_COLUMN && $this->columnModel->getLastColumnId($event['project_id']) == $event['dst_column_id']) {
$this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
$this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
}
}
}
@@ -34,7 +34,7 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI
$this->logger->debug('Subscriber executed: '.__METHOD__);
if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_CLOSE) {
$this->taskDuplicationModel->duplicateRecurringTask($event['task_id']);
$this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']);
}
}
}