diff --git a/module/execution/control.php b/module/execution/control.php index 9811f255d1..25b7228018 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2011,8 +2011,18 @@ class execution extends control $this->execution->setMenu($execution->id); $this->app->loadLang('bug'); - list($dateList, $interval) = $this->execution->getDateList($execution->begin, $execution->end, 'noweekend', 0, 'Y-m-d'); - $chartData = $this->execution->buildBurnData($executionID, $dateList, 'noweekend'); + $type = 'noweekend'; + 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)) + and strpos($type, 'delay') === false) + $type .= ',withdelay'; + + $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 : $execution->end; + list($dateList, $interval) = $this->execution->getDateList($execution->begin, $endDate, $type, 0, 'Y-m-d'); + $chartData = $this->execution->buildBurnData($executionID, $dateList, $type); /* Load pager. */ $this->app->loadClass('pager', $static = true); @@ -2036,6 +2046,7 @@ class execution extends control $this->view->statData = $this->execution->statRelatedData($executionID); $this->view->chartData = $chartData; $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable. + $this->view->type = $type; $this->display(); } diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 90ec222e0e..87e758c145 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -12,6 +12,7 @@ ?> +