diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-04-21 09:08:03 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-04-21 09:08:03 -0400 |
| commit | 2f135170ac9fe33352c68eec826ca11833a5f45c (patch) | |
| tree | faab204ffff8503a1f9441cbda93dc771c75c1ea /app | |
| parent | ea5cd9cda6ae5934346564a55feb5b758664d4fc (diff) | |
| parent | 6a9d5ede8b2c81c6bd67407fc0d8e46016720083 (diff) | |
Merge pull-request #2151
Diffstat (limited to 'app')
| -rw-r--r-- | app/Model/TaskFinder.php | 2 | ||||
| -rw-r--r-- | app/Template/app/tasks.php | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index d406b794..0b2cbb84 100644 --- a/app/Model/TaskFinder.php +++ b/app/Model/TaskFinder.php @@ -35,6 +35,7 @@ class TaskFinder extends Base Task::TABLE.'.date_started', Task::TABLE.'.project_id', Task::TABLE.'.color_id', + Task::TABLE.'.priority', Task::TABLE.'.time_spent', Task::TABLE.'.time_estimated', Project::TABLE.'.name AS project_name', @@ -67,6 +68,7 @@ class TaskFinder extends Base 'tasks.date_creation', 'tasks.project_id', 'tasks.color_id', + 'tasks.priority', 'tasks.time_spent', 'tasks.time_estimated', 'projects.name AS project_name' diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php index d7826fb7..e773bac6 100644 --- a/app/Template/app/tasks.php +++ b/app/Template/app/tasks.php @@ -9,6 +9,7 @@ <th class="column-5"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></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"><?= $paginator->order(t('Due date'), 'date_due') ?></th> </tr> @@ -24,6 +25,11 @@ <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </td> <td> + <?php if ($task['priority'] > 0): ?> + <?= $this->text->e($task['priority'])?> + <?php endif?> + </td> + <td> <?php if (! empty($task['time_spent'])): ?> <strong><?= $this->text->e($task['time_spent']).'h' ?></strong> <?= t('spent') ?> <?php endif ?> |