From 01192daf5bee6bb64fe9b2c8f01e4fd09a0b0be7 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 29 Nov 2010 13:01:52 +0000
Subject: [PATCH]  + add owner to test task.

---
 db/update1.3.sql                      | 3 +++
 module/testtask/control.php           | 4 +++-
 module/testtask/lang/en.php           | 1 +
 module/testtask/lang/zh-cn.php        | 1 +
 module/testtask/view/create.html.php  | 9 +++++++++
 module/testtask/view/edit.html.php    | 4 ++++
 module/testtask/view/results.html.php | 2 +-
 module/testtask/view/runcase.html.php | 2 +-
 module/testtask/view/view.html.php    | 4 ++++
 9 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/db/update1.3.sql b/db/update1.3.sql
index abda8b25ba..0b94d9d316 100644
--- a/db/update1.3.sql
+++ b/db/update1.3.sql
@@ -40,3 +40,6 @@ update zt_groupPriv set method='finish' where module='task' and method='complete
 
 UPDATE zt_task SET assignedTo = openedBy,assignedDate = finishedDate WHERE STATUS = 'done';
 UPDATE zt_task SET assignedTo = openedBy,assignedDate = canceledDate WHERE STATUS = 'cancel';
+
+-- test task table.
+ALTER TABLE `zt_testTask` ADD `owner` VARCHAR( 30 ) NOT NULL AFTER `build` ;
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 695dc83d65..f650d3c155 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -100,6 +100,7 @@ class testtask extends control
 
         $this->view->projects  = $this->product->getProjectPairs($productID);
         $this->view->builds    = $this->loadModel('build')->getProductBuildPairs($productID);
+        $this->view->users     = $this->loadModel('user')->getPairs('noclosed|nodeleted');
 
         $this->display();
     }
@@ -125,7 +126,7 @@ class testtask extends control
 
         $this->view->productID = $productID;
         $this->view->task      = $task;
-        $this->view->users     = $this->loadModel('user')->getPairs('noclosed');
+        $this->view->users     = $this->loadModel('user')->getPairs('noclosed|noletter');
         $this->view->actions   = $this->loadModel('action')->getList('testtask', $taskID);
 
         $this->display();
@@ -218,6 +219,7 @@ class testtask extends control
         $this->view->task      = $task;
         $this->view->projects  = $this->product->getProjectPairs($productID);
         $this->view->builds    = $this->loadModel('build')->getProductBuildPairs($productID);
+        $this->view->users     = $this->loadModel('user')->getPairs();
 
         $this->display();
     }
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 51571a266d..f152ac4b42 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -30,6 +30,7 @@ $lang->testtask->id             = 'ID';
 $lang->testtask->product        = 'Product';
 $lang->testtask->project        = 'Project';
 $lang->testtask->build          = 'Build';
+$lang->testtask->owner          = 'Owner';
 $lang->testtask->name           = 'Name';
 $lang->testtask->begin          = 'Begin';
 $lang->testtask->end            = 'End';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index c385ceffcc..821700e172 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -30,6 +30,7 @@ $lang->testtask->id             = '任务编号';
 $lang->testtask->product        = '所属产品';
 $lang->testtask->project        = '所属项目';
 $lang->testtask->build          = 'Build';
+$lang->testtask->owner          = '负责人';
 $lang->testtask->name           = '任务名称';
 $lang->testtask->begin          = '开始日期';
 $lang->testtask->end            = '结束日期';
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 92fd75e8e5..edd5082eba 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -13,6 +13,11 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<script language='Javascript'>
+function loadBuilds()
+{
+}
+</script>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -25,6 +30,10 @@
         <th class='rowhead'><?php echo $lang->testtask->build;?></th>
         <td><?php echo html::select('build', $builds, '', 'class=select-3');?></td>
       </tr>  
+      <tr>
+        <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
+        <td><?php echo html::select('owner', $users, '', 'class=select-3');?></td>
+      </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
         <td><?php echo html::input('begin', '', "class='text-3 date'");?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 708d68de73..4252782d78 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -25,6 +25,10 @@
         <th class='rowhead'><?php echo $lang->testtask->build;?></th>
         <td><?php echo html::select('build', $builds, $task->build, 'class=select-3');?></td>
       </tr>  
+      <tr>
+        <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
+        <td><?php echo html::select('owner', $users, $task->owner, 'class=select-3');?></td>
+      </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
         <td><?php echo html::input('begin', $task->begin, "class='text-3 date'");?>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index d71a506e9e..7d53123b1f 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -15,7 +15,7 @@
 <div class='yui-d0'>
   <h1>CASE#<?php echo $run->case->id. $lang->colon . $run->case->title;?></h1>
   <?php foreach($results as $result):?>
-  <table class='table-1 bd-1px'>
+  <table class='table-1'>
   <caption>RESULT#<?php echo $result->id . ' ' . $result->date . " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?></caption>
     <tr>
       <th class='w-30px'><?php echo $lang->testcase->stepID;?></th>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 64676960ea..38b64b2272 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -14,7 +14,7 @@
 <style>body{background:white}</style>
 <div class='yui-d0'>
   <form method='post'>
-  <table class='table-1 bd-1px'>
+  <table class='table-1'>
     <caption class='caption-tl'>CASE#<?php echo $run->case->id. $lang->colon . $run->case->title;?></caption>
     <tr class='colhead'>
       <th class='w-30px'><?php echo $lang->testcase->stepID;?></th>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 9bc0aeea9c..8ba8f7a24d 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -27,6 +27,10 @@
       <th class='rowhead'><?php echo $lang->testtask->build;?></th>
       <td><?php $task->buildName ? print($task->buildName) : print($task->build);?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
+      <td><?php echo $users[$task->owner];?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
       <td><?php echo $task->begin;?></td>