diff --git a/db/update2.3.sql b/db/update2.3.sql index 0f977ade70..4f44f5182d 100644 --- a/db/update2.3.sql +++ b/db/update2.3.sql @@ -1 +1,4 @@ ALTER TABLE `zt_bug` ADD `toStory` MEDIUMINT( 8 ) NOT NULL DEFAULT '0' AFTER `toTask` ; +ALTER TABLE `zt_testResult` ADD `runAccount` VARCHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `stepResults` ; +ALTER TABLE `zt_testRun` ADD `runAccount` VARCHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `assignedTo` ; +ALTER TABLE `zt_case` ADD `runAccount` VARCHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `deleted` ; diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 134115cb3a..3e48171014 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -61,7 +61,8 @@ var moduleID = ''; typeAB);?> openedByAB);?> - testtask->lastRun);?> + testtask->lastRunAccount);?> + testtask->lastRunTime);?> testtask->lastResult);?> statusAB);?> actions;?> @@ -79,6 +80,7 @@ var moduleID = ''; testcase->typeList[$case->type];?> openedBy];?> + runAccount];?> lastRun)) echo date(DT_MONTHTIME1, strtotime($case->lastRun));?> lastResult) echo $lang->testcase->resultList[$case->lastResult];?> testcase->statusList[$case->status];?> diff --git a/module/testtask/control.php b/module/testtask/control.php index 0ed6598ee7..e6463ca777 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -364,6 +364,7 @@ class testtask extends control $this->view->case = $this->testtask->getRunById($runID)->case; $this->view->results = $this->testtask->getResults($runID); } + $this->view->users = $this->loadModel('user')->getPairs('noclosed, noletter'); die($this->display()); } diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 5e98afad89..717646c690 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -38,7 +38,8 @@ $lang->testtask->desc = 'Desc'; $lang->testtask->status = 'Status'; $lang->testtask->assignedTo = 'Assigned to'; $lang->testtask->linkVersion = 'Link(version)'; -$lang->testtask->lastRun = 'Last run'; +$lang->testtask->lastRunAccount = "Run account"; +$lang->testtask->lastRunTime = 'Last run'; $lang->testtask->lastResult = 'Last result'; $lang->testtask->statusList['wait'] = 'Waiting'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 7554468797..28b896428a 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -38,7 +38,8 @@ $lang->testtask->desc = '任务描述'; $lang->testtask->status = '当前状态'; $lang->testtask->assignedTo = '指派给'; $lang->testtask->linkVersion = '关联(版本)'; -$lang->testtask->lastRun = '最后执行'; +$lang->testtask->lastRunAccount = '最后执行人'; +$lang->testtask->lastRunTime = '最后执行时间'; $lang->testtask->lastResult = '最终结果'; $lang->testtask->statusList['wait'] = '未开始'; diff --git a/module/testtask/model.php b/module/testtask/model.php index 68ec9581f5..96bb769750 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -247,11 +247,12 @@ class testtaskModel extends model ->add('run', $runID) ->add('caseResult', $caseResult) ->setForce('stepResults', serialize($stepResults)) + ->add('runAccount', $this->app->user->account) ->add('date', $now) ->remove('steps,reals,passall,result') ->get(); $this->dao->insert(TABLE_TESTRESULT)->data($result)->autoCheck()->exec(); - $this->dao->update(TABLE_CASE)->set('lastRun')->eq($now)->set('lastResult')->eq($caseResult)->where('id')->eq($this->post->case)->exec(); + $this->dao->update(TABLE_CASE)->set('runAccount')->eq($this->app->user->account)->set('lastRun')->eq($now)->set('lastResult')->eq($caseResult)->where('id')->eq($this->post->case)->exec(); if($runID) { @@ -262,6 +263,7 @@ class testtaskModel extends model $this->dao->update(TABLE_TESTRUN) ->set('lastResult')->eq($caseResult) ->set('status')->eq($runStatus) + ->set('runAccount')->eq($this->app->user->account) ->set('lastRun')->eq($now) ->where('id')->eq($runID) ->exec(); diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index d946def9ea..643426c057 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -50,8 +50,9 @@ var moduleID = ''; priAB;?> testcase->title;?> testcase->type;?> - testtask->assignedTo;?> - testtask->lastRun;?> + testtask->assignedTo;?> + testtask->lastRunAccount;?> + testtask->lastRunTime;?> testtask->lastResult;?> statusAB;?> actions;?> @@ -66,6 +67,7 @@ var moduleID = ''; testcase->typeList[$run->type];?> assignedTo]; echo substr($assignedTo, strpos($assignedTo, ':') + 1);?> + runAccount]; echo substr($runAccount, strpos($runAccount, ':') + 1);?> lastRun)) echo date(DT_MONTHTIME1, strtotime($run->lastRun));?> lastResult) echo $lang->testcase->resultList[$run->lastResult];?> testtask->statusList[$run->status];?> diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php index c5e3daad13..b28dda7e68 100644 --- a/module/testtask/view/results.html.php +++ b/module/testtask/view/results.html.php @@ -18,7 +18,7 @@ - +
RESULT#id . ' ' . $result->date . " " . $lang->testcase->resultList[$result->caseResult] . '';?>RESULT#id . ' ' . $result->date . ' ' . $users[$result->runAccount] . ' ' . $lang->testtask->runCase . ':'. " " . $lang->testcase->resultList[$result->caseResult] . '';?>
testcase->stepID;?> testcase->stepDesc;?>