From a4ec9958f0ed83aa576ec1275edd80f7eb59d7fc Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Wed, 10 Apr 2013 07:01:41 +0000
Subject: [PATCH]  * code for task#1328.

---
 module/report/model.php               | 8 +++++---
 module/report/view/bugassign.html.php | 2 +-
 module/report/view/workload.html.php  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/report/model.php b/module/report/model.php
index c013445e96..4e6b0fcc9a 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -428,8 +428,9 @@ EOT;
             {
                 foreach($userTasks as $task)
                 {
-                    $workload[$user]['task'][$task->projectName]['count']   = isset($workload[$user]['task'][$task->projectName]['count']) ? $workload[$user]['task'][$task->projectName]['count'] + 1 : 1;
-                    $workload[$user]['task'][$task->projectName]['manhour'] = isset($workload[$user]['task'][$task->projectName]['manhour']) ? $workload[$user]['task'][$task->projectName]['manhour'] + $task->left : $task->left;
+                    $workload[$user]['task'][$task->projectName]['count']     = isset($workload[$user]['task'][$task->projectName]['count']) ? $workload[$user]['task'][$task->projectName]['count'] + 1 : 1;
+                    $workload[$user]['task'][$task->projectName]['manhour']   = isset($workload[$user]['task'][$task->projectName]['manhour']) ? $workload[$user]['task'][$task->projectName]['manhour'] + $task->left : $task->left;
+                    $workload[$user]['task'][$task->projectName]['projectID'] = $task->project;
                     $workload[$user]['total']['count']   = isset($workload[$user]['total']['count']) ? $workload[$user]['total']['count'] + 1 : 1;
                     $workload[$user]['total']['manhour'] = isset($workload[$user]['total']['manhour']) ? $workload[$user]['total']['manhour'] + $task->left : $task->left;
                 }
@@ -462,7 +463,8 @@ EOT;
             {
                 foreach($userBugs as $bug)
                 {
-                    $assign[$user]['bug'][$bug->productName]['count'] = isset($assign[$user]['bug'][$bug->productName]['count']) ? $assign[$user]['bug'][$bug->productName]['count'] + 1 : 1;
+                    $assign[$user]['bug'][$bug->productName]['count']     = isset($assign[$user]['bug'][$bug->productName]['count']) ? $assign[$user]['bug'][$bug->productName]['count'] + 1 : 1;
+                    $assign[$user]['bug'][$bug->productName]['productID'] = $bug->product;
                     $assign[$user]['total']['count']   = isset($assign[$user]['total']['count']) ? $assign[$user]['total']['count'] + 1 : 1;
                 }
             }
diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php
index f85949e56b..f51e669c93 100644
--- a/module/report/view/bugassign.html.php
+++ b/module/report/view/bugassign.html.php
@@ -23,7 +23,7 @@
               <?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 html::a($this->createLink('product', 'view', "product={$count['productID']}"), $product);?></td>
               <td><?php echo $count['count'];?></td>
               <?php if($id == 1):?>
               <td rowspan="<?php echo count($assign['bug']);?>">
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index fd5f97dbaa..91ad575933 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -30,7 +30,7 @@
             <?php foreach($load['task'] as $project => $info):?>
             <?php $class = $color ? 'rowcolor' : '';?>
             <?php if($id != 1) echo '<tr class="a-center">';?>
-            <td class="<?php echo $class;?>"><?php echo $project;?></td>
+            <td class="<?php echo $class;?>"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $project);?></td>
             <td class="<?php echo $class;?>"><?php echo $info['count'];?></td>
             <td class="<?php echo $class;?>"><?php echo $info['manhour'];?></td>
             <?php if($id == 1):?>