diff --git a/app/Formatter/BoardFormatter.php b/app/Formatter/BoardFormatter.php index a43790b05..30e335f86 100644 --- a/app/Formatter/BoardFormatter.php +++ b/app/Formatter/BoardFormatter.php @@ -44,7 +44,7 @@ class BoardFormatter extends BaseFormatter implements FormatterInterface public function format() { $swimlanes = $this->swimlaneModel->getAllByStatus($this->projectId, SwimlaneModel::ACTIVE); - $columns = $this->columnModel->getAll($this->projectId); + $columns = $this->columnModel->getAllWithTaskCount($this->projectId); if (empty($swimlanes) || empty($columns)) { return array(); diff --git a/app/Formatter/BoardSwimlaneFormatter.php b/app/Formatter/BoardSwimlaneFormatter.php index c2f5a3b51..dbc2190fb 100644 --- a/app/Formatter/BoardSwimlaneFormatter.php +++ b/app/Formatter/BoardSwimlaneFormatter.php @@ -101,6 +101,8 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface foreach ($swimlane['columns'] as $columnIndex => &$column) { $column['column_nb_tasks'] = $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks']; $column['column_nb_score'] = $this->swimlanes[0]['columns'][$columnIndex]['column_score']; + // add number of open tasks to each column, ignoring the current filter + $column['column_nb_open_tasks'] = $this->columns[array_search($column['id'], array_column($this->columns, 'id'))]['nb_open_tasks']; } } @@ -108,7 +110,7 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface } /** - * Calculate stats for each column acrosss all swimlanes + * Calculate stats for each column across all swimlanes * * @access protected * @param array $columns diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index 0ede0db3e..b1c361b23 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -99,12 +99,12 @@ - + 0): ?> - (= $column['column_nb_tasks'] ?> / = $this->text->e($column['task_limit']) ?>) + (= $column['column_nb_open_tasks'] ?> / = $this->text->e($column['task_limit']) ?>) - (= $column['column_nb_tasks'] ?>) + (= $column['column_nb_open_tasks'] ?>) diff --git a/app/Template/board/table_tasks.php b/app/Template/board/table_tasks.php index 82e90bc93..1b846c731 100644 --- a/app/Template/board/table_tasks.php +++ b/app/Template/board/table_tasks.php @@ -3,7 +3,7 @@