Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* some other change for task #453.

Browse Source
This commit is contained in:
liukmqd@gmail.com
2011-04-26 03:42:10 +00:00
parent c418e46548
commit c8dee6d691
4 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.html.php
+9 -9
View File
@@ -32,15 +32,15 @@ var customed = <?php echo (int)$customed;?>;
echo "<span id='unresolvedTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved&param=0"), $lang->bug->unResolved) . "</span>";
echo "<span id='longlifebugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs&param=0"), $lang->bug->longLifeBugs) . "</span>";
echo "<span id='postponedbugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs&param=0"), $lang->bug->postponedBugs) . "</span>";
echo "<span id='allTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "</span>";
echo "<span id='needconfirmTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->bug->needConfirm) . "</span>";
echo "<span id='allTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "</span>";
echo "<span id='needconfirmTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->bug->needConfirm) . "</span>";
echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'>{$lang->bug->byQuery}</a></span> ";
?>
</div>
<script language='Javascript'>
$("#bysearchTab").toggle(
function(){$("#querybox").show(); $("#sidetable").hide(); $("#divider").hide(); },
function(){$("#querybox").hide(); $("#sidetable").show(); $("#divider").show(); }
function(){$("#querybox").show(); $("#treebox").hide(); $(".divider").hide(); },
function(){$("#querybox").hide(); $("#treebox").show(); $(".divider").show(); }
);
</script>
<div class='f-right'>
@@ -56,7 +56,7 @@ var customed = <?php echo (int)$customed;?>;
<table class='cont-lt1'>
<tr valign='top'>
<td id='sidetable' class='side <?php echo $treeClass;?>' id='treebox'>
<td class='side <?php echo $treeClass;?>' id='treebox'>
<div class='box-title'><?php echo $productName;?></div>
<div class='box-content'>
<?php echo $moduleTree;?>
@@ -79,9 +79,9 @@ var customed = <?php echo (int)$customed;?>;
<th class='w-p40'><?php common::printOrderLink('story', $orderBy, $vars, $lang->bug->story);?></th>
<th class='w-50px'><?php echo $lang->actions;?></th>
<?php else:?>
<th class='w-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='w-120px {sorter:false}'><?php echo $lang->actions;?></th>
<?php endif;?>
@@ -107,7 +107,7 @@ var customed = <?php echo (int)$customed;?>;
<?php
$params = "bugID=$bug->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);
?>
</td>
module/product/view/browse.html.php
+4 -4
View File
@@ -22,8 +22,8 @@
</div>
<script language='Javascript'>
$("#bysearchTab").toggle(
function(){ $("#querybox").show(); $("#sidetable").hide(); $("#divider").hide(); },
function(){ $("#querybox").hide(); $("#sidetable").show(); $("#divider").show(); } );
function(){ $("#querybox").show(); $("#treebox").hide(); $(".divider").hide(); },
function(){ $("#querybox").hide(); $("#treebox").show(); $(".divider").show(); } );
</script>
<div class='f-right'>
<?php echo html::export2csv($lang->exportCSV, $lang->setFileName);?>
@@ -35,7 +35,7 @@
<table class='cont-lt1'>
<tr valign='top'>
<td id='sidetable'class='side <?php echo $treeClass;?>' id='treebox'>
<td class='side <?php echo $treeClass;?>' id='treebox'>
<div class='box-title'><?php echo $productName;?></div>
<div class='box-content'>
<?php echo $moduleTree;?>
@@ -46,7 +46,7 @@
</div>
</div>
</td>
<td id='divider' class='divider <?php echo $treeClass;?>'></td>
<td class='divider <?php echo $treeClass;?>'></td>
<td>
<table class='table-1 fixed colored tablesorter datatable'>
<thead>
module/project/view/grouptask.html.php
+20 -1
View File
@@ -44,6 +44,15 @@
<td class='<?php echo $groupClass;?> a-center f-16px strong'><?php echo $groupKey;?></td>
<td colspan='10'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
</tr>
<?php
$groupWait = 0;
$groupDone = 0;
$groupDoing = 0;
$groupCancel = 0;
$groupEstimate = 0.0;
$groupConsumed = 0.0;
$groupLeft = 0.0;
?>
<?php foreach($groupTasks as $task):?>
<?php $assignedToClass = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
<?php $class = $task->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);
?>
<tr id='<?php echo $task->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
@@ -87,12 +106,12 @@
</td>
</tr>
<?php endforeach;?>
<tr><td colspan = 12 class ='a-right'><?php printf($lang->project->taskSummary, $groupSum, $groupWait,$groupDoing,$groupDone,$groupCancel,$groupEstimate,$groupConsumed,$groupLeft);?></td></tr>
<?php endforeach;?>
<?php
if(count($tasks) == 0) $taskSum = 0;
else $taskSum = $taskSum/count($tasks);
?>
<tr><td colspan= 12 class='a-right'><?php printf($lang->project->taskSummary, $taskSum, $statusWait,$statusDoing,$statusDone,$statusCancel,$totalEstimate,$totalConsumed,$totalLeft);?></td></tr>
</table>
<script language='Javascript'>$('#<?php echo $browseType;?>Tab').addClass('active');</script>
<?php include '../../common/view/footer.html.php';?>
module/testcase/view/browse.html.php
+5 -5
View File
@@ -31,8 +31,8 @@ var moduleID = '<?php echo $moduleID;?>';
<script language='Javascript'>
$("#bysearchTab").
toggle(
function(){$("#querybox").show(); $("#sidetable").hide(); $("#divider").hide(); },
function(){$("#querybox").hide(); $("#sidetable").show(); $("#divider").show(); }
function(){$("#querybox").show(); $(".side").hide(); $(".divider").hide(); },
function(){$("#querybox").hide(); $(".side").show(); $(".divider").show(); }
);
</script>
<div class='f-right'>
@@ -44,7 +44,7 @@ var moduleID = '<?php echo $moduleID;?>';
<table class='cont-lt1'>
<tr valign='top'>
<td id='sidetable' class='side <?php echo $treeClass;?>'>
<td class='side <?php echo $treeClass;?>'>
<div class='box-title'><?php echo $productName;?></div>
<div class='box-content'>
<?php echo $moduleTree;?>
@@ -53,7 +53,7 @@ var moduleID = '<?php echo $moduleID;?>';
</div>
</div>
</td>
<td id='divider' class='divider <?php echo $treeClass;?>'></td>
<td class='divider <?php echo $treeClass;?>'></td>
<td>
<?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<table class='table-1 colored tablesorter datatable'>
@@ -63,7 +63,7 @@ var moduleID = '<?php echo $moduleID;?>';
<th class='w-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th><?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
<?php if($browseType == 'needconfirm'):?>
<th> <?php common::printOrderLink('story', $orderBy, $vars, $lang->testcase->story);?></th>
<th><?php common::printOrderLink('story', $orderBy, $vars, $lang->testcase->story);?></th>
<th class='w-50px'><?php echo $lang->actions;?></th>
<?php else:?>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>