diff --git a/module/task/lang/de.php b/module/task/lang/de.php index 99f24627c1..493e02d009 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -255,6 +255,7 @@ $lang->task->error->recordMinus = 'Work hours should not be negative numbe $lang->task->error->leftNumber = '"Left" must be numbers.'; $lang->task->error->recordMinus = 'Work hours should not be negative number.'; $lang->task->error->consumedSmall = '"Genutzt" muss larger than before.'; +$lang->task->error->dateEmpty = 'Please enter "Date"'; $lang->task->error->consumedThisTime = 'Bitte geben Sie die Stunden an'; $lang->task->error->left = 'Bitte geben Sie die verbleibenden Stunden an"'; $lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen sein.'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 022de36c47..571fcd261e 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -255,6 +255,7 @@ $lang->task->error->recordMinus = 'Work hours should not be negative numbe $lang->task->error->leftNumber = '"Left" must be numbers.'; $lang->task->error->recordMinus = 'Work hours should not be negative number.'; $lang->task->error->consumedSmall = '"Total Cost" must be > the last number.'; +$lang->task->error->dateEmpty = 'Please enter "Date"'; $lang->task->error->consumedThisTime = 'Please enter "Hours Cost"'; $lang->task->error->left = 'Please enter "Hours Left"'; $lang->task->error->work = '"Comment" must be < %d characters.'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index c542fde310..baa3e29cd1 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -255,6 +255,7 @@ $lang->task->error->recordMinus = 'Work hours should not be negative numbe $lang->task->error->leftNumber = '"Entrez" doit être numérique.'; $lang->task->error->recordMinus = 'Work hours should not be negative number.'; $lang->task->error->consumedSmall = '"Coût Total" doit être > au dernier chiffre.'; +$lang->task->error->dateEmpty = 'Please enter "Date"'; $lang->task->error->consumedThisTime = 'Entrez le "Coût en Heures"'; $lang->task->error->left = 'Entrez les "Heures Restantes"'; $lang->task->error->work = '"Commentaire" doit être < %d caractères.'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 9127bc1d4e..fd840a99fa 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -255,6 +255,7 @@ $lang->task->error->recordMinus = '工时不能为负数'; $lang->task->error->leftNumber = '"预计剩余"必须为数字'; $lang->task->error->recordMinus = '工时不能为负数'; $lang->task->error->consumedSmall = '"总计消耗"必须大于之前消耗'; +$lang->task->error->dateEmpty = '请填写"日期"'; $lang->task->error->consumedThisTime = '请填写"消耗"'; $lang->task->error->left = '请填写"剩余"'; $lang->task->error->work = '"备注"必须小于%d个字符'; diff --git a/module/task/model.php b/module/task/model.php index 301f650360..19acbbea8d 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1828,8 +1828,9 @@ class taskModel extends model if(!empty($record->work[$id]) or !empty($record->consumed[$id])) { - if(!$record->consumed[$id]) helper::end(js::alert($this->lang->task->error->consumedThisTime)); - if($record->left[$id] === '') helper::end(js::alert($this->lang->task->error->left)); + if(helper::isZeroDate($record->dates[$id])) helper::end(js::alert($this->lang->task->error->dateEmpty)); + if(!$record->consumed[$id]) helper::end(js::alert($this->lang->task->error->consumedThisTime)); + if($record->left[$id] === '') helper::end(js::alert($this->lang->task->error->left)); $estimates[$id] = new stdclass(); $estimates[$id]->date = $record->dates[$id]; diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index dfc05fb33b..3abd641dba 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -115,13 +115,13 @@ if(!empty($members) && $task->mode == 'linear') - + - - + +
task->date;?>task->date;?> ">task->teamOrder;?> task->work;?>task->consumedAB;?>task->leftAB;?>task->consumedAB;?>task->leftAB;?>