From 457034daad102e5ae94e9d728c396dfae21c3abd Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 18 Oct 2019 21:36:30 +0200 Subject: [PATCH 1/7] Tests fixed --- e2e/helpers/components_selectors.js | 6 - e2e/helpers/extensions.js | 44 +++-- e2e/helpers/selectors.js | 179 +++++++++--------- e2e/paths/01-login/01_login.spec.js | 29 +-- .../03_edit_fiscal_data.spec.js | 4 +- .../12_lock_of_verified_data.spec.js | 4 +- .../05-ticket-module/13_services.spec.js | 4 +- e2e/paths/07-order-module/02_catalog.spec.js | 2 +- .../01_descriptor.spec.js | 2 +- .../components/button-menu/button-menu.html | 13 -- front/core/components/button-menu/index.html | 20 ++ .../button-menu/{button-menu.js => index.js} | 22 +-- .../{button-menu.spec.js => index.spec.js} | 0 front/core/components/button-menu/style.scss | 16 -- front/core/components/button/button.html | 6 - front/core/components/button/button.js | 34 ---- front/core/components/button/index.html | 11 ++ front/core/components/button/index.js | 46 +++++ front/core/components/button/style.scss | 86 ++++++++- front/core/components/card/card.js | 2 +- front/core/components/chip/index.html | 15 +- front/core/components/chip/index.js | 15 +- front/core/components/chip/index.spec.js | 12 +- front/core/components/chip/style.scss | 53 +++++- front/core/components/color-legend/index.html | 8 - front/core/components/color-legend/index.js | 24 --- front/core/components/color-legend/style.scss | 13 -- front/core/components/field/index.js | 48 +---- front/core/components/field/style.scss | 4 +- .../components/float-button/float-button.html | 3 - .../components/float-button/float-button.js | 8 - front/core/components/float-button/index.js | 13 ++ front/core/components/form-input/index.js | 54 +++++- .../components/icon-button/icon-button.html | 3 - .../components/icon-button/icon-button.js | 39 ---- front/core/components/icon-button/index.js | 14 ++ front/core/components/icon-button/style.scss | 25 +-- .../icon-focusable/icon-focusable.html | 1 - .../icon-focusable/icon-focusable.js | 29 --- .../core/components/icon-focusable/style.scss | 10 - .../core/components/icon-menu/icon-menu.html | 11 -- front/core/components/icon-menu/icon-menu.js | 41 ---- front/core/components/icon-menu/index.html | 11 ++ front/core/components/icon-menu/index.js | 14 ++ front/core/components/icon-menu/style.scss | 8 - front/core/components/index.js | 15 +- front/core/components/input-file/index.html | 83 ++++---- front/core/components/input-file/index.js | 26 +-- front/core/components/input-file/style.scss | 156 +-------------- front/core/components/input-range/index.html | 9 - front/core/components/input-range/index.js | 79 -------- front/core/components/input-range/style.scss | 14 -- front/core/components/list/style.scss | 3 +- .../components/multi-check/multi-check.js | 4 +- front/core/components/range/index.html | 4 + front/core/components/range/index.js | 50 +++++ front/core/components/range/style.scss | 84 ++++++++ .../core/components/scroll-up/scroll-up.html | 9 +- front/core/components/scroll-up/style.scss | 4 +- front/core/components/searchbar/style.scss | 1 + front/core/components/spinner/spinner.html | 12 +- front/core/components/spinner/spinner.js | 11 +- front/core/components/spinner/spinner.spec.js | 36 ++-- front/core/components/spinner/style.css | 3 - front/core/components/spinner/style.scss | 60 ++++++ front/core/components/step-control/style.scss | 6 - front/core/components/submit/index.js | 13 ++ front/core/components/submit/submit.html | 6 - front/core/components/submit/submit.js | 25 --- front/core/components/td-editable/index.js | 4 +- front/core/components/toggle/index.js | 13 +- front/core/components/toggle/style.scss | 3 + front/core/components/tooltip/tooltip.js | 2 +- front/core/directives/acl.js | 113 +++-------- front/core/directives/specs/acl.spec.js | 105 +++++++--- front/core/lib/input.js | 42 ---- front/core/module.js | 4 +- front/core/styles/background.scss | 6 + front/core/styles/font-family.scss | 23 +++ front/core/styles/global.scss | 40 ++++ front/core/styles/index.js | 3 +- front/core/styles/mdl-override.scss | 61 ------ front/core/styles/text.scss | 2 - front/core/styles/util.scss | 6 + front/core/styles/variables.scss | 2 + front/core/vendor.js | 7 +- front/package-lock.json | 41 ---- front/package.json | 6 - front/salix/components/app/style.scss | 41 ---- front/salix/components/descriptor/index.html | 24 +++ front/salix/components/descriptor/index.js | 11 ++ front/salix/components/descriptor/style.scss | 23 +-- front/salix/components/home/home.html | 2 +- front/salix/components/index.js | 14 +- front/salix/components/login/login.html | 2 - front/salix/components/main-menu/style.scss | 12 +- front/salix/components/summary/style.scss | 4 +- front/salix/styles/misc.scss | 70 ++++--- modules/agency/front/index/index.html | 3 +- modules/claim/front/action/index.html | 8 +- modules/claim/front/descriptor/index.html | 29 +-- modules/claim/front/dms/index/index.html | 11 +- modules/claim/front/summary/index.html | 8 +- .../client/front/address/create/index.html | 8 +- modules/client/front/basic-data/index.html | 130 +++++++------ .../insurance/create/index.html | 8 +- modules/client/front/descriptor/index.html | 29 +-- .../invoiceOut/front/descriptor/index.html | 21 +- modules/item/front/create/index.html | 14 +- modules/item/front/descriptor/index.html | 29 +-- modules/item/front/index/index.html | 3 +- modules/item/front/index/style.scss | 11 -- modules/item/front/last-entries/style.scss | 4 - modules/item/front/search-panel/index.js | 6 +- modules/order/front/descriptor/index.html | 29 +-- modules/order/front/filter/index.html | 19 +- modules/order/front/filter/style.scss | 4 +- modules/order/front/prices-popover/index.html | 35 +--- modules/route/front/descriptor/index.html | 29 +-- modules/ticket/front/descriptor/index.html | 38 +--- modules/ticket/front/index/index.html | 2 +- modules/ticket/front/index/style.scss | 13 -- modules/ticket/front/sale/index.html | 2 - modules/ticket/front/sale/style.scss | 7 - modules/ticket/front/services/index.html | 17 +- modules/ticket/front/services/index.js | 3 +- modules/ticket/front/services/index.spec.js | 2 +- modules/ticket/front/summary/index.html | 2 + modules/worker/front/calendar/index.html | 9 +- modules/worker/front/descriptor/index.html | 8 +- modules/worker/front/index/index.html | 3 +- modules/worker/front/index/index.js | 1 - modules/worker/front/index/style.scss | 11 -- 133 files changed, 1259 insertions(+), 1702 deletions(-) delete mode 100644 e2e/helpers/components_selectors.js delete mode 100644 front/core/components/button-menu/button-menu.html create mode 100644 front/core/components/button-menu/index.html rename front/core/components/button-menu/{button-menu.js => index.js} (83%) rename front/core/components/button-menu/{button-menu.spec.js => index.spec.js} (100%) delete mode 100644 front/core/components/button/button.html delete mode 100644 front/core/components/button/button.js create mode 100644 front/core/components/button/index.html create mode 100644 front/core/components/button/index.js delete mode 100644 front/core/components/color-legend/index.html delete mode 100644 front/core/components/color-legend/index.js delete mode 100644 front/core/components/color-legend/style.scss delete mode 100644 front/core/components/float-button/float-button.html delete mode 100644 front/core/components/float-button/float-button.js create mode 100644 front/core/components/float-button/index.js delete mode 100644 front/core/components/icon-button/icon-button.html delete mode 100644 front/core/components/icon-button/icon-button.js create mode 100644 front/core/components/icon-button/index.js delete mode 100644 front/core/components/icon-focusable/icon-focusable.html delete mode 100644 front/core/components/icon-focusable/icon-focusable.js delete mode 100644 front/core/components/icon-focusable/style.scss delete mode 100644 front/core/components/icon-menu/icon-menu.html delete mode 100644 front/core/components/icon-menu/icon-menu.js create mode 100644 front/core/components/icon-menu/index.html create mode 100644 front/core/components/icon-menu/index.js delete mode 100644 front/core/components/icon-menu/style.scss delete mode 100644 front/core/components/input-range/index.html delete mode 100644 front/core/components/input-range/index.js delete mode 100644 front/core/components/input-range/style.scss create mode 100644 front/core/components/range/index.html create mode 100644 front/core/components/range/index.js create mode 100644 front/core/components/range/style.scss delete mode 100644 front/core/components/spinner/style.css create mode 100644 front/core/components/spinner/style.scss create mode 100644 front/core/components/submit/index.js delete mode 100644 front/core/components/submit/submit.html delete mode 100644 front/core/components/submit/submit.js delete mode 100644 front/core/lib/input.js create mode 100644 front/core/styles/global.scss delete mode 100644 front/core/styles/mdl-override.scss create mode 100644 front/core/styles/util.scss create mode 100644 front/salix/components/descriptor/index.html delete mode 100644 modules/worker/front/index/style.scss diff --git a/e2e/helpers/components_selectors.js b/e2e/helpers/components_selectors.js deleted file mode 100644 index 3e2715ba2..000000000 --- a/e2e/helpers/components_selectors.js +++ /dev/null @@ -1,6 +0,0 @@ -export default { - vnTextfield: 'vn-textfield input', - vnInputNumber: 'vn-input-number input', - vnSubmit: 'vn-submit > input', - vnFloatButton: 'vn-float-button > button' -}; diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js index ee964b534..4148a4a05 100644 --- a/e2e/helpers/extensions.js +++ b/e2e/helpers/extensions.js @@ -15,6 +15,16 @@ let asyncActions = { return exists; }, + hasClass: async function(selector, className) { + return await this.evaluate((selector, className) => { + document.querySelector(selector).classList.contains(className); + }, selector, className); + }, + + parsedUrl: async function() { + return new URL(await this.url()); + }, + // Salix specific extensions changeLanguageToEnglish: async function() { @@ -28,6 +38,15 @@ let asyncActions = { await this.autocompleteSearch(langSelector, 'English'); }, + doLogin: async function(userName, password) { + if (password == null) password = 'nightmare'; + await this.wait(`vn-login [name=user]`) + .clearInput(`vn-login [name=user]`) + .write(`vn-login [name=user]`, userName) + .write(`vn-login [name=password]`, password) + .click(`vn-login button[type=submit]`); + }, + login: async function(userName) { if (currentUser !== userName) { let logoutClicked = await this.clickIfExists('#logout'); @@ -47,11 +66,7 @@ let asyncActions = { this.goto(`${config.url}/#!/login`); } - await this.wait(`vn-login input[name=user]`) - .clearInput(`vn-login input[name=user]`) - .write(`vn-login input[name=user]`, userName) - .write(`vn-login input[name=password]`, 'nightmare') - .click(`vn-login input[type=submit]`) + await this.doLogin(userName, null) .waitForURL('#!/') .changeLanguageToEnglish(); @@ -99,6 +114,10 @@ let asyncActions = { input.value = time; input.dispatchEvent(new Event('change')); }, selector, time); + }, + + isDisabled: async function(selector) { + return await this.hasClass(selector, 'disabled'); } }; @@ -124,21 +143,6 @@ let actions = { .catch(done); }, - resetLogin: function(done) { - this.then(() => { - currentUser = undefined; - done(); - }) - .catch(done); - }, - - parsedUrl: function(done) { - this.url() - .then(url => { - done(null, new URL(url)); - }).catch(done); - }, - getProperty: function(selector, property, done) { this.evaluate_now((selector, property) => { return document.querySelector(selector)[property].replace(/\s+/g, ' ').trim(); diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index bc68f96e4..96c2fe768 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -1,4 +1,3 @@ -import components from './components_selectors.js'; export default { globalItems: { @@ -22,29 +21,29 @@ export default { acceptButton: 'vn-confirm button[response=ACCEPT]' }, clientsIndex: { - searchClientInput: `${components.vnTextfield}`, + searchClientInput: `vn-textfield input`, searchButton: 'vn-searchbar vn-icon[icon="search"]', searchResult: 'vn-client-index .vn-list-item', - createClientButton: `${components.vnFloatButton}`, + createClientButton: `vn-float-button`, othersButton: 'vn-left-menu li[name="Others"] > a' }, createClientView: { - name: `${components.vnTextfield}[name="name"]`, - taxNumber: `${components.vnTextfield}[name="fi"]`, - socialName: `${components.vnTextfield}[name="socialName"]`, - street: `${components.vnTextfield}[name="street"]`, - postcode: `${components.vnTextfield}[name="postcode"]`, - city: `${components.vnTextfield}[name="city"]`, + name: `vn-textfield input[name="name"]`, + taxNumber: `vn-textfield input[name="fi"]`, + socialName: `vn-textfield input[name="socialName"]`, + street: `vn-textfield input[name="street"]`, + postcode: `vn-textfield input[name="postcode"]`, + city: `vn-textfield input[name="city"]`, province: `vn-autocomplete[ng-model="$ctrl.client.provinceFk"]`, country: `vn-autocomplete[ng-model="$ctrl.client.countryFk"]`, - userName: `${components.vnTextfield}[name="userName"]`, - email: `${components.vnTextfield}[name="email"]`, + userName: `vn-textfield input[name="userName"]`, + email: `vn-textfield input[name="email"]`, salesPersonAutocomplete: `vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]`, - createButton: `${components.vnSubmit}`, + createButton: `button[type=submit]`, cancelButton: 'vn-button[href="#!/client/index"]' }, clientDescriptor: { - moreMenu: 'vn-client-descriptor vn-icon-menu > div > vn-icon', + moreMenu: 'vn-client-descriptor vn-icon-menu[icon=more_vert]', simpleTicketButton: '.vn-popover.shown .vn-drop-down li' }, clientBasicData: { @@ -56,17 +55,17 @@ export default { emailInput: 'vn-textfield[ng-model="$ctrl.client.email"] input', salesPersonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]', channelAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.contactChannelFk"]', - saveButton: `${components.vnSubmit}` + saveButton: `button[type=submit]` }, clientFiscalData: { fiscalDataButton: 'vn-left-menu a[ui-sref="client.card.fiscalData"]', - socialNameInput: `${components.vnTextfield}[name="socialName"]`, - fiscalIdInput: `${components.vnTextfield}[name="fi"]`, + socialNameInput: `vn-textfield input[name="socialName"]`, + fiscalIdInput: `vn-textfield input[name="fi"]`, equalizationTaxCheckbox: 'vn-check[label="Is equalizated"]', acceptPropagationButton: 'vn-client-fiscal-data > vn-confirm button[response=ACCEPT]', - addressInput: `${components.vnTextfield}[name="street"]`, - postcodeInput: `${components.vnTextfield}[name="postcode"]`, - cityInput: `${components.vnTextfield}[name="city"]`, + addressInput: `vn-textfield input[name="street"]`, + postcodeInput: `vn-textfield input[name="postcode"]`, + cityInput: `vn-textfield input[name="city"]`, provinceAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.provinceFk"]', countryAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.countryFk"]', activeCheckbox: 'vn-check[label="Active"]', @@ -76,12 +75,12 @@ export default { hasToInvoiceCheckbox: 'vn-check[label="Has to invoice"]', invoiceByMailCheckbox: 'vn-check[label="Invoice by mail"]', viesCheckbox: 'vn-check[label="Vies"]', - saveButton: `${components.vnSubmit}` + saveButton: `button[type=submit]` }, clientBillingData: { payMethodAutocomplete: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.payMethodFk"]', - IBANInput: `vn-client-billing-data ${components.vnTextfield}[name="iban"]`, - dueDayInput: `vn-client-billing-data ${components.vnInputNumber}[name="dueDay"]`, + IBANInput: `vn-client-billing-data vn-textfield input[name="iban"]`, + dueDayInput: `vn-client-billing-data vn-input-number input[name="dueDay"]`, receivedCoreLCRCheckbox: 'vn-client-billing-data vn-check[label="Received LCR"]', receivedCoreVNLCheckbox: 'vn-client-billing-data vn-check[label="Received core VNL"]', receivedB2BVNLCheckbox: 'vn-client-billing-data vn-check[label="Received B2B VNL"]', @@ -92,20 +91,20 @@ export default { newBankEntityBIC: 'vn-client-billing-data > vn-dialog vn-textfield[label="Swift / BIC"] input', newBankEntityCode: 'vn-client-billing-data > vn-dialog vn-textfield[label="Entity Code"] input', acceptBankEntityButton: 'vn-client-billing-data > vn-dialog button[response="ACCEPT"]', - saveButton: `${components.vnSubmit}` + saveButton: `button[type=submit]` }, clientAddresses: { addressesButton: 'vn-left-menu a[ui-sref="client.card.address.index"]', - createAddress: `vn-client-address-index ${components.vnFloatButton}`, + createAddress: `vn-client-address-index vn-float-button`, defaultCheckboxInput: 'vn-check[label="Default"]', - consigneeInput: `${components.vnTextfield}[name="nickname"]`, - streetAddressInput: `${components.vnTextfield}[name="street"]`, - postcodeInput: `${components.vnTextfield}[name="postalCode"]`, - cityInput: `${components.vnTextfield}[name="city"]`, + consigneeInput: `vn-textfield input[name="nickname"]`, + streetAddressInput: `vn-textfield input[name="street"]`, + postcodeInput: `vn-textfield input[name="postalCode"]`, + cityInput: `vn-textfield input[name="city"]`, provinceAutocomplete: 'vn-autocomplete[ng-model="$ctrl.address.provinceFk"]', agencyAutocomplete: 'vn-autocomplete[ng-model="$ctrl.address.agencyModeFk"]', - phoneInput: `${components.vnTextfield}[name="phone"]`, - mobileInput: `${components.vnTextfield}[name="mobile"]`, + phoneInput: `vn-textfield input[name="phone"]`, + mobileInput: `vn-textfield input[name="mobile"]`, defaultAddress: 'vn-client-address-index div:nth-child(1) div[name="street"]', secondMakeDefaultStar: 'vn-client-address-index vn-card div:nth-child(2) vn-icon-button[icon="star_border"]', firstEditAddress: 'vn-client-address-index div:nth-child(1) > a', @@ -117,34 +116,34 @@ export default { secondObservationTypeAutocomplete: 'vn-client-address-edit [name=observations] :nth-child(2) [ng-model="observation.observationTypeFk"]', secondObservationDescriptionInput: 'vn-client-address-edit [name=observations] :nth-child(2) [ng-model="observation.description"] input', addObservationButton: 'vn-client-address-edit div[name="observations"] vn-icon-button[icon="add_circle"]', - saveButton: `${components.vnSubmit}`, + saveButton: `button[type=submit]`, cancelCreateAddressButton: 'button[ui-sref="client.card.address.index"]', cancelEditAddressButton: 'vn-client-address-edit > form > vn-button-bar > vn-button > button' }, clientWebAccess: { webAccessButton: 'vn-left-menu a[ui-sref="client.card.webAccess"]', enableWebAccessCheckbox: 'vn-check[label="Enable web access"]', - userNameInput: `${components.vnTextfield}[name="name"]`, - saveButton: `${components.vnSubmit}` + userNameInput: `vn-textfield input[name="name"]`, + saveButton: `button[type=submit]` }, clientNotes: { - addNoteFloatButton: `${components.vnFloatButton}`, + addNoteFloatButton: `vn-float-button`, noteInput: 'vn-textarea[label="Note"]', - saveButton: `${components.vnSubmit}`, + saveButton: `button[type=submit]`, firstNoteText: 'vn-client-note .text' }, clientCredit: { - addCreditFloatButton: `${components.vnFloatButton}`, - creditInput: `${components.vnInputNumber}[name="credit"]`, - saveButton: `${components.vnSubmit}`, + addCreditFloatButton: `vn-float-button`, + creditInput: `vn-input-number input[name="credit"]`, + saveButton: `button[type=submit]`, firstCreditText: 'vn-client-credit-index vn-card > div vn-table vn-tbody > vn-tr' }, clientGreuge: { - addGreugeFloatButton: `${components.vnFloatButton}`, - amountInput: `${components.vnInputNumber}[name="amount"]`, - descriptionInput: `${components.vnTextfield}[name="description"]`, + addGreugeFloatButton: `vn-float-button`, + amountInput: `vn-input-number input[name="amount"]`, + descriptionInput: `vn-textfield input[name="description"]`, typeAutocomplete: 'vn-autocomplete[ng-model="$ctrl.greuge.greugeTypeFk"]', - saveButton: `${components.vnSubmit}`, + saveButton: `button[type=submit]`, firstGreugeText: 'vn-client-greuge-index vn-card > div vn-table vn-tbody > vn-tr' }, clientMandate: { @@ -163,7 +162,7 @@ export default { clientBalance: { balanceButton: 'vn-left-menu a[ui-sref="client.card.balance.index"]', companyAutocomplete: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyFk"]', - newPaymentButton: `${components.vnFloatButton}`, + newPaymentButton: `vn-float-button`, newPaymentBank: 'vn-client-balance-create vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]', newPaymentAmountInput: 'vn-client-balance-create vn-input-number[ng-model="$ctrl.receipt.amountPaid"] input', saveButton: 'vn-client-balance-create vn-button[label="Save"]', @@ -182,7 +181,7 @@ export default { }, itemsIndex: { searchIcon: 'vn-item-index vn-searchbar vn-icon[icon="search"]', - createItemButton: `${components.vnFloatButton}`, + createItemButton: `vn-float-button`, searchResult: 'vn-item-index a.vn-tr', searchResultPreviewButton: 'vn-item-index .buttons > [icon="desktop_windows"]', searchResultCloneButton: 'vn-item-index .buttons > [icon="icon-clone"]', @@ -208,16 +207,16 @@ export default { saveFieldsButton: 'vn-item-index vn-dialog vn-horizontal:nth-child(16) > vn-button > button' }, itemCreateView: { - temporalName: `${components.vnTextfield}[name="provisionalName"]`, + temporalName: `vn-textfield input[name="provisionalName"]`, typeAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]', intrastatAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.intrastatFk"]', originAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]', - createButton: `${components.vnSubmit}`, - cancelButton: 'button[ui-sref="item.index"]' + createButton: `button[type=submit]`, + cancelButton: 'vn-button[ui-sref="item.index"]' }, itemDescriptor: { goBackToModuleIndexButton: 'vn-item-descriptor a[href="#!/item/index"]', - moreMenu: 'vn-item-descriptor vn-icon-menu > div > vn-icon', + moreMenu: 'vn-item-descriptor vn-icon-menu[icon=more_vert]', moreMenuRegularizeButton: '.vn-popover.shown .vn-drop-down li[name="Regularize stock"]', regularizeQuantityInput: 'vn-item-descriptor vn-dialog tpl-body > div > vn-textfield input', regularizeWarehouseAutocomplete: 'vn-item-descriptor vn-dialog vn-autocomplete[ng-model="$ctrl.warehouseFk"]', @@ -238,7 +237,7 @@ export default { longNameInput: 'vn-textfield[ng-model="$ctrl.item.longName"] input', isActiveCheckbox: 'vn-check[label="Active"]', priceInKgCheckbox: 'vn-check[label="Price in kg"]', - submitBasicDataButton: `${components.vnSubmit}` + submitBasicDataButton: `button[type=submit]` }, itemTags: { goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]', @@ -257,19 +256,19 @@ export default { seventhValueInput: 'vn-item-tags vn-horizontal:nth-child(7) > vn-textfield[label="Value"] input', seventhRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(7) > vn-textfield[label="Relevancy"] input', addItemTagButton: 'vn-item-tags vn-icon-button[icon="add_circle"]', - submitItemTagsButton: `vn-item-tags ${components.vnSubmit}` + submitItemTagsButton: `vn-item-tags button[type=submit]` }, itemTax: { undoChangesButton: 'vn-item-tax vn-button-bar > vn-button[label="Undo changes"]', firstClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(1) > vn-autocomplete[ng-model="tax.taxClassFk"]', secondClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(2) > vn-autocomplete[ng-model="tax.taxClassFk"]', thirdClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(3) > vn-autocomplete[ng-model="tax.taxClassFk"]', - submitTaxButton: `vn-item-tax ${components.vnSubmit}` + submitTaxButton: `vn-item-tax button[type=submit]` }, itemBarcodes: { addBarcodeButton: 'vn-item-barcode vn-icon[icon="add_circle"]', - thirdCodeInput: `vn-item-barcode vn-horizontal:nth-child(3) > ${components.vnTextfield}`, - submitBarcodesButton: `vn-item-barcode ${components.vnSubmit}`, + thirdCodeInput: `vn-item-barcode vn-horizontal:nth-child(3) > vn-textfield input`, + submitBarcodesButton: `vn-item-barcode button[type=submit]`, firstCodeRemoveButton: 'vn-item-barcode vn-horizontal vn-none vn-icon[icon="delete"]' }, itemNiches: { @@ -281,13 +280,13 @@ export default { secondNicheRemoveButton: 'vn-item-niche vn-horizontal:nth-child(2) > vn-none > vn-icon-button[icon="delete"]', thirdWarehouseAutocomplete: 'vn-item-niche vn-horizontal:nth-child(3) > vn-autocomplete[ng-model="niche.warehouseFk"]', thirdCodeInput: 'vn-item-niche vn-horizontal:nth-child(3) > vn-textfield[label="Code"] input', - submitNichesButton: `vn-item-niche ${components.vnSubmit}` + submitNichesButton: `vn-item-niche button[type=submit]` }, itemBotanical: { - botanicalInput: `vn-item-botanical vn-horizontal:nth-child(1) > ${components.vnTextfield}`, + botanicalInput: `vn-item-botanical vn-horizontal:nth-child(1) > vn-textfield input`, genusAutocomplete: 'vn-item-botanical vn-autocomplete[ng-model="$ctrl.botanical.genusFk"]', speciesAutocomplete: 'vn-item-botanical vn-autocomplete[ng-model="$ctrl.botanical.specieFk"]', - submitBotanicalButton: `vn-item-botanical ${components.vnSubmit}` + submitBotanicalButton: `vn-item-botanical button[type=submit]` }, itemSummary: { basicData: 'vn-item-summary [name="basicData"]', @@ -330,13 +329,13 @@ export default { searchResult: 'vn-ticket-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr', searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr', searchResultDate: 'vn-ticket-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(5)', - searchTicketInput: `vn-ticket-index ${components.vnTextfield}`, - searchWeeklyTicketInput: `vn-ticket-weekly-index ${components.vnTextfield}`, + searchTicketInput: `vn-ticket-index vn-textfield input`, + searchWeeklyTicketInput: `vn-ticket-weekly-index vn-textfield input`, searchWeeklyClearInput: 'vn-ticket-weekly-index vn-searchbar vn-icon[icon=clear]', - advancedSearchButton: 'vn-ticket-search-panel vn-submit[label="Search"] input', + advancedSearchButton: 'vn-ticket-search-panel button[type=submit]', searchButton: 'vn-ticket-index vn-searchbar vn-icon[icon="search"]', searchWeeklyButton: 'vn-ticket-weekly-index vn-searchbar vn-icon[icon="search"]', - moreMenu: 'vn-ticket-index vn-icon-menu[vn-id="more-button"] > div > vn-icon', + moreMenu: 'vn-ticket-index vn-icon-menu[icon=more_vert]', moreMenuWeeklyTickets: '.vn-popover.shown .vn-drop-down li:nth-child(2)', sixthWeeklyTicket: 'vn-ticket-weekly-index vn-table vn-tr:nth-child(6) vn-autocomplete[ng-model="weekly.weekDay"] input', weeklyTicket: 'vn-ticket-weekly-index vn-table > div > vn-tbody > vn-tr', @@ -349,13 +348,13 @@ export default { deliveryDateInput: 'vn-ticket-create vn-date-picker[ng-model="$ctrl.landed"]', warehouseAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.warehouseFk"]', agencyAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.ticket.agencyModeFk"]', - createButton: `${components.vnSubmit}` + createButton: `button[type=submit]` }, ticketDescriptor: { idLabelValue: 'vn-ticket-descriptor vn-label-value[label="Id"]', stateLabelValue: 'vn-ticket-descriptor vn-label-value[label="State"]', goBackToModuleIndexButton: 'vn-ticket-descriptor a[ui-sref="ticket.index"]', - moreMenu: 'vn-ticket-descriptor vn-icon-menu > div > vn-icon', + moreMenu: 'vn-ticket-descriptor vn-icon-menu[icon=more_vert]', moreMenuAddStowaway: '.vn-popover.shown .vn-drop-down li[name="Add stowaway"]', moreMenuDeleteStowawayButton: '.vn-popover.shown .vn-drop-down li[name="Remove stowaway"]', moreMenuAddToTurn: '.vn-popover.shown .vn-drop-down li[name="Add turn"]', @@ -365,7 +364,7 @@ export default { changeShippedHourDialog: 'vn-ticket-descriptor vn-dialog[vn-id="changeShippedDialog"]', changeShippedHourInput: 'vn-dialog[vn-id="changeShippedDialog"] [ng-model="$ctrl.newShipped"]', addStowawayDialogFirstTicket: 'vn-ticket-descriptor > vn-add-stowaway > vn-dialog vn-table vn-tbody vn-tr', - shipButton: 'vn-ticket-descriptor > div > div.body > div.quicklinks vn-icon[icon="icon-stowaway"]', + shipButton: 'vn-ticket-descriptor vn-icon[icon="icon-stowaway"]', thursdayButton: 'vn-ticket-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-tool-bar > vn-button:nth-child(4)', saturdayButton: 'vn-ticket-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-tool-bar > vn-button:nth-child(6)', closeStowawayDialog: 'vn-ticket-descriptor > vn-add-stowaway > vn-dialog > div > button[class="close"]', @@ -380,7 +379,7 @@ export default { addNoteButton: 'vn-icon[icon="add_circle"]', firstNoteTypeAutocomplete: 'vn-autocomplete[ng-model="observation.observationTypeFk"]', firstDescriptionInput: 'vn-textfield[label="Description"] input', - submitNotesButton: `${components.vnSubmit}` + submitNotesButton: `button[type=submit]` }, ticketExpedition: { expeditionButton: 'vn-left-menu a[ui-sref="ticket.card.expedition"]', @@ -395,7 +394,7 @@ export default { firstRemovePackageButton: 'vn-icon-button[vn-tooltip="Remove package"]', addPackageButton: 'vn-icon-button[vn-tooltip="Add package"]', clearPackageAutocompleteButton: 'vn-autocomplete[label="Package"] .icons > vn-icon[icon=clear]', - savePackagesButton: `${components.vnSubmit}` + savePackagesButton: `button[type=submit]` }, ticketSales: { saleButton: 'vn-left-menu a[ui-sref="ticket.card.sale"]', @@ -460,9 +459,9 @@ export default { }, ticketTracking: { trackingButton: 'vn-left-menu a[ui-sref="ticket.card.tracking.index"]', - createStateButton: `${components.vnFloatButton}`, + createStateButton: `vn-float-button`, stateAutocomplete: 'vn-ticket-tracking-edit vn-autocomplete[ng-model="$ctrl.stateFk"]', - saveButton: `${components.vnSubmit}`, + saveButton: `button[type=submit]`, cancelButton: 'vn-ticket-tracking-edit vn-button[ui-sref="ticket.card.tracking.index"]' }, ticketBasicData: { @@ -471,8 +470,8 @@ export default { addressAutocomplete: 'vn-autocomplete[ng-model="$ctrl.ticket.addressFk"]', agencyAutocomplete: 'vn-autocomplete[ng-model="$ctrl.agencyModeId"]', zoneAutocomplete: 'vn-autocomplete[ng-model="$ctrl.zoneId"]', - nextStepButton: 'vn-step-control > section > section.buttons > section:nth-child(2) > vn-button', - finalizeButton: 'vn-step-control > section > section.buttons > section:nth-child(2) > vn-submit', + nextStepButton: 'vn-step-control .buttons > section:last-child vn-button', + finalizeButton: 'vn-step-control .buttons > section:last-child button[type=submit]', stepTwoTotalPriceDif: 'vn-ticket-basic-data-step-two > form > vn-card > div > vn-horizontal > table > tfoot > tr > td:nth-child(4)', chargesReasonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.ticket.option"]', }, @@ -487,7 +486,7 @@ export default { quantityInput: 'vn-ticket-request-create vn-input-number input[name=quantity]', priceInput: 'vn-ticket-request-create vn-input-number input[name=price]', firstRemoveRequestButton: 'vn-ticket-request-index vn-icon[icon="delete"]:nth-child(1)', - saveButton: 'vn-ticket-request-create > form > div > vn-button-bar > vn-submit[label="Create"] input', + saveButton: 'vn-ticket-request-create button[type=submit]', firstDescription: 'vn-ticket-request-index vn-table vn-tr:nth-child(1) > vn-td:nth-child(2)', }, @@ -499,7 +498,7 @@ export default { }, ticketService: { addServiceButton: 'vn-ticket-service vn-icon-button[vn-tooltip="Add service"] > button', - firstAddDescriptionButton: 'vn-ticket-service vn-icon-button[vn-tooltip="New service type"] > button', + firstAddDescriptionButton: 'vn-ticket-service vn-icon-button[vn-tooltip="New service type"]', firstDescriptionAutocomplete: 'vn-ticket-service vn-autocomplete[ng-model="service.description"]', firstQuantityInput: 'vn-ticket-service vn-input-number[label="Quantity"] input', firstPriceInput: 'vn-ticket-service vn-input-number[label="Price"] input', @@ -507,22 +506,22 @@ export default { fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(1) vn-icon-button[icon="delete"]', newDescriptionInput: 'vn-ticket-service > vn-dialog vn-textfield[ng-model="$ctrl.newServiceType.name"] input', serviceLine: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(2) > vn-horizontal', - saveServiceButton: `${components.vnSubmit}`, + saveServiceButton: `button[type=submit]`, saveDescriptionButton: 'vn-ticket-service > vn-dialog[vn-id="createServiceTypeDialog"] > div > form > div.buttons > tpl-buttons > button' }, createStateView: { stateAutocomplete: 'vn-autocomplete[ng-model="$ctrl.stateFk"]', workerAutocomplete: 'vn-autocomplete[ng-model="$ctrl.workerFk"]', clearStateInputButton: 'vn-autocomplete[ng-model="$ctrl.stateFk"] .icons > vn-icon[icon=clear]', - saveStateButton: `${components.vnSubmit}` + saveStateButton: `button[type=submit]` }, claimsIndex: { - searchClaimInput: `vn-claim-index ${components.vnTextfield}`, + searchClaimInput: `vn-claim-index vn-textfield input`, searchResult: 'vn-claim-index vn-card > div > vn-table > div > vn-tbody > a', searchButton: 'vn-claim-index vn-searchbar vn-icon[icon="search"]' }, claimDescriptor: { - moreMenu: 'vn-claim-descriptor vn-icon-menu[vn-id="more-button"]', + moreMenu: 'vn-claim-descriptor vn-icon-menu[icon=more_vert]', moreMenuDeleteClaim: '.vn-popover.shown .vn-drop-down li[name="Delete claim"]', acceptDeleteClaim: 'vn-claim-descriptor > vn-confirm[vn-id="confirm-delete-claim"] button[response="ACCEPT"]' }, @@ -541,9 +540,9 @@ export default { }, claimBasicData: { claimStateAutocomplete: 'vn-claim-basic-data vn-autocomplete[ng-model="$ctrl.claim.claimStateFk"]', - responsabilityInputRange: 'vn-input-range', + responsabilityInputRange: 'vn-range', observationInput: 'vn-textarea[ng-model="$ctrl.claim.observation"] textarea', - saveButton: `${components.vnSubmit}` + saveButton: `button[type=submit]` }, claimDetail: { secondItemDiscount: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(6) > span', @@ -569,7 +568,7 @@ export default { secondClaimResponsibleAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimResponsibleFk"]', secondClaimWorkerAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.workerFk"]', secondClaimRedeliveryAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimRedeliveryFk"]', - saveDevelopmentButton: `${components.vnSubmit}` + saveDevelopmentButton: `button[type=submit]` }, claimAction: { importClaimButton: 'vn-claim-action vn-button[label="Import claim"]', @@ -584,9 +583,9 @@ export default { searchResult: 'vn-order-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr', searchResultDate: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(4)', searchResultAddress: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(6)', - searchOrderInput: `vn-order-index ${components.vnTextfield}`, + searchOrderInput: `vn-order-index vn-textfield input`, searchButton: 'vn-order-index vn-searchbar vn-icon[icon="search"]', - createOrderButton: `${components.vnFloatButton}`, + createOrderButton: `vn-float-button`, }, orderDescriptor: { returnToModuleIndexButton: 'vn-order-descriptor a[ui-sref="order.index"]', @@ -597,7 +596,7 @@ export default { addressAutocomplete: 'vn-autocomplete[label="Address"]', agencyAutocomplete: 'vn-autocomplete[label="Agency"]', landedDatePicker: 'vn-date-picker[label="Landed"]', - createButton: `${components.vnSubmit}`, + createButton: `button[type=submit]`, cancelButton: 'vn-button[href="#!/client/index"]' }, orderCatalog: { @@ -609,16 +608,16 @@ export default { openTagSearch: 'vn-catalog-filter > div > vn-vertical > vn-textfield[ng-model="$ctrl.value"] .append i', tagAutocomplete: 'vn-order-catalog-search-panel vn-autocomplete[ng-model="filter.tagFk"]', tagValueInput: 'vn-order-catalog-search-panel vn-textfield[ng-model="filter.value"] input', - searchTagButton: 'vn-order-catalog-search-panel > div > form > vn-horizontal:nth-child(3) > vn-submit > input', - thirdFilterRemoveButton: 'vn-catalog-filter > div > vn-horizontal.chips > vn-chip:nth-child(3) button', - fourthFilterRemoveButton: 'vn-catalog-filter > div > vn-horizontal.chips > vn-chip:nth-child(4) button', + searchTagButton: 'vn-order-catalog-search-panel button[type=submit]', + thirdFilterRemoveButton: 'vn-catalog-filter .chips > vn-chip:nth-child(3) vn-icon[icon=cancel]', + fourthFilterRemoveButton: 'vn-catalog-filter .chips > vn-chip:nth-child(4) vn-icon[icon=cancel]', }, orderBasicData: { clientAutocomplete: 'vn-autocomplete[label="Client"]', addressAutocomplete: 'vn-autocomplete[label="Address"]', agencyAutocomplete: 'vn-autocomplete[label="Agency"]', observationInput: 'vn-textarea[label="Observation"] textarea', - saveButton: `${components.vnSubmit}`, + saveButton: `button[type=submit]`, acceptButton: 'vn-order-basic-data vn-confirm[vn-id="confirm"] button[response="ACCEPT"]' }, orderLine: { @@ -636,7 +635,7 @@ export default { vehicleAutoComplete: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]', agencyAutoComplete: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]', descriptionInput: 'vn-route-create vn-textfield[ng-model="$ctrl.route.description"] input', - submitButton: 'vn-route-create vn-submit > input[type="submit"]' + submitButton: 'vn-route-create button[type=submit]' }, routeDescriptor: { volume: 'vn-route-descriptor vn-label-value[label="Volume"] > section > span' @@ -653,7 +652,7 @@ export default { createdDateInput: 'vn-route-basic-data vn-date-picker[ng-model="$ctrl.route.created"]', startedHourInput: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.started"] input', finishedHourInput: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.finished"] input', - saveButton: 'vn-route-basic-data vn-submit[label="Save"] input' + saveButton: 'vn-route-basic-data button[type=submit]' }, routeTickets: { firstTicketPriority: 'vn-route-tickets vn-tr:nth-child(1) vn-textfield[ng-model="ticket.priority"] input', @@ -668,7 +667,7 @@ export default { }, workerPbx: { extensionInput: 'vn-worker-pbx vn-textfield[ng-model="$ctrl.worker.sip.extension"] input', - saveButton: 'vn-worker-pbx vn-submit[label="Save"] input' + saveButton: 'vn-worker-pbx button[type=submit]' }, workerTimeControl: { timeDialogInput: '.vn-dialog.shown [ng-model="$ctrl.newTime"]', @@ -720,12 +719,12 @@ export default { navigateBackToIndex: 'vn-worker-descriptor vn-icon[icon="chevron_left"]' }, invoiceOutIndex: { - searchInvoiceOutInput: `vn-invoice-out-index ${components.vnTextfield}`, + searchInvoiceOutInput: `vn-invoice-out-index vn-textfield input`, searchButton: 'vn-invoice-out-index vn-searchbar vn-icon[icon="search"]', searchResult: 'vn-invoice-out-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr', }, invoiceOutDescriptor: { - moreMenu: 'vn-invoice-out-descriptor vn-icon-menu[vn-id="more-button"]', + moreMenu: 'vn-invoice-out-descriptor vn-icon-menu[icon=more_vert]', moreMenuDeleteInvoiceOut: '.vn-popover.shown .vn-drop-down li[name="Delete Invoice"]', moreMenuBookInvoiceOut: '.vn-popover.shown .vn-drop-down li[name="Book invoice"]', moreMenuShowInvoiceOutPdf: '.vn-popover.shown .vn-drop-down li[name="Show invoice PDF"]', diff --git a/e2e/paths/01-login/01_login.spec.js b/e2e/paths/01-login/01_login.spec.js index e5a70703e..03acc98a8 100644 --- a/e2e/paths/01-login/01_login.spec.js +++ b/e2e/paths/01-login/01_login.spec.js @@ -1,56 +1,35 @@ import createNightmare from '../../helpers/nightmare'; - describe('Login path', () => { const nightmare = createNightmare(); it('should receive an error when the username is incorrect', async() => { - const username = 'nobody'; - const password = 'nightmare'; - const result = await nightmare - .wait(`vn-login input[name=user]`) - .write(`vn-login input[name=user]`, username) - .write(`vn-login input[name=password]`, password) - .click(`vn-login input[type=submit]`) + .doLogin('badUser', null) .waitForLastSnackbar(); expect(result.length).toBeGreaterThan(0); }); it('should receive an error when the username is blank', async() => { - const password = 'nightmare'; - const result = await nightmare - .clearInput(`vn-login input[name=user]`) - .write(`vn-login input[name=password]`, password) - .click(`vn-login input[type=submit]`) + .doLogin('', null) .waitForLastSnackbar(); expect(result.length).toBeGreaterThan(0); }); it('should receive an error when the password is incorrect', async() => { - const username = 'employee'; - const password = 'badpassword'; - const result = await nightmare - .write(`vn-login input[name=user]`, username) - .write(`vn-login input[name=password]`, password) - .click(`vn-login input[type=submit]`) + .doLogin('employee', 'badPassword') .waitForLastSnackbar(); expect(result.length).toBeGreaterThan(0); }); it('should log in', async() => { - const username = 'employee'; - const password = 'nightmare'; - const url = await nightmare - .write(`vn-login input[name=user]`, username) - .write(`vn-login input[name=password]`, password) - .click(`vn-login input[type=submit]`) + .doLogin('employee', null) .wait('#logout') .parsedUrl(); diff --git a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js b/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js index ae3020d2a..cbe3722de 100644 --- a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js +++ b/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js @@ -42,9 +42,7 @@ describe('Client Edit fiscalData path', () => { it('should not be able to edit the verified data checkbox', async() => { const result = await nightmare .wait(selectors.clientFiscalData.verifiedDataCheckbox) - .evaluate(selector => { - return document.querySelector(selector).getAttribute('disabled'); - }, selectors.clientFiscalData.verifiedDataCheckbox); + .isDisabled(selectors.clientFiscalData.verifiedDataCheckbox); expect(result).toBeTruthy(); }); diff --git a/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js b/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js index 52e2db237..398185ba5 100644 --- a/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js +++ b/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js @@ -16,9 +16,7 @@ describe('Client lock verified data path', () => { const result = await nightmare .wait(200) .wait(selectors.clientFiscalData.verifiedDataCheckbox) - .evaluate(selector => { - return document.querySelector(selector).getAttribute('disabled'); - }, selectors.clientFiscalData.verifiedDataCheckbox); + .isDisabled(selectors.clientFiscalData.verifiedDataCheckbox); expect(result).toBeTruthy(); }); diff --git a/e2e/paths/05-ticket-module/13_services.spec.js b/e2e/paths/05-ticket-module/13_services.spec.js index 31d262778..7172ab5a6 100644 --- a/e2e/paths/05-ticket-module/13_services.spec.js +++ b/e2e/paths/05-ticket-module/13_services.spec.js @@ -17,9 +17,7 @@ describe('Ticket services path', () => { const result = await nightmare .waitToClick(selectors.ticketService.addServiceButton) .wait(selectors.ticketService.firstAddDescriptionButton) - .evaluate(selector => { - return document.querySelector(selector).disabled; - }, selectors.ticketService.firstAddDescriptionButton); + .isDisabled(selectors.ticketService.firstAddDescriptionButton); expect(result).toBeTruthy(); }); diff --git a/e2e/paths/07-order-module/02_catalog.spec.js b/e2e/paths/07-order-module/02_catalog.spec.js index d2a862958..cad95741e 100644 --- a/e2e/paths/07-order-module/02_catalog.spec.js +++ b/e2e/paths/07-order-module/02_catalog.spec.js @@ -66,7 +66,7 @@ describe('Order catalog', () => { const result = await nightmare .waitToClick(selectors.orderCatalog.fourthFilterRemoveButton) .waitToClick(selectors.orderCatalog.thirdFilterRemoveButton) - .waitForNumberOfElements('section.product', 4) + .waitForNumberOfElements('.product', 4) .countElement('section.product'); expect(result).toEqual(4); diff --git a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js index a00d6387d..fd3516d87 100644 --- a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js +++ b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('InvoiceOut descriptor path', () => { +fdescribe('InvoiceOut descriptor path', () => { const nightmare = createNightmare(); let bookedDate; diff --git a/front/core/components/button-menu/button-menu.html b/front/core/components/button-menu/button-menu.html deleted file mode 100644 index 5beeb12fb..000000000 --- a/front/core/components/button-menu/button-menu.html +++ /dev/null @@ -1,13 +0,0 @@ -
- - - -
\ No newline at end of file diff --git a/front/core/components/button-menu/index.html b/front/core/components/button-menu/index.html new file mode 100644 index 000000000..b0977bb93 --- /dev/null +++ b/front/core/components/button-menu/index.html @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/front/core/components/button-menu/button-menu.js b/front/core/components/button-menu/index.js similarity index 83% rename from front/core/components/button-menu/button-menu.js rename to front/core/components/button-menu/index.js index 99f3879ee..d31094d36 100644 --- a/front/core/components/button-menu/button-menu.js +++ b/front/core/components/button-menu/index.js @@ -1,17 +1,13 @@ import ngModule from '../../module'; -import Input from '../../lib/input'; +import Button from '../button'; import assignProps from '../../lib/assign-props'; import './style.scss'; -export default class ButtonMenu extends Input { +export default class ButtonMenu extends Button { constructor($element, $scope, $transclude) { super($element, $scope); this.$transclude = $transclude; - this.input = this.element.querySelector('.mdl-button'); - $element.on('click', e => { - if (!this.disabled) - this.onClick(e); - }); + $element.on('click', e => this.onClick(e)); } get model() { @@ -46,6 +42,7 @@ export default class ButtonMenu extends Input { } onClick(event) { + if (this.disabled) return; if (event.defaultPrevented) return; event.preventDefault(); this.emit('open'); @@ -85,15 +82,14 @@ export default class ButtonMenu extends Input { } ButtonMenu.$inject = ['$element', '$scope', '$transclude']; -ngModule.component('vnButtonMenu', { - template: require('./button-menu.html'), +ngModule.vnComponent('vnButtonMenu', { + template: require('./index.html'), + controller: ButtonMenu, bindings: { - label: '@', showField: '@?', selection: ' - {{$ctrl.label}} - - - \ No newline at end of file diff --git a/front/core/components/button/button.js b/front/core/components/button/button.js deleted file mode 100644 index 4e5cf50a2..000000000 --- a/front/core/components/button/button.js +++ /dev/null @@ -1,34 +0,0 @@ -import ngModule from '../../module'; -import Input from '../../lib/input'; -import './style.scss'; - -export default class Button extends Input { - constructor($element) { - super($element); - this.$element = $element; - this.input = this.element.querySelector('.mdl-button'); - - $element[0].addEventListener('click', event => { - if (this.disabled) - event.stopImmediatePropagation(); - }); - } - - $onInit() { - if (!this.type) - this.type = 'button'; - } -} -Button.$inject = ['$element']; - -ngModule.component('vnButton', { - controller: Button, - template: require('./button.html'), - bindings: { - label: '@?', - disabled: ' + + {{::$ctrl.label}} + + + + \ No newline at end of file diff --git a/front/core/components/button/index.js b/front/core/components/button/index.js new file mode 100644 index 000000000..e1a86eb5d --- /dev/null +++ b/front/core/components/button/index.js @@ -0,0 +1,46 @@ +import ngModule from '../../module'; +import FormInput from '../form-input'; +import './style.scss'; + +export default class Button extends FormInput { + constructor($element, $scope) { + super($element, $scope); + this.design = 'colored'; + this.input = this.element.querySelector('button'); + + let element = this.element; + element.tabIndex = 0; + element.classList.add('vn-button'); + this.element.addEventListener('keyup', e => this.onKeyup(e)); + this.element.addEventListener('click', e => this.onClick(e)); + } + + $onInit() { + this.element.classList.add(this.design); + if (!this.type) this.type = 'button'; + } + + onKeyup(event) { + if (event.code == 'Space') + this.onClick(event); + } + + onClick(event) { + if (event.defaultPrevented) return; + // event.preventDefault(); + + // FIXME: Don't stop event propagation + if (this.disabled) event.stopImmediatePropagation(); + } +} +Button.$inject = ['$element', '$scope']; + +ngModule.vnComponent('vnButton', { + controller: Button, + template: require('./index.html'), + bindings: { + icon: '@?', + type: '@?' + } +}); + diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss index 84bd8659a..74dcbcf9b 100644 --- a/front/core/components/button/style.scss +++ b/front/core/components/button/style.scss @@ -1,5 +1,83 @@ -vn-button { - & > button > vn-icon { - vertical-align: middle; +@import "variables"; + +.vn-button { + display: inline-flex; + align-items: center; + justify-content: center; + height: 36px; + border: none; + border-radius: .1em; + font-family: vn-font-bold; + text-transform: uppercase; + font-size: 14px; + cursor: pointer; + box-sizing: border-box; + outline: none; + + & > button { + width: 100%; + padding: 0 12px; + box-sizing: border-box; + background-color: transparent; + border: none; + height: inherit; + color: inherit; + font: inherit; + display: block; + text-transform: inherit; + cursor: inherit; + outline: none; + display: flex; + align-items: center; + justify-content: center; + + & > vn-icon { + vertical-align: middle; + color: inherit; + font-size: 1.7em; + } } -} \ No newline at end of file + &.colored { + color: white; + background-color: $color-main; + box-shadow: 0 .15em .15em 0 rgba(0, 0, 0, .3); + transition: background 200ms ease-in-out; + + &:not(.disabled) { + &:hover, + &:focus { + background-color: lighten($color-main, 10%); + } + } + } + &.flat { + color: $color-main; + background-color: transparent; + box-shadow: none; + transition: background 200ms ease-in-out; + + &:not(.disabled) { + &:hover, + &:focus { + background-color: $color-hover-cd; + } + } + } + &:hover, + &:focus { + outline: none; + } + &.round { + border-radius: 50%; + height: 3.8em; + width: 3.8em; + + & > button > span { + display: none; + } + } + &.disabled { + opacity: .7; + cursor: initial; + } +} diff --git a/front/core/components/card/card.js b/front/core/components/card/card.js index b812ccf61..a37835995 100644 --- a/front/core/components/card/card.js +++ b/front/core/components/card/card.js @@ -7,7 +7,7 @@ export default function directive() { transclude: true, template: require('./card.html'), link: function($scope, $element, $attrs, $ctrl, $transclude) { - $element.addClass('demo-card-wide mdl-shadow--2dp bg-panel'); + $element.addClass('demo-card-wide vn-shadow bg-panel'); $transclude($scope, function(clone) { angular.element($element[0].querySelector('div')).append(clone); diff --git a/front/core/components/chip/index.html b/front/core/components/chip/index.html index 8696fd8bb..38a56923d 100644 --- a/front/core/components/chip/index.html +++ b/front/core/components/chip/index.html @@ -1,8 +1,7 @@ - - - - - - \ No newline at end of file +
+ + \ No newline at end of file diff --git a/front/core/components/chip/index.js b/front/core/components/chip/index.js index b35c00cbf..6a945559b 100644 --- a/front/core/components/chip/index.js +++ b/front/core/components/chip/index.js @@ -1,17 +1,12 @@ import ngModule from '../../module'; +import Component from '../../lib/component'; import './style.scss'; -export default class Chip { - -/** - * Remove chip event - */ - remove() { - if (this.onRemove) - this.onRemove(); +export default class Chip extends Component { + onRemove() { + if (!this.disabled) this.emit('remove'); } } - Chip.$inject = ['$element', '$scope', '$transclude']; ngModule.component('vnChip', { @@ -20,6 +15,6 @@ ngModule.component('vnChip', { transclude: true, bindings: { disabled: ' { controller = $componentController('vnChip', {$element, $scope, $transclude: () => {}}); })); - describe('remove()', () => { - it(`should call onRemove()`, () => { - controller.onRemove = () => {}; - spyOn(controller, 'onRemove'); - controller.remove(); + describe('onRemove()', () => { + it(`should emit remove event`, () => { + controller.emit = () => {}; + spyOn(controller, 'emit'); + controller.onRemove(); - expect(controller.onRemove).toHaveBeenCalledWith(); + expect(controller.emit).toHaveBeenCalledWith('remove'); }); }); }); diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss index 81e81589c..ee7f46848 100644 --- a/front/core/components/chip/style.scss +++ b/front/core/components/chip/style.scss @@ -1,18 +1,53 @@ @import "variables"; vn-chip { + border-radius: 16px; + background-color: $color-bg; margin: 0 0.5em 0.5em 0; + color: $color-font; + font-size: 14px; + margin: .25em; + display: inline-flex; + align-items: center; + text-overflow: ellipsis; + white-space: nowrap; + height: 28px; + padding: 0 .7em; + overflow: hidden; - .mdl-chip { - background-color: rgba($color-main, 0.9); - color: #FFF + &.colored { + background-color: $color-main; + color: $color-font-dark; } - - .mdl-chip:active { - background-color: $color-main - } - - & > vn-one > span > span { + & > div { + display: flex; + align-items: center; max-width: 100%; + height: 100%; + + & > vn-avatar { + margin-left: -0.7em; + margin-right: .4em; + } } + & > vn-icon { + margin-left: .2em; + margin-right: -0.3em; + vertical-align: middle; + opacity: .6; + cursor: pointer; + transition: opacity 250ms ease-out; + + &:hover, + &:focus { + opacity: 1; + } + } +} + +vn-avatar { + display: inline-block; + height: 28px; + width: 28px; + border-radius: 50%; } \ No newline at end of file diff --git a/front/core/components/color-legend/index.html b/front/core/components/color-legend/index.html deleted file mode 100644 index 613fb2347..000000000 --- a/front/core/components/color-legend/index.html +++ /dev/null @@ -1,8 +0,0 @@ - - - {{legend.name}} - \ No newline at end of file diff --git a/front/core/components/color-legend/index.js b/front/core/components/color-legend/index.js deleted file mode 100644 index f72a501a7..000000000 --- a/front/core/components/color-legend/index.js +++ /dev/null @@ -1,24 +0,0 @@ -import ngModule from '../../module'; -import Component from '../../lib/component'; -import './style.scss'; - -export default class Controller extends Component { - constructor($element, $scope, $attrs) { - super($element, $scope); - this.$attrs = $attrs; - } - - onClick(legend) { - this.emit('click', {legend}); - } -} - -Controller.$inject = ['$element', '$scope', '$attrs']; - -ngModule.component('vnColorLegend', { - template: require('./index.html'), - controller: Controller, - bindings: { - data: ' this.onClick(e)); @@ -43,9 +42,11 @@ export default class Field extends FormInput { } set input(value) { - if (this.input) this.control.removeChild(this.input); + if (this.input) + this.control.removeChild(this.input); this._input = value; - this.control.appendChild(value); + if (value) + this.control.appendChild(value); } get input() { @@ -69,12 +70,10 @@ export default class Field extends FormInput { } set name(value) { - // super.name = value; this.input.name = value; } get name() { - // return super.name; return this.input.name; } @@ -86,36 +85,8 @@ export default class Field extends FormInput { return this.input.placeholder; } - set tabIndex(value) { - this.input.tabIndex = value; - } - - get tabIndex() { - return this.input.tabIndex; - } - - set disabled(value) { - this._disabled = boolTag(value); - this.input.disabled = this._disabled; - this.classList.toggle('disabled', this._disabled); - } - - get disabled() { - return this._disabled; - } - - set readonly(value) { - this._readonly = boolTag(value); - this.input.readOnly = this._readonly; - this.classList.toggle('readonly', this._readonly); - } - - get readonly() { - return this._readonly; - } - set required(value) { - this._required = boolTag(value); + this._required = value; let required = this.element.querySelector('.required'); display(required, this._required); } @@ -182,6 +153,10 @@ export default class Field extends FormInput { fix.innerText = text || ''; } + refreshTabIndex() { + this.input.tabIndex = this.disabled ? -1 : this.tabIndex; + } + onClick() { // if (event.defaultPrevented) return; // event.preventDefault(); @@ -252,15 +227,10 @@ ngModule.vnComponent('vnField', { suffix: '@?', hint: '@?', error: ' .hint { - z-index: -1; padding: 4px 0; height: 12px; color: rgba(0, 0, 0, .4); @@ -255,11 +254,12 @@ transition-duration: 200ms; transition-timing-function: ease-in-out; opacity: 0; + visibility: hidden; &.filled { - z-index: 0; opacity: 1; transform: translateY(0); + visibility: visible; } } &.invalid { diff --git a/front/core/components/float-button/float-button.html b/front/core/components/float-button/float-button.html deleted file mode 100644 index e74a1fce7..000000000 --- a/front/core/components/float-button/float-button.html +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/front/core/components/float-button/float-button.js b/front/core/components/float-button/float-button.js deleted file mode 100644 index beb3dd13b..000000000 --- a/front/core/components/float-button/float-button.js +++ /dev/null @@ -1,8 +0,0 @@ -import ngModule from '../../module'; - -ngModule.component('vnFloatButton', { - template: require('./float-button.html'), - bindings: { - icon: '@' - } -}); diff --git a/front/core/components/float-button/index.js b/front/core/components/float-button/index.js new file mode 100644 index 000000000..32ada7437 --- /dev/null +++ b/front/core/components/float-button/index.js @@ -0,0 +1,13 @@ +import ngModule from '../../module'; +import Button from '../button'; + +export default class FloatButton extends Button { + constructor($element, $scope) { + super($element, $scope); + this.element.classList.add('round'); + } +} + +ngModule.vnComponent('vnFloatButton', { + controller: FloatButton +}); diff --git a/front/core/components/form-input/index.js b/front/core/components/form-input/index.js index 74d98079c..0a1297788 100644 --- a/front/core/components/form-input/index.js +++ b/front/core/components/form-input/index.js @@ -9,6 +9,11 @@ import Component from '../../lib/component'; * @property {Boolean} disabled Put component in disabled mode */ export default class FormInput extends Component { + constructor($element, $scope) { + super($element, $scope); + this.classList = this.element.classList; + } + $onInit() { // XXX: Compatibility with old inputs let attrs = this.$element[0].attributes; @@ -41,6 +46,48 @@ export default class FormInput extends Component { get name() { return this.element.getAttribute('name'); } + + set disabled(value) { + this._disabled = boolTag(value); + this.input.disabled = this._disabled; + this.classList.toggle('disabled', this._disabled); + this.refreshTabIndex(); + } + + get disabled() { + return this._disabled; + } + + set readonly(value) { + this._readonly = boolTag(value); + this.input.readOnly = this._readonly; + this.classList.toggle('readonly', this._readonly); + } + + get readonly() { + return this._readonly; + } + + set tabIndex(value) { + this._tabIndex = value; + this.refreshTabIndex(); + } + + get tabIndex() { + return this._tabIndex; + } + + select() { + this.input.select(); + } + + focus() { + this.input.focus(); + } + + refreshTabIndex() { + this.element.tabIndex = this.disabled ? -1 : this.tabIndex; + } } ngModule.vnComponent('vnFormInput', { @@ -50,9 +97,14 @@ ngModule.vnComponent('vnFormInput', { field: '=?', name: '@?', disabled: ' - - \ No newline at end of file diff --git a/front/core/components/icon-button/icon-button.js b/front/core/components/icon-button/icon-button.js deleted file mode 100644 index ba3ccae3e..000000000 --- a/front/core/components/icon-button/icon-button.js +++ /dev/null @@ -1,39 +0,0 @@ -import ngModule from '../../module'; -import './style.scss'; - -export default class IconButton { - constructor($element) { - this.element = $element[0]; - - if (this.element.getAttribute('tabindex') == null) - this.element.tabIndex = 0; - - this.element.addEventListener('keyup', e => this.onKeyup(e)); - this.element.addEventListener('click', e => this.onClick(e)); - } - - onKeyup(event) { - if (event.code == 'Space') - this.onClick(event); - } - - onClick(event) { - if (event.defaultPrevented) return; - event.preventDefault(); - - // FIXME: Don't use Event.stopPropagation() - let button = this.element.querySelector('button'); - if (this.disabled || button.disabled) - event.stopImmediatePropagation(); - } -} - -IconButton.$inject = ['$element']; -ngModule.component('vnIconButton', { - controller: IconButton, - template: require('./icon-button.html'), - bindings: { - icon: '@', - disabled: ' button { - background-color: transparent; - display: block; - color: inherit; - border: 0; - padding: 0; - font-size: inherit; - &:hover { - background-color: initial; - } - & > vn-icon { - display: block; - font-size: inherit; - } + & > button { + padding: 0 !important; + } + &:focus { + opacity: .6; } } diff --git a/front/core/components/icon-focusable/icon-focusable.html b/front/core/components/icon-focusable/icon-focusable.html deleted file mode 100644 index 4bd8ad78a..000000000 --- a/front/core/components/icon-focusable/icon-focusable.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/front/core/components/icon-focusable/icon-focusable.js b/front/core/components/icon-focusable/icon-focusable.js deleted file mode 100644 index 691ee570f..000000000 --- a/front/core/components/icon-focusable/icon-focusable.js +++ /dev/null @@ -1,29 +0,0 @@ -import ngModule from '../../module'; -import './style.scss'; - -export default class IconFocusable { - constructor($element) { - $element[0].tabIndex = 0; - $element.on("keyup", event => this.onKeyDown(event, $element)); - } - - onKeyDown(event, $element) { - if (event.defaultPrevented) return; - if (event.keyCode == 32 || event.keyCode == 13) { - event.preventDefault(); - $element.triggerHandler('click'); - } - } -} - -IconFocusable.$inject = ['$element']; -ngModule.component('vnIconFocusable', { - controller: IconFocusable, - template: require('./icon-focusable.html'), - bindings: { - icon: '@', - className: '@?', - enabled: ' i, - & > i.material-icons { - display: block; - font-size: inherit; - } -} \ No newline at end of file diff --git a/front/core/components/icon-menu/icon-menu.html b/front/core/components/icon-menu/icon-menu.html deleted file mode 100644 index 93de718ff..000000000 --- a/front/core/components/icon-menu/icon-menu.html +++ /dev/null @@ -1,11 +0,0 @@ -
- - - - -
\ No newline at end of file diff --git a/front/core/components/icon-menu/icon-menu.js b/front/core/components/icon-menu/icon-menu.js deleted file mode 100644 index abc94504e..000000000 --- a/front/core/components/icon-menu/icon-menu.js +++ /dev/null @@ -1,41 +0,0 @@ -import ngModule from '../../module'; -import ButtonMenu from '../button-menu/button-menu'; -import './style.scss'; - -export default class IconMenu extends ButtonMenu { - constructor($element, $scope, $transclude) { - super($element, $scope); - this.$transclude = $transclude; - this.input = this.element.querySelector('.button'); - } -} -IconMenu.$inject = ['$element', '$scope', '$transclude']; - -ngModule.component('vnIconMenu', { - template: require('./icon-menu.html'), - bindings: { - label: '@', - showField: '@?', - selection: ' + + + + + \ No newline at end of file diff --git a/front/core/components/icon-menu/index.js b/front/core/components/icon-menu/index.js new file mode 100644 index 000000000..0549149a8 --- /dev/null +++ b/front/core/components/icon-menu/index.js @@ -0,0 +1,14 @@ +import ngModule from '../../module'; +import ButtonMenu from '../button-menu'; + +export default class IconMenu extends ButtonMenu { + constructor($element, $scope) { + super($element, $scope); + this.element.classList.add('flat'); + } +} + +ngModule.vnComponent('vnIconMenu', { + template: require('./index.html'), + controller: IconMenu +}); diff --git a/front/core/components/icon-menu/style.scss b/front/core/components/icon-menu/style.scss deleted file mode 100644 index df7a5e331..000000000 --- a/front/core/components/icon-menu/style.scss +++ /dev/null @@ -1,8 +0,0 @@ -vn-icon-menu { - cursor: pointer; - - vn-drop-down { - font-family: 'vn-font'; - outline: 0 - } -} \ No newline at end of file diff --git a/front/core/components/index.js b/front/core/components/index.js index 0433744f6..50c1a1bf8 100644 --- a/front/core/components/index.js +++ b/front/core/components/index.js @@ -10,36 +10,35 @@ import './subtitle/subtitle'; import './spinner/spinner'; import './snackbar/snackbar'; import './tooltip/tooltip'; -import './icon-menu/icon-menu'; -import './button-menu/button-menu'; import './popover/popover'; import './drop-down/drop-down'; import './menu/menu'; import './multi-check/multi-check'; -import './button/button'; -import './icon-button/icon-button'; -import './submit/submit'; import './card/card'; -import './float-button/float-button'; import './step-control/step-control'; import './label-value/label-value'; import './pagination/pagination'; import './searchbar/searchbar'; import './scroll-up/scroll-up'; import './autocomplete'; +import './button'; +import './button-menu'; import './calendar'; import './check'; import './chip'; -import './color-legend'; import './data-viewer'; import './date-picker'; import './field'; +import './float-button'; +import './icon-menu'; +import './icon-button'; import './input-number'; -import './input-range'; +import './range'; import './input-time'; import './input-file'; import './list'; import './radio'; +import './submit'; import './table'; import './td-editable'; import './textarea'; diff --git a/front/core/components/input-file/index.html b/front/core/components/input-file/index.html index 4e9c48631..58a2bea0c 100644 --- a/front/core/components/input-file/index.html +++ b/front/core/components/input-file/index.html @@ -1,42 +1,53 @@ -
-
-
-
-
+
+
+
+
+
+
+
{{$ctrl.value}}
- + type="file" + ng-model="$ctrl.files" + accept="{{$ctrl.accept}}"> +
-
-
-
- - info_outline - - - -
-
+
+
+
+ + + + + + +
+
+
+
+
+
+
+
diff --git a/front/core/components/input-file/index.js b/front/core/components/input-file/index.js index d0f93e4f8..3a0066e75 100644 --- a/front/core/components/input-file/index.js +++ b/front/core/components/input-file/index.js @@ -1,15 +1,13 @@ import ngModule from '../../module'; -import Input from '../../lib/input'; +import FormInput from '../form-input'; import './style.scss'; -export default class InputFile extends Input { +export default class InputFile extends FormInput { constructor($element, $scope) { super($element, $scope); - this.element = $element[0]; - this.hasFocus = false; this._multiple = false; this._value = 'Select a file'; - + this.input = this.element.querySelector('input'); this.registerEvents(); } @@ -106,26 +104,12 @@ export default class InputFile extends Input { } } -InputFile.$inject = ['$element', '$scope']; - -ngModule.component('vnInputFile', { +ngModule.vnComponent('vnInputFile', { template: require('./index.html'), controller: InputFile, - transclude: { - leftIcons: '?tLeftIcons', - rightIcons: '?tRightIcons' - }, bindings: { - label: '@?', - name: '@?', - disabled: ' .container { - width: 100%; - position: relative; - padding-bottom: 2px; - display: flex; - - & > .textField { - width: 100%; - display: flex; - align-items: center; - position: relative; - padding-top: 4px; - } - } - - .leftIcons, .rightIcons, .suffix { - display: flex; - color: $color-font-secondary; - - .material-icons { - font-size: 20px !important - } - } - - .suffix vn-icon-button { - padding: 0 - } - - t-left-icons { - padding-right: 0.5em - } - - t-right-icons { - padding-left: 0.5em - } - - .infix { - position: relative; - display: block; - flex: auto; - width: 100%; - min-width: 0; - } - i.clear { - visibility: hidden; - cursor: pointer; - outline: 0; - - &:hover { - color: #222; - } - } - &:hover i.clear { - visibility: visible; - } - i.visible { - visibility: visible; - } - label { - position: absolute; - bottom: 0; - left: 0; - padding: 4px 0!important; - pointer-events: none; - color: $color-font-secondary; - transition-duration: .2s; - transition-timing-function: cubic-bezier(.4,0,.2,1); - } - &.not-empty label{ - bottom: 24px; - color: $color-main; - padding: 0; - font-size: 12px; - } - input { - outline: none; - border: none; - font-family: "Helvetica", "Arial", sans-serif; - display: block; - font-size: 16px; - width: 100%; - background: 0 0; - color: inherit; - padding: 4px; - box-sizing: border-box; - border-bottom: 0!important; - - &[type=number] { - -moz-appearance: textfield; - &::-webkit-outer-spin-button, - &::-webkit-inner-spin-button { - -webkit-appearance: none; - margin: 0; - } - } - &:invalid { - box-shadow: none; - } - } - .underline { - position: absolute; - bottom: 0; - height: 1px; - content: ' '; - pointer-events: none; - width: 100%; - background-color: $color-input-underline; - } - .selected.underline { - background-color: $color-main; - height: 2px; - left: 50%; - width: 0px !important; - transition-duration: 0.2s; - transition-timing-function: cubic-bezier(.4,0,.2,1); - } - - div.selected { - &.container{ - border-bottom: 0px; - } - label { - bottom: 24px; - color: $color-main; - font-size: 12px; - } - .selected.underline{ - left: 0; - width: 100%!important; - } - } - & > div.container > div.textField > div.infix.invalid { - @extend div.selected; - - & > span.mdl-textfield__error { - visibility: visible; - } - & > label { - color: #d50000; - } - } - .infix.invalid + .underline { - background-color: #d50000; - } - - label span:nth-child(2) { - color: $color-alert + input[type=file] { + display: none; } } \ No newline at end of file diff --git a/front/core/components/input-range/index.html b/front/core/components/input-range/index.html deleted file mode 100644 index 649e4de9f..000000000 --- a/front/core/components/input-range/index.html +++ /dev/null @@ -1,9 +0,0 @@ -
- - - - -
\ No newline at end of file diff --git a/front/core/components/input-range/index.js b/front/core/components/input-range/index.js deleted file mode 100644 index 8cfd898c7..000000000 --- a/front/core/components/input-range/index.js +++ /dev/null @@ -1,79 +0,0 @@ -import ngModule from '../../module'; -import Input from '../../lib/input'; -import './style.scss'; - -export default class inputRange extends Input { - constructor($element, $scope) { - super($element, $scope); - this.mdlElement = this.element.querySelector('.mdl-slider'); - componentHandler.upgradeElement(this.mdlElement); - this.mdlElement.addEventListener('change', () => { - this._value = this.input.value; - this.$.$applyAsync(); - if (this._value && this.onChange) - this.emit('change', {value: this._value}); - }); - } - - get value() { - return this._value; - } - - set value(value) { - this._value = value; - this.mdlElement.MaterialSlider.change(value); - } - - get max() { - return this.input.max; - } - - set max(value) { - this.input.max = value; - } - - get min() { - return this.input.min; - } - - set min(value) { - this.input.min = value; - } - - get step() { - return this.input.step; - } - - set step(value) { - this.input.step = value; - } - - get() { - return this._model; - } - - set model(value) { - this._model = value; - } - - set disabled(value) { - this.input.disabled = value; - } -} - -inputRange.$inject = ['$element', '$scope']; - -ngModule.component('vnInputRange', { - template: require('./index.html'), - controller: inputRange, - bindings: { - label: '@?', - disabled: '{{::$ctrl.label}} + + + \ No newline at end of file diff --git a/front/core/components/range/index.js b/front/core/components/range/index.js new file mode 100644 index 000000000..80410875a --- /dev/null +++ b/front/core/components/range/index.js @@ -0,0 +1,50 @@ +import ngModule from '../../module'; +import FormInput from '../form-input'; +import './style.scss'; + +export default class Range extends FormInput { + constructor($element, $scope) { + super($element, $scope); + this.input = this.element.querySelector('input'); + } + + get max() { + return this.input.max; + } + + set max(value) { + this.input.max = value; + } + + get min() { + return this.input.min; + } + + set min(value) { + this.input.min = value; + } + + get step() { + return this.input.step; + } + + set step(value) { + this.input.step = value; + } + + refreshTabIndex() { + this.input.tabIndex = this.disabled ? -1 : this.tabIndex; + } +} + +ngModule.vnComponent('vnRange', { + template: require('./index.html'), + controller: Range, + bindings: { + min: ' label { + font-size: 12px; + + &.main { + color: $color-main; + } + &.min-label { + float: left; + } + &.max-label { + float: right; + } + } + & > input { + cursor: pointer; + height: 30px; + display: block; + width: 100%; + background: transparent; + border-color: transparent; + -webkit-appearance: none; + margin: .2em 0; + + &:focus { + outline: none; + } + &::-moz-focus-outer { + border: 0; + } + @include range( + "-moz-range-thumb", + "-moz-range-track" + ); + @include range( + "-webkit-slider-thumb", + "-webkit-slider-runnable-track" + ); + @include range( + "-ms-thumb", + "-ms-track" + ); + &:disabled { + cursor: initial; + } + } +} diff --git a/front/core/components/scroll-up/scroll-up.html b/front/core/components/scroll-up/scroll-up.html index 3f3b309d5..a3748acc6 100644 --- a/front/core/components/scroll-up/scroll-up.html +++ b/front/core/components/scroll-up/scroll-up.html @@ -1,5 +1,6 @@ - \ No newline at end of file + vn-tooltip="Go up" + class="round"> + \ No newline at end of file diff --git a/front/core/components/scroll-up/style.scss b/front/core/components/scroll-up/style.scss index 0d5cd6c58..1bf7ea982 100644 --- a/front/core/components/scroll-up/style.scss +++ b/front/core/components/scroll-up/style.scss @@ -1,6 +1,6 @@ vn-scroll-up { - top: 5em; - right: 2.5em; + top: 5.5em; + right: 2em; display: none; position: fixed; } \ No newline at end of file diff --git a/front/core/components/searchbar/style.scss b/front/core/components/searchbar/style.scss index b3fa4b1a2..03cc0cd8d 100644 --- a/front/core/components/searchbar/style.scss +++ b/front/core/components/searchbar/style.scss @@ -2,6 +2,7 @@ vn-searchbar { display: block; + width: 100%; } .search-panel { diff --git a/front/core/components/spinner/spinner.html b/front/core/components/spinner/spinner.html index 47b6e42fe..b6a3af8be 100644 --- a/front/core/components/spinner/spinner.html +++ b/front/core/components/spinner/spinner.html @@ -1,2 +1,12 @@ - -
- - - - - - - - - - - - -
+ +
-
- + tabindex="-1" + icon="delete"> +
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html index 314d71bc9..46600c0da 100644 --- a/modules/claim/front/summary/index.html +++ b/modules/claim/front/summary/index.html @@ -30,16 +30,18 @@ - - +

Detail

diff --git a/modules/client/front/address/create/index.html b/modules/client/front/address/create/index.html index 8c30f9929..30e49590c 100644 --- a/modules/client/front/address/create/index.html +++ b/modules/client/front/address/create/index.html @@ -119,12 +119,10 @@ - + diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html index eed8277af..ce80ea5a6 100644 --- a/modules/client/front/basic-data/index.html +++ b/modules/client/front/basic-data/index.html @@ -5,70 +5,68 @@ form="form" save="patch"> -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/modules/client/front/credit-insurance/insurance/create/index.html b/modules/client/front/credit-insurance/insurance/create/index.html index f652f6011..a28fb605b 100644 --- a/modules/client/front/credit-insurance/insurance/create/index.html +++ b/modules/client/front/credit-insurance/insurance/create/index.html @@ -35,9 +35,9 @@ - + + \ No newline at end of file diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html index 84f3ca10e..32d785fe3 100644 --- a/modules/client/front/descriptor/index.html +++ b/modules/client/front/descriptor/index.html @@ -63,31 +63,8 @@ ng-class="{bright: $ctrl.client.isTaxDataChecked == false}">
-
- - - - - - - - - - - - -
+ + \ No newline at end of file diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html index 211560d28..3960c3925 100644 --- a/modules/invoiceOut/front/descriptor/index.html +++ b/modules/invoiceOut/front/descriptor/index.html @@ -33,24 +33,9 @@ value="{{$ctrl.invoiceOut.company.code}}"> -
- - - - - - - - -
+ + - - + + + + diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index cd12c253f..e273b02e4 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -64,32 +64,9 @@ ng-class="{bright: $ctrl.item.isActive == false}"> -
- - - - - - - - - - - - -
+ +
- +
-
- - - - - - - - - - - - -
+ + - +
+ class="colored"> {{$ctrl.category.value}} + class="colored"> {{$ctrl.type.value}} + class="colored"> {{::tag.value}} - +
\ No newline at end of file diff --git a/modules/order/front/filter/style.scss b/modules/order/front/filter/style.scss index 52125ace6..0cac5765f 100644 --- a/modules/order/front/filter/style.scss +++ b/modules/order/front/filter/style.scss @@ -39,10 +39,12 @@ vn-catalog-filter > div { } } .chips { + display: flex; flex-wrap: wrap; padding: $spacing-md; + overflow: hidden; + max-width: 100%; } - vn-autocomplete[vn-id="type"] .list { max-height: 20em } diff --git a/modules/order/front/prices-popover/index.html b/modules/order/front/prices-popover/index.html index 3a7f34462..a88e027ac 100644 --- a/modules/order/front/prices-popover/index.html +++ b/modules/order/front/prices-popover/index.html @@ -1,13 +1,11 @@
- - - + - +
@@ -74,32 +72,9 @@ -
- - - - - - - - - - - - -
+ +
-
- - - - - - - - - - - - -
+ +
-
- - - - - - - - - - - - + + +
- - +
- + diff --git a/modules/ticket/front/sale/style.scss b/modules/ticket/front/sale/style.scss index fb70f0844..2a18e0920 100644 --- a/modules/ticket/front/sale/style.scss +++ b/modules/ticket/front/sale/style.scss @@ -5,13 +5,6 @@ vn-ticket-sale { justify-content: space-between !important; align-items: center; } - - vn-ticket-sale { - tr .mdl-textfield{ - width: inherit; - max-width: 100%; - } - } vn-table { img { border-radius: 50%; diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html index b1ce19f83..de8145ef1 100644 --- a/modules/ticket/front/services/index.html +++ b/modules/ticket/front/services/index.html @@ -20,15 +20,16 @@ show-field="name" value-field="name" ng-model="service.description"> + + + + - - { +describe('Ticket component vnTicketService', () => { let controller; let $httpBackend; let $httpParamSerializer; diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 584360121..89cf97ca9 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -6,6 +6,8 @@ diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html index d832fa960..a8225981f 100644 --- a/modules/worker/front/calendar/index.html +++ b/modules/worker/front/calendar/index.html @@ -23,7 +23,14 @@ {{'of' | translate}} {{$ctrl.calendar.totalHolidays}} {{'days' | translate}} - +
+ + + + {{legend.name}} + +
\ No newline at end of file diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html index 5bb9b22e5..cf5279ad8 100644 --- a/modules/worker/front/descriptor/index.html +++ b/modules/worker/front/descriptor/index.html @@ -36,11 +36,9 @@
- - + vn-tooltip="Go to client" + class="vn-button"> +
diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html index c27f3aed4..87abf1539 100644 --- a/modules/worker/front/index/index.html +++ b/modules/worker/front/index/index.html @@ -7,9 +7,8 @@
- + Date: Fri, 18 Oct 2019 21:54:13 +0200 Subject: [PATCH 2/7] Style fixes --- .../01_descriptor.spec.js | 2 +- front/core/components/card/style.scss | 1 + front/core/components/icon-button/style.scss | 2 +- front/core/components/searchbar/searchbar.html | 2 +- front/salix/components/home/home.html | 1 - front/salix/components/home/style.scss | 4 ++-- modules/agency/front/index/index.html | 2 +- modules/claim/front/index/index.html | 2 +- modules/client/front/index/index.html | 2 +- modules/invoiceOut/front/index/index.html | 18 ++++++++---------- modules/item/front/index/index.html | 2 +- modules/order/front/index/index.html | 2 +- modules/route/front/index/index.html | 2 +- modules/ticket/front/index/index.html | 2 +- modules/travel/front/index/index.html | 2 +- modules/worker/front/index/index.html | 2 +- 16 files changed, 23 insertions(+), 25 deletions(-) diff --git a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js index fd3516d87..a00d6387d 100644 --- a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js +++ b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -fdescribe('InvoiceOut descriptor path', () => { +describe('InvoiceOut descriptor path', () => { const nightmare = createNightmare(); let bookedDate; diff --git a/front/core/components/card/style.scss b/front/core/components/card/style.scss index c2fe4e1ea..a459879df 100644 --- a/front/core/components/card/style.scss +++ b/front/core/components/card/style.scss @@ -1,3 +1,4 @@ vn-card { display: block; + box-sizing: border-box; } \ No newline at end of file diff --git a/front/core/components/icon-button/style.scss b/front/core/components/icon-button/style.scss index 3dd41d723..c73580ad9 100644 --- a/front/core/components/icon-button/style.scss +++ b/front/core/components/icon-button/style.scss @@ -5,7 +5,7 @@ vn-icon-button { color: $color-main; & > button { - padding: 0 !important; + padding: .2em !important; } &:focus { opacity: .6; diff --git a/front/core/components/searchbar/searchbar.html b/front/core/components/searchbar/searchbar.html index c231b9752..069a9411c 100644 --- a/front/core/components/searchbar/searchbar.html +++ b/front/core/components/searchbar/searchbar.html @@ -1,6 +1,6 @@
diff --git a/front/salix/components/home/home.html b/front/salix/components/home/home.html index b6aaeced1..95bec4e5a 100644 --- a/front/salix/components/home/home.html +++ b/front/salix/components/home/home.html @@ -9,7 +9,6 @@

- diff --git a/front/salix/components/home/style.scss b/front/salix/components/home/style.scss index cab44ea73..b004b7336 100644 --- a/front/salix/components/home/style.scss +++ b/front/salix/components/home/style.scss @@ -49,9 +49,9 @@ vn-home { text-align: center; } & > h4 { - max-width: 7em; + max-width: 100%; text-align: center; - font-size: 13pt; + font-size: 12pt; overflow: hidden; color: inherit; margin: 0; diff --git a/modules/agency/front/index/index.html b/modules/agency/front/index/index.html index c2cd52faa..8c039cdef 100644 --- a/modules/agency/front/index/index.html +++ b/modules/agency/front/index/index.html @@ -7,7 +7,7 @@ auto-load="true">
- +
- +
- +
-
- - - - -
+ + + + diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 0b0030689..3ed297baa 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -6,7 +6,7 @@ data="items">
- +
- +
- +
- +
- +
- + Date: Fri, 18 Oct 2019 22:07:55 +0200 Subject: [PATCH 3/7] Style fixes --- modules/item/front/descriptor/style.scss | 1 + modules/item/front/summary/index.html | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/item/front/descriptor/style.scss b/modules/item/front/descriptor/style.scss index 8b08071e1..257e46e1c 100644 --- a/modules/item/front/descriptor/style.scss +++ b/modules/item/front/descriptor/style.scss @@ -5,6 +5,7 @@ vn-item-descriptor { img[ng-src] { height: 100%; width: 100%; + display: block; } vn-dialog[vn-id=regularize]{ vn-textfield{ diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html index 4a1e4fb56..a3ab3d8ae 100644 --- a/modules/item/front/summary/index.html +++ b/modules/item/front/summary/index.html @@ -2,11 +2,9 @@
{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}
- - - +

Visible

From de9a8443ca6b38f313cc09f099e069713aa2574c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 18 Oct 2019 22:28:08 +0200 Subject: [PATCH 4/7] Style fixes --- front/core/components/field/style.scss | 4 +- front/core/components/toggle/style.scss | 2 +- front/core/styles/global.scss | 2 +- front/core/styles/variables.scss | 2 +- modules/claim/front/detail/index.html | 128 ++++++++++++------------ 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss index 8441fb04a..e57b27912 100644 --- a/front/core/components/field/style.scss +++ b/front/core/components/field/style.scss @@ -35,7 +35,7 @@ & > .fix { padding-top: 24px; line-height: 24px; - font-size: $input-font-size; + font-size: $font-size; opacity: 0; transition: opacity 200ms ease-in-out; @@ -58,7 +58,7 @@ border: none; font-family: Arial, sans-serif; display: block; - font-size: $input-font-size; + font-size: $font-size; width: 100%; background: 0; color: inherit; diff --git a/front/core/components/toggle/style.scss b/front/core/components/toggle/style.scss index 13b7406f6..a373b6f4c 100644 --- a/front/core/components/toggle/style.scss +++ b/front/core/components/toggle/style.scss @@ -11,7 +11,7 @@ cursor: inherit; } & > span { - font-size: $input-font-size; + font-size: $font-size; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/front/core/styles/global.scss b/front/core/styles/global.scss index 2c99aa45b..5f001736b 100644 --- a/front/core/styles/global.scss +++ b/front/core/styles/global.scss @@ -6,7 +6,7 @@ html, body { height: 100%; font-family: vn-font; color: $color-font; - font-size: 12pt; + font-size: $font-size; margin: 0; padding: 0; } diff --git a/front/core/styles/variables.scss b/front/core/styles/variables.scss index 1783a4c01..454bc6f7c 100644 --- a/front/core/styles/variables.scss +++ b/front/core/styles/variables.scss @@ -3,7 +3,7 @@ $menu-width: 16em; $topbar-height: 4em; $mobile-width: 800px; -$input-font-size: 16px; +$font-size: 16px; // Width diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html index 4a5767194..30387ed43 100644 --- a/modules/claim/front/detail/index.html +++ b/modules/claim/front/detail/index.html @@ -1,12 +1,14 @@ - - - @@ -15,70 +17,68 @@ value="{{$ctrl.claimedTotal | currency: 'EUR':2}}"> - - - - - - - Landed - Quantity - Claimed - Description - Price - Disc. - Total - - - - - - {{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}} - {{::saleClaimed.sale.quantity}} - - - - - - - {{::saleClaimed.sale.concept}} - - - {{::saleClaimed.sale.price | currency: 'EUR':2}} - - - {{::saleClaimed.sale.discount}} % - - - - {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}} - - - - - - - - - - - + + + + + + Landed + Quantity + Claimed + Description + Price + Disc. + Total + + + + + + {{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}} + {{::saleClaimed.sale.quantity}} + + + + + + + {{::saleClaimed.sale.concept}} + + + {{::saleClaimed.sale.price | currency: 'EUR':2}} + + + {{::saleClaimed.sale.discount}} % + + + + {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}} + + + + + + + + + + - From 470b966e85e416c6e5f53b4c60ea58599ca9e2e7 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 18 Oct 2019 22:54:25 +0200 Subject: [PATCH 5/7] Style fixes --- front/salix/components/summary/style.scss | 1 + front/salix/styles/misc.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/front/salix/components/summary/style.scss b/front/salix/components/summary/style.scss index 9fd85be3c..558b9b758 100644 --- a/front/salix/components/summary/style.scss +++ b/front/salix/components/summary/style.scss @@ -21,6 +21,7 @@ flex-wrap: wrap; padding: $spacing-md; overflow: hidden; + align-items: flex-start; h4 { margin-bottom: $spacing-md; diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss index 6dcaab060..0983264bc 100644 --- a/front/salix/styles/misc.scss +++ b/front/salix/styles/misc.scss @@ -2,7 +2,7 @@ @import "./effects"; form vn-horizontal { - align-items: stretch; + align-items: center; & > * { box-sizing: border-box; From 72017a64ac888fc8e403bd1de0fba027fa925f1e Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 19 Oct 2019 01:18:25 +0200 Subject: [PATCH 6/7] Date timezone offset properly handled from backend DB connector --- front/core/components/date-picker/index.js | 2 +- .../core/components/date-picker/index.spec.js | 4 +-- front/core/components/input-time/index.js | 2 +- .../core/components/input-time/index.spec.js | 2 +- front/core/filters/dateTime.js | 21 ------------- front/core/filters/index.js | 1 - loopback/server/connectors/vn-mysql.js | 31 ------------------- loopback/server/datasources.json | 2 ++ modules/agency/back/methods/zone/clone.js | 4 --- modules/agency/front/descriptor/index.html | 2 +- modules/agency/front/events/index.html | 6 ++-- modules/agency/front/exclusions/index.html | 2 +- modules/agency/front/index/index.html | 2 +- modules/agency/front/location/index.html | 5 +-- modules/agency/front/summary/index.html | 2 +- modules/claim/front/action/index.html | 6 ++-- modules/claim/front/basic-data/index.html | 2 +- modules/claim/front/descriptor/index.html | 2 +- modules/claim/front/detail/index.html | 4 +-- modules/claim/front/index/index.html | 2 +- modules/claim/front/summary/index.html | 6 ++-- modules/client/front/balance/index/index.html | 8 ++--- .../front/credit-insurance/index/index.html | 6 ++-- .../insurance/index/index.html | 2 +- modules/client/front/credit/index/index.html | 2 +- modules/client/front/dms/index/index.html | 2 +- modules/client/front/greuge/index/index.html | 2 +- modules/client/front/mandate/index.html | 4 +-- modules/client/front/note/index/index.html | 2 +- .../client/front/recovery/index/index.html | 4 +-- modules/client/front/sample/index/index.html | 2 +- modules/client/front/summary/index.html | 2 +- modules/client/front/web-payment/index.html | 2 +- .../invoiceOut/front/descriptor/index.html | 2 +- modules/invoiceOut/front/index/index.html | 6 ++-- modules/invoiceOut/front/summary/index.html | 10 +++--- modules/item/front/diary/index.html | 2 +- modules/item/front/last-entries/index.html | 2 +- modules/item/front/request/index.html | 6 ++-- modules/order/front/descriptor/index.html | 2 +- modules/order/front/index/index.html | 2 +- modules/order/front/line/index.html | 2 +- modules/order/front/summary/index.html | 4 +-- modules/route/front/descriptor/index.html | 2 +- modules/route/front/index/index.html | 2 +- modules/route/front/summary/index.html | 6 ++-- .../front/basic-data/step-one/index.html | 2 +- .../ticket/front/descriptor/addStowaway.html | 2 +- modules/ticket/front/descriptor/index.html | 2 +- .../front/descriptor/removeStowaway.html | 2 +- modules/ticket/front/dms/index/index.html | 2 +- modules/ticket/front/expedition/index.html | 2 +- modules/ticket/front/index/index.html | 6 ++-- modules/ticket/front/request/index/index.html | 2 +- modules/ticket/front/sale-tracking/index.html | 2 +- modules/ticket/front/sale/index.html | 2 +- modules/ticket/front/summary/index.html | 8 ++--- .../ticket/front/tracking/index/index.html | 2 +- modules/ticket/front/weekly/index/index.html | 2 +- modules/travel/front/index/index.html | 4 +-- .../methods/worker-time-control/addTime.js | 3 -- modules/worker/front/log/index.html | 2 +- modules/worker/front/time-control/index.html | 2 +- 63 files changed, 93 insertions(+), 150 deletions(-) delete mode 100644 front/core/filters/dateTime.js diff --git a/front/core/components/date-picker/index.js b/front/core/components/date-picker/index.js index 933123485..b667674fa 100644 --- a/front/core/components/date-picker/index.js +++ b/front/core/components/date-picker/index.js @@ -43,7 +43,7 @@ class DatePicker extends Field { set field(value) { super.field = value; - this.input.value = this.$filter('dateTime')(value, 'yyyy-MM-dd'); + this.input.value = this.$filter('date')(value, 'yyyy-MM-dd'); } } DatePicker.$inject = ['$element', '$scope', '$compile', '$translate', '$filter']; diff --git a/front/core/components/date-picker/index.spec.js b/front/core/components/date-picker/index.spec.js index b6f6fbd2f..38d344fc9 100644 --- a/front/core/components/date-picker/index.spec.js +++ b/front/core/components/date-picker/index.spec.js @@ -22,10 +22,10 @@ describe('Component vnDatePicker', () => { it(`should display the formated the date`, () => { let today; today = new Date(); - today.setUTCHours(0, 0, 0, 0); + today.setHours(0, 0, 0, 0); $ctrl.field = today; - let displayed = $filter('dateTime')(today, 'yyyy-MM-dd'); + let displayed = $filter('date')(today, 'yyyy-MM-dd'); expect($ctrl.value).toEqual(displayed); }); diff --git a/front/core/components/input-time/index.js b/front/core/components/input-time/index.js index 3dc01e0c7..d77ccbec2 100644 --- a/front/core/components/input-time/index.js +++ b/front/core/components/input-time/index.js @@ -15,7 +15,7 @@ export default class InputTime extends Field { } set field(value) { - this.input.value = this.$filter('dateTime')(value, 'HH:mm'); + this.input.value = this.$filter('date')(value, 'HH:mm'); super.field = value; } diff --git a/front/core/components/input-time/index.spec.js b/front/core/components/input-time/index.spec.js index f1ab14b50..0ab0fc762 100644 --- a/front/core/components/input-time/index.spec.js +++ b/front/core/components/input-time/index.spec.js @@ -24,7 +24,7 @@ describe('Component vnInputTime', () => { it(`should display the formated the date`, () => { let date = new Date(); $ctrl.field = date; - let displayed = $filter('dateTime')(date, 'HH:mm'); + let displayed = $filter('date')(date, 'HH:mm'); expect($ctrl.value).toEqual(displayed); }); diff --git a/front/core/filters/dateTime.js b/front/core/filters/dateTime.js deleted file mode 100644 index a4a527160..000000000 --- a/front/core/filters/dateTime.js +++ /dev/null @@ -1,21 +0,0 @@ -import ngModule from '../module'; - -/** - * Returns a formatted date based on input filter. - * - * @return {String} The string result - */ -dateTime.$inject = ['$filter']; - -export default function dateTime($filter) { - return function(input, format) { - if (typeof input === 'string' && input) { - input = new Date(input); - let offset = input.getTimezoneOffset() * 60000; - input.setTime(input.getTime() + offset); - } - - return $filter('date')(input, format); - }; -} -ngModule.filter('dateTime', dateTime); diff --git a/front/core/filters/index.js b/front/core/filters/index.js index 26c2db213..cc4dff823 100644 --- a/front/core/filters/index.js +++ b/front/core/filters/index.js @@ -1,7 +1,6 @@ import './phone'; import './ucwords'; import './dash-if-empty'; -import './dateTime'; import './percentage'; import './currency'; import './zero-fill'; diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js index 2ea30b598..5c625be85 100644 --- a/loopback/server/connectors/vn-mysql.js +++ b/loopback/server/connectors/vn-mysql.js @@ -5,37 +5,6 @@ const EnumFactory = require('loopback-connector-mysql').EnumFactory; const fs = require('fs'); class VnMySQL extends MySQL { - toColumnValue(prop, val) { - if (val == null || !prop || prop.type !== Date) - return MySQL.prototype.toColumnValue.call(this, prop, val); - - val = new Date(val); - - return val.getFullYear() + '-' + - fillZeros(val.getMonth() + 1) + '-' + - fillZeros(val.getDate()) + ' ' + - fillZeros(val.getHours()) + ':' + - fillZeros(val.getMinutes()) + ':' + - fillZeros(val.getSeconds()); - - function fillZeros(v) { - return v < 10 ? '0' + v : v; - } - } - fromColumnValue(prop, val) { - if (val == null || !prop || prop.type !== Date) - return MySQL.prototype.fromColumnValue.call(this, prop, val); - - let date = new Date(val); - - return date; - } - - isIsoDate(dateString) { - let isoRegexp = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/g; - return isoRegexp.test(dateString); - } - /** * Promisified version of execute(). * diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json index 4c9e407a0..bbd8ce0d5 100644 --- a/loopback/server/datasources.json +++ b/loopback/server/datasources.json @@ -12,6 +12,8 @@ "username": "root", "password": "root", "multipleStatements": true, + "legacyUtcDateProcessing": false, + "timezone": "local", "connectTimeout": 20000, "acquireTimeout": 20000 }, diff --git a/modules/agency/back/methods/zone/clone.js b/modules/agency/back/methods/zone/clone.js index 7924415ed..3d0008a27 100644 --- a/modules/agency/back/methods/zone/clone.js +++ b/modules/agency/back/methods/zone/clone.js @@ -40,10 +40,6 @@ module.exports = Self => { where: {id} }, options); - const hour = zone.hour; - const offset = hour.getTimezoneOffset() * 60000; - hour.setTime(hour.getTime() + offset); - // Find all original included geolocations const includedGeo = await models.ZoneIncluded.find({ fields: ['geoFk', 'isIncluded'], diff --git a/modules/agency/front/descriptor/index.html b/modules/agency/front/descriptor/index.html index d6de7791e..ffed14551 100644 --- a/modules/agency/front/descriptor/index.html +++ b/modules/agency/front/descriptor/index.html @@ -31,7 +31,7 @@ value="{{$ctrl.zone.agencyMode.name}}"> + value="{{$ctrl.zone.hour | date: 'HH:mm'}}"> diff --git a/modules/agency/front/events/index.html b/modules/agency/front/events/index.html index eba9a9ac0..91864dc7c 100644 --- a/modules/agency/front/events/index.html +++ b/modules/agency/front/events/index.html @@ -15,13 +15,13 @@
- {{::row.from | dateTime:'dd/MM/yyyy'}} + {{::row.from | date:'dd/MM/yyyy'}}
- {{::row.from | dateTime:'dd/MM/yyyy'}} - {{::row.to | dateTime:'dd/MM/yyyy'}} + {{::row.from | date:'dd/MM/yyyy'}} - {{::row.to | date:'dd/MM/yyyy'}} Indefinitely @@ -32,7 +32,7 @@
+ value="{{::row.hour | date:'hh:mm'}}"> - {{::row.day | dateTime:'dd/MM/yyyy'}} + {{::row.day | date:'dd/MM/yyyy'}} {{::zone.id}} {{::zone.name}} {{::zone.agencyMode.name}} - {{::zone.hour | dateTime: 'HH:mm'}} + {{::zone.hour | date: 'HH:mm'}} {{::zone.price | currency: 'EUR':2}} diff --git a/modules/agency/front/location/index.html b/modules/agency/front/location/index.html index 4931e02fd..e01f1257a 100644 --- a/modules/agency/front/location/index.html +++ b/modules/agency/front/location/index.html @@ -4,8 +4,9 @@ filter="::$ctrl.filter">
- - + diff --git a/modules/agency/front/summary/index.html b/modules/agency/front/summary/index.html index eeb4d495e..f0336f0dc 100644 --- a/modules/agency/front/summary/index.html +++ b/modules/agency/front/summary/index.html @@ -14,7 +14,7 @@ + value="{{$ctrl.summary.hour | date: 'HH:mm'}}"> diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html index 72207d418..329514b37 100644 --- a/modules/claim/front/action/index.html +++ b/modules/claim/front/action/index.html @@ -92,7 +92,7 @@ on-change="$ctrl.setClaimDestination(saleClaimed.id, value)"> - {{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}} {{::saleClaimed.sale.quantity}} {{::saleClaimed.sale.concept}} {{::saleClaimed.sale.price | currency: 'EUR':2}} @@ -145,7 +145,7 @@ class="clickable" ng-click="$ctrl.addClaimedSale(sale.saleFk)"> {{sale.saleFk}} - {{sale.landed | dateTime: 'dd/MM/yyyy'}} + {{sale.landed | date: 'dd/MM/yyyy'}} {{sale.quantity}} {{sale.concept}} {{sale.price | currency: 'EUR':2}} @@ -182,7 +182,7 @@ ng-repeat="ticket in lastTickets" ng-click="$ctrl.importTicketLines(ticket.id)"> {{::ticket.id}} - {{::ticket.shipped | dateTime: 'dd/MM/yyyy'}} + {{::ticket.shipped | date: 'dd/MM/yyyy'}} {{::ticket.agencyMode.name}} {{::ticket.warehouse.name}} diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html index 289f8f197..1c68f6673 100644 --- a/modules/claim/front/basic-data/index.html +++ b/modules/claim/front/basic-data/index.html @@ -17,7 +17,7 @@ diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html index 431989bbd..313cf1b94 100644 --- a/modules/claim/front/descriptor/index.html +++ b/modules/claim/front/descriptor/index.html @@ -27,7 +27,7 @@ value="{{$ctrl.claim.claimState.description}}"> + value="{{$ctrl.claim.created | date: 'dd/MM/yyyy HH:mm'}}"> diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html index 30387ed43..ad59fadd9 100644 --- a/modules/claim/front/detail/index.html +++ b/modules/claim/front/detail/index.html @@ -34,7 +34,7 @@ - {{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}} + {{::saleClaimed.sale.ticket.landed | date:'dd/MM/yyyy'}} {{::saleClaimed.sale.quantity}} - {{sale.landed | dateTime: 'dd/MM/yyyy'}} + {{sale.landed | date: 'dd/MM/yyyy'}} {{sale.quantity}} - {{::claim.created | dateTime:'dd/MM/yyyy'}} + {{::claim.created | date:'dd/MM/yyyy'}} + value="{{$ctrl.summary.claim.created | date: 'dd/MM/yyyy'}}"> @@ -66,7 +66,7 @@ {{::saleClaimed.sale.itemFk | zeroFill:6}} - {{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}} {{::saleClaimed.sale.quantity}} {{::saleClaimed.quantity}} {{::saleClaimed.sale.concept}} @@ -157,7 +157,7 @@ {{::action.claimBeggining.description}} - {{::action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{::action.sale.ticket.landed | date: 'dd/MM/yyyy'}} {{::action.sale.quantity}} {{::action.sale.concept}} {{::action.sale.price}} diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html index 88dfe1222..2ae2aa2aa 100644 --- a/modules/client/front/balance/index/index.html +++ b/modules/client/front/balance/index/index.html @@ -62,13 +62,13 @@ - - {{::balance.payed | dateTime:'dd/MM/yyyy'}} + + {{::balance.payed | date:'dd/MM/yyyy'}} - - {{::balance.created | dateTime:'dd/MM/yyyy HH:mm'}} + + {{::balance.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/client/front/credit-insurance/index/index.html b/modules/client/front/credit-insurance/index/index.html index 83e34d62e..192af4671 100644 --- a/modules/client/front/credit-insurance/index/index.html +++ b/modules/client/front/credit-insurance/index/index.html @@ -19,8 +19,8 @@ -
Since {{::classification.started | dateTime:'dd/MM/yyyy'}}
-
To {{classification.finished | dateTime:'dd/MM/yyyy'}}
+
Since {{::classification.started | date:'dd/MM/yyyy'}}
+
To {{classification.finished | date:'dd/MM/yyyy'}}
 @@ -36,7 +36,7 @@ + value="{{::insurance.created | date:'dd/MM/yyyy' }}"> diff --git a/modules/client/front/credit-insurance/insurance/index/index.html b/modules/client/front/credit-insurance/insurance/index/index.html index ac2cdda48..06e963781 100644 --- a/modules/client/front/credit-insurance/insurance/index/index.html +++ b/modules/client/front/credit-insurance/insurance/index/index.html @@ -19,7 +19,7 @@ - {{::insurance.created | dateTime: 'dd/MM/yyyy'}} + {{::insurance.created | date: 'dd/MM/yyyy'}} {{::insurance.grade}} {{::insurance.credit | currency: 'EUR': 2}} diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html index dd2a9a88c..d9cfe7dee 100644 --- a/modules/client/front/credit/index/index.html +++ b/modules/client/front/credit/index/index.html @@ -22,7 +22,7 @@ - {{::credit.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::credit.created | date:'dd/MM/yyyy HH:mm'}} {{::credit.worker.user.nickname}} {{::credit.amount | currency:'EUR':2}} diff --git a/modules/client/front/dms/index/index.html b/modules/client/front/dms/index/index.html index 0c936234c..1f306dc88 100644 --- a/modules/client/front/dms/index/index.html +++ b/modules/client/front/dms/index/index.html @@ -70,7 +70,7 @@ {{::document.dms.worker.user.nickname | dashIfEmpty}} - {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} - {{::greuge.shipped | dateTime:'dd/MM/yyyy HH:mm' }} + {{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }} {{::greuge.description}} {{::greuge.greugeType.name}} {{::greuge.amount | currency: 'EUR': 2}} diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html index c5bfb058a..42d3d96bd 100644 --- a/modules/client/front/mandate/index.html +++ b/modules/client/front/mandate/index.html @@ -27,8 +27,8 @@ {{::mandate.id}} {{::mandate.company.code}} {{::mandate.mandateType.name}} - {{::mandate.created | dateTime:'dd/MM/yyyy HH:mm' }} - {{::mandate.finished | dateTime:'dd/MM/yyyy HH:mm' || '-'}} + {{::mandate.created | date:'dd/MM/yyyy HH:mm' }} + {{::mandate.finished | date:'dd/MM/yyyy HH:mm' || '-'}} diff --git a/modules/client/front/note/index/index.html b/modules/client/front/note/index/index.html index db9ba0818..04bd7d28e 100644 --- a/modules/client/front/note/index/index.html +++ b/modules/client/front/note/index/index.html @@ -15,7 +15,7 @@ class="note vn-pa-sm border-solid border-radius vn-mb-md"> {{::note.worker.user.nickname}} - {{::note.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::note.created | date:'dd/MM/yyyy HH:mm'}} {{::note.text}} diff --git a/modules/client/front/recovery/index/index.html b/modules/client/front/recovery/index/index.html index 9e4345025..755556f37 100644 --- a/modules/client/front/recovery/index/index.html +++ b/modules/client/front/recovery/index/index.html @@ -33,8 +33,8 @@ ng-click="$ctrl.setFinished(recovery)"> - {{::recovery.started | dateTime:'dd/MM/yyyy' }} - {{recovery.finished | dateTime:'dd/MM/yyyy' }} + {{::recovery.started | date:'dd/MM/yyyy' }} + {{recovery.finished | date:'dd/MM/yyyy' }} {{::recovery.amount | currency: 'EUR': 0}} {{::recovery.period}} diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html index 2d7f63ba7..49be184f3 100644 --- a/modules/client/front/sample/index/index.html +++ b/modules/client/front/sample/index/index.html @@ -23,7 +23,7 @@ - {{::sample.created | dateTime:'dd/MM/yyyy HH:mm' }} + {{::sample.created | date:'dd/MM/yyyy HH:mm' }} {{::sample.type.description}} diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index 2fae69572..eccf45873 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -192,7 +192,7 @@ + value="{{$ctrl.summary.recovery.started | date:'dd/MM/yyyy'}}"> diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html index 326945c21..7f6042759 100644 --- a/modules/client/front/web-payment/index.html +++ b/modules/client/front/web-payment/index.html @@ -36,7 +36,7 @@ {{::transaction.id}} - {{::transaction.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::transaction.created | date:'dd/MM/yyyy HH:mm'}} {{::transaction.amount | currency: 'EUR':2}}
{{$ctrl.invoiceOut.ref}}
+ value="{{$ctrl.invoiceOut.issued | date: 'dd/MM/yyyy'}}"> diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html index e88a1986d..a847018b6 100644 --- a/modules/invoiceOut/front/index/index.html +++ b/modules/invoiceOut/front/index/index.html @@ -37,7 +37,7 @@ class="clickable vn-tr searchResult" ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})"> {{::invoiceOut.ref | dashIfEmpty}} - {{::invoiceOut.issued | dateTime:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}} {{::invoiceOut.amount | currency: 'EUR': 2 | dashIfEmpty}} - {{::invoiceOut.created | dateTime:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}} {{::invoiceOut.companyCode | dashIfEmpty}} - {{::invoiceOut.dued | dateTime:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}} + value="{{$ctrl.summary.invoiceOut.issued | date: 'dd/MM/yyyy'}}"> + value="{{$ctrl.summary.invoiceOut.dued | date: 'dd/MM/yyyy'}}"> + value="{{$ctrl.summary.invoiceOut.created | date: 'dd/MM/yyyy'}}"> + value="{{$ctrl.summary.invoiceOut.booked | date: 'dd/MM/yyyy'}}"> @@ -66,7 +66,7 @@ {{ticket.nickname}} - {{ticket.shipped | dateTime: 'dd/MM/yyyy'}} + {{ticket.shipped | date: 'dd/MM/yyyy'}} {{ticket.total | currency: 'EUR': 2}} diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html index cf8de3236..29f074ee4 100644 --- a/modules/item/front/diary/index.html +++ b/modules/item/front/diary/index.html @@ -43,7 +43,7 @@ - {{::sale.date | dateTime:'dd/MM/yyyy' }} + {{::sale.date | date:'dd/MM/yyyy' }} diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html index 78f10c3af..d0fff0222 100644 --- a/modules/item/front/last-entries/index.html +++ b/modules/item/front/last-entries/index.html @@ -44,7 +44,7 @@ {{entry.warehouse| dashIfEmpty}} - {{entry.landed | dateTime:'dd/MM/yyyy HH:mm'}} + {{entry.landed | date:'dd/MM/yyyy HH:mm'}} {{entry.entryFk | dashIfEmpty}} {{entry.price2 | dashIfEmpty}} {{entry.price3 | dashIfEmpty}} diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html index 20af5653a..de2750014 100644 --- a/modules/item/front/request/index.html +++ b/modules/item/front/request/index.html @@ -8,7 +8,7 @@
- + - - {{::request.shipped | dateTime: 'dd/MM/yyyy'}} + {{::request.shipped | date: 'dd/MM/yyyy'}} {{::request.warehouse}} diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html index cf2a52e1a..fd83d5c71 100644 --- a/modules/order/front/descriptor/index.html +++ b/modules/order/front/descriptor/index.html @@ -31,7 +31,7 @@ value="{{$ctrl.order.client.salesPerson.user.nickname}}"> + value="{{$ctrl.order.landed | date: 'dd/MM/yyyy' }}"> diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 750130a7f..c6a817742 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -55,7 +55,7 @@ {{::order.sourceApp}} - {{::order.created | dateTime: 'dd/MM/yyyy HH:mm'}} + {{::order.created | date: 'dd/MM/yyyy HH:mm'}} {{::order.landed | date:'dd/MM/yyyy'}} {{::order.companyCode}} {{::order.total | currency: 'EUR': 2 | dashIfEmpty}} diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html index cbf492dbf..cdff9b35c 100644 --- a/modules/order/front/line/index.html +++ b/modules/order/front/line/index.html @@ -48,7 +48,7 @@ {{::row.warehouse.name}} - {{::row.shipped | dateTime: 'dd/MM/yyyy'}} + {{::row.shipped | date: 'dd/MM/yyyy'}} {{::row.quantity}} {{::row.price | currency: 'EUR':2}} diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index 939a43244..c7ee5b4b6 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -14,10 +14,10 @@ + value="{{$ctrl.summary.created | date: 'dd/MM/yyyy HH:mm'}}"> + value="{{$ctrl.summary.confirmed | date: 'dd/MM/yyyy HH:mm'}}"> diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html index 8ab44e9bf..312985cb4 100644 --- a/modules/route/front/descriptor/index.html +++ b/modules/route/front/descriptor/index.html @@ -24,7 +24,7 @@ value="{{$ctrl.route.id}}"> + value="{{$ctrl.route.created | date: 'dd/MM/yyyy'}}"> diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index e3ef4d98f..0f13c9021 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -47,7 +47,7 @@ {{::route.agencyName | dashIfEmpty}} {{::route.vehiclePlateNumber | dashIfEmpty}} - {{::route.created | dateTime:'dd/MM/yyyy' | dashIfEmpty}} + {{::route.created | date:'dd/MM/yyyy' | dashIfEmpty}} {{::route.m3 | dashIfEmpty}} {{::route.description | dashIfEmpty}} diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html index 85a045106..0ec6c47fe 100644 --- a/modules/route/front/summary/index.html +++ b/modules/route/front/summary/index.html @@ -6,7 +6,7 @@ value="{{$ctrl.summary.route.id}}"> + value="{{$ctrl.summary.route.created | date: 'dd/MM/yyyy'}}"> @@ -23,10 +23,10 @@ + value="{{$ctrl.summary.route.time | date: 'HH:MM'}}"> + value="{{$ctrl.summary.route.finished | date: 'HH:MM'}}"> diff --git a/modules/ticket/front/basic-data/step-one/index.html b/modules/ticket/front/basic-data/step-one/index.html index 95cbcccf6..cd3ef442e 100644 --- a/modules/ticket/front/basic-data/step-one/index.html +++ b/modules/ticket/front/basic-data/step-one/index.html @@ -86,7 +86,7 @@ ng-model="$ctrl.zoneId" vn-acl="productionBoss"> - {{::name}} - {{::warehouse.name}} - Max. {{::hour | dateTime: 'HH:mm'}} h. + {{::name}} - {{::warehouse.name}} - Max. {{::hour | date: 'HH:mm'}} h. diff --git a/modules/ticket/front/descriptor/addStowaway.html b/modules/ticket/front/descriptor/addStowaway.html index 963c9b6c1..e46292714 100644 --- a/modules/ticket/front/descriptor/addStowaway.html +++ b/modules/ticket/front/descriptor/addStowaway.html @@ -25,7 +25,7 @@ {{ticket.id}} - {{ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{ticket.landed | date: 'dd/MM/yyyy'}} {{ticket.agencyMode.name}} {{ticket.warehouse.name}} {{ticket.state.state.name}} diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html index faa2acf5b..9b981f27a 100644 --- a/modules/ticket/front/descriptor/index.html +++ b/modules/ticket/front/descriptor/index.html @@ -33,7 +33,7 @@ value="{{$ctrl.ticket.client.salesPerson.user.nickname}}"> + value="{{$ctrl.ticket.shipped | date: 'dd/MM/yyyy HH:mm' }}"> diff --git a/modules/ticket/front/descriptor/removeStowaway.html b/modules/ticket/front/descriptor/removeStowaway.html index 78ac5cf3f..e517206b3 100644 --- a/modules/ticket/front/descriptor/removeStowaway.html +++ b/modules/ticket/front/descriptor/removeStowaway.html @@ -19,7 +19,7 @@ {{stowaway.id}} - {{stowaway.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{stowaway.ticket.landed | date: 'dd/MM/yyyy'}} {{stowaway.ticket.agencyMode.name}} {{stowaway.ticket.warehouse.name}} {{stowaway.ticket.state.state.name}} diff --git a/modules/ticket/front/dms/index/index.html b/modules/ticket/front/dms/index/index.html index 73607f246..1cc6d3b38 100644 --- a/modules/ticket/front/dms/index/index.html +++ b/modules/ticket/front/dms/index/index.html @@ -69,7 +69,7 @@ {{::document.dms.worker.user.nickname | dashIfEmpty}} - {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} - {{::expedition.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::expedition.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 20eaf254a..e6c27f988 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -101,10 +101,10 @@ - {{::ticket.shipped | dateTime: 'dd/MM/yyyy'}} + {{::ticket.shipped | date: 'dd/MM/yyyy'}} - {{::ticket.shipped | dateTime: 'HH:mm'}} + {{::ticket.shipped | date: 'HH:mm'}} {{::ticket.agencyMode}} {{::ticket.warehouse}} {{::ticket.refFk | dashIfEmpty}} - {{::ticket.zoneLanding | dateTime: 'HH:mm'}} + {{::ticket.zoneLanding | date: 'HH:mm'}} {{::ticket.total | currency: 'EUR': 2}} diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html index 2e5d60f3d..28dd28dc0 100644 --- a/modules/ticket/front/request/index/index.html +++ b/modules/ticket/front/request/index/index.html @@ -32,7 +32,7 @@ {{::request.id}} {{::request.description}} - {{::request.created | dateTime: 'dd/MM/yyyy'}} + {{::request.created | date: 'dd/MM/yyyy'}} {{::sale.state}} - {{::sale.created | dateTime: 'dd/MM/yyyy HH:mm'}} + {{::sale.created | date: 'dd/MM/yyyy HH:mm'}} diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 3061938a7..38ed007a0 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -320,7 +320,7 @@ ng-repeat="ticket in $ctrl.transfer.lastActiveTickets track by ticket.id" ng-click="$ctrl.transferSales(ticket.id)"> {{::ticket.id}} - {{::ticket.shipped | dateTime: 'dd/MM/yyyy'}} + {{::ticket.shipped | date: 'dd/MM/yyyy'}} {{::ticket.agencyName}} {{::ticket.warehouseName}} diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 89cf97ca9..83cdd8e40 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -36,10 +36,10 @@ + value="{{$ctrl.summary.shipped | date: 'dd/MM/yyyy HH:mm'}}"> + value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}"> - {{package.created | dateTime: 'dd/MM/yyyy'}} + {{package.created | date: 'dd/MM/yyyy'}} {{package.packaging.item.name}} {{package.quantity}} @@ -180,7 +180,7 @@ {{::request.description}} - {{::request.created | dateTime: 'dd/MM/yyyy'}} + {{::request.created | date: 'dd/MM/yyyy'}} {{::request.requester.user.name}} {{::request.atender.user.name}} {{::request.quantity}} diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html index f919a636b..a5120a064 100644 --- a/modules/ticket/front/tracking/index/index.html +++ b/modules/ticket/front/tracking/index/index.html @@ -28,7 +28,7 @@ {{::tracking.worker.user.nickname | dashIfEmpty}} - {{::tracking.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::tracking.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/ticket/front/weekly/index/index.html b/modules/ticket/front/weekly/index/index.html index 3a251e37a..e25d115ba 100644 --- a/modules/ticket/front/weekly/index/index.html +++ b/modules/ticket/front/weekly/index/index.html @@ -9,7 +9,7 @@ auto-load="true">
- + {{::travel.ref}} {{::travel.agency.name}} {{::travel.warehouseOut.name}} - {{::travel.shipped | dateTime:'dd/MM/yyyy'}} + {{::travel.shipped | date:'dd/MM/yyyy'}} {{::travel.warehouseIn.name}} - {{::travel.landed | dateTime:'dd/MM/yyyy'}} + {{::travel.landed | date:'dd/MM/yyyy'}} diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js index 516519359..8130a16fd 100644 --- a/modules/worker/back/methods/worker-time-control/addTime.js +++ b/modules/worker/back/methods/worker-time-control/addTime.js @@ -34,9 +34,6 @@ module.exports = Self => { const subordinate = await Worker.findById(data.workerFk); const timed = new Date(data.timed); - let offset = timed.getTimezoneOffset() * 60000; - timed.setTime(timed.getTime() - offset); - return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [ subordinate.userFk, null, timed, true]); }; diff --git a/modules/worker/front/log/index.html b/modules/worker/front/log/index.html index 91166f045..674e5a200 100644 --- a/modules/worker/front/log/index.html +++ b/modules/worker/front/log/index.html @@ -26,7 +26,7 @@ - {{::log.creationDate | dateTime:'dd/MM/yyyy HH:mm'}} + {{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}
Changed by: diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html index a00ebab45..7eaed4ec5 100644 --- a/modules/worker/front/time-control/index.html +++ b/modules/worker/front/time-control/index.html @@ -27,7 +27,7 @@ icon="arrow_{{($index % 2) == 0 ? 'forward' : 'back'}}" title="{{(($index % 2) == 0 ? 'In' : 'Out') | translate}}"> - {{hour.timed | dateTime: 'HH:mm'}} + {{hour.timed | date: 'HH:mm'}} From 55f3390f85a331a0aec12c250cdcee760a6bf1a8 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Mon, 21 Oct 2019 07:08:47 +0200 Subject: [PATCH 7/7] added validation for confirmed purcharse requests --- modules/ticket/back/methods/ticket/isEmpty.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/ticket/isEmpty.js b/modules/ticket/back/methods/ticket/isEmpty.js index 7f9de98b1..0465589e6 100644 --- a/modules/ticket/back/methods/ticket/isEmpty.js +++ b/modules/ticket/back/methods/ticket/isEmpty.js @@ -40,7 +40,8 @@ module.exports = function(Self) { }, options); const hasPurchaseRequests = await models.TicketRequest.count({ - ticketFk: id + ticketFk: id, + isOk: true }, options); const isEmpty = !hasSales && !hasPackages &&