From 3979c28fb2caabb454802607a3198276b79d8ae3 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 28 Sep 2022 11:05:50 +0800
Subject: [PATCH] * Finish task #70487.

---
 module/product/css/all.css           |  4 ++--
 module/program/control.php           |  2 ++
 module/program/css/product.css       |  7 +++++++
 module/program/view/product.html.php | 23 ++++++++++++++++++-----
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/module/product/css/all.css b/module/product/css/all.css
index e4bac9340f..146f6bdf0e 100644
--- a/module/product/css/all.css
+++ b/module/product/css/all.css
@@ -90,5 +90,5 @@ th.c-actions {width: 50px;}
 #productTableList > tr.row-line.no-nest > td.text-left.table-nest-title > span.table-nest-icon.icon:before{content: '\e6f2'; background-color: white; display: inline;}
 .statistic {margin-left: 10px; color: #838a9d; float: left; position: relative; line-height: 28px;}
 .table-footer.fixed-footer .statistic {color: #fff;}
-#productTableList .c-manager {padding-left: 20px;}
-#productTableList .c-manager a {top: 7px; left: 28px;}
+#productTableList .c-manager {padding-left: 14px;}
+#productTableList .c-manager a {top: 7px; left: 22px;}
diff --git a/module/program/control.php b/module/program/control.php
index ba80180d95..7a18186f8d 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -170,6 +170,8 @@ class program extends control
         $this->view->orderBy     = $orderBy;
         $this->view->pager       = $pager;
         $this->view->users       = $this->loadModel('user')->getPairs('noletter');
+        $this->view->userIdPairs = $this->user->getPairs('noletter|showid');
+        $this->view->usersAvatar = $this->user->getAvatarPairs('');
         $this->view->products    = $this->loadModel('product')->getStats($orderBy, $pager, $browseType, '', 'story', $programID);
 
         $this->display();
diff --git a/module/program/css/product.css b/module/program/css/product.css
index 3d4a43d6f9..3f1c79c5c2 100644
--- a/module/program/css/product.css
+++ b/module/program/css/product.css
@@ -3,3 +3,10 @@
 tbody.sortable > tr > td > span.sort-handler {color: #999;}
 .icon-move {color: #16a8f8;}
 .table.has-sort-head thead>tr>th>a:after, .table.has-sort-head thead>tr>th>a:before {top: -4px;}
+.c-PO {width: 100px;}
+.c-story {width: 300px;}
+.c-bug {width: 150px;}
+.c-plan, .c-release {width: 80px;}
+.c-actions {width: 70px;}
+#productList .c-manager {padding-left: 20px;}
+#productList .c-manager a {top: 7px; left: 26px;}
diff --git a/module/program/view/product.html.php b/module/program/view/product.html.php
index 781b154887..226a3c0f94 100644
--- a/module/program/view/product.html.php
+++ b/module/program/view/product.html.php
@@ -48,11 +48,12 @@
               <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
             </th>
             <th rowspan="2"><?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?></th>
-            <th class="w-300px" colspan="4"><?php echo $lang->story->story;?></th>
-            <th class="w-200px" colspan="2"><?php echo $lang->bug->common;?></th>
-            <th class="w-80px"  rowspan="2"><?php echo $lang->product->plan;?></th>
-            <th class="w-80px"  rowspan="2"><?php echo $lang->product->release;?></th>
-            <th class='c-actions w-70px' rowspan="2"><?php echo $lang->actions;?></th>
+            <th class='c-PO' rowspan="2"><?php common::printOrderLink('PO', $orderBy, $vars, $lang->product->manager);?></th>
+            <th class='c-story' colspan="4"><?php echo $lang->story->story;?></th>
+            <th class='c-bug' colspan="2"><?php echo $lang->bug->common;?></th>
+            <th class='c-plan' rowspan="2"><?php echo $lang->product->plan;?></th>
+            <th class='c-release' rowspan="2"><?php echo $lang->product->release;?></th>
+            <th class='c-actions' rowspan="2"><?php echo $lang->actions;?></th>
           </tr>
           <tr class="text-center">
             <th style="border-left: 1px solid #ddd;"><?php echo $lang->story->draft;?></th>
@@ -78,6 +79,18 @@
               <?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>
+            <td class='c-manager'>
+              <?php
+              if(!empty($product->PO))
+              {
+                  $userName  = zget($users, $product->PO);
+                  echo html::smallAvatar(array('avatar' => $usersAvatar[$product->PO], 'account' => $product->PO, 'name' => $userName), 'avatar-circle avatar-' . zget($userIdPairs, $product->PO));
+
+                  $userID = isset($userIdPairs[$product->PO]) ? $userIdPairs[$product->PO] : '';
+                  echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");
+              }
+              ?>
+            </td>
             <td><?php echo $product->stories['draft'];?></td>
             <td><?php echo $product->stories['active'];?></td>
             <td><?php echo $product->stories['changing'];?></td>