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

Update task links, assignee and time tracking (#775), group links by label (#669)

Browse Source 
Merge and modification of pull-request #785
This commit is contained in:
Frederic Guillot
2015-05-09 22:09:09 -04:00
parent 0e019e8669
commit 5d5ba44337
31 changed files with 488 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
app/Model/TaskLink.php
View File

@@ -34,6 +34,24 @@ class TaskLink extends Base
return $this->db->table(self::TABLE)->eq('id', $task_link_id)->findOne();
}
/**
* Get the opposite task link (use the unique index task_has_links_unique)
*
* @access public
* @param array $task_link
* @return array
*/
public function getOppositeTaskLink(array $task_link)
{
$opposite_link_id = $this->link->getOppositeLinkId($task_link['link_id']);
return $this->db->table(self::TABLE)
->eq('opposite_task_id', $task_link['task_id'])
->eq('task_id', $task_link['opposite_task_id'])
->eq('link_id', $opposite_link_id)
->findOne();
}
/**
* Get all links attached to a task
*
@@ -41,7 +59,7 @@ class TaskLink extends Base
* @param integer $task_id Task id
* @return array
*/
public function getLinks($task_id)
public function getAll($task_id)
{
return $this->db
->table(self::TABLE)
@@ -52,16 +70,46 @@ class TaskLink extends Base
Task::TABLE.'.title',
Task::TABLE.'.is_active',
Task::TABLE.'.project_id',
Task::TABLE.'.time_spent AS task_time_spent',
Task::TABLE.'.time_estimated AS task_time_estimated',
Task::TABLE.'.owner_id AS task_assignee_id',
User::TABLE.'.username AS task_assignee_username',
User::TABLE.'.name AS task_assignee_name',
Board::TABLE.'.title AS column_title'
)
->eq(self::TABLE.'.task_id', $task_id)
->join(Link::TABLE, 'id', 'link_id')
->join(Task::TABLE, 'id', 'opposite_task_id')
->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
->orderBy(Link::TABLE.'.id ASC, '.Board::TABLE.'.position ASC, '.Task::TABLE.'.is_active DESC, '.Task::TABLE.'.id', Table::SORT_ASC)
->findAll();
}
/**
* Get all links attached to a task grouped by label
*
* @access public
* @param integer $task_id Task id
* @return array
*/
public function getAllGroupedByLabel($task_id)
{
$links = $this->getAll($task_id);
$result = array();
foreach ($links as $link) {
if (! isset($result[$link['label']])) {
$result[$link['label']] = array();
}
$result[$link['label']][] = $link;
}
return $result;
}
/**
* Create a new link
*
@@ -69,31 +117,76 @@ class TaskLink extends Base
* @param integer $task_id Task id
* @param integer $opposite_task_id Opposite task id
* @param integer $link_id Link id
* @return boolean
* @return integer Task link id
*/
public function create($task_id, $opposite_task_id, $link_id)
{
$this->db->startTransaction();
// Create the original link
// Get opposite link
$opposite_link_id = $this->link->getOppositeLinkId($link_id);
// Create the original task link
$this->db->table(self::TABLE)->insert(array(
'task_id' => $task_id,
'opposite_task_id' => $opposite_task_id,
'link_id' => $link_id,
));
$link_id = $this->link->getOppositeLinkId($link_id);
$task_link_id = $this->db->getConnection()->getLastId();
// Create the opposite link
// Create the opposite task link
$this->db->table(self::TABLE)->insert(array(
'task_id' => $opposite_task_id,
'opposite_task_id' => $task_id,
'link_id' => $link_id,
'link_id' => $opposite_link_id,
));
$this->db->closeTransaction();
return true;
return $task_link_id;
}
/**
* Update a task link
*
* @access public
* @param integer $task_link_id Task link id
* @param integer $task_id Task id
* @param integer $opposite_task_id Opposite task id
* @param integer $link_id Link id
* @return boolean
*/
public function update($task_link_id, $task_id, $opposite_task_id, $link_id)
{
$this->db->startTransaction();
// Get original task link
$task_link = $this->getById($task_link_id);
// Find opposite task link
$opposite_task_link = $this->getOppositeTaskLink($task_link);
// Get opposite link
$opposite_link_id = $this->link->getOppositeLinkId($link_id);
// Update the original task link
$rs1 = $this->db->table(self::TABLE)->eq('id', $task_link_id)->update(array(
'task_id' => $task_id,
'opposite_task_id' => $opposite_task_id,
'link_id' => $link_id,
));
// Update the opposite link
$rs2 = $this->db->table(self::TABLE)->eq('id', $opposite_task_link['id'])->update(array(
'task_id' => $opposite_task_id,
'opposite_task_id' => $task_id,
'link_id' => $opposite_link_id,
));
$this->db->closeTransaction();
return $rs1 && $rs2;
}
/**
@@ -123,6 +216,23 @@ class TaskLink extends Base
return true;
}
/**
* Common validation rules
*
* @access private
* @return array
*/
private function commonValidationRules()
{
return array(
new Validators\Required('task_id', t('Field required')),
new Validators\Required('opposite_task_id', t('Field required')),
new Validators\Required('link_id', t('Field required')),
new Validators\NotEquals('opposite_task_id', 'task_id', t('A task cannot be linked to itself')),
new Validators\Exists('opposite_task_id', t('This linked task id doesn\'t exists'), $this->db->getConnection(), Task::TABLE, 'id')
);
}
/**
* Validate creation
*
@@ -132,11 +242,28 @@ class TaskLink extends Base
*/
public function validateCreation(array $values)
{
$v = new Validator($values, array(
new Validators\Required('task_id', t('Field required')),
new Validators\Required('link_id', t('Field required')),
new Validators\Required('title', t('Field required')),
));
$v = new Validator($values, $this->commonValidationRules());
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateModification(array $values)
{
$rules = array(
new Validators\Required('id', t('Field required')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),