From 5d23ea8e88553fe0228504d838f1b328e1f970b2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 26 Jan 2018 09:37:00 +0800 Subject: [PATCH] * change for task #3602. --- module/block/control.php | 13 ++++++++++- module/block/view/bugblock.html.php | 26 ++++++++++++++------- module/block/view/caseblock.html.php | 16 ++++++++++++- module/block/view/productblock.html.php | 31 +++++++++++++++++++------ module/block/view/storyblock.html.php | 20 +++++++++++++--- module/block/view/taskblock.html.php | 16 ++++++++++++- module/product/lang/en.php | 1 + module/product/lang/zh-cn.php | 1 + 8 files changed, 103 insertions(+), 21 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index 37398b8471..fdcedf54f7 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -656,7 +656,18 @@ class block extends control $num = isset($this->params->num) ? (int)$this->params->num : 0; $type = isset($this->params->type) ? $this->params->type : ''; $pager = pager::init(0, $num , 1); - $this->view->productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type); + + $productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type); + $productIdList = array(); + foreach($productStats as $product) $productIdList[] = $product->id; + + $this->view->projects = $this->dao->select('t1.product,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->in($productIdList) + ->andWhere('t2.deleted')->eq(0) + ->orderBy('t1.project') + ->fetchPairs('product', 'name'); + $this->view->productStats = $productStats; } /** diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index 74474d859d..bd0db068a6 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -10,15 +10,18 @@ * @link http://www.ranzhi.org */ ?> +grid >= 6;?> - - - - - - - + + + + + + + + + createLink('bug', 'view', "bugID={$bug->id}"); ?> > + + - +
idAB?>priAB?> bug->title;?>bug->severityAB?>bug->statusAB;?>
idAB?>priAB?> bug->title;?>bug->severityAB?>'>bug->statusAB;?>
id;?> bug->priList, $bug->pri, $bug->pri)?> title?> bug->severityList, $bug->severity, $bug->severity)?>bug->statusList, $bug->status, $bug->status)?> + + + bug->statusList, $bug->status);?> + +
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index 38c23838c3..14277b1e01 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -10,14 +10,19 @@ * @link http://www.ranzhi.org */ ?> +grid >= 6;?> + + + + @@ -27,12 +32,21 @@ $viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}"); ?> > + + + - + +
idAB?> priAB?> case->title;?> testtask->lastRunTime;?> testtask->lastRunResult;?> statusAB;?>
id;?> case->priList, $case->pri, $case->pri)?> title?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?>testcase->statusList[$case->status];?> + + + testcase->statusList, $case->status);?> + +
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 0ac1f2f434..e89dd6f743 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -10,17 +10,26 @@ * @link http://www.zentao.net */ ?> +grid >= 6;?> - + - + + - - - + + + + + + + + + + @@ -31,12 +40,20 @@ ?> > - + - + + + + + + + + + diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index 6bc9f9a126..8c253262fb 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -10,15 +10,20 @@ * @link http://www.ranzhi.org */ ?> +grid >= 6;?>
product->name;?>story->statusList['active'];?> story->statusList['changed'];?>story->statusList['draft'];?> product->plans;?>product->releases;?>product->bugs;?>bug->unResolved;?>product->releases;?>product->currentProject;?>story->statusList['active'];?>product->bugs;?>bug->unResolved;?>
name?>stories['active']?> stories['changed']?>stories['draft']?> plans?> releases?>id, '');?>stories['active']?> bugs?> unResolved?>
+ + + - + + @@ -27,12 +32,21 @@ $viewLink = $this->createLink('story', 'view', "storyID={$story->id}"); ?> > + + + - + +
idAB?> priAB?> story->title;?> story->estimateAB;?> statusAB;?>story->stageAB;?>story->stageAB;?>
id;?> story->priList, $story->pri, $story->pri)?> title?> estimate?>story->statusList, $story->status, $story->status);?> - story->stageList, $story->stage, $story->stage);?> + + + + story->statusList, $story->status);?> + + story->stageList, $story->stage, $story->stage);?>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 61b3e88b56..98e9741dbe 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -13,14 +13,19 @@ +grid >= 6;?> + + + + @@ -30,12 +35,21 @@ td.delayed{background: #e84e0f!important; color: white;} $viewLink = $this->createLink('task', 'view', "taskID={$task->id}"); ?> > + + + -
idAB?> priAB?> task->name;?> task->estimateAB;?> task->deadline;?> statusAB;?>
id;?> task->priList, $task->pri, $task->pri)?> name?> estimate?> '>deadline, 0, 4) > 0) echo $task->deadline;?>task->statusList, $task->status, $task->status);?> + + + + + task->statusList, $task->status);?> + +
diff --git a/module/product/lang/en.php b/module/product/lang/en.php index a9307e0581..77e950a488 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -43,6 +43,7 @@ $lang->product->doc = 'Doc'; $lang->product->project = $lang->projectCommon . 'List'; $lang->product->build = 'Build'; +$lang->product->currentProject = 'Current Project'; $lang->product->activeStories = 'Activated Story'; $lang->product->changedStories = 'Changed Story'; $lang->product->draftStories = 'Draft Story'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index c47a0f512c..086cea20db 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -43,6 +43,7 @@ $lang->product->doc = '文档列表'; $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; +$lang->product->currentProject = '当前项目'; $lang->product->activeStories = '激活需求'; $lang->product->changedStories = '已变更需求'; $lang->product->draftStories = '草稿需求';