From c7b8b61a08511de47e65de2662bafb61d7e05b3a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 8 Apr 2022 10:34:36 +0200
Subject: [PATCH 1/2] feat(item): add model itemPackingType

---
 modules/item/back/model-config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/item/back/model-config.json b/modules/item/back/model-config.json
index d134d9283..004aeb4b9 100644
--- a/modules/item/back/model-config.json
+++ b/modules/item/back/model-config.json
@@ -29,6 +29,9 @@
     "ItemLog": {
         "dataSource": "vn"
     },
+    "ItemPackingType": {
+        "dataSource": "vn"
+    },
     "ItemPlacement": {
         "dataSource": "vn"
     },

From 786b7fa84fd70c6d4980e3cfcd6aa4a709f0215e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 11 Apr 2022 08:02:05 +0200
Subject: [PATCH 2/2] feat(descriptor): button open summary popup

---
 e2e/helpers/extensions.js                            |  4 ++--
 e2e/helpers/selectors.js                             |  2 +-
 e2e/paths/10-travel/03_descriptor.spec.js            |  2 +-
 front/salix/components/descriptor-popover/style.scss | 12 +++++++++---
 front/salix/components/descriptor/index.html         |  9 +++++++--
 front/salix/components/descriptor/index.js           |  3 ++-
 front/salix/components/descriptor/style.scss         |  3 +++
 front/salix/locale/es.yml                            |  2 ++
 modules/account/front/descriptor/index.html          |  6 +++++-
 modules/claim/front/descriptor/index.html            |  8 ++++++--
 modules/client/front/descriptor/index.html           |  8 ++++++--
 modules/entry/front/descriptor/index.html            |  6 +++++-
 modules/invoiceIn/front/descriptor/index.html        | 10 ++++++++--
 modules/invoiceOut/front/descriptor/index.html       |  8 ++++++--
 modules/item/front/descriptor/index.html             |  6 +++++-
 modules/order/front/descriptor/index.html            |  8 ++++++--
 modules/route/front/descriptor/index.html            |  8 ++++++--
 modules/supplier/front/descriptor/index.html         |  6 +++++-
 modules/ticket/front/descriptor/index.html           |  8 ++++++--
 modules/travel/front/descriptor/index.html           |  6 +++++-
 modules/worker/front/descriptor/index.html           |  6 +++++-
 modules/zone/front/descriptor/index.html             |  7 ++++++-
 22 files changed, 107 insertions(+), 31 deletions(-)

diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index 789c800b5..7bf56e2c8 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -181,12 +181,12 @@ let actions = {
     },
 
     reloadSection: async function(state) {
-        await this.click('vn-icon[icon="preview"]');
+        await this.click('vn-icon[icon="launch"]');
         await this.accessToSection(state);
     },
 
     forceReloadSection: async function(sectionRoute) {
-        await this.waitToClick('vn-icon[icon="preview"]');
+        await this.waitToClick('vn-icon[icon="launch"]');
         await this.waitToClick('button[response="accept"]');
         await this.waitForSelector('vn-card.summary');
         await this.waitToClick(`vn-left-menu li > a[ui-sref="${sectionRoute}"]`);
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 62c32434a..266b2a1c1 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -957,7 +957,7 @@ export default {
         supplierRef: 'vn-invoice-in-summary vn-label-value:nth-child(2) > section > span'
     },
     invoiceInDescriptor: {
-        summaryIcon: 'vn-invoice-in-descriptor a[title="Preview"]',
+        summaryIcon: 'vn-invoice-in-descriptor a[title="Go to module summary"]',
         moreMenu: 'vn-invoice-in-descriptor vn-icon-button[icon=more_vert]',
         moreMenuDeleteInvoiceIn: '.vn-menu [name="deleteInvoice"]',
         moreMenuCloneInvoiceIn: '.vn-menu [name="cloneInvoice"]',
diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js
index 619228f35..f459ef043 100644
--- a/e2e/paths/10-travel/03_descriptor.spec.js
+++ b/e2e/paths/10-travel/03_descriptor.spec.js
@@ -134,7 +134,7 @@ describe('Travel descriptor path', () => {
     });
 
     it('should navigate to the summary and then clone the travel and its entries using the descriptor menu to get redirected to the cloned travel basic data', async() => {
-        await page.waitToClick('vn-icon[icon="preview"]'); // summary icon
+        await page.waitToClick('vn-icon[icon="launch"]');
         await page.waitForState('travel.card.summary');
         await page.waitForTimeout(1000);
         await page.waitToClick(selectors.travelDescriptor.dotMenu);
diff --git a/front/salix/components/descriptor-popover/style.scss b/front/salix/components/descriptor-popover/style.scss
index 6ae8675bf..7203c8e8e 100644
--- a/front/salix/components/descriptor-popover/style.scss
+++ b/front/salix/components/descriptor-popover/style.scss
@@ -4,8 +4,14 @@
     vn-descriptor-content > .descriptor {
         width: 256px;
 
-        & > .header > a:first-child {
-            visibility: hidden;
-        }
+        & > .header {
+            a:first-child {
+                display: none;
+            }
+            vn-icon-button:nth-child(2) {
+                display: block;
+            }
+        }   
+            
     }
 }
diff --git a/front/salix/components/descriptor/index.html b/front/salix/components/descriptor/index.html
index 5b4c6f12c..e7a5b6297 100644
--- a/front/salix/components/descriptor/index.html
+++ b/front/salix/components/descriptor/index.html
@@ -12,10 +12,15 @@
             name="goToModuleIndex">
             <vn-icon icon="{{$ctrl.moduleMap[$ctrl.module].icon}}"></vn-icon>
         </a>
+        <vn-icon-button 
+            translate-attr="{title: 'Show summary'}"
+            icon="preview"
+            vn-click-stop="$ctrl.summary.show()">
+        </vn-icon-button>
         <a
-            translate-attr="{title: 'Preview'}"
+            translate-attr="{title: 'Go to module summary'}"
             ui-sref="{{::$ctrl.summaryState}}({id: $ctrl.descriptor.id})">
-            <vn-icon icon="preview"></vn-icon>
+            <vn-icon icon="launch"></vn-icon>
         </a>
         <vn-icon-button ng-if="!$ctrl.$transclude.isSlotFilled('dotMenu')"
             ng-class="::{invisible: !$ctrl.$transclude.isSlotFilled('menu')}"
diff --git a/front/salix/components/descriptor/index.js b/front/salix/components/descriptor/index.js
index 470f0409d..c59fa2f7a 100644
--- a/front/salix/components/descriptor/index.js
+++ b/front/salix/components/descriptor/index.js
@@ -125,7 +125,8 @@ ngModule.vnComponent('vnDescriptorContent', {
         module: '@',
         baseState: '@?',
         description: '<',
-        descriptor: '<?'
+        descriptor: '<?',
+        summary: '<?'
     },
     transclude: {
         body: 'slotBody',
diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss
index a87b3f451..27f482f26 100644
--- a/front/salix/components/descriptor/style.scss
+++ b/front/salix/components/descriptor/style.scss
@@ -60,6 +60,9 @@ vn-descriptor-content {
                     font-size: 1.75rem;
                 }
             }
+            & > vn-icon-button:nth-child(2) {
+                display: none;
+            }
         }
         & > .body {
             display: block;
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index 5e877c372..4e93ae18e 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -13,6 +13,8 @@ Preview: Vista previa
 Profile: Perfil
 Push on applications menu: Para abrir un módulo pulsa en el menú de aplicaciones
 Go to module index: Ir al índice del módulo
+Go to module summary: Ir a la vista previa del módulo
+Show summary: Mostrar vista previa
 What is new: Novedades de la versión
 Settings: Ajustes
 
diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html
index d01e953c2..c709c1ec0 100644
--- a/modules/account/front/descriptor/index.html
+++ b/modules/account/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="account"
-    description="$ctrl.user.nickname">
+    description="$ctrl.user.nickname"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item
             ng-click="deleteUser.show()"
@@ -173,3 +174,6 @@
         <button response="accept" translate>Change password</button>
     </tpl-buttons>
 </vn-dialog>
+<vn-popup vn-id="summary">
+    <vn-user-summary user="$ctrl.user"></vn-user-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index 1337c6242..56fd0bb35 100644
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="claim"
-    description="$ctrl.claim.client.name">
+    description="$ctrl.claim.client.name"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item
             ng-click="$ctrl.showPickupOrder()"
@@ -96,4 +97,7 @@
 </vn-worker-descriptor-popover>
 <vn-ticket-descriptor-popover 
     vn-id="ticketDescriptor">
-</vn-ticket-descriptor-popover>
\ No newline at end of file
+</vn-ticket-descriptor-popover>
+<vn-popup vn-id="summary">
+    <vn-claim-summary claim="$ctrl.claim"></vn-claim-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index e75246ebe..de7a86d3b 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="client"
-    description="$ctrl.client.name">
+    description="$ctrl.client.name"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <a class="vn-item"
             ui-sref="ticket.create({clientFk: $ctrl.client.id})"
@@ -118,4 +119,7 @@
 </vn-client-sms>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
-</vn-worker-descriptor-popover>
\ No newline at end of file
+</vn-worker-descriptor-popover>
+<vn-popup vn-id="summary">
+    <vn-client-summary client="$ctrl.client"></vn-client-summary>
+</vn-popup>
diff --git a/modules/entry/front/descriptor/index.html b/modules/entry/front/descriptor/index.html
index 04bef0024..f0e2439bb 100644
--- a/modules/entry/front/descriptor/index.html
+++ b/modules/entry/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="entry"
-    description="$ctrl.entry.supplier.nickname">
+    description="$ctrl.entry.supplier.nickname"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item
             ng-click="$ctrl.showEntryReport()"
@@ -59,3 +60,6 @@
         </div>
     </slot-body>
 </vn-descriptor-content>
+<vn-popup vn-id="summary">
+    <vn-entry-summary entry="$ctrl.entry"></vn-entry-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/invoiceIn/front/descriptor/index.html b/modules/invoiceIn/front/descriptor/index.html
index a51743091..33f9ee8c6 100644
--- a/modules/invoiceIn/front/descriptor/index.html
+++ b/modules/invoiceIn/front/descriptor/index.html
@@ -1,4 +1,7 @@
-<vn-descriptor-content module="invoiceIn" description="$ctrl.invoiceIn.supplierRef">
+<vn-descriptor-content 
+    module="invoiceIn" 
+    description="$ctrl.invoiceIn.supplierRef"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item
             ng-click="$ctrl.checkToBook()"
@@ -76,4 +79,7 @@
     vn-id="confirm-toBookAnyway"
     message="Are you sure you want to book this invoice?"
     on-accept="$ctrl.onAcceptToBook()">
-</vn-confirm>
\ No newline at end of file
+</vn-confirm>
+<vn-popup vn-id="summary">
+    <vn-invoice-in-summary invoice-in="$ctrl.invoiceIn"></vn-invoice-in-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index 135eae0e1..92f0b9de5 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="invoiceOut"
-    description="$ctrl.invoiceOut.ref">
+    description="$ctrl.invoiceOut.ref"
+    summary="$ctrl.$.summary">
     <slot-dot-menu>
         <vn-invoice-out-descriptor-menu 
             invoice-out="$ctrl.invoiceOut"
@@ -49,4 +50,7 @@
             </div>
         </div>
     </slot-body>
-</vn-descriptor-content>
\ No newline at end of file
+</vn-descriptor-content>
+<vn-popup vn-id="summary">
+    <vn-invoice-out-summary invoice-out="$ctrl.invoiceOut"></vn-invoice-out-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index 87def9145..321545b38 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="item"
-    description="$ctrl.item.name">
+    description="$ctrl.item.name"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item
             ng-click="regularize.show()"
@@ -114,6 +115,9 @@
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
+<vn-popup vn-id="summary">
+    <vn-item-summary item="$ctrl.item"></vn-item-summary>
+</vn-popup>
 
 <!-- Upload photo dialog -->
 <vn-upload-photo 
diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html
index a96da252b..538789027 100644
--- a/modules/order/front/descriptor/index.html
+++ b/modules/order/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="order"
-    description="$ctrl.order.client.name">
+    description="$ctrl.order.client.name"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item
             ng-click="deleteOrderConfirmation.show()"
@@ -71,4 +72,7 @@
 </vn-confirm>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
-</vn-worker-descriptor-popover>
\ No newline at end of file
+</vn-worker-descriptor-popover>
+<vn-popup vn-id="summary">
+    <vn-order-summary order="$ctrl.order"></vn-order-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html
index bda46952a..fc1d3419c 100644
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="route"
-    description="$ctrl.route.name">
+    description="$ctrl.route.name"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item
             ng-click="$ctrl.showRouteReport()"
@@ -61,4 +62,7 @@
     vn-id="updateVolumeConfirmation"
     on-accept="$ctrl.updateVolume()"
     question="Are you sure you want to update the volume?">
-</vn-confirm>
\ No newline at end of file
+</vn-confirm>
+<vn-popup vn-id="summary">
+    <vn-route-summary route="$ctrl.route"></vn-route-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/supplier/front/descriptor/index.html b/modules/supplier/front/descriptor/index.html
index dcc065eff..4691bfe9b 100644
--- a/modules/supplier/front/descriptor/index.html
+++ b/modules/supplier/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="supplier"
-    description="$ctrl.supplier.name">
+    description="$ctrl.supplier.name"
+    summary="$ctrl.$.summary">
     <slot-body>
         <div class="attributes">
             <vn-label-value label="Tax number" 
@@ -60,3 +61,6 @@
         </div>
     </slot-body>
 </vn-descriptor-content>
+<vn-popup vn-id="summary">
+    <vn-supplier-summary supplier="$ctrl.supplier"></vn-supplier-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html
index 8d7688826..2c27b19cd 100644
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="ticket"
-    description="$ctrl.ticket.client.name">
+    description="$ctrl.ticket.client.name"
+    summary="$ctrl.$.summary">
     <slot-dot-menu>
         <vn-ticket-descriptor-menu 
             vn-id="descriptorMenu" 
@@ -127,4 +128,7 @@
 </vn-descriptor-content>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
-</vn-worker-descriptor-popover>
\ No newline at end of file
+</vn-worker-descriptor-popover>
+<vn-popup vn-id="summary">
+    <vn-ticket-summary ticket="$ctrl.ticket"></vn-ticket-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/travel/front/descriptor/index.html b/modules/travel/front/descriptor/index.html
index 28e908d18..bbf5721fd 100644
--- a/modules/travel/front/descriptor/index.html
+++ b/modules/travel/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="travel"
-    description="$ctrl.travel.ref">
+    description="$ctrl.travel.ref"
+    summary="$ctrl.$.summary">
     <slot-dot-menu>
         <vn-travel-descriptor-menu travel-id="$ctrl.travel.id"/>
     </slot-dot-menu>
@@ -42,3 +43,6 @@
         </div>
     </slot-body>
 </vn-descriptor-content>
+<vn-popup vn-id="summary">
+    <vn-travel-summary travel="$ctrl.travel"></vn-travel-summary>
+</vn-popup>
\ No newline at end of file
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 036b70eab..01681ebb8 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="worker"
-    description="$ctrl.worker.firstName +' '+ $ctrl.worker.lastName">
+    description="$ctrl.worker.firstName +' '+ $ctrl.worker.lastName"
+    summary="$ctrl.$.summary">
     <slot-before>
         <div class="photo" text-center>
             <img vn-id="photo"
@@ -57,6 +58,9 @@
         </div>
     </slot-body>
 </vn-descriptor-content>
+<vn-popup vn-id="summary">
+    <vn-worker-summary worker="$ctrl.worker"></vn-worker-summary>
+</vn-popup>
 
 <!-- Upload photo dialog -->
 <vn-upload-photo 
diff --git a/modules/zone/front/descriptor/index.html b/modules/zone/front/descriptor/index.html
index 355028c98..a3432a99d 100644
--- a/modules/zone/front/descriptor/index.html
+++ b/modules/zone/front/descriptor/index.html
@@ -1,6 +1,7 @@
 <vn-descriptor-content
     module="zone"
-    description="$ctrl.zone.name">
+    description="$ctrl.zone.name"
+    summary="$ctrl.$.summary">
     <slot-menu>
         <vn-item class="vn-item"
             ng-click="$ctrl.onDelete()"
@@ -39,6 +40,10 @@
         </div>
     </slot-body>
 </vn-descriptor-content>
+<vn-popup vn-id="summary">
+    <vn-zone-summary zone="$ctrl.zone"></vn-zone-summary>
+</vn-popup>
+
 <vn-confirm
     vn-id="deleteZone"
     on-accept="$ctrl.deleteZone()"