From 658e7af2270fda5fd3557b7bb63430b3ac8e7c9b Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Mon, 17 Dec 2012 07:15:34 +0000 Subject: [PATCH] * change QM to QD, RM to RD. --- module/project/control.php | 3 +++ module/project/lang/en.php | 4 ++-- module/project/lang/zh-cn.php | 4 ++-- module/project/model.php | 22 +++++++++++++++++----- module/project/view/edit.html.php | 8 ++++---- module/project/view/view.html.php | 8 ++++---- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/module/project/control.php b/module/project/control.php index bfc20ec5b8..680aa085db 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -43,6 +43,7 @@ class project extends control if($locate == 'yes') $this->locate($this->createLink('project', 'task')); $this->commonAction($projectID); + $this->session->set('projectList', $this->app->getURI(true)); $this->app->loadLang('my'); $this->view->projectStats = $this->project->getProjectStats($status); @@ -1113,6 +1114,8 @@ class project extends control $users = $this->user->getPairs('noclosed, nodeleted'); $users = array('' => '') + $users; $members = $this->project->getTeamMembers($projectID); + $teams = $this->project->getTeams2Import($this->app->user->account, $projectID); + a($teams); /* The deleted members. */ foreach($members as $account => $member) diff --git a/module/project/lang/en.php b/module/project/lang/en.php index fb90d4fcd2..32031e2bbe 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -36,8 +36,8 @@ $lang->project->canceledBy = 'Canceled by'; $lang->project->canceledDate = 'Canceled date'; $lang->project->PO = 'Product owner'; $lang->project->PM = 'Project manager'; -$lang->project->QM = 'Test manager'; -$lang->project->RM = 'Release manager'; +$lang->project->QD = 'Quality director'; +$lang->project->RD = 'Release director'; $lang->project->acl = 'Access limitation'; $lang->project->teamname = 'Team name'; $lang->project->order = 'Project order'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index edd3778bec..2dc7aacac4 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -36,8 +36,8 @@ $lang->project->canceledBy = '由谁取消'; $lang->project->canceledDate = '取消日期'; $lang->project->PO = '产品负责人'; $lang->project->PM = '项目负责人'; -$lang->project->QM = '测试负责人'; -$lang->project->RM = '发布负责人'; +$lang->project->QD = '测试负责人'; +$lang->project->RD = '发布负责人'; $lang->project->acl = '访问控制'; $lang->project->teamname = '团队名称'; $lang->project->order = '项目排序'; diff --git a/module/project/model.php b/module/project/model.php index f2f9f517ca..12dd0f18e6 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -311,14 +311,14 @@ class projectModel extends model ->exec(); foreach($project as $fieldName => $value) { - if($fieldName == 'PO' or $fieldName == 'PM' or $fieldName == 'QM' or $fieldName == 'RM' ) + if($fieldName == 'PO' or $fieldName == 'PM' or $fieldName == 'QD' or $fieldName == 'RD' ) { if(!empty($value) and !isset($team[$value])) { $member->project = (int)$projectID; $member->account = $value; $member->join = helper::today(); - $member->role = $fieldName; + $member->role = $this->lang->project->$fieldName; $member->days = $project->days; $member->hours = $this->config->project->defaultWorkhours; $this->dao->insert(TABLE_TEAM)->data($member)->exec(); @@ -578,15 +578,15 @@ class projectModel extends model */ public function getDefaultManagers($projectID) { - $managers = $this->dao->select('PO,QM,RM')->from(TABLE_PRODUCT)->alias('t1') + $managers = $this->dao->select('PO,QD,RD')->from(TABLE_PRODUCT)->alias('t1') ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.product') ->where('t2.project')->eq($projectID) ->fetch(); if($managers) return $managers; $managers->PO = ''; - $managers->QM = ''; - $managers->RM = ''; + $managers->QD = ''; + $managers->RD = ''; return $managers; } @@ -934,6 +934,18 @@ class projectModel extends model return array('' => '') + $users; } + public function getTeams2Import($account, $currentProject) + { + return $this->dao->select('t1.project, t2.name as projectName, t2.team as teamName') + ->from(TABLE_TEAM)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') + ->where('t1.account')->eq($account) + ->andWhere('t1.project')->ne($currentProject) + ->groupBy('t1.project') + ->orderBy('t1.project DESC') + ->fetchAll('project'); + } + /** * Manage team members. * diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 3104e4cc3a..376e755c4a 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -53,12 +53,12 @@ PM, 'class=text-3');?> - project->QM;?> - QM, 'class=text-3');?> + project->QD;?> + QD, 'class=text-3');?> - project->RM;?> - RM, 'class=text-3');?> + project->RD;?> + RD, 'class=text-3');?> project->manageProducts;?> diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 5aaa979035..a65f1b0d16 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -81,12 +81,12 @@ PO];?> - project->QM;?> - QM];?> + project->QD;?> + QD];?> - project->RM;?> - RM];?> + project->RD;?> + RD];?> project->products;?>