Show number of tasks for each column across all swimlanes

4 files changed, 17 insertions, 9 deletions

diff --git a/app/Model/Board.php b/app/Model/Board.php
index b1032e90..d3d2703d 100644
--- a/app/Model/Board.php
+++ b/app/Model/Board.php
@@ -252,16 +252,22 @@ class Board extends Base
             $swimlanes[$i]['columns'] = $columns;
             $swimlanes[$i]['nb_columns'] = $nb_columns;
             $swimlanes[$i]['nb_tasks'] = 0;
+            $swimlanes[$i]['nb_swimlanes'] = $ilen;
 
             for ($j = 0; $j < $nb_columns; $j++) {
 
                 $column_id = $columns[$j]['id'];
                 $swimlane_id = $swimlanes[$i]['id'];
 
+                if (! isset($swimlanes[0]['columns'][$j]['nb_column_tasks'])) {
+                    $swimlanes[0]['columns'][$j]['nb_column_tasks'] = 0;
+                }
+
                 $swimlanes[$i]['columns'][$j]['tasks'] = $callback === null ? $this->taskFinder->getTasksByColumnAndSwimlane($project_id, $column_id, $swimlane_id) : $callback($project_id, $column_id, $swimlane_id);
                 $swimlanes[$i]['columns'][$j]['nb_tasks'] = count($swimlanes[$i]['columns'][$j]['tasks']);
                 $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'];
             }
         }
 
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index bfb18a26..de7ca5e6 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -7,7 +7,7 @@
         <!-- column in collapsed mode -->
         <div class="board-column-collapsed">
             <span title="<?= t('Task count') ?>" class="board-column-header-task-count" title="<?= t('Show this column') ?>">
-                <span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>
+                <span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_column_tasks'] ?></span>
             </span>
         </div>
 
@@ -35,13 +35,13 @@
                 </span>
             <?php endif ?>
 
+            <span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count">
+                (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_column_tasks'] ?></span>)
+            </span>
+
             <?php if ($column['task_limit']): ?>
                 <span title="<?= t('Task limit') ?>">
-                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->e($column['task_limit']) ?>)
-                </span>
-            <?php else: ?>
-                <span title="<?= t('Task count') ?>" class="board-column-header-task-count">
-                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>)
+                    (<span id="task-number-column-<?= $column['id'] ?>"><?= $this->e($column['task_limit']) ?></span>)
                 </span>
             <?php endif ?>
         </div>
diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php
index b20426a6..fb9212a7 100644
--- a/app/Template/board/table_container.php
+++ b/app/Template/board/table_container.php
@@ -13,7 +13,6 @@
         >
     <?php endif ?>
 
-    <?php $nb_swimlanes = count($swimlanes) ?>
     <?php foreach ($swimlanes as $index => $swimlane): ?>
         <?php if (empty($swimlane['columns'])): ?>
             <p class="alert alert-error"><?= t('There is no column in your project!') ?></p>
@@ -26,7 +25,7 @@
                 )) ?>
             <?php endif ?>
 
-            <?php if ($nb_swimlanes > 1): ?>
+            <?php if ($swimlane['nb_swimlanes'] > 1): ?>
                 <?= $this->render('board/table_swimlane', array(
                     'project' => $project,
                     'swimlane' => $swimlane,
diff --git a/app/Template/board/table_tasks.php b/app/Template/board/table_tasks.php
index f17e1132..edb4d323 100644
--- a/app/Template/board/table_tasks.php
+++ b/app/Template/board/table_tasks.php
@@ -1,7 +1,10 @@
 <!-- task row -->
 <tr class="board-swimlane swimlane-row-<?= $swimlane['id'] ?>">
     <?php foreach ($swimlane['columns'] as $column): ?>
-        <td class="board-column-<?= $column['id'] ?> <?= $column['task_limit'] && $column['nb_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?>">
+        <td class="
+            board-column-<?= $column['id'] ?>
+            <?= $column['task_limit'] > 0 && $column['nb_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?>
+            ">
 
             <!-- tasks list -->
             <div class="board-task-list board-column-expanded" data-column-id="<?= $column['id'] ?>" data-swimlane-id="<?= $swimlane['id'] ?>" data-task-limit="<?= $column['task_limit'] ?>">