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

* testtask: rename the processRowspanOfCases method to processRowspanForGroupCase and refactor it.

Browse Source
This commit is contained in:
liugang
2023-09-25 09:55:41 +08:00
parent 795c8c0a9e
commit cca08c5c0b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+2 -1
View File
@@ -480,10 +480,11 @@ class testtask extends control
$groupBy = $groupBy ?: 'story';
$cases = $this->testtask->getRuns($taskID, 0, $groupBy);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
$cases = $this->loadModel('testcase')->appendData($cases, 'run');
/* 处理测试用例的跨行合并属性供前端组件分组使用。*/
/* Process the rowspan property of cases for use by front-end component groupings. */
$cases = $this->testtaskZen->processRowspanOfCases($cases, $task->build);
$cases = $this->testtaskZen->processRowspanForGroupCase($cases, $task->build);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
module/testtask/zen.php
+7 -6
View File
@@ -520,18 +520,17 @@ class testtaskZen extends testtask
}
/**
* 处理测试用例的跨行合并属性供前端组件分组使用。
* Process the rowspan property of cases for use by front-end component groupings.
* 处理分组查看页面的测试用例的跨行合并属性供前端组件分组使用。
* Process the rowspan property of cases for groupCase page for use by front-end component groupings.
*
* @param array $cases
* @param int $build
* @access protected
* @return array
*/
protected function processRowspanOfCases(array $cases, int $build): array
protected function processRowspanForGroupCase(array $cases, int $build): array
{
$groupCases = array();
$cases = $this->loadModel('testcase')->appendData($cases, 'run');
foreach($cases as $case) $groupCases[$case->story][] = $case;
if($build)
@@ -545,14 +544,16 @@ class testtaskZen extends testtask
}
}
/* 将每个需求的总用例数量赋予每个需求的第一条测试用例。*/
/* Assign the total number of test cases under each story to the first test case of each story. */
$story = null;
foreach($cases as $case)
{
$case->rowspan = 0;
if($story !== $case->story)
if($story !== $case->story && !empty($groupCases[$case->story]))
{
$story = $case->story;
if(!empty($groupCases[$case->story])) $case->rowspan = count($groupCases[$case->story]);
$case->rowspan = count($groupCases[$case->story]);
}
}