* Finish task #8797.

2020-12-22 16:07:13 +08:00
parent 4563840ba7
commit 9c73a943f5
8 changed files with 16 additions and 18 deletions
@@ -999,11 +999,8 @@ class userModel extends model
            $hour = (object)$emptyHour;
            foreach($projectTasks as $task)
            {
-                if($task->status == 'wait')
-                {
-                    $hour->waitTasks     += 1;
-                    $hour->totalConsumed += $task->consumed;
-                }
+                if($task->status == 'wait') $hour->waitTasks += 1;
+                if($task->status != 'cancel') $hour->totalConsumed += $task->consumed;
                if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
            }
            $hours[$projectID] = $hour;