From 5789150b1cf2948403e4e2a1b7b70837fb8d52bc Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 20 Aug 2020 09:28:21 +0800
Subject: [PATCH] * Question details page.

---
 module/issue/control.php        |  3 +-
 module/issue/lang/zh-cn.php     |  1 +
 module/issue/view/view.html.php | 86 ++++++++++++++++++++++++++++++---
 3 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/module/issue/control.php b/module/issue/control.php
index 30a372ce0f..1eecc71d02 100644
--- a/module/issue/control.php
+++ b/module/issue/control.php
@@ -282,9 +282,8 @@ class issue extends control
         $this->view->position[] = $this->lang->issue->common;
         $this->view->position[] = $this->lang->issue->basicInfo;
 
-        $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
+        $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted');
         $this->view->issue = $issue;
-
         $this->display();
     }
 
diff --git a/module/issue/lang/zh-cn.php b/module/issue/lang/zh-cn.php
index d2ffb9cf2f..11c77eceba 100644
--- a/module/issue/lang/zh-cn.php
+++ b/module/issue/lang/zh-cn.php
@@ -28,6 +28,7 @@ $lang->issue->assignedTo        = '指派给';
 $lang->issue->assignedBy        = '由谁指派';
 $lang->issue->assignedDate      = '指派时间';
 $lang->issue->resolved          = '解决';
+$lang->issue->id                = '编号';
 
 $lang->issue->delete            = '删除';
 $lang->issue->basicInfo         = '基本信息';
diff --git a/module/issue/view/view.html.php b/module/issue/view/view.html.php
index c3a0612807..b90cc77d84 100644
--- a/module/issue/view/view.html.php
+++ b/module/issue/view/view.html.php
@@ -15,6 +15,12 @@
 <?php
 $browseLink = $this->createLink('issue', 'browse');
 $createLink = $this->createLink('issue', 'create');
+
+$dateFiled  = array('deadline', 'resolvedDate', 'createdDate', 'editedDate', 'activateDate', 'closedDate', 'assignedDate');
+foreach($issue as $field => $value)
+{
+	if(in_array($field, $dateFiled) && strpos($value, '0000') === 0) $issue->$field = '';
+}
 ?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
@@ -35,8 +41,8 @@ $createLink = $this->createLink('issue', 'create');
   <div class="main-col col-8">
     <div class="cell">
       <div class="detail">
-        <p><strong>标题</strong> - 设计出现偏差，需求重新设计</p>
-        <p><strong>标题</strong> - 设计出现偏差，需求重新设计</p>
+        <p><strong><?php echo $lang->issue->title;?></strong> - <?php echo $issue->title?></p>
+        <p><strong><?php echo $lang->issue->deadline;?></strong> - <?php echo $issue->deadline;?></p>
       </div>
       <div class="detail">
         <div class="detail-title"><?php echo $lang->issue->desc;?></div>
@@ -59,12 +65,80 @@ $createLink = $this->createLink('issue', 'create');
         <div class="tab-content">
           <div class="tab-pane active" id="basicInfo">
             <table class="table table-data">
-              <tbody>
+			  <tbody>
+				<tr valign="middle">
+				<th class="thWidth w-100px"><?php echo $lang->issue->id;?></th>
+				<td><?php echo $issue->id;?></td>
+				</tr>
                 <tr valign="middle">
                   <th class="thWidth w-80px"><?php echo $lang->issue->type;?></th>
-                  <td></td>
-                  
-                </tr>
+				  <td><?php echo zget($lang->issue->typeList, $issue->type);?></td>
+				</tr>
+
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->severity;?></th>
+				  <td><?php echo $issue->severity;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->pri;?></th>
+				  <td><?php echo $issue->pri;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->resolvedDate;?></th>
+				  <td><?php echo $issue->resolvedDate;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->owner;?></th>
+				  <td><?php echo zget($users, $issue->owner);?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->assignedTo;?></th>
+				  <td><?php echo zget($users, $issue->assignedTo);?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->createdBy;?></th>
+				  <td><?php echo zget($users, $issue->createdBy);?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->createdDate;?></th>
+				  <td><?php echo $issue->createdDate;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->editedBy;?></th>
+				  <td><?php echo zget($users, $issue->editedBy);?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->editedDate;?></th>
+				  <td><?php echo $issue->editedDate;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->assignedBy;?></th>
+				  <td><?php echo zget($users, $issue->assignedBy);?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->assignedDate;?></th>
+				  <td><?php echo $issue->assignedDate;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->closedDate;?></th>
+				  <td><?php echo $issue->closedDate;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->activateBy;?></th>
+				  <td><?php echo zget($users, $issue->activateBy);?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->activateDate;?></th>
+				  <td><?php echo $issue->activateDate;?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->closeBy;?></th>
+				  <td><?php echo zget($users, $issue->closeBy);?></td>
+				</tr>
+                <tr valign="middle">
+                  <th class="thWidth w-80px"><?php echo $lang->issue->status;?></th>
+				  <td><?php echo zget($lang->issue->statusList, $issue->status);?></td>
+				</tr>
               </tbody>
             </table>
           </div>