From 1f102d851de8264d3e4a05d44c06faf3d78c21ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Fri, 20 Oct 2017 15:11:27 +0800
Subject: [PATCH] "Task list add btn"

---
 module/project/js/common.js    | 17 ++++++++++++++
 module/task/js/common.js       |  2 +-
 module/task/model.php          |  1 +
 module/task/view/view.html.php | 42 ++++++++++++++++++++++++++++++++--
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/module/project/js/common.js b/module/project/js/common.js
index dc3a24d66a..5f3298ac06 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -174,3 +174,20 @@ $(function()
         computeWorkDays(this.id);
     })
 });
+
+$('.task-toggle').click(function()
+{
+    var obj = $(this).find('i');
+    var id  = $(this).data('id');
+    if(obj.hasClass('icon-plus'))
+    {
+        $('tr.parent-'+id).show();
+        obj.removeClass('icon-plus').addClass('icon-minus');
+    }
+    else if(obj.hasClass('icon-minus'))
+    {
+        $('tr.parent-'+id).hide();
+        obj.removeClass('icon-minus').addClass('icon-plus');
+    }
+    return false;
+});
\ No newline at end of file
diff --git a/module/task/js/common.js b/module/task/js/common.js
index 140db4051e..9363ddb004 100644
--- a/module/task/js/common.js
+++ b/module/task/js/common.js
@@ -56,4 +56,4 @@ $('#modalTeam .btn').click(function()
         $('#teamMember').val(team);
         $('#estimate').val(time);
     })
-})
+})
\ No newline at end of file
diff --git a/module/task/model.php b/module/task/model.php
index b7643dc362..1dc1000479 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1836,6 +1836,7 @@ class taskModel extends model
                 if($modulePairs and $task->module) echo "<span class='label label-info label-badge'>" . $modulePairs[$task->module] . '</span> ';
                 echo html::a($taskLink, $task->name, null, "style='color: $task->color'");
                 if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");
+                if($task->children) echo '<span class="task-toggle" data-id="'.$task->id.'">&nbsp;&nbsp;<i class="icon icon-minus"></i>&nbsp;&nbsp;</span>';
                 break;
             case 'type':
                 echo $this->lang->task->typeList[$task->type];
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 3decac4ae3..58ab441e40 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -87,7 +87,6 @@
         <div class='article-content'><?php echo $task->storyVerify;?></div>
       </fieldset>
       <?php endif;?>
-
       <?php if(isset($task->cases) and $task->cases):?>
       <fieldset>
         <legend><?php echo $lang->task->case;?></legend>
@@ -98,7 +97,46 @@
         </div>
       </fieldset>
       <?php endif;?>
-
+        <?php if(!empty($task->children)):?>
+      <fieldset>
+        <legend><?php echo $this->lang->task->children;?></legend>
+        <table class='table table-hover table-data table-fixed'>
+          <tr class='text-center'>
+            <th class='w-60px'> <?php echo$lang->task->id;?></th>
+            <th class='w-40px'> <?php echo$lang->task->lblPri;?></th>
+            <th>                <?php echo$lang->task->name;?></th>
+            <th class='w-100px'><?php echo$lang->task->deadline;?></th>
+            <th class='w-80px'> <?php echo$lang->task->assignedTo;?></th>
+            <th class='w-90px'> <?php echo$lang->task->status;?></th>
+            <th class='w-50px visible-lg'> <?php echo $lang->task->consumedAB . $lang->task->lblHour;?></th>
+            <th class='w-50px visible-lg'><?php echo $lang->task->leftAB . $lang->task->lblHour;?></th>
+            <th class='w-150px'><?php echo $lang->actions;?></th>
+          </tr>
+            <?php foreach($task->children as $child):?>
+              <tr class='text-center'>
+                <td><?php echo $child->id;?></td>
+                <td><span class='active pri pri-<?php echo $child->pri; ?>'><?php echo $lang->task->priList[$child->pri];?></span></td>
+                <td class='text-left'><a href="<?php echo $this->createLink('task', 'view', "taskID=$child->id"); ?>"><?php echo $child->name;?></a></td>
+                <td><?php echo $child->deadline;?></td>
+                <td><?php if(isset($users[$child->assignedTo])) echo $users[$child->assignedTo];?></td>
+                <td><?php echo zget($lang->task->statusList, $child->status);?></td>
+                <td class='visible-lg'><?php echo $child->consumed;?></td>
+                <td class='visible-lg'><?php echo $child->left;?></td>
+                <td>
+                    <?php
+                    common::printIcon('task', 'assignTo', "projectID=$child->project&taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                    common::printIcon('task', 'start',    "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                    common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true);
+                    common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                    common::printIcon('task', 'close',    "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                    common::printIcon('task', 'edit',"taskID=$child->id", $child, 'list');
+                    ?>
+                </td>
+              </tr>
+            <?php endforeach;?>
+        </table>
+      </fieldset>
+        <?php endif;?>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'> <?php if(!$task->deleted) echo $actionLinks;?></div>