diff --git a/module/program/model.php b/module/program/model.php index f34590bf94..d66d556935 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1463,7 +1463,7 @@ class programModel extends model echo $project->begin; break; case 'end': - echo $project->end; + echo $project->end == LONG_TIME ? $this->lang->program->PRJLongTime : $project->end; break; case 'PRJStatus': echo zget($this->lang->program->statusList, $project->status); diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php index da605feac7..18564c1006 100644 --- a/module/program/view/pgmbrowsebylist.html.php +++ b/module/program/view/pgmbrowsebylist.html.php @@ -53,7 +53,7 @@ project->statusList, $program->status, '');?> begin;?> - end;?> + end == LONG_TIME ? $lang->program->PRJLongTime : $program->end;?> budget ? $program->budget . ' ' . zget($lang->program->unitList, $program->budgetUnit) : '';?> PM);?> diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php index 7b53d434d6..d32e7ed495 100644 --- a/module/program/view/pgmcreate.html.php +++ b/module/program/view/pgmcreate.html.php @@ -34,7 +34,7 @@ project->weekend);?> project->placeholder);?> project->errorSameProducts);?> - +program->PRJLongTime);?> program->PGMCreate->requiredFields;?>
diff --git a/module/program/view/pgmedit.html.php b/module/program/view/pgmedit.html.php index 3f5363018c..e5fc5c89fa 100644 --- a/module/program/view/pgmedit.html.php +++ b/module/program/view/pgmedit.html.php @@ -13,7 +13,7 @@ project->weekend);?> - +program->PRJLongTime);?> parent ? $lang->program->subPGMAclList : $lang->program->PGMAclList;?> program->PGMEdit->requiredFields;?>
@@ -55,8 +55,11 @@
begin, "class='form-control form-date' placeholder='" . $lang->program->begin . "' required");?> program->to;?> - end == LONG_TIME ? 'disabled' : '';?> - end, "class='form-control form-date' $disabledEnd placeholder='" . $lang->program->end . "' required");?> + end == LONG_TIME ? 'disabled' : ''; + $end = $program->end == LONG_TIME ? $lang->program->PRJLongTime : $program->end; + echo html::input('end', $end, "class='form-control form-date' $disabledEnd placeholder='" . $lang->program->end . "' required"); + ?>
end == LONG_TIME ? 999 : '';?> diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php index c40119ac8d..15b040e72c 100644 --- a/module/program/view/prjcreate.html.php +++ b/module/program/view/prjcreate.html.php @@ -19,7 +19,7 @@ project->weekend);?> program->errorSameProducts);?> - +program->PRJLongTime);?> program->PRJCreate->requiredFields;?>
diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php index 7a4693d31d..f1802bac58 100644 --- a/module/program/view/prjedit.html.php +++ b/module/program/view/prjedit.html.php @@ -18,7 +18,7 @@ parent);?> id);?> program->PGMChangeTips);?> - +program->PRJLongTime);?> parent ? $lang->program->PGMPRJAclList : $lang->program->PRJAclList;?> program->PRJEdit->requiredFields;?>
@@ -110,7 +110,8 @@ program->to;?> end == LONG_TIME ? 'disabled' : ''; - echo html::input('end', $project->end, "class='form-control form-date' onchange='computeWorkDays();' $disabledEnd placeholder='" . $lang->program->end . "' required"); + $end = $project->end == LONG_TIME ? $lang->program->PRJLongTime : $project->end; + echo html::input('end', $end, "class='form-control form-date' onchange='computeWorkDays();' $disabledEnd placeholder='" . $lang->program->end . "' required"); ?>