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

* finish task#666.

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2012-05-17 08:34:04 +00:00
parent d8897545b8
commit 0cb2ea93a4
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+13 -5
View File
@@ -447,15 +447,23 @@ class testtask extends control
{
if($caseID)
{
$this->view->case = $this->loadModel('testcase')->getByID($caseID, $version);
$this->view->results = $this->testtask->getResults(0, $caseID);
$case = $this->loadModel('testcase')->getByID($caseID, $version);
$results = $this->testtask->getResults(0, $caseID);
}
else
{
$this->view->case = $this->testtask->getRunById($runID)->case;
$this->view->results = $this->testtask->getResults($runID);
$case = $this->testtask->getRunById($runID)->case;
$results = $this->testtask->getResults($runID);
$testtaskID = $this->dao->select('task')->from(TABLE_TESTRUN)->where('id')->eq($runID)->fetch('task', false);
$testtask = $this->dao->select('build, product')->from(TABLE_TESTTASK)->where('id')->eq($testtaskID)->fetch();
$builds = $this->loadModel('build')->getProductBuildPairs($testtask->product);
$this->view->build = isset($builds[$testtask->build]) ? $builds[$testtask->build] : '';
}
$this->view->users = $this->loadModel('user')->getPairs('noclosed, noletter');
$this->view->case = $case;
$this->view->results = $results;
$this->view->users = $this->loadModel('user')->getPairs('noclosed, noletter');
die($this->display());
}
module/testtask/view/results.html.php
+1
View File
@@ -20,6 +20,7 @@
<table class='table-1'>
<caption>
<div class='f-left'>RESULT#<?php echo $result->id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?></div>
<?php if(isset($build)):?><div class='f-right'><?php echo $lang->testtask->build . $lang->colon . $build;?></div><?php endif;?>
</caption>
<tr>
<th class='w-30px'><?php echo $lang->testcase->stepID;?></th>