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

Merge pull-request #2320

Browse Source
This commit is contained in:
Frederic Guillot
2016-06-09 21:39:27 -04:00
parent 18385b09d6 a5b35954db
commit 3c394fe92e
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/ProjectModel.php
View File

@@ -294,10 +294,12 @@ class ProjectModel extends Base
public function getColumnStats(array &$project) public function getColumnStats(array &$project)
{ {
$project['columns'] = $this->columnModel->getAll($project['id']); $project['columns'] = $this->columnModel->getAll($project['id']);
$project['nb_active_tasks'] = 0;
$stats = $this->boardModel->getColumnStats($project['id']); $stats = $this->boardModel->getColumnStats($project['id']);
foreach ($project['columns'] as &$column) { foreach ($project['columns'] as &$column) {
$column['nb_tasks'] = isset($stats[$column['id']]) ? $stats[$column['id']] : 0; $column['nb_tasks'] = isset($stats[$column['id']]) ? $stats[$column['id']] : 0;
$project['nb_active_tasks'] += $column['nb_tasks'];
} }
return $project; return $project;

5
app/Template/dashboard/projects.php
View File

@@ -9,6 +9,7 @@
<th class="column-5"><?= $paginator->order('Id', 'id') ?></th> <th class="column-5"><?= $paginator->order('Id', 'id') ?></th>
<th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', 'is_private') ?></th> <th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', 'is_private') ?></th>
<th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\ProjectModel::TABLE.'.name') ?></th> <th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\ProjectModel::TABLE.'.name') ?></th>
<th class="column-10"><?= t('Tasks') ?></th>
<th><?= t('Columns') ?></th> <th><?= t('Columns') ?></th>
</tr> </tr>
<?php foreach ($paginator->getCollection() as $project): ?> <?php foreach ($paginator->getCollection() as $project): ?>
@@ -36,12 +37,16 @@
</span> </span>
<?php endif ?> <?php endif ?>
</td> </td>
<td>
<?= $project['nb_active_tasks'] ?>
</td>
<td class="dashboard-project-stats"> <td class="dashboard-project-stats">
<?php foreach ($project['columns'] as $column): ?> <?php foreach ($project['columns'] as $column): ?>
<strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong> <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
<span><?= $this->text->e($column['title']) ?></span> <span><?= $this->text->e($column['title']) ?></span>
<?php endforeach ?> <?php endforeach ?>
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>
</table> </table>