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 1fe60a42e..4ed53ce60 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -958,7 +958,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-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 @@ + description="$ctrl.user.nickname" + summary="$ctrl.$.summary"> Change password + + + \ 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 @@ + description="$ctrl.claim.client.name" + summary="$ctrl.$.summary"> - \ No newline at end of file + + + + \ 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 @@ + description="$ctrl.client.name" + summary="$ctrl.$.summary"> - \ No newline at end of file + + + + 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 @@ + description="$ctrl.entry.supplier.nickname" + summary="$ctrl.$.summary"> + + + \ 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 @@ - + - \ No newline at end of file + + + + \ 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 @@ + description="$ctrl.invoiceOut.ref" + summary="$ctrl.$.summary"> - \ No newline at end of file + + + + \ No newline at end of file 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" }, 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 @@ + description="$ctrl.item.name" + summary="$ctrl.$.summary"> + + + + description="$ctrl.order.client.name" + summary="$ctrl.$.summary"> - \ No newline at end of file + + + + \ 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 @@ + description="$ctrl.route.name" + summary="$ctrl.$.summary"> - \ No newline at end of file + + + + \ 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 @@ + description="$ctrl.supplier.name" + summary="$ctrl.$.summary">
+ + + \ 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 @@ + description="$ctrl.ticket.client.name" + summary="$ctrl.$.summary"> - \ No newline at end of file + + + + \ 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 @@ + description="$ctrl.travel.ref" + summary="$ctrl.$.summary"> @@ -42,3 +43,6 @@
+ + + \ 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 @@ + description="$ctrl.worker.firstName +' '+ $ctrl.worker.lastName" + summary="$ctrl.$.summary">
+ + + + description="$ctrl.zone.name" + summary="$ctrl.$.summary"> + + + +