From 4a2d61ddcb2da3bae957f392b763a9f12c3bd8d1 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Mon, 14 Oct 2019 08:52:31 +0200 Subject: [PATCH] #1769 removed route report from ticket descriptor --- .../05-ticket-module/12_descriptor.spec.js | 20 ------------------- .../ticket/front/descriptor/addStowaway.html | 6 +++--- modules/ticket/front/descriptor/index.js | 6 ------ modules/ticket/front/descriptor/style.scss | 3 ++- 4 files changed, 5 insertions(+), 30 deletions(-) diff --git a/e2e/paths/05-ticket-module/12_descriptor.spec.js b/e2e/paths/05-ticket-module/12_descriptor.spec.js index c178e7fc8..d6046c5a9 100644 --- a/e2e/paths/05-ticket-module/12_descriptor.spec.js +++ b/e2e/paths/05-ticket-module/12_descriptor.spec.js @@ -37,7 +37,6 @@ describe('Ticket descriptor path', () => { .wait(selectors.ticketDescriptor.changeShippedHourInput) .isVisible(selectors.ticketDescriptor.changeShippedHourInput); - expect(visible).toBeTruthy(); }); @@ -127,16 +126,6 @@ describe('Ticket descriptor path', () => { expect(result).toEqual('Data saved!'); }); - it(`should navigate to the added ticket using the descriptors ship button`, async() => { - const url = await nightmare - .waitToClick(selectors.ticketDescriptor.closeStowawayDialog) - .waitToClick(selectors.ticketDescriptor.shipButton) - .waitForURL('#!/ticket/17/summary') - .parsedUrl(); - - expect(url.hash).toContain('#!/ticket/17/summary'); - }); - it(`should check the state of the stowaway ticket is embarked`, async() => { const state = await nightmare .waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText'); @@ -144,15 +133,6 @@ describe('Ticket descriptor path', () => { expect(state).toEqual('State Embarcando'); }); - it(`should navigate to the ship ticket using the descriptors ship button`, async() => { - const url = await nightmare - .waitToClick(selectors.ticketDescriptor.shipButton) - .waitForURL('#!/ticket/16/summary') - .parsedUrl(); - - expect(url.hash).toContain('#!/ticket/16/summary'); - }); - it(`should navigate back to the added ticket using the descriptors ship button`, async() => { const url = await nightmare .waitToClick(selectors.ticketDescriptor.closeStowawayDialog) diff --git a/modules/ticket/front/descriptor/addStowaway.html b/modules/ticket/front/descriptor/addStowaway.html index 0c8c3d6b0..963c9b6c1 100644 --- a/modules/ticket/front/descriptor/addStowaway.html +++ b/modules/ticket/front/descriptor/addStowaway.html @@ -7,10 +7,10 @@ class="modal-form" on-open="model.refresh()"> - +
Stowaways to add
- - +
+ diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js index 18484f107..a33e57e14 100644 --- a/modules/ticket/front/descriptor/index.js +++ b/modules/ticket/front/descriptor/index.js @@ -15,7 +15,6 @@ class Controller { {name: 'Delete ticket', callback: this.showDeleteTicketDialog}, {name: 'Change shipped hour', callback: this.showChangeShipped}, {name: 'Send SMS', callback: this.showSMSDialog}, - {name: 'Show pallet report', callback: this.openRptRoute}, { name: 'Add stowaway', callback: this.showAddStowaway, @@ -147,11 +146,6 @@ class Controller { } } - openRptRoute() { - let url = `/api/report/rpt-route?routeFk=${this.ticket.routeFk}`; - window.open(url); - } - showAddStowaway() { this.$scope.addStowaway.show(); } diff --git a/modules/ticket/front/descriptor/style.scss b/modules/ticket/front/descriptor/style.scss index 719ce159b..72cb80143 100644 --- a/modules/ticket/front/descriptor/style.scss +++ b/modules/ticket/front/descriptor/style.scss @@ -7,9 +7,10 @@ vn-add-stowaway { } vn-dialog.modal-form { - vn-horizontal.header { + section.header { background-color: $color-main; color: $color-font-dark; + text-align: center; h5 { color: inherit;