Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug #471.

Browse Source
This commit is contained in:
zhujinyong
2012-08-24 08:26:28 +00:00
parent c90800e6cb
commit c211260480
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/report/control.php
View File

@@ -86,7 +86,7 @@ class report extends control
$this->view->begin = $begin;
$this->view->end = $end;
$this->view->bugs = $this->report->getBugs($begin, $end);
$this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed');
$this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted');
$this->view->submenu = 'test';
$this->display();
}
@@ -102,7 +102,7 @@ class report extends control
$this->view->header->title = $this->lang->report->bugAssign;
$this->view->submenu = 'test';
$this->view->assigns = $this->report->getBugAssign();
$this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed');
$this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed|nodeleted');
$this->display();
}

31
module/report/view/bugassign.html.php
View File

@@ -17,21 +17,22 @@
</thead>
<tbody>
<?php foreach($assigns as $account => $assign):?>
<tr class="a-center">
<td rowspan="<?php echo count($assign['bug']);?>"><?php echo $users[$account];?></td>
<?php $id = 1;?>
<?php foreach($assign['bug'] as $product => $count):?>
<?php if($id != 1) echo '<tr class="a-center">';?>
<td><?php echo $product;?></td>
<td><?php echo $count['count'];?></td>
<?php if($id == 1):?>
<td rowspan="<?php echo count($assign['bug']);?>">
<?php echo $assign['total']['count'];?>
</td>
<?php endif;?>
<?php if($id != 1) echo '</tr>'; $id ++;?>
<?php endforeach;?>
</tr>
<?php if(!array_key_exists($account, $users)) continue;?>
<tr class="a-center">
<td rowspan="<?php echo count($assign['bug']);?>"><?php echo $users[$account];?></td>
<?php $id = 1;?>
<?php foreach($assign['bug'] as $product => $count):?>
<?php if($id != 1) echo '<tr class="a-center">';?>
<td><?php echo $product;?></td>
<td><?php echo $count['count'];?></td>
<?php if($id == 1):?>
<td rowspan="<?php echo count($assign['bug']);?>">
<?php echo $assign['total']['count'];?>
</td>
<?php endif;?>
<?php if($id != 1) echo '</tr>'; $id ++;?>
<?php endforeach;?>
</tr>
<?php endforeach;?>
</tbody>
</table>

2
module/report/view/bugsummary.html.php
View File

@@ -1,4 +1,5 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<table class="cont-lt1">
<tr valign='top'>
@@ -28,6 +29,7 @@
</thead>
<tbody>
<?php foreach($bugs as $user => $bug):?>
<?php if(!array_key_exists($user, $users)) continue;?>
<tr class="a-center">
<td><?php echo $users[$user];?></td>
<td><?php echo $bug['all'];?></td>