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

Add a page to display completed tasks and add the completion date column for tasks

Browse Source
This commit is contained in:
Frédéric Guillot
2014-02-22 13:37:06 -05:00
parent fd28d50597
commit a1923d3d7f
13 changed files with 215 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
models/task.php
View File

@@ -33,6 +33,7 @@ class Task extends Base
self::TABLE.'.title',
self::TABLE.'.description',
self::TABLE.'.date_creation',
self::TABLE.'.date_completed',
self::TABLE.'.color_id',
self::TABLE.'.project_id',
self::TABLE.'.column_id',
@@ -55,9 +56,30 @@ class Task extends Base
}
}
public function getAllByProjectId($project_id)
public function getAllByProjectId($project_id, array $status = array(1, 0))
{
return $this->db->table(self::TABLE)->eq('project_id', $project_id)->findAll();
return $this->db->table(self::TABLE)
->columns(
self::TABLE.'.id',
self::TABLE.'.title',
self::TABLE.'.description',
self::TABLE.'.date_creation',
self::TABLE.'.date_completed',
self::TABLE.'.color_id',
self::TABLE.'.project_id',
self::TABLE.'.column_id',
self::TABLE.'.owner_id',
self::TABLE.'.position',
self::TABLE.'.is_active',
\Model\Board::TABLE.'.title AS column_title',
\Model\User::TABLE.'.username'
)
->join(\Model\Board::TABLE, 'id', 'column_id')
->join(\Model\User::TABLE, 'id', 'owner_id')
->eq(self::TABLE.'.project_id', $project_id)
->in('is_active', $status)
->desc('date_completed')
->findAll();
}
public function countByProjectId($project_id, $status = array(1, 0))
@@ -117,12 +139,22 @@ class Task extends Base
public function close($task_id)
{
return $this->db->table(self::TABLE)->eq('id', $task_id)->update(array('is_active' => 0));
return $this->db->table(self::TABLE)
->eq('id', $task_id)
->update(array(
'is_active' => 0,
'date_completed' => time()
));
}
public function open($task_id)
{
return $this->db->table(self::TABLE)->eq('id', $task_id)->update(array('is_active' => 1));
return $this->db->table(self::TABLE)
->eq('id', $task_id)
->update(array(
'is_active' => 1,
'date_completed' => ''
));
}
public function remove($task_id)