Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug

module/program/control.php

@@ -171,6 +171,8 @@ class program extends control
         $this->view->pager         = $pager;
         $this->view->users         = $this->loadModel('user')->getPairs('noletter');
         $this->view->products      = $this->loadModel('product')->getStats($orderBy, $pager, $browseType, '', 'story', $programID);
+        $this->view->userIdPairs   = $this->user->getPairs('noletter|showid');
+        $this->view->usersAvatar   = $this->user->getAvatarPairs('');
         $this->view->showBatchEdit = $this->cookie->showProductBatchEdit;
 
         $this->display();

module/program/css/product.css

@@ -3,4 +3,11 @@
 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;}
 .statistic {margin-left: 10px; color: #838a9d; float: left; position: relative; line-height: 28px;}

module/program/css/project.css

@@ -8,3 +8,5 @@
 
 .has-suffix > a {max-width: calc(100% - 100px); padding-right: 5px; color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
 .c-budget {width:100px; text-align: right; padding-right:16px !important;}
+.c-manager {white-space: nowrap; overflow: hidden;}
+.c-manager a {top: 8px;}

module/program/view/browsebylist.html.php

@@ -73,10 +73,10 @@
           <?php endif;?>
         </td>
         <td class='c-status'><span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status, '');?></span></td>
-        <td>
+        <td class="c-manager">
           <?php if(!empty($program->PM)):?>
           <?php $userName = zget($users, $program->PM);?>
-          <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$program->PM], 'account' => $program->PM, 'name' => $userName), 'avatar-circle avatar-' . zget($userIdPairs, $program->PM)); ?>
+          <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$program->PM], 'account' => $program->PM, 'name' => $userName), (($program->type == 'program' and $program->grade == 1 )? 'avatar-circle avatar-top avatar-' : 'avatar-circle avatar-') . zget($userIdPairs, $program->PM)); ?>
           <?php $userID   = isset($PMList[$program->PM]) ? $PMList[$program->PM]->id : '';?>
           <?php echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");?>
           <?php endif;?>
@@ -119,9 +119,8 @@
 #programTableList .icon-scrum:before {content: '\e9a2';}
 #programTableList .icon-waterfall:before {content: '\e9a4';}
 #programTableList .icon-kanban:before {content: '\e983';}
-/* #programTableList .has-nest-child > .c-name > a {color: #0b0f18!important;}
-#programTableList .is-nest-child > .c-name > a {color: #2463c7!important;} */
-#programTableList .c-name .label-danger {position: absolute; right: 10px; padding: 2px 4px;}
+#programTableList > tr[data-type="program"] > .c-name > a {color: #0b0f18 !important;}
+#programTableList > tr[data-type="program"] > .c-name:hover > a {color: #313c52 !important;}
 </style>
 <?php js::set('originOrders', $originOrders);?>
 <script>

module/program/view/product.html.php

@@ -51,11 +51,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-150px" 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>
@@ -80,6 +81,18 @@
               <span class="product-id <?php if($canBatchEdit && $showBatchEdit) echo 'hidden';?>"><?php printf('%03d', $product->id);?></span>
             </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>

module/program/view/project.html.php

@@ -54,6 +54,7 @@ $canBatchEdit = common::hasPriv('project', 'batchEdit');
               foreach($setting as $value)
               {
                 if($value->id == 'projectStatus' and $browseType !== 'all') $value->show = false;
+                if($value->id == 'status' and strpos('all,unclosed', $browseType) === false) $value->show = false;
                 if($value->show) $this->datatable->printHead($value, $orderBy, $vars, $canBatchEdit);
               }
             ?>