From 8809a36e64840479e44ee9b3ec6444b2e9175414 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 22 Nov 2016 16:43:53 +0800
Subject: [PATCH 1/8]  * finish task #2752.

---
 module/bug/view/browse.html.php     | 4 ++--
 module/doc/control.php              | 4 ++--
 module/product/view/browse.html.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 23f6278747..5eef3aa05f 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -62,7 +62,7 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
       </div>
     </div>
     <div class='btn-group'>
-      <div class='btn-group'>
+      <div class='btn-group btn-bug-create'>
         <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
           <i class='icon icon-plus'></i> <?php echo $lang->bug->common;?>
           <span class='caret'></span>
@@ -72,7 +72,7 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
         if(commonModel::isTutorialMode())
         {
             $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
-            echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), $lang->bug->create);
+            echo '<li>' . html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), $lang->bug->create) . '</li>';
         }
         else
         {
diff --git a/module/doc/control.php b/module/doc/control.php
index e841c5e332..f1e6094470 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -17,9 +17,9 @@ class doc extends control
      * @access public
      * @return void
      */
-    public function __construct()
+    public function __construct($moduleName = '', $methodName = '')
     {
-        parent::__construct();
+        parent::__construct($moduleName, $methodName);
         $this->loadModel('user');
         $this->loadModel('tree');
         $this->loadModel('action');
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 57e905f630..f8e1e2acbb 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -56,7 +56,7 @@
         <?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'button', 'bar-chart'); ?>
     </div>
     <div class='btn-group'>
-      <div class='btn-group'>
+      <div class='btn-group create-story-btn'>
         <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
           <i class='icon icon-plus'></i> <?php echo $lang->story->common;?>
           <span class='caret'></span>

From 0f26f8f7d7e4c03f25639403c4f9305155b275d1 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 22 Nov 2016 17:19:08 +0800
Subject: [PATCH 2/8]  * finish task #2777.

---
 module/project/view/kanban.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 2b07eeb07d..f31355e368 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -70,6 +70,7 @@
                   <div class='dropdown-menu pull-right'>
                     <?php
                     echo (common::hasPriv('task', 'create')) ? html::a($this->createLink('task', 'create', "projectID=$story->project&storyID=$story->story&moduleID=$story->module", '', true), $lang->project->wbs, '', "class='kanbanFrame'") : '';
+                    echo (common::hasPriv('task', 'batchCreate')) ? html::a($this->createLink('task', 'batchCreate', "projectID=$story->project&storyID=$story->story&iframe=true", '', true), $lang->project->batchWBS, '', "class='kanbanFrame'") : '';
                     echo (common::hasPriv('project', 'unlinkStory')) ? html::a($this->createLink('project', 'unlinkStory', "projectID=$story->project&storyID=$story->story&confirm=no", '', true), $lang->project->unlinkStory, 'hiddenwin') : '';
                     echo (common::hasPriv('story', 'activate') and storyModel::isClickable($story, 'activate')) ? html::a($this->createLink('story', 'activate', "storyID=$story->id", '', 'true'), $lang->story->activate, '', "class='kanbanFrame'") : '';
                     echo (common::hasPriv('story', 'close')    and storyModel::isClickable($story, 'close')) ? html::a($this->createLink('story', 'close', "storyID=$story->id", '', 'true'), $lang->story->close, '', "class='kanbanFrame'") : '';

From 7a9b077972f78d9c42fcfd34e438a1d1527cc25a Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 23 Nov 2016 09:24:38 +0800
Subject: [PATCH 3/8]  * finish task #2745.

---
 module/task/view/create.html.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index a7dcd0d1fc..f6c9c6d3e1 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -29,7 +29,7 @@
       <tr>
         <th class='w-100px'><?php echo $lang->task->module;?></th>
         <td id='moduleIdBox' class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control chosen' onchange='setStories(this.value,$project->id)'");?></td>
-        <td class='w-p25-f'></td><td></td>
+        <td></td><td></td><td></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->task->type;?></th>
@@ -45,7 +45,7 @@
       <?php if(strpos(",$showFields,", ',story,') !== false):?>
       <tr>
         <th><?php echo $lang->task->story;?></th>
-        <td colspan='3'>
+        <td colspan='5'>
           <div class='input-group'>
             <?php if(empty($stories)):?>
             <span id='story'><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('project', 'linkStory', "projectID=$project->id"), $lang->project->linkStory, '_blank'), html::a("javascript:loadStories($project->id)", $lang->refresh));?></span>
@@ -59,7 +59,7 @@
       <?php endif;?>
       <tr>
         <th><?php echo $lang->task->name;?></th>
-        <td colspan='3'>
+        <td colspan='5'>
           <div class='row-table'>
             <div class='col-table'>
               <div class="input-group w-p100">
@@ -113,7 +113,7 @@
       </tr>
       <tr>
         <th><?php echo $lang->task->desc;?></th>
-        <td colspan='3'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
+        <td colspan='5'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
       </tr>
       <?php
       $hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
@@ -124,7 +124,7 @@
       <tr>
         <th><?php echo ($hiddenEstStarted and $hiddenDeadline) ? $lang->task->mailto : $lang->task->datePlan;?></th>
         <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
-        <td>
+        <td colspan='2'>
           <div class='input-group' id='dataPlanGroup'>
             <?php if(!$hiddenEstStarted):?>
             <?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?>
@@ -139,7 +139,7 @@
         </td>
         <?php endif;?>
         <?php if(!$hiddenMailto):?>
-        <?php $colspan = ($hiddenEstStarted and $hiddenDeadline) ? '3' : '2';?>
+        <?php $colspan = ($hiddenEstStarted and $hiddenDeadline) ? '5' : '4';?>
         <td colspan='<?php echo $colspan?>'>
           <div id='mailtoGroup' class='input-group'>
             <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
@@ -154,15 +154,15 @@
       <?php endif;?>
       <tr>
         <th><?php echo $lang->files;?></th>
-        <td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
+        <td colspan='5'><?php echo $this->fetch('file', 'buildform');?></td>
       </tr>
       <tr>
         <th><?php echo $lang->task->afterSubmit;?></th>
-        <td colspan='3'><?php echo html::radio('after', $lang->task->afterChoices, 'continueAdding');?></td>
+        <td colspan='5'><?php echo html::radio('after', $lang->task->afterChoices, 'continueAdding');?></td>
       </tr>
       <tr>
         <td></td>
-        <td colspan='3'><?php echo html::submitButton() . html::backButton();?></td>
+        <td colspan='5'><?php echo html::submitButton() . html::backButton();?></td>
       </tr>
     </table>
     <span id='responser'></span>

From ceb1fd45fba7e9966b8b343cea27b4540e7d6bd7 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 23 Nov 2016 10:40:15 +0800
Subject: [PATCH 4/8]  * add api for integrate svn/git.

---
 module/git/control.php | 52 ++++++++++++++++++++++++++++++++++++++++++
 module/git/model.php   | 19 +++++++++++++++
 module/svn/control.php | 12 ++++++++++
 module/svn/model.php   | 19 +++++++++++++++
 4 files changed, 102 insertions(+)

diff --git a/module/git/control.php b/module/git/control.php
index cdffbfc01d..44ea33760b 100644
--- a/module/git/control.php
+++ b/module/git/control.php
@@ -107,4 +107,56 @@ class git extends control
             exit;
         }
     }
+
+    /**
+     * Ajax save log.
+     * 
+     * @access public
+     * @return void
+     */
+    public function ajaxSaveLog()
+    {
+        $repoUrl  = trim($this->post->repoUrl);
+        $repoRoot = str_replace('\\', '/', trim($this->post->repoRoot));
+        $message  = trim($this->post->message);
+        $revision = trim($this->post->revision);
+        $files    = $this->post->files;
+
+        /* Ignore git. */
+        if(strpos($repoUrl, '://') === false) die();
+
+        $parsedFiles = array();
+        foreach($files as $file)
+        {
+            $file = trim($file);
+            if(empty($file)) continue;
+            $path = str_replace($repoRoot,  '', $file);
+            $parsedFiles[''][] = $path;
+        }
+
+        $objects = $this->git->parseComment($message);
+        if($objects)
+        {
+            $log = new stdclass();
+            $log->author   = $this->app->user->account;
+            $log->date     = helper::now();
+            $log->msg      = $message;
+            $log->revision = $revision;
+            $log->files    = $parsedFiles;
+            $this->git->saveAction2PMS($objects, $log, $repoUrl);
+        }
+        die();
+    }
+
+    /**
+     * Ajax get repos.
+     * 
+     * @access public
+     * @return void
+     */
+    public function ajaxGetRepos()
+    {
+        $repos = $this->git->getRepos();
+        die(json_encode($repos));
+    }
 }
diff --git a/module/git/model.php b/module/git/model.php
index 8ace7470df..2c414193ab 100644
--- a/module/git/model.php
+++ b/module/git/model.php
@@ -187,6 +187,25 @@ class gitModel extends model
         return true;
     }
 
+    /**
+     * Get repos.
+     * 
+     * @access public
+     * @return array
+     */
+    public function getRepos()
+    {
+        $repos = array();
+        if(!$this->config->git->repos) return $repos;
+
+        foreach($this->config->git->repos as $repo)
+        {
+            if(empty($repo['path'])) continue;
+            $repos[] = $repo['path'];
+        }
+        return $repos;
+    }
+
     /**
      * Set repo.
      * 
diff --git a/module/svn/control.php b/module/svn/control.php
index 364af0c1b4..a48918b238 100644
--- a/module/svn/control.php
+++ b/module/svn/control.php
@@ -135,4 +135,16 @@ class svn extends control
         }
         die();
     }
+
+    /**
+     * Ajax get repos.
+     * 
+     * @access public
+     * @return void
+     */
+    public function ajaxGetRepos()
+    {
+        $repos = $this->svn->getRepos();
+        die(json_encode($repos));
+    }
 }
diff --git a/module/svn/model.php b/module/svn/model.php
index e7aa3250d6..72f4509ca5 100644
--- a/module/svn/model.php
+++ b/module/svn/model.php
@@ -186,6 +186,25 @@ class svnModel extends model
         return true;
     }
 
+    /**
+     * Get repos.
+     * 
+     * @access public
+     * @return array
+     */
+    public function getRepos()
+    {
+        $repos = array();
+        if(!$this->config->svn->repos) return $repos;
+
+        foreach($this->config->svn->repos as $repo)
+        {
+            if(empty($repo['path'])) continue;
+            $repos[] = $repo['path'];
+        }
+        return $repos;
+    }
+
     /**
      * Set repo.
      * 

From decf0f8b67cb0c0ec2279eb9ad57be02a7d0452e Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 23 Nov 2016 10:59:00 +0800
Subject: [PATCH 5/8]  * finish task #2750.

---
 module/project/control.php             |  8 ++++
 module/project/lang/en.php             |  9 +---
 module/project/lang/zh-cn.php          |  9 +---
 module/project/view/grouptask.html.php | 58 ++++++++++++--------------
 module/task/model.php                  |  3 ++
 5 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 9706947a89..b43908e4c4 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -289,6 +289,14 @@ class project extends control
                 $groupTasks[$task->$groupBy][] = $task;
             }
         }
+        /* Process closed data when group by assignedTo. */
+        if($groupBy == 'assignedTo' and isset($groupTasks['Closed']))
+        {
+            $closedTasks = $groupTasks['Closed'];
+            unset($groupTasks['Closed']);
+            $groupTasks['closed'] = $closedTasks;
+        }
+
 
         /* Assign. */
         $this->app->loadLang('tree');
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 4369dbfe4b..9e839cc5f4 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -148,20 +148,13 @@ $lang->project->groups['assignedTo'] = 'By AssignedTo';
 $lang->project->groups['finishedBy'] = 'By FinishedBy';
 $lang->project->groups['closedBy']   = 'By ClosedBy';
 $lang->project->groups['type']       = 'By Type';
-$lang->project->groups['deadline']   = 'By Deadline';
 
 $lang->project->groupFilter['story']['all']         = $lang->project->all;
 $lang->project->groupFilter['story']['linked']      = 'Task Linked to Story';
 $lang->project->groupFilter['pri']['all']           = $lang->project->all;
-$lang->project->groupFilter['pri']['setted']        = 'Congfigured';
+$lang->project->groupFilter['pri']['noset']         = 'Not set';
 $lang->project->groupFilter['assignedTo']['undone'] = 'Pending';
 $lang->project->groupFilter['assignedTo']['all']    = $lang->project->all;
-$lang->project->groupFilter['finishedBy']['done']   = 'Done';
-$lang->project->groupFilter['finishedBy']['all']    = $lang->project->all;
-$lang->project->groupFilter['closedBy']['closed']   = 'Closed';
-$lang->project->groupFilter['closedBy']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['setted']   = 'Configured';
 
 $lang->project->byQuery              = 'Search';
 
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 774c4cd7e0..399177b4dd 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -148,20 +148,13 @@ $lang->project->groups['assignedTo'] = '指派给分组';
 $lang->project->groups['finishedBy'] = '完成者分组';
 $lang->project->groups['closedBy']   = '关闭者分组';
 $lang->project->groups['type']       = '类型分组';
-$lang->project->groups['deadline']   = '截止分组';
 
 $lang->project->groupFilter['story']['all']         = $lang->project->all;
 $lang->project->groupFilter['story']['linked']      = '已关联需求的任务';
 $lang->project->groupFilter['pri']['all']           = $lang->project->all;
-$lang->project->groupFilter['pri']['setted']        = '已设置';
+$lang->project->groupFilter['pri']['noset']         = '未设置';
 $lang->project->groupFilter['assignedTo']['undone'] = '未完成';
 $lang->project->groupFilter['assignedTo']['all']    = $lang->project->all;
-$lang->project->groupFilter['finishedBy']['done']   = '已完成';
-$lang->project->groupFilter['finishedBy']['all']    = $lang->project->all;
-$lang->project->groupFilter['closedBy']['closed']   = '已关闭';
-$lang->project->groupFilter['closedBy']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['setted']   = '已设置';
 
 $lang->project->byQuery              = '搜索';
 
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 5faff67c96..6a5780a18f 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -25,20 +25,22 @@
 <table class='table active-disabled table-condensed table-fixed' id='groupTable'>
   <thead>
     <tr>
-      <th class='<?php echo $groupBy == 'story' ? 'w-200px' : 'w-120px'?> text-left'>
+      <th class='w-200px text-left'>
         <?php echo html::a('###', "<i class='icon-caret-down'></i> " . $lang->task->$groupBy, '', "class='expandAll' data-action='expand'")?>
         <?php echo html::a('###', "<i class='icon-caret-right'></i> " . $lang->task->$groupBy, '', "class='collapseAll hidden' data-action='collapse'")?>
       </th>
-      <th><?php echo $lang->task->name;?></th>
+      <th class='w-id'><?php echo $lang->task->id;?></th>
       <th class='w-pri'> <?php echo $lang->priAB;?></th>
+      <th><?php echo $lang->task->name;?></th>
+      <th class='w-80px'><?php echo $lang->task->status;?></th>
+      <th class='w-80px'><?php echo $lang->task->deadlineAB;?></th>
       <th class='w-user'><?php echo $lang->task->assignedTo;?></th>
       <th class='w-user'><?php echo $lang->task->finishedBy;?></th>
       <th class='w-50px'><?php echo $lang->task->estimateAB;?></th>
       <th class='w-50px'><?php echo $lang->task->consumedAB;?></th>
       <th class='w-50px'><?php echo $lang->task->leftAB;?></th>
+      <th class='w-50px'><?php echo $lang->task->progess;?></th>
       <th class='w-50px'><?php echo $lang->typeAB;?></th>
-      <th class='w-80px'><?php echo $lang->task->deadlineAB;?></th>
-      <th class='w-80px'><?php echo $lang->task->status;?></th>
       <th class='w-60px'><?php echo $lang->actions;?></th>
     </tr>
   </thead>
@@ -52,6 +54,10 @@
     $totalConsumed = 0.0;
     $totalLeft     = 0.0;
   ?>
+  <?php
+  if($groupBy == 'finishedBy') unset($tasks['']);
+  if($groupBy == 'closedBy') unset($tasks['']);
+  ?>
   <?php foreach($tasks as $groupKey => $groupTasks):?>
   <?php $i = 0;?>
   <?php
@@ -64,11 +70,8 @@
     $groupLeft     = 0.0;
 
     $groupName = $groupKey;
-    if($groupBy == 'story' and $groupName == 0)       $groupName = $this->lang->task->noStory;
+    if($groupBy == 'story') $groupName = empty($groupName) ? $this->lang->task->noStory : zget($groupByList, $groupKey);
     if($groupBy == 'assignedTo' and $groupName == '') $groupName = $this->lang->task->noAssigned;
-    if($groupBy == 'finishedBy' and $groupName == '') $groupName = $this->lang->task->noFinished;
-    if($groupBy == 'closedBy' and $groupName == '')   $groupName = $this->lang->task->noClosed;
-    if(!empty($groupByList[$groupKey])) $groupName .= '::' . $groupByList[$groupKey];
   ?>
   <tbody>
   <?php foreach($groupTasks as $task):?>
@@ -76,11 +79,8 @@
   if(isset($currentFilter) and $currentFilter != 'all')
   {
       if($groupBy == 'story'      and $currentFilter == 'linked' and empty($task->story)) continue;
-      if($groupBy == 'pri'        and $currentFilter == 'setted' and empty($task->pri)) continue;
+      if($groupBy == 'pri'        and $currentFilter == 'noset'  and !empty($task->pri)) continue;
       if($groupBy == 'assignedTo' and $currentFilter == 'undone' and $task->status != 'wait' and $task->status != 'doing') continue;
-      if($groupBy == 'finishedBy' and $currentFilter == 'done'   and $task->status != 'done') continue;
-      if($groupBy == 'closedBy'   and $currentFilter == 'closed' and $task->status != 'closed') continue;
-      if($groupBy == 'deadline'   and $currentFilter == 'setted' and $task->deadline == '0000-00-00') continue;
   }
   ?>
   <?php $assignedToClass = $task->assignedTo == $app->user->account ? "style='color:red'" : '';?>
@@ -121,18 +121,23 @@
       <?php if($i == 0):?>
       <td rowspan='<?php echo count($groupTasks) + 1?>' class='groupby text-left'>
         <?php echo html::a('###', "<i class='icon-caret-down'></i> " . $groupName, '', "class='expandGroup' data-action='expand' title='$groupName'");?>
+        <div class='groupSummary text' style='white-space:normal'>
+        <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
+        <?php printf($lang->project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?></div>
       </td>
       <?php endif;?>
-      <td class='text-left'>&nbsp;<?php echo $task->id . $lang->colon; if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
+      <td><?php echo $task->id;?></td>
       <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
+      <td class='text-left'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
+      <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
+      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
       <td <?php echo $assignedToClass;?>><?php echo $task->assignedToRealName;?></td>
       <td><?php echo $users[$task->finishedBy];?></td>
       <td><?php echo $task->estimate;?></td>
       <td><?php echo $task->consumed;?></td>
       <td><?php echo $task->left;?></td>
+      <td class='text-left'><?php echo $task->progess . '%';?></td>
       <td><?php echo $lang->task->typeList[$task->type];?></td>
-      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-      <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
       <td>
         <?php common::printIcon('task', 'edit', "taskid=$task->id", '', 'list');?>
         <?php common::printIcon('task', 'delete', "projectID=$task->project&taskid=$task->id", '', 'list', '', 'hiddenwin');?>
@@ -141,31 +146,20 @@
     <?php $i++;?>
     <?php endforeach;?>
     <?php if($i != 0):?>
-    <tr class='text-center groupdivider'>
-      <td colspan='4' class='text-left'>
-        <div class='text'>
-        <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
-        <?php printf($lang->project->noTimeSummary, $groupSum, $groupWait, $groupDoing);?></div>
-      </td>
-      <td><?php echo $groupEstimate;?></td>
-      <td><?php echo $groupConsumed;?></td>
-      <td><?php echo $groupLeft;?></td>
-      <td colspan='4'></td>
-    </tr>
     <tr class='actie-disabled group-collapse hidden text-center group-title'>
-      <td colspan='5' class='text-left'>
+      <td class='text-left'>
         <?php echo html::a('###', "<i class='icon-caret-right'></i> " . $groupName, '', "class='collapseGroup' data-action='collapse' title='$groupName'");?>
+      </td>
+      <td></td>
+      <td></td>
+      <td colspan='11' class='text-left'>
         <span class='groupdivider' style='margin-left:10px;'>
           <span class='text'>
             <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
-            <?php printf($lang->project->noTimeSummary, $groupSum, $groupWait, $groupDoing);?>
+            <?php printf($lang->project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
           </span>
         </span>
       </td>
-      <td><?php echo $groupEstimate;?></td>
-      <td><?php echo $groupConsumed;?></td>
-      <td><?php echo $groupLeft;?></td>
-      <td colspan='4'></td>
     </tr>
     <?php endif;?>
   </tbody>
diff --git a/module/task/model.php b/module/task/model.php
index 23580744ad..aad2740964 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1191,6 +1191,9 @@ class taskModel extends model
             $task->productType = $product->type;
         }
 
+        /* Set closed realname. */
+        if($task->assignedTo == 'closed') $task->assignedToRealName = 'Closed';
+
         /* Compute task progess. */
         if($task->consumed == 0 and $task->left == 0)
         {

From 5aeebbba9534dcf6ea9e4c45cdf367d04f19d08c Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 23 Nov 2016 11:06:51 +0800
Subject: [PATCH 6/8]  * finish task #2748.

---
 module/productplan/css/view.css       | 5 ++++-
 module/productplan/view/view.html.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css
index 88e40fefd5..06b242098c 100644
--- a/module/productplan/css/view.css
+++ b/module/productplan/css/view.css
@@ -1,6 +1,9 @@
 .tabs{position:relative;}
+.tabs .nav-tabs{border-bottom:none;}
+.tabs .nav-tabs>li{margin-bottom:0px;}
+.tabs .tab-content{padding: 0px; border: 0px;}
 .tabs .tab-content .tab-pane .action{position: absolute; right: 0px; top: 0px;}
-.tabs .tab-content .tab-pane #querybox{margin:0px}
+.tabs .tab-content .tab-pane #querybox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;}
 .tabs .tab-content .tab-pane #querybox form{padding-left:0px;}
 
 .hide-side .col-main {width: 100%;}
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 151cf8933c..6435ac0f3f 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -65,7 +65,7 @@
             <div class='linkBox'></div>
             <?php endif;?>
             <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
-              <table class='table tablesorter table-condensed table-hover table-striped table-borderless table-fixed' id='storyList'>
+              <table class='table tablesorter table-condensed table-hover table-striped table-fixed' id='storyList'>
                 <?php $vars = "planID={$plan->id}&type=story&orderBy=%s&link=$link&param=$param"; ?>
                 <thead>
                 <tr>
@@ -307,7 +307,7 @@
             <div class='linkBox'></div>
             <?php endif;?>
             <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">
-              <table class='table tablesorter table-condensed table-hover table-striped table-borderless table-fixed' id='bugList'>
+              <table class='table tablesorter table-condensed table-hover table-striped table-fixed' id='bugList'>
                 <?php $vars = "planID={$plan->id}&type=bug&orderBy=%s&link=$link&param=$param"; ?>
                 <thead>
                 <tr>

From 26aadd03f9b0dba8dc9b9ac5f9bab7a1a72d6f88 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 23 Nov 2016 11:55:37 +0800
Subject: [PATCH 7/8]  * finish task #2740.

---
 module/project/js/create.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/js/create.js b/module/project/js/create.js
index bdd1ffa849..cb29ecc71b 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -7,4 +7,5 @@ $(function()
 {
     $('#cpmBtn').click(function(){$('#copyProjectModal').modal('show')});
     $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')});
+    $('#productsBox .col-sm-3').width($('#type').closest('td').width());
 });

From dc75ee01248d5eca03de9abc1a6203a9c15564a4 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 23 Nov 2016 13:32:31 +0800
Subject: [PATCH 8/8]  * code for task #2731: could custom branch when batch
 create story.

---
 module/story/control.php               | 15 +++++++++++++--
 module/story/model.php                 |  4 ++--
 module/story/view/batchcreate.html.php |  6 +++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index 6947b373cc..87db2fdf87 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -253,9 +253,20 @@ class story extends control
         $sourceList['ditto'] = $this->lang->story->ditto;
 
         /* Set Custom*/
-        foreach(explode(',', $this->config->story->list->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->story->$field;
+        foreach(explode(',', $this->config->story->list->customBatchCreateFields) as $field)
+        {
+            if($product->type != 'normal') $customFields[$product->type] = $this->lang->product->branchName[$product->type];
+            $customFields[$field] = $this->lang->story->$field;
+        }
+        $showFields = $this->config->story->custom->batchCreateFields;
+        if($product->type == 'normal')
+        {
+            $showFields = str_replace(array(0 => ",branch,", 1 => ",platform,"), '', ",$showFields,");
+            $showFields = trim($showFields, ',');
+        }
+
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->story->custom->batchCreateFields;
+        $this->view->showFields   = $showFields;
 
         $this->view->title            = $product->name . $this->lang->colon . $this->lang->story->batchCreate;
         $this->view->productName      = $product->name;
diff --git a/module/story/model.php b/module/story/model.php
index 5331d9b884..f5ec41a913 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -245,7 +245,7 @@ class storyModel extends model
         $stories  = fixer::input('post')->get();
         $batchNum = count(reset($stories));
 
-        $result  = $this->loadModel('common')->removeDuplicate('story', $stories, "product={$productID} and branch={$branch}");
+        $result  = $this->loadModel('common')->removeDuplicate('story', $stories, "product={$productID}");
         $stories = $result['data'];
 
         $module = 0;
@@ -272,6 +272,7 @@ class storyModel extends model
             if(!empty($stories->title[$i]))
             {
                 $data = new stdclass();
+                $data->branch     = $stories->branch[$i];
                 $data->module     = $stories->module[$i];
                 $data->plan       = $stories->plan[$i];
                 $data->color      = $stories->color[$i];
@@ -282,7 +283,6 @@ class storyModel extends model
                 $data->status     = ($stories->needReview[$i] == 0 and !$forceReview) ? 'active' : 'draft';
                 $data->keywords   = $stories->keywords[$i];
                 $data->product    = $productID;
-                $data->branch     = $branch;
                 $data->openedBy   = $this->app->user->account;
                 $data->openedDate = $now;
                 $data->version    = 1;
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index b32d934831..bd16341e92 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -38,9 +38,10 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr class='text-center'>
         <th class='w-30px'><?php echo $lang->idAB;?></th> 
+        <th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
         <th class='w-p15<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->story->module;?></th>
         <th class='w-p15<?php echo zget($visibleFields, 'plan', ' hidden')?>'><?php echo $lang->story->plan;?></th>
-        <th><?php echo $lang->story->title;?> <span class='required'></span></th>
+        <th <?php if(count($visibleFields) >= 9) echo "class='w-150px'"?>><?php echo $lang->story->title;?> <span class='required'></span></th>
         <th class='w-80px<?php echo zget($visibleFields, 'source', ' hidden')?>'><?php echo $lang->story->source;?></th>
         <th class='w-p15<?php echo zget($visibleFields, 'spec', ' hidden')?>'><?php echo $lang->story->spec;?></th>
         <th class='w-p15<?php echo zget($visibleFields, 'verify', ' hidden')?>'><?php echo $lang->story->verify;?></th>
@@ -59,6 +60,7 @@ foreach(explode(',', $showFields) as $field)
     <?php $source   = $i == 0 ? '' : 'ditto';?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
+      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
       <td style='overflow:visible'>
@@ -87,6 +89,7 @@ foreach(explode(',', $showFields) as $field)
     <?php $source   = $i - $nextStart == 0 ? '' : 'ditto';?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
+      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
       <td style='overflow:visible'>
@@ -111,6 +114,7 @@ foreach(explode(',', $showFields) as $field)
   <tbody>
     <tr class='text-center'>
       <td>%s</td>
+      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[%s]", $branch, $branch, "class='form-control'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[%s]", $plans, $planID, "class='form-control'");?></td>
       <td style='overflow:visible'>