From 4b10512f21aa156be21a28a66a24a48c100565fa Mon Sep 17 00:00:00 2001
From: fujia <yuren_@126.com>
Date: Sat, 13 Nov 2010 03:41:38 +0000
Subject: [PATCH]  + complete task #307:add PO PM QM RM to project.

---
 db/update1.3.sql                  |  2 ++
 module/project/control.php        |  1 +
 module/project/lang/en.php        |  1 +
 module/project/lang/zh-cn.php     |  1 +
 module/project/model.php          | 16 ++++++++++++++++
 module/project/view/edit.html.php | 16 ++++++++++++++++
 www/theme/default/style.css       |  2 +-
 7 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 db/update1.3.sql

diff --git a/db/update1.3.sql b/db/update1.3.sql
new file mode 100644
index 0000000000..78d2f8aee6
--- /dev/null
+++ b/db/update1.3.sql
@@ -0,0 +1,2 @@
+-- 2010-11-13 project table.
+ALTER TABLE `zt_project` ADD `RM` varchar(30) NOT NULL DEFAULT '' AFTER `QM`;
diff --git a/module/project/control.php b/module/project/control.php
index 0f23421c74..3a5b1b39d5 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -421,6 +421,7 @@ class project extends control
         $this->view->position = $position;
         $this->view->projects = $projects;
         $this->view->project  = $project;
+        $this->view->users    = $this->loadModel('user')->getPairs('noclosed,nodeleted');
         $this->view->groups   = $this->loadModel('group')->getPairs();
 
         $this->display();
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 53711976fb..3be71be1df 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -34,6 +34,7 @@ $lang->project->canceledDate = 'Canceled date';
 $lang->project->PO           = 'Product owner';
 $lang->project->PM           = 'Project manager';
 $lang->project->QM           = 'QA manager';
+$lang->project->RM           = 'Release manager';
 $lang->project->acl          = 'Access limitation';
 $lang->project->teamname     = 'Team name';
 $lang->project->products     = 'Products';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 4ab3f34a57..3a7177cfcd 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -46,6 +46,7 @@ $lang->project->canceledDate = '取消日期';
 $lang->project->PO           = '产品负责人';
 $lang->project->PM           = '项目负责人';
 $lang->project->QM           = '测试负责人';
+$lang->project->RM           = '发布负责人';
 $lang->project->acl          = '访问控制';
 $lang->project->teamname     = '团队名称';
 $lang->project->products     = '相关产品';
diff --git a/module/project/model.php b/module/project/model.php
index 88b5bc0a2d..ef002593b0 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -114,6 +114,7 @@ class projectModel extends model
     public function update($projectID)
     {
         $oldProject = $this->getById($projectID);
+        $team = $this->getTeamMemberPairs($projectID);
         $this->lang->project->team = $this->lang->project->teamname;
         $projectID = (int)$projectID;
         $project = fixer::input('post')
@@ -134,6 +135,21 @@ class projectModel extends model
             ->where('id')->eq($projectID)
             ->limit(1)
             ->exec();
+        foreach($project as $fieldName => $value)
+        {
+            if($fieldName == 'PO' or $fieldName == 'PM' or $fieldName == 'QM' or $fieldName == 'RM' )
+            {
+                if(!empty($value) and !isset($team[$value]))
+                {
+                    $member->project     = (int)$projectID;
+                    $member->account     = $value;
+                    $member->joinDate    = helper::today();
+                    $member->role        = $fieldName;
+                    $member->workingHour = '';
+                    $this->dao->insert(TABLE_TEAM)->data($member)->exec();
+                }
+            }
+        }
         if(!dao::isError()) return common::createChanges($oldProject, $project);
     }
 
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 83d9139b38..b629029ac0 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -47,6 +47,22 @@ function setWhite(acl)
         <th class='rowhead'><?php echo $lang->project->status;?></th>
         <td><?php echo html::select('status', $lang->project->statusList, $project->status, 'class=text-3');?></td>
       </tr>
+      <tr>
+        <th class='rowhead'><?php echo $lang->project->PO;?></th>
+        <td><?php echo html::select('PO', $users, $project->PO, 'class=text-3');?></td>
+      </tr>  
+      <tr>
+        <th class='rowhead'><?php echo $lang->project->PM;?></th>
+        <td><?php echo html::select('PM', $users, $project->PM, 'class=text-3');?></td>
+      </tr>  
+      <tr>
+        <th class='rowhead'><?php echo $lang->project->QM;?></th>
+        <td><?php echo html::select('QM', $users, $project->QM, 'class=text-3');?></td>
+      </tr>  
+      <tr>
+        <th class='rowhead'><?php echo $lang->project->RM;?></th>
+        <td><?php echo html::select('RM', $users, $project->RM, 'class=text-3');?></td>
+      </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->project->goal;?></th>
         <td><?php echo html::textarea('goal', $project->goal, "rows='5' class='area-1'");?></td>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 8338d95094..1b3b8edc2e 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -273,7 +273,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .roadmap a{color:white;}
 .release {background:darkgreen; color:white}
 .plan    {background:#9F9F5F;}
-.search  {display:none; float:left; clear:none; width:16px; height:16px; padding:0; margin:0 0 0 2px; text-indent:-2000px; overflow:hidden; background: url(images/main/search.gif) no-repeat;} 
+.search  {display:block; float:left; clear:none; width:16px; height:16px; padding:0; margin:0 0 0 2px; text-indent:-2000px; overflow:hidden; background: url(images/main/search.gif) no-repeat;} 
 .searchleft{display:block; float:left; clear:none;} 
 .helplink {font-size:9px}