diff --git a/module/execution/model.php b/module/execution/model.php index cab9ea4ee4..b04ced0a78 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4369,7 +4369,7 @@ class executionModel extends model } echo empty($execution->children) ? html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name) : $execution->name; echo '' . zget($users, $execution->PM) . ''; - echo "" . zget($this->lang->project->statusList, $execution->status) . ''; + echo "" . zget($this->lang->project->statusList, $execution->status) . ''; echo '' . html::ring($execution->hours->progress) . ''; echo helper::isZeroDate($execution->begin) ? '' : '' . $execution->begin . ''; if(!helper::isZeroDate($execution->end)) diff --git a/module/my/css/execution.css b/module/my/css/execution.css index 98cba85497..f4869cbc17 100644 --- a/module/my/css/execution.css +++ b/module/my/css/execution.css @@ -1 +1,2 @@ -.c-hours, .c-progress {width: 80px !important;} +.c-hours, .c-progress {width: 80px !important;} +th.c-status {padding-right: 8px !important;} diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php index 101cd0ea50..c7516e8a12 100644 --- a/module/my/view/execution.html.php +++ b/module/my/view/execution.html.php @@ -39,7 +39,7 @@ execution->begin;?> execution->end;?> - statusAB;?> + statusAB;?> team->role;?> team->join;?> my->hours;?> @@ -53,13 +53,13 @@ id));?> - systemMode == 'new'):?> + systemMode == 'new'):?> type === 'stage') echo "{$lang->project->stage} "; if($execution->type === 'sprint') echo "{$lang->executionCommon} "; if($execution->type === 'kanban') echo "{$lang->execution->kanban} "; ?> - + name, '', "title='$execution->name'");?> systemMode == 'new'):?> @@ -69,7 +69,7 @@ begin;?> end;?> - + delay)):?> execution->delayed;?> diff --git a/module/project/model.php b/module/project/model.php index 2c70e44587..6a74a66720 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2029,7 +2029,7 @@ class projectModel extends model echo $project->end; break; case 'status': - echo " " . zget($this->lang->project->statusList, $project->status) . ""; + echo " " . zget($this->lang->project->statusList, $project->status) . ""; break; case 'budget': echo $budgetTitle; diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php index 22f4130f1d..dcc40d6fd8 100644 --- a/module/project/view/execution.html.php +++ b/module/project/view/execution.html.php @@ -72,7 +72,7 @@ nameAB;?> execution->owner;?> - project->status;?> + project->status;?> project->progress;?> programplan->begin;?> programplan->end;?>