diff --git a/db/update2.3.sql b/db/update2.3.sql index 8e72ada7a1..a75b08d55d 100644 --- a/db/update2.3.sql +++ b/db/update2.3.sql @@ -1,10 +1,15 @@ 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` ; +ALTER TABLE `zt_testResult` ADD `lastRunner` VARCHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `stepResults` ; +ALTER TABLE `zt_testRun` ADD `lastRunner` VARCHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `assignedTo` ; +ALTER TABLE `zt_case` ADD `lastRunner` VARCHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `deleted` ; -- adjust the working hours. ALTER TABLE `zt_project` ADD `days` SMALLINT UNSIGNED NOT NULL AFTER `end`; ALTER TABLE `zt_team` CHANGE `joinDate` `join` DATE NOT NULL DEFAULT '0000-00-00'; ALTER TABLE `zt_team` CHANGE `workingHour` `hours` TINYINT( 3 ) UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE `zt_team` ADD `days` SMALLINT UNSIGNED NOT NULL AFTER `join` ; + +ALTER TABLE `zt_case` CHANGE `lastRun` `lastRunDate` DATETIME NOT NULL , +CHANGE `lastResult` `lastRunResult` CHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; +ALTER TABLE `zt_testRun` CHANGE `lastRun` `lastRunDate` DATETIME NOT NULL , +CHANGE `lastResult` `lastRunResult` CHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 8829307611..a969a556d5 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -61,9 +61,9 @@ var moduleID = ''; typeAB);?> openedByAB);?> - testtask->lastRunAccount);?> - testtask->lastRunTime);?> - testtask->lastResult);?> + testtask->lastRunAccount);?> + testtask->lastRunTime);?> + testtask->lastRunResult);?> statusAB);?> actions;?> @@ -80,9 +80,9 @@ var moduleID = ''; testcase->typeList[$case->type];?> openedBy];?> - runAccount];?> - lastRun)) echo date(DT_MONTHTIME1, strtotime($case->lastRun));?> - lastResult) echo $lang->testcase->resultList[$case->lastResult];?> + lastRunner];?> + lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> + lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> testcase->statusList[$case->status];?> '; common::printLink('testcase', 'delete', "caseID=$case->id", $lang->delete, 'hiddenwin'); common::printLink('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $this->app->loadLang('testtask')->testtask->runCase, '', 'class="runcase"'); common::printLink('testtask', 'results', "runID=0&caseID=$case->id", $lang->testtask->results, '', 'class="results"'); - if(!($case->lastResult == 'fail' and common::printLink('bug', 'create', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $lang->testtask->createBug))) echo $lang->testtask->createBug; + if(!($case->lastRunResult == 'fail' and common::printLink('bug', 'create', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $lang->testtask->createBug))) echo $lang->testtask->createBug; ?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 8e1ab27b83..47d533e1f9 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -20,8 +20,8 @@ if(!$case->deleted) { common::printLink('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->currentVersion", $this->app->loadLang('testtask')->testtask->runCase, '', 'class="runcase"'); - common::printLink('testtask', 'results', "runID=0&extras=caseID=$case->id,version=$case->version", $lang->testtask->results, '', 'class="results"'); - if($case->lastResult == 'fail') common::printLink('bug', 'create', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $lang->testtask->createBug); + common::printLink('testtask', 'results', "runID=0&caseID=$case->id&version=$case->version", $lang->testtask->results, '', 'class="results"'); + if($case->lastRunResult == 'fail') common::printLink('bug', 'create', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $lang->testtask->createBug); common::printLink('testcase', 'edit', "caseID=$case->id", $lang->testcase->buttonEdit); common::printLink('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase¶m=$case->id", $lang->copy); common::printLink('testcase', 'delete', "caseID=$case->id", $lang->delete, 'hiddenwin'); @@ -133,11 +133,11 @@ app->loadLang('testtask')->testtask->lastRunTime;?> - lastRun)) echo $case->lastRun;?> + lastRunDate)) echo $case->lastRunDate;?> - app->loadLang('testtask')->testtask->lastResult;?> - lastResult) echo $lang->testcase->resultList[$case->lastResult];?> + app->loadLang('testtask')->testtask->lastRunResult;?> + lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> testcase->keywords;?> diff --git a/module/testtask/control.php b/module/testtask/control.php index e25834c77e..4ef33c3081 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -405,11 +405,11 @@ class testtask extends control * @access public * @return void */ - public function results($runID, $caseID = 0) + public function results($runID, $caseID = 0, $version = 0) { - if($caseID) + if($caseID and $version) { - $this->view->case = $this->loadModel('testcase')->getByID($caseID); + $this->view->case = $this->loadModel('testcase')->getByID($caseID, $version); $this->view->results = $this->testtask->getResults(0, $caseID); } else diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 717646c690..7c98b3e792 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -40,7 +40,7 @@ $lang->testtask->assignedTo = 'Assigned to'; $lang->testtask->linkVersion = 'Link(version)'; $lang->testtask->lastRunAccount = "Run account"; $lang->testtask->lastRunTime = 'Last run'; -$lang->testtask->lastResult = 'Last result'; +$lang->testtask->lastRunResult = 'Last result'; $lang->testtask->statusList['wait'] = 'Waiting'; $lang->testtask->statusList['doing'] = 'Doing'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 28b896428a..11c2b8626e 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -40,7 +40,7 @@ $lang->testtask->assignedTo = '指派给'; $lang->testtask->linkVersion = '关联(版本)'; $lang->testtask->lastRunAccount = '最后执行人'; $lang->testtask->lastRunTime = '最后执行时间'; -$lang->testtask->lastResult = '最终结果'; +$lang->testtask->lastRunResult = '最终结果'; $lang->testtask->statusList['wait'] = '未开始'; $lang->testtask->statusList['doing'] = '进行中'; diff --git a/module/testtask/model.php b/module/testtask/model.php index d02282ffe2..81652a2d03 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -267,12 +267,12 @@ class testtaskModel extends model ->add('run', $runID) ->add('caseResult', $caseResult) ->setForce('stepResults', serialize($stepResults)) - ->add('runAccount', $this->app->user->account) + ->add('lastRunner', $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('runAccount')->eq($this->app->user->account)->set('lastRun')->eq($now)->set('lastResult')->eq($caseResult)->where('id')->eq($this->post->case)->exec(); + $this->dao->update(TABLE_CASE)->set('lastRunner')->eq($this->app->user->account)->set('lastRunDate')->eq($now)->set('lastRunResult')->eq($caseResult)->where('id')->eq($this->post->case)->exec(); if($runID) { @@ -281,10 +281,10 @@ class testtaskModel extends model { $runStatus = $caseResult == 'blocked' ? 'blocked' : 'done'; $this->dao->update(TABLE_TESTRUN) - ->set('lastResult')->eq($caseResult) + ->set('lastRunResult')->eq($caseResult) ->set('status')->eq($runStatus) - ->set('runAccount')->eq($this->app->user->account) - ->set('lastRun')->eq($now) + ->set('lastRunner')->eq($this->app->user->account) + ->set('lastRunDate')->eq($now) ->where('id')->eq($runID) ->exec(); } diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 643426c057..d38e59bf39 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -53,7 +53,7 @@ var moduleID = ''; testtask->assignedTo;?> testtask->lastRunAccount;?> testtask->lastRunTime;?> - testtask->lastResult;?> + testtask->lastRunResult;?> statusAB;?> actions;?> @@ -67,16 +67,16 @@ 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];?> + lastRunner]; echo substr($lastRunner, strpos($lastRunner, ':') + 1);?> + lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?> + lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?> testtask->statusList[$run->status];?> id", $lang->testtask->runCase, '', 'class="iframe"'); common::printLink('testtask', 'results', "id=$run->id", $lang->testtask->results, '', 'class="iframe"'); common::printLink('testtask', 'unlinkcase', "id=$run->id", $lang->testtask->unlinkCase, 'hiddenwin'); - if($run->lastResult == 'fail') common::printLink('bug', 'create', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $lang->testtask->createBug); + if($run->lastRunResult == 'fail') common::printLink('bug', 'create', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $lang->testtask->createBug); ?> diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php index 22b85ea120..ccd9090675 100644 --- a/module/testtask/view/results.html.php +++ b/module/testtask/view/results.html.php @@ -18,7 +18,7 @@ - +
RESULT#id . ' ' . $result->date . ' ' . $users[$result->runAccount] . ' ' . $lang->testtask->runCase . ':'. " " . $lang->testcase->resultList[$result->caseResult] . '';?>RESULT#id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " " . $lang->testcase->resultList[$result->caseResult] . '';?>
testcase->stepID;?> testcase->stepDesc;?>