* Finish task #41735.
This commit is contained in:
@@ -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. */
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user