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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2017-03-01 15:36:11 +08:00
parent c1aa7413e0 d2b82bc30d
commit 3e32f88360
15 changed files with 290 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/config.php
+1 -1
View File
@@ -24,7 +24,7 @@ $config->bug->list->allFields = 'id, module, project, story, task,
lastEditedDate';
$config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,resolvedBy,resolution';
$config->bug->list->exportFields = 'id, product, module, project, story, task,
$config->bug->list->exportFields = 'id, product, branch, module, project, story, task,
title, keywords, severity, pri, type, os, browser,
steps, status, activatedCount, confirmed, mailto,
openedBy, openedDate, openedBuild,
module/bug/control.php
+4
View File
@@ -1310,6 +1310,7 @@ class bug extends control
$relatedBugIdList = array();
$relatedCaseIdList = array();
$relatedBuildIdList = array();
$relatedBranchIdList = array();
foreach($bugs as $bug)
{
@@ -1318,6 +1319,7 @@ class bug extends control
$relatedTaskIdList[$bug->task] = $bug->task;
$relatedCaseIdList[$bug->case] = $bug->case;
$relatedBugIdList[$bug->duplicateBug] = $bug->duplicateBug;
$relatedBranchIdList[$bug->branch] = $bug->branch;
/* Process link bugs. */
$linkBugs = explode(',', $bug->linkBug);
@@ -1341,6 +1343,7 @@ class bug extends control
$relatedTasks = $this->dao->select('id, name')->from(TABLE_TASK)->where('id')->in($relatedTaskIdList)->fetchPairs();
$relatedBugs = $this->dao->select('id, title')->from(TABLE_BUG)->where('id')->in($relatedBugIdList)->fetchPairs();
$relatedCases = $this->dao->select('id, title')->from(TABLE_CASE)->where('id')->in($relatedCaseIdList)->fetchPairs();
$relatedBranch = $this->dao->select('id, name')->from(TABLE_BRANCH)->where('id')->in($relatedBranchIdList)->fetchPairs();
$relatedBuilds = array('trunk' => $this->lang->trunk) + $this->dao->select('id, name')->from(TABLE_BUILD)->where('id')->in($relatedBuildIdList)->fetchPairs();
$relatedFiles = $this->dao->select('id, objectID, pathname, title')->from(TABLE_FILE)->where('objectType')->eq('bug')->andWhere('objectID')->in(@array_keys($bugs))->fetchGroup('objectID');
@@ -1364,6 +1367,7 @@ class bug extends control
if(isset($relatedBugs[$bug->duplicateBug])) $bug->duplicateBug = $relatedBugs[$bug->duplicateBug] . "($bug->duplicateBug)";
if(isset($relatedCases[$bug->case])) $bug->case = $relatedCases[$bug->case] . "($bug->case)";
if(isset($relatedBuilds[$bug->resolvedBuild])) $bug->resolvedBuild = $relatedBuilds[$bug->resolvedBuild] . "(#$bug->resolvedBuild)";
if(isset($relatedBranch[$bug->branch])) $bug->branch = $relatedBranch[$bug->branch] . "(#$bug->branch)";
if(isset($bugLang->priList[$bug->pri])) $bug->pri = $bugLang->priList[$bug->pri];
if(isset($bugLang->typeList[$bug->type])) $bug->type = $bugLang->typeList[$bug->type];
module/bug/lang/zh-cn.php
+4
View File
@@ -13,6 +13,7 @@
$lang->bug->common = 'Bug';
$lang->bug->id = 'Bug编号';
$lang->bug->product = '所属' . $lang->productCommon;
$lang->bug->branch = '分支/平台';
$lang->bug->productplan = '所属计划';
$lang->bug->module = '所属模块';
$lang->bug->moduleAB = '模块';
@@ -284,6 +285,7 @@ $lang->bug->report->bugsPerResolution = new stdclass();
$lang->bug->report->bugsPerStatus = new stdclass();
$lang->bug->report->bugsPerActivatedCount = new stdclass();
$lang->bug->report->bugsPerType = new stdclass();
$lang->bug->report->bugsPerPri = new stdclass();
$lang->bug->report->bugsPerAssignedTo = new stdclass();
$lang->bug->report->bugLiveDays = new stdclass();
$lang->bug->report->bugHistories = new stdclass();
@@ -302,6 +304,7 @@ $lang->bug->report->bugsPerResolution->graph = new stdclass();
$lang->bug->report->bugsPerStatus->graph = new stdclass();
$lang->bug->report->bugsPerActivatedCount->graph = new stdclass();
$lang->bug->report->bugsPerType->graph = new stdclass();
$lang->bug->report->bugsPerPri->graph = new stdclass();
$lang->bug->report->bugsPerAssignedTo->graph = new stdclass();
$lang->bug->report->bugLiveDays->graph = new stdclass();
$lang->bug->report->bugHistories->graph = new stdclass();
@@ -327,6 +330,7 @@ $lang->bug->report->bugsPerSeverity->graph->xAxisName = '严重程度';
$lang->bug->report->bugsPerResolution->graph->xAxisName = '解决方案';
$lang->bug->report->bugsPerStatus->graph->xAxisName = '状态';
$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = '激活次数';
$lang->bug->report->bugsPerPri->graph->xAxisName = '优先级';
$lang->bug->report->bugsPerType->graph->xAxisName = '类型';
$lang->bug->report->bugsPerAssignedTo->graph->xAxisName = '指派给';
$lang->bug->report->bugLiveDays->graph->xAxisName = '处理时间';
module/bug/model.php
+1 -1
View File
@@ -1632,7 +1632,7 @@ class bugModel extends model
{
$datas = $this->dao->select('pri AS name, COUNT(*) AS value')->from(TABLE_BUG)->where($this->reportCondition())->groupBy('name')->orderBy('value DESC')->fetchAll('name');
if(!$datas) return array();
foreach($datas as $status => $data) if(isset($this->lang->bug->statusList[$status])) $data->name = $this->lang->bug->statusList[$status];
foreach($datas as $status => $data) $data->name = $this->lang->bug->report->bugsPerPri->graph->xAxisName . ':' . $data->name;
return $datas;
}
module/product/control.php
+15 -1
View File
@@ -201,6 +201,7 @@ class product extends control
$this->view->storyBugs = $storyBugs;
$this->view->storyCases = $storyCases;
$this->view->param = $param;
$this->view->products = $this->products;
$this->display();
}
@@ -573,9 +574,22 @@ class product extends control
*/
public function ajaxGetMatchedItems($keywords, $module, $method, $extra)
{
$products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq(0)->andWhere('name')->like("%$keywords%")->orderBy('`order` desc')->fetchAll();
$products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq(0)->orderBy('`order` desc')->fetchAll();
$toPinyin = $this->product->toPinyin($products);
foreach($toPinyin as $key => $value) {
if(!strstr($value ,$keywords) && !strstr($key,$keywords)) {
unset($toPinyin[$key]);
}
}
foreach($products as $key => $product)
{
if(!isset($toPinyin[$product->name])) {
unset($products[$key]);
continue;
}
if(!$this->product->checkPriv($product)) unset($products[$key]);
}
module/product/model.php
+48
View File
@@ -900,4 +900,52 @@ class productModel extends model
->limit(1)
->fetch();
}
public function toPinyin($products)
{
global $app;
static $pinyin;
static $dataKeys;
if(empty($pinyin)) $pinyin = $app->loadClass('pinyin');
$joinOptions = '';
$sign = ' aNd ';
foreach($products as $value)
{
if(!isset($dataKeys[$value->name])) $joinOptions .= str_replace($sign, ' and ', $value->name) . $sign;
}
if($joinOptions)
{
$valuesPinyin = $pinyin->romanize($joinOptions);
$signLenth = strlen($sign);
$pinyinSign = trim($sign);
$pySignLenth = strlen($pinyinSign);
while($joinOptions)
{
$valuePinyin = '';
$value = '';
$pinyinPos = strpos($valuesPinyin, $pinyinSign);
if($pinyinPos !== false)
{
$valuePinyin = substr($valuesPinyin, 0, $pinyinPos);
$valuesPinyin = substr($valuesPinyin, $pinyinPos + $pySignLenth);
}
$valuePos = strpos($joinOptions, $sign);
if($valuePos === false) break;
$value = substr($joinOptions, 0, $valuePos);
$joinOptions = substr($joinOptions, $valuePos + $signLenth);
$valuePinyin = preg_split('/[^a-z]+/iu', trim($valuePinyin));
$valueAbbr = '';
foreach($valuePinyin as $wordPinyin) if($wordPinyin) $valueAbbr .= $wordPinyin[0];
$dataKeys[$value] = empty($valuePinyin) ? '' : join($valuePinyin) . ' ' . $valueAbbr;
}
}
return $dataKeys;
}
}
module/project/control.php
+14 -1
View File
@@ -1896,9 +1896,22 @@ class project extends control
*/
public function ajaxGetMatchedItems($keywords, $module, $method, $extra)
{
$projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq(0)->andWhere('name')->like("%$keywords%")->orderBy('order desc')->fetchAll();
$projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq(0)->orderBy('order desc')->fetchAll();
$toPinyin = $this->project->toPinyin($projects);
foreach($toPinyin as $key => $value) {
if(!strstr($value ,$keywords) && !strstr($key,$keywords)) {
unset($toPinyin[$key]);
}
}
foreach($projects as $key => $project)
{
if(!isset($toPinyin[$project->name])) {
unset($projects[$key]);
continue;
}
if(!$this->project->checkPriv($project)) unset($projects[$key]);
}
module/project/model.php
+48
View File
@@ -2389,4 +2389,52 @@ class projectModel extends model
if(isset($fullTrees[0]) and empty($fullTrees[0]->children)) array_shift($fullTrees);
return array_values($fullTrees);
}
public function toPinyin($products)
{
global $app;
static $pinyin;
static $dataKeys;
if(empty($pinyin)) $pinyin = $app->loadClass('pinyin');
$joinOptions = '';
$sign = ' aNd ';
foreach($products as $value)
{
if(!isset($dataKeys[$value->name])) $joinOptions .= str_replace($sign, ' and ', $value->name) . $sign;
}
if($joinOptions)
{
$valuesPinyin = $pinyin->romanize($joinOptions);
$signLenth = strlen($sign);
$pinyinSign = trim($sign);
$pySignLenth = strlen($pinyinSign);
while($joinOptions)
{
$valuePinyin = '';
$value = '';
$pinyinPos = strpos($valuesPinyin, $pinyinSign);
if($pinyinPos !== false)
{
$valuePinyin = substr($valuesPinyin, 0, $pinyinPos);
$valuesPinyin = substr($valuesPinyin, $pinyinPos + $pySignLenth);
}
$valuePos = strpos($joinOptions, $sign);
if($valuePos === false) break;
$value = substr($joinOptions, 0, $valuePos);
$joinOptions = substr($joinOptions, $valuePos + $signLenth);
$valuePinyin = preg_split('/[^a-z]+/iu', trim($valuePinyin));
$valueAbbr = '';
foreach($valuePinyin as $wordPinyin) if($wordPinyin) $valueAbbr .= $wordPinyin[0];
$dataKeys[$value] = empty($valuePinyin) ? '' : join($valuePinyin) . ' ' . $valueAbbr;
}
}
return $dataKeys;
}
}
module/story/config.php
+1 -1
View File
@@ -29,7 +29,7 @@ $config->story->editor->activate = array('id' => 'comment', 'tools' => 'simpleTo
$config->story->list = new stdclass();
$config->story->list->exportFields = '
id, product, module, plan, source, title, spec, verify, keywords,
id, product, branch, module, plan, source, title, spec, verify, keywords,
pri, estimate, status, stage,
openedBy, openedDate, assignedTo, assignedDate, mailto,
reviewedBy, reviewedDate,
module/story/control.php
+6 -3
View File
@@ -1331,11 +1331,13 @@ class story extends control
$relatedModuleIdList = array();
$relatedStoryIdList = array();
$relatedPlanIdList = array();
$relatedBranchIdList = array();
foreach($stories as $story)
{
$relatedModuleIdList[$story->module] = $story->module;
$relatedPlanIdList[$story->plan] = $story->plan;
$relatedBranchIdList[$story->branch] = $story->branch;
/* Process related stories. */
$relatedStories = $story->childStories . ',' . $story->linkStories . ',' . $story->duplicateStory;
@@ -1352,6 +1354,7 @@ class story extends control
$relatedStories = $this->dao->select('id,title')->from(TABLE_STORY) ->where('id')->in($relatedStoryIdList)->fetchPairs();
$relatedFiles = $this->dao->select('id, objectID, pathname, title')->from(TABLE_FILE)->where('objectType')->eq('story')->andWhere('objectID')->in(@array_keys($stories))->fetchGroup('objectID');
$relatedSpecs = $this->dao->select('*')->from(TABLE_STORYSPEC)->where('`story`')->in(@array_keys($stories))->orderBy('version desc')->fetchGroup('story');
$relatedBranch = $this->dao->select('id, name')->from(TABLE_BRANCH)->where('id')->in($relatedBranchIdList)->fetchPairs();
foreach($stories as $story)
{
@@ -1378,8 +1381,9 @@ class story extends control
$story->verify = str_replace(' ', ' ', $story->verify);
}
/* fill some field with useful value. */
if(isset($products[$story->product])) $story->product = $products[$story->product] . "(#$story->product)";
if(isset($relatedModules[$story->module])) $story->module = $relatedModules[$story->module] . "(#$story->module)";
if(isset($products[$story->product])) $story->product = $products[$story->product] . "(#$story->product)";
if(isset($relatedModules[$story->module])) $story->module = $relatedModules[$story->module] . "(#$story->module)";
if(isset($relatedBranch[$story->branch])) $story->branch = $relatedBranch[$story->branch] . "(#$story->branch)";
if(isset($story->plan))
{
$plans = '';
@@ -1408,7 +1412,6 @@ class story extends control
$story->lastEditedDate = substr($story->lastEditedDate, 0, 10);
$story->closedDate = substr($story->closedDate, 0, 10);
if($story->linkStories)
{
$tmpLinkStories = array();
module/story/lang/zh-cn.php
+1
View File
@@ -47,6 +47,7 @@ $lang->story->batchChangeModule = "批量修改模块";
$lang->story->common = '需求';
$lang->story->id = '编号';
$lang->story->product = "所属{$lang->productCommon}";
$lang->story->branch = "分支/平台";
$lang->story->module = '所属模块';
$lang->story->moduleAB = '模块';
$lang->story->source = '需求来源';
module/testcase/control.php
+41
View File
@@ -186,6 +186,47 @@ class testcase extends control
$this->display();
}
/**
* The report page.
*
* @param int $productID
* @param string $browseType
* @param int $branchID
* @param int $moduleID
* @access public
* @return void
*/
public function report($productID, $browseType, $branchID, $moduleID)
{
$this->loadModel('report');
$this->view->charts = array();
if(!empty($_POST))
{
foreach($this->post->charts as $chart)
{
$chartFunc = 'getDataOf' . $chart;
$chartData = $this->testcase->$chartFunc();
$chartOption = $this->lang->testcase->report->$chart;
$this->testcase->mergeChartOption($chart);
$this->view->charts[$chart] = $chartOption;
$this->view->datas[$chart] = $this->report->computePercent($chartData);
}
}
$this->testcase->setMenu($this->products, $productID, $branchID);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common . $this->lang->colon . $this->lang->testcase->reportChart;
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testcase->reportChart;
$this->view->productID = $productID;
$this->view->browseType = $browseType;
$this->view->moduleID = $moduleID;
$this->view->checkedCharts = $this->post->charts ? join(',', $this->post->charts) : '';
$this->display();
}
/**
* Create a test case.
*
module/testcase/lang/zh-cn.php
+26
View File
@@ -76,6 +76,7 @@ $lang->testcase->import = "导入";
$lang->testcase->showImport = "显示导入内容";
$lang->testcase->exportTemplet = "导出模板";
$lang->testcase->export = "导出数据";
$lang->testcase->reportChart = '报表统计';
$lang->testcase->confirmChange = '确认用例变动';
$lang->testcase->confirmStoryChange = '确认需求变动';
$lang->testcase->copy = '复制用例';
@@ -163,3 +164,28 @@ $lang->testcase->featureBar['browse']['group'] = '分组查看';
$lang->testcase->featureBar['browse']['zerocase'] = '零用例需求';
$lang->testcase->featureBar['browse']['suite'] = '套件';
$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse'];
/* 统计报表。*/
$lang->testcase->report = new stdclass();
$lang->testcase->report->common = '报表';
$lang->testcase->report->select = '请选择报表类型';
$lang->testcase->report->create = '生成报表';
$lang->testcase->report->charts['testCasePerRunResult'] = '测试用例结果统计';
$lang->testcase->report->charts['testCasePerStatus'] = '测试用例状态统计';
$lang->testcase->report->charts['testCasePerType'] = '测试用例类型统计';
$lang->testcase->report->options = new stdclass();
$lang->testcase->report->options->graph = new stdclass();
$lang->testcase->report->options->type = 'pie';
$lang->testcase->report->options->width = 500;
$lang->testcase->report->options->height = 140;
$lang->testcase->report->testCasePerRunResult = new stdclass();
$lang->testcase->report->testCasePerStatus = new stdclass();
$lang->testcase->report->testCasePerType = new stdclass();
$lang->testcase->report->testCasePerRunResult->graph = new stdclass();
$lang->testcase->report->testCasePerStatus->graph = new stdclass();
$lang->testcase->report->testCasePerType->graph = new stdclass();
module/testcase/model.php
+79
View File
@@ -1164,4 +1164,83 @@ class testcaseModel extends model
return $cases;
}
/**
* Get report data of testcase per run result.
*
* @access public
* @return array
*/
public function getDataOfTestCasePerRunResult()
{
$datas = $this->dao->select('lastRunResult AS name, COUNT(*) AS value')->from(TABLE_CASE)->where($this->reportCondition())->groupBy('name')->orderBy('value DESC')->fetchAll('name');
if(!$datas) return array();
foreach($datas as $result => $data) if(isset($this->lang->testcase->resultList[$result])) $data->name = $this->lang->testcase->resultList[$result];
return $datas;
}
/**
* Get report data of testcase per status.
*
* @access public
* @return array
*/
public function getDataOfTestCasePerStatus()
{
$datas = $this->dao->select('status AS name, COUNT(*) AS value')->from(TABLE_CASE)->where($this->reportCondition())->groupBy('name')->orderBy('value DESC')->fetchAll('name');
if(!$datas) return array();
foreach($datas as $result => $data) if(isset($this->lang->testcase->statusList[$result])) $data->name = $this->lang->testcase->statusList[$result];
return $datas;
}
/**
* Get report data of testcase per Type.
*
* @access public
* @return array
*/
public function getDataOfTestCasePerType()
{
$datas = $this->dao->select('type AS name, COUNT(*) AS value')->from(TABLE_CASE)->where($this->reportCondition())->groupBy('name')->orderBy('value DESC')->fetchAll('name');
if(!$datas) return array();
foreach($datas as $result => $data) if(isset($this->lang->testcase->typeList[$result])) $data->name = $this->lang->testcase->typeList[$result];
return $datas;
}
/**
* Get report condition from session.
*
* @access public
* @return void
*/
public function reportCondition()
{
if(isset($_SESSION['testcaseQueryCondition']))
{
if(!$this->session->testcaseOnlyCondition) return 'id in (' . preg_replace('/SELECT .* FROM/', 'SELECT t1.id FROM', $this->session->testcaseQueryCondition) . ')';
return $this->session->testcaseQueryCondition;
}
return true;
}
/**
* Merge the default chart settings and the settings of current chart.
*
* @param string $chartType
* @access public
* @return void
*/
public function mergeChartOption($chartType)
{
$chartOption = $this->lang->testcase->report->$chartType;
$commonOption = $this->lang->testcase->report->options;
$chartOption->graph->caption = $this->lang->testcase->report->charts[$chartType];
if(!isset($chartOption->type)) $chartOption->type = $commonOption->type;
if(!isset($chartOption->width)) $chartOption->width = $commonOption->width;
if(!isset($chartOption->height)) $chartOption->height = $commonOption->height;
/* 合并配置。*/
foreach($commonOption->graph as $key => $value) if(!isset($chartOption->graph->$key)) $chartOption->graph->$key = $value;
}
}
module/testcase/view/caseheader.html.php
+1
View File
@@ -94,6 +94,7 @@
</ul>
</div>
<?php common::printIcon('testcase', 'import', "productID=$productID&branch=$branch", '', 'button', '', '', 'export cboxElement iframe');?>
<?php common::printIcon('testcase', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID"); ?>
</div>
<div class='btn-group'>
<div class='btn-group' id='createActionMenu'>