From d45bb9c4f26812cabc3faa4c4e7d82b9c08d352a Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Thu, 17 Jun 2021 14:57:30 +0800
Subject: [PATCH]  * finish task #38726.

---
 module/personnel/view/invest.html.php |  6 +++++-
 module/product/view/all.html.php      |  8 +++++++-
 module/program/view/product.html.php  | 14 ++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/module/personnel/view/invest.html.php b/module/personnel/view/invest.html.php
index 5eb291e263..49ca357588 100644
--- a/module/personnel/view/invest.html.php
+++ b/module/personnel/view/invest.html.php
@@ -28,7 +28,7 @@
             <th colspan="2"><?php echo $lang->personnel->workingHours;?></th>
             <th colspan="3"><?php echo $lang->personnel->task;?></th>
             <th colspan="3"><?php echo $lang->personnel->bug;?></th>
-            <th colspan="2" class="w-150px"><?php echo $lang->personnel->createStories;?></th>
+            <th <?php echo $config->URAndSR ? "colspan='2'" : "rowspan='2'";?> class="w-150px"><?php echo $lang->personnel->createStories;?></th>
             <?php if(isset($this->config->maxVersion)): ?>
             <th colspan="3"><?php echo $lang->personnel->issue;?></th>
             <th colspan="3"><?php echo $lang->personnel->risk;?></th>
@@ -43,8 +43,10 @@
             <th><?php echo $lang->personnel->created;?></th>
             <th><?php echo $lang->personnel->resolved;?></th>
             <th><?php echo $lang->personnel->wait;?></th>
+            <?php if($this->config->URAndSR):?>
             <th><?php echo $lang->personnel->UR;?></th>
             <th><?php echo $lang->personnel->SR;?></th>
+            <?php endif;?>
             <?php if(isset($this->config->maxVersion)): ?>
             <th><?php echo $lang->personnel->created;?></th>
             <th><?php echo $lang->personnel->resolved;?></th>
@@ -70,7 +72,9 @@
             <td><?php echo $personnel['createdBug'];?></td>
             <td><?php echo $personnel['resolvedBug'];?></td>
             <td><?php echo $personnel['pendingBug'];?></td>
+            <?php if($this->config->URAndSR):?>
             <td><?php echo $personnel['UR'];?></td>
+            <?php endif;?>
             <td><?php echo $personnel['SR'];?></td>
             <?php if(isset($this->config->maxVersion)): ?>
             <td><?php echo $personnel['createdIssue'];?></td>
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 82868a70a3..ab5f6b4a0e 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -40,7 +40,9 @@
               <a class='table-nest-toggle table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse; ?>'></a>
               <?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?>
             </th>
+            <?php if($this->config->URAndSR):?>
             <th class="w-300px" colspan="4"><?php echo $lang->story->requirement;?></th>
+            <?php endif;?>
             <th class="w-300px" colspan="4"><?php echo $lang->story->story;?></th>
             <th class="w-150px" colspan="2"><?php echo $lang->bug->common;?></th>
             <th class="w-80px"  rowspan="2"><?php echo $lang->product->release;?></th>
@@ -48,10 +50,12 @@
             <th class='c-actions w-70px' rowspan="2"><?php echo $lang->actions;?></th>
           </tr>
           <tr class="text-center">
+            <?php if($this->config->URAndSR):?>
             <th style="border-left: 1px solid #ddd;"><?php echo $lang->story->activate;?></th>
             <th><?php echo $lang->story->close;?></th>
             <th><?php echo $lang->story->draft;?></th>
             <th><?php echo $lang->story->completeRate;?></th>
+            <?php endif;?>
             <th style="border-left: 1px solid #ddd;"><?php echo $lang->story->activate;?></th>
             <th><?php echo $lang->story->close;?></th>
             <th><?php echo $lang->story->draft;?></th>
@@ -69,7 +73,7 @@
         ?>
           <?php if(isset($program['programName'])):?>
           <tr <?php echo $trAttrs;?>>
-            <td colspan="14">
+            <td colspan="<?php echo $this->config->URAndSR ? 14 : 10;?>">
               <span class="table-nest-icon icon table-nest-toggle"></span>
               <?php echo $program['programName']?>
             </td>
@@ -134,10 +138,12 @@
               <span class='table-nest-icon icon icon-product'></span>
               <?php echo html::a($this->createLink('product', 'browse', 'product=' . $product->id), $product->name);?>
             </td>
+            <?php if($this->config->URAndSR):?>
             <td><?php echo $product->requirements['active'];?></td>
             <td><?php echo $product->requirements['closed'];?></td>
             <td><?php echo $product->requirements['draft'];?></td>
             <td><?php echo $totalRequirements == 0 ? 0 : round($product->requirements['closed'] / $totalRequirements, 3) * 100;?>%</td>
+            <?php endif;?>
             <td><?php echo $product->stories['active'];?></td>
             <td><?php echo $product->stories['closed'];?></td>
             <td><?php echo $product->stories['draft'];?></td>
diff --git a/module/program/view/product.html.php b/module/program/view/product.html.php
index 387dd97ea9..c1c4d899cd 100644
--- a/module/program/view/product.html.php
+++ b/module/program/view/product.html.php
@@ -48,18 +48,22 @@
               <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
             </th>
             <th rowspan="2"><?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?></th>
+            <?php if($this->config->URAndSR):?>
             <th class="w-300px" colspan="4"><?php echo $lang->story->requirement;?></th>
+            <?php endif;?>
             <th class="w-300px" colspan="4"><?php echo $lang->story->story;?></th>
             <th class="w-150px" colspan="2"><?php echo $lang->bug->common;?></th>
             <th class="w-80px"  rowspan="2"><?php echo $lang->product->release;?></th>
             <th class="w-80px"  rowspan="2"><?php echo $lang->product->plan;?></th>
-            <th class='c-actions w-60px' rowspan="2"><?php echo $lang->actions;?></th>
+            <th class='c-actions w-70px' rowspan="2"><?php echo $lang->actions;?></th>
           </tr>
           <tr class="text-center">
+            <?php if($this->config->URAndSR):?>
             <th style="border-left: 1px solid #ddd;"><?php echo $lang->story->activate;?></th>
             <th><?php echo $lang->story->close;?></th>
             <th><?php echo $lang->story->draft;?></th>
             <th><?php echo $lang->story->completeRate;?></th>
+            <?php endif;?>
             <th style="border-left: 1px solid #ddd;"><?php echo $lang->story->activate;?></th>
             <th><?php echo $lang->story->close;?></th>
             <th><?php echo $lang->story->draft;?></th>
@@ -83,10 +87,12 @@
               <?php endif;?>
             </td>
             <td class="c-name" title='<?php echo $product->name?>'><?php echo html::a($this->createLink('product', 'browse', 'product=' . $product->id), $product->name);?></td>
+            <?php if($this->config->URAndSR):?>
             <td><?php echo $product->requirements['active'];?></td>
             <td><?php echo $product->requirements['closed'];?></td>
             <td><?php echo $product->requirements['draft'];?></td>
             <td><?php echo $totalRequirements == 0 ? 0 : round($product->requirements['closed'] / $totalRequirements, 3) * 100;?>%</td>
+            <?php endif;?>
             <td><?php echo $product->stories['active'];?></td>
             <td><?php echo $product->stories['closed'];?></td>
             <td><?php echo $product->stories['draft'];?></td>
@@ -126,11 +132,11 @@
 $(function()
 {
     $('#productTableList').on('sort.sortable', function(e, data)
-    {   
-        var list = ''; 
+    {
+        var list = '';
         for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ',';
         $.post(createLink('product', 'updateOrder'), {'products' : list, 'orderBy' : orderBy});
-    }); 
+    });
 });
 </script>
 <?php include '../../common/view/footer.html.php';?>