From 253996901a10918e3207d46839cdfdc90d200e72 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 14 Mar 2015 20:53:33 -0400
Subject: Calculate the time spent based on the timetable

---
 app/Template/task/time_tracking.php | 10 ++++++----
 app/Template/user/timesheet.php     | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/task/time_tracking.php b/app/Template/task/time_tracking.php
index 1dea0f0b..55d33e5e 100644
--- a/app/Template/task/time_tracking.php
+++ b/app/Template/task/time_tracking.php
@@ -6,10 +6,11 @@
 <?php else: ?>
     <table class="table-fixed">
         <tr>
-            <th class="column-20"><?= $subtask_paginator->order(t('User'), 'username') ?></th>
-            <th class="column-30"><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th>
-            <th><?= $subtask_paginator->order(t('Start'), 'start') ?></th>
-            <th><?= $subtask_paginator->order(t('End'), 'end') ?></th>
+            <th class="column-15"><?= $subtask_paginator->order(t('User'), 'username') ?></th>
+            <th><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th>
+            <th class="column-20"><?= $subtask_paginator->order(t('Start'), 'start') ?></th>
+            <th class="column-20"><?= $subtask_paginator->order(t('End'), 'end') ?></th>
+            <th class="column-10"><?= $subtask_paginator->order(t('Time spent'), 'time_spent') ?></th>
         </tr>
         <?php foreach ($subtask_paginator->getCollection() as $record): ?>
         <tr>
@@ -17,6 +18,7 @@
             <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>
+            <td><?= n($record['time_spent']).' '.t('hours') ?></td>
         </tr>
         <?php endforeach ?>
     </table>
diff --git a/app/Template/user/timesheet.php b/app/Template/user/timesheet.php
index 4f052006..3ae84df0 100644
--- a/app/Template/user/timesheet.php
+++ b/app/Template/user/timesheet.php
@@ -8,10 +8,11 @@
 <?php else: ?>
     <table class="table-fixed">
         <tr>
-            <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>
+            <th class="column-25"><?= $subtask_paginator->order(t('Task'), 'task_title') ?></th>
+            <th class="column-25"><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th>
+            <th class="column-20"><?= $subtask_paginator->order(t('Start'), 'start') ?></th>
+            <th class="column-20"><?= $subtask_paginator->order(t('End'), 'end') ?></th>
+            <th class="column-10"><?= $subtask_paginator->order(t('Time spent'), 'time_spent') ?></th>
         </tr>
         <?php foreach ($subtask_paginator->getCollection() as $record): ?>
         <tr>
@@ -19,6 +20,7 @@
             <td><?= $this->a($this->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></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>
+            <td><?= n($record['time_spent']).' '.t('hours') ?></td>
         </tr>
         <?php endforeach ?>
     </table>
-- 
cgit v1.2.3