diff --git a/module/execution/model.php b/module/execution/model.php
index 129b2aa23c..00f4f38d0b 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4712,7 +4712,7 @@ class executionModel extends model
echo "{$this->lang->execution->typeList[$execution->type]} ";
if(empty($execution->children))
{
- echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name, '', 'class="text-ellipsis"');
+ echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name, '', "class='text-ellipsis' title='{$execution->name}'");
if(!helper::isZeroDate($execution->end))
{
if($execution->status != 'closed')
@@ -4742,7 +4742,7 @@ class executionModel extends model
echo "
" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . ' | ';
echo '' . html::ring($execution->hours->progress) . ' | ';
echo " | ";
- echo '';
+ echo ' | ';
common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true);
$class = !empty($execution->children) ? 'disabled' : '';
common::printIcon('task', 'create', "executionID={$execution->id}", '', 'list', '', '', $class, false, "data-app='execution'");
diff --git a/module/project/js/execution.js b/module/project/js/execution.js
index f3d71fc092..49a94fd3f4 100644
--- a/module/project/js/execution.js
+++ b/module/project/js/execution.js
@@ -116,6 +116,11 @@ $(function()
return (checkedTotal ? checkedSummary : pageSummary).replace('%total%', $rows.length).replace('%wait%', checkedWait).replace('%doing%', checkedDoing);
}
})
+
+ if(project.division && project.hasProduct && $('#executionList thead th.table-nest-title').width() < 240)
+ {
+ $('#executionList thead th.table-nest-title').width(240)
+ }
})
window.addEventListener('scroll', this.handleScroll)
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 569d2b4159..88788e85a4 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -1,5 +1,6 @@
+
edit);?>
selectAll);?>
execution->checkedExecutions);?>
@@ -87,15 +88,15 @@
- division and $project->hasProduct) echo " | {$lang->project->product} | ";?>
+ division and $project->hasProduct) echo "{$lang->project->product} | ";?>
project->status;?> |
- execution->owner;?> |
+ execution->owner;?> |
programplan->begin;?> |
programplan->end;?> |
- task->estimateAB;?> |
- task->consumedAB;?> |
- task->leftAB;?> |
- project->progress;?> |
+ task->estimateAB;?> |
+ task->consumedAB;?> |
+ task->leftAB;?> |
+ project->progress;?> |
execution->burn;?> |
actions;?> |