From 3617b6958c4c44678d64c05e669b50e427fc45f8 Mon Sep 17 00:00:00 2001
From: grakiss <grakiss.wanglei@huawei.com>
Date: Thu, 19 Oct 2017 23:50:18 -0400
Subject: [web-cvp]Additional columns in ‘My Results’
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JIRA: DOVETAIL-532

1. original filename
2. user editable label

Change-Id: I1566cecb3d8ceacc14167bb2fb7fa41508f293be
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
---
 cvp/3rd_party/static/testapi-ui/components/results/results.html     | 6 +++++-
 .../static/testapi-ui/components/results/resultsController.js       | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'cvp/3rd_party/static/testapi-ui/components/results')

diff --git a/cvp/3rd_party/static/testapi-ui/components/results/results.html b/cvp/3rd_party/static/testapi-ui/components/results/results.html
index 5d6979da..e1d05b2d 100644
--- a/cvp/3rd_party/static/testapi-ui/components/results/results.html
+++ b/cvp/3rd_party/static/testapi-ui/components/results/results.html
@@ -21,6 +21,8 @@
             <tr>
                 <th>Upload Date</th>
                 <th>Test ID</th>
+                <th>File Name</th>
+                <th>Label</th>
                 <th>Status</th>
                 <th>Log</th>
                 <th class="col-md-2">Operation</th>
@@ -28,10 +30,12 @@
             </tr>
         </thead>
 
-        <tbody>
+        <tbody style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
             <tr ng-repeat="(index, result) in ctrl.data.tests">
                 <td>{{ result.upload_date }}</td>
                 <td><a ng-click="ctrl.gotoResultDetail(result.id, result._id)">{{ result.id }}</a></td>
+                <td>{{ result.filename || "None"}}</td>
+                <td><div class="popover-wrapper"><a editable-theme="bs3" onbeforesave="ctrl.toggleCheck(result, 'label', $data)" editable-text="result.label"> {{ result.label || "None" }}</a></div></td>
                 <td>{{ result.status }}</td>
                 <td><a ng-click="ctrl.downloadLogs(result.id)">logs</a></td>
 		<td>
diff --git a/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js b/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js
index 471cec0d..2ece86fb 100644
--- a/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js
+++ b/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js
@@ -251,10 +251,8 @@
             })
             .success(function(data){
                 ctrl.uploadState = "";
+                data.filename = file.name;
                 var createTestUrl = testapiApiUrl + "/tests"
-                var fd = new FormData();
-                fd.append('results',data.results);
-                fd.append('id',data.id);
                 $http.post(createTestUrl, data)
                 .success(function(data, status){
                   if (data.code && data.code != 0) {
-- 
cgit 1.2.3-korg