diff --git a/module/execution/control.php b/module/execution/control.php
index 407d833f02..17ac64b75a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3342,20 +3342,10 @@ 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 299daac777..6d7691160d 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -38,6 +38,7 @@
config->systemMode == 'new'):?>
+
execution->selectProject}'");?>
@@ -127,18 +128,12 @@
id);?>
- name;
- $onlyChildStage = ($execution->grade == 2 and $execution->project != $execution->parent);
- if($onlyChildStage and isset($parents[$execution->parent])) $executionName = $parents[$execution->parent]->name . '/' . $executionName;
- ?>
- flex' title=''>
+ | flex' title='name?>'>
systemMode == 'new'):?>
'>execution->typeList[$execution->type]?>
projectModel == 'kanban' ? html::a($this->createLink('execution', 'kanban', 'executionID=' . $execution->id), $executionName, '', "class='text-ellipsis'") : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $executionName, '', "class='text-ellipsis'");
- if($onlyChildStage) echo "{$lang->programplan->childrenAB} ";
+ $executionLink = $execution->projectModel == 'kanban' ? html::a($this->createLink('execution', 'kanban', 'executionID=' . $execution->id), $execution->name, '', "class='text-ellipsis'") : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $execution->name, '', "class='text-ellipsis'");
echo !empty($execution->children) ? $execution->name : $executionLink;
if(isset($execution->delay)) echo "{$lang->execution->delayed} ";
?>
@@ -146,7 +141,7 @@
|
-
+
code;?> |
systemMode == 'new' and $this->app->tab == 'execution'):?>
@@ -228,6 +223,10 @@
if(isset($child->delay)) echo "{$lang->execution->delayed} ";
?>
+
+ code;?>
+ | projectName;?>
+
| PM);?> |
processStatus('execution', $child);?>
@@ -236,7 +235,7 @@
|
hours->progress); ?>
|
-
+
percent . '%';?> |
stage->typeList, $child->attribute, '');?> |
begin) ? '' : $child->begin;?> |
@@ -269,11 +268,11 @@
?>
+ begin;?>'>begin) ? '' : $child->begin;?> |
+ end;?>'>end) ? '' : $child->end;?> |
lang->execution->workHour;?>'>hours->totalEstimate . ' ' . $this->lang->execution->workHourUnit;?> |
lang->execution->workHour;?>'>hours->totalConsumed . ' ' . $this->lang->execution->workHourUnit;?> |
lang->execution->workHour;?>'>hours->totalLeft . ' ' . $this->lang->execution->workHourUnit;?> |
-
-
burns);?>'> |
" . $this->loadModel('flow')->getFieldValue($extendField, $child) . "";?>