ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-24 04:55:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Search] Result paging

Browse Source 
The search view now can page the
results when there are many.
This commit is contained in:
shale 2015-07-16 16:22:49 -07:00
parent 442a1979e7
commit c1ebd50e4c
5 changed files with 70 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
platform/features/search/res/templates/search.html
View File

@ -38,11 +38,27 @@
<!-- Results list -->
<div ng-if="controller.areResults()"
style="height: 30px">
style="height: 60px">
<p>
Results:
</p>
<div ng-if="controller.arePaging()">
<button ng-if="controller.canGoBack()"
ng-click="controller.previousPage()">
Previous Page
</button>
showing results {{ index+1 }} - {{ index + pageLength }}
of {{ results.length }}
<button ng-if="controller.canGoForward()"
ng-click="controller.nextPage()">
Next Page
</button>
</div>
</div>
<div>
<mct-representation key="'grid-item'"
ng-repeat="result in page"
mct-object="result.object">
</mct-representation>
</div>
<mct-representation key="'grid-item'"
ng-repeat="result in results"
mct-object="result.object">
</mct-representation>
</div>

3
platform/features/search/res/templates/searchbar.html
View File

@ -25,6 +25,7 @@
<input type="text"
id="searchbarinput"
value=""
style="width: 100%"
ng-keyup="controller.search('searchbarinput')" />
</div>
@ -32,7 +33,7 @@
<div>
<mct-representation key="'searchbar-item'"
ng-repeat="result in results"
mct-object="result">
mct-object="result.object">
</mct-representation>
</div>
</span>

1
platform/features/search/src/SearchAggregator.js
View File

@ -55,7 +55,6 @@ define(
var ids = [];
for (var i = 0; i < results.length; i += 1) {
//if (ids.includes(results[i].id)) {
if (ids.indexOf(results[i].id) !== -1) {
// If this result's ID is already there, remove the object
results.splice(i, 1);

53
platform/features/search/src/controllers/SearchController.js
View File

@ -27,7 +27,18 @@
define(function () {
"use strict";
function SearchController($scope, searchService, objectService) {
$scope.pageLength = 4;
function page(start, howMany) {
if (!howMany) {
howMany = $scope.pageLength;
}
$scope.index = start;
$scope.page = $scope.results.slice(start, start + howMany);
}
function getResults(inputID) {
@ -37,6 +48,8 @@ define(function () {
searchService.query(inputID).then(function (c) {
$scope.results = c;
$scope.index = 0;
page($scope.index, $scope.pageLength);
});
}
@ -51,16 +64,38 @@ define(function () {
} else {
return false;
}
}/*,
},
// Get a domain object from its ID
getObjectByID: function (id) {
return objectService.getObjects([id]).then(function (objects) {
var obj = objects[id];
console.log('get object', obj);
return obj;
});
}*/
// Check to see if there are enough results to be paging them
arePaging: function () {
return $scope.results.length > $scope.page.length;
},
canGoBack: function () {
return $scope.index > 0;
},
canGoForward: function () {
return ($scope.index + $scope.pageLength) < $scope.results.length;
},
nextPage: function(howMany) {
if (!howMany) {
howMany = $scope.pageLength;
}
$scope.index = $scope.index + howMany;
$scope.page = $scope.results.slice($scope.index, $scope.index + howMany);
},
previousPage: function(howMany) {
if (!howMany) {
howMany = $scope.pageLength;
}
$scope.index = $scope.index - howMany;
$scope.page = $scope.results.slice($scope.index, $scope.index + howMany);
}
};
}
return SearchController;

6
platform/features/search/src/providers/EverythingSearchProvider.js
View File

@ -89,10 +89,10 @@ define(
// Very rudimentary
function score(item, term) {
var name = item.object.getModel().name,
numWordsinName = name.split(' ').length,
numWordsinTerm = term.split(' ').length,
//numWordsinName = name.split(' ').length,
//numWordsinTerm = term.split(' ').length,
weight = 1.5,
score = (term.length / name.length)/*(numWordsinTerm / numWordsinName)*/ * weight;
score = (term.length / name.length) * weight;
return score;
}