From acd02c78eee3891b981446f9b9432f0e6df8039b Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 15 Jun 2023 17:19:51 +0800
Subject: [PATCH] * Fix bug #35909.

---
 module/program/view/product.html.php | 16 ++++++++--------
 www/checktable.php                   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/program/view/product.html.php b/module/program/view/product.html.php
index 504b0a8429..d1d903f0ea 100644
--- a/module/program/view/product.html.php
+++ b/module/program/view/product.html.php
@@ -70,7 +70,7 @@
         </thead>
         <tbody class="sortable" id="productTableList">
         <?php foreach($products as $product):?>
-          <?php $totalStories = $product->stories['finishClosed'] + $product->stories['unclosed'];?>
+          <?php $totalStories = $product->finishedStories + ($product->totalStories - $product->closedStories);?>
           <tr class="text-center" data-id='<?php echo $product->id ?>' data-order='<?php echo $product->code;?>'>
             <td class='c-id text-left'>
               <?php if($canBatchEdit):?>
@@ -91,13 +91,13 @@
               }
               ?>
             </td>
-            <td><?php echo $product->stories['draft'];?></td>
-            <td><?php echo $product->stories['active'];?></td>
-            <td><?php echo $product->stories['changing'];?></td>
-            <td><?php echo $product->stories['reviewing'];?></td>
-            <td><?php echo $totalStories == 0 ? 0 : round($product->stories['finishClosed'] / $totalStories, 3) * 100;?>%</td>
-            <td><?php echo $product->unResolved;?></td>
-            <td><?php echo ($product->unResolved + $product->fixedBugs) == 0 ? 0 : round($product->fixedBugs / ($product->unResolved + $product->fixedBugs), 3) * 100;?>%</td>
+            <td><?php echo $product->draftStories;?></td>
+            <td><?php echo $product->activeStories;?></td>
+            <td><?php echo $product->changingStories;?></td>
+            <td><?php echo $product->reviewingStories;?></td>
+            <td><?php echo $totalStories == 0 ? 0 : round($product->finishedStories / $totalStories, 3) * 100;?>%</td>
+            <td><?php echo $product->unresolvedBugs;?></td>
+            <td><?php echo ($product->unresolvedBugs + $product->fixedBugs) == 0 ? 0 : round($product->fixedBugs / ($product->unresolvedBugs + $product->fixedBugs), 3) * 100;?>%</td>
             <td><?php echo $product->plans;?></td>
             <td><?php echo $product->releases;?></td>
             <td class='c-actions'>
diff --git a/www/checktable.php b/www/checktable.php
index 1a1e09124b..6237cf6d29 100644
--- a/www/checktable.php
+++ b/www/checktable.php
@@ -63,7 +63,7 @@ $lang = new stdclass();
 $lang->misc = new stdclass();
 $lang->storyCommon     = '';
 $lang->productCommon   = '';
-$lang->executionCommon   = '';
+$lang->executionCommon = '';
 $lang->URCommon        = '';
 $lang->SRCommon        = '';
 $lang->productURCommon = '';