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

Close all subtasks when a task is closed

Browse Source
This commit is contained in:
Frederic Guillot
2015-06-20 16:50:52 -04:00
parent a409bf3ff4
commit b6b733b22f
5 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Model/Subtask.php
View File

@@ -227,6 +227,18 @@ class Subtask extends Base
return $result; return $result;
} }
/**
* Close all subtasks of a task
*
* @access public
* @param integer $task_id
* @return boolean
*/
public function closeAll($task_id)
{
return $this->db->table(self::TABLE)->eq('task_id', $task_id)->update(array('status' => self::STATUS_DONE));
}
/** /**
* Get subtasks with consecutive positions * Get subtasks with consecutive positions
* *

3
app/Model/TaskStatus.php
View File

@@ -62,6 +62,7 @@ class TaskStatus extends Base
*/ */
public function close($task_id) public function close($task_id)
{ {
$this->subtask->closeAll($task_id);
return $this->changeStatus($task_id, Task::STATUS_CLOSED, time(), Task::EVENT_CLOSE); return $this->changeStatus($task_id, Task::STATUS_CLOSED, time(), Task::EVENT_CLOSE);
} }
@@ -113,7 +114,7 @@ class TaskStatus extends Base
} }
/** /**
* Check the status of task * Check the status of a task
* *
* @access private * @access private
* @param integer $task_id Task id * @param integer $task_id Task id

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

@@ -4,7 +4,7 @@
<div class="confirm"> <div class="confirm">
<p class="alert alert-info"> <p class="alert alert-info">
<?= t('Do you really want to close this task: "%s"?', $this->e($task['title'])) ?> <?= t('Do you really want to close the task "%s" as well as all subtasks?', $this->e($task['title'])) ?>
</p> </p>
<div class="form-actions"> <div class="form-actions">

22
tests/units/SubtaskTest.php
View File

@@ -11,6 +11,28 @@ use Model\User;
class SubTaskTest extends Base class SubTaskTest extends Base
{ {
public function testCloseAll()
{
$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->assertTrue($s->closeAll(1));
$subtasks = $s->getAll(1);
$this->assertNotEmpty($subtasks);
foreach ($subtasks as $subtask) {
$this->assertEquals(Subtask::STATUS_DONE, $subtask['status']);
}
}
public function testMoveUp() public function testMoveUp()
{ {
$tc = new TaskCreation($this->container); $tc = new TaskCreation($this->container);

24
tests/units/TaskStatusTest.php
View File

@@ -2,6 +2,7 @@
require_once __DIR__.'/Base.php'; require_once __DIR__.'/Base.php';
use Model\Subtask;
use Model\Task; use Model\Task;
use Model\TaskCreation; use Model\TaskCreation;
use Model\TaskFinder; use Model\TaskFinder;
@@ -74,4 +75,27 @@ class TaskStatusTest extends Base
$this->assertArrayHasKey('task_id', $event); $this->assertArrayHasKey('task_id', $event);
$this->assertNotEmpty($event['task_id']); $this->assertNotEmpty($event['task_id']);
} }
public function testThatAllSubtasksAreClosed()
{
$ts = new TaskStatus($this->container);
$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->assertTrue($ts->close(1));
$subtasks = $s->getAll(1);
$this->assertNotEmpty($subtasks);
foreach ($subtasks as $subtask) {
$this->assertEquals(Subtask::STATUS_DONE, $subtask['status']);
}
}
} }