From 4c6213cd01b7ef4c318d03aa5e327c365d582ee0 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Fri, 13 Apr 2018 08:59:23 +0200
Subject: [PATCH] =?UTF-8?q?Tarea=20#240=20A=C3=B1adir=20comprador?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/item/src/descriptor/descriptor.html      | 1 +
 client/item/src/list/product.html               | 3 ++-
 client/item/src/locale/es.yml                   | 9 ++++++++-
 client/item/src/summary/summary.html            | 1 +
 services/loopback/common/methods/item/filter.js | 6 +++++-
 services/loopback/common/models/item-type.json  | 7 +++++++
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/client/item/src/descriptor/descriptor.html b/client/item/src/descriptor/descriptor.html
index 38002ed5a..eacaafce5 100644
--- a/client/item/src/descriptor/descriptor.html
+++ b/client/item/src/descriptor/descriptor.html
@@ -25,6 +25,7 @@
         <vn-auto pad-medium>
             <h6>{{$ctrl.item.name}}</h6>
             <div><vn-label translate>Id</vn-label> {{$ctrl.item.id}}</div>
+            <div><vn-label translate>Buyer</vn-label> {{$ctrl.item.itemType.worker.firstName}}</div>
             <div ng-repeat="itemTag in $ctrl.itemTags | limitTo:4">
                 <div><vn-label translate>{{$ctrl.tags[itemTag.tagFk].name}}</vn-label> {{itemTag.value}}</div>
             </div>
diff --git a/client/item/src/list/product.html b/client/item/src/list/product.html
index 30663314c..8f2680333 100644
--- a/client/item/src/list/product.html
+++ b/client/item/src/list/product.html
@@ -15,8 +15,9 @@
             <div><vn-label translate>Description</vn-label> {{::$ctrl.item.description}}</div>
             <div><vn-label translate>Size</vn-label> {{::$ctrl.item.size}}</div>
             <div><vn-label translate>Type</vn-label> {{::$ctrl.item.itemType.name}}</div>
+            <div><vn-label translate>Buyer</vn-label> {{::$ctrl.item.itemType.worker.firstName}} {{::$ctrl.item.itemType.worker.name}}</div>
         </vn-one>
-        <vn-horizontal class="buttons"s>
+        <vn-horizontal class="buttons">
             <vn-icon
                 ng-click="$ctrl.clone($event)"
                 vn-tooltip="Clone"
diff --git a/client/item/src/locale/es.yml b/client/item/src/locale/es.yml
index 2fc0077d7..8843f0fbf 100644
--- a/client/item/src/locale/es.yml
+++ b/client/item/src/locale/es.yml
@@ -34,4 +34,11 @@ Item niches: Nichos del artículo
 Warehouse: Almacén
 Code: Código
 Botanical: Botánico
-Species: Especie
\ No newline at end of file
+Species: Especie
+Add tag: Añadir etiqueta
+Remove tag: Quitar etiqueta
+Add niche: Añadir nicho
+Remove niche: Quitar nicho
+Add barcode: Añadir código de barras
+Remove barcode: Quitar código de barras
+Buyer: Comprador
\ No newline at end of file
diff --git a/client/item/src/summary/summary.html b/client/item/src/summary/summary.html
index 7ad31fd9d..5b96cbd32 100644
--- a/client/item/src/summary/summary.html
+++ b/client/item/src/summary/summary.html
@@ -28,6 +28,7 @@
                     <p><span translate>Relevancy</span>: <b>{{$ctrl.item.relevancy}}</b></p>
                     <p><span translate>Origin</span>: <b>{{$ctrl.item.origin.name}}</b></p>
                     <p><span translate>Expence</span>: <b>{{$ctrl.item.expence.name}}</b></p>
+                    <p><span translate>Buyer</span>: <b>{{$ctrl.item.itemType.worker.firstName}} {{$ctrl.item.itemType.worker.name}}</b></p>
                 </vn-vertical>
             </vn-one>
             <vn-one margin-medium>
diff --git a/services/loopback/common/methods/item/filter.js b/services/loopback/common/methods/item/filter.js
index a91b61585..cda4bda81 100644
--- a/services/loopback/common/methods/item/filter.js
+++ b/services/loopback/common/methods/item/filter.js
@@ -10,7 +10,11 @@ module.exports = Self => {
             include: {
                 relation: 'itemType',
                 scope: {
-                    fields: ['id', 'name']
+                    fields: ['id', 'name', 'workerFk'],
+                    include: {
+                        relation: 'worker',
+                        fields: ['firstName', 'name']
+                    }
                 }
             }
         };
diff --git a/services/loopback/common/models/item-type.json b/services/loopback/common/models/item-type.json
index 107bccc02..8619a35be 100644
--- a/services/loopback/common/models/item-type.json
+++ b/services/loopback/common/models/item-type.json
@@ -22,6 +22,13 @@
             "type": "Number"
         }
     },
+    "relations": {
+        "worker": {
+          "type": "belongsTo",
+          "model": "Worker",
+          "foreignKey": "workerFk"
+        }
+    },
     "acls": [
       {
         "accessType": "READ",