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

Merge pull-request #2151

Browse Source
This commit is contained in:
Frederic Guillot
2016-04-21 09:08:03 -04:00
parent ea5cd9cda6 6a9d5ede8b
commit 2f135170ac
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/TaskFinder.php
View File

@@ -35,6 +35,7 @@ class TaskFinder extends Base
Task::TABLE.'.date_started', Task::TABLE.'.date_started',
Task::TABLE.'.project_id', Task::TABLE.'.project_id',
Task::TABLE.'.color_id', Task::TABLE.'.color_id',
Task::TABLE.'.priority',
Task::TABLE.'.time_spent', Task::TABLE.'.time_spent',
Task::TABLE.'.time_estimated', Task::TABLE.'.time_estimated',
Project::TABLE.'.name AS project_name', Project::TABLE.'.name AS project_name',
@@ -67,6 +68,7 @@ class TaskFinder extends Base
'tasks.date_creation', 'tasks.date_creation',
'tasks.project_id', 'tasks.project_id',
'tasks.color_id', 'tasks.color_id',
'tasks.priority',
'tasks.time_spent', 'tasks.time_spent',
'tasks.time_estimated', 'tasks.time_estimated',
'projects.name AS project_name' 'projects.name AS project_name'

6
app/Template/app/tasks.php
View File

@@ -9,6 +9,7 @@
<th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th>
<th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th> <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
<th><?= $paginator->order(t('Task'), 'title') ?></th> <th><?= $paginator->order(t('Task'), 'title') ?></th>
<th class="column-5"><?= $paginator->order('Priority', 'tasks.priority') ?></th>
<th class="column-20"><?= t('Time tracking') ?></th> <th class="column-20"><?= t('Time tracking') ?></th>
<th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th> <th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th>
</tr> </tr>
@@ -23,6 +24,11 @@
<td> <td>
<?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</td> </td>
<td>
<?php if ($task['priority'] > 0): ?>
<?= $this->text->e($task['priority'])?>
<?php endif?>
</td>
<td> <td>
<?php if (! empty($task['time_spent'])): ?> <?php if (! empty($task['time_spent'])): ?>
<strong><?= $this->text->e($task['time_spent']).'h' ?></strong> <?= t('spent') ?> <strong><?= $this->text->e($task['time_spent']).'h' ?></strong> <?= t('spent') ?>