diff --git a/module/block/control.php b/module/block/control.php index 4b21c1b856..922824c124 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1063,16 +1063,16 @@ class block extends control if($task->parent == '-1') continue; $totalConsumed += $task->consumed; - if($task->status != 'cancel') $totalEstimate += $task->estimate; + $totalEstimate += $task->estimate; if($task->status != 'cancel' and $task->status != 'closed') $totalLeft += $task->left; } $executions[$executionID]->totalTasks = count($taskGroup); $executions[$executionID]->undoneTasks = $undoneTasks; $executions[$executionID]->yesterdayFinished = $yesterdayFinished; - $executions[$executionID]->totalEstimate = $totalEstimate; - $executions[$executionID]->totalConsumed = $totalConsumed; - $executions[$executionID]->totalLeft = $totalLeft; + $executions[$executionID]->totalEstimate = round($totalEstimate, 1); + $executions[$executionID]->totalConsumed = round($totalConsumed, 1); + $executions[$executionID]->totalLeft = round($totalLeft, 1); } /* Get stories. */ diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index 6e0a5b4174..5e64d05570 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -118,16 +118,16 @@ $(function()
project->totalEstimate;?>
-
totalEstimate;?> task->hour;?>
+
totalEstimate;?> task->hour;?>
project->totalConsumed;?>
-
totalConsumed;?> task->hour;?>
+
totalConsumed;?> task->hour;?>
-
project->totalLeft;?>
+
project->totalLeft;?>
totalLeft;?> task->hour;?>
diff --git a/module/project/model.php b/module/project/model.php index 2fc3c02262..1a789467dd 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2738,7 +2738,7 @@ class projectModel extends model $taskSum ++; } - return sprintf($this->lang->project->taskSummary, $taskSum, $statusWait, $statusDoing, $totalEstimate, round($totalConsumed, 1), round($totalLeft, 1)); + return sprintf($this->lang->project->taskSummary, $taskSum, $statusWait, $statusDoing, round($totalEstimate, 1), round($totalConsumed, 1), round($totalLeft, 1)); } /**