* Add empty judgment.

This commit is contained in:
tianshujie98
2021-05-24 08:56:32 +08:00
parent 6c47912596
commit d55163f464
2 changed files with 9 additions and 3 deletions
+8 -2
View File
@@ -148,6 +148,7 @@ class testreportModel extends model
$severityGroups = $statusGroups = $openedByGroups = $resolvedByGroups = $resolutionGroups = $moduleGroups = $typeGroups = $stageGoups = $handleGroups = array();
/* Init stageGroups. */
$isEmptyStage = true;
foreach($this->lang->bug->priList as $priKey => $priValue)
{
$stageGroups[$priKey]['generated'] = 0;
@@ -156,6 +157,7 @@ class testreportModel extends model
}
/* Init handleGroups. */
$isEmptyHandle = true;
$beginTimeStamp = strtotime($begin);
$endTimeStamp = strtotime($end);
for($i = $beginTimeStamp; $i <= $endTimeStamp; $i += 86400)
@@ -174,6 +176,8 @@ class testreportModel extends model
$resolvedDate = date('m-d', strtotime($bug->resolvedDate));
$stageGroups[$bug->pri]['resolved'] += 1;
$handleGroups['resolved'][$resolvedDate] += 1;
$isEmptyStage = false;
$isEmptyHandle = false;
}
}
@@ -187,6 +191,8 @@ class testreportModel extends model
$foundBugs[$bug->id] = $bug;
$stageGroups[$bug->pri]['generated'] += 1;
$handleGroups['generated'][$openedDate] += 1;
$isEmptyStage = false;
$isEmptyHandle = false;
if($bug->status == 'active' or $bug->resolvedDate > "$end 23:59:59")
{
@@ -228,8 +234,8 @@ class testreportModel extends model
$bugInfo['countBugByTask'] = $byCaseNum;
$bugInfo['bugConfirmedRate'] = empty($resolvedBugs) ? 0 : round((zget($resolutionGroups, 'fixed', 0) + zget($resolutionGroups, 'postponed', 0)) / $resolvedBugs * 100, 2);
$bugInfo['bugCreateByCaseRate'] = empty($byCaseNum) ? 0 : round($byCaseNum / count($foundBugs) * 100, 2);
$bugInfo['bugStageGroups'] = $stageGroups;
$bugInfo['bugHandleGroups'] = $handleGroups;
$bugInfo['bugStageGroups'] = $isEmptyStage ? array() : $stageGroups;
$bugInfo['bugHandleGroups'] = $isEmptyHandle ? array() : $handleGroups;
$this->app->loadLang('bug');
$users = $this->loadModel('user')->getPairs('noclosed|noletter|nodeleted');
@@ -200,7 +200,7 @@
<?php js::set('zeroPri', $lang->null);?>
<?php js::set('bugStageGroups', $bugInfo['bugStageGroups']);?>
<?php js::set('bugHandleGroups', $bugInfo['bugHandleGroups']);?>
<?php js::set('dateGroups', array_keys($bugInfo['bugHandleGroups']['generated']));?>
<?php js::set('dateGroups', !empty($bugInfo['bugHandleGroups']) ? array_keys($bugInfo['bugHandleGroups']['generated']) : '');?>
<script>
var priList = [];
var stageList = [];