search improvement

parent 320a5088
...@@ -398,6 +398,8 @@ dashboardControllers.controller('AddPictoCtrl', function ( ...@@ -398,6 +398,8 @@ dashboardControllers.controller('AddPictoCtrl', function (
$scope.page=1; // Reset pagination $scope.page=1; // Reset pagination
$scope.pictos = []; // Reset pictos
var length = $scope.srch_term_picto == undefined ? 0 : $scope.srch_term_picto.length; var length = $scope.srch_term_picto == undefined ? 0 : $scope.srch_term_picto.length;
if(length == 1){ //Check the word length if(length == 1){ //Check the word length
$scope.alert = { type: 'warning', msg: 'warning_two_characters', show: true }; $scope.alert = { type: 'warning', msg: 'warning_two_characters', show: true };
...@@ -452,10 +454,20 @@ dashboardControllers.controller('AddPictoCtrl', function ( ...@@ -452,10 +454,20 @@ dashboardControllers.controller('AddPictoCtrl', function (
$http.get(request) $http.get(request)
.success(function (data) { .success(function (data) {
// Load data into pictos
$scope.pictos = data; $scope.pictos = data;
// Order by expression length
$scope.pictos.sort(function(a, b){
return a.expressions[0].text.length > b.expressions[0].text.length;
});
// No data warning
if(data.length == 0){ if(data.length == 0){
$scope.alert = { type: 'warning', msg: 'warning_no_pictos_found', show: true }; $scope.alert = { type: 'warning', msg: 'warning_no_pictos_found', show: true };
} }
$scope.loadingCatPictos = false; $scope.loadingCatPictos = false;
}) })
.error(function () { .error(function () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment