From 07cbac7fcd2f3a1ba4ea484fb857aa32b3c4a10f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 8 May 2020 19:56:39 +0200 Subject: [PATCH] Merge fixes --- e2e/helpers/selectors.js | 10 +++++----- front/core/components/autocomplete/index.html | 2 +- front/core/components/field/index.html | 2 +- front/core/components/input-file/index.html | 2 +- front/core/components/input-number/index.html | 2 +- modules/claim/front/summary/index.html | 4 ++-- modules/item/front/descriptor-popover/index.html | 2 +- modules/item/front/descriptor-popover/index.js | 14 ++++++++++++-- modules/zone/front/delivery-days/index.html | 13 ++++++++----- modules/zone/front/events/index.html | 10 ++++------ 10 files changed, 36 insertions(+), 25 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 4e82dd12a..6ee2f98aa 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -442,7 +442,7 @@ export default { saleLine: 'vn-table div > vn-tbody > vn-tr', saleDescriptorPopover: '.vn-popover.shown vn-item-descriptor', saleDescriptorPopoverSummaryButton: '.vn-popover.shown vn-item-descriptor a[ui-sref="item.card.summary({id: $ctrl.item.id})"]', - descriptorItemDiaryButton: 'vn-item-descriptor .quicklinks.ng-scope > vn-horizontal > a > vn-icon > i', + descriptorItemDiaryButton: '.vn-popover vn-item-descriptor vn-quick-link[icon="icon-transaction"] > a', newItemFromCatalogButton: 'vn-ticket-sale vn-float-button[icon="add"]', newItemButton: 'vn-ticket-sale vn-card vn-icon-button[icon="add_circle"]', moreMenu: 'vn-ticket-sale vn-tool-bar > vn-button-menu[vn-id="more-button"] > div > button', @@ -569,9 +569,9 @@ export default { firstSaleItemId: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(4) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(1) > span', firstSaleDescriptorImage: '.vn-popover.shown vn-item-descriptor img', itemDescriptorPopover: '.vn-popover.shown vn-item-descriptor', - itemDescriptorPopoverItemDiaryButton: '.vn-popover.shown vn-item-descriptor a[href="#!/item/2/diary"]', + itemDescriptorPopoverItemDiaryButton: '.vn-popover vn-item-descriptor vn-quick-link[icon="icon-transaction"] > a', firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span', - firstDevelopmentWorkerGoToClientButton: '.vn-popover.shown vn-worker-descriptor .quicklinks a[href="#!/client/21/summary"]', + firstDevelopmentWorkerGoToClientButton: '.vn-popover vn-worker-descriptor vn-quick-link[icon="person"] > a', firstActionTicketId: 'vn-claim-summary > vn-card > vn-horizontal > vn-auto:nth-child(6) vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span', firstActionTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor' }, @@ -847,7 +847,7 @@ export default { }, entryDescriptor: { agency: 'vn-entry-descriptor div.body vn-label-value:nth-child(2) span', - travelsQuicklink: 'vn-entry-descriptor .quicklinks > :nth-child(1) a', - entriesQuicklink: 'vn-entry-descriptor .quicklinks > :nth-child(2) a' + travelsQuicklink: 'vn-entry-descriptor vn-quick-link[icon="local_airport"] > a', + entriesQuicklink: 'vn-entry-descriptor vn-quick-link[icon="icon-entry"] > a' } }; diff --git a/front/core/components/autocomplete/index.html b/front/core/components/autocomplete/index.html index feaa47bdb..69aac4d43 100755 --- a/front/core/components/autocomplete/index.html +++ b/front/core/components/autocomplete/index.html @@ -16,7 +16,7 @@
diff --git a/front/core/components/field/index.html b/front/core/components/field/index.html index c31fe2862..b1b78be66 100644 --- a/front/core/components/field/index.html +++ b/front/core/components/field/index.html @@ -8,7 +8,7 @@
diff --git a/front/core/components/input-file/index.html b/front/core/components/input-file/index.html index ad71b744d..5ec7e1da4 100644 --- a/front/core/components/input-file/index.html +++ b/front/core/components/input-file/index.html @@ -19,7 +19,7 @@
diff --git a/front/core/components/input-number/index.html b/front/core/components/input-number/index.html index acce849e2..4d0227333 100644 --- a/front/core/components/input-number/index.html +++ b/front/core/components/input-number/index.html @@ -8,7 +8,7 @@
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html index 1c99d4119..ffc677572 100644 --- a/modules/claim/front/summary/index.html +++ b/modules/claim/front/summary/index.html @@ -65,7 +65,7 @@ {{::saleClaimed.sale.itemFk | zeroFill:6}} @@ -148,7 +148,7 @@ {{::action.sale.itemFk | zeroFill:6}} diff --git a/modules/item/front/descriptor-popover/index.html b/modules/item/front/descriptor-popover/index.html index b0c13f2ab..d4d8035b9 100644 --- a/modules/item/front/descriptor-popover/index.html +++ b/modules/item/front/descriptor-popover/index.html @@ -3,7 +3,7 @@ diff --git a/modules/item/front/descriptor-popover/index.js b/modules/item/front/descriptor-popover/index.js index 60b4ab02b..92baefa9c 100644 --- a/modules/item/front/descriptor-popover/index.js +++ b/modules/item/front/descriptor-popover/index.js @@ -1,13 +1,23 @@ import ngModule from '../module'; import DescriptorPopover from 'salix/components/descriptor-popover'; -class Controller extends DescriptorPopover {} +class Controller extends DescriptorPopover { + show(parent, id, lineFk) { + super.show(parent, id); + this.lineFk = lineFk; + } + + hide() { + super.hide(); + this.lineFk = null; + } +} ngModule.vnComponent('vnItemDescriptorPopover', { slotTemplate: require('./index.html'), controller: Controller, bindings: { warehouseFk: ' + show-field="code"> - {{code}} - {{town.name}} ({{town.province.name}}, - {{town.province.country.country}}) +
+ {{code}} {{town.name}} +
+
+ {{town.province.name}}, {{town.province.country.country}} +
- - - - +