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

Merge branch 'sprint/biz17'

Browse Source
This commit is contained in:
liugang
2022-12-26 08:50:31 +08:00
parent f0b1d7fbd2 f6c4838800
commit 8100689bb2
544 changed files with 24132 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+9 -3
View File
@@ -4395,10 +4395,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';
@@ -4410,10 +4411,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);