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 @@
name;?>
- | project->name;?> |
+ project->name;?> |
createLink('project', 'browse', "projectid=$project->id"), $project->name);?> |
- | project->code;?> |
+ project->code;?> |
code;?> |
- | project->begin;?> |
+ project->begin;?> |
begin;?> |
- | project->end;?> |
+ project->end;?> |
end;?> |
- | project->status;?> |
+ project->status;?> |
status;?> |
@@ -71,7 +71,7 @@
name;?>
- | product->name;?> |
+ product->name;?> |
createLink('product', 'browse', "productID=$product->id"), $product->name);?> |
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』工时
已经消耗『%s』工时
预计剩余『%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 @@
id, 'onchange="selectProject(this.value);" style="width:200px"');?>
- | project->name;?> |
+ project->name;?> |
name;?> |
- | project->code;?> |
+ project->code;?> |
code;?> |
- | project->begin;?> |
- begin;?> |
-
-
- | project->end;?> |
- end;?> |
+ project->beginAndEnd;?> |
+ begin . ' ~ ' . $project->end;?> |
- | project->goal;?> |
+ project->goal;?> |
goal);?> |
- | project->desc;?> |
+ project->desc;?> |
desc);?> |
+
+ | project->lblStats;?> |
+ project->stats, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?> |
+
|
|