diff --git a/module/execution/css/all.css b/module/execution/css/all.css index 872a6e1219..104a5a8a92 100644 --- a/module/execution/css/all.css +++ b/module/execution/css/all.css @@ -38,3 +38,7 @@ canvas {height: 28px;} #datatable-executionList .table-child-bottom.table-child-top > .c-name.flex {border-bottom: 2px solid #cbd0db !important;} #datatable-executionList .parent.has-child.c-name.flex {border-bottom: 1px solid #cbd0db !important;} #datatable-executionList tr:last-child .c-name.flex {margin-top: 1px !important;} + +#executionList thead .c-estimate.text-right, +#executionList thead .c-consumed.text-right, +#executionList thead .c-left.text-right {padding-right: 8px;} diff --git a/module/execution/model.php b/module/execution/model.php index c8eb61f0ed..1137d00672 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4626,9 +4626,9 @@ class executionModel extends model echo '' . html::ring($execution->hours->progress) . ''; echo helper::isZeroDate($execution->begin) ? '' : '' . $execution->begin . ''; echo helper::isZeroDate($execution->end) ? '' : '' . $execution->end . ''; - echo "" . $execution->hours->totalEstimate . $this->lang->execution->workHourUnit . ''; - echo "" . $execution->hours->totalConsumed . $this->lang->execution->workHourUnit . ''; - echo "" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . ''; + echo "" . $execution->hours->totalEstimate . $this->lang->execution->workHourUnit . ''; + echo "" . $execution->hours->totalConsumed . $this->lang->execution->workHourUnit . ''; + echo "" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . ''; echo ""; echo ''; common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true); diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php index f63268a42f..5d2183a2a8 100644 --- a/module/project/view/execution.html.php +++ b/module/project/view/execution.html.php @@ -78,9 +78,9 @@ project->progress;?> programplan->begin;?> programplan->end;?> - task->estimateAB;?> - task->consumedAB;?> - task->leftAB;?> + task->estimateAB;?> + task->consumedAB;?> + task->leftAB;?> execution->burn;?> actions;?>