diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index f303762896..cfbe35be12 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -76,6 +76,9 @@ idAB);?> systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?> + systemMode == 'new'):?> + execution->project);?> + execution->owner);?> execution->execStatus : $lang->execution->status);?> execution->progress;?> @@ -126,6 +129,11 @@ + systemMode == 'new'):?> + + parentName;?> + + PM);?> processStatus('execution', $execution);?> diff --git a/module/project/model.php b/module/project/model.php index d1e53ca07a..7e72674e3a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1851,6 +1851,17 @@ class projectModel extends model ->fetchAll('id'); } + $parentIDList = array(); + foreach($executions as $execution) if($execution->parent) array_push($parentIDList, $execution->parent); + $parentNameList = $this->dao->select('id, name')->from(TABLE_EXECUTION) + ->where('id')->in($parentIDList) + ->fetchPairs('id', 'name'); + foreach($executions as $execution) + { + $execution->parentName = ''; + if(isset($parentNameList[$execution->parent])) $execution->parentName = $parentNameList[$execution->parent]; + } + $hours = $this->computerProgress($executions); $emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);