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

* Refactor the getStats method under the project.

Browse Source
This commit is contained in:
tianshujie
2022-08-15 18:57:50 +08:00
parent 72ef1b0ebd
commit 396673bd6d
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
-1
View File
@@ -1703,7 +1703,6 @@ class block extends control
$projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
$this->view->executionStats = $this->execution->getStatData($projectID, $status, 0, 0, false, 'skipParent', 'id_asc', $pager);
$this->view->projectPairs = $projectPairs;
}
/**
module/block/view/executionblock.html.php
-1
View File
@@ -43,7 +43,6 @@
<?php
$appid = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'";
$viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id);
if($config->systemMode == 'new' and isset($projectPairs[$execution->project])) $execution->name = zget($projectPairs, $execution->project, '') . ' / ' . $execution->name;
?>
<tr <?php echo $appid?>>
<td class='c-name text-left' title='<?php echo $execution->name;?>'><nobr><?php echo html::a($viewLink, $execution->name, '', "title='$execution->name'");?></nobr></td>
module/execution/model.php
+11 -6
View File
@@ -1478,13 +1478,16 @@ class executionModel extends model
->page($pager)
->fetchAll('id');
$hours = $this->computerProgress($executions);
$burns = $this->loadModel('execution')->getBurnData($executions);
$hours = $this->loadModel('project')->computerProgress($executions);
$burns = $this->getBurnData($executions);
if($withTasks) $executionTasks = $this->execution->getTaskGroupByExecution(array_keys($executions));
if($withTasks) $executionTasks = $this->getTaskGroupByExecution(array_keys($executions));
/* Process executions. */
$this->app->loadConfig('task');
$emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
$today = helper::today();
foreach($executions as $key => $execution)
{
/* Process the end time. */
@@ -1493,7 +1496,7 @@ class executionModel extends model
/* Judge whether the execution is delayed. */
if($execution->status != 'done' and $execution->status != 'closed' and $execution->status != 'suspended')
{
$delay = helper::diffDate(helper::today(), $execution->end);
$delay = helper::diffDate($today, $execution->end);
if($delay > 0) $execution->delay = $delay;
}
@@ -1505,7 +1508,6 @@ class executionModel extends model
/* Process the hours. */
$execution->hours = isset($hours[$execution->id]) ? $hours[$execution->id] : (object)$emptyHour;
$this->app->loadConfig('task');
if(isset($executionTasks) and isset($executionTasks[$execution->id]))
{
$tasks = array_chunk($executionTasks[$execution->id], $this->config->task->defaultLoadCount, true);
@@ -1516,6 +1518,7 @@ class executionModel extends model
if($param == 'skipParent')
{
if($execution->parent < 0 and $execution->type == 'stage') unset($executions[$key]);
if($this->config->systemMode == 'new' and $execution->projectName) $execution->name = $execution->projectName . ' / ' . $execution->name;
}
else
{
@@ -1526,7 +1529,7 @@ class executionModel extends model
}
}
}
return $executions;
return array_values($executions);
}
/**
@@ -3397,6 +3400,8 @@ class executionModel extends model
*/
public function getBurnData($executions)
{
if(empty($executions)) return array();
/* Get burndown charts datas. */
$burns = $this->dao->select('execution, date AS name, `left` AS value')
->from(TABLE_BURN)