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

* adjust for show unit.

Browse Source
This commit is contained in:
wangyidong
2020-04-02 16:50:43 +08:00
parent 3fae19d76b
commit d649cbcbaa
17 changed files with 496 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+128 -1
View File
@@ -91,6 +91,52 @@ class testtask extends control
$this->display();
}
/**
* Browse unit task.
*
* @param int $productID
* @param string $browseType
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
public function browseUnit($productID = 0, $browseType = 'newest', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
$this->session->set('testtaskList', $this->app->getURI(true));
/* Set menu. */
$productID = $this->product->saveState($productID, $this->products);
$this->lang->testtask->menu = $this->lang->testcase->menu;
$this->lang->testtask->menuOrder = $this->lang->testcase->menuOrder;
$this->lang->testtask->subMenu->testcase->unit['subModule'] = 'testtask';
$this->loadModel('testtask')->setUnitMenu($this->products, $productID);
/* Load pager. */
if($browseType == 'newest') $recPerPage = '10';
$this->app->loadClass('pager', $static = true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
/* Append id for secend sort. */
$sort = $this->loadModel('common')->appendOrder($orderBy);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common;
$this->view->position[] = html::a($this->createLink('testtask', 'browseUnit', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testtask->common;
$this->view->productID = $productID;
$this->view->productName = $this->products[$productID];
$this->view->orderBy = $orderBy;
$this->view->browseType = $browseType;
$this->view->tasks = $this->testtask->getProductUnitTasks($productID, $browseType, $sort, $pager);
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->pager = $pager;
$this->display();
}
/**
* Create a test task.
*
@@ -233,6 +279,87 @@ class testtask extends control
$this->display();
}
/**
* Browse unit cases.
*
* @param int $taskID
* @param string $orderBy
* @access public
* @return void
*/
public function units($taskID, $orderBy = 'id_desc')
{
$task = $this->testtask->getById($taskID);
/* Set browseType, productID, moduleID and queryID. */
$productID = $this->product->saveState($task->product, $this->products);
/* Set menu, save session. */
$this->lang->testtask->menu = $this->lang->testcase->menu;
$this->lang->testtask->menuOrder = $this->lang->testcase->menuOrder;
$this->lang->testtask->subMenu->testcase->unit['subModule'] = 'testtask';
$this->loadModel('testtask')->setUnitMenu($this->products, $productID, 0, $taskID);
$this->session->set('caseList', $this->app->getURI(true));
/* Load lang. */
$this->app->loadLang('testtask');
$this->app->loadLang('project');
/* Get test cases. */
$runs = $this->testtask->getRuns($taskID, 0, $orderBy);
/* save session .*/
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
$cases = array();
$runs = $this->loadModel('testcase')->appendData($runs, 'testrun');
foreach($runs as $run) $cases[$run->case] = $run;
$results = $this->dao->select('*')->from(TABLE_TESTRESULT)->where('`case`')->in(array_keys($cases))->andWhere('run')->in(array_keys($runs))->fetchAll('run');
foreach($results as $result)
{
$runs[$result->run]->caseResult = $result->caseResult;
$runs[$result->run]->xml = $result->xml;
$runs[$result->run]->duration = $result->duration;
}
$groupCases = $this->dao->select('*')->from(TABLE_SUITECASE)->where('`case`')->in(array_keys($cases))->orderBy('case')->fetchGroup('suite', 'case');
$summary = array();
foreach($groupCases as $suiteID => $groupCase)
{
$caseNum = 0;
$failNum = 0;
$duration = 0;
foreach($groupCase as $caseID => $suitecase)
{
$case = $cases[$caseID];
$groupCases[$suiteID][$caseID] = $case;
$duration += $case->duration;
$caseNum ++;
if($case->caseResult == 'fail') $failNum ++;
}
$summary[$suiteID] = sprintf($this->lang->testtask->unitSummary, $caseNum, $failNum, $duration);
}
$suites = $this->loadModel('testsuite')->getUnit($productID);
/* Assign. */
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common;
$this->view->position[] = html::a($this->createLink('testcase', 'browseUnit', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testcase->common;
$this->view->productID = $productID;
$this->view->product = $this->product->getById($productID);
$this->view->productName = $this->products[$productID];
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->groupCases = $groupCases;
$this->view->suites = $suites;
$this->view->summary = $summary;
$this->view->taskID = $taskID;
$this->display();
}
/**
* Browse cases of a test task.
*
@@ -1046,7 +1173,7 @@ class testtask extends control
if(dao::isError()) die(js::error(dao::getError()));
$this->loadModel('action')->create('testtask', $taskID, 'opened');
die(js::locate($this->createLink('testtask', 'cases', "taskID=$taskID"), 'parent'));
die(js::locate($this->createLink('testtask', 'units', "taskID=$taskID"), 'parent'));
}
$this->testtask->setMenu($this->products, $productID);