[MediaWiki-commits] [Gerrit] adds default task sort by priority desc - change (phabricator...Sprint)

[Christopher Johnson (WMDE) (Code Review)]

Christopher Johnson (WMDE) has submitted this change and it was merged.

Change subject: adds default task sort by priority desc
......................................................................


adds default task sort by priority desc

adds epoch sort key for create and update dates

Change-Id: I846333e5958144d7998ac61a70cc6ed01e2283e7
---
M src/view/TasksTableView.php
1 file changed, 37 insertions(+), 13 deletions(-)

Approvals:
  Christopher Johnson (WMDE): Verified; Looks good to me, approved



diff --git a/src/view/TasksTableView.php b/src/view/TasksTableView.php
index b91f4fd..573615f 100644
--- a/src/view/TasksTableView.php
+++ b/src/view/TasksTableView.php
@@ -43,9 +43,12 @@
         ->setHeaders(
             array(
                 pht('Task'),
+                pht('Epoch Created'),
                 pht('Date Created'),
+                pht('Epoch Updated'),
                 pht('Last Update'),
                 pht('Assigned to'),
+                pht('NumPriority'),
                 pht('Priority'),
                 pht('Points'),
                 pht('Status'),
@@ -57,14 +60,30 @@
         $reverse,
         array(
             'Task',
+            'Epoch Created',
             'Date Created',
+            'Epoch Updated',
             'Last Update',
             'Assigned to',
+            'NumPriority',
             'Priority',
             'Points',
             'Status'
         )
     );
+    $table->setColumnVisibility(
+        array(
+            true,
+            false,
+            true,
+            false,
+            true,
+            true,
+            false,
+            true,
+            true,
+            true,
+        ));
 
     $box = id(new PHUIObjectBoxView())
         ->setHeaderText(pht('Tasks in this Sprint'))
@@ -111,8 +130,8 @@
       }
 
       $row = $this->addTaskToTree($output, $task, $tasks, $map, $handles);
-      list ($task, $created, $last_update, $assigned_to, $priority,$points, 
$status) = $row[0];
-      $row['sort'] = $this->setSortOrder($row, $order, $task, $created, 
$last_update, $assigned_to, $priority,$points, $status);
+      list ($task, $cdate, $date_created, $udate, $last_update, $owner_link, 
$numpriority, $priority, $points, $status) = $row[0];
+      $row['sort'] = $this->setSortOrder($row, $order, $task, $cdate, $udate, 
$owner_link, $numpriority, $points, $status);
       $rows[] = $row;
     }
     $rows = isort($rows, 'sort');
@@ -128,34 +147,31 @@
     return $rows;
   }
 
-  /**
-   * @param string $priority
-   * @param string $points
-   */
-  private function setSortOrder ($row, $order, $task, $created, $last_update, 
$assigned_to, $priority,
+  private function setSortOrder ($row, $order, $task, $cdate, $udate, 
$owner_link, $numpriority,
                                  $points, $status) {
     switch ($order) {
       case 'Task':
         $row['sort'] = $task;
         break;
       case 'Date Created':
-        $row['sort'] = $created;
+        $row['sort'] = $cdate;
         break;
-      case 'Date Modified':
-        $row['sort'] = $last_update;
+      case 'Last Update':
+        $row['sort'] = $udate;
         break;
       case 'Assigned to':
-        $row['sort'] = $assigned_to;
+        $row['sort'] = $owner_link;
         break;
       case 'Priority':
-        $row['sort'] = $priority;
+        $row['sort'] = $numpriority;
         break;
       case 'Points':
         $row['sort'] = $points;
         break;
       case 'Status':
-      default:
         $row['sort'] = $status;
+      default:
+        $row['sort'] = -$numpriority;
         break;
     }
     return $row['sort'];
@@ -223,6 +239,10 @@
     return $priority_name->getTaskPriorityName($task->getPriority());
   }
 
+  private function getPriority($task) {
+    return $task->getPriority();
+  }
+
   private function addTaskToTree($output, $task, $tasks, $map, $handles, 
$depth = 0) {
     static $included = array();
 
@@ -242,6 +262,7 @@
     }
 
     $owner_link = $this->setOwnerLink($handles, $task);
+    $priority = $this->getPriority($task);
     $priority_name = $this->getPriorityName($task);
 
     // Build the row
@@ -257,9 +278,12 @@
                 $task->getMonogram() . ': ' . $task->getTitle()
             ) . ($repeat ? '&nbsp;&nbsp;<em title="This task is a child of 
more than one task in this list. Children are only shown on ' .
                 'the first occurance">[Repeat]</em>' : '')),
+        $cdate,
         $date_created,
+        $udate,
         $last_updated,
         $owner_link,
+        $priority,
         $priority_name,
         $points,
         $status,

-- 
To view, visit https://gerrit.wikimedia.org/r/178187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I846333e5958144d7998ac61a70cc6ed01e2283e7
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
Gerrit-Reviewer: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits