| id;?> |
createLink('build', 'view', "build=$build->id"), $build->name);?> |
- scmPath, 'http') === 0 ? printf(html::a($build->scmPath)) : printf($build->scmPath);?> |
- filePath, 'http') === 0 ? printf(html::a($build->filePath)) : printf($build->filePath);?> |
+ scmPath, 'http') === true ? html::a($build->scmPath) : $build->scmPath;?> |
+ filePath, 'http') === true ? html::a($build->filePath) : $build->filePath;?> |
date?> |
builder]?> |
diff --git a/module/project/control.php b/module/project/control.php
index a48d5ff535..46a77050f1 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -290,6 +290,14 @@ class project extends control
{
$groupTasks[$task->$groupBy][] = $task;
}
+ if(isset($task->children))
+ {
+ foreach($task->children as $child)
+ {
+ $groupTasks[$child->assignedToRealName][] = $child;
+ }
+ $task->children = true;
+ }
}
/* Process closed data when group by assignedTo. */
if($groupBy == 'assignedTo' and isset($groupTasks['Closed']))
diff --git a/module/project/model.php b/module/project/model.php
index 23fa69b0c2..a38c042772 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -564,7 +564,7 @@ class projectModel extends model
*
* @param int $projectID
* @access public
- * @return void
+ * @return array
*/
public function close($projectID)
{
@@ -1681,7 +1681,7 @@ class projectModel extends model
*
* @param int $projectID
* @access public
- * @return void
+ * @return array
*/
public function getBurnDataFlot($projectID = 0)
{
@@ -1835,7 +1835,7 @@ class projectModel extends model
*/
public function summary($tasks)
{
- $taskSum = $statusWait = $statusDone = $statusDoing = $statusClosed = $statusCancel = $statusPause = 0;
+ $taskSum = $statusWait = $statusDone = $statusDoing = $statusClosed = $statusCancel = $statusPause = 0;
$totalEstimate = $totalConsumed = $totalLeft = 0.0;
foreach($tasks as $task)
@@ -1845,7 +1845,13 @@ class projectModel extends model
$totalLeft += (($task->status == 'cancel' or $task->closedReason == 'cancel') ? 0 : $task->left);
$statusVar = 'status' . ucfirst($task->status);
$$statusVar ++;
- if(!empty($task->children)) $taskSum += count($task->children);
+ if(!empty($task->children)){
+ $taskSum += count($task->children);
+ foreach($task->children as $child)
+ {
+ if($child->status == 'wait') $statusWait ++;
+ }
+ }
$taskSum ++;
}
@@ -1921,6 +1927,7 @@ class projectModel extends model
* @param string $end
* @param string $type
* @param string|int $interval
+ * @param string $format
* @access public
* @return array
*/
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index eec67d5780..699f4a1b63 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -65,7 +65,7 @@
if($groupBy == 'assignedTo' and $groupName == '') $groupName = $this->lang->task->noAssigned;
?>
$task)
{
if(isset($currentFilter) and $currentFilter != 'all')
@@ -87,8 +87,6 @@
}
}
- if(!empty($task->children)) $rowspan += count($task->children);
-
$groupEstimate += $task->estimate;
$groupConsumed += $task->consumed;
$groupLeft += ($task->status == 'cancel' ? 0 : $task->left);
@@ -99,7 +97,6 @@
if($task->status == 'closed') $groupClosed++;
}
$groupSum = count($groupTasks);
- $rowspan += $groupSum;
?>
@@ -107,7 +104,7 @@
createLink('task','view',"taskID=$task->id"); ?>
|
- |
+ |
" . $groupName, '', "class='expandGroup' data-action='expand' title='$groupName'");?>
assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
@@ -116,8 +113,15 @@
|
id;?> |
- task->priList, $task->pri, $task->pri)?>'>task->priList, $task->pri, $task->pri);?> |
- team)) echo ''.$lang->task->multipleAB.' ';if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?> |
+ task->priList), $task->pri, $task->pri)?>'>task->priList), $task->pri, $task->pri);?> |
+
+ team)) echo '' . $lang->task->multipleAB . ' ';
+ if(!empty($task->parent)) echo '' . $lang->task->childrenAB . ' ';
+ if(isset($task->children) && $task->children == true) echo '' . $lang->task->parentAB . ' ';
+ if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;
+ ?>
+ |
task->statusList[$task->status];?> |
'>deadline, 0, 4) > 0) echo $task->deadline;?> |
>assignedToRealName;?> |
@@ -132,33 +136,6 @@
project&taskid=$task->id", '', 'list', '', 'hiddenwin');?>
- children)):?>
- children as $key => $child):?>
-
- children)) ? ' table-child-bottom' : '';?>
-
- | id;?> |
-
- task->priList, $child->pri, $task->pri)?>'>task->priList, $child->pri, $child->pri);?>
- |
- task->childrenAB;?> id", $child->name)) echo $child->name;?> |
- task->statusList[$child->status];?> |
- '>deadline, 0, 4) > 0) echo $child->deadline;?> |
- >assignedToRealName;?> |
- finishedBy];?> |
- estimate;?> |
- consumed;?> |
- left;?> |
- progress . '%';?> |
- task->typeList[$child->type];?> |
-
- id", '', 'list');?>
- project&taskid=$child->id", '', 'list', '', 'hiddenwin');?>
- |
-
-
-
-
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 5d36a32d67..76831bedb2 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -103,6 +103,7 @@ $lang->task->transferTo = 'Transfer To';
$lang->task->children = 'Child';
$lang->task->childrenAB = 'Child';
$lang->task->parent = 'Parent Task';
+$lang->task->parentAB = 'Parent Task';
$lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
$lang->task->deniedNotice = 'This task can only be started by the first user in the team.';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 3104dd8dd4..035a1f0e06 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -103,6 +103,7 @@ $lang->task->transferTo = '转交给';
$lang->task->children = '子任务';
$lang->task->childrenAB = '子';
$lang->task->parent = '父任务';
+$lang->task->parentAB = '父';
$lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
$lang->task->deniedNotice = '此任务只允许由团队第一人开始。';