From cb4e84a9da1910b4e720517a5a327af4588c4f49 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Fri, 13 Nov 2015 00:19:43 +0800
Subject: [PATCH] * finish task #2403.

---
 module/project/js/managemembers.js         | 14 ++++++++
 module/project/view/managemembers.html.php | 42 +++++++++++++++-------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/module/project/js/managemembers.js b/module/project/js/managemembers.js
index f324425b3b..7c7956d3c6 100644
--- a/module/project/js/managemembers.js
+++ b/module/project/js/managemembers.js
@@ -31,3 +31,17 @@ $(function()
     $('#importTeams a').click(function(){importTeam($(this).data('id')); $('#importTeamModal').modal('hide')});
 });
 
+function addItem()
+{
+    var item = $('#addItem').html().replace(/%i%/g, i).replace(/%memberCount%/g, memberCount);
+    $('#submit').before('<tr class="addedItem">' + item  + '</tr>');
+    $('#accounts' + memberCount).trigger('liszt:updated');
+    $('#accounts' + memberCount).chosen(defaultChosenOptions);
+    i ++;
+    memberCount ++;
+}
+
+function deleteItem(obj)
+{
+    $(obj).closest('.addedItem').remove();
+}
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 682d753588..5dd014ff6e 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -32,6 +32,8 @@
           <th><?php echo $lang->team->role;?></th>
           <th class='w-100px'><?php echo $lang->team->days;?></th>
           <th class='w-100px'><?php echo $lang->team->hours;?></th>
+          <th class="w-40px"> <?php echo $lang->actions;?></th>
+          <th class="w-40px"> <?php echo $lang->delete;?></th>
         </tr>
       </thead>
       <?php $i = 1; $memberCount = 0;?>
@@ -47,12 +49,14 @@
           <input type='hidden' name='modes[]' value='update' />
           <input type='hidden' name='accounts[]' value='<?php echo $member->account;?>' />
         </td>
+        <td><a href='javascript:;' onclick='addItem()' class='btn btn-block'><i class='icon-plus'></i></a></td>
+        <td><a href='javascript:;' onclick='deleteItem()' class='disabled btn btn-block'><i class='icon icon-remove'></i></a></td>
       </tr>
       <?php $i ++; $memberCount ++;?>
       <?php endforeach;?>
 
       <?php foreach($members2Import as $member2Import):?>
-      <tr>
+      <tr class='addedItem'>
         <td><?php echo html::select("accounts[$memberCount]", $users, $member2Import->account, "class='select-2 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>
@@ -60,29 +64,43 @@
           <input type='text'   name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->hours;?>' />
           <input type='hidden' name='modes[]' value='create' />
         </td>
+        <td><a href='javascript:;' onclick='addItem()' class='btn btn-block'><i class='icon-plus'></i></a></td>
+        <td><a href='javascript:;' onclick='deleteItem(this)' class='btn btn-block'><i class='icon icon-remove'></i></a></td>
       </tr>
       <?php $i ++; $memberCount ++;?>
       <?php endforeach;?>
 
-      <?php
-      $count = count($users) - 1;
-      if($count > PROJECTMODEL::LINK_MEMBERS_ONE_TIME) $count = PROJECTMODEL::LINK_MEMBERS_ONE_TIME;
-      ?>
-
-      <?php for($j = 0; $j < $count; $j ++):?>
-      <tr>
+      <?php for($j = 0; $j < 5; $j ++):?>
+      <tr class='addedItem'>
         <td><?php echo html::select("accounts[$memberCount]", $users, '', "class='select-2 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='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='7' />
           <input type='hidden' name='modes[]' value='create' />
         </td>
+        <td><a href='javascript:;' onclick='addItem()' class='btn btn-block'><i class='icon-plus'></i></a></td>
+        <td><a href='javascript:;' onclick='deleteItem(this)' class='btn btn-block'><i class='icon icon-remove'></i></a></td>
       </tr>
       <?php $i ++; $memberCount ++;?>
       <?php endfor;?>
-      <tr>
-        <td colspan='4' class='text-center'>
+
+      <?php js::set('i', $i);?>
+      <?php js::set('memberCount', $memberCount);?>
+      <?php $i = '%i%'; $memberCount = '%memberCount%';?>
+      <tr id='addItem' class='hidden'>
+        <td><?php echo html::select("accounts[$memberCount]", $users, '', "class='select-2' 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='7' />
+          <input type='hidden' name='modes[]' value='create' />
+        </td>
+        <td><a href='javascript:;' onclick='addItem()' class='btn btn-block'><i class='icon-plus'></i></a></td>
+        <td><a href='javascript:;' onclick='deleteItem(this)' class='btn btn-block'><i class='icon icon-remove'></i></a></td>
+      </tr>
+      <tr id='submit'>
+        <td colspan='6' class='text-center'>
           <?php echo html::submitButton() ?>
         </td>
       </tr>