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

Merge branch 'feature/doctemplate' into release/21.7.2

Browse Source
This commit is contained in:
xieqiyu
2025-06-18 02:18:57 +00:00
parent c9c2fb2e63 1cd90a2cd0
commit 2155a40448
174 changed files with 7507 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+5 -3
View File
@@ -356,7 +356,7 @@ class execution extends control
$pager = new pager(count($tasks2Imported), $recPerPage, $pageID);
$tasks2ImportedList = array_chunk($tasks2Imported, $pager->recPerPage, true);
$tasks2ImportedList = empty($tasks2ImportedList) ? $tasks2ImportedList : (isset($tasks2ImportedList[$pageID - 1]) ? $tasks2ImportedList[$pageID - 1] : current($tasks2ImportedList));
if(!empty($tasks2ImportedList)) $tasks2ImportedList = isset($tasks2ImportedList[$pageID - 1]) ? $tasks2ImportedList[$pageID - 1] : current($tasks2ImportedList);
$tasks2ImportedList = $this->loadModel('task')->processTasks($tasks2ImportedList);
$this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->importTask;
@@ -975,12 +975,14 @@ class execution extends control
}
$burn = $this->execution->getBurnByExecution($executionID, $execution->begin, 0);
$left = empty($burn) ? 0 : $burn->left;
$withLeft = $this->post->withLeft ? $this->post->withLeft : 0;
if($withLeft) $left = $this->post->estimate;
$burnData = form::data($this->config->execution->form->fixfirst)
->add('task', 0)
->add('execution', $executionID)
->add('date', $execution->begin)
->add('left', $withLeft ? $this->post->estimate : (empty($burn) ? 0 : $burn->left))
->add('left', $left)
->add('consumed', empty($burn) ? 0 : $burn->consumed)
->get();
@@ -3498,7 +3500,7 @@ class execution extends control
$this->loadModel('task');
$result = array();
foreach($array as $key => $object)
foreach($array as $object)
{
$result[$object->id] = $object;
$tasks = zget($object, 'tasks', array());