Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#8865.

Browse Source
This commit is contained in:
leiyong
2021-01-01 11:34:11 +08:00
parent de2769bc5f
commit 0c4afee4ee
9 changed files with 103 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+21
View File
@@ -1175,4 +1175,25 @@ class testtask extends control
$this->view->productID = $productID;
$this->display();
}
/**
* AJAX: return test tasks of a user in html select.
*
* @param int $userID
* @param string $id
* @param string $status
* @access public
* @return void
*/
public function ajaxGetUserTestTasks($userID = '', $id = '', $status = 'all')
{
if($userID == '') $userID = $this->app->user->id;
$user = $this->loadModel('user')->getById($userID, 'id');
$account = $user->account;
$testTasks = $this->testtask->getUserTestTaskPairs($account, 0, $status);
if($id) die(html::select("testTasks[$id]", $testTasks, '', 'class="form-control"'));
die(html::select('testTask', $testTasks, '', 'class=form-control'));
}
}
module/testtask/model.php
+5 -3
View File
@@ -1085,11 +1085,12 @@ class testtaskModel extends model
* @param string $account
* @param int $limit
* @param string $status all|wait|doing|done|blocked
* @param string $skipProjectIDList
* @param array $skipProductIDList
* @param array $skipProjectIDList
* @access public
* @return array
*/
public function getUserTesttaskPairs($account, $limit = 0, $status = 'all', $skipProjectIDList = '')
public function getUserTestTaskPairs($account, $limit = 0, $status = 'all', $skipProductIDList = array(), $skipProjectIDList = array())
{
$stmt = $this->dao->select('t1.id, t1.name, t2.name as project')
->from(TABLE_TESTTASK)->alias('t1')
@@ -1097,7 +1098,8 @@ class testtaskModel extends model
->where('t1.owner')->eq($account)
->andWhere('t1.deleted')->eq(0)
->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi()
->beginIF(!empty($skipProjectIDList))->andWhere('t1.project')->notin($skipProjectIDList)->fi()
->beginIF(!empty($skipProductIDList))->andWhere('t1.product')->notin($skipProductIDList)->fi()
->beginIF(!empty($skipProjectIDList))->andWhere('t1.PRJ')->notin($skipProjectIDList)->fi()
->beginIF($limit)->limit($limit)->fi()
->query();