From 10ea4c8419747658e1f81e29772dcfa2297d6b43 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Fri, 30 Oct 2009 06:45:26 +0000
Subject: [PATCH]  + show the total working hour state.

---
 trunk/module/index/view/index.html.php     | 12 ++++++------
 trunk/module/project/lang/zh-cn.php        |  4 ++++
 trunk/module/project/model.php             |  7 ++++++-
 trunk/module/project/view/project.html.php | 20 ++++++++++----------
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/trunk/module/index/view/index.html.php b/trunk/module/index/view/index.html.php
index 1a7f34540f..75df334a93 100644
--- a/trunk/module/index/view/index.html.php
+++ b/trunk/module/index/view/index.html.php
@@ -34,23 +34,23 @@
       <table class='table-1'>
         <caption><?php echo $project->name;?></caption>
         <tr>
-          <th class='rowhead'><?php echo $lang->project->name;?></th>
+          <th width='60'><?php echo $lang->project->name;?></th>
           <td><?php echo html::a($this->createLink('project', 'browse', "projectid=$project->id"), $project->name);?></td>
         </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->project->code;?></th>
+          <th><?php echo $lang->project->code;?></th>
           <td><?php echo $project->code;?></td>
         </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->project->begin;?></th>
+          <th><?php echo $lang->project->begin;?></th>
           <td><?php echo $project->begin;?></td>
         </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->project->end;?></th>
+          <th><?php echo $lang->project->end;?></th>
           <td><?php echo $project->end;?></td>
         </tr>
         <tr>
-          <th class='rowhead'><?php echo $lang->project->status;?></th>
+          <th><?php echo $lang->project->status;?></th>
           <td><?php echo $project->status;?></td>
         </tr>
       </table>
@@ -71,7 +71,7 @@
       <table class='table-1'>
       <caption><?php echo $product->name;?></caption>
         <tr>
-          <th><?php echo $lang->product->name;?></th>
+          <th width='60'><?php echo $lang->product->name;?></th>
           <td><?php echo html::a($this->createLink('product', 'browse', "productID=$product->id"), $product->name);?></td>
         </tr>
         <tr>
diff --git a/trunk/module/project/lang/zh-cn.php b/trunk/module/project/lang/zh-cn.php
index cf28a72c49..b65e39bc0a 100644
--- a/trunk/module/project/lang/zh-cn.php
+++ b/trunk/module/project/lang/zh-cn.php
@@ -75,6 +75,10 @@ $lang->project->story        = '需求列表';
 $lang->project->bug          = 'Bug列表';
 $lang->project->burndown     = '燃烧图';
 
+$lang->project->beginAndEnd = '起止时间';
+$lang->project->lblStats    = '工时统计';
+$lang->project->stats       = '总共预计『%s』工时<br />已经消耗『%s』工时<br />预计剩余『%s』工时';
+
 $lang->team->account     = '用户';
 $lang->team->role        = '角色';
 $lang->team->joinDate    = '加盟日';
diff --git a/trunk/module/project/model.php b/trunk/module/project/model.php
index ceb3c8aeae..c4e409188a 100644
--- a/trunk/module/project/model.php
+++ b/trunk/module/project/model.php
@@ -99,7 +99,12 @@ class projectModel extends model
     /* 通过Id获取项目信息。*/
     public function findById($projectID)
     {
-        return $this->dao->findById((int)$projectID)->from(TABLE_PROJECT)->fetch();
+        $project = $this->dao->findById((int)$projectID)->from(TABLE_PROJECT)->fetch();
+        $total   = $this->dao->select('SUM(estimate) AS totalEstimate, SUM(consumed) AS totalConsumed, SUM(`left`) AS totalLeft')->from(TABLE_TASK)->where('project')->eq((int)$projectID)->fetch();
+        $project->totalEstimate = $total->totalEstimate;
+        $project->totalConsumed = $total->totalConsumed;
+        $project->totalLeft     = $total->totalLeft;
+        return $project;
     }
 
     /* 获得相关的产品列表。*/
diff --git a/trunk/module/project/view/project.html.php b/trunk/module/project/view/project.html.php
index d3ac0f3c8e..6a7717b740 100644
--- a/trunk/module/project/view/project.html.php
+++ b/trunk/module/project/view/project.html.php
@@ -4,20 +4,16 @@
     <?php echo html::select('projectID', $projects, $project->id, 'onchange="selectProject(this.value);" style="width:200px"');?>
   </caption>
   <tr>
-    <th class='rowhead'><?php echo $lang->project->name;?></th>
+    <th><?php echo $lang->project->name;?></th>
     <td><?php echo $project->name;?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->project->code;?></th>
+    <th><?php echo $lang->project->code;?></th>
     <td><?php echo $project->code;?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->project->begin;?></th>
-    <td><?php echo $project->begin;?></td>
-  </tr>
-  <tr>
-    <th class='rowhead'><?php echo $lang->project->end;?></th>
-    <td><?php echo $project->end;?></td>
+    <th><?php echo $lang->project->beginAndEnd;?></th>
+    <td><?php echo $project->begin . ' ~ ' . $project->end;?></td>
   </tr>
   <!--
   <tr>
@@ -26,13 +22,17 @@
   </tr>
   -->
   <tr>
-    <th class='rowhead'><?php echo $lang->project->goal;?></th>
+    <th><?php echo $lang->project->goal;?></th>
     <td><?php echo nl2br($project->goal);?></td>
   </tr>
   <tr>
-    <th class='rowhead'><?php echo $lang->project->desc;?></th>
+    <th><?php echo $lang->project->desc;?></th>
     <td><?php echo nl2br($project->desc);?></td>
   </tr>
+  <tr>
+    <th><?php echo $lang->project->lblStats;?></th>
+    <td><?php printf($lang->project->stats, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?></td>
+  </tr>
   <tr>
     <td colspan='2' class='a-right'>
     <?php