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

Add subtask position

This commit is contained in:
Frederic Guillot 2015-03-01 18:03:58 -05:00
parent da425e4187
commit 35d99ec5d3
8 changed files with 256 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controller/Subtask.php
View File

@ -185,7 +185,7 @@ class Subtask extends Base
if ($redirect === 'board') {
$this->session['has_subtask_inprogress'] = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
$this->response->html($this->template->render('board/subtasks', array(
'subtasks' => $this->subtask->getAll($task['id']),
'task' => $task,
@ -259,4 +259,22 @@ class Subtask extends Base
$this->response->redirect($this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
}
}
/**
* Move subtask position
*
* @access public
*/
public function movePosition()
{
$this->checkCSRFParam();
$project_id = $this->request->getIntegerParam('project_id');
$task_id = $this->request->getIntegerParam('task_id');
$subtask_id = $this->request->getIntegerParam('subtask_id');
$direction = $this->request->getStringParam('direction');
$method = $direction === 'up' ? 'moveUp' : 'moveDown';
$this->subtask->$method($task_id, $subtask_id);
$this->response->redirect($this->helper->url('task', 'show', array('project_id' => $project_id, 'task_id' => $task_id)).'#subtasks');
}
}

82
app/Model/Subtask.php
View File

@ -122,7 +122,7 @@ class Subtask extends Base
->eq('task_id', $task_id)
->columns(self::TABLE.'.*', User::TABLE.'.username', User::TABLE.'.name')
->join(User::TABLE, 'id', 'user_id')
->asc(self::TABLE.'.id')
->asc(self::TABLE.'.position')
->filter(array($this, 'addStatusName'))
->findAll();
}
@ -163,6 +163,22 @@ class Subtask extends Base
$this->resetFields($values, array('time_estimated', 'time_spent'));
}
/**
* Get the position of the last column for a given project
*
* @access public
* @param integer $task_id Task id
* @return integer
*/
public function getLastPosition($task_id)
{
return (int) $this->db
->table(self::TABLE)
->eq('task_id', $task_id)
->desc('position')
->findOneColumn('position');
}
/**
* Create a new subtask
*
@ -173,6 +189,8 @@ class Subtask extends Base
public function create(array $values)
{
$this->prepare($values);
$values['position'] = $this->getLastPosition($values['task_id']) + 1;
$subtask_id = $this->persist(self::TABLE, $values);
if ($subtask_id) {
@ -208,6 +226,64 @@ class Subtask extends Base
return $result;
}
/**
* Move a subtask down, increment the position value
*
* @access public
* @param integer $task_id
* @param integer $subtask_id
* @return boolean
*/
public function moveDown($task_id, $subtask_id)
{
$subtasks = $this->db->hashtable(self::TABLE)->eq('task_id', $task_id)->asc('position')->getAll('id', 'position');
$positions = array_flip($subtasks);
if (isset($subtasks[$subtask_id]) && $subtasks[$subtask_id] < count($subtasks)) {
$position = ++$subtasks[$subtask_id];
$subtasks[$positions[$position]]--;
$this->db->startTransaction();
$this->db->table(self::TABLE)->eq('id', $subtask_id)->update(array('position' => $position));
$this->db->table(self::TABLE)->eq('id', $positions[$position])->update(array('position' => $subtasks[$positions[$position]]));
$this->db->closeTransaction();
return true;
}
return false;
}
/**
* Move a subtask up, decrement the position value
*
* @access public
* @param integer $task_id
* @param integer $subtask_id
* @return boolean
*/
public function moveUp($task_id, $subtask_id)
{
$subtasks = $this->db->hashtable(self::TABLE)->eq('task_id', $task_id)->asc('position')->getAll('id', 'position');
$positions = array_flip($subtasks);
if (isset($subtasks[$subtask_id]) && $subtasks[$subtask_id] > 1) {
$position = --$subtasks[$subtask_id];
$subtasks[$positions[$position]]++;
$this->db->startTransaction();
$this->db->table(self::TABLE)->eq('id', $subtask_id)->update(array('position' => $position));
$this->db->table(self::TABLE)->eq('id', $positions[$position])->update(array('position' => $subtasks[$positions[$position]]));
$this->db->closeTransaction();
return true;
}
return false;
}
/**
* Change the status of subtask
*
@ -286,9 +362,9 @@ class Subtask extends Base
return $this->db->transaction(function ($db) use ($src_task_id, $dst_task_id) {
$subtasks = $db->table(Subtask::TABLE)
->columns('title', 'time_estimated')
->columns('title', 'time_estimated', 'position')
->eq('task_id', $src_task_id)
->asc('id') // Explicit sorting for postgresql
->asc('position')
->findAll();
foreach ($subtasks as &$subtask) {

24
app/Schema/Mysql.php
View File

@ -6,7 +6,29 @@ use PDO;
use Core\Security;
use Model\Link;
const VERSION = 48;
const VERSION = 49;
function version_49($pdo)
{
$pdo->exec('ALTER TABLE subtasks ADD COLUMN position INTEGER DEFAULT 1');
$task_id = 0;
$urq = $pdo->prepare('UPDATE subtasks SET position=? WHERE id=?');
$rq = $pdo->prepare('SELECT * FROM subtasks ORDER BY task_id, id ASC');
$rq->execute();
foreach ($rq->fetchAll(PDO::FETCH_ASSOC) as $subtask) {
if ($task_id != $subtask['task_id']) {
$position = 1;
$task_id = $subtask['task_id'];
}
$urq->execute(array($position, $subtask['id']));
$position++;
}
}
function version_48($pdo)
{

24
app/Schema/Postgres.php
View File

@ -6,7 +6,29 @@ use PDO;
use Core\Security;
use Model\Link;
const VERSION = 29;
const VERSION = 30;
function version_30($pdo)
{
$pdo->exec('ALTER TABLE subtasks ADD COLUMN position INTEGER DEFAULT 1');
$task_id = 0;
$urq = $pdo->prepare('UPDATE subtasks SET position=? WHERE id=?');
$rq = $pdo->prepare('SELECT * FROM subtasks ORDER BY task_id, id ASC');
$rq->execute();
foreach ($rq->fetchAll(PDO::FETCH_ASSOC) as $subtask) {
if ($task_id != $subtask['task_id']) {
$position = 1;
$task_id = $subtask['task_id'];
}
$urq->execute(array($position, $subtask['id']));
$position++;
}
}
function version_29($pdo)
{

26
app/Schema/Sqlite.php
View File

@ -6,7 +6,31 @@ use Core\Security;
use PDO;
use Model\Link;
const VERSION = 47;
const VERSION = 48;
function version_48($pdo)
{
$pdo->exec('ALTER TABLE subtasks ADD COLUMN position INTEGER DEFAULT 1');
// Migrate all subtasks position
$task_id = 0;
$urq = $pdo->prepare('UPDATE subtasks SET position=? WHERE id=?');
$rq = $pdo->prepare('SELECT * FROM subtasks ORDER BY task_id, id ASC');
$rq->execute();
foreach ($rq->fetchAll(PDO::FETCH_ASSOC) as $subtask) {
if ($task_id != $subtask['task_id']) {
$position = 1;
$task_id = $subtask['task_id'];
}
$urq->execute(array($position, $subtask['id']));
$position++;
}
}
function version_47($pdo)
{

12
app/Template/subtask/show.php
View File

@ -20,7 +20,7 @@
<?php if (! isset($not_editable)): ?>
<?= $this->toggleSubtaskStatus($subtask, 'task') ?>
<?php else: ?>
<?= $this->render('subtask/icons', array('subtask' => $subtask)) . $this->e($subtask['status_name']) ?>
<?= $this->render('subtask/icons', array('subtask' => $subtask)) . $this->e($subtask['title']) ?>
<?php endif ?>
</td>
<td>
@ -40,6 +40,16 @@
<?php if (! isset($not_editable)): ?>
<td>
<ul>
<?php if ($subtask['position'] > 1): ?>
<li>
<?= $this->a(t('Move Up'), 'subtask', 'movePosition', array('project_id' => $project['id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'up'), true) ?>
</li>
<?php endif ?>
<?php if ($subtask['position'] != 0 && $subtask['position'] != count($subtasks)): ?>
<li>
<?= $this->a(t('Move Down'), 'subtask', 'movePosition', array('project_id' => $project['id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'down'), true) ?>
</li>
<?php endif ?>
<li>
<?= $this->a(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
</li>

2
app/Template/task/show.php
View File

@ -2,7 +2,7 @@
<?= $this->render('task/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
<?= $this->render('task/show_description', array('task' => $task)) ?>
<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links)) ?>
<?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?>
<?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks, 'project' => $project)) ?>
<?= $this->render('task/timesheet', array('task' => $task)) ?>
<?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?>
<?= $this->render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>

75
tests/units/SubtaskTest.php
View File

@ -11,6 +11,78 @@ use Model\User;
class SubTaskTest extends Base
{
public function testMoveUp()
{
$tc = new TaskCreation($this->container);
$s = new Subtask($this->container);
$p = new Project($this->container);
$this->assertEquals(1, $p->create(array('name' => 'test1')));
$this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
$this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
$this->assertEquals(2, $s->create(array('title' => 'subtask #2', 'task_id' => 1)));
$this->assertEquals(3, $s->create(array('title' => 'subtask #3', 'task_id' => 1)));
$subtask = $s->getById(1);
$this->assertNotEmpty($subtask);
$this->assertEquals(1, $subtask['position']);
$subtask = $s->getById(2);
$this->assertNotEmpty($subtask);
$this->assertEquals(2, $subtask['position']);
$subtask = $s->getById(3);
$this->assertNotEmpty($subtask);
$this->assertEquals(3, $subtask['position']);
$this->assertTrue($s->moveUp(1, 2));
$subtask = $s->getById(1);
$this->assertNotEmpty($subtask);
$this->assertEquals(2, $subtask['position']);
$subtask = $s->getById(2);
$this->assertNotEmpty($subtask);
$this->assertEquals(1, $subtask['position']);
$subtask = $s->getById(3);
$this->assertNotEmpty($subtask);
$this->assertEquals(3, $subtask['position']);
$this->assertFalse($s->moveUp(1, 2));
}
public function testMoveDown()
{
$tc = new TaskCreation($this->container);
$s = new Subtask($this->container);
$p = new Project($this->container);
$this->assertEquals(1, $p->create(array('name' => 'test1')));
$this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
$this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
$this->assertEquals(2, $s->create(array('title' => 'subtask #2', 'task_id' => 1)));
$this->assertEquals(3, $s->create(array('title' => 'subtask #3', 'task_id' => 1)));
$this->assertTrue($s->moveDown(1, 1));
$subtask = $s->getById(1);
$this->assertNotEmpty($subtask);
$this->assertEquals(2, $subtask['position']);
$subtask = $s->getById(2);
$this->assertNotEmpty($subtask);
$this->assertEquals(1, $subtask['position']);
$subtask = $s->getById(3);
$this->assertNotEmpty($subtask);
$this->assertEquals(3, $subtask['position']);
$this->assertFalse($s->moveDown(1, 3));
}
public function testDuplicate()
{
$tc = new TaskCreation($this->container);
@ -53,5 +125,8 @@ class SubTaskTest extends Base
$this->assertEquals(0, $subtasks[0]['user_id']);
$this->assertEquals(0, $subtasks[1]['user_id']);
$this->assertEquals(1, $subtasks[0]['position']);
$this->assertEquals(2, $subtasks[1]['position']);
}
}