diff --git a/module/testtask/css/runcase.css b/module/testtask/css/runcase.css
index 9a6fc8262e..0956a05876 100644
--- a/module/testtask/css/runcase.css
+++ b/module/testtask/css/runcase.css
@@ -4,3 +4,6 @@
.btn-file {float:right; padding: 0px 5px!important}
.fix-border td {border:0px;}
.fix-position td {vertical-align: middle;}
+
+#filesName {float: right;}
+.nav > li {margin-right: 5px; display: inline-block; margin-top: 5px;}
diff --git a/module/testtask/js/runcase.js b/module/testtask/js/runcase.js
index 3de3e6cb8e..9cd3df0e2b 100644
--- a/module/testtask/js/runcase.js
+++ b/module/testtask/js/runcase.js
@@ -28,3 +28,18 @@ function downloadFile(fileID)
window.open(url, '_blank');
return false;
}
+
+/* Load files name when upload files. */
+function loadFilesName()
+{
+ $('#filesName').find('li').remove();//Remove file name in li label before uploading files every time.
+ $('.fileBox').each(function()
+ {
+ fileName = $(this).find('input[type="file"]').val();
+ if(fileName.lastIndexOf('\\')) fileName = fileName.substring(fileName.lastIndexOf('\\') + 1);//Process the file name.
+ labelName = $(this).find('input[type="text"]').val();
+ if(labelName) fileName = labelName;//If label name exits, set label name as file name.
+
+ if(fileName) $('#filesName').append("
" + fileName + '');//Show file name.
+ })
+}
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 347ec8bdf0..19ace9fac9 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -36,6 +36,7 @@
caseResult == 'pass' ? 'success' : ($result->caseResult == 'fail' ? 'danger' : ($result->caseResult == 'blocked' ? 'warning' : '')));
if($class != 'success') $failCount++;
+ $fileCount = '(' . count($result->files) . ')';
?>
| #id?> |
@@ -43,7 +44,7 @@
lastRunner] . ' ' . $lang->testtask->runCase;?> |
build, '');?> |
testcase->resultList[$result->caseResult]?> |
- files)) echo html::a("#caseResult{$result->id}", $lang->files, '', "data-toggle='modal' data-type='iframe'")?> |
+ files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?> |
|
@@ -56,14 +57,17 @@
| testcase->stepExpect;?> |
testcase->result;?> |
testcase->real;?> |
- |
+ |
stepResults as $key => $stepResult):
?>
- id . '-' . $key;?>
+ id . '-' . $key;
+ $fileCount = '(' . count($stepResult['files']) . ')';
+ ?>
|
|
@@ -71,7 +75,7 @@
text-center'>testcase->resultList[$stepResult['result']];?> |
|
- files, '', "data-toggle='modal' data-type='iframe'")?> |
+ files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?> |
|
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 5a15365046..f3c85760b6 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -73,6 +73,7 @@
echo html::hidden('case', $run->case->id);
echo html::hidden('version', $run->case->currentVersion);
?>
+
@@ -89,6 +90,9 @@
| fetch('file', 'buildform');?> |
+
+ |
+
@@ -108,6 +112,9 @@
| fetch('file', 'buildform', array('fileCount' => 1, 'percent' => 0.9, 'filesName' => "files{$step->id}", 'labelsName' => "labels{$step->id}"));?> |
+
+ |
+