From 70c79fe39ac0b5f7605e9ca870412b3c582f3cf6 Mon Sep 17 00:00:00 2001 From: Nayan Ambali Date: Sat, 17 Aug 2013 14:38:54 +0530 Subject: [PATCH] global serach --- html/search/glresults.html | 2 +- js/controllers/SearchController.js | 14 ++++++++++++++ js/mifosXComponents.js | 3 ++- js/routes.js | 3 +++ js/services/ResourceFactoryProvider.js | 6 ++++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 js/controllers/SearchController.js diff --git a/html/search/glresults.html b/html/search/glresults.html index 75b471f9..e720b85c 100644 --- a/html/search/glresults.html +++ b/html/search/glresults.html @@ -1,4 +1,4 @@ -
+
diff --git a/js/controllers/SearchController.js b/js/controllers/SearchController.js new file mode 100644 index 00000000..fbe667b9 --- /dev/null +++ b/js/controllers/SearchController.js @@ -0,0 +1,14 @@ +(function(module) { + mifosX.controllers = _.extend(module, { + SearchController: function(scope, routeParams , resourceFactory) { + + scope.searchResults = []; + resourceFactory.globalSearch.search( {query: routeParams.query} , function(data){ + scope.searchResults = data; + }); + } + }); + mifosX.ng.application.controller('SearchController', ['$scope','$routeParams','ResourceFactory', mifosX.controllers.SearchController]).run(function($log) { + $log.info("SearchController initialized"); + }); +}(mifosX.controllers || {})); diff --git a/js/mifosXComponents.js b/js/mifosXComponents.js index 2fac67e2..fd85c6e1 100644 --- a/js/mifosXComponents.js +++ b/js/mifosXComponents.js @@ -19,7 +19,8 @@ define(['underscore', 'mifosX'], function() { 'ViewClientController', 'CreateClientController', 'TaskController', - 'CurrencyConfigController' + 'CurrencyConfigController', + 'SearchController' ], filters: [ 'StatusLookup' diff --git a/js/routes.js b/js/routes.js index 5259e0a8..aa2cdb86 100644 --- a/js/routes.js +++ b/js/routes.js @@ -51,6 +51,9 @@ }) .when('/viewcurrconfig', { templateUrl: 'html/organization/currencyconfig.html' + }) + .when('/search/:query', { + templateUrl: 'html/search/glresults.html' }); $locationProvider.html5Mode(false); diff --git a/js/services/ResourceFactoryProvider.js b/js/services/ResourceFactoryProvider.js index 551b305a..89f91470 100644 --- a/js/services/ResourceFactoryProvider.js +++ b/js/services/ResourceFactoryProvider.js @@ -43,6 +43,12 @@ }), currencyConfigResource: defineResource(apiVer + "/currencies", {}, { update: { method: 'PUT'} + }), + globalSearch: defineResource(apiVer + "/search", {query:'@query'}, { + search: { method: 'GET', + params: { query: '@query'} , + isArray:true + } }) }; }];