Merge branch 'sprint/211_liumengyi_59468' into 'master'

* Finish task #59468.

See merge request easycorp/zentaopms!4316

module/task/js/finish.js

@@ -8,5 +8,13 @@ $(function()
         totalConsumed = Math.round(totalConsumed * 1000) / 1000;
         $('#totalConsumed').html(totalConsumed);
         $('#consumed').val(totalConsumed);
-    })        
+    })
+
+    $('#submit').click(function()
+    {
+        if(task.consumed != 0 && $('#currentConsumed').val() == 0)
+        {
+            return confirm(consumedEmpty);
+        }
+    })
 })

module/task/lang/de.php

@@ -252,7 +252,8 @@ $lang->task->error->skipClose         = 'Aufgabe: %s ist nicht “Erledigt” od
 $lang->task->error->closeParent       = 'Task: %s is the Parent Task, which is automatically closed after all subtasks under the Parent Task are closed and cannot be closed manually.';
 $lang->task->error->consumed          = 'Aufgabe: %s Hour must be more than 0. Ignore changes to this Task.';
 $lang->task->error->assignedTo        = 'Mehere Tasks können nicht zugewisen werden, da die Benutzer nicht teil des Teams sind.';
-$lang->task->error->consumedEmpty     = '"Current Cost" should not be 0.';
+$lang->task->error->consumedEmpty     = 'Cannot finish the task with 0 "Total Cost", please enter "Current Cost".';
+$lang->task->error->consumedEmptyAB   = '"Current Cost" is 0, please confirm whether you submit.';
 $lang->task->error->deadlineSmall     = '"Deadline" must be greater than "StartDate".';
 $lang->task->error->alreadyStarted    = 'You cannot start this task, because it is started.';
 $lang->task->error->realStartedEmpty  = '"Real Started" should not be empty.';

module/task/lang/en.php

@@ -252,7 +252,8 @@ $lang->task->error->skipClose         = 'Task: %s is not “Finished” or “Ca
 $lang->task->error->closeParent       = 'Task: %s is the Parent Task, which is automatically closed after all subtasks under the Parent Task are closed and cannot be closed manually.';
 $lang->task->error->consumed          = 'Task: %s hour must be < 0. Ignore changes to this task.';
 $lang->task->error->assignedTo        = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.';
-$lang->task->error->consumedEmpty     = '"Current Cost" should not be 0.';
+$lang->task->error->consumedEmpty     = 'Cannot finish the task with 0 "Total Cost", please enter "Current Cost".';
+$lang->task->error->consumedEmptyAB   = '"Current Cost" is 0, please confirm whether you submit.';
 $lang->task->error->deadlineSmall     = '"Deadline" must be greater than "StartDate".';
 $lang->task->error->alreadyStarted    = 'You cannot start this task, because it is started.';
 $lang->task->error->realStartedEmpty  = '"Real Started" should not be empty.';

module/task/lang/fr.php

@@ -252,7 +252,8 @@ $lang->task->error->skipClose         = 'Tâche: %s non “Finie” ou “Annul
 $lang->task->error->closeParent       = 'Task: %s is the Parent Task, which is automatically closed after all subtasks under the Parent Task are closed and cannot be closed manually.';
 $lang->task->error->consumed          = 'Tâche: %s heures doivent être < 0. Ignorer changements de cette tâche.';
 $lang->task->error->assignedTo        = "Tâche Multi-user dans le statut courant ne peut pas être assignée à un membre qui ne fait pas partie de l'équipe.";
-$lang->task->error->consumedEmpty     = '"Coût Actuel" ne devrait pas être 0.';
+$lang->task->error->consumedEmpty     = 'Lorsque la "Coût Total" est de 0, la tâche ne peut pas être terminée. Veuillez d\'abord remplir "Coût Actuel".';
+$lang->task->error->consumedEmptyAB   = '"Coût Actuel" est de 0, veuillez confirmer si vous souhaitez continuer à soumettre.';
 $lang->task->error->deadlineSmall     = '"Date Limite" doit être supérieur à la "Date de Départ".';
 $lang->task->error->alreadyStarted    = 'You cannot start this task, because it is started.';
 $lang->task->error->realStartedEmpty  = '"Real Started" should not be empty.';

module/task/lang/zh-cn.php

@@ -252,7 +252,8 @@ $lang->task->error->skipClose         = '任务：%s 不是“已完成”或“
 $lang->task->error->closeParent       = '任务：%s 是父任务，父任务在所有子任务关闭后会自动关闭，无法手动关闭。';
 $lang->task->error->consumed          = '任务：%s工时不能小于0，忽略该任务工时的改动';
 $lang->task->error->assignedTo        = '当前状态的多人任务不能指派给任务团队外的成员。';
-$lang->task->error->consumedEmpty     = '"本次消耗"不能为0';
+$lang->task->error->consumedEmpty     = '总计消耗为0时不能完成任务，请填写本次消耗工时';
+$lang->task->error->consumedEmptyAB   = '"本次消耗"为0，请确认是否提交。';
 $lang->task->error->deadlineSmall     = '"截止日期"必须大于"预计开始"';
 $lang->task->error->alreadyStarted    = '此任务已被启动，不能重复启动！';
 $lang->task->error->realStartedEmpty  = '实际开始不能为空';

module/task/model.php

@@ -1879,7 +1879,7 @@ class taskModel extends model
             return false;
         }
 
-        if(empty($currentConsumed))
+        if(empty($currentConsumed) and $oldTask->consumed == '0')
         {
             dao::$errors[] = $this->lang->task->error->consumedEmpty;
             return false;

module/task/view/finish.html.php

@@ -13,6 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php js::set('task', $task);?>
+<?php js::set('consumedEmpty', $lang->task->error->consumedEmptyAB);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <?php if(!empty($task->team) and (!isset($task->team[$app->user->account]) or ($task->assignedTo != $app->user->account and $task->mode == 'linear'))):?>
@@ -59,7 +61,7 @@
           <th><?php echo empty($task->team) ? $lang->task->consumed : $lang->task->myConsumed;?></th>
           <td>
           <?php $consumed = empty($task->team) ? $task->consumed : (float)$task->myConsumed;?>
-          <?php 
+          <?php
           echo "<span id='totalConsumed'>" . (float)$consumed . "</span> " . $lang->workingHour . html::hidden('consumed', $consumed);
           js::set('consumed', $consumed);
           ?>