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

The task limit should consider all open tasks (not only filtered tasks)

Browse Source 
Fixes #4291
This commit is contained in:
Timo
2019-10-02 05:33:45 +02:00
committed by Frédéric Guillot
parent 91194776cf
commit 219c933832
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Formatter/BoardFormatter.php
View File

@@ -44,7 +44,7 @@ class BoardFormatter extends BaseFormatter implements FormatterInterface
public function format() public function format()
{ {
$swimlanes = $this->swimlaneModel->getAllByStatus($this->projectId, SwimlaneModel::ACTIVE); $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)) { if (empty($swimlanes) || empty($columns)) {
return array(); return array();

4
app/Formatter/BoardSwimlaneFormatter.php
View File

@@ -101,6 +101,8 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface
foreach ($swimlane['columns'] as $columnIndex => &$column) { foreach ($swimlane['columns'] as $columnIndex => &$column) {
$column['column_nb_tasks'] = $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks']; $column['column_nb_tasks'] = $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks'];
$column['column_nb_score'] = $this->swimlanes[0]['columns'][$columnIndex]['column_score']; $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 * @access protected
* @param array $columns * @param array $columns

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

@@ -99,12 +99,12 @@
<?php endif ?> <?php endif ?>
</span> </span>
<?php if (! empty($column['column_nb_tasks'])): ?> <?php if (! empty($column['column_nb_open_tasks'])): ?>
<span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count"> <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count">
<?php if ($column['task_limit'] > 0): ?> <?php if ($column['task_limit'] > 0): ?>
(<span><?= $column['column_nb_tasks'] ?></span> / <span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>) (<span><?= $column['column_nb_open_tasks'] ?></span> / <span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>)
<?php else: ?> <?php else: ?>
(<span><?= $column['column_nb_tasks'] ?></span>) (<span><?= $column['column_nb_open_tasks'] ?></span>)
<?php endif ?> <?php endif ?>
</span> </span>
<?php endif ?> <?php endif ?>

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

@@ -3,7 +3,7 @@
<?php foreach ($swimlane['columns'] as $column): ?> <?php foreach ($swimlane['columns'] as $column): ?>
<td class=" <td class="
board-column-<?= $column['id'] ?> board-column-<?= $column['id'] ?>
<?= $column['task_limit'] > 0 && $column['column_nb_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?> <?= $column['task_limit'] > 0 && $column['column_nb_open_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?>
" "
> >