From 4db30b464d2b2cc2fa5d94f2ec3202d27c15bcde Mon Sep 17 00:00:00 2001
From: qiyu-xie <xieqiyu@easycorp.ltd>
Date: Thu, 12 Aug 2021 10:44:04 +0800
Subject: [PATCH] * Finish task#41218.

---
 module/project/css/managemembers.css       |  2 +
 module/project/js/managemembers.js         | 39 +++++++++++----
 module/project/lang/en.php                 |  1 +
 module/project/lang/zh-cn.php              |  1 +
 module/project/lang/zh-tw.php              |  1 +
 module/project/view/managemembers.html.php | 58 ++++++++++------------
 6 files changed, 62 insertions(+), 40 deletions(-)
 create mode 100644 module/project/css/managemembers.css

diff --git a/module/project/css/managemembers.css b/module/project/css/managemembers.css
new file mode 100644
index 0000000000..e595a3d456
--- /dev/null
+++ b/module/project/css/managemembers.css
@@ -0,0 +1,2 @@
+#dept_chosen    .chosen-single {width: 220px;}
+#project_chosen .chosen-single {width: 220px;}
diff --git a/module/project/js/managemembers.js b/module/project/js/managemembers.js
index 67d66cd033..232f686a34 100644
--- a/module/project/js/managemembers.js
+++ b/module/project/js/managemembers.js
@@ -1,8 +1,8 @@
 /**
  * Set role when select an account.
- * 
- * @param  string $account 
- * @param  int    $roleID 
+ *
+ * @param  string $account
+ * @param  int    $roleID
  * @access public
  * @return void
  */
@@ -13,6 +13,13 @@ function setRole(account, roleID)
     roleOBJ.val(role)               // set the role.
 }
 
+/**
+ * Add item.
+ *
+ * @param  object $obj
+ * @access public
+ * @return void
+ */
 function addItem(obj)
 {
     var item = $('#addItem').html().replace(/%i%/g, i);
@@ -23,16 +30,30 @@ function addItem(obj)
     i ++;
 }
 
+/**
+ * Delete item.
+ *
+ * @param  object $obj
+ * @access public
+ * @return void
+ */
 function deleteItem(obj)
 {
     $(obj).closest('tr').remove();
 }
 
+/**
+ * Set selected Department.
+ *
+ * @param  object $obj
+ * @access public
+ * @return void
+ */
 function setDeptUsers(obj)
 {
-    dept = $(obj).val(); // Get dept ID.
-    link = createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + dept); // Create manageMembers link.
-    location.href=link;
+    dept = $(obj).val();
+    link = createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + dept + '&copyProjectID=' + copyProjectID);
+    location.href = link;
 }
 
 /**
@@ -44,7 +65,7 @@ function setDeptUsers(obj)
  */
 function choseTeam2Copy(obj)
 {
-    team = $(obj).val();
-    link = createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=&team2Import=' + team);
-    location.href=link;
+    copyProjectID = $(obj).val();
+    locateLink    = createLink('project', 'manageMembers', 'projectID=' + projectID + '&dept=' + deptID + '&copyProjectID=' + copyProjectID);
+    location.href = locateLink;
 }
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 2ce52b6ef0..ac0c63151d 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -53,6 +53,7 @@ $lang->project->testreport        = 'Test Report';
 $lang->project->selectProgram     = 'Program filtering';
 $lang->project->teamMember        = 'Team Member';
 $lang->project->unlinkMember      = 'Remove Member';
+$lang->project->copyTeamTitle     = 'Select a project team to copy';
 
 /* Fields. */
 $lang->project->common             = 'Project';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 676b5d8209..14fd47a8b9 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -53,6 +53,7 @@ $lang->project->testreport        = '测试报告';
 $lang->project->selectProgram     = '项目集筛选';
 $lang->project->teamMember        = '团队成员';
 $lang->project->unlinkMember      = '移除成员';
+$lang->project->copyTeamTitle     = '选择一个项目团队来复制';
 
 /* Fields. */
 $lang->project->common             = '项目';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index bbe8b095ba..e3ef0ae67a 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -53,6 +53,7 @@ $lang->project->testreport        = '測試報告';
 $lang->project->selectProgram     = '項目集篩選';
 $lang->project->teamMember        = '團隊成員';
 $lang->project->unlinkMember      = '移除成員';
+$lang->project->copyTeamTitle     = '選擇一個項目團隊來複製';
 
 /* Fields. */
 $lang->project->common             = '項目';
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index c704ea7270..c446e1a0b1 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -1,6 +1,8 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('projectID', $project->id);?>
 <?php js::set('roles', $roles);?>
+<?php js::set('deptID', $dept);?>
+<?php js::set('copyProjectID', $copyProjectID);?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <span class='btn btn-link btn-active-text'>
@@ -9,9 +11,9 @@
     <div class='input-group space w-200px'>
       <span class='input-group-addon'><?php echo $lang->execution->selectDept?></span>
       <?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='setDeptUsers(this)' data-placeholder='{$lang->execution->selectDeptTitle}'");?>
-      <?php if(count($teams2Import) != 1):?>
-      <span class='input-group-addon'><?php echo $lang->execution->copyTeam?></span>
-      <?php echo html::select('execution', $teams2Import, $copyProjectID, "class='form-control chosen' onchange='choseTeam2Copy(this)' data-placeholder='{$lang->execution->copyTeamTitle}'");?>
+      <?php if(!empty(array_filter($teams2Import))):?>
+      <span class='input-group-addon'><?php echo $lang->execution->copyTeam;?></span>
+      <?php echo html::select('project', $teams2Import, $copyProjectID, "class='form-control chosen' onchange='choseTeam2Copy(this)' data-placeholder='{$lang->project->copyTeamTitle}'");?>
       <?php endif;?>
     </div>
   </div>
@@ -51,32 +53,13 @@
         <?php $i ++; $memberCount ++;?>
         <?php endforeach;?>
 
-        <?php foreach($members2Import as $member2Import):?>
-        <tr class='addedItem'>
-          <td><?php echo html::select("accounts[]", $users, $member2Import->account, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
-          <td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->role;?>' /></td>
-          <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
-          <td>
-            <input type='text'   name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->hours;?>' />
-          </td>
-          <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
-          <td class='c-actions text-center'>
-            <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
-            <a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
-          </td>
-        </tr>
-        <?php $i ++; $memberCount ++;?>
-        <?php endforeach;?>
-
         <?php foreach($deptUsers as $deptAccount => $userName):?>
         <?php if(!isset($users[$deptAccount])) continue;?>
         <tr class='addedItem'>
           <td><?php echo html::select("accounts[]", $users, $deptAccount, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
-          <td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $roles[$deptAccount]?>'/></td>
-          <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
-          <td>
-            <input type='text'   name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' />
-          </td>
+          <td><input type='text' name='roles[]' id='role<?php echo $i;?>'  class='form-control' value='<?php echo $roles[$deptAccount]?>'/></td>
+          <td><input type='text' name='days[]'  id='days<?php echo $i;?>'  class='form-control' value='<?php echo $project->days?>'/></td>
+          <td><input type='text' name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' /></td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
           <td class='c-actions text-center'>
             <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
@@ -87,14 +70,29 @@
         <?php $i ++; $memberCount ++;?>
         <?php endforeach;?>
 
+        <?php foreach($members2Import as $member2Import):?>
+        <?php if(!isset($users[$member2Import->account])) continue;?>
+        <tr class='addedItem'>
+          <td><?php echo html::select("accounts[]", $users, $member2Import->account, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
+          <td><input type='text' name='roles[]' id='role<?php echo $i;?>'  class='form-control' value='<?php echo $member2Import->role;?>' /></td>
+          <td><input type='text' name='days[]'  id='days<?php echo $i;?>'  class='form-control' value='<?php echo $project->days?>'/></td>
+          <td><input type='text' name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->hours;?>' /></td>
+          <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
+          <td class='c-actions text-center'>
+            <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
+            <a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
+          </td>
+        </tr>
+        <?php unset($users[$member2Import->account]);?>
+        <?php $i ++; $memberCount ++;?>
+        <?php endforeach;?>
+
         <?php for($j = 0; $j < 5; $j ++):?>
         <tr class='addedItem'>
           <td><?php echo html::select("accounts[]", $users, '', "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
           <td><input type='text' name='roles[]' id='role<?php  echo ($i);?>' class='form-control' /></td>
           <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
-          <td>
-            <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' />
-          </td>
+          <td><input type='text' name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' /></td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
           <td class='c-actions text-center'>
             <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
@@ -122,9 +120,7 @@
       <td><?php echo html::select("accounts[]", $users, '', "class='form-control' onchange='setRole(this.value, $i)'");?></td>
       <td><input type='text' name='roles[]' id='role<?php  echo ($i);?>' class='form-control' /></td>
       <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
-      <td>
-        <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' />
-      </td>
+      <td><input type='text' name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' /></td>
       <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
       <td class='c-actions text-center'>
         <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>