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

* [bug#50382,0.3h,done] get earliest begin and lasted end date for testreport.

Browse Source
This commit is contained in:
liumengyi
2024-06-07 14:36:19 +08:00
parent 91a31c1a00
commit 8d06c8010e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testreport/zen.php
+9 -2
View File
@@ -194,6 +194,8 @@ class testreportZen extends testreport
$buildIdList = array();
$productIdList = array();
$tasks = $this->testtask->getExecutionTasks($executionID, $objectType);
$taskBegin = '';
$taskEnd = '';
foreach($tasks as $i => $task)
{
if($extra && strpos(",{$extra},", ",{$task->id},") === false)
@@ -206,11 +208,16 @@ class testreportZen extends testreport
$productIdList[$task->product] = $task->product;
$this->setChartDatas($task->id);
if($task->build != 'trunk') $buildIdList[$task->build] = $task->build;
if(empty($taskBegin)) $taskBegin = $task->begin;
if(empty($taskEnd)) $taskEnd = $task->end;
if($taskBegin > $task->begin) $taskBegin = $task->begin;
if($taskEnd < $task->end) $taskEnd = $task->end;
}
$task = $objectID ? $this->testtask->getByID((int)$extra) : key($tasks);
$begin = !empty($begin) ? date("Y-m-d", strtotime($begin)) : (string)$task->begin;
$end = !empty($end) ? date("Y-m-d", strtotime($end)) : (string)$task->end;
$begin = !empty($begin) ? date("Y-m-d", strtotime($begin)) : (string)$taskBegin;
$end = !empty($end) ? date("Y-m-d", strtotime($end)) : (string)$taskEnd;
$builds = $this->build->getByList($buildIdList);
$bugs = $this->testreport->getBugs4Test($builds, $productIdList, $begin, $end, 'execution');
$execution = $this->execution->getById($executionID);