Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #3660.

Browse Source
This commit is contained in:
tianshujie98
2020-12-02 14:10:00 +08:00
parent 27e9164878
commit 071e99b3a5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+4 -4
View File
@@ -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. */
module/block/view/projectstatisticblock.html.php
+3 -3
View File
@@ -118,16 +118,16 @@ $(function()
<div class="table-row text-center small text-muted with-padding">
<div class="col-4 text-bottom">
<div><?php echo $lang->project->totalEstimate;?></div>
<div><?php echo $execution->totalEstimate;?> <span class="muted"><?php echo $lang->task->hour;?></span></div>
<div><?php echo (float)$execution->totalEstimate;?> <span class="muted"><?php echo $lang->task->hour;?></span></div>
</div>
<div class="col-4">
<span class="label label-dot label-primary"></span>
<div><?php echo $lang->project->totalConsumed;?></div>
<div><?php echo $execution->totalConsumed;?> <span class="muted"><?php echo $lang->task->hour;?></span></div>
<div><?php echo (float)$execution->totalConsumed;?> <span class="muted"><?php echo $lang->task->hour;?></span></div>
</div>
<div class="col-4">
<span class="label label-dot label-pale"></span>
<div><?php echo $lang->project->totalLeft;?></div>
<div><?php echo (float)$lang->project->totalLeft;?></div>
<div><?php echo $execution->totalLeft;?> <span class="muted"><?php echo $lang->task->hour;?></span></div>
</div>
</div>
module/project/model.php
+1 -1
View File
@@ -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));
}
/**