* fix the bugs of burn down chart.
+ add the link to update the burn down chart.
This commit is contained in:
@@ -124,6 +124,7 @@ $lang->resource->project->story = 'story';
|
||||
$lang->resource->project->build = 'build';
|
||||
$lang->resource->project->bug = 'bug';
|
||||
$lang->resource->project->burn = 'burn';
|
||||
$lang->resource->project->computeBurn = 'computeBurn';
|
||||
$lang->resource->project->burnData = 'burnData';
|
||||
$lang->resource->project->team = 'team';
|
||||
$lang->resource->project->manageProducts = 'manageProducts';
|
||||
|
||||
@@ -46,7 +46,8 @@
|
||||
<div class='box-content a-center'>
|
||||
<?php
|
||||
echo $burns[$project->id];
|
||||
echo html::linkButton($lang->project->largeBurnChart, $this->createLink('project', 'burn', "projectID=$project->id"));
|
||||
common::printLink('project', 'burn', "projectID=$project->id", $lang->project->largeBurnChart);
|
||||
common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin');
|
||||
?>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -322,11 +322,11 @@ class project extends control
|
||||
}
|
||||
|
||||
/* 计算燃烧图数据。*/
|
||||
public function computeBurn()
|
||||
public function computeBurn($reload = 'no')
|
||||
{
|
||||
$this->view->burns = $this->project->computeBurn();
|
||||
$this->display();
|
||||
exit;
|
||||
if($reload == 'yes') die(js::reload('parent'));
|
||||
die($this->display());
|
||||
}
|
||||
|
||||
/* 团队成员。*/
|
||||
|
||||
@@ -75,6 +75,7 @@ $lang->project->story = '需求列表';
|
||||
$lang->project->bug = 'Bug列表';
|
||||
$lang->project->build = 'Build列表';
|
||||
$lang->project->burn = '燃尽图';
|
||||
$lang->project->computeBurn = '更新燃尽图';
|
||||
$lang->project->burnData = '燃尽图数据';
|
||||
$lang->project->team = '团队成员';
|
||||
$lang->project->manageProducts = '关联产品';
|
||||
|
||||
@@ -422,7 +422,7 @@ class projectModel extends model
|
||||
}
|
||||
|
||||
/* 燃烧图所需要的数据。*/
|
||||
public function getBurnData($projectID = 0, $itemCounts = 21)
|
||||
public function getBurnData($projectID = 0, $itemCounts = 30)
|
||||
{
|
||||
/* 获得项目的信息,和已经计算过的燃烧图数量。*/
|
||||
$project = $this->getById($projectID);
|
||||
@@ -442,17 +442,22 @@ class projectModel extends model
|
||||
$current = helper::today();
|
||||
if($project->end != '0000-00-00')
|
||||
{
|
||||
$period = helper::diffDate($project->end, $project->begin);
|
||||
$period = helper::diffDate($project->end, $project->begin) + 1;
|
||||
$counts = $period > $itemCounts ? $itemCounts : $period;
|
||||
}
|
||||
else
|
||||
{
|
||||
$counts = $itemCounts;
|
||||
}
|
||||
for($i = 0; $i <= $counts - $burnCounts; $i ++)
|
||||
|
||||
for($i = 0; $i < $counts - $burnCounts; $i ++)
|
||||
{
|
||||
$sets[$current]->name = $current;
|
||||
$sets[$current]->value = '';
|
||||
if(helper::diffDate($current, $project->end) > 0) break;
|
||||
if(!isset($sets[$current]))
|
||||
{
|
||||
$sets[$current]->name = $current;
|
||||
$sets[$current]->value = '';
|
||||
}
|
||||
$nextDay = date(DT_DATE1, strtotime('next day', strtotime($current)));
|
||||
$current = $nextDay;
|
||||
}
|
||||
|
||||
@@ -23,6 +23,11 @@
|
||||
*/
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<div class='yui-d0 a-center'><?php echo $charts; ?></div>
|
||||
<div class='yui-d0 a-center'>
|
||||
<?php
|
||||
echo $charts;
|
||||
common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin');
|
||||
?>
|
||||
</div>
|
||||
<script language='Javascript'>createChart1();</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
Reference in New Issue
Block a user