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

* Fix bug #36142 again.

Browse Source
This commit is contained in:
songchenxuan
2023-07-07 09:41:02 +08:00
parent 2ef84b660b
commit c94f65442c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/product/model.php
View File

@@ -1958,7 +1958,9 @@ class productModel extends model
->where('deleted')->eq(0)
->andWhere('status')->eq('closed')
->andWhere('closedReason')->eq('done')
->groupBy('product')
->fetchPairs('product', 'finish');
foreach($products as $productID => $product) $products[$productID]->finishClosedStories = isset($finishClosedStory[$productID]) ? $finishClosedStory[$productID] : 0;
return $products;

6
module/product/view/all.html.php
View File

@@ -128,7 +128,7 @@
<td><?php echo $program['activeStories'];?></td>
<td><?php echo $program['changingStories'];?></td>
<td><?php echo $program['reviewingStories'];?></td>
<?php $totalStories = $program['activeStories'] + $program['finishClosedStories'];?>
<?php $totalStories = ($program['totalStories'] - $program['closedStories']) + $program['finishClosedStories'];?>
<td><?php echo $totalStories == 0 ? 0 : round($program['finishedStories'] / $totalStories, 3) * 100;?>%</td>
<td><?php echo $program['unresolvedBugs'];?></td>
<td><?php echo ($program['unresolvedBugs'] + $program['fixedBugs']) == 0 ? 0 : round($program['fixedBugs'] / ($program['unresolvedBugs'] + $program['fixedBugs']), 3) * 100;?>%</td>
@@ -169,7 +169,7 @@
<td><?php echo isset($line['activeStories']) ? $line['activeStories'] : 0;?></td>
<td><?php echo isset($line['changingStories']) ? $line['changingStories'] : 0;?></td>
<td><?php echo isset($line['reviewingStories']) ? $line['reviewingStories'] : 0;?></td>
<?php $totalStories = (isset($line['activeStories']) ? $line['activeStories'] : 0) + (isset($line['finishClosedStories']) ? $line['finishClosedStories'] : 0)?>
<?php $totalStories = (isset($line['totalStories']) ? $line['totalStories'] : 0) - (isset($line['closedStories']) ? $line['closedStories'] : 0) + (isset($line['finishClosedStories']) ? $line['finishClosedStories'] : 0)?>
<td><?php echo $totalStories == 0 ? 0 : round((isset($line['finishedStories']) ? $line['finishedStories'] : 0) / $totalStories, 3) * 100;?>%</td>
<td><?php echo isset($line['unresolvedBugs']) ? $line['unresolvedBugs'] : 0;?></td>
<td><?php echo (isset($line['fixedBugs']) and ($line['unresolvedBugs'] + $line['fixedBugs'] != 0)) ? round($line['fixedBugs'] / ($line['unresolvedBugs'] + $line['fixedBugs']), 3) * 100 : 0;?>%</td>
@@ -184,7 +184,7 @@
<?php if(isset($line['products']) and is_array($line['products'])):?>
<?php foreach($line['products'] as $productID => $product):?>
<?php
$totalStories = $product->activeStories + $product->finishClosedStories;
$totalStories = ($product->totalStories - $product->closedStories) + $product->finishClosedStories;
$trClass = '';
if($product->line and $this->config->systemMode == 'ALM')