From 80b14f7c0459ca424ed2c07150bbac630e1934a8 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 2 Nov 2017 15:20:29 +0800
Subject: [PATCH] =?UTF-8?q?Finish=20task#3287=20=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8C=89=E9=92=AE=E5=90=88=E5=B9=B6=E5=88=B0?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=8E=92=E5=BA=8F=E8=8F=9C=E5=8D=95=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=9C=80=E6=B1=82ID=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F,cost:1=20left:0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/project/control.php          |  2 +-
 module/project/css/kanban.css       |  3 +++
 module/project/lang/en.php          |  4 ++--
 module/project/lang/zh-cn.php       |  4 ++--
 module/project/view/kanban.html.php | 21 +++++++++++++--------
 module/upgrade/model.php            |  5 ++++-
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 3fa6459aa6..bbcaacc0d5 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1254,7 +1254,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function kanban($projectID, $type = 'story', $orderBy = 'pri_asc')
+    public function kanban($projectID, $type = 'story', $orderBy = 'order_asc')
     {
         /* Save to session. */
         $uri = $this->app->getURI(true);
diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index 5511a1dddc..453f4a8cfb 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -86,6 +86,9 @@ table th.col-closed {width:14%}
 .board-story.stage-tested.inverse     {background-color:#827717;}
 .board-story.stage-released.inverse   {background-color:#9C27B0;}
 
+.board-assignedTo {color:#D2322D; background-color: #FFEBEE;}
+.board-finishedBy {color:#229F24; background-color: #E8F5E9;}
+
 .bug-pri,.task-pri {display: inline-block; width: 16px; height: 16px; text-align: center; border-radius: 8px; border: 1px solid #ddd; font-size: 12px; line-height: 14px;}
 
 .affix {position:fixed; top:0px; width:95%;z-index:1030;}
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index a51c8c57c9..f963818496 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -238,10 +238,10 @@ $lang->project->placeholder->totalLeft = 'Total man-hour remained when start Pro
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(Done)';
 
+$lang->project->orderList['order_asc']  = "Order Asc";
+$lang->project->orderList['order_desc'] = "Order Desc";
 $lang->project->orderList['pri_asc']    = "Priority Asc";
 $lang->project->orderList['pri_desc']   = "Priority Desc";
-$lang->project->orderList['id_asc']     = "ID Asc";
-$lang->project->orderList['id_desc']    = "ID Desc";
 $lang->project->orderList['stage_asc']  = "Stage Asc";
 $lang->project->orderList['stage_desc'] = "Stage Desc";
 
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 75dfc0e5aa..becffa1fd1 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -238,10 +238,10 @@ $lang->project->placeholder->totalLeft = '项目开始时的总预计工时';
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(已结束)';
 
+$lang->project->orderList['order_asc']  = "需求排序正序";
+$lang->project->orderList['order_desc'] = "需求排序倒序";
 $lang->project->orderList['pri_asc']    = "需求优先级正序";
 $lang->project->orderList['pri_desc']   = "需求优先级倒序";
-$lang->project->orderList['id_asc']     = "需求ID正序";
-$lang->project->orderList['id_desc']    = "需求ID倒序";
 $lang->project->orderList['stage_asc']  = "需求阶段正序";
 $lang->project->orderList['stage_desc'] = "需求阶段倒序";
 
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index e92107ee8c..b7a6ed1b25 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -27,18 +27,23 @@ $account = $this->app->user->account
         <?php $hasGroupCol = (($type == 'story' and count($stories) > 0) or $type != 'story');?>
         <?php if($hasGroupCol):?>
         <th class='w-p15 col-story'>
-          <?php if($type == 'story'):?>
           <div class='dropdown inline-block'>
-            <a data-toggle='dropdown' href='javascript:;'><?php echo $lang->project->orderList[$orderBy]?> <span class='icon-caret-down'></span> </a>
+            <a data-toggle='dropdown' href='javascript:;'>
+              <?php if($type == 'story'):?>
+              <?php echo $lang->project->orderList[$orderBy]?>
+              <?php else:?>
+              <?php echo $lang->task->$type;?>
+              <?php endif;?>
+               <span class='icon-caret-down'></span>
+            </a>
             <ul class='dropdown-menu text-left'>
-            <?php foreach ($lang->project->orderList as $key => $value):?>
-              <li <?php echo $orderBy == $key ? " class='active'" : '' ?>><?php echo html::a($this->createLink('project', 'kanban', "projectID=$projectID&type=story&orderBy=$key"), $value);?></li>
-            <?php endforeach;?>
+              <?php foreach ($lang->project->orderList as $key => $value):?>
+              <li <?php echo ($type == 'story' and $orderBy == $key) ? " class='active'" : '' ?>><?php echo html::a($this->createLink('project', 'kanban', "projectID=$projectID&type=story&orderBy=$key"), $value);?></li>
+              <?php endforeach;?>
+              <?php echo "<li" . ($type == 'assignedTo' ? " class='active'" : '') . ">" . html::a(inlink('kanban', "project=$projectID&type=assignedTo"), $lang->project->groups['assignedTo']) . "</li>";?>
+              <?php echo "<li" . ($type == 'finishedBy' ? " class='active'" : '') . ">" . html::a(inlink('kanban', "project=$projectID&type=finishedBy"), $lang->project->groups['finishedBy']) . "</li>";?>
             </ul>
           </div>
-          <?php else:?>
-          <?php echo $lang->task->$type;?>
-          <?php endif;?>
         </th>
         <?php endif;?>
         <?php $endCol = array_pop($taskCols);?>
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 29a25377b5..1c5d1a4828 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -1802,7 +1802,10 @@ class upgradeModel extends model
      */
     public function initProjectStoryOrder()
     {
-        $storyGroup = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->orderBy('story_asc')->fetchGroup('project', 'story');
+        $storyGroup = $this->dao->select('t1.*')->from(TABLE_PROJECTSTORY)->alias('t1')
+            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
+            ->orderBy('t2.pri_desc,t1.story_asc')
+            ->fetchGroup('project', 'story');
 
         foreach($storyGroup as $projectID => $stories)
         {