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

Merge branch 'sprint/tianshujie_case' into 'master'

Browse Source 
Sprint/tianshujie case

See merge request easycorp/zentaopms!3403
This commit is contained in:
孙广明
2022-05-16 00:50:42 +00:00
parent 8dc60251fc ad49931b1d
commit 659a967bd1
7 changed files with 133 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/model.php
+12 -12
View File
@@ -232,7 +232,8 @@ class blockModel extends model
/**
* Init block when account use first.
*
* @param string $appName
* @param string $module project|product|execution|qa|my
* @param string $type scrum|waterfall|kanban
* @access public
* @return bool
*/
@@ -531,15 +532,16 @@ class blockModel extends model
/**
* Get statistic params.
*
* @param string $module product|project|execution|qa
* @access public
* @return string
*/
public function getStatisticParams($module = 'product')
{
if($module == 'product') return $this->getProductStatisticParams($module);
if($module == 'project') return $this->getProjectStatisticParams($module);
if($module == 'execution') return $this->getExecutionStatisticParams($module);
if($module == 'qa') return $this->getQaStatisticParams($module);
if($module == 'product') return $this->getProductStatisticParams();
if($module == 'project') return $this->getProjectStatisticParams();
if($module == 'execution') return $this->getExecutionStatisticParams();
if($module == 'qa') return $this->getQaStatisticParams();
$params = new stdclass();
$params = $this->appendCountParams($params);
@@ -876,12 +878,11 @@ class blockModel extends model
/**
* Get testtask params.
*▫
* @param string $module
*
* @access public
* @return void
* @return string
*/
public function getScrumTestParams($module = '')
public function getScrumTestParams()
{
$params = $this->appendCountParams();
$params->type['name'] = $this->lang->block->type;
@@ -923,11 +924,10 @@ class blockModel extends model
/**
* Get scrum roadmap list params.
*
* @param string $module
* @access public
* @return string
* @return bool
*/
public function getScrumRoadMapParams($module = '')
public function getScrumRoadMapParams()
{
return false;
}
test/class/block.class.php
+54 -10
View File
@@ -135,13 +135,32 @@ class blockTest
return json_encode($objects);
}
/**
* Init block when account use first.
*
* @param string $module project|product|execution|qa|my
* @param string $type scrum|waterfall|kanban
* @access public
* @return bool
*/
public function initBlockTest($module, $type = '')
{
$objects = $this->objectModel->initBlock($module, $type = '');
global $tester;
$this->objectModel->initBlock($module, $type);
if(dao::isError()) return dao::getError();
return $objects;
$object = new stdclass();
$account = $tester->app->user->account;
$section = $module == 'project' ? $type . 'common' : 'common';
$object->blockInited = $tester->loadModel('setting')->getItem("owner=$account&module=$module&section=$section&key=blockInited");
$object->blockversion = $tester->loadModel('setting')->getItem("owner=$account&module=$module&section=block&key=initVersion");
$blockData = $this->objectModel->getBlockList($module, $type);
$object->blockData = current($blockData);
return $object;
}
/**
@@ -352,13 +371,20 @@ class blockTest
return $objects;
}
/**
* Get statistic params.
*
* @param string $module product|project|execution|qa
* @access public
* @return string
*/
public function getStatisticParamsTest($module = 'product')
{
$objects = $this->objectModel->getStatisticParams($module = 'product');
$objects = $this->objectModel->getStatisticParams($module);
if(dao::isError()) return dao::getError();
return $objects;
return json_encode(json_decode($objects), JSON_UNESCAPED_UNICODE);
}
public function getProductStatisticParamsTest()
@@ -559,9 +585,15 @@ class blockTest
return $objects;
}
public function getScrumTestParamsTest($module = '')
/**
* Get testtask params.
*
* @access public
* @return string
*/
public function getScrumTestParamsTest()
{
$objects = $this->objectModel->getScrumTestParams($module = '');
$objects = json_decode($this->objectModel->getScrumTestParams());
if(dao::isError()) return dao::getError();
@@ -586,18 +618,30 @@ class blockTest
return $objects;
}
public function getScrumRoadMapParamsTest($module = '')
/**
* Get scrum roadmap list params.
*
* @access public
* @return string
*/
public function getScrumRoadMapParamsTest()
{
$objects = $this->objectModel->getScrumRoadMapParams($module = '');
$objects = $this->objectModel->getScrumRoadMapParams();
if(dao::isError()) return dao::getError();
return $objects;
}
public function getScrumProductParamsTest($module = '')
/**
* Get scrum product list params.
*
* @access public
* @return string
*/
public function getScrumProductParamsTest()
{
$objects = $this->objectModel->getScrumProductParams($module = '');
$objects = json_decode($this->objectModel->getScrumProductParams());
if(dao::isError()) return dao::getError();
test/model/block/getscrumproductparams.php
+2 -2
View File
@@ -10,10 +10,10 @@ title=测试 blockModel->getScrumProductParams();
cid=1
pid=1
测试获取产品区块的参数 >> 数量;20;input
*/
$block = new blockTest();
r($block->getScrumProductParamsTest()) && p() && e();
r($block->getScrumProductParamsTest()) && p('count:name;count:default;count:control') && e('数量;20;input'); // 测试获取产品区块的参数
test/model/block/getscrumroadmapparams.php
+2 -2
View File
@@ -10,10 +10,10 @@ title=测试 blockModel->getScrumRoadMapParams();
cid=1
pid=1
测试获取产品路线图区块的参数 >> 0
*/
$block = new blockTest();
r($block->getScrumRoadMapParamsTest()) && p() && e();
r($block->getScrumRoadMapParamsTest()) && p() && e('0'); // 测试获取产品路线图区块的参数
test/model/block/getscrumtestparams.php
+2 -2
View File
@@ -10,10 +10,10 @@ title=测试 blockModel->getScrumTestParams();
cid=1
pid=1
测试获取测试单区块的参数 >> 数量;类型
*/
$block = new blockTest();
r($block->getScrumTestParamsTest()) && p() && e();
r($block->getScrumTestParamsTest()) && p('count:name;type:name') && e('数量;类型'); // 测试获取测试单区块的参数
test/model/block/getstatisticparams.php
+17 -2
View File
@@ -10,10 +10,25 @@ title=测试 blockModel->getStatisticParams();
cid=1
pid=1
获取空区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"}}
获取产品区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}}
获取项目区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"全部","involved":"我参与的"},"control":"select"}}
获取执行区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"所有","involved":"我参与"},"control":"select"}}
获取测试区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}}
*/
$block = new blockTest();
r($block->getStatisticParamsTest()) && p() && e();
$data = array();
$data[0] = $block->getStatisticParamsTest('');
$data[1] = $block->getStatisticParamsTest('product');
$data[2] = $block->getStatisticParamsTest('project');
$data[3] = $block->getStatisticParamsTest('execution');
$data[4] = $block->getStatisticParamsTest('qa');
r($data[0]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"}}'); // 获取空区块的参数
r($data[1]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}}'); // 获取产品区块的参数
r($data[2]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"全部","involved":"我参与的"},"control":"select"}}'); // 获取项目区块的参数
r($data[3]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"所有","involved":"我参与"},"control":"select"}}'); // 获取执行区块的参数
r($data[4]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}}'); // 获取测试区块的参数
test/model/block/initblock.php
+44 -2
View File
@@ -10,10 +10,52 @@ title=测试 blockModel->initBlock();
cid=1
pid=1
获取敏捷项目的区块版本 >> 1;2
获取敏捷项目的区块数据 >> project;scrum
获取瀑布项目的区块版本 >> 1;2
获取瀑布项目的区块数据 >> project;waterfall
获取看板项目的区块版本 >> 1;2
获取看板项目的区块数据 >> project;kanban
获取产品的区块版本 >> 1;2
获取产品的区块数据 >> product;
获取执行的区块版本 >> 1;2
获取执行的区块数据 >> execution;
获取地盘的区块版本 >> 1;2
获取地盘的区块数据 >> my;
获取测试的区块版本 >> 1;2
获取测试的区块数据 >> qa;
获取空区块版本 >> 1;2
获取空区块数据 >> 0
*/
$block = new blockTest();
r($block->initBlockTest()) && p() && e();
$dataList = array();
$dataList[0] = $block->initBlockTest('project', 'scrum');
$dataList[1] = $block->initBlockTest('project', 'waterfall');
$dataList[2] = $block->initBlockTest('project', 'kanban');
$dataList[3] = $block->initBlockTest('product');
$dataList[4] = $block->initBlockTest('execution');
$dataList[5] = $block->initBlockTest('my');
$dataList[6] = $block->initBlockTest('qa');
$dataList[7] = $block->initBlockTest('');
r($dataList[0]) && p("blockInited;blockversion") && e('1;2'); // 获取敏捷项目的区块版本
r($dataList[0]) && p("blockData:module;blockData:type") && e('project;scrum'); // 获取敏捷项目的区块数据
r($dataList[1]) && p("blockInited;blockversion") && e('1;2'); // 获取瀑布项目的区块版本
r($dataList[1]) && p("blockData:module;blockData:type") && e('project;waterfall'); // 获取瀑布项目的区块数据
r($dataList[2]) && p("blockInited;blockversion") && e('1;2'); // 获取看板项目的区块版本
r($dataList[2]) && p("blockData:module;blockData:type") && e('project;kanban'); // 获取看板项目的区块数据
r($dataList[3]) && p("blockInited;blockversion") && e('1;2'); // 获取产品的区块版本
r($dataList[3]) && p("blockData:module;blockData:type") && e('product;'); // 获取产品的区块数据
r($dataList[4]) && p("blockInited;blockversion") && e('1;2'); // 获取执行的区块版本
r($dataList[4]) && p("blockData:module;blockData:type") && e('execution;'); // 获取执行的区块数据
r($dataList[5]) && p("blockInited;blockversion") && e('1;2'); // 获取地盘的区块版本
r($dataList[5]) && p("blockData:module;blockData:type") && e('my;'); // 获取地盘的区块数据
r($dataList[6]) && p("blockInited;blockversion") && e('1;2'); // 获取测试的区块版本
r($dataList[6]) && p("blockData:module;blockData:type") && e('qa;'); // 获取测试的区块数据
r($dataList[7]) && p("blockInited;blockversion") && e('1;2'); // 获取空区块版本
r($dataList[7]) && p("blockData") && e('0'); // 获取空区块数据
system("./ztest init");