From 6b098e42b9e24f56b06f109ce64965a419848e5f Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Fri, 8 Jan 2021 13:28:16 +0800 Subject: [PATCH] * Finish task#8948. --- module/product/view/project.html.php | 2 +- module/program/config.php | 12 ++++++------ module/program/lang/de.php | 1 - module/program/lang/en.php | 1 - module/program/lang/fr.php | 1 - module/program/lang/vi.php | 1 - module/program/lang/zh-cn.php | 1 - module/program/lang/zh-tw.php | 1 - module/program/model.php | 26 +++++++++++++------------- 9 files changed, 20 insertions(+), 26 deletions(-) diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index b778b7d0ba..cc7aacdc81 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -33,7 +33,7 @@ idAB;?> program->PRJName;?> - program->PRJPGM;?> + program->common;?> program->PM;?> program->begin;?> program->end;?> diff --git a/module/program/config.php b/module/program/config.php index 282df28d06..f870092a81 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -39,7 +39,7 @@ $config->program->sortFields->PRJBudget = 'budget'; global $lang; $config->program->datatable = new stdclass(); -$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJPGM', 'PM', 'PRJStatus', 'begin', 'end', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions'); +$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJProgram', 'PM', 'PRJStatus', 'begin', 'end', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions'); $config->program->datatable->fieldList['idAB']['title'] = 'idAB'; $config->program->datatable->fieldList['idAB']['fixed'] = 'left'; @@ -52,11 +52,11 @@ $config->program->datatable->fieldList['PRJName']['width'] = 'auto'; $config->program->datatable->fieldList['PRJName']['required'] = 'yes'; $config->program->datatable->fieldList['PRJName']['sort'] = 'no'; -$config->program->datatable->fieldList['PRJPGM']['title'] = 'PRJPGM'; -$config->program->datatable->fieldList['PRJPGM']['fixed'] = 'left'; -$config->program->datatable->fieldList['PRJPGM']['width'] = '140'; -$config->program->datatable->fieldList['PRJPGM']['required'] = 'no'; -$config->program->datatable->fieldList['PRJPGM']['sort'] = 'no'; +$config->program->datatable->fieldList['PRJProgram']['title'] = 'common'; +$config->program->datatable->fieldList['PRJProgram']['fixed'] = 'left'; +$config->program->datatable->fieldList['PRJProgram']['width'] = '140'; +$config->program->datatable->fieldList['PRJProgram']['required'] = 'no'; +$config->program->datatable->fieldList['PRJProgram']['sort'] = 'no'; $config->program->datatable->fieldList['PM']['title'] = 'PM'; $config->program->datatable->fieldList['PM']['fixed'] = 'no'; diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 6142ada5e4..fb53e1c206 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -46,7 +46,6 @@ $lang->program->project = 'Project'; $lang->program->stage = 'Stage'; $lang->program->PM = 'Manager'; $lang->program->PRJName = 'Name'; -$lang->program->PRJPGM = 'Program'; $lang->program->PRJCategory = 'Category'; $lang->program->PRJDesc = 'Description'; $lang->program->PRJCode = 'Code'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 5bdb2dd9dc..7ca91bba3e 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -46,7 +46,6 @@ $lang->program->project = 'Project'; $lang->program->stage = 'Stage'; $lang->program->PM = 'Manager'; $lang->program->PRJName = 'Name'; -$lang->program->PRJPGM = 'Program'; $lang->program->PRJCategory = 'Category'; $lang->program->PRJDesc = 'Description'; $lang->program->PRJCode = 'Code'; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index 22f81a011c..d13a09d2f2 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -46,7 +46,6 @@ $lang->program->project = 'Project'; $lang->program->stage = 'Stage'; $lang->program->PM = 'Manager'; $lang->program->PRJName = 'Name'; -$lang->program->PRJPGM = 'Program'; $lang->program->PRJCategory = 'Category'; $lang->program->PRJDesc = 'Description'; $lang->program->PRJCode = 'Code'; diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php index 22f81a011c..d13a09d2f2 100644 --- a/module/program/lang/vi.php +++ b/module/program/lang/vi.php @@ -46,7 +46,6 @@ $lang->program->project = 'Project'; $lang->program->stage = 'Stage'; $lang->program->PM = 'Manager'; $lang->program->PRJName = 'Name'; -$lang->program->PRJPGM = 'Program'; $lang->program->PRJCategory = 'Category'; $lang->program->PRJDesc = 'Description'; $lang->program->PRJCode = 'Code'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 82936b7e12..4812831458 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -46,7 +46,6 @@ $lang->program->project = '项目'; $lang->program->stage = '阶段'; $lang->program->PM = '负责人'; $lang->program->PRJName = '项目名称'; -$lang->program->PRJPGM = '所属项目集'; $lang->program->PRJCategory = '项目类型'; $lang->program->PRJDesc = '项目描述'; $lang->program->PRJCode = '项目代号'; diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php index b848d1d446..d19b79f098 100644 --- a/module/program/lang/zh-tw.php +++ b/module/program/lang/zh-tw.php @@ -46,7 +46,6 @@ $lang->program->project = '項目'; $lang->program->stage = '階段'; $lang->program->PM = '負責人'; $lang->program->PRJName = '項目名稱'; -$lang->program->PRJPGM = '所屬項目集'; $lang->program->PRJCategory = '項目類型'; $lang->program->PRJDesc = '項目描述'; $lang->program->PRJCode = '項目代號'; diff --git a/module/program/model.php b/module/program/model.php index 362eb5966f..365f0d8bd9 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1606,9 +1606,8 @@ class programModel extends model if($col->show) { - $class = "c-$id"; - $title = ''; - $PRJPGM = ''; + $class = "c-$id"; + $title = ''; if($id == 'idAB') $class .= ' cell-id'; @@ -1618,17 +1617,18 @@ class programModel extends model $title = "title='{$project->name}'"; } - if($id == 'PRJPGM') + $PRJProgram = ''; + if($id == 'PRJProgram') { - $programList = $this->getPGMPairs(); - $PGMIndex = strpos($project->path, $programID); - $PRJIndex = strpos($project->path, $project->id); - $PGMPath = explode(',' , substr($project->path, $PGMIndex, $PRJIndex - $PGMIndex)); - foreach($PGMPath as $program) + $programList = $this->getPGMPairs(); + $programIndex = strpos($project->path, $programID); + $projectIndex = strpos($project->path, $project->id); + $programPath = explode(',' , substr($project->path, $programIndex, $projectIndex - $programIndex)); + foreach($programPath as $program) { - if($program) $PRJPGM .= '/' . zget($programList, $program); + if($program) $PRJProgram .= '/' . zget($programList, $program); } - $title = "title='{$PRJPGM}'"; + $title = "title='{$PRJProgram}'"; } echo ""; @@ -1643,8 +1643,8 @@ class programModel extends model if($project->model === 'waterfall') echo "{$this->lang->program->waterfall}"; if($project->model === 'scrum') echo "{$this->lang->program->scrum}"; break; - case 'PRJPGM': - echo $PRJPGM; + case 'PRJProgram': + echo $PRJProgram; break; case 'PM': echo zget($users, $project->PM);