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

* Adjust code.

Browse Source
This commit is contained in:
leiyong
2021-03-09 13:50:43 +08:00
parent 9098e727a5
commit c8c64bd05d
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+4 -3
View File
@@ -1337,13 +1337,14 @@ class projectModel extends model
->orderBy('date desc')
->fetchGroup('execution', 'name');
$this->loadModel('execution');
foreach($burns as $executionID => $executionBurns)
{
/* If executionBurns > $itemCounts, split it, else call processBurnData() to pad burns. */
$begin = $executions[$executionID]->begin;
$end = $executions[$executionID]->end;
if(helper::isZeroDate($begin)) $begin = $executions[$executionID]->openedDate;
$executionBurns = $this->loadModel('execution')->processBurnData($executionBurns, $itemCounts, $begin, $end);
$executionBurns = $this->execution->processBurnData($executionBurns, $itemCounts, $begin, $end);
/* Shorter names. */
foreach($executionBurns as $executionBurn)
@@ -1384,8 +1385,8 @@ class projectModel extends model
}
/* In the case of the waterfall model, calculate the sub-stage. */
$execution = $this->loadModel('execution')->getById($this->session->project);
if($execution and $execution->model == 'waterfall')
$project = $this->getByID($this->session->project);
if($project and $project->model == 'waterfall')
{
foreach($parents as $id => $execution)
{