From 55a1ae034860b8fef9814cce41a59dc1ecfca97e Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 16 Nov 2020 14:43:35 +0100 Subject: [PATCH 1/8] added entry descriptor to item last entries --- modules/item/front/last-entries/index.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html index 1f7c3c364..6d8add2cb 100644 --- a/modules/item/front/last-entries/index.html +++ b/modules/item/front/last-entries/index.html @@ -50,7 +50,14 @@ {{::entry.warehouse| dashIfEmpty}} {{::entry.landed | date:'dd/MM/yyyy HH:mm'}} - {{::entry.entryFk | dashIfEmpty}} + + + + {{::entry.entryFk | dashIfEmpty}} + + {{::entry.price2 | dashIfEmpty}} {{::entry.price3 | dashIfEmpty}} {{entry.stickers | dashIfEmpty}} @@ -77,6 +84,10 @@ + + + -- 2.40.1 From c0b2ef96661d31b4e502641893fa9e392e855336 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 16 Nov 2020 14:50:03 +0100 Subject: [PATCH 2/8] travel descriptor quicklinks --- modules/travel/back/models/travel.json | 3 ++ modules/travel/front/descriptor/index.html | 18 +++++++++++ modules/travel/front/descriptor/index.js | 36 +++++++++++++++++++++- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json index aebf4e3cd..df5b183b1 100644 --- a/modules/travel/back/models/travel.json +++ b/modules/travel/back/models/travel.json @@ -37,6 +37,9 @@ "m3": { "type": "Number" }, + "cargoSupplierFk": { + "type": "Number" + }, "agencyModeFk": { "type": "Number", "mysql": { diff --git a/modules/travel/front/descriptor/index.html b/modules/travel/front/descriptor/index.html index a3e77f6d1..cd6143cae 100644 --- a/modules/travel/front/descriptor/index.html +++ b/modules/travel/front/descriptor/index.html @@ -24,5 +24,23 @@ value="{{$ctrl.travel.totalEntries}}"> +
+
+ + +
+
+ + +
+
+
+
diff --git a/modules/travel/front/descriptor/index.js b/modules/travel/front/descriptor/index.js index 6136d5347..744166580 100644 --- a/modules/travel/front/descriptor/index.js +++ b/modules/travel/front/descriptor/index.js @@ -10,6 +10,39 @@ class Controller extends Descriptor { this.entity = value; } + get travelFilter() { + let travelFilter; + const travel = this.travel; + + if (travel && travel.agencyFk) { + travelFilter = this.travel && JSON.stringify({ + agencyFk: this.travel.agencyFk + }); + } + return travelFilter; + } + + get entryFilter() { + let travel = this.travel; + + if (!travel || !travel.landed) return null; + + const date = new Date(travel.landed); + date.setHours(0, 0, 0, 0); + + const from = new Date(date.getTime()); + from.setDate(from.getDate() - 10); + + const to = new Date(date.getTime()); + to.setDate(to.getDate() + 10); + + return JSON.stringify({ + supplierFk: this.travel.cargoSupplierFk, + from, + to + }); + } + loadData() { const filter = { fields: [ @@ -19,7 +52,8 @@ class Controller extends Descriptor { 'landed', 'totalEntries', 'warehouseInFk', - 'warehouseOutFk' + 'warehouseOutFk', + 'cargoSupplierFk' ], include: [ { -- 2.40.1 From dc7a6d4ce159be22e2c132a6c9f8c25e0fcb0843 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 16 Nov 2020 19:04:37 +0100 Subject: [PATCH 3/8] dot menu along with clone option --- .../travel/front/descriptor-menu/index.html | 21 ++++++++++ modules/travel/front/descriptor-menu/index.js | 31 +++++++++++++++ .../front/descriptor-menu/index.spec.js | 39 +++++++++++++++++++ .../travel/front/descriptor-menu/style.scss | 24 ++++++++++++ modules/travel/front/descriptor/index.html | 3 ++ modules/travel/front/index.js | 1 + 6 files changed, 119 insertions(+) create mode 100644 modules/travel/front/descriptor-menu/index.html create mode 100644 modules/travel/front/descriptor-menu/index.js create mode 100644 modules/travel/front/descriptor-menu/index.spec.js create mode 100644 modules/travel/front/descriptor-menu/style.scss diff --git a/modules/travel/front/descriptor-menu/index.html b/modules/travel/front/descriptor-menu/index.html new file mode 100644 index 000000000..45c745688 --- /dev/null +++ b/modules/travel/front/descriptor-menu/index.html @@ -0,0 +1,21 @@ + + + + + + Clone travel + + + + + + + diff --git a/modules/travel/front/descriptor-menu/index.js b/modules/travel/front/descriptor-menu/index.js new file mode 100644 index 000000000..84a510e55 --- /dev/null +++ b/modules/travel/front/descriptor-menu/index.js @@ -0,0 +1,31 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; +import './style.scss'; + +class Controller extends Section { + constructor($element, $) { + super($element, $); + } + + onCloneAccept() { + const params = JSON.stringify({ + ref: this.travel.ref, + agencyModeFk: this.travel.agencyFk, + shipped: this.travel.shipped, + landed: this.travel.landed, + warehouseInFk: this.travel.warehouseInFk, + warehouseOutFk: this.travel.warehouseOutFk + }); + this.$state.go('travel.create', {q: params}); + } +} + +Controller.$inject = ['$element', '$scope']; + +ngModule.vnComponent('vnTravelDescriptorMenu', { + template: require('./index.html'), + controller: Controller, + bindings: { + travel: '<', + } +}); diff --git a/modules/travel/front/descriptor-menu/index.spec.js b/modules/travel/front/descriptor-menu/index.spec.js new file mode 100644 index 000000000..d66f3a435 --- /dev/null +++ b/modules/travel/front/descriptor-menu/index.spec.js @@ -0,0 +1,39 @@ +import './index.js'; + +describe('Travel Component vnTravelDescriptorMenu', () => { + let controller; + beforeEach(ngModule('travel')); + + beforeEach(inject(($componentController, $state,) => { + const $element = angular.element(''); + controller = $componentController('vnTravelDescriptorMenu', {$element}); + })); + + describe('onCloneAccept()', () => { + it('should call state.go with the travel data', () => { + jest.spyOn(controller.$state, 'go').mockReturnValue('ok'); + + controller.travel = { + ref: 'the ref', + agencyFk: 'the agency', + shipped: 'the shipped date', + landed: 'the landing date', + warehouseInFk: 'the receiver warehouse', + warehouseOutFk: 'the sender warehouse' + }; + + controller.onCloneAccept(); + + const params = JSON.stringify({ + ref: controller.travel.ref, + agencyModeFk: controller.travel.agencyFk, + shipped: controller.travel.shipped, + landed: controller.travel.landed, + warehouseInFk: controller.travel.warehouseInFk, + warehouseOutFk: controller.travel.warehouseOutFk + }); + + expect(controller.$state.go).toHaveBeenCalledWith('travel.create', {'q': params}); + }); + }); +}); diff --git a/modules/travel/front/descriptor-menu/style.scss b/modules/travel/front/descriptor-menu/style.scss new file mode 100644 index 000000000..beab9335e --- /dev/null +++ b/modules/travel/front/descriptor-menu/style.scss @@ -0,0 +1,24 @@ +@import "./effects"; +@import "variables"; + +vn-travel-descriptor-menu { + & > vn-icon-button[icon="more_vert"] { + display: flex; + min-width: 45px; + height: 45px; + box-sizing: border-box; + align-items: center; + justify-content: center; + } + & > vn-icon-button[icon="more_vert"] { + @extend %clickable; + color: inherit; + + & > vn-icon { + padding: 10px; + } + vn-icon { + font-size: 1.75rem; + } + } +} \ No newline at end of file diff --git a/modules/travel/front/descriptor/index.html b/modules/travel/front/descriptor/index.html index cd6143cae..1e5d0294f 100644 --- a/modules/travel/front/descriptor/index.html +++ b/modules/travel/front/descriptor/index.html @@ -1,6 +1,9 @@ + + +
Date: Tue, 17 Nov 2020 11:04:17 +0100 Subject: [PATCH 4/8] removed commented code --- modules/item/front/last-entries/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html index 6d8add2cb..4d8dea570 100644 --- a/modules/item/front/last-entries/index.html +++ b/modules/item/front/last-entries/index.html @@ -50,7 +50,6 @@ {{::entry.warehouse| dashIfEmpty}} {{::entry.landed | date:'dd/MM/yyyy HH:mm'}} - Date: Tue, 17 Nov 2020 15:54:45 +0100 Subject: [PATCH 5/8] refactor --- modules/travel/front/descriptor-menu/index.js | 43 ++++++++++++++++++- .../front/descriptor-menu/locale/es.yml | 1 + modules/travel/front/descriptor/index.html | 7 +-- modules/travel/front/descriptor/index.js | 21 --------- 4 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 modules/travel/front/descriptor-menu/locale/es.yml diff --git a/modules/travel/front/descriptor-menu/index.js b/modules/travel/front/descriptor-menu/index.js index 84a510e55..975cd9134 100644 --- a/modules/travel/front/descriptor-menu/index.js +++ b/modules/travel/front/descriptor-menu/index.js @@ -7,6 +7,47 @@ class Controller extends Section { super($element, $); } + get travelId() { + return this._travelId; + } + + set travelId(value) { + this._travelId = value; + + if (value) this.loadData(); + } + + loadData() { + const filter = { + fields: [ + 'id', + 'ref', + 'shipped', + 'landed', + 'totalEntries', + 'agencyFk', + 'warehouseInFk', + 'warehouseOutFk', + 'cargoSupplierFk' + ], + include: [ + { + relation: 'warehouseIn', + scope: { + fields: ['name'] + } + }, { + relation: 'warehouseOut', + scope: { + fields: ['name'] + } + } + ] + }; + return this.$http.get(`Travels/${this.travelId}`, {filter}) + .then(res => this.travel = res.data); + } + onCloneAccept() { const params = JSON.stringify({ ref: this.travel.ref, @@ -26,6 +67,6 @@ ngModule.vnComponent('vnTravelDescriptorMenu', { template: require('./index.html'), controller: Controller, bindings: { - travel: '<', + travelId: '<', } }); diff --git a/modules/travel/front/descriptor-menu/locale/es.yml b/modules/travel/front/descriptor-menu/locale/es.yml new file mode 100644 index 000000000..117611660 --- /dev/null +++ b/modules/travel/front/descriptor-menu/locale/es.yml @@ -0,0 +1 @@ +Clone travel: Clonar envío \ No newline at end of file diff --git a/modules/travel/front/descriptor/index.html b/modules/travel/front/descriptor/index.html index 1e5d0294f..28e908d18 100644 --- a/modules/travel/front/descriptor/index.html +++ b/modules/travel/front/descriptor/index.html @@ -2,7 +2,7 @@ module="travel" description="$ctrl.travel.ref"> - +
@@ -36,11 +36,6 @@
- -
diff --git a/modules/travel/front/descriptor/index.js b/modules/travel/front/descriptor/index.js index 744166580..dc19f68af 100644 --- a/modules/travel/front/descriptor/index.js +++ b/modules/travel/front/descriptor/index.js @@ -22,27 +22,6 @@ class Controller extends Descriptor { return travelFilter; } - get entryFilter() { - let travel = this.travel; - - if (!travel || !travel.landed) return null; - - const date = new Date(travel.landed); - date.setHours(0, 0, 0, 0); - - const from = new Date(date.getTime()); - from.setDate(from.getDate() - 10); - - const to = new Date(date.getTime()); - to.setDate(to.getDate() + 10); - - return JSON.stringify({ - supplierFk: this.travel.cargoSupplierFk, - from, - to - }); - } - loadData() { const filter = { fields: [ -- 2.40.1 From 7dc8ae9dbcb81d6422baac4668fea527dbbdea7a Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 17 Nov 2020 16:52:19 +0100 Subject: [PATCH 6/8] e2e path for travel descriptor --- e2e/helpers/selectors.js | 9 ++++ e2e/paths/10-travel/03_descriptor.spec.js | 45 +++++++++++++++++++ .../travel/front/descriptor-menu/index.html | 1 + 3 files changed, 55 insertions(+) create mode 100644 e2e/paths/10-travel/03_descriptor.spec.js diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 95ffca91e..f5f2c4050 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -815,6 +815,10 @@ export default { ticketOne: 'vn-invoice-out-summary > vn-card > vn-horizontal > vn-auto > vn-table > div > vn-tbody > vn-tr:nth-child(1)', ticketTwo: 'vn-invoice-out-summary > vn-card > vn-horizontal > vn-auto > vn-table > div > vn-tbody > vn-tr:nth-child(2)' }, + travelIndex: { + anySearchResult: 'vn-travel-index vn-tbody > a', + firstSearchResult: 'vn-travel-index vn-tbody > a:nth-child(1)' + }, travelBasicDada: { reference: 'vn-travel-basic-data vn-textfield[ng-model="$ctrl.travel.ref"]', agency: 'vn-travel-basic-data vn-autocomplete[ng-model="$ctrl.travel.agencyModeFk"]', @@ -841,6 +845,11 @@ export default { createdThermograph: 'vn-travel-thermograph-index vn-tbody > vn-tr', upload: 'vn-travel-thermograph-create button[type=submit]' }, + travelDescriptor: { + filterByAgencyButton: 'vn-descriptor-content .quicklinks > div:nth-child(1) > vn-quick-link > a[vn-tooltip="All travels with current agency"]', + dotMenu: 'vn-travel-descriptor vn-icon-button[icon="more_vert"]', + dotMenuClone: '#clone' + }, zoneIndex: { searchResult: 'vn-zone-index a.vn-tr', }, diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js new file mode 100644 index 000000000..13b2dfe7a --- /dev/null +++ b/e2e/paths/10-travel/03_descriptor.spec.js @@ -0,0 +1,45 @@ +import selectors from '../../helpers/selectors.js'; +import getBrowser from '../../helpers/puppeteer'; + +describe('Travel descriptor path', () => { + let browser; + let page; + + beforeAll(async() => { + browser = await getBrowser(); + page = browser.page; + await page.loginAndModule('buyer', 'travel'); + await page.accessToSearchResult('3'); + await page.waitForState('travel.card.summary'); + }); + + afterAll(async() => { + await browser.close(); + }); + + it('should click the descriptor button to navigate to the travel index showing all travels with current agency', async() => { + await page.waitToClick(selectors.travelDescriptor.filterByAgencyButton); + await page.waitForState('travel.index'); + const result = await page.countElement(selectors.travelIndex.anySearchResult); + + expect(result).toEqual(8); + }); + + it('should navigate to the first search result', async() => { + await page.waitToClick(selectors.travelIndex.firstSearchResult); + await page.waitForState('travel.card.summary'); + const state = await page.getState(); + + expect(state).toBe('travel.card.summary'); + }); + + it('should be redirected to the create travel when using the clone option of the dot menu', async() => { + await page.waitToClick(selectors.travelDescriptor.dotMenu); + await page.waitToClick(selectors.travelDescriptor.dotMenuClone); + await page.respondToDialog('accept'); + await page.waitForState('travel.create'); + const state = await page.getState(); + + expect(state).toBe('travel.create'); + }); +}); diff --git a/modules/travel/front/descriptor-menu/index.html b/modules/travel/front/descriptor-menu/index.html index 45c745688..1eb558008 100644 --- a/modules/travel/front/descriptor-menu/index.html +++ b/modules/travel/front/descriptor-menu/index.html @@ -5,6 +5,7 @@ Clone travel -- 2.40.1 From 71f0a1932037cb33f3627d1ab63471f4199928d4 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 17 Nov 2020 17:19:22 +0100 Subject: [PATCH 7/8] descriptor path fix --- e2e/paths/10-travel/03_descriptor.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js index 13b2dfe7a..8567f6a66 100644 --- a/e2e/paths/10-travel/03_descriptor.spec.js +++ b/e2e/paths/10-travel/03_descriptor.spec.js @@ -20,6 +20,7 @@ describe('Travel descriptor path', () => { it('should click the descriptor button to navigate to the travel index showing all travels with current agency', async() => { await page.waitToClick(selectors.travelDescriptor.filterByAgencyButton); await page.waitForState('travel.index'); + await page.waitForNumberOfElements(selectors.travelIndex.anySearchResult, 8); const result = await page.countElement(selectors.travelIndex.anySearchResult); expect(result).toEqual(8); -- 2.40.1 From 7dff246e46b3bbeca75a6ef5e35397d93cccd95c Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 17 Nov 2020 18:07:04 +0100 Subject: [PATCH 8/8] adapted e2e path for full run --- e2e/paths/02-client/14_balance.spec.js | 1 - e2e/paths/10-travel/03_descriptor.spec.js | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/e2e/paths/02-client/14_balance.spec.js b/e2e/paths/02-client/14_balance.spec.js index a9d5e304a..bd00af58e 100644 --- a/e2e/paths/02-client/14_balance.spec.js +++ b/e2e/paths/02-client/14_balance.spec.js @@ -41,7 +41,6 @@ describe('Client balance path', () => { it('should click the new payment button', async() => { await page.closePopup(); await page.reloadSection('client.card.balance.index'); - await page.waitForState('client.card.balance.index'); }); it('should create a new payment that clears the debt', async() => { diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js index 8567f6a66..3f79bea06 100644 --- a/e2e/paths/10-travel/03_descriptor.spec.js +++ b/e2e/paths/10-travel/03_descriptor.spec.js @@ -9,7 +9,7 @@ describe('Travel descriptor path', () => { browser = await getBrowser(); page = browser.page; await page.loginAndModule('buyer', 'travel'); - await page.accessToSearchResult('3'); + await page.accessToSearchResult('1'); await page.waitForState('travel.card.summary'); }); @@ -20,10 +20,9 @@ describe('Travel descriptor path', () => { it('should click the descriptor button to navigate to the travel index showing all travels with current agency', async() => { await page.waitToClick(selectors.travelDescriptor.filterByAgencyButton); await page.waitForState('travel.index'); - await page.waitForNumberOfElements(selectors.travelIndex.anySearchResult, 8); const result = await page.countElement(selectors.travelIndex.anySearchResult); - expect(result).toEqual(8); + expect(result).toBeGreaterThanOrEqual(7); }); it('should navigate to the first search result', async() => { -- 2.40.1