From dfd79722270b4f7a6653cb130b6518dcd7bd8c95 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 18 Jul 2015 11:33:51 -0400
Subject: Add new search attribute for swimlane

---
 app/Template/listing/show.php   | 18 ++++++------------
 app/Template/search/results.php | 20 +++++++-------------
 2 files changed, 13 insertions(+), 25 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php
index 06940678..fc8a607b 100644
--- a/app/Template/listing/show.php
+++ b/app/Template/listing/show.php
@@ -10,13 +10,12 @@
         <table class="table-fixed table-small">
             <tr>
                 <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
-                <th class="column-8"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
-                <th class="column-8"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Swimlane'), 'tasks.swimlane_id') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
                 <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
                 <th class="column-10"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
                 <th class="column-10"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Date created'), 'tasks.date_creation') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Date completed'), 'tasks.date_completed') ?></th>
                 <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
             </tr>
             <?php foreach ($paginator->getCollection() as $task): ?>
@@ -24,6 +23,9 @@
                 <td class="task-table color-<?= $task['color_id'] ?>">
                     <?= $this->url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
+                <td>
+                    <?= $this->e($task['swimlane_name'] ?: $task['default_swimlane']) ?>
+                </td>
                 <td>
                     <?= $this->e($task['column_name']) ?>
                 </td>
@@ -43,14 +45,6 @@
                 <td>
                     <?= dt('%B %e, %Y', $task['date_due']) ?>
                 </td>
-                <td>
-                    <?= dt('%B %e, %Y', $task['date_creation']) ?>
-                </td>
-                <td>
-                    <?php if ($task['date_completed']): ?>
-                        <?= dt('%B %e, %Y', $task['date_completed']) ?>
-                    <?php endif ?>
-                </td>
                 <td>
                     <?php if ($task['is_active'] == \Model\Task::STATUS_OPEN): ?>
                         <?= t('Open') ?>
diff --git a/app/Template/search/results.php b/app/Template/search/results.php
index 1d8cc6e2..04cb6a19 100644
--- a/app/Template/search/results.php
+++ b/app/Template/search/results.php
@@ -1,14 +1,13 @@
 <table class="table-fixed table-small">
     <tr>
         <th class="column-8"><?= $paginator->order(t('Project'), 'tasks.project_id') ?></th>
-        <th class="column-8"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
-        <th class="column-8"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
-        <th class="column-8"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
+        <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+        <th class="column-10"><?= $paginator->order(t('Swimlane'), 'tasks.swimlane_id') ?></th>
+        <th class="column-10"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
+        <th class="column-10"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
         <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
         <th class="column-10"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
         <th class="column-10"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
-        <th class="column-10"><?= $paginator->order(t('Date created'), 'tasks.date_creation') ?></th>
-        <th class="column-10"><?= $paginator->order(t('Date completed'), 'tasks.date_completed') ?></th>
         <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
     </tr>
     <?php foreach ($paginator->getCollection() as $task): ?>
@@ -19,6 +18,9 @@
         <td class="task-table color-<?= $task['color_id'] ?>">
             <?= $this->url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
         </td>
+        <td>
+            <?= $this->e($task['swimlane_name'] ?: $task['default_swimlane']) ?>
+        </td>
         <td>
             <?= $this->e($task['column_name']) ?>
         </td>
@@ -38,14 +40,6 @@
         <td>
             <?= dt('%B %e, %Y', $task['date_due']) ?>
         </td>
-        <td>
-            <?= dt('%B %e, %Y', $task['date_creation']) ?>
-        </td>
-        <td>
-            <?php if ($task['date_completed']): ?>
-                <?= dt('%B %e, %Y', $task['date_completed']) ?>
-            <?php endif ?>
-        </td>
         <td>
             <?php if ($task['is_active'] == \Model\Task::STATUS_OPEN): ?>
                 <?= t('Open') ?>
-- 
cgit v1.2.3