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

+ add unplanned story.

Browse Source
This commit is contained in:
zhujinyong
2013-02-19 01:44:52 +00:00
parent ef486899e3
commit 0f4b864f90
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/report/lang/en.php
View File

@@ -68,5 +68,6 @@ $lang->report->to = 'to';
$lang->report->taskTotal = "Task Total";
$lang->report->manhourTotal = "Manhour Total";
$lang->report->bugTotal = "%s Bugs";
$lang->report->unplanned = 'unplanned';
$lang->report->proVersion = '<a href="http://www.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">Try pro version for more!</a>';

1
module/report/lang/zh-cn.php
View File

@@ -68,5 +68,6 @@ $lang->report->to = '至';
$lang->report->taskTotal = "总任务数";
$lang->report->manhourTotal = "总工时";
$lang->report->bugTotal = "共%s个Bug";
$lang->report->unplanned = '未计划';
$lang->report->proVersion = '<a href="http://www.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩，尽在专业版！</a>';

12
module/report/model.php
View File

@@ -365,6 +365,18 @@ EOT;
$products[$plan->product]->plans[$story->plan]->status[$story->status] = isset($products[$plan->product]->plans[$story->plan]->status[$story->status]) ? $products[$plan->product]->plans[$story->plan]->status[$story->status] + 1 : 1;
}
}
$unplannedStories = $this->dao->select('product, id, status')->from(TABLE_STORY)->where('deleted')->eq(0)->andWhere('plan')->eq(0)->andWhere('product')->in(array_keys($products))->fetchGroup('product', 'id');
foreach($unplannedStories as $product => $stories)
{
$products[$product]->plans[0] = new stdClass();
$products[$product]->plans[0]->title = $this->lang->report->unplanned;
$products[$product]->plans[0]->begin = '';
$products[$product]->plans[0]->end = '';
foreach($stories as $story)
{
$products[$product]->plans[0]->status[$story->status] = isset($products[$product]->plans[0]->status[$story->status]) ? $products[$product]->plans[0]->status[$story->status] + 1 : 1;
}
}
return $products;
}