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

* Modify review code.

Browse Source
This commit is contained in:
xieqiyu
2022-05-12 10:55:50 +08:00
parent ffa1ec828d
commit dab8c1bb1e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -1
View File
@@ -1163,7 +1163,8 @@ class execution extends control
/* Get date list. */
$executionInfo = $this->execution->getByID($executionID);
$deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : ($execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate);
$deadline = $execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate;
$deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : $deadline;
$endDate = strpos($type, 'withdelay') !== false ? $deadline : $executionInfo->end;
list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $endDate, $type, $interval, 'Y-m-d');
$chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy);
module/execution/view/burn.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
<?php
$weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
$delay = strpos($type, 'withdelay') !== false ? 'nodelay' : 'withdelay';
if(strpos('closed,suspended', $execution->status) === false)
if(strpos('wait,doing', $execution->status) !== false)
{
common::printLink('execution', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
echo '<div class="space"></div>';