diff options
author | xando <sebastian.pawlus@gmail.com> | 2014-07-04 12:35:45 +0200 |
---|---|---|
committer | xando <sebastian.pawlus@gmail.com> | 2014-07-04 12:35:45 +0200 |
commit | 90cb058327b00df98c3fbe8c6402a9d055310bfa (patch) | |
tree | 7fedcaf08530abbeca76f788738de57103a4c1ea /testmanager | |
parent | 3f2e496480883d322cf154a51991c63e005ea559 (diff) |
execution view updated
Diffstat (limited to 'testmanager')
3 files changed, 56 insertions, 15 deletions
diff --git a/testmanager/testmanualrunner/static/testmanualrunner/main.css b/testmanager/testmanualrunner/static/testmanualrunner/main.css index 6ae9ad4..9bf63bd 100644 --- a/testmanager/testmanualrunner/static/testmanualrunner/main.css +++ b/testmanager/testmanualrunner/static/testmanualrunner/main.css @@ -2,3 +2,11 @@ cursor: pointer; } +.active-test { + background-color: #eee; +} + +.active-test table { + margin-top: 10px; + margin-bottom: 10px; +}
\ No newline at end of file diff --git a/testmanager/testmanualrunner/static/testmanualrunner/main.js b/testmanager/testmanualrunner/static/testmanualrunner/main.js index 334769a..2981cd4 100644 --- a/testmanager/testmanualrunner/static/testmanualrunner/main.js +++ b/testmanager/testmanualrunner/static/testmanualrunner/main.js @@ -58,28 +58,32 @@ function Execute($scope, $window, $routeParams, $q, TestRun, TestPlan, Status, T TestRun.get({id:$routeParams.id}).$promise ]).then(function(responses) { $scope.status_list = responses[0]; + $scope.status_by_id = _.indexBy(responses[0], 'id'); $scope.test_run = responses[1]; - $scope.test_plan = $scope.test_run.test_plan; $scope.active_test_definition = $scope.test_plan.tests_definitions[0]; - $scope.tests_definitions_results = _.indexBy( + tests_results_by_id = _.indexBy( $scope.test_run.tests_definitions_results, 'test_definition' ); + _.each($scope.test_run.test_plan.tests_definitions, function(test_definition) { + test_definition.result = tests_results_by_id[test_definition.id]; + }); }) + $scope.get_status = function(test_definition) { + return $scope.status_by_id[test_definition.result.status]; + } $scope.set_status = function(status, test_definition) { - test_run_result = $scope.tests_definitions_results[test_definition.id]; - $id = test_run_result.id; if (status) { - test_run_result.status = status.id; + test_definition.result.status = status.id; } else { - test_run_result.status = null; + test_definition.result.status = null; } - TestRunResult.update({id: $id}, test_run_result); + TestRunResult.update({id: test_definition.result.id}, test_definition.result); } diff --git a/testmanager/testmanualrunner/static/testmanualrunner/templates/testrun_execute.html b/testmanager/testmanualrunner/static/testmanualrunner/templates/testrun_execute.html index cbe7714..828bee5 100644 --- a/testmanager/testmanualrunner/static/testmanualrunner/templates/testrun_execute.html +++ b/testmanager/testmanualrunner/static/testmanualrunner/templates/testrun_execute.html @@ -7,10 +7,10 @@ <div class="row"> - <div class="col-md-5"> + <div class="col-md-6"> <div class="list-group"> - <a ng-style="{'color': test_definition.status.color}" - ng-repeat="test_definition in test_plan.tests_definitions" + <a ng-style="{'color': get_status(test_definition).color }" + ng-repeat-start="test_definition in test_plan.tests_definitions" ng-click="load_test_definition(test_definition)" ng-class="{'active': active_test_definition == test_definition}" @@ -19,7 +19,7 @@ {{ test_definition.name }} <button href="" title="Remove Status" class="pull-right btn btn-default btn-xs" - ng-click='set_status(null, test_definition)'> + ng-click='set_status(null, test_definition)'> <span class="glyphicon glyphicon-question-sign" class="glyphicon"></span> </button> @@ -30,18 +30,47 @@ ng-click='set_status(status, test_definition)' ng-style="{'color': status.color}" class="btn btn-default btn-xs" - ng-class="{active: test_definition.status == status}" + ng-class="{active: get_status(test_definition).id == status.id}" ng-repeat="status in status_list"> <span ng-class="status.icon" class="glyphicon"></span> </button> </div> - </a> + <div ng-repeat-end class="list-group-item" + ng-show="active_test_definition == test_definition" + ng-class="{'active-test': active_test_definition == test_definition}" + > + + <form class="form-inline" role="form"> + <div class="form-group form-group-sm"> + <input type="email" class="form-control" id="exampleInputEmail2" placeholder="issue id"> + <select class="form-control"> + <option>Bugzilla - Linaro</option> + <option>Launchpad - Linaro</option> + </select> + <button type="submit" class="btn btn-default">+</button> + </div> + </form> + + <table class="table"> + <tbody> + <tr> + <td><a href="http://google.com">#1111</a></td> + <td>Some description</td> + </tr> + <tr> + <td><a href="#1111">http://google.com</a></td> + <td>Some description</td> + </tr> + </tbody> + </table> + </div> </div> </div> - <pre class="col-md-7 well" style="border-color: "> + <pre class="col-md-6 well" style="border-color: "> -{{ active_test_definition.test_file_name }} + {{ active_test_definition.test_file_name }} +{{ active_test_definition.id }} metadata: name: serial-console |