From 355af26fb5e4d8eef38fae7f3f710c7ed024d8fa Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Fri, 25 Dec 2020 13:54:19 +0800 Subject: [PATCH] * Finish task#8751. Add stakeholder type and key. --- module/program/lang/de.php | 5 +++++ module/program/lang/en.php | 5 +++++ module/program/lang/fr.php | 5 +++++ module/program/lang/vi.php | 5 +++++ module/program/lang/zh-cn.php | 5 +++++ module/program/lang/zh-tw.php | 5 +++++ module/program/model.php | 2 +- module/program/view/pgmstakeholder.html.php | 6 +++++- 8 files changed, 36 insertions(+), 2 deletions(-) diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 4e78ad3644..6765f9404a 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -195,6 +195,8 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->stakeholderType = 'Stakeholder type'; +$lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; $lang->program->PGMParentBudget = "Parent program budget:%s"; @@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be $lang->program->PGMBeginGreateChild = "Child earliest begin: %s, parent begin date <= child earliest begin date."; $lang->program->PGMEndLetterChild = "Child latest end: %s, parent end date >= child latest end date."; +$lang->program->stakeholderTypeList['inside'] = 'Inside'; +$lang->program->stakeholderTypeList['outside'] = 'Outside'; + /* Fields. */ $lang->program->PGMName = 'Name'; $lang->program->PGMTemplate = 'Template'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index cc6d87f65f..91e02f76fd 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -195,6 +195,8 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->stakeholderType = 'Stakeholder type'; +$lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; $lang->program->PGMParentBudget = "Parent program budget:%s"; @@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be $lang->program->PGMBeginGreateChild = "Child earliest begin: %s, parent begin date <= child earliest begin date."; $lang->program->PGMEndLetterChild = "Child latest end: %s, parent end date >= child latest end date."; +$lang->program->stakeholderTypeList['inside'] = 'Inside'; +$lang->program->stakeholderTypeList['outside'] = 'Outside'; + /* Fields. */ $lang->program->PGMName = 'Name'; $lang->program->PGMTemplate = 'Template'; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index 4e78ad3644..6765f9404a 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -195,6 +195,8 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->stakeholderType = 'Stakeholder type'; +$lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; $lang->program->PGMParentBudget = "Parent program budget:%s"; @@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be $lang->program->PGMBeginGreateChild = "Child earliest begin: %s, parent begin date <= child earliest begin date."; $lang->program->PGMEndLetterChild = "Child latest end: %s, parent end date >= child latest end date."; +$lang->program->stakeholderTypeList['inside'] = 'Inside'; +$lang->program->stakeholderTypeList['outside'] = 'Outside'; + /* Fields. */ $lang->program->PGMName = 'Name'; $lang->program->PGMTemplate = 'Template'; diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php index 4e78ad3644..6765f9404a 100644 --- a/module/program/lang/vi.php +++ b/module/program/lang/vi.php @@ -195,6 +195,8 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->stakeholderType = 'Stakeholder type'; +$lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; $lang->program->PGMParentBudget = "Parent program budget:%s"; @@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be $lang->program->PGMBeginGreateChild = "Child earliest begin: %s, parent begin date <= child earliest begin date."; $lang->program->PGMEndLetterChild = "Child latest end: %s, parent end date >= child latest end date."; +$lang->program->stakeholderTypeList['inside'] = 'Inside'; +$lang->program->stakeholderTypeList['outside'] = 'Outside'; + /* Fields. */ $lang->program->PGMName = 'Name'; $lang->program->PGMTemplate = 'Template'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 87baa0485a..5a738881db 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -195,6 +195,8 @@ $lang->program->PGMExport = '导出'; $lang->program->PGMStakeholder = '干系人列表'; $lang->program->createStakeholder = '添加干系人'; $lang->program->unlinkStakeholder = '移除干系人'; +$lang->program->stakeholderType = '干系人类型'; +$lang->program->isStakeholderKey = '关键干系人'; $lang->program->importStakeholder = '从父项目集导入'; $lang->program->PGMManageMembers = '项目集团队'; $lang->program->PGMParentBudget = "父项目集预算:%s"; @@ -204,6 +206,9 @@ $lang->program->PGMEndGreaterParent = "父项目集的完成日期:%s,完 $lang->program->PGMBeginGreateChild = "子项目集的最小开始日期:%s,父项目集的开始日期不能大于子项目集的最小开始日期"; $lang->program->PGMEndLetterChild = "子项目的最大完成日期:%s,父项目的完成日期不能小于子项目的最大完成日期"; +$lang->program->stakeholderTypeList['inside'] = '内部'; +$lang->program->stakeholderTypeList['outside'] = '外部'; + /* Fields. */ $lang->program->PGMName = '项目集名称'; $lang->program->PGMTemplate = '项目集模板'; diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php index aaa55ad41c..803e351658 100644 --- a/module/program/lang/zh-tw.php +++ b/module/program/lang/zh-tw.php @@ -198,6 +198,8 @@ $lang->program->PGMExport = '導出'; $lang->program->PGMStakeholder = '干係人列表'; $lang->program->createStakeholder = '添加干係人'; $lang->program->unlinkStakeholder = '移除干係人'; +$lang->program->stakeholderType = '干係人類型'; +$lang->program->isStakeholderKey = '關鍵干係人'; $lang->program->importStakeholder = '從父項目集導入'; $lang->program->PGMManageMembers = '項目集團隊'; $lang->program->PGMParentBudget = "父項目集預算:%s"; @@ -207,6 +209,9 @@ $lang->program->PGMEndGreaterParent = "父項目集的完成日期:%s,完 $lang->program->PGMBeginGreateChild = "子項目集的最小開始日期:%s,父項目集的開始日期不能大於子項目集的最小開始日期"; $lang->program->PGMEndLetterChild = "子項目的最大完成日期:%s,父項目的完成日期不能小於子項目的最大完成日期"; +$lang->program->stakeholderTypeList['inside'] = '内部'; +$lang->program->stakeholderTypeList['outside'] = '外部'; + /* Fields. */ $lang->program->PGMName = '項目集名稱'; $lang->program->PGMTemplate = '項目集模板'; diff --git a/module/program/model.php b/module/program/model.php index a18da0b5a0..d5e5b92ff2 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -449,7 +449,7 @@ class programModel extends model */ public function getStakeholders($programID = 0, $orderBy, $pager = null) { - return $this->dao->select('t2.account,t2.realname,t2.role,t2.qq,t2.mobile,t2.phone,t2.weixin,t2.email,t1.id')->from(TABLE_STAKEHOLDER)->alias('t1') + return $this->dao->select('t2.account,t2.realname,t2.role,t2.qq,t2.mobile,t2.phone,t2.weixin,t2.email,t1.id,t1.type,t1.key')->from(TABLE_STAKEHOLDER)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account') ->where('t1.objectID')->eq($programID) ->andWhere('t1.objectType')->eq('program') diff --git a/module/program/view/pgmstakeholder.html.php b/module/program/view/pgmstakeholder.html.php index 85c7f16b92..b909f186f6 100644 --- a/module/program/view/pgmstakeholder.html.php +++ b/module/program/view/pgmstakeholder.html.php @@ -32,6 +32,7 @@ idAB;?> user->realname;?> + program->stakeholderType;?> user->role;?> user->phone;?> user->qq;?> @@ -46,7 +47,10 @@ id);?> - realname;?> + key ? " " : '';?> + key ? $lang->program->isStakeholderKey : '';?> + realname . $isKey;?> + '>program->stakeholderTypeList, $stakeholder->type, '');?> user->roleList, $stakeholder->role);?> phone;?> qq;?>