From fcb87dc1a141c3591e67e4936c4e26fec35118ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Wed, 6 Dec 2017 13:21:16 +0800
Subject: [PATCH] * Task #3434

---
 module/product/lang/en.php    |  2 ++
 module/product/lang/zh-cn.php | 10 ++++++----
 module/product/model.php      |  1 +
 module/story/model.php        | 28 +++++++++++++++++++++++-----
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 02b9197e3c..e9be106688 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -81,6 +81,7 @@ $lang->product->changedStory = 'Changed';
 $lang->product->willClose    = 'To be Closed';
 $lang->product->closedStory  = 'Closed';
 $lang->product->unclosed     = 'Open';
+$lang->product->unplan       = 'No plan';
 
 $lang->product->allStory    = 'All Stories';
 $lang->product->allProduct  = 'All' . $lang->productCommon;
@@ -111,6 +112,7 @@ $lang->product->storySummary = " <strong>%s</strong> Story(ies), <strong>%s</str
 $lang->product->noMatched    = '"%s" cannot be found.' . $lang->productCommon;
 
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
+$lang->product->featureBar['browse']['unplan']       = $lang->product->unplan;
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
 $lang->product->featureBar['browse']['openedbyme']   = $lang->product->openedByMe;
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index e60bf4f4be..236ad7622f 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -71,16 +71,17 @@ $lang->product->whitelist = '分组白名单';
 $lang->product->branch    = '所属%s';
 
 $lang->product->searchStory  = '搜索';
-$lang->product->assignedToMe = '指派给我';
-$lang->product->openedByMe   = '由我创建';
-$lang->product->reviewedByMe = '由我评审';
-$lang->product->closedByMe   = '由我关闭';
+$lang->product->assignedToMe = '指给我';
+$lang->product->openedByMe   = '我创建';
+$lang->product->reviewedByMe = '我评审';
+$lang->product->closedByMe   = '我关闭';
 $lang->product->draftStory   = '草稿';
 $lang->product->activeStory  = '激活';
 $lang->product->changedStory = '已变更';
 $lang->product->willClose    = '待关闭';
 $lang->product->closedStory  = '已关闭';
 $lang->product->unclosed     = '未关闭';
+$lang->product->unplan       = '未计划';
 
 $lang->product->allStory    = '全部需求';
 $lang->product->allProduct  = '全部' . $lang->productCommon;
@@ -111,6 +112,7 @@ $lang->product->storySummary = "本页共 <strong>%s</strong> 个需求，预计
 $lang->product->noMatched    = '找不到包含"%s"的' . $lang->productCommon;
 
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
+$lang->product->featureBar['browse']['unplan']       = $lang->product->unplan;
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
 $lang->product->featureBar['browse']['openedbyme']   = $lang->product->openedByMe;
diff --git a/module/product/model.php b/module/product/model.php
index 960673d2b9..eca7f65b77 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -454,6 +454,7 @@ class productModel extends model
             unset($unclosedStatus['closed']);
             $stories = $this->story->getProductStories($productID, $branch, $modules, array_keys($unclosedStatus), $sort, $pager);
         }
+        if($browseType == 'unplan')       $stories = $this->story->getByPlan($productID, $queryID, $modules, '', $sort, $pager);
         if($browseType == 'allstory')     $stories = $this->story->getProductStories($productID, $branch, $modules, 'all', $sort, $pager);
         if($browseType == 'bymodule')     $stories = $this->story->getProductStories($productID, $branch, $modules, 'all', $sort, $pager);
         if($browseType == 'bysearch')     $stories = $this->story->getBySearch($productID, $queryID, $sort, $pager, '', $branch);
diff --git a/module/story/model.php b/module/story/model.php
index 70e644ce34..3390a032db 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1303,11 +1303,12 @@ class storyModel extends model
     /**
      * Get stories list of a product.
      * 
-     * @param  int           $productID 
-     * @param  array|string  $moduleIdList
-     * @param  string        $status 
-     * @param  string        $orderBy 
-     * @param  object        $pager 
+     * @param  int          $productID
+     * @param  array|string $moduleIdList
+     * @param  string       $status
+     * @param  string       $orderBy
+     * @param  object       $pager
+     *
      * @access public
      * @return array
      */
@@ -1433,6 +1434,23 @@ class storyModel extends model
         return $this->getByField($productID, $branch, $modules, 'status', $status, $orderBy, $pager);
     }
 
+    /**
+     * Get stories by plan.
+     *
+     * @param $productID
+     * @param $branch
+     * @param $modules
+     * @param $plan
+     * @param $orderBy
+     * @param $pager
+     *
+     * @return array
+     */
+    public function getByPlan($productID, $branch, $modules, $plan, $orderBy, $pager)
+    {
+        return $this->getByField($productID, $branch, $modules, 'plan', $plan, $orderBy, $pager);
+    }
+
     /**
      * Get stories by a field.
      *