From 3d0dffd995d4c8aaa749b8f5e7ace6c43714b3d4 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Sun, 6 Jan 2013 02:03:30 +0000
Subject: [PATCH]  * code for task#1043.

---
 module/my/control.php        | 19 +++++++++++--------
 module/my/view/todo.html.php | 18 +++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index e2d82ef9eb..f1cfa89a92 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -68,7 +68,7 @@ class my extends control
      * @access public
      * @return void
      */
-    public function todo($type = 'today', $account = '', $status = 'all', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function todo($type = 'today', $account = '', $status = 'all', $orderBy="date, status, begin", $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
         $uri = $this->app->getURI(true);
@@ -85,13 +85,16 @@ class my extends control
         $this->view->position[]    = $this->lang->my->todo;
 
         /* Assign. */
-        $this->view->dates   = $this->loadModel('todo')->buildDateList();
-        $this->view->todos   = $this->todo->getList($type, $account, $status, 0, $pager);
-        $this->view->date    = (int)$type == 0 ? date(DT_DATE1) : date(DT_DATE1, strtotime($type));
-        $this->view->type    = is_numeric($type) ? 'bydate' : $type;
-        $this->view->status  = $status;
-        $this->view->account = $this->app->user->account;
-        $this->view->pager   = $pager;
+        $this->view->dates        = $this->loadModel('todo')->buildDateList();
+        $this->view->todos        = $this->todo->getList($type, $account, $status, 0, $pager, $orderBy);
+        $this->view->date         = (int)$type == 0 ? date(DT_DATE1) : date(DT_DATE1, strtotime($type));
+        $this->view->type         = is_numeric($type) ? 'bydate' : $type;
+        $this->view->recTotal     = $recTotal;
+        $this->view->recPerPage   = $recPerPage;
+        $this->view->status       = $status;
+        $this->view->account      = $this->app->user->account;
+        $this->view->orderBy      = $orderBy;
+        $this->view->pager        = $pager;
         $this->view->importFuture = ($type != 'today');
 
         $this->display();
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index ed75247661..839e0af349 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<?php include '../../common/view/tablesorter.html.php';?>
 <form method='post' id='todoform'>
   <div id='featurebar'>
     <div class='f-left'>
@@ -53,16 +52,17 @@
     </div>
   </div>
   <table class='table-1 tablesorter'>
+    <?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
     <thead>
     <tr class='colhead'>
-      <th class='w-id'><?php echo $lang->idAB;?></th>
-      <th class='w-date'><?php echo $lang->todo->date;?></th>
-      <th class='w-type'><?php echo $lang->todo->type;?></th>
-      <th class='w-pri'><?php echo $lang->priAB;?></th>
-      <th><?php echo $lang->todo->name;?></th>
-      <th class='w-hour'><?php echo $lang->todo->beginAB;?></th>
-      <th class='w-hour'><?php echo $lang->todo->endAB;?></th>
-      <th class='w-status'><?php echo $lang->todo->status;?></th>
+      <th class='w-id'>  <?php common::printOrderLink('id',    $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-date'><?php common::printOrderLink('date',  $orderBy, $vars, $lang->todo->date);?></th>
+      <th class='w-type'><?php common::printOrderLink('type',  $orderBy, $vars, $lang->todo->type);?></th>
+      <th class='w-pri'> <?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
+      <th>               <?php common::printOrderLink('name',  $orderBy, $vars, $lang->todo->name);?></th>
+      <th class='w-hour'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->todo->beginAB);?></th>
+      <th class='w-hour'><?php common::printOrderLink('end',   $orderBy, $vars, $lang->todo->endAB);?></th>
+      <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
       <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
     </tr>
     </thead>