From 98798c5b76c6b1d24f94666a07e92f28f30a5dc0 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 25 Aug 2016 21:15:41 -0400
Subject: Show both time spent and estimated on the board

---
 ChangeLog                          | 1 +
 app/Template/board/task_footer.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e9edd49..f5aaaf4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ New features:
 
 Improvements:
 
+* Show both time spent and estimated on the board
 * Store board collapsed mode user preference in the database
 * Store comment sorting direction in the database
 * Avoid tags overlapping on the board
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index bc34363c..650fe559 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -81,8 +81,10 @@
         </span>
     <?php endif ?>
 
-    <?php if (! empty($task['time_estimated'])): ?>
-        <span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->text->e($task['time_estimated']).'h' ?></span>
+    <?php if (! empty($task['time_estimated']) || ! empty($task['time_spent'])): ?>
+        <span class="task-time-estimated" title="<?= t('Time spent and estimated') ?>">
+            <?= $this->text->e($task['time_spent']) ?>/<?= $this->text->e($task['time_estimated']) ?>h
+        </span>
     <?php endif ?>
 
     <?php if ($task['is_milestone'] == 1): ?>
-- 
cgit v1.2.3