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

Show complexity sum across all swimlanes

This commit is contained in:
Frederic Guillot 2015-09-26 20:58:13 -04:00
parent 6c03925f23
commit 0b1da8d61c
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Board.php
View File

@ -261,6 +261,7 @@ class Board extends Base
if (! isset($swimlanes[0]['columns'][$j]['nb_column_tasks'])) {
$swimlanes[0]['columns'][$j]['nb_column_tasks'] = 0;
$swimlanes[0]['columns'][$j]['total_score'] = 0;
}
$swimlanes[$i]['columns'][$j]['tasks'] = $callback === null ? $this->taskFinder->getTasksByColumnAndSwimlane($project_id, $column_id, $swimlane_id) : $callback($project_id, $column_id, $swimlane_id);
@ -268,6 +269,7 @@ class Board extends Base
$swimlanes[$i]['columns'][$j]['score'] = $this->getColumnSum($swimlanes[$i]['columns'][$j]['tasks'], 'score');
$swimlanes[$i]['nb_tasks'] += $swimlanes[$i]['columns'][$j]['nb_tasks'];
$swimlanes[0]['columns'][$j]['nb_column_tasks'] += $swimlanes[$i]['columns'][$j]['nb_tasks'];
$swimlanes[0]['columns'][$j]['total_score'] += $swimlanes[$i]['columns'][$j]['score'];
}
}

2
app/Template/board/table_column.php
View File

@ -31,7 +31,7 @@
<?php if (! empty($column['score'])): ?>
<span class="pull-right" title="<?= t('Score') ?>">
<?= $column['score'] ?>&nbsp;
<?= $column['total_score'] ?>
</span>
<?php endif ?>

38
tests/units/Model/BoardTest.php
View File

@ -54,11 +54,15 @@ class BoardTest extends Base
$board = $b->getBoard(1);
$this->assertNotEmpty($board);
$this->assertEquals(1, count($board));
$this->assertEquals(5, count($board[0]));
$this->assertTrue(array_key_exists('name', $board[0]));
$this->assertTrue(array_key_exists('columns', $board[0]));
$this->assertTrue(array_key_exists('tasks', $board[0]['columns'][2]));
$this->assertTrue(array_key_exists('title', $board[0]['columns'][2]));
$this->assertEquals(6, count($board[0]));
$this->assertArrayHasKey('name', $board[0]);
$this->assertArrayHasKey('nb_tasks', $board[0]);
$this->assertArrayHasKey('columns', $board[0]);
$this->assertArrayHasKey('tasks', $board[0]['columns'][2]);
$this->assertArrayHasKey('nb_tasks', $board[0]['columns'][2]);
$this->assertArrayHasKey('title', $board[0]['columns'][2]);
$this->assertArrayHasKey('nb_column_tasks', $board[0]['columns'][0]);
$this->assertArrayHasKey('total_score', $board[0]['columns'][0]);
}
public function testGetBoardWithSwimlane()
@ -75,18 +79,26 @@ class BoardTest extends Base
$this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 3)));
$this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 2, 'swimlane_id' => 1)));
$this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 3)));
$this->assertEquals(5, $tc->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 4)));
$this->assertEquals(6, $tc->create(array('title' => 'Task #6', 'project_id' => 1, 'column_id' => 4, 'swimlane_id' => 1)));
$this->assertEquals(5, $tc->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 4, 'score' => 2)));
$this->assertEquals(6, $tc->create(array('title' => 'Task #6', 'project_id' => 1, 'column_id' => 4, 'score' => 3, 'swimlane_id' => 1)));
$board = $b->getBoard(1);
$this->assertNotEmpty($board);
$this->assertEquals(2, count($board));
$this->assertEquals(5, count($board[0]));
$this->assertTrue(array_key_exists('nb_tasks', $board[0]));
$this->assertTrue(array_key_exists('name', $board[0]));
$this->assertTrue(array_key_exists('columns', $board[0]));
$this->assertTrue(array_key_exists('tasks', $board[0]['columns'][2]));
$this->assertTrue(array_key_exists('title', $board[0]['columns'][2]));
$this->assertEquals(6, count($board[0]));
$this->assertArrayHasKey('name', $board[0]);
$this->assertArrayHasKey('nb_tasks', $board[0]);
$this->assertArrayHasKey('columns', $board[0]);
$this->assertArrayHasKey('tasks', $board[0]['columns'][2]);
$this->assertArrayHasKey('nb_tasks', $board[0]['columns'][2]);
$this->assertArrayHasKey('title', $board[0]['columns'][2]);
$this->assertArrayHasKey('nb_column_tasks', $board[0]['columns'][0]);
$this->assertArrayNotHasKey('nb_column_tasks', $board[1]['columns'][0]);
$this->assertArrayNotHasKey('total_score', $board[1]['columns'][0]);
$this->assertArrayHasKey('score', $board[0]['columns'][3]);
$this->assertArrayHasKey('total_score', $board[0]['columns'][3]);
$this->assertEquals(2, $board[0]['columns'][3]['score']);
$this->assertEquals(5, $board[0]['columns'][3]['total_score']);
$task = $tf->getById(1);
$this->assertEquals(1, $task['id']);