diff options
| -rw-r--r-- | app/Model/TaskFinder.php | 2 | ||||
| -rw-r--r-- | app/Template/app/tasks.php | 10 | ||||
| -rw-r--r-- | assets/css/app.css | 4 | ||||
| -rw-r--r-- | assets/css/src/dashboard.css | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index 42f2f273..4ed196ef 100644 --- a/app/Model/TaskFinder.php +++ b/app/Model/TaskFinder.php @@ -59,6 +59,8 @@ class TaskFinder extends Base 'tasks.date_creation', 'tasks.project_id', 'tasks.color_id', + 'tasks.time_spent', + 'tasks.time_estimated', 'projects.name AS project_name' ) ->join(Project::TABLE, 'id', 'project_id') diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php index 37843af5..9987ff48 100644 --- a/app/Template/app/tasks.php +++ b/app/Template/app/tasks.php @@ -7,6 +7,7 @@ <th class="column-8"><?= $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-20"><?= t('Time tracking') ?></th> <th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th> </tr> <?php foreach ($paginator->getCollection() as $task): ?> @@ -21,6 +22,15 @@ <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </td> <td> + <?php if (! empty($task['time_spent'])): ?> + <strong><?= $this->e($task['time_spent']).'h' ?></strong> <?= t('spent') ?> + <?php endif ?> + + <?php if (! empty($task['time_estimated'])): ?> + <strong><?= $this->e($task['time_estimated']).'h' ?></strong> <?= t('estimated') ?> + <?php endif ?> + </td> + <td> <?= dt('%B %e, %Y', $task['date_due']) ?> </td> </tr> diff --git a/assets/css/app.css b/assets/css/app.css index 6c675ccd..b43531c4 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1828,12 +1828,12 @@ a.task-board-nobody { } .dashboard-left-column { - width: 55%; + width: 58%; float: left; } .dashboard-right-column { - margin-left: 5%; + margin-left: 2%; width: 40%; float: left; } diff --git a/assets/css/src/dashboard.css b/assets/css/src/dashboard.css index 8d0897b4..9044aa43 100644 --- a/assets/css/src/dashboard.css +++ b/assets/css/src/dashboard.css @@ -7,12 +7,12 @@ } .dashboard-left-column { - width: 55%; + width: 58%; float: left; } .dashboard-right-column { - margin-left: 5%; + margin-left: 2%; width: 40%; float: left; } |