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

* Code for task#53661.

Browse Source
This commit is contained in:
xieqiyu
2022-05-12 10:38:22 +08:00
parent 1cab87893e
commit ffa1ec828d
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -1163,7 +1163,7 @@ class execution extends control
/* Get date list. */
$executionInfo = $this->execution->getByID($executionID);
$deadline = $execution->status != 'closed' ? helper::today() : substr($execution->closedDate, 0, 10);
$deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : ($execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate);
$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/model.php
+4 -1
View File
@@ -827,6 +827,7 @@ class executionModel extends model
->setDefault('status', 'suspended')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('suspendedDate', helper::today())
->remove('comment')->get();
$this->dao->update(TABLE_EXECUTION)->data($execution)
@@ -3654,7 +3655,9 @@ class executionModel extends model
$chartData['baseLine'] = $baselineJSON;
$execution = $this->getById($executionID);
if(($execution->status != 'closed' and helper::today() > $execution->end) or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end))
if((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end)
or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end)
or ($execution->status == 'suspended' and $execution->suspendedDate > $execution->end))
{
$delaySets = $this->getBurnDataFlot($executionID, $burnBy, true);
$chartData['delayLine'] = $this->report->createSingleJSON($delaySets, $dateList);
module/execution/view/burn.html.php
+10 -3
View File
@@ -24,10 +24,17 @@
<?php
$weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
$delay = strpos($type, 'withdelay') !== false ? 'nodelay' : 'withdelay';
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>';
if(strpos('closed,suspended', $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>';
}
echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
if(($execution->status != 'closed' and helper::today() > $execution->end) or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end)) echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
if((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end)
or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end)
or ($execution->status == 'suspended' and $execution->suspendedDate > $execution->end))
echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
if(common::canModify('execution', $execution)) common::printLink('execution', 'fixFirst', "execution=$execution->id", $lang->execution->fixFirst, '', "class='btn btn-link iframe' data-width='700'");
echo $lang->execution->howToUpdateBurn;
?>