From 2d890cbc712371f17ba4bbceb02af3c5ba04e6da Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 7 Feb 2015 19:39:39 -0500
Subject: Update task time tracking based on subtask time tracking

---
 app/Template/task/show.php      | 2 +-
 app/Template/task/timesheet.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index 3bc6796f..b8243cc6 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -2,6 +2,6 @@
 <?= $this->render('task/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
 <?= $this->render('task/show_description', array('task' => $task)) ?>
 <?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?>
-<?= $this->render('task/timesheet', array('timesheet' => $timesheet)) ?>
+<?= $this->render('task/timesheet', array('task' => $task)) ?>
 <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?>
 <?= $this->render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>
\ No newline at end of file
diff --git a/app/Template/task/timesheet.php b/app/Template/task/timesheet.php
index fa76b84d..0210be7e 100644
--- a/app/Template/task/timesheet.php
+++ b/app/Template/task/timesheet.php
@@ -1,13 +1,13 @@
-<?php if ($timesheet['time_estimated'] > 0 || $timesheet['time_spent'] > 0): ?>
+<?php if ($task['time_estimated'] > 0 || $task['time_spent'] > 0): ?>
 
 <div class="page-header">
     <h2><?= t('Time tracking') ?></h2>
 </div>
 
 <ul class="listing">
-    <li><?= t('Estimate:') ?> <strong><?= $this->e($timesheet['time_estimated']) ?></strong> <?= t('hours') ?></li>
-    <li><?= t('Spent:') ?> <strong><?= $this->e($timesheet['time_spent']) ?></strong> <?= t('hours') ?></li>
-    <li><?= t('Remaining:') ?> <strong><?= $this->e($timesheet['time_remaining']) ?></strong> <?= t('hours') ?></li>
+    <li><?= t('Estimate:') ?> <strong><?= $this->e($task['time_estimated']) ?></strong> <?= t('hours') ?></li>
+    <li><?= t('Spent:') ?> <strong><?= $this->e($task['time_spent']) ?></strong> <?= t('hours') ?></li>
+    <li><?= t('Remaining:') ?> <strong><?= $this->e($task['time_estimated'] - $task['time_spent']) ?></strong> <?= t('hours') ?></li>
 </ul>
 
 <?php endif ?>
\ No newline at end of file
-- 
cgit v1.2.3