diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 6c534ce902..8d5e7b6c94 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -252,6 +252,7 @@ $lang->project->error->budgetGe0 = '『Budget』must be greater than or e $lang->project->error->budgetNumber = '『Budget』must be numbers.'; $lang->project->error->productNotEmpty = "Please link {$lang->productCommon}s or create {$lang->productCommon}s."; $lang->project->error->emptyBranch = 'Branch can not be empty!'; +$lang->project->error->endLessBegin = 'The end date must be greater than the start date.'; $lang->project->tenThousand = 'Ten Thousand'; $lang->project->hundredMillion = 'Hundred Million'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 4f9d17918a..f7826b4ee0 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -252,6 +252,7 @@ $lang->project->error->budgetGe0 = '『Budget』must be greater than or e $lang->project->error->budgetNumber = '『Budget』must be numbers.'; $lang->project->error->productNotEmpty = "Please link {$lang->productCommon}s or create {$lang->productCommon}s."; $lang->project->error->emptyBranch = 'Branch can not be empty!'; +$lang->project->error->endLessBegin = 'The end date must be greater than the start date.'; $lang->project->tenThousand = 'Ten Thousand'; $lang->project->hundredMillion = 'Hundred Million'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 1e6ff88f05..5277f7f9c4 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -252,6 +252,7 @@ $lang->project->error->budgetGe0 = '『Budget』must be greater than or e $lang->project->error->budgetNumber = '『Budget』must be numbers.'; $lang->project->error->productNotEmpty = "Please link {$lang->productCommon}s or create {$lang->productCommon}s."; $lang->project->error->emptyBranch = 'Branch can not be empty!'; +$lang->project->error->endLessBegin = 'The end date must be greater than the start date.'; $lang->project->tenThousand = 'Ten Thousand'; $lang->project->hundredMillion = 'Hundred Million'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 4fe494d64e..71a42e42f0 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -244,6 +244,7 @@ $lang->project->error->budgetGe0 = '『预算』金额必须大于等于0 $lang->project->error->budgetNumber = '『预算』金额必须为数字。'; $lang->project->error->productNotEmpty = "请关联{$lang->productCommon}或创建{$lang->productCommon}。"; $lang->project->error->emptyBranch = '分支不能为空!'; +$lang->project->error->endLessBegin = '计划结束日期不能小于计划开始日期!'; $lang->project->tip = new stdclass(); $lang->project->tip->closed = '该项目已是关闭状态,无须关闭。'; diff --git a/module/project/model.php b/module/project/model.php index 0a7290144b..23250ce2be 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -1454,6 +1454,12 @@ class projectModel extends model */ public function activate(int $projectID, object $project) :array|false { + if($project->begin > $project->end) + { + dao::$errors['end'] = $this->lang->project->error->endLessBegin; + return false; + } + $oldProject = $this->projectTao->fetchProjectInfo($projectID); $daoSuccess = $this->projectTao->doActivate($projectID, $project); diff --git a/module/project/ui/activate.html.php b/module/project/ui/activate.html.php index cf7e1a448f..8436c5713f 100644 --- a/module/project/ui/activate.html.php +++ b/module/project/ui/activate.html.php @@ -21,14 +21,13 @@ formPanel set::label($lang->execution->beginAndEnd), inputGroup ( - input + datePicker ( - set::control('date'), set::name('begin'), set::value($newBegin) ), $lang->execution->to, - input + datePicker ( set::control('date'), set::name('end'),