verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia

This commit is contained in:
Javi Gallego 2020-04-03 12:26:27 +02:00
parent 0b966cbb76 a33bbd428f
commit b6aedd2e6d
126 changed files with 691 additions and 749 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
e2e/helpers/extensions.js
View File

@ -125,7 +125,7 @@ let actions = {
let $state = angular.element(document.body).injector().get('$state'); let $state = angular.element(document.body).injector().get('$state');
return !$state.transition && $state.is(state); return !$state.transition && $state.is(state);
}, {}, state); }, {}, state);
await this.waitForSpinnerLoad(state); await this.waitForSpinnerLoad();
}, },
waitForTransition: async function() { waitForTransition: async function() {
@ -133,6 +133,7 @@ let actions = {
const $state = angular.element(document.body).injector().get('$state'); const $state = angular.element(document.body).injector().get('$state');
return !$state.transition; return !$state.transition;
}); });
await this.waitForSpinnerLoad();
}, },
accessToSection: async function(state) { accessToSection: async function(state) {
@ -142,7 +143,11 @@ let actions = {
}, state); }, state);
if (nested) { if (nested) {
await this.waitToClick('vn-left-menu vn-item-section > vn-icon[icon=keyboard_arrow_down]'); let selector = 'vn-left-menu vn-item-section > vn-icon[icon=keyboard_arrow_down]';
await this.evaluate(selector => {
document.querySelector(selector).scrollIntoViewIfNeeded();
}, selector);
await this.waitToClick(selector);
await this.wait('vn-left-menu .expanded'); await this.wait('vn-left-menu .expanded');
} }
@ -167,11 +172,17 @@ let actions = {
await this.waitToClick(`vn-left-menu li > a[ui-sref="${sectionRoute}"]`); await this.waitToClick(`vn-left-menu li > a[ui-sref="${sectionRoute}"]`);
}, },
accessToSearchResult: async function(searchValue) { doSearch: async function(searchValue) {
await this.clearInput('vn-searchbar'); await this.clearInput('vn-searchbar');
if (searchValue)
await this.write('vn-searchbar', searchValue); await this.write('vn-searchbar', searchValue);
await this.waitToClick('vn-searchbar vn-icon[icon="search"]'); await this.waitToClick('vn-searchbar vn-icon[icon="search"]');
await this.waitForTransition(); await this.waitForTransition();
},
accessToSearchResult: async function(searchValue) {
await this.doSearch(searchValue);
await this.waitFor('.vn-descriptor'); await this.waitFor('.vn-descriptor');
}, },
@ -228,6 +239,11 @@ let actions = {
await this.waitForTextInField(selector, text); await this.waitForTextInField(selector, text);
}, },
overwrite: async function(selector, text) {
await this.clearInput(selector);
await this.write(selector, text);
},
waitToClick: async function(selector) { waitToClick: async function(selector) {
await this.waitForSelector(selector); await this.waitForSelector(selector);
await this.waitForFunction(checkVisibility, {}, selector); await this.waitForFunction(checkVisibility, {}, selector);
@ -546,7 +562,7 @@ let actions = {
}, },
waitForContentLoaded: async function() { waitForContentLoaded: async function() {
// await this.waitFor(250); await this.waitForSpinnerLoad();
} }
}; };

9
e2e/helpers/selectors.js
View File

@ -178,12 +178,11 @@ export default {
}, },
clientBalance: { clientBalance: {
balanceButton: 'vn-left-menu a[ui-sref="client.card.balance.index"]',
company: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyId"]', company: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyId"]',
newPaymentButton: `vn-float-button`, newPaymentButton: `vn-float-button`,
newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]', newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
newPaymentAmount: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.receipt.amountPaid"]', newPaymentAmount: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.receipt.amountPaid"]',
saveButton: '.vn-dialog.shown vn-button[label="Save"]', saveButton: '.vn-dialog.shown [response="accept"]',
firstBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)' firstBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)'
}, },
@ -373,7 +372,7 @@ export default {
payoutButton: 'vn-ticket-index vn-button[icon="icon-recovery"]', payoutButton: 'vn-ticket-index vn-button[icon="icon-recovery"]',
payoutCompany: '.vn-dialog vn-autocomplete[ng-model="$ctrl.receipt.companyFk"]', payoutCompany: '.vn-dialog vn-autocomplete[ng-model="$ctrl.receipt.companyFk"]',
payoutBank: '.vn-dialog vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]', payoutBank: '.vn-dialog vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
submitPayout: '.vn-dialog vn-button[label="Save"]', submitPayout: '.vn-dialog button[response="accept"]',
searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr', searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr',
searchResultDate: 'vn-ticket-summary [label=Landed] span', searchResultDate: 'vn-ticket-summary [label=Landed] span',
topbarSearch: 'vn-searchbar', topbarSearch: 'vn-searchbar',
@ -545,8 +544,8 @@ export default {
firstPrice: 'vn-ticket-service vn-horizontal:nth-child(1) vn-input-number[ng-model="service.price"]', firstPrice: 'vn-ticket-service vn-horizontal:nth-child(1) vn-input-number[ng-model="service.price"]',
firstVatType: 'vn-ticket-service vn-autocomplete[label="Tax class"]', firstVatType: 'vn-ticket-service vn-autocomplete[label="Tax class"]',
fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(1) vn-icon-button[icon="delete"]', fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(1) vn-icon-button[icon="delete"]',
newServiceTypeName: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.newServiceType.name"]', newServiceTypeName: '.vn-dialog.shown vn-textfield[ng-model="newServiceType.name"]',
newServiceTypeExpense: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.newServiceType.expenseFk"]', newServiceTypeExpense: '.vn-dialog.shown vn-autocomplete[ng-model="newServiceType.expenseFk"]',
serviceLine: 'vn-ticket-service > form > vn-card > vn-one:nth-child(2) > vn-horizontal', serviceLine: 'vn-ticket-service > form > vn-card > vn-one:nth-child(2) > vn-horizontal',
saveServiceButton: 'button[type=submit]', saveServiceButton: 'button[type=submit]',
saveServiceTypeButton: '.vn-dialog.shown tpl-buttons > button' saveServiceTypeButton: '.vn-dialog.shown tpl-buttons > button'

4
e2e/paths/02-client/01_create_client.spec.js
View File

@ -15,9 +15,7 @@ describe('Client create path', async() => {
}); });
it(`should search for the user Carol Danvers to confirm it isn't created yet`, async() => { it(`should search for the user Carol Danvers to confirm it isn't created yet`, async() => {
await page.write(selectors.clientsIndex.topbarSearch, 'Carol Danvers'); await page.doSearch('Carol Danvers');
await page.waitToClick(selectors.clientsIndex.searchButton);
await page.waitForNumberOfElements(selectors.clientsIndex.searchResult, 0);
const result = await page.countElement(selectors.clientsIndex.searchResult); const result = await page.countElement(selectors.clientsIndex.searchResult);
expect(result).toEqual(0); expect(result).toEqual(0);

1
e2e/paths/02-client/04_edit_billing_data.spec.js
View File

@ -60,7 +60,6 @@ describe('Client Edit billing data path', () => {
}); });
it(`should save the form with all its new data`, async() => { it(`should save the form with all its new data`, async() => {
await page.waitFor(3000);
await page.waitForWatcherData(selectors.clientBillingData.watcher); await page.waitForWatcherData(selectors.clientBillingData.watcher);
await page.waitToClick(selectors.clientBillingData.saveButton); await page.waitToClick(selectors.clientBillingData.saveButton);
let snackbarMessage = await page.waitForLastSnackbar(); let snackbarMessage = await page.waitForLastSnackbar();

6
e2e/paths/02-client/07_edit_web_access.spec.js
View File

@ -27,10 +27,8 @@ describe('Client Edit web access path', () => {
}); });
it('should confirm web access is now unchecked', async() => { it('should confirm web access is now unchecked', async() => {
await page.waitToClick(selectors.clientBasicData.basicDataButton); await page.accessToSection('client.card.basicData');
await page.wait(selectors.clientBasicData.name); await page.accessToSection('client.card.webAccess');
await page.waitToClick(selectors.clientsIndex.othersButton);
await page.waitToClick(selectors.clientWebAccess.webAccessButton);
const result = await page.checkboxState(selectors.clientWebAccess.enableWebAccessCheckbox); const result = await page.checkboxState(selectors.clientWebAccess.enableWebAccessCheckbox);
expect(result).toBe('unchecked'); expect(result).toBe('unchecked');

3
e2e/paths/02-client/13_log.spec.js
View File

@ -26,8 +26,7 @@ describe('Client log path', () => {
}); });
it('should navigate to the log section', async() => { it('should navigate to the log section', async() => {
await page.waitToClick(selectors.clientLog.logButton); await page.accessToSection('client.card.log');
await page.waitForState('client.card.log');
}); });
it('should check the previous value of the last logged change', async() => { it('should check the previous value of the last logged change', async() => {

12
e2e/paths/02-client/14_balance.spec.js
View File

@ -67,9 +67,7 @@ describe('Client balance path', () => {
it('should create a new payment that sets the balance to positive value', async() => { it('should create a new payment that sets the balance to positive value', async() => {
await page.waitToClick(selectors.clientBalance.newPaymentButton); await page.waitToClick(selectors.clientBalance.newPaymentButton);
await page.waitFor(3000); // didn't manage to make this dynamic to allow clearInput to find the icon clear... :( await page.overwrite(selectors.clientBalance.newPaymentAmount, '100');
await page.clearInput(selectors.clientBalance.newPaymentAmount);
await page.write(selectors.clientBalance.newPaymentAmount, '100');
await page.waitToClick(selectors.clientBalance.saveButton); await page.waitToClick(selectors.clientBalance.saveButton);
let result = await page.waitForLastSnackbar(); let result = await page.waitForLastSnackbar();
@ -85,10 +83,7 @@ describe('Client balance path', () => {
it('should create a new payment that sets the balance back to the original negative value', async() => { it('should create a new payment that sets the balance back to the original negative value', async() => {
await page.waitToClick(selectors.clientBalance.newPaymentButton); await page.waitToClick(selectors.clientBalance.newPaymentButton);
await page.waitFor(3000); // didn't manage to make this dynamic to allow clearInput to find the icon clear... :( await page.overwrite(selectors.clientBalance.newPaymentAmount, '-150');
await page.waitForSelector('.vn-dialog.vn-popup.shown', {visible: true});
await page.clearInput(selectors.clientBalance.newPaymentAmount);
await page.write(selectors.clientBalance.newPaymentAmount, '-150');
await page.waitToClick(selectors.clientBalance.saveButton); await page.waitToClick(selectors.clientBalance.saveButton);
let result = await page.waitForLastSnackbar(); let result = await page.waitForLastSnackbar();
@ -113,8 +108,7 @@ describe('Client balance path', () => {
it('should now search for the user Petter Parker', async() => { it('should now search for the user Petter Parker', async() => {
await page.accessToSearchResult('Petter Parker'); await page.accessToSearchResult('Petter Parker');
await page.waitToClick(selectors.clientBalance.balanceButton); await page.accessToSection('client.card.balance.index');
await page.waitForState('client.card.balance.index');
}); });
it('should not be able to click the new payment button as it isnt present', async() => { it('should not be able to click the new payment button as it isnt present', async() => {

5
e2e/paths/02-client/15_user_config.spec.js
View File

@ -16,7 +16,6 @@ describe('User config', () => {
describe('as salesPerson', () => { describe('as salesPerson', () => {
it('should login', async() => { it('should login', async() => {
await page.login('salesPerson'); await page.login('salesPerson');
await page.waitForContentLoaded();
}); });
it('should now open the user config form to check the settings', async() => { it('should now open the user config form to check the settings', async() => {
@ -26,7 +25,6 @@ describe('User config', () => {
let expectedLocalWarehouse = await page let expectedLocalWarehouse = await page
.expectPropertyValue(selectors.globalItems.userLocalWarehouse, 'value', ''); .expectPropertyValue(selectors.globalItems.userLocalWarehouse, 'value', '');
let expectedLocalBank = await page let expectedLocalBank = await page
.expectPropertyValue(selectors.globalItems.userLocalBank, 'value', ''); .expectPropertyValue(selectors.globalItems.userLocalBank, 'value', '');
@ -50,7 +48,6 @@ describe('User config', () => {
describe('as employee', () => { describe('as employee', () => {
it('should log in', async() => { it('should log in', async() => {
await page.login('employee'); await page.login('employee');
await page.waitForContentLoaded();
}); });
it('should open the user config form to check the settings', async() => { it('should open the user config form to check the settings', async() => {
@ -59,7 +56,6 @@ describe('User config', () => {
let expectedLocalWarehouse = await page let expectedLocalWarehouse = await page
.expectPropertyValue(selectors.globalItems.userLocalWarehouse, 'value', ''); .expectPropertyValue(selectors.globalItems.userLocalWarehouse, 'value', '');
let expectedLocalBank = await page let expectedLocalBank = await page
.expectPropertyValue(selectors.globalItems.userLocalBank, 'value', ''); .expectPropertyValue(selectors.globalItems.userLocalBank, 'value', '');
@ -92,7 +88,6 @@ describe('User config', () => {
describe('as salesPerson 2nd run', () => { describe('as salesPerson 2nd run', () => {
it('should log in once more', async() => { it('should log in once more', async() => {
await page.login('salesPerson'); await page.login('salesPerson');
await page.waitForContentLoaded();
}); });
it('should again open the user config form to check the local settings', async() => { it('should again open the user config form to check the local settings', async() => {

17
e2e/paths/04-item/01_summary.spec.js
View File

@ -15,14 +15,14 @@ describe('Item summary path', () => {
}); });
it('should search for an item', async() => { it('should search for an item', async() => {
await page.clearInput(selectors.itemsIndex.topbarSearch); await page.doSearch('Ranged weapon');
await page.write(selectors.itemsIndex.topbarSearch, 'Ranged weapon'); const nResults = await page.countElement(selectors.itemsIndex.searchResult);
await page.waitToClick(selectors.itemsIndex.searchButton);
await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3);
await page.waitForTextInElement(selectors.itemsIndex.searchResult, 'Ranged weapon'); await page.waitForTextInElement(selectors.itemsIndex.searchResult, 'Ranged weapon');
await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton); await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
const isVisible = await page.isVisible(selectors.itemSummary.basicData); const isVisible = await page.isVisible(selectors.itemSummary.basicData);
expect(nResults).toBe(3);
expect(isVisible).toBeTruthy(); expect(isVisible).toBeTruthy();
}); });
@ -67,12 +67,13 @@ describe('Item summary path', () => {
}); });
it('should search for other item', async() => { it('should search for other item', async() => {
await page.clearInput('vn-searchbar'); await page.doSearch('Melee Reinforced');
await page.write(selectors.itemsIndex.topbarSearch, 'Melee Reinforced'); const nResults = await page.countElement(selectors.itemsIndex.searchResult);
await page.keyboard.press('Enter');
await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton); await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
await page.waitForSelector(selectors.itemSummary.basicData, {visible: true}); await page.waitForSelector(selectors.itemSummary.basicData, {visible: true});
expect(nResults).toBe(2);
}); });
it(`should now check the item summary preview shows fields from basic data`, async() => { it(`should now check the item summary preview shows fields from basic data`, async() => {

28
e2e/paths/04-item/08_create_and_clone.spec.js
View File

@ -16,13 +16,10 @@ describe('Item Create/Clone path', () => {
describe('create', () => { describe('create', () => {
it(`should search for the item Infinity Gauntlet to confirm it isn't created yet`, async() => { it(`should search for the item Infinity Gauntlet to confirm it isn't created yet`, async() => {
await page.clearInput(selectors.itemsIndex.topbarSearch); await page.doSearch('Infinity Gauntlet');
await page.write(selectors.itemsIndex.topbarSearch, 'Infinity Gauntlet'); const nResults = await page.countElement(selectors.itemsIndex.searchResult);
await page.waitToClick(selectors.itemsIndex.searchButton);
await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 0);
const result = await page.countElement(selectors.itemsIndex.searchResult);
expect(result).toEqual(0); expect(nResults).toEqual(0);
}); });
it('should access to the create item view by clicking the create floating button', async() => { it('should access to the create item view by clicking the create floating button', async() => {
@ -85,13 +82,10 @@ describe('Item Create/Clone path', () => {
}); });
it(`should search for the item Infinity Gauntlet`, async() => { it(`should search for the item Infinity Gauntlet`, async() => {
await page.clearInput(selectors.itemsIndex.topbarSearch); await page.doSearch('Infinity Gauntlet');
await page.write(selectors.itemsIndex.topbarSearch, 'Infinity Gauntlet'); const nResults = await page.countElement(selectors.itemsIndex.searchResult);
await page.waitToClick(selectors.itemsIndex.searchButton);
await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1);
const result = await page.countElement(selectors.itemsIndex.searchResult);
expect(result).toEqual(1); expect(nResults).toEqual(1);
}); });
it(`should clone the Infinity Gauntlet`, async() => { it(`should clone the Infinity Gauntlet`, async() => {
@ -102,14 +96,10 @@ describe('Item Create/Clone path', () => {
}); });
it('should search for the item Infinity Gauntlet and find two', async() => { it('should search for the item Infinity Gauntlet and find two', async() => {
await page.waitToClick(selectors.itemTags.goToItemIndexButton); await page.doSearch('Infinity Gauntlet');
await page.clearInput(selectors.itemsIndex.topbarSearch); const nResults = await page.countElement(selectors.itemsIndex.searchResult);
await page.write(selectors.itemsIndex.topbarSearch, 'Infinity Gauntlet');
await page.waitToClick(selectors.itemsIndex.searchButton);
await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
const result = await page.countElement(selectors.itemsIndex.searchResult);
expect(result).toEqual(2); expect(nResults).toEqual(2);
}); });
}); });
}); });

2
e2e/paths/04-item/09_regularize.spec.js
View File

@ -65,8 +65,8 @@ describe('Item regularize path', () => {
}); });
it('should clear the user local settings now', async() => { it('should clear the user local settings now', async() => {
await page.waitForContentLoaded();
await page.waitToClick(selectors.globalItems.userMenuButton); await page.waitToClick(selectors.globalItems.userMenuButton);
await page.waitForContentLoaded();
await page.clearInput(selectors.globalItems.userConfigFirstAutocomplete); await page.clearInput(selectors.globalItems.userConfigFirstAutocomplete);
const result = await page.waitForLastSnackbar(); const result = await page.waitForLastSnackbar();

8
e2e/paths/04-item/11_item_log.spec.js
View File

@ -15,12 +15,10 @@ describe('Item log path', () => {
}); });
it(`should search for the Knowledge artifact to confirm it isn't created yet`, async() => { it(`should search for the Knowledge artifact to confirm it isn't created yet`, async() => {
await page.write(selectors.itemsIndex.topbarSearch, 'Knowledge artifact'); await page.doSearch('Knowledge artifact');
await page.waitToClick(selectors.itemsIndex.searchButton); const nResults = await page.countElement(selectors.itemsIndex.searchResult);
await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 0);
const result = await page.countElement(selectors.itemsIndex.searchResult);
expect(result).toEqual(0); expect(nResults).toEqual(0);
}); });
it('should access to the create item view by clicking the create floating button', async() => { it('should access to the create item view by clicking the create floating button', async() => {

2
e2e/paths/05-ticket/02_expeditions_and_log.spec.js
View File

@ -30,7 +30,7 @@ describe('Ticket expeditions and log path', () => {
}); });
it(`should confirm the expedition deleted is shown now in the ticket log`, async() => { it(`should confirm the expedition deleted is shown now in the ticket log`, async() => {
await page.waitToClick(selectors.ticketLog.logButton); await page.accessToSection('ticket.card.log');
const changedBy = await page const changedBy = await page
.waitToGetProperty(selectors.ticketLog.changedBy, 'innerText'); .waitToGetProperty(selectors.ticketLog.changedBy, 'innerText');

18
e2e/paths/05-ticket/09_weekly.spec.js
View File

@ -17,7 +17,6 @@ describe('Ticket descriptor path', () => {
}); });
it('should count the amount of tickets in the turns section', async() => { it('should count the amount of tickets in the turns section', async() => {
await page.waitForNumberOfElements(selectors.ticketsIndex.weeklyTicket, 5);
const result = await page.countElement(selectors.ticketsIndex.weeklyTicket); const result = await page.countElement(selectors.ticketsIndex.weeklyTicket);
expect(result).toEqual(5); expect(result).toEqual(5);
@ -87,12 +86,10 @@ describe('Ticket descriptor path', () => {
}); });
it('should now search for the weekly ticket 11', async() => { it('should now search for the weekly ticket 11', async() => {
await page.write(selectors.ticketsIndex.topbarSearch, '11'); await page.doSearch('11');
await page.waitToClick(selectors.ticketsIndex.searchButton); const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
await page.waitForNumberOfElements(selectors.ticketsIndex.searchWeeklyResult, 1);
const result = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
expect(result).toEqual(1); expect(nResults).toEqual(1);
}); });
it('should delete the weekly ticket 11', async() => { it('should delete the weekly ticket 11', async() => {
@ -104,12 +101,9 @@ describe('Ticket descriptor path', () => {
}); });
it('should confirm the sixth weekly ticket was deleted', async() => { it('should confirm the sixth weekly ticket was deleted', async() => {
await page.waitForContentLoaded(); await page.doSearch();
await page.clearInput('vn-searchbar'); const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
await page.waitToClick(selectors.ticketsIndex.searchWeeklyButton);
await page.waitForNumberOfElements(selectors.ticketsIndex.searchWeeklyResult, 5);
const result = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
expect(result).toEqual(5); expect(nResults).toEqual(5);
}); });
}); });

4
e2e/paths/05-ticket/12_descriptor.spec.js
View File

@ -99,8 +99,8 @@ describe('Ticket descriptor path', () => {
}); });
it('should delete the stowaway', async() => { it('should delete the stowaway', async() => {
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenu); await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteStowawayButton); await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteStowawayButton);
await page.waitToClick(selectors.ticketDescriptor.acceptDeleteStowawayButton); await page.waitToClick(selectors.ticketDescriptor.acceptDeleteStowawayButton);
const result = await page.waitForLastSnackbar(); const result = await page.waitForLastSnackbar();
@ -130,8 +130,8 @@ describe('Ticket descriptor path', () => {
}); });
it('should invoice the ticket using the descriptor more menu', async() => { it('should invoice the ticket using the descriptor more menu', async() => {
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenu); await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenuMakeInvoice); await page.waitToClick(selectors.ticketDescriptor.moreMenuMakeInvoice);
await page.waitToClick(selectors.ticketDescriptor.acceptInvoiceOutButton); await page.waitToClick(selectors.ticketDescriptor.acceptInvoiceOutButton);
const result = await page.waitForLastSnackbar(); const result = await page.waitForLastSnackbar();

7
e2e/paths/05-ticket/13_services.spec.js
View File

@ -81,7 +81,6 @@ describe('Ticket services path', () => {
await page.autocompleteSearch(selectors.ticketService.newServiceTypeExpense, 'Retencion'); await page.autocompleteSearch(selectors.ticketService.newServiceTypeExpense, 'Retencion');
await page.waitToClick(selectors.ticketService.saveServiceTypeButton); await page.waitToClick(selectors.ticketService.saveServiceTypeButton);
await page.write(selectors.ticketService.firstPrice, '999'); await page.write(selectors.ticketService.firstPrice, '999');
await page.waitFor(1000); // time needed for the button to be clickable
await page.waitToClick(selectors.ticketService.saveServiceButton); await page.waitToClick(selectors.ticketService.saveServiceButton);
const result = await page.waitForLastSnackbar(); const result = await page.waitForLastSnackbar();
@ -120,7 +119,6 @@ describe('Ticket services path', () => {
it('should delete the service', async() => { it('should delete the service', async() => {
await page.waitToClick(selectors.ticketService.fistDeleteServiceButton); await page.waitToClick(selectors.ticketService.fistDeleteServiceButton);
await page.waitForNumberOfElements(selectors.ticketService.serviceLine, 0); await page.waitForNumberOfElements(selectors.ticketService.serviceLine, 0);
await page.waitFor(1000); // without this wait it fails to click the save button
await page.waitToClick(selectors.ticketService.saveServiceButton); await page.waitToClick(selectors.ticketService.saveServiceButton);
const result = await page.waitForLastSnackbar(); const result = await page.waitForLastSnackbar();
@ -129,10 +127,9 @@ describe('Ticket services path', () => {
it(`should confirm the service was removed`, async() => { it(`should confirm the service was removed`, async() => {
await page.reloadSection('ticket.card.service'); await page.reloadSection('ticket.card.service');
await page.waitForNumberOfElements(selectors.ticketService.serviceLine, 0); const nResults = await page.countElement(selectors.ticketService.serviceLine);
const result = await page.countElement(selectors.ticketService.serviceLine);
expect(result).toEqual(0); expect(nResults).toEqual(0);
}); });
}); });
}); });

1
e2e/paths/05-ticket/17_log.spec.js
View File

@ -34,7 +34,6 @@ describe('Ticket log path', () => {
it('should navigate to the log section', async() => { it('should navigate to the log section', async() => {
await page.accessToSection('ticket.card.log'); await page.accessToSection('ticket.card.log');
await page.waitForState('ticket.card.log');
}); });
it('should set the viewport width to 1920 to see the table full width', async() => { it('should set the viewport width to 1920 to see the table full width', async() => {

4
e2e/paths/05-ticket/18_index_payout.spec.js
View File

@ -16,9 +16,7 @@ describe('Ticket index payout path', () => {
it('should navigate to the ticket index', async() => { it('should navigate to the ticket index', async() => {
await page.loginAndModule('administrative', 'ticket'); await page.loginAndModule('administrative', 'ticket');
let url = await page.expectURL('#!/ticket/index'); await page.waitForState('ticket.index');
expect(url).toBe(true);
}); });
it('should check three tickets 2 of a clinet and 1 of another', async() => { it('should check three tickets 2 of a clinet and 1 of another', async() => {

5
e2e/paths/06-claim/04_claim_action.spec.js
View File

@ -25,7 +25,10 @@ describe('Claim action path', () => {
}); });
it('should import the second importable ticket', async() => { it('should import the second importable ticket', async() => {
await page.waitFor(3000); // the animation adding the header element for the claimed total obscures somehow other elements for about 2 seconds // the animation adding the header element for the claimed total
// obscures somehow other elements for about 2 seconds
await page.waitFor(3000);
await page.waitToClick(selectors.claimAction.importTicketButton); await page.waitToClick(selectors.claimAction.importTicketButton);
await page.waitToClick(selectors.claimAction.secondImportableTicket); await page.waitToClick(selectors.claimAction.secondImportableTicket);
const result = await page.waitForLastSnackbar(); const result = await page.waitForLastSnackbar();

8
e2e/paths/06-claim/06_descriptor.spec.js
View File

@ -50,11 +50,9 @@ describe('claim Descriptor path', () => {
}); });
it(`should search for the deleted claim to find no results`, async() => { it(`should search for the deleted claim to find no results`, async() => {
await page.write(selectors.claimsIndex.searchClaimInput, claimId); await page.doSearch(claimId);
await page.waitToClick(selectors.claimsIndex.searchButton); const nResults = await page.countElement(selectors.claimsIndex.searchResult);
await page.waitForNumberOfElements(selectors.claimsIndex.searchResult, 0);
const result = await page.countElement(selectors.claimsIndex.searchResult);
expect(result).toEqual(0); expect(nResults).toEqual(0);
}); });
}); });

1
e2e/paths/08-route/03_create.spec.js
View File

@ -17,7 +17,6 @@ describe('Route create path', () => {
describe('as employee', () => { describe('as employee', () => {
it('should click on the add new route button and open the creation form', async() => { it('should click on the add new route button and open the creation form', async() => {
await page.waitForContentLoaded();
await page.waitToClick(selectors.routeIndex.addNewRouteButton); await page.waitToClick(selectors.routeIndex.addNewRouteButton);
await page.waitForState('route.create'); await page.waitForState('route.create');
}); });

18
e2e/paths/09-invoice-out/02_descriptor.spec.js
View File

@ -50,12 +50,10 @@ describe('InvoiceOut descriptor path', () => {
}); });
it(`should search for the deleted invouceOut to find no results`, async() => { it(`should search for the deleted invouceOut to find no results`, async() => {
await page.write(selectors.invoiceOutIndex.topbarSearch, 'T2222222'); await page.doSearch('T2222222');
await page.waitToClick(selectors.invoiceOutIndex.searchButton); const nResults = await page.countElement(selectors.invoiceOutIndex.searchResult);
await page.waitForNumberOfElements(selectors.invoiceOutIndex.searchResult, 0);
const result = await page.countElement(selectors.invoiceOutIndex.searchResult);
expect(result).toEqual(0); expect(nResults).toEqual(0);
}); });
it('should navigate to the ticket index', async() => { it('should navigate to the ticket index', async() => {
@ -66,17 +64,13 @@ describe('InvoiceOut descriptor path', () => {
}); });
it('should search for tickets with an specific invoiceOut to find no results', async() => { it('should search for tickets with an specific invoiceOut to find no results', async() => {
await page.waitToClick(selectors.ticketsIndex.openAdvancedSearchButton); await page.doSearch('T2222222');
await page.write(selectors.ticketsIndex.advancedSearchInvoiceOut, 'T2222222'); const nResults = await page.countElement(selectors.ticketsIndex.searchResult);
await page.waitToClick(selectors.ticketsIndex.advancedSearchButton);
await page.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 0);
const result = await page.countElement(selectors.ticketsIndex.searchResult);
expect(result).toEqual(0); expect(nResults).toEqual(0);
}); });
it('should now navigate to the invoiceOut index', async() => { it('should now navigate to the invoiceOut index', async() => {
await page.waitForContentLoaded();
await page.waitToClick(selectors.globalItems.applicationsMenuButton); await page.waitToClick(selectors.globalItems.applicationsMenuButton);
await page.wait(selectors.globalItems.applicationsMenuVisible); await page.wait(selectors.globalItems.applicationsMenuVisible);
await page.waitToClick(selectors.globalItems.invoiceOutButton); await page.waitToClick(selectors.globalItems.invoiceOutButton);

1
front/core/components/autocomplete/index.html
View File

@ -1,5 +1,6 @@
<div <div
class="container" class="container"
tabindex="-1"
ng-click="$ctrl.onContainerClick($event)" ng-click="$ctrl.onContainerClick($event)"
ng-keydown="$ctrl.onContainerKeyDown($event)"> ng-keydown="$ctrl.onContainerKeyDown($event)">
<div <div

19
front/core/components/button/style.scss
View File

@ -6,10 +6,10 @@
justify-content: center; justify-content: center;
height: 36px; height: 36px;
border: none; border: none;
border-radius: .1em; border-radius: 1px;
font-family: vn-font-bold; font-family: vn-font-bold;
text-transform: uppercase; text-transform: uppercase;
font-size: 14px; font-size: .87rem;
cursor: pointer; cursor: pointer;
box-sizing: border-box; box-sizing: border-box;
outline: none; outline: none;
@ -34,13 +34,12 @@
& > vn-icon { & > vn-icon {
vertical-align: middle; vertical-align: middle;
color: inherit; color: inherit;
font-size: 1.7em;
} }
} }
&.colored { &.colored {
color: white; color: white;
background-color: $color-button; background-color: $color-button;
box-shadow: 0 .15em .15em 0 rgba(0, 0, 0, .3); box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .3);
transition: background 200ms ease-in-out; transition: background 200ms ease-in-out;
&:not(.disabled) { &:not(.disabled) {
@ -80,27 +79,27 @@
} }
&.round { &.round {
border-radius: 50%; border-radius: 50%;
height: 3.8em; height: 54px;
width: 3.8em; width: 54px;
& > button > span { & > button > span {
display: none; display: none;
} }
&.xs { &.xs {
font-size: 0.5em; font-size: .5rem;
} }
&.sm { &.sm {
font-size: 0.7em; font-size: .7rem;
} }
&.md { &.md {
font-size: 0.9em; font-size: .875rem;
} }
&.lg { &.lg {
font-size: 1.2em; font-size: 1.2rem;
} }
} }
&.disabled { &.disabled {

18
front/core/components/calendar/style.scss
View File

@ -6,14 +6,14 @@
& > div { & > div {
& > .header { & > .header {
display: flex; display: flex;
margin-bottom: 0.5em; margin-bottom: 8px;
align-items: center; align-items: center;
height: 2.4em; height: 38px;
& > .title { & > .title {
flex: 1; flex: 1;
text-align: center; text-align: center;
padding: 0.2em 0; padding: 3px 0;
} }
& > .vn-button { & > .vn-button {
color: inherit; color: inherit;
@ -22,10 +22,10 @@
& > .weekdays { & > .weekdays {
display: flex; display: flex;
color: $color-font-secondary; color: $color-font-secondary;
margin-bottom: 0.5em; margin-bottom: 8px;
padding: 0.5em 0; padding: 8px 0;
font-weight: bold; font-weight: bold;
font-size: 0.8em; font-size: .8rem;
text-align: center; text-align: center;
& > section { & > section {
@ -62,9 +62,9 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 50%; border-radius: 50%;
font-size: 14px; font-size: .9rem;
width: 2.2em; width: 30px;
height: 2.2em; height: 30px;
cursor: pointer; cursor: pointer;
outline: 0; outline: 0;
transition: background-color 300ms ease-in-out; transition: background-color 300ms ease-in-out;

28
front/core/components/chip/style.scss
View File

@ -1,23 +1,23 @@
@import "variables"; @import "variables";
vn-chip { vn-chip {
border-radius: 1em; border-radius: 16px;
background-color: $color-bg; background-color: $color-bg;
color: $color-font; color: $color-font;
font-size: .9rem; font-size: .9rem;
margin: .25em; margin: 4px;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
height: 2em; height: 28px;
max-width: 100%; max-width: 100%;
box-sizing: border-box; box-sizing: border-box;
&.small { &.small {
height: 1.5em; height: 24px;
& > div { & > div {
padding: 0.6em; padding: 9px;
font-size: 0.8rem; font-size: .8rem;
} }
} }
@ -46,22 +46,22 @@ vn-chip {
display: flex; display: flex;
align-items: center; align-items: center;
height: 100%; height: 100%;
padding: 0 .7em; padding: 0 11px;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
& > vn-avatar { & > vn-avatar {
margin-left: -0.7em; margin-left: -11px;
margin-right: .3em; margin-right: 6px;
vertical-align: middle; vertical-align: middle;
height: 2em; height: 28px;
width: 2em; width: 28px;
} }
} }
& > vn-icon { & > vn-icon {
margin-right: .12em; margin-right: 2px;
margin-left: -.12em; margin-left: -2px;
vertical-align: middle; vertical-align: middle;
opacity: .6; opacity: .6;
cursor: pointer; cursor: pointer;
@ -76,6 +76,6 @@ vn-chip {
vn-avatar { vn-avatar {
display: inline-block; display: inline-block;
min-width: 2em; min-width: 28px;
border-radius: 50%; border-radius: 50%;
} }

5
front/core/components/confirm/confirm.js
View File

@ -6,10 +6,7 @@ import './style.scss';
export default class Confirm extends Dialog { export default class Confirm extends Dialog {
constructor($element, $, $transclude) { constructor($element, $, $transclude) {
super($element, $, $transclude); super($element, $, $transclude);
this.fillSlots(template);
let $template = angular.element(template);
this.fillSlot('body', $template.find('tpl-body'));
this.fillSlot('buttons', $template.find('tpl-buttons'));
} }
} }

2
front/core/components/confirm/style.scss
View File

@ -1,3 +1,3 @@
.vn-confirm .window { .vn-confirm .window {
max-width: 30em max-width: 480px
} }

4
front/core/components/data-viewer/style.scss
View File

@ -6,9 +6,9 @@ vn-data-viewer {
& > .empty-rows { & > .empty-rows {
display: block; display: block;
text-align: center; text-align: center;
padding: 1.5em; padding: 24px;
box-sizing: border-box; box-sizing: border-box;
color: $color-font-secondary; color: $color-font-secondary;
font-size: 1.4em; font-size: 1.375rem;
} }
} }

16
front/core/components/debug-info/style.scss
View File

@ -2,10 +2,10 @@
vn-debug-info { vn-debug-info {
position: fixed; position: fixed;
bottom: 1em; bottom: 16px;
left: 1em; left: 16px;
padding: 1em; padding: 16px;
min-width: 8em; min-width: 128px;
background-color: #3f51b5; background-color: #3f51b5;
color: $color-font-dark; color: $color-font-dark;
border-radius: 4px; border-radius: 4px;
@ -19,7 +19,7 @@ vn-debug-info {
& > h6 { & > h6 {
font-weight: normal; font-weight: normal;
color: rgba(255, 255, 255, .5); color: rgba(255, 255, 255, .5);
font-size: 1em; font-size: 1rem;
} }
ul { ul {
list-style-type: none; list-style-type: none;
@ -27,11 +27,11 @@ vn-debug-info {
margin: 0; margin: 0;
& > li { & > li {
margin-top: .2em; margin-top: 3px;
font-size: .95em; font-size: .94rem;
& > span { & > span {
padding: .05em .2em; padding: 1px 3px;
border-radius: 4px; border-radius: 4px;
transition: background-color 200ms ease-in-out; transition: background-color 200ms ease-in-out;

21
front/core/components/dialog/index.js
View File

@ -21,6 +21,17 @@ export default class Dialog extends Popup {
this.fillDefaultSlot(template); this.fillDefaultSlot(template);
} }
/**
* Fills the dialog slots, it is intended to be used by child classes.
*
* @param {String} template The HTML template string
*/
fillSlots(template) {
let $template = angular.element(template);
this.fillSlot('body', $template.find('tpl-body'));
this.fillSlot('buttons', $template.find('tpl-buttons'));
}
/** /**
* Shows the dialog and optionally registers a handler for the response. * Shows the dialog and optionally registers a handler for the response.
* *
@ -68,7 +79,17 @@ export default class Dialog extends Popup {
respond(response) { respond(response) {
if (!this.shown) if (!this.shown)
return this.$q.resolve(); return this.$q.resolve();
return this.responseHandler(response);
}
/**
* The default response handler, it can be overriden by child classes to
* add custom logic.
*
* @param {String} response The response code
* @return {Boolean} The response handler return
*/
responseHandler(response) {
let handlerArgs = { let handlerArgs = {
$response: response, $response: response,
$data: this.data $data: this.data

16
front/core/components/dialog/style.scss
View File

@ -8,11 +8,11 @@
text-transform: uppercase; text-transform: uppercase;
background-color: transparent; background-color: transparent;
border: none; border: none;
border-radius: .1em; border-radius: 1px;
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
padding: .3em; padding: 4px;
color: #666; color: #666;
} }
& > form { & > form {
@ -20,11 +20,11 @@
& > .body > tpl-body { & > .body > tpl-body {
display: block; display: block;
min-width: 16em; min-width: 256px;
} }
& > .buttons > tpl-buttons { & > .buttons > tpl-buttons {
display: block; display: block;
margin-top: 1.5em; margin-top: 24px;
text-align: right; text-align: right;
button, button,
@ -35,12 +35,12 @@
text-transform: uppercase; text-transform: uppercase;
background-color: transparent; background-color: transparent;
border: none; border: none;
border-radius: .1em; border-radius: 1px;
color: $color-button; color: $color-button;
font-family: vn-font-bold; font-family: vn-font-bold;
padding: .7em; padding: 11px;
margin: -0.7em; margin: -11px;
margin-left: .7em; margin-left: 11px;
} }
} }
} }

14
front/core/components/drop-down/style.scss
View File

@ -19,13 +19,13 @@
display: none; display: none;
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: .5em; right: 8px;
top: .6em; top: 9px;
height: 1em; height: 16px;
color: #888; color: #888;
border-radius: 50%; border-radius: 50%;
background-color: rgba(255, 255, 255, .8); background-color: rgba(255, 255, 255, .8);
font-size: 18px; font-size: 1.125rem;
&:hover { &:hover {
color: $color-font; color: $color-font;
@ -36,7 +36,7 @@
} }
} }
& > .list { & > .list {
max-height: 20em; max-height: 320px;
overflow: auto; overflow: auto;
ul { ul {
@ -46,13 +46,13 @@
} }
li, .status { li, .status {
@extend %clickable; @extend %clickable;
padding: .6em; padding: 9px;
white-space: nowrap; white-space: nowrap;
display: flex; display: flex;
& > input[type=checkbox] { & > input[type=checkbox] {
margin: 0; margin: 0;
margin-right: .6em; margin-right: 9px;
} }
&.active { &.active {
@extend %active; @extend %active;

2
front/core/components/field/index.html
View File

@ -1,4 +1,4 @@
<div class="container"> <div class="container" tabindex="-1">
<div <div
ng-transclude="prepend" ng-transclude="prepend"
class="prepend"> class="prepend">

24
front/core/components/field/index.js
View File

@ -9,20 +9,17 @@ export default class Field extends FormInput {
this.prefix = null; this.prefix = null;
this.suffix = null; this.suffix = null;
this.control = this.element.querySelector('.control');
this.element.addEventListener('click', e => this.onClick(e));
this.container = this.element.querySelector('.container'); this.container = this.element.querySelector('.container');
this.container.addEventListener('mousedown', e => this.onMouseDown(e)); this.container.addEventListener('focusout', () => this.onFocus(false));
this.container.addEventListener('focusin', () => this.onFocus(true));
this.control = this.element.querySelector('.control');
} }
$onInit() { $onInit() {
super.$onInit(); super.$onInit();
if (this.info) this.classList.add('has-icons'); if (this.info) this.classList.add('has-icons');
this.input.addEventListener('focus', () => this.onFocus(true));
this.input.addEventListener('blur', () => this.onFocus(false));
this.input.addEventListener('change', () => this.onChange()); this.input.addEventListener('change', () => this.onChange());
} }
@ -160,19 +157,6 @@ export default class Field extends FormInput {
fix.innerText = text || ''; fix.innerText = text || '';
} }
onClick() {
// if (event.defaultPrevented) return;
if (this.input !== document.activeElement)
this.focus();
}
onMouseDown(event) {
if (event.target == this.input) return;
event.preventDefault();
this.focus();
}
onFocus(hasFocus) { onFocus(hasFocus) {
this.classList.toggle('focused', hasFocus); this.classList.toggle('focused', hasFocus);
} }

10
front/core/components/field/style.scss
View File

@ -9,6 +9,7 @@
display: flex; display: flex;
align-items: stretch; align-items: stretch;
position: relative; position: relative;
outline: none;
& > .infix { & > .infix {
position: relative; position: relative;
@ -30,7 +31,6 @@
& > .required { & > .required {
display: none; display: none;
color: $color-alert
} }
} }
& > .fix { & > .fix {
@ -135,7 +135,7 @@
align-items: center; align-items: center;
& > vn-icon { & > vn-icon {
font-size: 24px; font-size: 1.5rem;
} }
} }
& > .prepend > prepend { & > .prepend > prepend {
@ -197,7 +197,7 @@
} }
} }
&.standout { &.standout {
border-radius: .1em; border-radius: 1px;
background-color: rgba(255, 255, 255, .1); background-color: rgba(255, 255, 255, .1);
padding: 0 12px; padding: 0 12px;
transition-property: background-color, color; transition-property: background-color, color;
@ -248,7 +248,7 @@
top: 5px; top: 5px;
color: $color-primary; color: $color-primary;
padding: 0; padding: 0;
font-size: 12px; font-size: .75rem;
} }
& > .control > * { & > .control > * {
&[type=time], &[type=time],
@ -298,7 +298,7 @@
padding: 4px 0; padding: 4px 0;
height: 12px; height: 12px;
color: rgba(0, 0, 0, .4); color: rgba(0, 0, 0, .4);
font-size: 12px; font-size: .75rem;
transform: translateY(-12px); transform: translateY(-12px);
transition-property: opacity, transform, color; transition-property: opacity, transform, color;
transition-duration: 200ms; transition-duration: 200ms;

2
front/core/components/icon-button/style.scss
View File

@ -5,7 +5,7 @@
color: $color-button; color: $color-button;
& > button { & > button {
padding: .2em !important; padding: 3px !important;
} }
&:focus { &:focus {
opacity: .6; opacity: .6;

2
front/core/components/icon/style.scss
View File

@ -1,6 +1,6 @@
vn-icon { vn-icon {
display: inline-block; display: inline-block;
font-size: 18pt; font-size: 1.7em;
text-align: center; text-align: center;
outline: 0; outline: 0;

2
front/core/components/input-number/index.html
View File

@ -1,4 +1,4 @@
<div class="container"> <div class="container" tabindex="-1">
<div <div
ng-transclude="prepend" ng-transclude="prepend"
class="prepend"> class="prepend">

2
front/core/components/label-value/style.scss
View File

@ -4,6 +4,6 @@ vn-label-value > section {
& > vn-icon { & > vn-icon {
vertical-align: middle; vertical-align: middle;
color: $color-font-secondary; color: $color-font-secondary;
font-size: 1.2em font-size: 1.2rem
} }
} }

8
front/core/components/list/style.scss
View File

@ -11,7 +11,7 @@ ul.menu {
@extend %clickable; @extend %clickable;
display: block; display: block;
color: inherit; color: inherit;
padding: .6em 2em; padding: 9px 32px;
} }
} }
*/ */
@ -76,7 +76,7 @@ vn-item,
margin-right: $spacing-md; margin-right: $spacing-md;
& > .vn-icon { & > .vn-icon {
font-size: 1.2em; font-size: 1.2rem;
} }
} }
&[side] { &[side] {
@ -86,10 +86,10 @@ vn-item,
& > .vn-button { & > .vn-button {
opacity: .4; opacity: .4;
margin-left: .5em; margin-left: 8px;
transition: opacity 250ms ease-out; transition: opacity 250ms ease-out;
padding: 0; padding: 0;
font-size: 1.05em; font-size: 1rem;
&:hover { &:hover {
opacity: 1; opacity: 1;

2
front/core/components/multi-check/style.scss
View File

@ -1,5 +1,5 @@
vn-multi-check { vn-multi-check {
.vn-check { .vn-check {
margin-bottom: 0.8em margin-bottom: 12px
} }
} }

2
front/core/components/pagination/style.scss
View File

@ -4,7 +4,7 @@ vn-pagination {
text-align: center; text-align: center;
& > div > vn-icon-button { & > div > vn-icon-button {
font-size: 2em; font-size: 2rem;
padding: 0; padding: 0;
} }
} }

14
front/core/components/popover/style.scss
View File

@ -10,7 +10,7 @@
color: $color-font; color: $color-font;
opacity: 0; opacity: 0;
transform: translateY(-.6em); transform: translateY(-9px);
transition-property: opacity, transform; transition-property: opacity, transform;
transition-duration: 200ms; transition-duration: 200ms;
transition-timing-function: ease-in-out; transition-timing-function: ease-in-out;
@ -21,21 +21,21 @@
} }
& > .window { & > .window {
position: absolute; position: absolute;
box-shadow: 0 .1em .4em $color-shadow; box-shadow: 0 1px 6px $color-shadow;
z-index: 0; z-index: 0;
& > .arrow { & > .arrow {
width: 1em; width: 16px;
height: 1em; height: 16px;
margin: -.5em; margin: -8px;
background-color: $color-bg-panel; background-color: $color-bg-panel;
box-shadow: 0 .1em .4em $color-shadow; box-shadow: 0 1px 6px $color-shadow;
position: absolute; position: absolute;
transform: rotate(45deg); transform: rotate(45deg);
z-index: -1; z-index: -1;
} }
& > .content { & > .content {
border-radius: .1em; border-radius: 1px;
background-color: $color-bg-panel; background-color: $color-bg-panel;
height: inherit; height: inherit;
overflow: auto; overflow: auto;

1
front/core/components/popup/index.html
View File

@ -2,6 +2,7 @@
<div <div
class="window" class="window"
ng-mousedown="$ctrl.onWindowMouseDown($event)" ng-mousedown="$ctrl.onWindowMouseDown($event)"
tabindex="-1"
ng-transclude> ng-transclude>
</div> </div>
</div> </div>

1
front/core/components/popup/index.js
View File

@ -51,6 +51,7 @@ export default class Popup extends Component {
{parentBoundTranscludeFn: this.$transclude} {parentBoundTranscludeFn: this.$transclude}
)[0]; )[0];
this.windowEl = this.popup.querySelector('.window'); this.windowEl = this.popup.querySelector('.window');
this.windowEl.focus();
let classList = this.popup.classList; let classList = this.popup.classList;
classList.add(this.displayMode); classList.add(this.displayMode);

7
front/core/components/popup/style.scss
View File

@ -19,19 +19,20 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: rgba(0, 0, 0, .6); background-color: rgba(0, 0, 0, .6);
padding: 1em; padding: 16px;
box-sizing: border-box; box-sizing: border-box;
& > .window { & > .window {
position: relative; position: relative;
box-shadow: 0 0 .4em $color-shadow; box-shadow: 0 0 6px $color-shadow;
background-color: $color-bg-panel; background-color: $color-bg-panel;
border-radius: .2em; border-radius: 3px;
overflow: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
max-height: 100%; max-height: 100%;
transform: scale3d(.9, .9, .9); transform: scale3d(.9, .9, .9);
transition: transform 200ms ease-in-out; transition: transform 200ms ease-in-out;
outline: none;
} }
&.shown > .window { &.shown > .window {
transform: scale3d(1, 1, 1); transform: scale3d(1, 1, 1);

4
front/core/components/range/style.scss
View File

@ -37,7 +37,7 @@
.vn-range { .vn-range {
& > label { & > label {
font-size: 12px; font-size: .75rem;
&.main { &.main {
color: $color-button; color: $color-button;
@ -57,7 +57,7 @@
background: transparent; background: transparent;
border-color: transparent; border-color: transparent;
-webkit-appearance: none; -webkit-appearance: none;
margin: .2em 0; margin: 3px 0;
&:focus { &:focus {
outline: none; outline: none;

4
front/core/components/scroll-up/style.scss
View File

@ -1,6 +1,6 @@
vn-scroll-up { vn-scroll-up {
top: 5.5em; top: 88px;
right: 2em; right: 32px;
display: none; display: none;
position: fixed; position: fixed;
} }

16
front/core/components/searchbar/style.scss
View File

@ -2,24 +2,24 @@
vn-searchbar { vn-searchbar {
display: block; display: block;
max-width: 35em; max-width: 560px;
margin: 0 auto; margin: 0 auto;
.search-params { .search-params {
flex: 1; flex: 1;
margin: .05em 0; margin: 1px 0;
overflow: visible; overflow: visible;
display: flex; display: flex;
max-width: 24em; max-width: 384px;
& > .search-param { & > .search-param {
color: rgba(0, 0, 0, .6); color: rgba(0, 0, 0, .6);
background-color: rgba(0, 0, 0, .1); background-color: rgba(0, 0, 0, .1);
padding: .1em .4em; padding: 1px 6px;
margin-left: .2em; margin-left: 3px;
display: inline-block; display: inline-block;
border-radius: .8em; border-radius: 12px;
max-width: 12em; max-width: 192px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -39,7 +39,7 @@ vn-searchbar {
} }
.search-panel { .search-panel {
max-height: 48em; max-height: 768px;
& > form { & > form {
padding: $spacing-lg; padding: $spacing-lg;

34
front/core/components/snackbar/style.scss
View File

@ -1,33 +1,33 @@
@import "variables"; @import "variables";
vn-snackbar #shapes { vn-snackbar #shapes {
max-height: 20.625em; max-height: 330px;
margin-left: -12.5em; margin-left: -160px;
position: fixed; position: fixed;
z-index: 100; z-index: 100;
width: 25em; width: 320px;
left: 50%; left: 50%;
bottom: 0 bottom: 0
} }
vn-snackbar .shape { vn-snackbar .shape {
background-color: rgba(0, 0, 0, 0.8); background-color: rgba(0, 0, 0, .8);
box-shadow: 0 0 .4em $color-shadow; box-shadow: 0 0 6px $color-shadow;
transition: transform 300ms ease-in-out; transition: transform 300ms ease-in-out;
transform: translateY(20em); transform: translateY(320px);
box-sizing: border-box; box-sizing: border-box;
border-radius: .2em; border-radius: 3px;
margin-bottom: 15px; margin-bottom: 15px;
color: white; color: white;
padding: 0.8em; padding: 12px;
& > .text { & > .text {
text-align: center; text-align: center;
vn-chip { vn-chip {
position: absolute; position: absolute;
left: -1em; left: -16px;
top: -1em; top: -16px;
} }
} }
@ -36,32 +36,32 @@ vn-snackbar .shape {
} }
&.success { &.success {
background-color: rgba(163, 209, 49, 0.8); background-color: rgba(163, 209, 49, .8);
color: #445911; color: #445911;
& > button { & > button {
color: rgba(1, 1, 1, 0.6); color: rgba(1, 1, 1, .6);
} }
} }
&.error { &.error {
background-color: rgba(198, 40, 40, 0.8); background-color: rgba(198, 40, 40, .8);
& > button { & > button {
color: rgba(1, 1, 1, 0.6); color: rgba(1, 1, 1, .6);
} }
} }
& > button { & > button {
background-color: transparent; background-color: transparent;
text-transform: uppercase; text-transform: uppercase;
margin-left: .5em; margin-left: 8px;
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;
color: $color-main; color: $color-main;
float: right; float: right;
border: none; border: none;
padding: .5em; padding: 8px;
margin: -.5em margin: -8px;
} }
} }

6
front/core/components/step-control/style.scss
View File

@ -22,11 +22,11 @@ vn-step-control {
border: 2px solid $color-main; border: 2px solid $color-main;
background-color: white; background-color: white;
align-content: center; align-content: center;
margin-top: -9.5px; margin-top: -10px;
border-radius: 50%; border-radius: 50%;
cursor: pointer; cursor: pointer;
height: 15px; height: 15px;
width: 15px width: 15px;
} }
& > .steps > .step .circle.active { & > .steps > .step .circle.active {
background-color: $color-main; background-color: $color-main;
@ -36,7 +36,7 @@ vn-step-control {
flex: auto; flex: auto;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
margin-top: 10px margin-top: 10px;
} }
& > .buttons > .step { & > .buttons > .step {
display: flex display: flex

30
front/core/components/table/style.scss
View File

@ -14,7 +14,7 @@ vn-table {
& > vn-thead, & > vn-thead,
& > thead { & > thead {
display: table-header-group; display: table-header-group;
border-bottom: .15em solid $color-spacer; border-bottom: 2px solid $color-spacer;
& > * > th { & > * > th {
font-weight: normal; font-weight: normal;
@ -52,14 +52,14 @@ vn-table {
} }
& > vn-tfoot, & > vn-tfoot,
& > tfoot { & > tfoot {
border-top: .15em solid $color-spacer; border-top: 2px solid $color-spacer;
display: table-footer-group display: table-footer-group
} }
& > * > vn-tr, & > * > vn-tr,
& > * > a.vn-tr, & > * > a.vn-tr,
& > * > tr { & > * > tr {
display: table-row; display: table-row;
height: 3em; height: 48px;
} }
vn-thead, vn-tbody, vn-tfoot, vn-thead, vn-tbody, vn-tfoot,
thead, tbody, tfoot { thead, tbody, tfoot {
@ -69,8 +69,8 @@ vn-table {
& > vn-th, & > vn-th,
& > th { & > th {
color: $color-font-light; color: $color-font-light;
padding-top: 1em; padding-top: 16px;
padding-bottom: .8em; padding-bottom: 12px;
} }
& > vn-th, & > vn-th,
& > vn-td, & > vn-td,
@ -86,14 +86,14 @@ vn-table {
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
text-align: left; text-align: left;
padding: .6em .5em; padding: 9px 8px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 5em; max-width: 80px;
&[number] { &[number] {
text-align: right; text-align: right;
width: 6em; width: 96px;
} }
&[center] { &[center] {
text-align: center; text-align: center;
@ -103,7 +103,7 @@ vn-table {
text-align: center; text-align: center;
} }
&[expand] { &[expand] {
max-width: 25em; max-width: 400px;
min-width: 0; min-width: 0;
} }
vn-icon.bright, i.bright { vn-icon.bright, i.bright {
@ -111,10 +111,10 @@ vn-table {
} }
} }
& > :last-child { & > :last-child {
padding-right: 1.4em; padding-right: 22px;
} }
& > :first-child { & > :first-child {
padding-left: 1.4em; padding-left: 22px;
} }
} }
& > a.vn-tr { & > a.vn-tr {
@ -123,7 +123,7 @@ vn-table {
} }
vn-tbody > *, vn-tbody > *,
tbody > * { tbody > * {
border-bottom: .1em solid $color-spacer-light; border-bottom: 1px solid $color-spacer-light;
&:last-child { &:last-child {
border-bottom: none; border-bottom: none;
@ -134,8 +134,8 @@ vn-table {
& > vn-td, & > vn-td,
& > td { & > td {
.chip { .chip {
padding: .3em; padding: 4px;
border-radius: .3em; border-radius: 4px;
color: $color-font-bg; color: $color-font-bg;
&.notice { &.notice {
@ -158,7 +158,7 @@ vn-table {
vn-icon-menu { vn-icon-menu {
display: inline-block; display: inline-block;
color: $color-main; color: $color-main;
padding: .25em padding: 4px
} }
} }
& > [actions] { & > [actions] {

12
front/core/components/td-editable/style.scss
View File

@ -8,7 +8,7 @@ vn-td-editable {
text { text {
border: 1px dashed rgba(0, 0, 0, .15); border: 1px dashed rgba(0, 0, 0, .15);
border-radius: 1em; border-radius: 16px;
padding: 5px 10px; padding: 5px 10px;
min-height: 15px; min-height: 15px;
display: block; display: block;
@ -36,16 +36,16 @@ vn-td-editable {
left: 0; left: 0;
box-sizing: border-box; box-sizing: border-box;
align-items: center; align-items: center;
padding: .6em; padding: 9px;
overflow: visible; overflow: visible;
& > field { & > field {
flex: 1; flex: 1;
background-color: $color-bg-panel; background-color: $color-bg-panel;
padding: .5em; padding: 8px;
box-shadow: 0 0 .4em rgba(0, 0, 0, .2); box-shadow: 0 0 6px rgba(0, 0, 0, .2);
border-radius: .1em; border-radius: 1px;
min-width: 6em; min-width: 96px;
& > * { & > * {
width: 100%; width: 100%;

2
front/core/components/toggle/style.scss
View File

@ -22,7 +22,7 @@
height: 20px; height: 20px;
min-width: 20px; min-width: 20px;
margin: 6px 0; margin: 6px 0;
margin-right: .6em; margin-right: 9px;
border: 2px solid #666; border: 2px solid #666;
} }
& > .btn > .focus-mark { & > .btn > .focus-mark {

2
front/core/components/tooltip/style.scss
View File

@ -6,7 +6,7 @@
z-index: 150; z-index: 150;
background-color: $color-bg-dark; background-color: $color-bg-dark;
color: $color-active-font; color: $color-active-font;
border-radius: .2em; border-radius: 3px;
&.show { &.show {
display: inherit; display: inherit;

4
front/core/components/treeview/style.scss
View File

@ -11,7 +11,7 @@ vn-treeview-childs {
list-style: none; list-style: none;
ul { ul {
padding-left: 2.2em; padding-left: 35px;
} }
} }
} }
@ -37,7 +37,7 @@ vn-treeview-childs {
vn-treeview-child { vn-treeview-child {
line-height: 38px; line-height: 38px;
font-size: 16px; font-size: 1rem;
display: block; display: block;
.node { .node {

8
front/core/components/wday-picker/style.scss
View File

@ -9,11 +9,11 @@
& > span { & > span {
@extend %clickable; @extend %clickable;
border-radius: 50%; border-radius: 50%;
padding: .4em; padding: 6px;
margin: .2em; margin: 3px;
display: inline-flex; display: inline-flex;
width: 1.5em; width: 24px;
height: 1.5em; height: 24px;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
outline: none; outline: none;

4
front/core/directives/droppable.scss
View File

@ -5,8 +5,8 @@
.vn-draggable, .vn-draggable,
[vn-droppable] { [vn-droppable] {
border: 2px dashed transparent; border: 2px dashed transparent;
border-radius: 0.5em; border-radius: 8px;
transition: all 0.5s; transition: all .5s;
} }
.vn-droppable, .vn-droppable,

20
front/core/directives/focus.js
View File

@ -1,11 +1,11 @@
import ngModule from '../module'; import ngModule from '../module';
import isMobile from '../lib/is-mobile'; import isMobile from '../lib/is-mobile';
export function focus($scope, input) { export function focus($timeout, input) {
if (isMobile) return; if (isMobile) return;
const element = input; const element = input;
let selector = 'input, textarea, button, submit'; const selector = 'input, textarea, button, submit';
if (!input.matches(selector)) if (!input.matches(selector))
input = input.querySelector(selector); input = input.querySelector(selector);
@ -20,26 +20,24 @@ export function focus($scope, input) {
return; return;
} }
$timeout(() => {
input.focus(); input.focus();
if (input.select)
if (input.select) {
$scope.$applyAsync(() => {
input.select(); input.select();
}); });
} }
}
/** /*
* Sets the focus and selects the text on the input. * Sets the focus and selects the text on the input.
*
* @return {Object} The directive
*/ */
export function directive() { export function directive($timeout) {
return { return {
restrict: 'A', restrict: 'A',
link: function($scope, $element) { link: function($scope, $element) {
$scope.$watch('', () => focus($scope, $element[0])); $scope.$watch('', () => focus($timeout, $element[0]));
} }
}; };
} }
directive.$inject = ['$timeout'];
ngModule.directive('vnFocus', directive); ngModule.directive('vnFocus', directive);

4
front/core/directives/specs/focus.spec.js
View File

@ -6,7 +6,7 @@ describe('Directive focus', () => {
beforeEach(ngModule('vnCore')); beforeEach(ngModule('vnCore'));
compile = (_element, _childElement) => { compile = (_element, _childElement) => {
inject(($compile, $rootScope) => { inject(($compile, $rootScope, $flushPendingTasks) => {
$scope = $rootScope.$new(); $scope = $rootScope.$new();
$element = angular.element(_element); $element = angular.element(_element);
if (_childElement) if (_childElement)
@ -15,7 +15,7 @@ describe('Directive focus', () => {
$element[0].focus = jasmine.createSpy('focus'); $element[0].focus = jasmine.createSpy('focus');
$element[0].select = jasmine.createSpy('select'); $element[0].select = jasmine.createSpy('select');
$compile($element)($scope); $compile($element)($scope);
$scope.$digest(); $flushPendingTasks();
}); });
}; };

2
front/core/directives/uvc.scss
View File

@ -1,6 +1,6 @@
vn-table vn-dialog[vn-id="uvc"]{ vn-table vn-dialog[vn-id="uvc"]{
& > div { & > div {
min-width: 18em; min-width: 288px;
align-items: center; align-items: center;
} }

6
front/core/directives/zoom-image.scss
View File

@ -5,7 +5,7 @@
position: fixed; position: fixed;
top: 0; top: 0;
z-index: 25; z-index: 25;
background-color: rgba(1, 1, 1, 0.6); background-color: rgba(1, 1, 1, .6);
& > div { & > div {
display: flex; display: flex;
@ -14,13 +14,13 @@
width: inherit; width: inherit;
height: inherit; height: inherit;
box-sizing: border-box; box-sizing: border-box;
padding: 1em; padding: 16px;
& > img { & > img {
cursor: zoom-out; cursor: zoom-out;
max-height: 100%; max-height: 100%;
max-width: 100%; max-width: 100%;
border-radius: .2em; border-radius: 3px;
} }
} }
} }

2
front/core/styles/animations.scss
View File

@ -2,7 +2,7 @@
@keyframes nothing {} @keyframes nothing {}
@keyframes slideIn { @keyframes slideIn {
from { from {
transform: translate3d(-2em, 0, 0); transform: translate3d(-32px, 0, 0);
opacity: 0; opacity: 0;
} }
to { to {

2
front/core/styles/border.scss
View File

@ -19,5 +19,5 @@
/* Border Radius */ /* Border Radius */
.border-radius { .border-radius {
border-radius: .3em; border-radius: 4px;
} }

2
front/core/styles/font-family.scss
View File

@ -21,7 +21,7 @@
font-family: 'Material Icons'; font-family: 'Material Icons';
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
font-size: 24px; /* Preferred icon size */ font-size: 1.5rem; /* Preferred icon size */
display: inline-block; display: inline-block;
line-height: 1; line-height: 1;
text-transform: none; text-transform: none;

2
front/core/styles/global.scss
View File

@ -1,6 +1,7 @@
@import "variables"; @import "variables";
html { html {
font-size: $font-size;
background-color: $color-bg; background-color: $color-bg;
overflow: auto; overflow: auto;
height: 100%; height: 100%;
@ -9,7 +10,6 @@ body {
height: 100%; height: 100%;
font-family: vn-font; font-family: vn-font;
color: $color-font; color: $color-font;
font-size: $font-size;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }

2
front/core/styles/layout.scss
View File

@ -40,7 +40,7 @@ html [vn-nine],
html [vn-ten], html [vn-ten],
html [vn-eleven], html [vn-eleven],
html [vn-twelve]{ html [vn-twelve]{
flex-basis: 0.000000001px; flex-basis: .1px;
} }
html [vn-auto], vn-auto, .vn-auto { html [vn-auto], vn-auto, .vn-auto {
flex-basis: auto; flex-basis: auto;

25
front/core/styles/responsive.scss
View File

@ -1,52 +1,53 @@
@import "variables"; @import "variables";
/*
/* Desktop - Laptop 1360x768 */ // Desktop - Laptop 1360x768
@media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px) @media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px)
{ {
body { font-size: 10pt; } html { font-size: 10pt; }
} }
/* Mobile - Low DPI */ // Mobile - Low DPI
@media @media
(min-resolution: 120dpi), (min-resolution: 120dpi),
(-webkit-min-device-pixel-ratio: 1.5) (-webkit-min-device-pixel-ratio: 1.5)
{ {
body { font-size: 9pt; } html { font-size: 9pt; }
} }
@media @media
(min-resolution: 144dpi), (min-resolution: 144dpi),
(-webkit-min-device-pixel-ratio: 1.5) (-webkit-min-device-pixel-ratio: 1.5)
{ {
body { font-size: 11pt; } html { font-size: 11pt; }
} }
/* Mobile - Normal DPI */ // Mobile - Normal DPI
@media @media
(max-device-width: 383px) and (min-resolution: 192dpi), (max-device-width: 383px) and (min-resolution: 192dpi),
(max-device-width: 383px) and (-webkit-min-device-pixel-ratio: 2) (max-device-width: 383px) and (-webkit-min-device-pixel-ratio: 2)
{ {
body { font-size: 10pt; } html { font-size: 10pt; }
} }
@media @media
(min-device-width: 384px) and (min-resolution: 192dpi), (min-device-width: 384px) and (min-resolution: 192dpi),
(min-device-width: 384px) and (-webkit-min-device-pixel-ratio: 2) (min-device-width: 384px) and (-webkit-min-device-pixel-ratio: 2)
{ {
body { font-size: 11pt; } html { font-size: 11pt; }
} }
/* Mobile - High DPI */ // Mobile - High DPI
@media @media
(max-device-width: 411px) and (min-resolution: 249dpi), (max-device-width: 411px) and (min-resolution: 249dpi),
(max-device-width: 411px) and (-webkit-min-device-pixel-ratio: 3) (max-device-width: 411px) and (-webkit-min-device-pixel-ratio: 3)
{ {
body { font-size: 10pt; } html { font-size: 10pt; }
} }
@media @media
(min-device-width: 412px) and (min-resolution: 249dpi), (min-device-width: 412px) and (min-resolution: 249dpi),
(min-device-width: 412px) and (-webkit-min-device-pixel-ratio: 3) (min-device-width: 412px) and (-webkit-min-device-pixel-ratio: 3)
{ {
body { font-size: 11pt; } html { font-size: 11pt; }
} }
*/
.vn-hide-narrow { .vn-hide-narrow {
@media (max-width: $mobile-width) { @media (max-width: $mobile-width) {

26
front/core/styles/text.scss
View File

@ -3,46 +3,46 @@
/* Headings */ /* Headings */
.text-h1, h1 { .text-h1, h1 {
font-size: 32pt; font-size: 2.3rem;
} }
.text-h2, h2 { .text-h2, h2 {
font-size: 28pt; font-size: 2.25rem;
} }
.text-h3, h3 { .text-h3, h3 {
font-size: 24pt; font-size: 2rem;
} }
.text-h4, h4 { .text-h4, h4 {
font-size: 20pt; font-size: 1.6rem;
} }
.text-h5, h5 { .text-h5, h5 {
font-size: 16pt; font-size: 1.3rem;
} }
.text-h6, h6 { .text-h6, h6 {
font-size: 14pt; font-size: 1.125rem;
} }
.text-subtitle1 { .text-subtitle1 {
font-size: 13pt; font-size: 1.06rem;
} }
.text-subtitle2 { .text-subtitle2 {
font-size: 12pt; font-size: 1rem;
} }
.text-body1 { .text-body1 {
font-size: 11pt; font-size: .875rem;
} }
.text-body2 { .text-body2 {
font-size: 11pt; font-size: .875rem;
} }
.text-caption { .text-caption {
font-size: 11pt; font-size: .875rem;
} }
.text-overline { .text-overline {
font-size: 10pt; font-size: .8rem;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
padding: 0; padding: 0;
margin-top: 0; margin-top: 0;
margin-bottom: .3em; margin-bottom: 4px;
} }
/* Colors */ /* Colors */

22
front/core/styles/variables.scss
View File

@ -1,17 +1,17 @@
@import "./util"; @import "./util";
$menu-width: 16em; $font-size: 12pt;
$topbar-height: 4em; $menu-width: 256px;
$topbar-height: 56px;
$mobile-width: 800px; $mobile-width: 800px;
$font-size: 16px;
// Width // Width
$width-xs: 25em; $width-xs: 400px;
$width-sm: 34em; $width-sm: 544px;
$width-md: 50em; $width-md: 800px;
$width-lg: 80em; $width-lg: 1280px;
$width-xl: 100em; $width-xl: 1600px;
// Spacing // Spacing
@ -115,6 +115,6 @@ $color-alert-light: darken($color-alert, 35%);
// Border // Border
$border-thin: .05em solid $color-spacer; $border-thin: 1px solid $color-spacer;
$border-thin-light: .05em solid $color-spacer-light; $border-thin-light: 1px solid $color-spacer-light;
$shadow: 0 .15em .15em 0 rgba(0, 0, 0, .3); $shadow: 0 2px 2px 0 rgba(0, 0, 0, .3);

8
front/salix/components/descriptor/style.scss
View File

@ -3,7 +3,7 @@
@import "./variables"; @import "./variables";
.vn-descriptor { .vn-descriptor {
box-shadow: 0 .1em .2em $color-shadow; box-shadow: 0 1px 3px $color-shadow;
& > .header { & > .header {
display: flex; display: flex;
@ -26,7 +26,7 @@
padding: 10px; padding: 10px;
} }
vn-icon { vn-icon {
font-size: 1.8em; font-size: 1.75rem;
} }
} }
} }
@ -51,7 +51,7 @@
& > vn-icon { & > vn-icon {
padding: $spacing-sm; padding: $spacing-sm;
color: $color-marginal; color: $color-marginal;
font-size: 1.5em; font-size: 1.5rem;
&.bright { &.bright {
color: $color-main; color: $color-main;
@ -70,7 +70,7 @@
margin: 0 $spacing-sm; margin: 0 $spacing-sm;
& > vn-icon { & > vn-icon {
font-size: 1.8em; font-size: 1.75rem;
padding: 0; padding: 0;
} }
} }

20
front/salix/components/home/style.scss
View File

@ -2,7 +2,7 @@
vn-home { vn-home {
display: block; display: block;
padding: .5em; padding: 8px;
& > div { & > div {
& > h6 { & > h6 {
@ -16,7 +16,7 @@ vn-home {
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
flex-wrap: wrap; flex-wrap: wrap;
max-width: 44em; max-width: 704px;
margin: 0 auto; margin: 0 auto;
& > a { & > a {
@ -27,10 +27,10 @@ vn-home {
color: $color-font-dark; color: $color-font-dark;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 8em; height: 128px;
width: 8em; width: 128px;
margin: .5em; margin: 8px;
padding: 1em; padding: 16px;
justify-content: center; justify-content: center;
& > div { & > div {
@ -41,21 +41,21 @@ vn-home {
& > vn-icon { & > vn-icon {
display: block; display: block;
font-size: 3.5em; font-size: 3.5rem;
} }
} }
& > span { & > span {
font-size: 0.9em; font-size: .875rem;
text-align: center; text-align: center;
} }
& > h4 { & > h4 {
max-width: 100%; max-width: 100%;
text-align: center; text-align: center;
font-size: 12pt; font-size: 1rem;
overflow: hidden; overflow: hidden;
color: inherit; color: inherit;
margin: 0; margin: 0;
line-height: 1.5em; line-height: 24px;
/* & > .bind-letter { /* & > .bind-letter {
color: #FD0; color: #FD0;

47
front/salix/components/layout/style.scss
View File

@ -7,42 +7,42 @@ vn-layout {
right: 0; right: 0;
left: 0; left: 0;
z-index: 10; z-index: 10;
box-shadow: 0 .1em .2em $color-shadow; box-shadow: 0 1px 3px $color-shadow;
height: $topbar-height; height: $topbar-height;
padding: 0 1em; padding: 0 16px;
justify-content: space-between; justify-content: space-between;
& > .side { & > .side {
flex: auto; flex: auto;
display: flex; display: flex;
align-items: center; align-items: center;
width: 5em; width: 80px;
transition: width 200ms; transition: width 200ms;
} }
& > .start { & > .start {
padding-right: 1em; padding-right: 16px;
overflow: hidden; overflow: hidden;
& > .logo > img { & > .logo > img {
height: 2em; height: 32px;
display: block; display: block;
} }
& > .main-title { & > .main-title {
font-size: 1.6em; font-size: 1.56rem;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
padding-left: .4em; padding-left: 6px;
} }
& > vn-spinner { & > vn-spinner {
padding: 0 .4em; padding: 0 6px;
} }
} }
& > vn-slot { & > vn-slot {
flex: auto; flex: auto;
} }
& > .end { & > .end {
padding-left: 1em; padding-left: 16px;
justify-content: flex-end; justify-content: flex-end;
} }
.show-menu { .show-menu {
@ -50,7 +50,7 @@ vn-layout {
} }
.vn-button { .vn-button {
color: inherit; color: inherit;
font-size: 1.05em; font-size: 1.05rem;
padding: 0; padding: 0;
} }
} }
@ -66,7 +66,7 @@ vn-layout {
} }
&.left-menu { &.left-menu {
& > vn-topbar > .start { & > vn-topbar > .start {
width: 5em + $menu-width; width: 80px + $menu-width;
} }
& > .main-view { & > .main-view {
padding-left: $menu-width; padding-left: $menu-width;
@ -74,11 +74,14 @@ vn-layout {
} }
&.right-menu { &.right-menu {
& > vn-topbar > .end { & > vn-topbar > .end {
width: 5em + $menu-width; width: 80px + $menu-width;
} }
& > .main-view { & > .main-view {
padding-right: $menu-width; padding-right: $menu-width;
} }
[fixed-bottom-right] {
right: 64px + $menu-width;
}
} }
& > .main-view { & > .main-view {
padding-top: $topbar-height; padding-top: $topbar-height;
@ -89,6 +92,11 @@ vn-layout {
padding: $spacing-md; padding: $spacing-md;
box-sizing: border-box box-sizing: border-box
} }
[fixed-bottom-right] {
position: fixed;
bottom: 32px;
right: 32px;
}
&.ng-enter { &.ng-enter {
vn-side-menu { vn-side-menu {
opacity: 0; opacity: 0;
@ -124,6 +132,9 @@ vn-layout {
& > .main-view { & > .main-view {
padding-right: 0; padding-right: 0;
} }
[fixed-bottom-right] {
right: 32px;
}
} }
ui-view > * { ui-view > * {
padding-left: 0; padding-left: 0;
@ -139,22 +150,22 @@ vn-layout {
& > li { & > li {
@extend %clickable-light; @extend %clickable-light;
background-color: $color-main; background-color: $color-main;
margin-bottom: .6em; margin-bottom: 9px;
padding: .8em; padding: 12px;
border-radius: .1em; border-radius: 1px;
min-width: 8em; min-width: 128px;
white-space: nowrap; white-space: nowrap;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
& > vn-icon { & > vn-icon {
padding-right: .3em; padding-right: 4px;
vertical-align: middle; vertical-align: middle;
} }
} }
} }
#user { #user {
font-size: 1.5em; font-size: 1.5rem;
height: auto; height: auto;
} }

22
front/salix/components/login/style.scss
View File

@ -7,7 +7,7 @@ vn-login {
margin: 0; margin: 0;
padding: 0; padding: 0;
color: $color-font; color: $color-font;
font-size: 1.1em; font-size: 1.1rem;
font-weight: normal; font-weight: normal;
background-color: $color-bg-dark; background-color: $color-bg-dark;
display: flex; display: flex;
@ -18,16 +18,16 @@ vn-login {
& > .box { & > .box {
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
max-width: 19em; max-width: 304px;
min-width: 15em; min-width: 240px;
padding: 3em; padding: 48px;
background-color: $color-bg-panel; background-color: $color-bg-panel;
box-shadow: 0 0 1em 0 rgba(0, 0, 0, .6); box-shadow: 0 0 16px 0 rgba(0, 0, 0, .6);
border-radius: .5em; border-radius: 8px;
& > img { & > img {
width: 100%; width: 100%;
padding-bottom: 1em; padding-bottom: 16px;
} }
& > form { & > form {
& > .vn-textfield { & > .vn-textfield {
@ -40,7 +40,7 @@ vn-login {
} }
} }
& > .footer { & > .footer {
margin-top: 2em; margin-top: 32px;
text-align: center; text-align: center;
position: relative; position: relative;
@ -55,8 +55,8 @@ vn-login {
& > .spinner-wrapper { & > .spinner-wrapper {
position: absolute; position: absolute;
width: 0; width: 0;
top: .2em; top: 3px;
right: -.5em; right: -8px;
overflow: visible; overflow: visible;
} }
} }
@ -67,7 +67,7 @@ vn-login {
background-color: $color-bg-panel; background-color: $color-bg-panel;
& > .box { & > .box {
padding: 1em; padding: 16px;
box-shadow: none; box-shadow: none;
} }
} }

2
front/salix/components/side-menu/style.scss
View File

@ -11,7 +11,7 @@ vn-side-menu > .menu {
width: $menu-width; width: $menu-width;
min-width: $menu-width; min-width: $menu-width;
background-color: $color-bg-panel; background-color: $color-bg-panel;
box-shadow: 0 .1em .2em $color-shadow; box-shadow: 0 1px 3px $color-shadow;
overflow: auto; overflow: auto;
top: $topbar-height; top: $topbar-height;

10
front/salix/components/summary/style.scss
View File

@ -11,7 +11,7 @@
color: $color-font-dark; color: $color-font-dark;
margin: 0; margin: 0;
text-align: center; text-align: center;
line-height: 1.3em; line-height: 20px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -25,27 +25,27 @@
h4 { h4 {
margin-bottom: $spacing-md; margin-bottom: $spacing-md;
text-transform: uppercase; text-transform: uppercase;
font-size: 15pt; font-size: 1.25rem;
line-height: 1; line-height: 1;
padding: 7px; padding: 7px;
padding-bottom: 4px; /* Bottom line-height fix */ padding-bottom: 4px; /* Bottom line-height fix */
font-weight: lighter; font-weight: lighter;
background-color: $color-main-light; background-color: $color-main-light;
border-bottom: .1em solid $color-main; border-bottom: 1px solid $color-main;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
& > * { & > * {
margin: $spacing-sm; margin: $spacing-sm;
min-width: 14em; min-width: 224px;
padding: 0; padding: 0;
} }
& > vn-auto { & > vn-auto {
width: 100%; width: 100%;
} }
vn-label-value > section { vn-label-value > section {
margin-bottom: .3em; margin-bottom: 4px;
} }
} }
p:after { p:after {

10
front/salix/components/user-popover/style.scss
View File

@ -1,14 +1,14 @@
@import "variables"; @import "variables";
.vn-popover .user-popover { .vn-popover .user-popover {
width: 16em; width: 256px;
& > .profile-card { & > .profile-card {
display: flex; display: flex;
align-items: center; align-items: center;
& > vn-icon { & > vn-icon {
font-size: 80px; font-size: 5rem;
color: $color-font-bg-marginal; color: $color-font-bg-marginal;
} }
& > div { & > div {
@ -19,11 +19,11 @@
& > div { & > div {
display: flex; display: flex;
padding-bottom: .5em; padding-bottom: 8px;
& > .user { & > .user {
flex: 1; flex: 1;
max-width: 8em; max-width: 128px;
} }
} }
} }
@ -33,5 +33,5 @@
float: right; float: right;
height: initial; height: initial;
vertical-align: middle; vertical-align: middle;
font-size: 1em; font-size: 1rem;
} }

19
front/salix/styles/misc.scss
View File

@ -3,7 +3,7 @@
form vn-horizontal { form vn-horizontal {
align-items: center; align-items: center;
min-height: 2.8em; min-height: 44px;
& > * { & > * {
box-sizing: border-box; box-sizing: border-box;
@ -55,9 +55,9 @@ form vn-horizontal {
vn-bg-title { vn-bg-title {
display: block; display: block;
text-align: center; text-align: center;
padding: 1em; padding: 16px;
color: gray; color: gray;
font-size: 1.3em; font-size: 1.25rem;
} }
.totalBox { .totalBox {
border: 1px solid #CCC; border: 1px solid #CCC;
@ -65,7 +65,7 @@ vn-bg-title {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: $spacing-md; padding: $spacing-md;
max-width: 14em; max-width: 224px;
} }
.form { .form {
height: 100%; height: 100%;
@ -73,11 +73,6 @@ vn-bg-title {
padding: $spacing-lg; padding: $spacing-lg;
max-width: 1000px; max-width: 1000px;
} }
html [fixed-bottom-right] {
position: fixed;
bottom: 2em;
right: 2em;
}
.list > vn-none { .list > vn-none {
min-width: 60px; min-width: 60px;
} }
@ -103,13 +98,13 @@ vn-tool-bar {
display: flex; display: flex;
& > * { & > * {
margin-right: .6em; margin-right: 9px;
} }
} }
html [scrollable] { html [scrollable] {
min-height: 1px; min-height: 1px;
flex: 1; flex: 1;
flex-basis: 0.000000001px; flex-basis: .1px;
} }
.ellipsize { .ellipsize {
text-overflow: ellipsis; text-overflow: ellipsis;
@ -120,7 +115,7 @@ html [scrollable] {
@extend %active; @extend %active;
&.small { &.small {
font-size: 0.7em font-size: .7rem
} }
} }

32
front/salix/styles/order-product.scss
View File

@ -8,16 +8,16 @@
& > .product { & > .product {
box-sizing: border-box; box-sizing: border-box;
padding: $spacing-sm; padding: $spacing-sm;
width: 28em; width: 448px;
overflow: hidden; overflow: hidden;
& > vn-card { & > vn-card {
display: flex; display: flex;
height: 12em; height: 192px;
.image { .image {
width: 12em; width: 192px;
height: 12em; height: 192px;
img { img {
width: 100%; width: 100%;
@ -32,37 +32,37 @@
height: 100%; height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
padding: .8em; padding: 12px;
& > h3 { & > h3 {
font-family: vn-font; font-family: vn-font;
margin: 0; margin: 0;
margin-bottom: .3em; margin-bottom: 4px;
font-weight: normal; font-weight: normal;
line-height: initial; line-height: initial;
font-size: 1.05em; font-size: 1rem;
max-height:2.4em; max-height: 38px;
overflow: hidden; overflow: hidden;
} }
& > h4 { & > h4 {
color: $color-font-secondary; color: $color-font-secondary;
text-transform: uppercase; text-transform: uppercase;
margin-bottom: .3em; margin-bottom: 4px;
line-height: initial; line-height: initial;
font-size: 1em; font-size: 1rem;
flex: 1; flex: 1;
} }
& > .tags { & > .tags {
padding-bottom: .2em; padding-bottom: 3px;
height: 3em; height: 48px;
& > vn-label-value { & > vn-label-value {
font-size: .8em; font-size: .75rem;
} }
} }
} }
.footer { .footer {
font-size: .8em; font-size: .8rem;
& > .price { & > .price {
overflow: hidden; overflow: hidden;
@ -77,7 +77,7 @@
&:first-child, &:first-child,
&:last-child { &:last-child {
font-size: 1.4em; font-size: 1.375rem;
} }
} }
@ -87,7 +87,7 @@
} }
& > .priceKg { & > .priceKg {
color: $color-font-secondary; color: $color-font-secondary;
font-size: .8em; font-size: .75rem;
} }
} }
} }

8
front/salix/styles/photo-list.scss
View File

@ -8,10 +8,10 @@
.photo { .photo {
box-sizing: border-box; box-sizing: border-box;
transition: all 0.5s; transition: all .5s;
padding: $spacing-sm; padding: $spacing-sm;
position: relative; position: relative;
width: 28em; width: 448px;
.image { .image {
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),
@ -30,8 +30,8 @@
} }
.actions { .actions {
position: absolute; position: absolute;
right: 1em; right: 16px;
top: 1em top: 16px
} }
} }
.photo:hover .image { .photo:hover .image {

2
modules/claim/front/action/style.scss
View File

@ -36,7 +36,7 @@ vn-claim-action {
div.ticketList { div.ticketList {
overflow: auto; overflow: auto;
max-height: 350px max-height: 350px;
} }
} }
} }

2
modules/claim/front/basic-data/style.scss
View File

@ -1,3 +1,3 @@
vn-claim-basic-data vn-date-picker { vn-claim-basic-data vn-date-picker {
padding-left: 5em; padding-left: 80px;
} }

6
modules/claim/front/detail/style.scss
View File

@ -1,7 +1,7 @@
@import "variables"; @import "variables";
.vn-popover .discount-popover { .vn-popover .discount-popover {
width: 16em; width: 256px;
.header { .header {
background-color: $color-main; background-color: $color-main;
@ -13,8 +13,8 @@
} }
} }
.simulatorTitle { .simulatorTitle {
margin-bottom: 0px; margin-bottom: 0;
font-size: 12px; font-size: .75rem;
color: $color-main; color: $color-main;
} }
vn-label-value { vn-label-value {

12
modules/claim/front/photos/style.scss
View File

@ -6,17 +6,17 @@ vn-claim-photos {
.drop-zone { .drop-zone {
color: $color-font-secondary; color: $color-font-secondary;
box-sizing: border-box; box-sizing: border-box;
border-radius: 0.5em; border-radius: 8px;
text-align: center; text-align: center;
min-height: 100%; min-height: 100%;
.empty-rows { .empty-rows {
padding: 5em $spacing-md; padding: 80px $spacing-md;
font-size: 1.4em font-size: 1.375rem
} }
vn-icon { vn-icon {
font-size: 3em font-size: 3rem
} }
} }
@ -25,8 +25,8 @@ vn-claim-photos {
min-height: 100%; min-height: 100%;
.photo { .photo {
width: 32em; width: 512px;
height: 18em; height: 288px;
} }
} }
} }

4
modules/claim/front/summary/style.scss
View File

@ -2,9 +2,9 @@
vn-claim-summary { vn-claim-summary {
section.photo { section.photo {
height: 15.5em height: 248px;
} }
.photo .image { .photo .image {
border-radius: 0.2em border-radius: 3px;
} }
} }

25
modules/client/front/balance/create/index.html
View File

@ -1,11 +1,6 @@
<vn-dialog <div>
vn-id="dialog"
class="modal-form">
<tpl-body> <tpl-body>
<mg-ajax path="receipts" options="vnPost"></mg-ajax> <h6 translate>New payment</h6>
<vn-horizontal class="header">
<h5><span translate>New payment</span></h5>
</vn-horizontal>
<div class="vn-pa-md"> <div class="vn-pa-md">
<vn-horizontal> <vn-horizontal>
<vn-date-picker <vn-date-picker
@ -13,7 +8,8 @@
label="Date" label="Date"
ng-model="$ctrl.receipt.payed"> ng-model="$ctrl.receipt.payed">
</vn-date-picker> </vn-date-picker>
<vn-autocomplete vn-one <vn-autocomplete
vn-one
url="Companies" url="Companies"
label="Company" label="Company"
show-field="code" show-field="code"
@ -22,7 +18,8 @@
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-autocomplete vn-one <vn-autocomplete
vn-one
url="Banks" url="Banks"
label="Bank" label="Bank"
show-field="bank" show-field="bank"
@ -39,9 +36,9 @@
</vn-input-number> </vn-input-number>
</vn-horizontal> </vn-horizontal>
</div> </div>
<vn-horizontal class="vn-ma-md buttons-bar">
<vn-button vn-one label="Save" ng-click="$ctrl.save()"></vn-button>
<vn-button vn-one ng-click="$ctrl.hide()" label="Cancel"></vn-button>
</vn-horizontal>
</tpl-body> </tpl-body>
</vn-dialog> <tpl-buttons>
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
<button response="accept" translate vn-focus>Accept</button>
</tpl-buttons>
</div>

43
modules/client/front/balance/create/index.js
View File

@ -1,10 +1,12 @@
import ngModule from '../../module'; import ngModule from '../../module';
import Section from 'salix/components/section'; import Dialog from 'core/components/dialog';
import './style.scss'; import template from './index.html';
class Controller extends Dialog {
constructor($element, $, $transclude) {
super($element, $, $transclude);
this.fillSlots(template);
class Controller extends Section {
constructor($element, $) {
super($element, $);
this.receipt = { this.receipt = {
payed: new Date(), payed: new Date(),
clientFk: this.$params.id, clientFk: this.$params.id,
@ -51,46 +53,35 @@ class Controller extends Section {
} }
getAmountPaid() { getAmountPaid() {
let filter = { const filter = {
where: { where: {
clientFk: this.$params.id, clientFk: this.$params.id,
companyFk: this.receipt.companyFk companyFk: this.receipt.companyFk
} }
}; };
let query = `ClientRisks?filter=${JSON.stringify(filter)}`; this.$http.get(`ClientRisks`, {filter}).then(res => {
this.$http.get(query).then(res => {
this.receipt.amountPaid = (res.data.length && res.data[0].amount) || null; this.receipt.amountPaid = (res.data.length && res.data[0].amount) || null;
}); });
} }
show() { responseHandler(response) {
this.$.dialog.show(); if (response !== 'accept')
} return super.responseHandler(response);
hide() { return this.$http.post(`Receipts`, this.receipt)
this.$.dialog.hide(); .then(() => super.responseHandler(response))
} .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
save() {
let query = `receipts`;
this.$http.post(query, this.receipt).then(() => {
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
this.hide();
if (this.onResponse)
this.onResponse();
});
} }
} }
ngModule.component('vnClientBalanceCreate', { ngModule.vnComponent('vnClientBalanceCreate', {
template: require('./index.html'),
controller: Controller, controller: Controller,
transclude: true,
bindings: { bindings: {
payed: '<?', payed: '<?',
bankFk: '<?', bankFk: '<?',
amountPaid: '<?', amountPaid: '<?',
onResponse: '&?',
companyFk: '<?', companyFk: '<?',
description: '<?', description: '<?',
clientFk: '<?' clientFk: '<?'

3
modules/client/front/balance/create/style.scss
View File

@ -1,3 +0,0 @@
vn-horizontal.buttons-bar{
text-align: center;
}

32
modules/client/front/balance/index/index.html
View File

@ -10,35 +10,31 @@
filter="$ctrl.filter" filter="$ctrl.filter"
data="$ctrl.clientRisks"> data="$ctrl.clientRisks">
</vn-crud-model> </vn-crud-model>
<div class="vn-w-lg"> <vn-side-menu side="right">
<vn-card class="vn-pa-md vn-mb-md"> <div class="vn-pa-md">
<vn-horizontal
style="align-items: center;">
<vn-one></vn-one>
<vn-one>
<vn-autocomplete <vn-autocomplete
vn-one
vn-id="company" vn-id="company"
class="dense"
ng-model="$ctrl.companyId" ng-model="$ctrl.companyId"
url="Companies" url="Companies"
show-field="code" show-field="code"
value-field="id" value-field="id"
label="Company"> label="Company">
</vn-autocomplete> </vn-autocomplete>
</vn-one> <div
<vn-one> class="totalBox"
<div class="totalBox" ng-if="$ctrl.clientRisks.length"> style="text-align: center;"
ng-if="$ctrl.clientRisks.length">
<h6 translate>Total by company</h6> <h6 translate>Total by company</h6>
<vn-auto ng-repeat="riskByCompany in $ctrl.clientRisks">
<vn-label-value <vn-label-value
ng-repeat="riskByCompany in $ctrl.clientRisks"
label="{{riskByCompany.company.code}}" label="{{riskByCompany.company.code}}"
value="{{riskByCompany.amount | currency: 'EUR':2}}"> value="{{riskByCompany.amount | currency: 'EUR':2}}">
</vn-label-value> </vn-label-value>
</vn-auto>
</div> </div>
</vn-one> </div>
</vn-horizontal> </vn-side-menu>
</vn-card> <div class="vn-w-lg">
<vn-data-viewer model="model"> <vn-data-viewer model="model">
<vn-card> <vn-card>
<vn-table model="model"> <vn-table model="model">
@ -117,10 +113,12 @@
vn-tooltip="New payment" vn-tooltip="New payment"
vn-bind="+" vn-bind="+"
fixed-bottom-right fixed-bottom-right
ng-click="$ctrl.openCreateDialog()"> ng-click="balanceCreate.show()">
</vn-float-button> </vn-float-button>
<vn-client-balance-create <vn-client-balance-create
vn-id="balanceCreateDialog"> vn-id="balance-create"
on-accept="$ctrl.getData()"
company-fk="$ctrl.companyId">
</vn-client-balance-create> </vn-client-balance-create>
<vn-worker-descriptor-popover <vn-worker-descriptor-popover
vn-id="workerDescriptor" vn-id="workerDescriptor"

7
modules/client/front/balance/index/index.js
View File

@ -1,6 +1,5 @@
import ngModule from '../../module'; import ngModule from '../../module';
import Section from 'salix/components/section'; import Section from 'salix/components/section';
import './style.scss';
class Controller extends Section { class Controller extends Section {
constructor($element, $) { constructor($element, $) {
@ -74,12 +73,6 @@ class Controller extends Section {
}); });
} }
openCreateDialog() {
this.$.balanceCreateDialog.companyFk = this.companyId;
this.$.balanceCreateDialog.onResponse = () => this.getData();
this.$.balanceCreateDialog.show();
}
showWorkerDescriptor(event, workerFk) { showWorkerDescriptor(event, workerFk) {
if (event.defaultPrevented) return; if (event.defaultPrevented) return;

10
modules/client/front/balance/index/style.scss
View File

@ -1,10 +0,0 @@
@import "./variables";
vn-client-balance-index {
.totalBox {
border: $border-thin-light;
text-align: left;
float: right
}
}

3
modules/client/front/billing-data/index.html
View File

@ -106,7 +106,8 @@
vn-one vn-one
label="Name" label="Name"
ng-model="$ctrl.newBankEntity.name" ng-model="$ctrl.newBankEntity.name"
required="true"> required="true"
vn-focus>
</vn-textfield> </vn-textfield>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

2
modules/client/front/descriptor-popover/style.scss
View File

@ -1,7 +1,7 @@
vn-client-descriptor-popover { vn-client-descriptor-popover {
vn-client-descriptor { vn-client-descriptor {
display: block; display: block;
width: 16em; width: 256px;
& > vn-card{ & > vn-card{
margin: 0!important; margin: 0!important;
} }

10
modules/client/front/sample/create/style.scss
View File

@ -4,7 +4,7 @@ div.vn-dialog {
.container, .container h1 { .container, .container h1 {
font-family: "Roboto","Helvetica","Arial",sans-serif; font-family: "Roboto","Helvetica","Arial",sans-serif;
font-size: 1em !important; font-size: 1rem !important;
h1 { h1 {
font-weight: bold; font-weight: bold;
@ -12,18 +12,18 @@ div.vn-dialog {
} }
p { p {
margin: 1em 0 margin: 16px 0
} }
footer p { footer p {
font-size: 10px !important; font-size: .625rem !important;
line-height: 10px line-height: 10px;
} }
} }
.title h1 { .title h1 {
font-size: 2em !important; font-size: 2rem !important;
margin: 0 margin: 0
} }

2
modules/client/front/sms/style.scss
View File

@ -1,5 +1,5 @@
@import "variables"; @import "variables";
.SMSDialog { .SMSDialog {
min-width: 25em min-width: 400px
} }

4
modules/invoiceOut/front/descriptor-popover/style.scss
View File

@ -1,8 +1,8 @@
vn-ticket-descriptor-popover { vn-ticket-descriptor-popover {
vn-ticket-descriptor { vn-ticket-descriptor {
display: block; display: block;
width: 16em; width: 256px;
max-height: 28em; max-height: 448px;
& > vn-card { & > vn-card {
margin: 0!important; margin: 0!important;

4
modules/invoiceOut/front/descriptor/index.html
View File

@ -40,11 +40,11 @@
</div> </div>
<vn-confirm <vn-confirm
vn-id="deleteConfirmation" vn-id="deleteConfirmation"
on-response="$ctrl.deleteInvoiceOut($response)" on-accept="$ctrl.deleteInvoiceOut()"
question="Are you sure you want to delete this invoice?"> question="Are you sure you want to delete this invoice?">
</vn-confirm> </vn-confirm>
<vn-confirm <vn-confirm
vn-id="bookConfirmation" vn-id="bookConfirmation"
on-response="$ctrl.bookInvoiceOut($response)" on-accept="$ctrl.bookInvoiceOut()"
question="Are you sure you want to book this invoice?"> question="Are you sure you want to book this invoice?">
</vn-confirm> </vn-confirm>

37
modules/invoiceOut/front/descriptor/index.js
View File

@ -5,9 +5,18 @@ class Controller extends Component {
constructor($element, $) { constructor($element, $) {
super($element, $); super($element, $);
this.moreOptions = [ this.moreOptions = [
{callback: this.showInvoiceOutPdf, name: 'Show invoice PDF'}, {
{callback: this.showDeleteInvoiceOutDialog, name: 'Delete Invoice', acl: 'invoicing'}, name: 'Show invoice PDF',
{callback: this.showBookInvoiceOutDialog, name: 'Book invoice', acl: 'invoicing'} callback: this.showInvoiceOutPdf
}, {
name: 'Delete Invoice',
callback: this.showDeleteInvoiceOutDialog,
acl: 'invoicing'
}, {
name: 'Book invoice',
callback: this.showBookInvoiceOutDialog,
acl: 'invoicing'
}
]; ];
} }
@ -60,24 +69,18 @@ class Controller extends Component {
this.$.bookConfirmation.show(); this.$.bookConfirmation.show();
} }
deleteInvoiceOut(response) { deleteInvoiceOut() {
if (response === 'accept') {
const query = `InvoiceOuts/${this.invoiceOut.id}/delete`; const query = `InvoiceOuts/${this.invoiceOut.id}/delete`;
this.$http.post(query).then(() => { return this.$http.post(query)
this.vnApp.showSuccess(this.$translate.instant('InvoiceOut deleted')); .then(() => this.$state.go('invoiceOut.index'))
this.$state.go('invoiceOut.index'); .then(() => this.vnApp.showSuccess(this.$t('InvoiceOut deleted')));
});
}
} }
bookInvoiceOut(response) { bookInvoiceOut() {
if (response === 'accept') {
const query = `InvoiceOuts/${this.invoiceOut.ref}/book`; const query = `InvoiceOuts/${this.invoiceOut.ref}/book`;
this.$http.post(query).then(() => { return this.$http.post(query)
this.vnApp.showSuccess(this.$translate.instant('InvoiceOut booked')); .then(() => this.$state.reload())
this.$state.reload(); .then(() => this.vnApp.showSuccess(this.$t('InvoiceOut booked')));
});
}
} }
set quicklinks(value = {}) { set quicklinks(value = {}) {

4
modules/item/front/descriptor-popover/style.scss
View File

@ -1,5 +1,5 @@
body > .vn-popover vn-item-descriptor { body > .vn-popover vn-item-descriptor {
display: block; display: block;
width: 16em; width: 256px;
min-height: 28em; min-height: 448px;
} }

Some files were not shown because too many files have changed in this diff Show More