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

Merge branch 'xuan'

Browse Source
This commit is contained in:
zhujinyong
2021-12-14 09:08:15 +08:00
parent e3b686cf57 57da5467c9
commit 45cdfc8f59
46 changed files with 896 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/task.html.php
+54 -2
View File
@@ -179,6 +179,18 @@ body {margin-bottom: 25px;}
</div>
<?php endif; ?>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="xx-title">
<strong>
<?php echo ($this->project->getById($execution->project)->name . ' / ' . $this->execution->getByID($execution->id)->name) ?>
</strong>
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
</div>
</div>
<?php endif;?>
<div id="mainContent" class="main-row fade">
<div class="side-col" id="sidebar">
<div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
@@ -237,6 +249,20 @@ body {margin-bottom: 25px;}
<table class='table has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='taskList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
<thead>
<tr>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
{
if($field->show)
{
$this->datatable->printHead($field, $orderBy, $vars, $canBatchAction);
$columns++;
}
}
}?>
<?php else:?>
<?php
foreach($customFields as $field)
{
@@ -247,12 +273,24 @@ body {margin-bottom: 25px;}
}
}
?>
<?php endif;?>
</tr>
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr data-id='<?php echo $task->id;?>' data-status='<?php echo $task->status?>' data-estimate='<?php echo $task->estimate?>' data-consumed='<?php echo $task->consumed?>' data-left='<?php echo $task->left?>'>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', false, $showBranch);?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
{
$this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');
}
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
<?php endif;?>
</tr>
<?php if(!empty($task->children)):?>
<?php $i = 0;?>
@@ -260,7 +298,16 @@ body {margin-bottom: 25px;}
<?php $class = $i == 0 ? ' table-child-top' : '';?>
<?php $class .= ($i + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
<tr class='table-children<?php echo $class;?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-consumed='<?php echo $child->consumed?>' data-left='<?php echo $child->left?>'>
<?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true, $showBranch);?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
$this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);?>
<?php endif;?>
</tr>
<?php $i ++;?>
<?php endforeach;?>
@@ -436,5 +483,10 @@ $(function()
}
})
});
function handleLinkButtonClick()
{
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
window.open(xxcUrl);
}
</script>
<?php include '../../common/view/footer.html.php';?>