From c82fc3ff60e4e605b8a3c7f36d77461aad3b0319 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 20 Aug 2020 15:49:26 +0800 Subject: [PATCH] * Add scrum block module. --- db/update20.0.sql | 8 +++---- module/block/control.php | 7 +++--- module/block/lang/zh-cn.php | 18 +++++++++++++++- module/block/model.php | 21 ++++++++++++++++++ module/block/view/scrumtestblock.html.php | 26 +++++++++++------------ module/task/control.php | 1 + 6 files changed, 58 insertions(+), 23 deletions(-) diff --git a/db/update20.0.sql b/db/update20.0.sql index c86ef8bd2d..5af7eb7c59 100644 --- a/db/update20.0.sql +++ b/db/update20.0.sql @@ -239,10 +239,10 @@ CREATE TABLE IF NOT EXISTS `zt_holiday` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(30) NOT NULL DEFAULT '', `type` enum('holiday', 'working') NOT NULL DEFAULT 'holiday', - `desc` text NOT NULL, - `year` char(4) NOT NULL, - `begin` date NOT NULL, - `end` date NOT NULL, + `desc` text NOT NULL, + `year` char(4) NOT NULL, + `begin` date NOT NULL, + `end` date NOT NULL, PRIMARY KEY (`id`), KEY `year` (`year`), KEY `name` (`name`) diff --git a/module/block/control.php b/module/block/control.php index 4a034203b5..de01ca3231 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1440,18 +1440,17 @@ class block extends control */ public function printScrumtestBlock() { - $this->view->program = $this->loadModel('project')->getByID($this->session->program); - $this->session->set('testtaskList', $this->app->getURI(true)); if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); $this->app->loadLang('testtask'); - $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1') + $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName') + ->from(TABLE_TESTTASK)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id') ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id') ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id') ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project') ->where('t1.deleted')->eq('0') - ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi() + ->andWhere('t1.product')->eq($this->session->program)->fi() ->andWhere('t1.product = t5.product') ->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi() ->orderBy('t1.id desc') diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 4fa18ec0bd..818e5dcaf9 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -117,6 +117,10 @@ $lang->block->default['scrum']['program']['4']['title'] = '待测版本'; $lang->block->default['scrum']['program']['4']['block'] = 'scrumtest'; $lang->block->default['scrum']['program']['4']['grid'] = 8; +$lang->block->default['scrum']['program']['4']['params']['type'] = 'all'; +$lang->block->default['scrum']['program']['4']['params']['num'] = '15'; +$lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc'; + $lang->block->default['scrum']['program']['5']['title'] = '产品总览'; $lang->block->default['scrum']['program']['5']['block'] = 'scrumproduct'; $lang->block->default['scrum']['program']['5']['grid'] = 4; @@ -126,7 +130,7 @@ $lang->block->default['scrum']['program']['6']['block'] = 'scrumproject'; $lang->block->default['scrum']['program']['6']['grid'] = 4; $lang->block->default['scrum']['program']['7']['title'] = '最新动态'; -$lang->block->default['scrum']['program']['7']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['program']['7']['block'] = 'scrumdynamic'; $lang->block->default['scrum']['program']['7']['grid'] = 4; $lang->block->default['product']['1']['title'] = $lang->productCommon . '统计'; @@ -315,6 +319,18 @@ $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; $lang->block->moduleList['qa'] = '测试'; $lang->block->moduleList['todo'] = '待办'; +$lang->block->moduleList['program'] = '项目'; + + +$lang->block->modules['program'] = new stdclass(); +$lang->block->modules['program']->availableBlocks = new stdclass(); +$lang->block->modules['program']->availableBlocks->scrumoverall = '项目整体情况'; +$lang->block->modules['program']->availableBlocks->scrumprogress = '进行中的迭代'; +$lang->block->modules['program']->availableBlocks->scrumproject = '迭代总览'; +$lang->block->modules['program']->availableBlocks->scrumproduct = '产品总览'; +$lang->block->modules['program']->availableBlocks->scrumtest = '待测版本'; +$lang->block->modules['program']->availableBlocks->scrumroadmap = '产品路线图'; +$lang->block->modules['program']->availableBlocks->scrumdynamic = '最新动态'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); diff --git a/module/block/model.php b/module/block/model.php index 9c8a109623..703856cd5e 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -661,4 +661,25 @@ class blockModel extends model return $key == $hash; } + + /** + * Get testtask params. + *▫ + * @param string $module▫ + * @access public + * @return void + */ + public function getScrumtestParams($module = '') + { + $params = new stdclass(); + $params->type['name'] = $this->lang->block->type; + $params->type['options'] = $this->lang->block->typeList->testtask; + $params->type['control'] = 'select'; + + $params->num['name'] = $this->lang->block->num; + $params->num['default'] = 20; + $params->num['control'] = 'input'; + + return json_encode($params); + } } diff --git a/module/block/view/scrumtestblock.html.php b/module/block/view/scrumtestblock.html.php index b4327a7afb..5cb099cef5 100644 --- a/module/block/view/scrumtestblock.html.php +++ b/module/block/view/scrumtestblock.html.php @@ -17,16 +17,15 @@ - - - - - + - - + + + + + @@ -36,16 +35,15 @@ $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); ?> > - - - - - + - - + + + + + diff --git a/module/task/control.php b/module/task/control.php index 44b700a291..c6264caa62 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -81,6 +81,7 @@ class task extends control } $project = $this->project->getById($projectID); + $taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task"); $storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('project', 'story', "projectID=$projectID");
idAB?>testtask->product;?> testtask->name;?> testtask->project . '/' . $lang->testtask->build;?>testtask->product;?> testtask->begin;?>testtask->end;?>testtask->project?>testtask->build;?>testtask->status;?>
id);?>productName?> name?> buildName?>'>projectName . '/' . $testtask->buildName?>productName?> begin?>end?>projectName?>buildName?>testtask->statusList, $testtask->status)?>