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

* Finish task #57095.

Browse Source
This commit is contained in:
tianshujie
2022-06-16 10:29:31 +08:00
parent da9801d9eb
commit b3e240eda5
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/datatable/control.php
+6 -1
View File
@@ -99,7 +99,12 @@ class datatable extends control
if($module == 'execution' and $method == 'all')
{
if($extra == 'execution' or $extra == 'project') unset($cols['actions']);
if($extra == 'execution' or $extra == 'project')
{
unset($cols['percent']);
unset($cols['attribute']);
unset($cols['actions']);
}
if($extra == 'project' or $extra == 'stage') unset($cols['project']);
}
module/execution/config.php
+1 -1
View File
@@ -139,7 +139,7 @@ $config->execution->gantt->linkType['end']['end'] = 2;
$config->execution->gantt->linkType['begin']['end'] = 3;
$config->execution->datatable = new stdclass();
$config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
$config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'percent', 'attribute', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn', 'actions');
$config->execution->datatable->fieldList['id']['title'] = 'idAB';
$config->execution->datatable->fieldList['id']['fixed'] = 'left';
module/execution/model.php
+1 -1
View File
@@ -4167,7 +4167,7 @@ class executionModel extends model
$id = $col->id;
$onlyChildStage = ($execution->grade == 2 and $execution->project != $execution->parent);
if(!$isStage and $col->id == 'actions') return;
if(!$isStage and in_array($col->id, array('percent', 'attribute', 'actions'))) return;
if(($this->config->systemMode == 'classic' or ($this->config->systemMode == 'new' and $this->app->tab != 'execution')) and $col->id == 'project') return;
if($col->show)
module/execution/view/all.html.php
+7 -3
View File
@@ -106,7 +106,11 @@ js::set('foldAll', $lang->execution->treeLevel['root']);
$hasActions = false;
foreach($setting as $key => $value)
{
if($value->id == 'actions') $hasActions = true;
if($value->id == 'actions')
{
$hasActions = true;
$value->show = true;
}
}
if(!$hasActions)
@@ -126,9 +130,9 @@ js::set('foldAll', $lang->execution->treeLevel['root']);
foreach($setting as $key => $value)
{
if($value->show || $value->id == 'actions')
if($value->show)
{
if($isStage and $value->id == 'actions') $value->show = true;
if(!$isStage and in_array($value->id, array('percent', 'attribute', 'actions'))) continue;
if(($config->systemMode == 'classic' or ($config->systemMode == 'new' and $this->app->tab != 'execution')) and $value->id == 'project') continue;
$this->datatable->printHead($value, $orderBy, $vars, $canBatchEdit);