* Fix bug #3334.

module/task/js/start.js

@@ -1,9 +1,15 @@
 /* If left = 0, warning. */
 function checkLeft()
 {
-    var value = $("#left").val();
-    if(isNaN(parseFloat(value)) || value == 0)
+    var left     = $("#left").val();
+    var consumed = $("#consumed").val();
+    if(isNaN(parseFloat(left)) || left == 0)
     {
+        if(isNaN(parseFloat(consumed)) || consumed == 0)
+        {
+            alert(noticeTaskStart);
+            return false;
+        }
         var result = confirm(confirmFinish);
         if(!result) setTimeout(function() {$.enableForm()}, 500);
         return result;

module/task/lang/de.php

@@ -189,6 +189,7 @@ $lang->task->confirmChangeProject  = "Wenn Sie {$lang->projectCommon} ändern, d
 $lang->task->confirmFinish         = '"Reststunden " sind 0. Möchten Sue den Status auf Erledigt setzen?';
 $lang->task->confirmRecord         = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?';
 $lang->task->confirmTransfer       = '"Reststunden " sind 0. Möchten Sie den Task transferieren?';
+$lang->task->noticeTaskStart       = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
 $lang->task->noticeLinkStory       = "Es wurde keine Story verknüpft. Sie können %s für dieses Projekt, anschließend %s.";
 $lang->task->noticeSaveRecord      = 'Ihre Stunden wurden nicht gespeichrt. Bitte erst speichern.';
 $lang->task->commentActions        = '%s. %s, kommentiert von <strong>%s</strong>.';

module/task/lang/en.php

@@ -189,6 +189,7 @@ $lang->task->confirmChangeProject  = "If you change {$lang->projectCommon}, Modu
 $lang->task->confirmFinish         = '"Left Hour" is 0. Do you want to change the status to "Finished"?';
 $lang->task->confirmRecord         = '"Left Hour" is 0. Do you want to set the task as "Finished"?';
 $lang->task->confirmTransfer       = '"Left Hour" is 0，Do you want to transfer task?';
+$lang->task->noticeTaskStart       = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
 $lang->task->noticeLinkStory       = "No story has been linked. You can %s for this project, then %s.";
 $lang->task->noticeSaveRecord      = 'Your Hour is not saved. Please save it first.';
 $lang->task->commentActions        = '%s. %s, commented by <strong>%s</strong>.';

module/task/lang/fr.php

@@ -189,6 +189,7 @@ $lang->task->confirmChangeProject  = "Si vous changez {$lang->projectCommon}, Mo
 $lang->task->confirmFinish         = '"Heures Restantes" à 0. Voulez-vous passer le statut à "Terminée" ?';
 $lang->task->confirmRecord         = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?';
 $lang->task->confirmTransfer       = '"Heures Restantes" à 0. Voulez-vous transférer la tâche ?';
+$lang->task->noticeTaskStart       = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
 $lang->task->noticeLinkStory       = "Aucune Story n'est associée. Vous pouvez %s pour ce projet, alors %s.";
 $lang->task->noticeSaveRecord      = "Votre temps n'a pas été sauvé. Enregistrez-le d'abord.";
 $lang->task->commentActions        = '%s. %s, commenté par <strong>%s</strong>.';

module/task/lang/vi.php

@@ -189,6 +189,7 @@ $lang->task->confirmChangeProject  = "Nếu bạn thay đổi {$lang->projectCom
 $lang->task->confirmFinish         = '"Còn lại" bằng 0. Bạn có muốn thay đổi tình trạng thành "Kết thúc"?';
 $lang->task->confirmRecord         = '"Còn lại" bằng 0. Bạn có muốn thiết lập nhiệm vụ thành "Kết thúc"?';
 $lang->task->confirmTransfer       = '"Còn lại" bằng 0，Bạn có muốn chuyển thành nhiệm vụ?';
+$lang->task->noticeTaskStart       = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
 $lang->task->noticeLinkStory       = "Không có câu chuyện liên kết. Bạn có thể %s cho dự án này, sau đó %s.";
 $lang->task->noticeSaveRecord      = 'Số giờ làm của bạn chưa được lưu. Vui lòng lưu nó trước.';
 $lang->task->commentActions        = '%s. %s, nhận xét bởi <strong>%s</strong>.';

module/task/lang/zh-cn.php

@@ -189,6 +189,7 @@ $lang->task->confirmChangeProject  = "修改{$lang->projectCommon}会导致相
 $lang->task->confirmFinish         = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
 $lang->task->confirmRecord         = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
 $lang->task->confirmTransfer       = '"当前剩余"为0，任务将被转交，您确定吗？';
+$lang->task->noticeTaskStart       = '"总计消耗"和"预计剩余"不能同时为0';
 $lang->task->noticeLinkStory       = "没有可关联的相关{$lang->storyCommon}，您可以为当前项目%s，然后%s";
 $lang->task->noticeSaveRecord      = '您有尚未保存的工时记录，请先将其保存。';
 $lang->task->commentActions        = '%s. %s, 由 <strong>%s</strong> 添加备注。';

module/task/lang/zh-tw.php

@@ -189,6 +189,7 @@ $lang->task->confirmChangeProject  = "修改{$lang->projectCommon}會導致相
 $lang->task->confirmFinish         = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
 $lang->task->confirmRecord         = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
 $lang->task->confirmTransfer       = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
+$lang->task->noticeTaskStart       = '"總計消耗"和"預計剩餘"不能同時為0';
 $lang->task->noticeLinkStory       = "沒有可關聯的相關{$lang->storyCommon}，您可以為當前項目%s，然後%s";
 $lang->task->noticeSaveRecord      = '您有尚未保存的工時記錄，請先將其保存。';
 $lang->task->commentActions        = '%s. %s, 由 <strong>%s</strong> 添加備註。';

module/task/model.php

@@ -1232,6 +1232,11 @@ class taskModel extends model
 
         if($this->post->left == 0)
         {
+            if($task->consumed == 0)
+            {
+                dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->task->consumed);
+                return false;
+            }
             $task->status       = 'done';
             $task->finishedBy   = $this->app->user->account;
             $task->finishedDate = helper::now();

module/task/view/start.html.php

@@ -14,6 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('confirmFinish', $lang->task->confirmFinish);?>
+<?php js::set('noticeTaskStart', $lang->task->noticeTaskStart);?>
 <div id='mainContent' class='main-content'>
   <?php
   /* IF it is multi-task, the suspened can only be restarted by the current user who it is assigned to. */