#1769 removed route report from ticket descriptor
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-10-14 08:52:31 +02:00
parent cd2b02b0c6
commit 4a2d61ddcb
4 changed files with 5 additions and 30 deletions

View File

@ -37,7 +37,6 @@ describe('Ticket descriptor path', () => {
.wait(selectors.ticketDescriptor.changeShippedHourInput) .wait(selectors.ticketDescriptor.changeShippedHourInput)
.isVisible(selectors.ticketDescriptor.changeShippedHourInput); .isVisible(selectors.ticketDescriptor.changeShippedHourInput);
expect(visible).toBeTruthy(); expect(visible).toBeTruthy();
}); });
@ -127,16 +126,6 @@ describe('Ticket descriptor path', () => {
expect(result).toEqual('Data saved!'); 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() => { it(`should check the state of the stowaway ticket is embarked`, async() => {
const state = await nightmare const state = await nightmare
.waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText'); .waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText');
@ -144,15 +133,6 @@ describe('Ticket descriptor path', () => {
expect(state).toEqual('State Embarcando'); 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() => { it(`should navigate back to the added ticket using the descriptors ship button`, async() => {
const url = await nightmare const url = await nightmare
.waitToClick(selectors.ticketDescriptor.closeStowawayDialog) .waitToClick(selectors.ticketDescriptor.closeStowawayDialog)

View File

@ -7,10 +7,10 @@
class="modal-form" class="modal-form"
on-open="model.refresh()"> on-open="model.refresh()">
<tpl-body> <tpl-body>
<vn-horizontal class="header vn-pa-md"> <section class="header vn-pa-md">
<h5><span translate>Stowaways to add</span></h5> <h5><span translate>Stowaways to add</span></h5>
</vn-horizontal> </section>
<vn-horizontal class="vn-pa-md"> <!-- FIXME: Dialog width --> <vn-horizontal class="vn-pa-md">
<vn-data-viewer model="model"> <vn-data-viewer model="model">
<vn-table model="model" auto-load="false"> <vn-table model="model" auto-load="false">
<vn-thead> <vn-thead>

View File

@ -15,7 +15,6 @@ class Controller {
{name: 'Delete ticket', callback: this.showDeleteTicketDialog}, {name: 'Delete ticket', callback: this.showDeleteTicketDialog},
{name: 'Change shipped hour', callback: this.showChangeShipped}, {name: 'Change shipped hour', callback: this.showChangeShipped},
{name: 'Send SMS', callback: this.showSMSDialog}, {name: 'Send SMS', callback: this.showSMSDialog},
{name: 'Show pallet report', callback: this.openRptRoute},
{ {
name: 'Add stowaway', name: 'Add stowaway',
callback: this.showAddStowaway, callback: this.showAddStowaway,
@ -147,11 +146,6 @@ class Controller {
} }
} }
openRptRoute() {
let url = `/api/report/rpt-route?routeFk=${this.ticket.routeFk}`;
window.open(url);
}
showAddStowaway() { showAddStowaway() {
this.$scope.addStowaway.show(); this.$scope.addStowaway.show();
} }

View File

@ -7,9 +7,10 @@ vn-add-stowaway {
} }
vn-dialog.modal-form { vn-dialog.modal-form {
vn-horizontal.header { section.header {
background-color: $color-main; background-color: $color-main;
color: $color-font-dark; color: $color-font-dark;
text-align: center;
h5 { h5 {
color: inherit; color: inherit;