From a5ac84f2ff1471620da0bcd63f2ee4028c661918 Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Thu, 1 Jun 2017 01:49:51 +0000 Subject: Change to 'catalog_description' in Catalogue page JIRA: RELENG-231 Change-Id: Id0b770575c0d91a58b3503f8580bd658337b2cd0 Signed-off-by: chenjiankun --- reporting/api/api/handlers/testcases.py | 2 +- reporting/pages/app/images/overview.png | Bin 76161 -> 113333 bytes .../scripts/controllers/testvisual.controller.js | 45 +++++++++++++++------ reporting/pages/app/styles/custome.css | 1 + .../pages/app/views/commons/testCaseVisual.html | 7 ++-- .../pages/app/views/modal/testcasedetail.html | 4 +- 6 files changed, 41 insertions(+), 18 deletions(-) (limited to 'reporting') diff --git a/reporting/api/api/handlers/testcases.py b/reporting/api/api/handlers/testcases.py index 110ac4c..2b91186 100644 --- a/reporting/api/api/handlers/testcases.py +++ b/reporting/api/api/handlers/testcases.py @@ -20,7 +20,7 @@ class TestCases(BaseHandler): url = '{}/projects/{}/cases'.format(conf.base_url, project) cases = requests.get(url).json().get('testcases', []) - data = [t['name'] for t in cases] + data = [{t['name']: t['catalog_description']} for t in cases] self.write(json_encode(data)) diff --git a/reporting/pages/app/images/overview.png b/reporting/pages/app/images/overview.png index 14dbbff..f1688cf 100644 Binary files a/reporting/pages/app/images/overview.png and b/reporting/pages/app/images/overview.png differ diff --git a/reporting/pages/app/scripts/controllers/testvisual.controller.js b/reporting/pages/app/scripts/controllers/testvisual.controller.js index 7082aed..def8e72 100644 --- a/reporting/pages/app/scripts/controllers/testvisual.controller.js +++ b/reporting/pages/app/scripts/controllers/testvisual.controller.js @@ -10,16 +10,16 @@ angular.module('opnfvApp') .controller('testVisualController', ['$scope', '$state', '$stateParams', 'TableFactory', 'ngDialog', '$http', '$loading', function($scope, $state, $stateParams, TableFactory, ngDialog, $http, $loading) { - $scope.dovet = "59,222,156,317"; - $scope.functest = "203,163,334,365"; - $scope.yardstick = "398,161,513,384"; - $scope.vsperf = "567,163,673,350"; - $scope.stor = "686,165,789,341"; - $scope.qtip = "802,164,905,341"; - $scope.bootleneck = "917,161,1022,338"; - $scope.noPopArea1 = "30,11,1243,146"; - $scope.noPopArea2 = "1041,157,1250,561"; - $scope.noPopArea3 = "15,392,1027,561"; + $scope.dovet = "50,168,177,443"; + $scope.functest = "194,173,356,442"; + $scope.yardstick = "377,183,521,412"; + $scope.vsperf = "542,185,640,414"; + $scope.stor = "658,187,750,410"; + $scope.qtip = "769,190,852,416"; + $scope.bootleneck = "870,192,983,419"; + $scope.noPopArea1 = "26,8,1190,180"; + $scope.noPopArea2 = "1018,193,1190,590"; + $scope.noPopArea3 = "37,455,1003,584"; init(); $scope.showSelectValue = 0; @@ -51,20 +51,41 @@ angular.module('opnfvApp') $http.get(url, config).then(function(response) { if (response.status == 200) { $scope.tableData = response.data; + + $scope.tableData = constructObjectArray($scope.tableData); + console.log($scope.tableData); $loading.finish('Key'); + } }) } + //construct key value for tableData + function constructObjectArray(array) { + var templateArray = []; + for (var i = 0; i < array.length; i++) { + var key = Object.keys(array[i])[0]; + var value = array[i][key]; + var temp = { + 'key': key, + 'value': value + }; + templateArray.push(temp); + + } + + return templateArray; + } + function getDetail(casename) { TableFactory.getProjectTestCaseDetail().get({ 'project': $scope.modalName, 'testcase': casename }).$promise.then(function(response) { if (response != null) { - $scope.project_name_modal = response.project_name; + $scope.name_modal = response.name; $scope.description_modal = response.description; openTestDetail(); } @@ -108,4 +129,4 @@ angular.module('opnfvApp') } - ]); \ No newline at end of file + ]); diff --git a/reporting/pages/app/styles/custome.css b/reporting/pages/app/styles/custome.css index 7ab869b..8e567ca 100644 --- a/reporting/pages/app/styles/custome.css +++ b/reporting/pages/app/styles/custome.css @@ -71,6 +71,7 @@ html { border-radius: 5px 5px 5px 5px; background-color: #f3f3f4; opacity: 0.9; + width: 200px; } .ngdialog.ngdialog.ngdialog-theme-default .ngdialog-content { diff --git a/reporting/pages/app/views/commons/testCaseVisual.html b/reporting/pages/app/views/commons/testCaseVisual.html index 9d146ba..74eb56e 100644 --- a/reporting/pages/app/views/commons/testCaseVisual.html +++ b/reporting/pages/app/views/commons/testCaseVisual.html @@ -4,7 +4,7 @@
-
+

OPNFV Test ecosystem *mouse over display test case list @@ -70,7 +70,7 @@

-