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

* code for 2899.

Browse Source
This commit is contained in:
wangyidong
2017-03-10 09:58:49 +08:00
parent cb90082ae3
commit 107039b87b
11 changed files with 270 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testreport/control.php
+4 -2
View File
@@ -320,16 +320,18 @@ class testreport extends control
$this->session->set('notHead', false);
$style = <<<EOD
<style>
body{font-size:14px}h1{font-size:16px}
body{font-size:14px}h1{font-size:16px;text-align:center}
.w-100px{width:100px}.w-p50{width:50%}.w-id{width:70px}.w-pri{width:40px}.w-user{width:80px}.w-80px{width:80px}.w-70px{width:70px}.w-hour[width:57px].w-status{width:60px}.w-130px{width:130px;}.w-type{width:80px}.w-150px{width:150px;}
.text-center{text-align:center}.text-top{vertical-align:top;}.text-left{text-align:left}.text-right{text-align:right;}
.table{width:100%;margin-bottom:5px;border:1px solid #ddd;border-collapse:collapse;border-spacing:0;}
.table caption{padding:8px 20px;border:1px solid #DDD;border-bottom:0;background:#fafafa;}.table td, .table th{border-bottom:1px solid #ddd;padding:5px;}
.table caption{padding:8px 20px;border:1px solid #DDD;border-bottom:0;background:#fafafa;text-align:left}.table td, .table th{border-bottom:1px solid #ddd;padding:5px;}
.table>thead>tr>th{text-align:center;vertical-align:middle;background-color:#f1f1f1;border-bottom:1px solid #ddd;}
.table-form{border: none;}.table-form>tbody>tr>th,.table-form>tbody>tr>td{border-bottom:none;}.table-form>tbody>tr>th{text-align:right;}
.input-group{width:100%;}.input-group{position:relative;display:table;border-collapse:separate;}
.input-group-addon:first-child {border-right:0;}
.input-group-addon{background-color:#f5f5f5;padding:6px 12px;font-size:13px;font-weight:400;line-height:1;color:#222;text-align:center;background-color:#e5e5e5;border:1px solid #ccc;border-radius:0;display:table-cell;}
.input-group-addon:first-child{border-top-right-radius:0;border-bottom-right-radius:0;}
fieldset{margin-bottom:15px;border:1px solid #e5e5e5;padding:10px 15px 15px;}fieldset>legend{width:auto;margin:0 0 0 -5px;font-weight:bold;border-bottom:none;padding:0 5px;display:block;}
</style>
EOD;
$content = "<!DOCTYPE html>\n<html lang='zh-cn'>\n<head>\n<meta charset='utf-8'>\n<title>{$report->title}</title>\n$style</head>\n<body>\n<h1>{$report->title}</h1>\n$output</body></html>";
module/testreport/lang/zh-cn.php
+15 -9
View File
@@ -15,7 +15,7 @@ $lang->testreport->builds = '版本信息';
$lang->testreport->goal = '项目目标';
$lang->testreport->coverage = '需求覆盖率';
$lang->testreport->cases = '用例';
$lang->testreport->bugInfo = '缺陷信息';
$lang->testreport->bugInfo = '缺陷分布';
$lang->testreport->report = '总结';
$lang->testreport->legacyBugs = '遗留的Bug';
$lang->testreport->createdDate = '创建时间';
@@ -24,15 +24,21 @@ $lang->testreport->value = '值';
$lang->testreport->none = '无';
$lang->testreport->all = '所有报告';
$lang->testreport->bugSeverityGroups = '严重级别分布';
$lang->testreport->bugStatusGroups = '状态分布';
$lang->testreport->bugOpenedByGroups = '创建者分布';
$lang->testreport->bugResolvedByGroups = '解决者分布';
$lang->testreport->bugResolutionGroups = '解决方案分布';
$lang->testreport->bugModuleGroups = '模块分布';
$lang->testreport->legendBasic = '基本信息';
$lang->testreport->legendStoryAndBug = '测试的需求和Bug';
$lang->testreport->legendBuild = '版本信息';
$lang->testreport->legendCase = '执行的用例的信息';
$lang->testreport->legendBug = '缺陷信息';
$lang->testreport->bugSeverityGroups = '产生Bug严重级别分布';
$lang->testreport->bugStatusGroups = '产生Bug状态分布';
$lang->testreport->bugOpenedByGroups = '产生Bug创建者分布';
$lang->testreport->bugResolvedByGroups = '产生Bug解决者分布';
$lang->testreport->bugResolutionGroups = '产生Bug解决方案分布';
$lang->testreport->bugModuleGroups = '产生Bug模块分布';
$lang->testreport->legacyBugs = '遗留的Bug';
$lang->testreport->bugConfirmedRate = '有效Bug率';
$lang->testreport->bugCreateByCaseRate = '用例发现Bug率';
$lang->testreport->bugConfirmedRate = '有效Bug率 (确认的Bug / 测试创建的Bug)';
$lang->testreport->bugCreateByCaseRate = '用例发现Bug率 (用例创建的Bug / 时间区间中新增的Bug)';
$lang->testreport->caseSummary = '共有%s个用例，共执行%s个用例，产生了%s个结果，失败的用例有%s个';
$lang->testreport->confirmDelete = '是否删除该报告？';
module/testreport/model.php
+5 -11
View File
@@ -112,9 +112,9 @@ class testreportModel extends model
*/
public function getBugInfo($tasks, $productIdList, $begin, $end, $builds)
{
$bugsByTask = $this->dao->select('*')->from(TABLE_BUG)->where('testtask')->in(array_keys($tasks))->andWhere('deleted')->eq(0)->fetchAll();
$bugsByTask = $this->dao->select('*')->from(TABLE_BUG)->where('testtask')->in(array_keys($tasks))->andWhere('deleted')->eq(0)->fetchAll();
$severityGroups = $statusGroups = $openedByGroups = $resolvedByGroups = $resolutionGroups = $moduleGroups = array();
$confirmedNum = 0;
$confirmedNum = 0;
foreach($bugsByTask as $bug)
{
$severityGroups[$bug->severity] = isset($severityGroups[$bug->severity]) ? $severityGroups[$bug->severity] + 1 : 1;
@@ -126,15 +126,9 @@ class testreportModel extends model
if($bug->confirmed) $confirmedNum ++;
}
$newBugs = $this->dao->select('*')->from(TABLE_BUG)
->where('product')->in($productIdList)
->andWhere('openedDate')->ge($begin)
->andWhere('openedDate')->le("$end 23:59:59")
->andWhere('deleted')->eq(0)
->fetchAll();
$legacyBugs = array();
$byCaseNum = 0;
$newBugs = $this->dao->select('*')->from(TABLE_BUG)->where('product')->in($productIdList)->andWhere('openedDate')->ge($begin)->andWhere('openedDate')->le("$end 23:59:59")->andWhere('deleted')->eq(0)->fetchAll();
$legacyBugs = array();
$byCaseNum = 0;
$buildIdList = array_keys($builds) + array('trunk' => 'trunk');
foreach($newBugs as $bug)
{
module/testreport/view/blockbuginfo.html.php
+95 -96
View File
@@ -1,110 +1,109 @@
<tr>
<th rowspan='4' class='text-top'><?php echo $lang->testreport->bugInfo?></th>
<td class='text-top'>
<th class='text-top w-80px'><?php echo $lang->testreport->bugInfo?></th>
<td class='text-top' colspan='2'>
<div class='input-group' id='bugConfirmedRate'>
<span class='input-group-addon'><?php echo $lang->testreport->bugConfirmedRate?></span>
<span class='input-group-addon'><?php echo $bugConfirmedRate . '%'?></span>
<span class='input-group-addon'><?php echo $lang->testreport->bugCreateByCaseRate?></span>
<span class='input-group-addon'><?php echo $bugCreateByCaseRate . '%'?></span>
</div>
</td>
<td></td>
</tr>
<tr>
<td class='text-top'>
<table class='table' id='bugSeverityGroups'>
<caption><?php echo $lang->testreport->bugSeverityGroups?></caption>
<table class='table table-form'>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->severity?></th>
<th><?php echo $lang->testreport->value?></th>
<td class='text-top' width='33%'>
<table class='table table-condensed' id='bugSeverityGroups'>
<caption><?php echo $lang->testreport->bugSeverityGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->severity?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($lang->bug->severityList as $severityKey => $severityValue):?>
<tr>
<td class='text-right'><?php echo $severityValue === '' ? 'null' : $severityValue?></td>
<td><?php echo zget($bugSeverityGroups, $severityKey, 0);?></td>
</tr>
<?php endforeach?>
</table>
</td>
<td class='text-top' width='33%'>
<table class='table table-condensed' id='bugStatusGroups'>
<caption><?php echo $lang->testreport->bugStatusGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->status?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($lang->bug->statusList as $statusKey => $statusValue):?>
<?php if(!isset($bugStatusGroups['']) and $statusValue === '') continue;?>
<tr>
<td class='text-right'><?php echo $statusValue === '' ? 'null' : $statusValue?></td>
<td><?php echo zget($bugStatusGroups, $statusKey, 0);?></td>
</tr>
<?php endforeach?>
</table>
</td>
<td class='text-top' width='33%'>
<table class='table table-condensed' id='bugResolutionGroups'>
<caption><?php echo $lang->testreport->bugResolutionGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->resolution?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($lang->bug->resolutionList as $resolutionKey => $resolutionValue):?>
<tr>
<td class='text-right'><?php echo $resolutionValue === '' ? 'null' : $resolutionValue?></td>
<td><?php echo zget($bugResolutionGroups, $resolutionKey, 0);?></td>
</tr>
<?php endforeach?>
</table>
</td>
</tr>
<?php foreach($lang->bug->severityList as $severityKey => $severityValue):?>
<tr>
<td class='text-right'><?php echo $severityValue === '' ? 'null' : $severityValue?></td>
<td><?php echo zget($bugSeverityGroups, $severityKey, 0);?></td>
<td class='text-top'>
<table class='table table-condensed' id='bugOpenedByGroups'>
<caption><?php echo $lang->testreport->bugOpenedByGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->openedBy?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($bugOpenedByGroups as $account => $num):?>
<tr>
<td class='text-right'><?php echo zget($users, $account)?></td>
<td><?php echo $num;?></td>
</tr>
<?php endforeach?>
</table>
</td>
<td class='text-top'>
<table class='table table-condensed' id='bugModuleGroups'>
<caption><?php echo $lang->testreport->bugModuleGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->module?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php ksort($bugModuleGroups)?>
<?php foreach($bugModuleGroups as $moduleKey => $num):?>
<tr>
<td class='text-right'><?php echo zget($modules, $moduleKey);?></td>
<td><?php echo $num;?></td>
</tr>
<?php endforeach?>
</table>
</td>
<td class='text-top'>
<table class='table table-condensed' id='bugResolvedByGroups'>
<caption><?php echo $lang->testreport->bugResolvedByGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->resolvedBy?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($bugResolvedByGroups as $account => $num):?>
<tr>
<td class='text-right'><?php echo zget($users, $account)?></td>
<td><?php echo $num;?></td>
</tr>
<?php endforeach?>
</table>
</td>
</tr>
<?php endforeach?>
</table>
</td>
<td class='text-top'>
<table class='table' id='bugStatusGroups'>
<caption><?php echo $lang->testreport->bugStatusGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->status?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($lang->bug->statusList as $statusKey => $statusValue):?>
<?php if(!isset($bugStatusGroups['']) and $statusValue === '') continue;?>
<tr>
<td class='text-right'><?php echo $statusValue === '' ? 'null' : $statusValue?></td>
<td><?php echo zget($bugStatusGroups, $statusKey, 0);?></td>
</tr>
<?php endforeach?>
</table>
</td>
</tr>
<tr>
<td class='text-top'>
<table class='table' id='bugOpenedByGroups'>
<caption><?php echo $lang->testreport->bugOpenedByGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->openedBy?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($bugOpenedByGroups as $account => $num):?>
<tr>
<td class='text-right'><?php echo zget($users, $account)?></td>
<td><?php echo $num;?></td>
</tr>
<?php endforeach?>
</table>
</td>
<td class='text-top'>
<table class='table' id='bugResolvedByGroups'>
<caption><?php echo $lang->testreport->bugResolvedByGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->resolvedBy?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($bugResolvedByGroups as $account => $num):?>
<tr>
<td class='text-right'><?php echo zget($users, $account)?></td>
<td><?php echo $num;?></td>
</tr>
<?php endforeach?>
</table>
</td>
</tr>
<tr>
<td class='text-top'>
<table class='table' id='bugResolutionGroups'>
<caption><?php echo $lang->testreport->bugResolutionGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->resolution?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php foreach($lang->bug->resolutionList as $resolutionKey => $resolutionValue):?>
<tr>
<td class='text-right'><?php echo $resolutionValue === '' ? 'null' : $resolutionValue?></td>
<td><?php echo zget($bugResolutionGroups, $resolutionKey, 0);?></td>
</tr>
<?php endforeach?>
</table>
</td>
<td class='text-top'>
<table class='table' id='bugModuleGroups'>
<caption><?php echo $lang->testreport->bugModuleGroups?></caption>
<tr>
<th class='text-right w-100px'><?php echo $lang->bug->module?></th>
<th><?php echo $lang->testreport->value?></th>
</tr>
<?php ksort($bugModuleGroups)?>
<?php foreach($bugModuleGroups as $moduleKey => $num):?>
<tr>
<td class='text-right'><?php echo zget($modules, $moduleKey);?></td>
<td><?php echo $num;?></td>
</tr>
<?php endforeach?>
</table>
</td>
</tr>
module/testreport/view/blockbugs.html.php
+4 -2
View File
@@ -1,5 +1,5 @@
<tr>
<th class='text-top'><?php echo $lang->testreport->bugs?></th>
<th class='text-top w-80px'><?php echo $lang->testreport->bugs?></th>
<td colspan='2'>
<?php if($bugs):?>
<table class='table' id='bugs'>
@@ -9,7 +9,8 @@
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th> <?php echo $lang->bug->title;?></th>
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
<th class='w-150px'><?php echo $lang->bug->resolvedBy;?></th>
<th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
<th class='w-130px'><?php echo $lang->bug->resolvedDate;?></th>
<th class='w-80px'> <?php echo $lang->statusAB;?></th>
</tr>
</thead>
@@ -21,6 +22,7 @@
<td class='text-left' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
<td><?php echo zget($lang->bug->statusList, $bug->status);?></td>
</tr>
<?php endforeach;?>
module/testreport/view/blockbuilds.html.php
+24 -29
View File
@@ -1,29 +1,24 @@
<tr>
<th class='text-top'><?php echo $lang->testreport->builds?></th>
<td colspan='2'>
<?php if($builds):?>
<table class='table' id='builds'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->build->id;?></th>
<th> <?php echo $lang->build->name;?></th>
<th class='w-user'><?php echo $lang->build->builder;?></th>
<th class='w-date'><?php echo $lang->build->date;?></th>
</tr>
</thead>
<tbody class='text-center'>
<?php foreach($builds as $build):?>
<tr>
<td><?php echo $build->id . html::hidden('builds[]', $build->id)?></td>
<td class='text-left' title='<?php echo $build->name?>'><?php echo $build->name?></td>
<td><?php echo zget($users, $build->builder);?></td>
<td><?php echo $build->date;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php else:?>
<?php echo 'Trunk'?>
<?php endif;?>
</td>
</tr>
<?php if($builds):?>
<table class='table' id='builds'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->build->id;?></th>
<th> <?php echo $lang->build->name;?></th>
<th class='w-user'><?php echo $lang->build->builder;?></th>
<th class='w-date'><?php echo $lang->build->date;?></th>
</tr>
</thead>
<tbody class='text-center'>
<?php foreach($builds as $build):?>
<tr>
<td><?php echo $build->id . html::hidden('builds[]', $build->id)?></td>
<td class='text-left' title='<?php echo $build->name?>'><?php echo $build->name?></td>
<td><?php echo zget($users, $build->builder);?></td>
<td><?php echo $build->date;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php else:?>
<?php echo 'Trunk'?>
<?php endif;?>
module/testreport/view/blockcases.html.php
+35 -40
View File
@@ -1,40 +1,35 @@
<tr>
<th class='text-top'><?php echo $lang->testreport->cases?></th>
<td colspan='2'>
<?php if($cases):?>
<table class='table' id='cases'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th> <?php echo $lang->testcase->title;?></th>
<th class='w-type'> <?php echo $lang->testcase->type;?></th>
<th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
<th class='w-user'> <?php echo $lang->testtask->lastRunAccount;?></th>
<th class='w-130px'> <?php echo $lang->testtask->lastRunTime;?></th>
<th class='w-80px'> <?php echo $lang->testtask->lastRunResult;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<tbody class='text-center'>
<?php foreach($cases as $case):?>
<tr>
<td><?php echo $case->id . html::hidden('cases[]', $case->id)?></td>
<td><span class='pri<?php echo $case->pri?>'><?php echo zget($lang->testcase->priList, $case->pri);?></span></td>
<td class='text-left' title='<?php echo $case->title?>'><?php echo $case->title?></td>
<td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
<td><?php echo zget($users, $case->assignedTo);?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
<td><?php echo substr($case->lastRunDate, 2);?></td>
<td><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
<td><?php echo zget($lang->testtask->statusList, $case->status);?></td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot><tr><td colspan='9'><?php echo $caseSummary;?></td></tr></tfoot>
</table>
<?php else:?>
<?php echo $lang->testreport->none;?>
<?php endif;?>
</td>
</tr>
<?php if($cases):?>
<table class='table' id='cases'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th> <?php echo $lang->testcase->title;?></th>
<th class='w-type'> <?php echo $lang->testcase->type;?></th>
<th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
<th class='w-user'> <?php echo $lang->testtask->lastRunAccount;?></th>
<th class='w-130px'> <?php echo $lang->testtask->lastRunTime;?></th>
<th class='w-80px'> <?php echo $lang->testtask->lastRunResult;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<tbody class='text-center'>
<?php foreach($cases as $case):?>
<tr>
<td><?php echo $case->id . html::hidden('cases[]', $case->id)?></td>
<td><span class='pri<?php echo $case->pri?>'><?php echo zget($lang->testcase->priList, $case->pri);?></span></td>
<td class='text-left' title='<?php echo $case->title?>'><?php echo $case->title?></td>
<td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
<td><?php echo zget($users, $case->assignedTo);?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
<td><?php echo substr($case->lastRunDate, 2);?></td>
<td><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
<td><?php echo zget($lang->testtask->statusList, $case->status);?></td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot><tr><td colspan='9'><?php echo $caseSummary;?></td></tr></tfoot>
</table>
<?php else:?>
<?php echo $lang->testreport->none;?>
<?php endif;?>
module/testreport/view/blocklegacybugs.html.php
+4 -2
View File
@@ -1,5 +1,5 @@
<tr>
<th class='text-top'><?php echo $lang->testreport->legacyBugs?></th>
<th class='text-top w-80px'><?php echo $lang->testreport->legacyBugs?></th>
<td colspan='2'>
<?php if($legacyBugs):?>
<table class='table' id='bugs'>
@@ -9,7 +9,8 @@
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th> <?php echo $lang->bug->title;?></th>
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
<th class='w-150px'><?php echo $lang->bug->resolvedBy;?></th>
<th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
<th class='w-130px'><?php echo $lang->bug->resolvedDate;?></th>
<th class='w-80px'> <?php echo $lang->statusAB;?></th>
</tr>
</thead>
@@ -21,6 +22,7 @@
<td class='text-left' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
<td><?php echo zget($lang->bug->statusList, $bug->status);?></td>
</tr>
<?php endforeach;?>
module/testreport/view/blockstories.html.php
+1 -1
View File
@@ -1,5 +1,5 @@
<tr>
<th class='text-top'><?php echo $lang->testreport->stories?></th>
<th class='text-top w-80px'><?php echo $lang->testreport->stories?></th>
<td colspan='2'>
<?php if($stories):?>
<table class='table' id='stories'>
module/testreport/view/create.html.php
+32 -14
View File
@@ -31,7 +31,10 @@
?>
</div>
</div>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<div class='main'>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<fieldset>
<legend><?php echo $lang->testreport->legendBasic?></legend>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->testreport->startEnd?></th>
@@ -65,25 +68,40 @@
<th><?php echo $lang->testreport->goal?></th>
<td colspan='2'><?php echo $project->desc?></td>
</tr>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendStoryAndBug?></legend>
<table class='table table-form'>
<?php include './blockstories.html.php'?>
<?php include './blockbugs.html.php'?>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendBuild?></legend>
<?php include './blockbuilds.html.php'?>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendCase?></legend>
<?php include './blockcases.html.php'?>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendBug?></legend>
<table class='table table-form'>
<?php include './blocklegacybugs.html.php'?>
<?php include './blockbuginfo.html.php'?>
<tr>
<th><?php echo $lang->testreport->report?></th>
<td colspan='2'><?php echo html::textarea('report', '', "class='form-control'")?></td>
</tr>
<tr>
<th><?php echo $lang->files?></th>
<td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
<tr>
<th></th>
<td colspan='2'><?php echo html::submitButton() . html::backButton();?></td>
</tr>
</table>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->report?></legend>
<?php echo html::textarea('report', '', "class='form-control'")?>
</fieldset>
<fieldset>
<legend><?php echo $lang->files?></legend>
<?php echo $this->fetch('file', 'buildform');?>
</fieldset>
<div><?php echo html::submitButton() . html::backButton();?></div>
</form>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/testreport/view/view.html.php
+51 -33
View File
@@ -41,41 +41,59 @@
</div>
</div>
<?php endif;?>
<table class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->testreport->startEnd?></th>
<td class='w-p50'> <?php echo $report->begin . ' ~ ' . $report->end;?></td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->testreport->owner?></th>
<td><?php echo zget($users, $report->owner);?></td>
</tr>
<tr>
<th><?php echo $lang->testreport->member?></th>
<td colspan='2'><?php foreach(explode(',', $report->members) as $member)echo zget($users, $member) . ' &nbsp; ';?></td>
</tr>
<tr>
<th><?php echo $lang->testreport->goal?></th>
<td colspan='2'><?php echo $project->desc?></td>
</tr>
<?php include './blockstories.html.php'?>
<?php include './blockbugs.html.php'?>
<?php include './blockbuilds.html.php'?>
<?php include './blockcases.html.php'?>
<?php include './blocklegacybugs.html.php'?>
<?php include './blockbuginfo.html.php'?>
<tr>
<th><?php echo $lang->testreport->report?></th>
<td colspan='2'><?php echo $report->report;?></td>
</tr>
<div class='main'>
<fieldset>
<legend><?php echo $lang->testreport->legendBasic?></legend>
<table class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->testreport->startEnd?></th>
<td class='w-p50'> <?php echo $report->begin . ' ~ ' . $report->end;?></td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->testreport->owner?></th>
<td><?php echo zget($users, $report->owner);?></td>
</tr>
<tr>
<th><?php echo $lang->testreport->member?></th>
<td colspan='2'><?php foreach(explode(',', $report->members) as $member)echo zget($users, $member) . ' &nbsp; ';?></td>
</tr>
<tr>
<th><?php echo $lang->testreport->goal?></th>
<td colspan='2'><?php echo $project->desc?></td>
</tr>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendStoryAndBug?></legend>
<table class='table table-form'>
<?php include './blockstories.html.php'?>
<?php include './blockbugs.html.php'?>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendBuild?></legend>
<?php include './blockbuilds.html.php'?>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendCase?></legend>
<?php include './blockcases.html.php'?>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->legendBug?></legend>
<table class='table table-form'>
<?php include './blocklegacybugs.html.php'?>
<?php include './blockbuginfo.html.php'?>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->testreport->report?></legend>
<div><?php echo $report->report;?></div>
</fieldset>
<?php if(!$this->session->notHead):?>
<tr>
<th><?php echo $lang->files?></th>
<td colspan='2'><?php echo $this->fetch('file', 'printFiles', array('files' => $report->files, 'fieldset' => 'false'));?></td>
</tr>
<?php echo $this->fetch('file', 'printFiles', array('files' => $report->files, 'fieldset' => 'true'));?>
<?php endif;?>
</table>
</div>
<?php if(!$this->session->notHead):?>
</div>
<?php include '../../common/view/footer.html.php';?>