diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 7000161da3..40de616a4b 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -198,6 +198,7 @@ $lang->task->createDenied = '你不能在該項目添加任務'; $lang->task->cannotDeleteParent = '不能刪除父任務。'; $lang->task->error = new stdclass(); +$lang->task->error->totalNumber = '"總計消耗"必須為數字'; $lang->task->error->consumedNumber = '"本次消耗"必須為數字'; $lang->task->error->estimateNumber = '"預計剩餘"必須為數字'; $lang->task->error->recordMinus = '工時不能為負數'; diff --git a/module/task/model.php b/module/task/model.php index 63eef086cf..d6febd4f56 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1208,9 +1208,14 @@ class taskModel extends model public function recordEstimate($taskID) { $record = fixer::input('post')->get(); - foreach($record->consumed as $item) + foreach($record->consumed as $id => $item) { - if(!trim($item)) continue; + if(!trim($item)) + { + $record->consumed[$id] = trim($item); + continue; + } + if(!is_numeric($item)) { dao::$errors[] = $this->lang->task->error->totalNumber; @@ -1218,9 +1223,14 @@ class taskModel extends model } } - foreach($record->left as $item) + foreach($record->left as $id => $item) { - if(!trim($item)) continue; + if(!trim($item)) + { + $record->left[$id] = trim($item); + continue; + } + if(!is_numeric($item)) { dao::$errors[] = $this->lang->task->error->estimateNumber;