From 2a05766fe2347f9570f74f300fda4f734ed3aac7 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Tue, 16 May 2023 09:48:43 +0800
Subject: [PATCH] * Fix bug #31321, modify product story completion rate.

---
 module/product/model.php         | 1 +
 module/product/view/all.html.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index 3c94c09be4..ccffc75658 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1947,6 +1947,7 @@ class productModel extends model
             $product->stories                 = $stories[$product->id];
             $product->stories['finishClosed'] = isset($finishClosedStory[$product->id]) ? $finishClosedStory[$product->id] : 0;
             $product->stories['unclosed']     = isset($unclosedStory[$product->id]) ? $unclosedStory[$product->id] : 0;
+            $product->stories['totalStories'] = $product->stories['unclosed'] + $product->stories['closed'];
 
             $product->requirements = $requirements[$product->id];
             $product->plans        = isset($plans[$product->id])    ? $plans[$product->id]    : 0;
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 99829dd160..817ff60e84 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -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['finishClosedStories'] + $program['unclosedStories'];?>
+            <?php $totalStories = $program['totalStories'];?>
             <td><?php echo $totalStories == 0 ? 0 : round($program['finishClosedStories'] / $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['finishClosedStories']) ? $line['finishClosedStories'] : 0) + (isset($line['unclosedStories']) ? $line['unclosedStories'] : 0);?>
+            <?php $totalStories = (isset($line['totalStories']) ? $line['totalStories'] : 0)?>
             <td><?php echo $totalStories == 0 ? 0 : round((isset($line['finishClosedStories']) ? $line['finishClosedStories'] : 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->stories['finishClosed'] + $product->stories['unclosed'];
+          $totalStories = $product->stories['totalStories'];
 
           $trClass = '';
           if($product->line and $this->config->systemMode == 'ALM')