summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-09-26 20:58:13 -0400
committerFrederic Guillot <fred@kanboard.net>2015-09-26 20:58:13 -0400
commit0b1da8d61c82d46ef54c3d7b699694baaeed83cf (patch)
treef77d64ac26757466cac730347f646fd828398b56 /app
parent6c03925f23a91722471f33d3561543f4180f2b42 (diff)
Show complexity sum across all swimlanes
Diffstat (limited to 'app')
-rw-r--r--app/Model/Board.php2
-rw-r--r--app/Template/board/table_column.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/Model/Board.php b/app/Model/Board.php
index d3d2703d..0e2cbaaa 100644
--- a/app/Model/Board.php
+++ b/app/Model/Board.php
@@ -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'];
}
}
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index de7ca5e6..da8db52d 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -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 ?>