From 67a9c68636f2c24152c767f73802697e6c63a4fc Mon Sep 17 00:00:00 2001 From: wyd621 Date: Mon, 19 Aug 2013 15:43:35 +0800 Subject: [PATCH] * finish task #1396. --- module/testcase/control.php | 13 --- module/testcase/lang/en.php | 3 +- module/testcase/lang/zh-cn.php | 3 +- module/testcase/view/showimport.html.php | 102 ++++++++++------------- 4 files changed, 45 insertions(+), 76 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index b9cddebc7b..e0b2b321e5 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -814,8 +814,6 @@ class testcase extends control $endField = $field; $caseData = array(); $stepData = array(); - $hasEdit = false; - $hasNew = false; while($csv) { $case = new stdclass(); @@ -889,15 +887,6 @@ class testcase extends control $csv = substr($csv, $pos + strlen($delimiter)); } - if(!empty($case->id)) - { - $hasEdit = true; - } - else - { - $hasNew = true; - } - $caseData[$row] = $case; unset($case); $row++; @@ -919,8 +908,6 @@ class testcase extends control $this->view->stepData = $stepData; $this->view->productID = $productID; $this->view->product = $this->products[$productID]; - $this->view->hasEdit = $hasEdit; - $this->view->hasNew = $hasNew; $this->display(); } } diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 3c943d2679..0b24d72915 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -69,8 +69,7 @@ $lang->testcase->export = "Export data"; $lang->testcase->confirmChange = 'Confirm case change'; $lang->testcase->confirmStoryChange = 'Confirm story change'; -$lang->testcase->editHaved = 'Modify existing case'; -$lang->testcase->addNew = 'Add new case'; +$lang->testcase->new = 'New'; $lang->testcase->num = 'The number of cases'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 39c17a6ae9..94631b3dec 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -69,8 +69,7 @@ $lang->testcase->export = "导出数据"; $lang->testcase->confirmChange = '确认用例变动'; $lang->testcase->confirmStoryChange = '确认需求变动'; -$lang->testcase->editHaved = '修改已有用例'; -$lang->testcase->addNew = '添加新用例'; +$lang->testcase->new = '新增'; $lang->testcase->num = '导入用例个数：'; diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index ecd39360ef..0ef4eab98b 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -1,8 +1,9 @@ +
- - @@ -24,13 +25,24 @@ $case):?> - id)) continue?> - + - - - + + + @@ -52,58 +64,30 @@
testcase->editHaved?>
testcase->id?> testcase->title?>
id . html::hidden("id[$key]", $case->id) . html::hidden("product[$key]", $productID)?> + id)) + { + echo $case->id . html::hidden("id[$key]", $case->id); + } + else + { + echo $key . " {$lang->testcase->new}"; + } + echo html::hidden("product[$key]", $productID); + ?> + title, "class='text-1' style='margin-top:2px'")?>module) ? $case->module : $cases[$case->id]->module, "class='select-2'")?>story) ? $case->story : $cases[$case->id]->story, "class='select-2'")?>testcase->priList, isset($case->pri) ? $case->pri : $cases[$case->id]->pri)?>module) ? $case->module : (isset($case->id) ? $cases[$case->id]->module : ''), "class='select-2'")?>story) ? $case->story : (isset($case->id) ? $cases[$case->id]->story : ''), "class='select-2'")?>testcase->priList, isset($case->pri) ? $case->pri : (isset($case->id) ? $cases[$case->id]->pri : ''))?> testcase->typeList, $case->type)?> testcase->statusList, isset($case->status) ? $case->status : '')?> frequency) ? $case->frequency : 1, "size='2'")?>
- - - - - - - - - - - - - - - - - - $case):?> - - - - - - - - - - - - - - -
testcase->addNew?>
testcase->importID?>testcase->title?>testcase->module?>testcase->story?>testcase->pri?>testcase->type?>testcase->status?>testcase->frequency?>testcase->stage?>testcase->precondition?>testcase->steps?> - - - - - -
testcase->stepDesc?>testcase->stepExpect?>
-
title, "class='text-1' style='margin-top:2px'")?>module) ? $case->module : '', "class='select-2'") . html::hidden("product[$key]", $productID)?>story) ? $case->story : '', "class='select-2'")?>testcase->priList, isset($case->pri) ? $case->pri : '')?>testcase->typeList, $case->type)?>testcase->statusList, isset($case->status) ? $case->status : 'normal')?>frequency) ? $case->frequency : 1, "size='2'")?>testcase->stageList, isset($case->stage) ? $case->stage : '', "multiple='multiple'")?>precondition) ? $case->precondition : "", "style='margin-top:2px; height:69px'")?> - - - $desc):?> - - - - - -
- -
-

+