From 454f47a94a7039fb9929c68d30b995ee71f7f13f Mon Sep 17 00:00:00 2001
From: Sébastien Kergreis <seb.kerro@gmail.com>
Date: Mon, 23 May 2016 18:24:37 -0500
Subject: Adds task column in 'my tasks' table on dasboard

---
 app/Model/TaskFinder.php         | 4 +++-
 app/Template/dashboard/tasks.php | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index 28ddb88f..f8566bc2 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -73,9 +73,11 @@ class TaskFinder extends Base
                         'tasks.time_estimated',
                         'tasks.is_active',
                         'tasks.creator_id',
-                        'projects.name AS project_name'
+                        'projects.name AS project_name',
+                        'columns.title AS column_title'
                     )
                     ->join(Project::TABLE, 'id', 'project_id')
+                    ->join(Column::TABLE, 'id', 'column_id')
                     ->eq(Task::TABLE.'.owner_id', $user_id)
                     ->eq(Task::TABLE.'.is_active', Task::STATUS_OPEN)
                     ->eq(Project::TABLE.'.is_active', Project::ACTIVE);
diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php
index 71b62572..756bd9b4 100644
--- a/app/Template/dashboard/tasks.php
+++ b/app/Template/dashboard/tasks.php
@@ -11,7 +11,8 @@
             <th><?= $paginator->order(t('Task'), 'title') ?></th>
             <th class="column-5"><?= $paginator->order('Priority', 'tasks.priority') ?></th>
             <th class="column-20"><?= t('Time tracking') ?></th>
-            <th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th>
+            <th class="column-10"><?= $paginator->order(t('Due date'), 'date_due') ?></th>
+            <th class="column-10"><?= $paginator->order(t('Column'), 'column_title') ?></th>
         </tr>
         <?php foreach ($paginator->getCollection() as $task): ?>
         <tr>
@@ -41,6 +42,9 @@
             <td>
                 <?= $this->dt->date($task['date_due']) ?>
             </td>
+            <td>
+                <?= $this->text->e($task['column_title']) ?>
+            </td>
         </tr>
         <?php endforeach ?>
     </table>
-- 
cgit v1.2.3