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

Add collapsible swimlanes (merge and improve pull-request #565)

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-01 11:05:07 -05:00
parent 9a98013736
commit be4e90e319
8 changed files with 139 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Board.php
View File

@@ -243,10 +243,12 @@ class Board extends Base
$swimlanes[$i]['columns'] = $columns;
$swimlanes[$i]['nb_columns'] = $nb_columns;
$swimlanes[$i]['nb_tasks'] = 0;
for ($j = 0; $j < $nb_columns; $j++) {
$swimlanes[$i]['columns'][$j]['tasks'] = $this->taskFinder->getTasksByColumnAndSwimlane($project_id, $columns[$j]['id'], $swimlanes[$i]['id']);
$swimlanes[$i]['columns'][$j]['nb_tasks'] = count($swimlanes[$i]['columns'][$j]['tasks']);
$swimlanes[$i]['nb_tasks'] += $swimlanes[$i]['columns'][$j]['nb_tasks'];
}
}

23
app/Template/board/swimlane.php
View File

@@ -1,6 +1,20 @@
<tr>
<?php if (! $hide_swimlane): ?>
<td width="10%"></td>
<th>
<?php if ($swimlane['nb_tasks'] > 0): ?>
<a href="#" class="board-swimlane-toggle" data-swimlane-id="<?= $swimlane['id'] ?>">
<i class="fa fa-minus-circle hide-icon-swimlane-<?= $swimlane['id'] ?>"></i>
<i class="fa fa-plus-circle show-icon-swimlane-<?= $swimlane['id'] ?>" style="display: none"></i>
</a>
<?php endif ?>
<?= $this->e($swimlane['name']) ?>
<span title="<?= t('Task count') ?>" class="task-count">
(<span><?= $swimlane['nb_tasks'] ?></span>)
</span>
</th>
<?php endif ?>
<?php foreach ($swimlane['columns'] as $column): ?>
@@ -25,11 +39,10 @@
</th>
<?php endforeach ?>
</tr>
<tr>
<tr class="swimlane-row-<?= $swimlane['id'] ?>">
<?php if (! $hide_swimlane): ?>
<th class="board-swimlane-title">
<?= $this->e($swimlane['name']) ?>
</th>
<th></th>
<?php endif ?>
<?php foreach ($swimlane['columns'] as $column): ?>