From a072ee2b7fd4b48ee280c17428794947b991e3d0 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 23 Aug 2021 16:04:37 +0800 Subject: [PATCH] * Finish task #41735. --- module/task/lang/de.php | 1 + module/task/lang/en.php | 1 + module/task/lang/fr.php | 1 + module/task/lang/vi.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/model.php | 6 ++++++ 6 files changed, 11 insertions(+) diff --git a/module/task/lang/de.php b/module/task/lang/de.php index d2eddf576d..0abf07334c 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -221,6 +221,7 @@ $lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartD $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; +$lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"'; $lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 89fd8d6e11..f18814599c 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -224,6 +224,7 @@ $lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartD $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; +$lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"'; $lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index ffba0373cb..bbd34ff83d 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -221,6 +221,7 @@ $lang->task->error->deadlineSmall = '"Date Limite" doit être supérieur à $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; +$lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"'; $lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php index 3244e831ba..e6629cd6f3 100644 --- a/module/task/lang/vi.php +++ b/module/task/lang/vi.php @@ -221,6 +221,7 @@ $lang->task->error->deadlineSmall = '"Hạn chót" phải lớn hơn "Ngày $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; +$lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"'; $lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 38fbcfc026..4030feb93d 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -224,6 +224,7 @@ $lang->task->error->deadlineSmall = '"截止日期"必须大于"预计开始 $lang->task->error->alreadyStarted = '此任务已被启动,不能重复启动!'; $lang->task->error->realStartedEmpty = '实际开始不能为空'; $lang->task->error->finishedDateEmpty = '实际完成不能为空'; +$lang->task->error->finishedDateSmall = '实际完成不能小于实际开始'; $lang->task->error->alreadyConsumed = '当前选中的父任务已有消耗。'; /* Report. */ diff --git a/module/task/model.php b/module/task/model.php index 9d8d2c486a..f04410db92 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1650,6 +1650,12 @@ class taskModel extends model return false; } + if($this->post->realStarted > $this->post->finishedDate) + { + dao::$errors[] = $this->lang->task->error->finishedDateSmall; + return false; + } + /* Record consumed and left. */ if(empty($oldTask->team)) {