From 33666bc545148a66823d8e2fe3c06ad62aa47424 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 24 Aug 2020 10:50:52 +0800 Subject: [PATCH] * Add risk list for assign to me block. --- module/block/control.php | 14 ++++++++ module/block/lang/de.php | 1 + module/block/lang/en.php | 1 + module/block/lang/fr.php | 1 + module/block/lang/vi.php | 1 + module/block/lang/zh-cn.php | 2 ++ module/block/lang/zh-tw.php | 1 + module/block/model.php | 4 +++ module/block/view/riskblock.html.php | 49 ++++++++++++++++++++++++++++ 9 files changed, 74 insertions(+) create mode 100644 module/block/view/riskblock.html.php diff --git a/module/block/control.php b/module/block/control.php index b14d058819..112081282e 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1365,6 +1365,7 @@ class block extends control if(common::hasPriv('todo', 'view')) $hasViewPriv['todo'] = true; if(common::hasPriv('task', 'view')) $hasViewPriv['task'] = true; if(common::hasPriv('bug', 'view')) $hasViewPriv['bug'] = true; + if(common::hasPriv('risk', 'view')) $hasViewPriv['risk'] = true; $params = $this->get->param; $params = json_decode(base64_decode($params)); @@ -1419,6 +1420,19 @@ class block extends control $this->view->bugs = $bugs; } + if(isset($hasViewPriv['risk'])) + { + $this->app->loadLang('risk'); + $stmt = $this->dao->select('*')->from(TABLE_RISK) + ->where('assignedTo')->eq($this->app->user->account) + ->andWhere('deleted')->eq('0') + ->andWhere('status')->ne('closed') + ->orderBy('id_desc'); + if(isset($params->riskNum)) $stmt->limit($params->riskNum); + $risks = $stmt->fetchAll(); + + $this->view->risks = $risks; + } $this->view->selfCall = $this->selfCall; $this->view->hasViewPriv = $hasViewPriv; diff --git a/module/block/lang/de.php b/module/block/lang/de.php index c551adf31c..d106089dfa 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -252,6 +252,7 @@ $lang->block->availableBlocks->plan = 'Plan'; $lang->block->availableBlocks->release = 'Release'; $lang->block->availableBlocks->build = 'Build'; $lang->block->availableBlocks->testtask = 'Testaufgaben'; +$lang->block->availableBlocks->risk = 'My Risks'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index b5416da341..275209bbbf 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -252,6 +252,7 @@ $lang->block->availableBlocks->plan = 'Plans'; $lang->block->availableBlocks->release = 'Releases'; $lang->block->availableBlocks->build = 'Builds'; $lang->block->availableBlocks->testtask = 'Requests'; +$lang->block->availableBlocks->risk = 'My Risks'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index a3ecc79af9..7c8a9d24e2 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -252,6 +252,7 @@ $lang->block->availableBlocks->plan = 'Plans'; $lang->block->availableBlocks->release = 'Releases'; $lang->block->availableBlocks->build = 'Builds'; $lang->block->availableBlocks->testtask = 'Recettes'; +$lang->block->availableBlocks->risk = 'My Risks'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index bc392ee9fd..fe3cc139ba 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -252,6 +252,7 @@ $lang->block->availableBlocks->plan = 'Kế hoạch'; $lang->block->availableBlocks->release = 'Phát hành'; $lang->block->availableBlocks->build = 'Bản dựng'; $lang->block->availableBlocks->testtask = 'Yêu cầu'; +$lang->block->availableBlocks->risk = 'My Risks'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 66aaeda051..861e699ed0 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -294,6 +294,7 @@ $lang->block->availableBlocks->plan = '计划列表'; $lang->block->availableBlocks->release = '发布列表'; $lang->block->availableBlocks->build = '版本列表'; $lang->block->availableBlocks->testtask = '测试版本列表'; +$lang->block->availableBlocks->risk = '我的风险'; $lang->block->moduleList['program'] = '项目'; $lang->block->moduleList['product'] = $lang->productCommon; @@ -402,6 +403,7 @@ $lang->block->orderByList->story['stage_desc'] = '阶段倒序'; $lang->block->todoNum = '待办数'; $lang->block->taskNum = '任务数'; $lang->block->bugNum = 'Bug数'; +$lang->block->riskNum = '风险数'; $lang->block->typeList = new stdclass(); diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 68d200e7c5..4ef38040ce 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -252,6 +252,7 @@ $lang->block->availableBlocks->plan = '計劃列表'; $lang->block->availableBlocks->release = '發佈列表'; $lang->block->availableBlocks->build = '版本列表'; $lang->block->availableBlocks->testtask = '測試版本列表'; +$lang->block->availableBlocks->risk = '我的風險'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/model.php b/module/block/model.php index 351eccabed..17081018a1 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -587,6 +587,10 @@ class blockModel extends model $params->bugNum['default'] = 20; $params->bugNum['control'] = 'input'; + $params->riskNum['name'] = $this->lang->block->riskNum; + $params->riskNum['default'] = 20; + $params->riskNum['control'] = 'input'; + return json_encode($params); } diff --git a/module/block/view/riskblock.html.php b/module/block/view/riskblock.html.php new file mode 100644 index 0000000000..b7a6ea0520 --- /dev/null +++ b/module/block/view/riskblock.html.php @@ -0,0 +1,49 @@ + +