From 20e76fb28d1e090f085a3f7ce4dbfe2750f47cb0 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Fri, 5 Oct 2018 14:03:59 +0200
Subject: [PATCH] Tarea #646 item descriptor now passes the ticket id

---
 client/item/routes.json                  | 2 +-
 client/ticket/src/component/index.js     | 3 ++-
 client/ticket/src/expedition/index.html  | 2 +-
 client/ticket/src/expedition/index.js    | 3 ++-
 client/ticket/src/sale-checked/index.js  | 3 ++-
 client/ticket/src/sale-tracking/index.js | 3 ++-
 client/ticket/src/sale/index.js          | 3 ++-
 client/ticket/src/summary/index.js       | 3 ++-
 client/ticket/src/volume/index.js        | 3 ++-
 9 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/client/item/routes.json b/client/item/routes.json
index efb317211..66a7ebb0b 100644
--- a/client/item/routes.json
+++ b/client/item/routes.json
@@ -126,7 +126,7 @@
             }
         }, 
         {
-            "url" : "/diary?warehouseFk",
+            "url" : "/diary?warehouseFk&ticketFk",
             "state": "item.card.diary",
             "component": "vn-item-diary",
             "description": "Diary",
diff --git a/client/ticket/src/component/index.js b/client/ticket/src/component/index.js
index 8dd556cb1..1d54d7598 100644
--- a/client/ticket/src/component/index.js
+++ b/client/ticket/src/component/index.js
@@ -93,7 +93,8 @@ class Controller {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
                     id: ${itemFk}, 
-                    q: '{"warehouseFk": ${this.ticket.warehouseFk}}'
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    ticketFk: ${this.ticket.id}
                 })`,
                 tooltip: 'Item diary'
             }
diff --git a/client/ticket/src/expedition/index.html b/client/ticket/src/expedition/index.html
index 10253d615..695ff15ec 100644
--- a/client/ticket/src/expedition/index.html
+++ b/client/ticket/src/expedition/index.html
@@ -36,7 +36,7 @@
                             <span
                                 ng-class="{'link pointer':expedition.itemFk}"
                                 ng-click="$ctrl.showDescriptor($event, expedition.itemFk)">
-                                {{expedition.itemFk}}
+                                {{("000000"+expedition.itemFk).slice(-6)}}
                             </span>
                         </vn-td>
                         <vn-td>{{::expedition.namePackage}}</vn-td>
diff --git a/client/ticket/src/expedition/index.js b/client/ticket/src/expedition/index.js
index 50f767ec7..f83d88fcd 100644
--- a/client/ticket/src/expedition/index.js
+++ b/client/ticket/src/expedition/index.js
@@ -27,7 +27,8 @@ class Controller {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
                     id: ${itemFk}, 
-                    q: '{"warehouseFk": ${this.ticket.warehouseFk}}'
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    ticketFk: ${this.ticket.id}
                 })`,
                 tooltip: 'Item diary'
             }
diff --git a/client/ticket/src/sale-checked/index.js b/client/ticket/src/sale-checked/index.js
index 204b393ab..2f69aec4d 100644
--- a/client/ticket/src/sale-checked/index.js
+++ b/client/ticket/src/sale-checked/index.js
@@ -39,7 +39,8 @@ class Controller {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
                     id: ${itemFk}, 
-                    q: '{"warehouseFk": ${this.ticket.warehouseFk}}'
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    ticketFk: ${this.ticket.id}
                 })`,
                 tooltip: 'Item diary'
             }
diff --git a/client/ticket/src/sale-tracking/index.js b/client/ticket/src/sale-tracking/index.js
index 0ef1a0ddf..0adfce1de 100644
--- a/client/ticket/src/sale-tracking/index.js
+++ b/client/ticket/src/sale-tracking/index.js
@@ -12,7 +12,8 @@ class Controller {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
                     id: ${itemFk}, 
-                    q: '{"warehouseFk": ${this.ticket.warehouseFk}}'
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    ticketFk: ${this.ticket.id}
                 })`,
                 tooltip: 'Item diary'
             }
diff --git a/client/ticket/src/sale/index.js b/client/ticket/src/sale/index.js
index 74b1d2f7c..71c17158d 100644
--- a/client/ticket/src/sale/index.js
+++ b/client/ticket/src/sale/index.js
@@ -243,7 +243,8 @@ class Controller {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
                     id: ${itemFk}, 
-                    q: '{"warehouseFk": ${this.ticket.warehouseFk}}'
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    ticketFk: ${this.ticket.id}
                 })`,
                 tooltip: 'Item diary'
             }
diff --git a/client/ticket/src/summary/index.js b/client/ticket/src/summary/index.js
index 645432bcb..0446fdd16 100644
--- a/client/ticket/src/summary/index.js
+++ b/client/ticket/src/summary/index.js
@@ -37,7 +37,8 @@ class Controller {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
                     id: ${itemFk}, 
-                    q: '{"warehouseFk": ${this.ticket.warehouseFk}}'
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    ticketFk: ${this.ticket.id}
                 })`,
                 tooltip: 'Item diary'
             }
diff --git a/client/ticket/src/volume/index.js b/client/ticket/src/volume/index.js
index 7da05435d..cc69ca3b3 100644
--- a/client/ticket/src/volume/index.js
+++ b/client/ticket/src/volume/index.js
@@ -52,7 +52,8 @@ class Controller {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
                     id: ${itemFk}, 
-                    q: '{"warehouseFk": ${this.ticket.warehouseFk}}'
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    ticketFk: ${this.ticket.id}
                 })`,
                 tooltip: 'Item diary'
             }