Merge pull-request #907

3 files changed, 10 insertions, 0 deletions

diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index 327b480f..234101ec 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -111,6 +111,7 @@ class TaskFinder extends Base
                 'tasks.recurrence_basedate',
                 'tasks.recurrence_parent',
                 'tasks.recurrence_child',
+                'tasks.time_estimated',
                 'users.username AS assignee_username',
                 'users.name AS assignee_name'
             )
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 5945d5af..e191dca7 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -58,4 +58,8 @@
     <?php if ($task['score']): ?>
         <span class="task-score"><?= $this->e($task['score']) ?></span>
     <?php endif ?>
+
+    <?php if (! empty($task['time_estimated'])): ?>
+        <strong><?= $this->e($task['time_estimated']).'h' ?> <?= t('estimated') ?></strong>
+    <?php endif ?>
 </div>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index f688585a..7a99371f 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -9,6 +9,11 @@
             <strong><?= t('Reference: %s', $task['reference']) ?></strong>
         </li>
         <?php endif ?>
+        <?php if ($task['swimlane_id']): ?>
+        <li>
+            <?= t('Swimlane: %s ', $this->swimlane->getNameById($task['swimlane_id'])) ?>
+        </li>
+        <?php endif ?>
         <li>
             <?= dt('Created on %B %e, %Y at %k:%M %p', $task['date_creation']) ?>
         </li>