diff --git a/module/programplan/control.php b/module/programplan/control.php index 37add7ab08..5ca4b23b27 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -113,11 +113,17 @@ class programplan extends control $plans = $this->programplan->getPlans($projectID, $productID, $sort); } + $project = $this->project->getByID($projectID); + if($project->model == 'ipd' and $this->config->edition == 'ipd') + { + $this->view->reviewPoints = $this->loadModel('review')->getReviewPointByProject($projectID); + } + $zooming = !empty($this->config->programplan->ganttCustom->zooming) ? $this->config->programplan->ganttCustom->zooming : 'day'; $this->view->title = $this->lang->programplan->browse; $this->view->position[] = $this->lang->programplan->browse; $this->view->projectID = $projectID; - $this->view->project = $this->project->getByID($projectID); + $this->view->project = $project; $this->view->productID = $productID; $this->view->product = $this->product->getByID($productID); $this->view->productList = $this->product->getProductPairsByProject($projectID, 'all', '', false); diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php index 28b56f806f..b31682a00f 100644 --- a/module/programplan/lang/de.php +++ b/module/programplan/lang/de.php @@ -21,6 +21,7 @@ $lang->programplan->close = 'Close Stage'; $lang->programplan->activate = 'Activate Stage'; $lang->programplan->createSubPlan = 'Create Sub Plan'; $lang->programplan->subPlanManage = 'Sub-stages management'; +$lang->programplan->submit = 'Submit'; $lang->programplan->parent = 'Parent Stage'; $lang->programplan->emptyParent = 'N/A'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index 4ffed2645e..1105846897 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -21,6 +21,7 @@ $lang->programplan->close = 'Close Stage'; $lang->programplan->activate = 'Activate Stage'; $lang->programplan->createSubPlan = 'Create Sub Stage'; $lang->programplan->subPlanManage = 'Sub-stages management'; +$lang->programplan->submit = 'Submit'; $lang->programplan->parent = 'Parent Stage'; $lang->programplan->emptyParent = 'N/A'; diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index 28b56f806f..b31682a00f 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -21,6 +21,7 @@ $lang->programplan->close = 'Close Stage'; $lang->programplan->activate = 'Activate Stage'; $lang->programplan->createSubPlan = 'Create Sub Plan'; $lang->programplan->subPlanManage = 'Sub-stages management'; +$lang->programplan->submit = 'Submit'; $lang->programplan->parent = 'Parent Stage'; $lang->programplan->emptyParent = 'N/A'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index 9acd3b9c76..69cefd6d8e 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -21,6 +21,7 @@ $lang->programplan->close = '关闭阶段'; $lang->programplan->activate = '激活阶段'; $lang->programplan->createSubPlan = '创建子阶段'; $lang->programplan->subPlanManage = '子阶段的管理方法'; +$lang->programplan->submit = '提交评审'; $lang->programplan->parent = '父阶段'; $lang->programplan->emptyParent = '无'; diff --git a/module/programplan/model.php b/module/programplan/model.php index 33a65d5318..9a28b6e342 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -368,10 +368,11 @@ class programplanModel extends model if($project->model == 'ipd' and $datas) { $this->loadModel('review'); - $reviewPoints = $this->dao->select('*')->from(TABLE_OBJECT) - ->where('deleted')->eq('0') - ->andWhere('project')->eq($projectID) - ->beginIF($productID)->andWhere('product')->eq($productID)->fi() + $reviewPoints = $this->dao->select('t1.*, t2.status')->from(TABLE_OBJECT)->alias('t1') + ->leftJoin(TABLE_REVIEW)->alias('t2')->on('t1.id = t2.object') + ->where('t1.deleted')->eq('0') + ->andWhere('t1.project')->eq($projectID) + ->beginIF($productID)->andWhere('t1.product')->eq($productID)->fi() ->fetchAll('id'); foreach($datas['data'] as $plan) diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index 621ffc67be..5db4b9bca3 100755 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -12,6 +12,8 @@ ?> +model == 'ipd') js::set('reviewPoints', json_encode($reviewPoints));?> +