From e52012ac41fcfcf21eae0ae6d28b93120624ae79 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Mon, 10 Dec 2018 10:16:54 +0100
Subject: [PATCH] #911 claim.development

---
 client/claim/src/development/index.html               | 11 ++++-------
 .../common/methods/client/activeWorkersWithRole.js    |  6 +++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/claim/src/development/index.html b/client/claim/src/development/index.html
index 11483ab72..1c2af1e6a 100644
--- a/client/claim/src/development/index.html
+++ b/client/claim/src/development/index.html
@@ -21,12 +21,6 @@
     data="claimResponsibles"
     order="description">
 </vn-crud-model>
-<vn-crud-model
-    url="/client/api/Clients/activeWorkersWithRole"
-    where="{role: 'salesPerson'}"
-    data="activeSalesPersons"
-    order="firstName">
-</vn-crud-model>
 <vn-crud-model
     url="claim/api/ClaimRedeliveries"
     data="claimRedeliveries"
@@ -78,8 +72,11 @@
                     vn-one
                     label="Worker"
                     field="claimDevelopment.workerFk"
-                    data="activeSalesPersons"
+                    url="/client/api/Clients/activeWorkersWithRole"
+                    search-function="{firstName: $search}"
+                    where="{role: 'employee'}"
                     show-field="firstName"
+                    value-field="id"
                     vn-acl="salesAssistant">
                     <tpl-item>{{firstName}} {{name}}</tpl-item>
                 </vn-autocomplete>
diff --git a/services/loopback/common/methods/client/activeWorkersWithRole.js b/services/loopback/common/methods/client/activeWorkersWithRole.js
index bb0231bd6..c2f429952 100644
--- a/services/loopback/common/methods/client/activeWorkersWithRole.js
+++ b/services/loopback/common/methods/client/activeWorkersWithRole.js
@@ -37,7 +37,11 @@ module.exports = Self => {
             case 'role':
                 return {'r.name': value};
             case 'firstName':
-                return {or: [{'w.firstName': {like: `%${value}%`}}, {'w.name': {like: `%${value}%`}}]};
+                return {or: [
+                    {'w.firstName': {like: `%${value}%`}},
+                    {'w.name': {like: `%${value}%`}},
+                    {'u.name': {like: `%${value}%`}}
+                ]};
             case 'id':
                 return {'w.id': value};
             }