* Code for task #92310.

This commit is contained in:
tanghucheng
2023-05-08 19:23:21 +08:00
parent 503593149c
commit b24ce954fd
3 changed files with 20 additions and 9 deletions
+17 -6
View File
@@ -5213,14 +5213,15 @@ class executionModel extends model
/**
* Print execution nested list.
*
* @param object $execution
* @param bool $isChild
* @param array $users
* @param int $execution
* @param int $isChild
* @param int $users
* @param int $productID
* @param string $project
* @access public
* @return void
*/
public function printNestedList($execution, $isChild, $users, $productID)
public function printNestedList($execution, $isChild, $users, $productID, $project = '')
{
$this->loadModel('task');
$this->loadModel('execution');
@@ -5286,11 +5287,21 @@ class executionModel extends model
echo '<td>' . html::ring($execution->hours->progress) . '</td>';
echo "<td id='spark-{$execution->id}' class='sparkline text-left no-padding' values='$burns'></td>";
echo '<td class="c-actions text-center">';
common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true);
$title = '';
$disabled = '';
if($project->model == 'ipd')
{
$this->app->loadLang('stage');
$title = $execution->ipdStage['canStart'] ? '' : sprintf($this->lang->execution->disabledTip->startTip, $this->lang->stage->ipdTypeList[$execution->ipdStage['preAttribute']], $this->lang->stage->ipdTypeList[$execution->attribute]);
$disabled = $execution->ipdStage['canStart'] ? '' : 'disabled';
}
common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true, $disabled, $title);
$class = !empty($execution->children) ? 'disabled' : '';
common::printIcon('task', 'create', "executionID={$execution->id}", '', 'list', '', '', $class, false, "data-app='execution'");
$project = $this->loadModel('project')->getByID($execution->project);
if(empty($project)) $project = $this->loadModel('project')->getByID($execution->project);
if($execution->type == 'stage' or ($this->app->tab == 'project' and !empty($project->model) and $project->model == 'waterfallplus'))
{
$isCreateTask = $this->loadModel('programplan')->isCreateTask($execution->id);
+1 -1
View File
@@ -115,7 +115,7 @@
<?php foreach($executionStats as $execution):?>
<?php $execution->division = $project->division;?>
<?php $executionProductID = (empty($productID) and !empty($execution->product)) ? $execution->product : $productID;?>
<?php $this->execution->printNestedList($execution, false, $users, $executionProductID);?>
<?php $this->execution->printNestedList($execution, false, $users, $executionProductID, $project);?>
<?php endforeach;?>
</tbody>
</table>
+2 -2
View File
@@ -4175,7 +4175,7 @@ class taskModel extends model
$list .= '<td></td>';
$list .= '<td></td>';
$list .= '<td class="c-actions">';
$list .= $this->buildOperateMenu($task, 'browse');
$list .= $this->buildOperateBrowseMenu($task, $execution);
$list .= '</td></tr>';
if(!empty($task->children))
@@ -4252,7 +4252,7 @@ class taskModel extends model
* @access public
* @return string
*/
public function buildOperateBrowseMenu($task)
public function buildOperateBrowseMenu($task, $execution = '')
{
$menu = '';
$params = "taskID=$task->id";