* Finish task#8932.

This commit is contained in:
hufangzhou
2021-01-08 17:24:15 +08:00
parent 1b74e246b1
commit 4b3f4edd3c
2 changed files with 15 additions and 2 deletions
+14 -2
View File
@@ -156,7 +156,7 @@
<script>
$(function()
{
// Update table summary text.
/* Update table summary text. */
var checkedSummary = '<?php echo $lang->project->checkedSummary?>';
var pageSummary = '<?php echo $lang->project->pageSummary?>';
@@ -176,6 +176,7 @@ $(function()
var checkedConsumed = 0;
var checkedLeft = 0;
var taskIdList = [];
$rows.each(function()
{
var $row = $(this);
@@ -190,7 +191,18 @@ $(function()
if(status === 'doing') checkedDoing++;
var parentID = tasks[$row.data('id')].parent;
if(parentID <= 0 || !$('tbody>tr[data-id="' + parentID + '"]').length > 0)
var canStatistics = false;
if(parentID <= 0)
{
canStatistics = true;
}
else
{
if(taskIdList.indexOf(parseInt(parentID)) < 0) canStatistics = true;
}
if(canStatistics)
{
checkedEstimate += Number(data.estimate);
checkedConsumed += Number(data.consumed);
+1
View File
@@ -2065,6 +2065,7 @@ class taskModel extends model
->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->leftjoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id')
->where('t1.deleted')->eq(0)
->andWhere('t1.parent')->ne(-1)
->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi()
->beginIF($programID)->andWhere('t1.PRJ')->eq($programID)->fi()
->beginIF($type == 'finishedBy')