From a84fc8c1b61c4d969dcf7857e8735fc154c74a7c Mon Sep 17 00:00:00 2001
From: Daniel Herrero <dherrero@alfatecsistemas.es>
Date: Tue, 14 Nov 2017 08:45:56 +0100
Subject: [PATCH] new autoComplete option to custom filter

---
 client/client/src/basic-data/basic-data.html |  4 +++-
 client/core/src/autocomplete/autocomplete.js | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/client/client/src/basic-data/basic-data.html b/client/client/src/basic-data/basic-data.html
index 07c60750e..00fca8fd0 100644
--- a/client/client/src/basic-data/basic-data.html
+++ b/client/client/src/basic-data/basic-data.html
@@ -28,7 +28,9 @@
                     show-field="name"
                     value-field="id"
                     select-fields="surname"
-                    label="Salesperson">
+                    label="Salesperson"
+                    filter-search="{where: {or: [{name: {regexp: 'search'}}, {surname: {regexp: 'search'}}]}}"
+                    >
                 </vn-autocomplete>
                 <vn-autocomplete vn-one
                     initial-data="$ctrl.client.contactChannel"
diff --git a/client/core/src/autocomplete/autocomplete.js b/client/core/src/autocomplete/autocomplete.js
index 0366cece7..7d20d5c22 100644
--- a/client/core/src/autocomplete/autocomplete.js
+++ b/client/core/src/autocomplete/autocomplete.js
@@ -191,10 +191,17 @@ class Autocomplete extends Component {
     findItems(search) {
         if (this.url && search && !this.finding) {
             this.maxRow = false;
-            let filter = {where: {name: {regexp: search}}};
-            if (this.filter && this.filter.where) {
-                Object.assign(filter.where, this.filter.where);
+            let filter = {};
+            if (this.filterSearch) {
+                let toSearch = this.filterSearch.replace(/search/g, search);
+                filter = this.$scope.$eval(toSearch);
+            } else {
+                filter = {where: {name: {regexp: search}}};
+                if (this.filter && this.filter.where) {
+                    Object.assign(filter.where, this.filter.where);
+                }
             }
+            filter.order = this.order;
             let json = JSON.stringify(filter);
             this.finding = true;
             this.$http.get(`${this.url}?filter=${json}`).then(
@@ -339,7 +346,8 @@ module.component('vnAutocomplete', {
         label: '@',
         multiple: '@?',
         order: '@?',
-        filter: '<?'
+        filter: '<?',
+        filterSearch: '@?'
     },
     transclude: {
         tplItem: '?tplItem'