From 368775a796266d7679cbcc1d803ee9e28e1168a8 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 1 Jul 2019 14:18:23 +0800
Subject: [PATCH] * Finish task #5892.

---
 module/task/js/finish.js   | 11 +++++++++++
 module/task/lang/en.php    |  2 +-
 module/task/lang/zh-cn.php |  2 +-
 module/task/model.php      |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 module/task/js/finish.js

diff --git a/module/task/js/finish.js b/module/task/js/finish.js
new file mode 100644
index 0000000000..465c895ecf
--- /dev/null
+++ b/module/task/js/finish.js
@@ -0,0 +1,11 @@
+$(function()
+{
+    $('#currentConsumed').keyup(function()
+    {
+        var currentConsumed = $(this).val();
+        if(!parseInt(currentConsumed)) currentConsumed = 0;
+        var total = parseInt(currentConsumed) + parseInt(consumed);
+        $('#totalConsumed').html(total);
+        $('#consumed').val(total);
+    })        
+})
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 24a17fc186..2a73fa6dc7 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -185,7 +185,7 @@ $lang->task->noTask                = 'No tasks yet. ';
 $lang->task->createDenied          = 'Create Task is denied in this project';
 
 $lang->task->error = new stdclass();
-$lang->task->error->consumedNumber   = '"Hours Cost" must be numbers.';
+$lang->task->error->consumedNumber   = '"Current Cost" must be numbers.';
 $lang->task->error->estimateNumber   = '"Estimates" must be numbers.';
 $lang->task->error->consumedSmall    = '"Hours Cost" must be > the last number.';
 $lang->task->error->consumedThisTime = 'Please enter "Hours Cost"';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 5d3680dd59..a5f4e61f59 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -185,7 +185,7 @@ $lang->task->noTask                = '暂时没有任务。';
 $lang->task->createDenied          = '你不能在该项目添加任务';
 
 $lang->task->error                   = new stdclass();
-$lang->task->error->consumedNumber   = '"已经消耗"必须为数字';
+$lang->task->error->consumedNumber   = '"本次消耗"必须为数字';
 $lang->task->error->estimateNumber   = '"预计剩余"必须为数字';
 $lang->task->error->consumedSmall    = '"已经消耗"必须大于之前消耗';
 $lang->task->error->consumedThisTime = '请填写"工时"';
diff --git a/module/task/model.php b/module/task/model.php
index b6f5c1804c..56dc07a40d 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1289,7 +1289,7 @@ class taskModel extends model
             ->remove('comment,files,labels,currentConsumed')
             ->get();
 
-        if(!is_numeric($task->consumed))
+        if(!is_numeric($this->post->currentConsumed))
         {
             dao::$errors[] = $this->lang->task->error->consumedNumber;
             return false;