diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 6725d65f81..b9db7d842d 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -32,15 +32,15 @@ var customed = ; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved¶m=0"), $lang->bug->unResolved) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs¶m=0"), $lang->bug->longLifeBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs¶m=0"), $lang->bug->postponedBugs) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->bug->needConfirm) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->bug->needConfirm) . ""; echo "{$lang->bug->byQuery} "; ?>
@@ -56,7 +56,7 @@ var customed = ; - - - - + + + @@ -107,7 +107,7 @@ var customed = ; id"; if(!($bug->status == 'active' and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' '; - if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' '; + if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' '; common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit); ?> diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index e008141d81..3cd3f38b77 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -22,8 +22,8 @@
exportCSV, $lang->setFileName);?> @@ -35,7 +35,7 @@
+
@@ -79,9 +79,9 @@ var customed = ;
bug->story);?> actions;?> openedByAB);?>assignedToAB);?>bug->resolvedByAB);?>openedByAB);?>assignedToAB);?>bug->resolvedByAB);?> bug->resolutionAB);?> actions;?>
- - +
+
@@ -46,7 +46,7 @@
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index b8c899a140..80ed57d707 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -44,6 +44,15 @@ + assignedTo == $app->user->account ? 'style=color:red' : '';?> assignedTo == $app->user->account ? 'style=color:red' : '';?> @@ -51,22 +60,32 @@ $totalEstimate += $task->estimate; $totalConsumed += $task->consumed; $totalLeft += $task->left; + + $groupEstimate += $task->estimate; + $groupConsumed += $task->consumed; + $groupLeft += $task->left; + if($task->status == 'wait') { $statusWait++; + $groupWait++; } elseif($task->status == 'doing') { $statusDoing++; + $groupDoing++; } elseif($task->status == 'done') { $statusDone++; + $groupDone++; } else { $statusCancel++; + $groupCancel++; } + $groupSum = count($groupTasks); $taskSum += count($tasks); ?> @@ -87,12 +106,12 @@ + -
project->taskSummary, $groupSum, $groupWait,$groupDoing,$groupDone,$groupCancel,$groupEstimate,$groupConsumed,$groupLeft);?>
project->taskSummary, $taskSum, $statusWait,$statusDoing,$statusDone,$statusCancel,$totalEstimate,$totalConsumed,$totalLeft);?>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 65d7a02c2c..e5450cc6f0 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -31,8 +31,8 @@ var moduleID = '';
@@ -44,7 +44,7 @@ var moduleID = ''; - - +
+
@@ -53,7 +53,7 @@ var moduleID = '';
recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -63,7 +63,7 @@ var moduleID = ''; - +
priAB);?> testcase->title);?> testcase->story);?>testcase->story);?> actions;?> typeAB);?>