diff --git a/module/execution/control.php b/module/execution/control.php index 17ac64b75a..407d833f02 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -3342,10 +3342,20 @@ class execution extends control $executionStats = $this->project->getStats($projectID, $status, $productID, 0, 30, $orderBy, $pager); + $parentIdList = array(); + foreach($executionStats as $execution) + { + if($execution->type != 'stage') continue; + if($execution->grade == 2 and $execution->project != $execution->parent) $parentIdList[$execution->parent] = $execution->parent; + } + $parents = array(); + if($parentIdList) $parents = $this->execution->getByIdList($parentIdList); + $this->view->executionStats = $executionStats; $this->view->productList = $this->loadModel('product')->getProductPairsByProject($projectID); $this->view->productID = $productID; $this->view->projectID = $projectID; + $this->view->parents = $parents; $this->view->projects = array('') + $this->project->getPairsByProgram(); $this->view->pager = $pager; $this->view->orderBy = $orderBy; diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 03c34d9e3a..15d04376ac 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -128,13 +128,19 @@ id);?> -