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

* adjust style.

Browse Source
This commit is contained in:
pengjiangxiu
2017-03-20 13:24:07 +08:00
parent f43682fec8
commit 1de940c5aa
17 changed files with 150 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+23 -9
View File
@@ -864,7 +864,7 @@ class testcaseModel extends model
{
$action = strtolower($action);
if($action == 'createbug') return $case->caseFailCount > 0;
if($action == 'createbug') return $case->caseFails > 0;
if($action == 'review') return $case->status == 'wait';
return true;
@@ -1258,18 +1258,25 @@ class testcaseModel extends model
* Append bugs and results.
*
* @param array $cases
* @param string $type
* @access public
* @return array
*/
public function appendBugAndResults($cases, $type = 'case')
public function appendData($cases, $type = 'case')
{
$caseIdList = array_keys($cases);
if($type == 'case')
{
$caseBugs = $this->dao->select('count(*) as count, `case`')->from(TABLE_BUG)->where('`case`')->in($caseIdList)->andWhere('deleted')->eq(0)->groupBy('`case`')->fetchPairs('case', 'count');
$results = $this->dao->select('count(*) as count, `case`')->from(TABLE_TESTRESULT)->where('`case`')->in($caseIdList)->groupBy('`case`')->fetchPairs('case', 'count');
$caseFailCount = $this->dao->select('`case` AS name, COUNT(*) AS value')->from(TABLE_TESTRESULT)->where('caseResult')->eq('fail')->andwhere('`case`')->in($caseIdList)->groupBy('name')->orderBy('value DESC')->fetchPairs('name','value');
$stepNumber = $this->dao->select('count(distinct t1.id) as count, t1.`case`')->from(TABLE_CASESTEP)->alias('t1')
$caseFails = $this->dao->select('count(*) as count, `case`')->from(TABLE_TESTRESULT)
->where('caseResult')->eq('fail')
->andwhere('`case`')->in($caseIdList)
->groupBy('`case`')
->fetchPairs('case','count');
$steps = $this->dao->select('count(distinct t1.id) as count, t1.`case`')->from(TABLE_CASESTEP)->alias('t1')
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.`case`=t2.`id`')
->where('t1.`case`')->in($caseIdList)
->andWhere('t1.type')->eq('item')
@@ -1281,7 +1288,14 @@ class testcaseModel extends model
{
$caseBugs = $this->dao->select('count(*) as count, `case`')->from(TABLE_BUG)->where('`result`')->in($caseIdList)->andWhere('deleted')->eq(0)->groupBy('`case`')->fetchPairs('case', 'count');
$results = $this->dao->select('count(*) as count, `case`')->from(TABLE_TESTRESULT)->where('`run`')->in($caseIdList)->groupBy('`run`')->fetchPairs('case', 'count');
$stepNumber = $this->dao->select('count(distinct t1.id) as count, t1.`case`')->from(TABLE_CASESTEP)->alias('t1')
$caseFails = $this->dao->select('count(*) as count, `case`')->from(TABLE_TESTRESULT)
->where('caseResult')->eq('fail')
->andwhere('`case`')->in($caseIdList)
->groupBy('`case`')
->fetchPairs('case','count');
$steps = $this->dao->select('count(distinct t1.id) as count, t1.`case`')->from(TABLE_CASESTEP)->alias('t1')
->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.`case`=t2.`case`')
->where('t2.`id`')->in($caseIdList)
->andWhere('t1.type')->eq('item')
@@ -1293,10 +1307,10 @@ class testcaseModel extends model
foreach($cases as $key => $case)
{
$caseID = $type == 'case' ? $case->id : $case->case;
$case->bugs = isset($caseBugs[$caseID]) ? $caseBugs[$caseID] : 0;
$case->results = isset($results[$caseID]) ? $results[$caseID] : 0;
$case->caseFailCount = isset($caseFailCount[$caseID])? $caseFailCount[$caseID] : 0;
$case->stepNumber = isset($stepNumber[$caseID]) ? $stepNumber[$caseID] : 0;
$case->bugs = isset($caseBugs[$caseID]) ? $caseBugs[$caseID] : 0;
$case->results = isset($results[$caseID]) ? $results[$caseID] : 0;
$case->caseFails = isset($caseFails[$caseID]) ? $caseFails[$caseID] : 0;
$case->stepNumber = isset($stepNumber[$caseID]) ? $stepNumber[$caseID] : 0;
}
return $cases;