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

Add task time tracking on the dashboard

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-07 21:56:04 -05:00
parent c9cc82eec8
commit 563941c70d
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/TaskFinder.php
View File

@@ -59,6 +59,8 @@ class TaskFinder extends Base
'tasks.date_creation', 'tasks.date_creation',
'tasks.project_id', 'tasks.project_id',
'tasks.color_id', 'tasks.color_id',
'tasks.time_spent',
'tasks.time_estimated',
'projects.name AS project_name' 'projects.name AS project_name'
) )
->join(Project::TABLE, 'id', 'project_id') ->join(Project::TABLE, 'id', 'project_id')

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

@@ -7,6 +7,7 @@
<th class="column-8"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-8"><?= $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-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>
<?php foreach ($paginator->getCollection() as $task): ?> <?php foreach ($paginator->getCollection() as $task): ?>
@@ -20,6 +21,15 @@
<td> <td>
<?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> <?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</td> </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> <td>
<?= dt('%B %e, %Y', $task['date_due']) ?> <?= dt('%B %e, %Y', $task['date_due']) ?>
</td> </td>

4
assets/css/app.css
View File

@@ -1828,12 +1828,12 @@ a.task-board-nobody {
} }
.dashboard-left-column { .dashboard-left-column {
width: 55%; width: 58%;
float: left; float: left;
} }
.dashboard-right-column { .dashboard-right-column {
margin-left: 5%; margin-left: 2%;
width: 40%; width: 40%;
float: left; float: left;
} }

4
assets/css/src/dashboard.css
View File

@@ -7,12 +7,12 @@
} }
.dashboard-left-column { .dashboard-left-column {
width: 55%; width: 58%;
float: left; float: left;
} }
.dashboard-right-column { .dashboard-right-column {
margin-left: 5%; margin-left: 2%;
width: 40%; width: 40%;
float: left; float: left;
} }