From efbf679385773e76cbb436691f63e931c17172d4 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 10 Feb 2015 22:10:32 -0500
Subject: Add subtask time tracking in the task view

---
 app/Template/task/sidebar.php       |  5 +++++
 app/Template/task/time_tracking.php | 25 +++++++++++++++++++++++++
 app/Template/user/timesheet.php     |  4 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 app/Template/task/time_tracking.php

(limited to 'app/Template')

diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index acddd52f..e85a1671 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -4,6 +4,11 @@
         <li>
             <?= $this->a(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
+        <?php if ($task['time_estimated'] > 0 || $task['time_spent'] > 0): ?>
+        <li>
+            <?= $this->a(t('Time tracking'), 'task', 'timesheet', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        </li>
+        <?php endif ?>
         <li>
             <?= $this->a(t('Edit the task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
diff --git a/app/Template/task/time_tracking.php b/app/Template/task/time_tracking.php
new file mode 100644
index 00000000..6e86df91
--- /dev/null
+++ b/app/Template/task/time_tracking.php
@@ -0,0 +1,25 @@
+<?= $this->render('task/timesheet', array('task' => $task)) ?>
+
+<h3><?= t('Subtask timesheet') ?></h3>
+<?php if ($subtask_paginator->isEmpty()): ?>
+    <p class="alert"><?= t('There is nothing to show.') ?></p>
+<?php else: ?>
+    <table class="table-fixed">
+        <tr>
+            <th class="column-20"><?= $subtask_paginator->order(t('User'), 'username') ?></th>
+            <th class="column-40"><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th>
+            <th><?= $subtask_paginator->order(t('Start'), 'start') ?></th>
+            <th><?= $subtask_paginator->order(t('End'), 'end') ?></th>
+        </tr>
+        <?php foreach ($subtask_paginator->getCollection() as $record): ?>
+        <tr>
+            <td><?= $this->a($this->e($record['user_fullname'] ?: $record['username']), 'user', 'show', array('user_id' => $record['user_id'])) ?></td>
+            <td><?= t($record['subtask_title']) ?></td>
+            <td><?= dt('%B %e, %Y at %k:%M %p', $record['start']) ?></td>
+            <td><?= dt('%B %e, %Y at %k:%M %p', $record['end']) ?></td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= $subtask_paginator ?>
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/user/timesheet.php b/app/Template/user/timesheet.php
index fb7e51f0..4f052006 100644
--- a/app/Template/user/timesheet.php
+++ b/app/Template/user/timesheet.php
@@ -8,8 +8,8 @@
 <?php else: ?>
     <table class="table-fixed">
         <tr>
-            <th class="column-20"><?= $subtask_paginator->order('Task', 'task_title') ?></th>
-            <th class="column-20"><?= $subtask_paginator->order('Subtask', 'subtask_title') ?></th>
+            <th class="column-20"><?= $subtask_paginator->order(t('Task'), 'task_title') ?></th>
+            <th class="column-20"><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th>
             <th><?= $subtask_paginator->order(t('Start'), 'start') ?></th>
             <th><?= $subtask_paginator->order(t('End'), 'end') ?></th>
         </tr>
-- 
cgit v1.2.3