* Modify burn chart .

This commit is contained in:
宋辰轩
2022-12-23 10:49:21 +08:00
parent 786b8da824
commit c0f84b7f29
2 changed files with 14 additions and 6 deletions
+11 -5
View File
@@ -3170,12 +3170,12 @@ class executionModel extends model
{
dao::$errors['message'][] = sprintf($this->lang->execution->daysGreaterProject, $execution->days);
return false;
}
}
if((float)$hours[$key] > 24)
{
dao::$errors['message'][] = $this->lang->execution->errorHours;
return false;
}
}
}
$this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq($executionType)->exec();
@@ -4354,10 +4354,11 @@ class executionModel extends model
* @param array $dateList
* @param string $type
* @param string $burnBy
* @param string $executionEnd
* @access public
* @return array
*/
public function buildBurnData($executionID, $dateList, $type, $burnBy = 'left')
public function buildBurnData($executionID, $dateList, $type, $burnBy = 'left', $executionEnd = '')
{
$this->loadModel('report');
$burnBy = $burnBy ? $burnBy : 'left';
@@ -4369,10 +4370,15 @@ class executionModel extends model
$firstBurn = empty($sets) ? 0 : reset($sets);
$firstTime = !empty($firstBurn->$burnBy) ? $firstBurn->$burnBy : (!empty($firstBurn->value) ? $firstBurn->value : 0);
$firstTime = $firstTime == 'null' ? 0 : $firstTime;
$days = count($dateList) - 1;
/* If the $executionEnd is passed, the guide should end of execution. */
$days = $executionEnd ? array_search($executionEnd, $dateList) : count($dateList) - 1;
$rate = $days ? $firstTime / $days : '';
$baselineJSON = '[';
foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * (float)$rate, 3) . ',';
foreach($dateList as $i => $date)
{
$value = ($i > $days ? 0 : round(($days - $i) * (float)$rate, 3)) . ',';
$baselineJSON .= $value;
}
$baselineJSON = rtrim($baselineJSON, ',') . ']';
$chartData['labels'] = $this->report->convertFormat($dateList, DT_DATE5);