diff --git a/src/boot/defaults/qInput.js b/src/boot/defaults/qInput.js new file mode 100644 index 0000000000..299b987182 --- /dev/null +++ b/src/boot/defaults/qInput.js @@ -0,0 +1,4 @@ +import { QInput } from 'quasar'; +import setDefault from './setDefault'; + +setDefault(QInput, 'dense', true); diff --git a/src/boot/defaults/qSelect.js b/src/boot/defaults/qSelect.js new file mode 100644 index 0000000000..be0ba048a7 --- /dev/null +++ b/src/boot/defaults/qSelect.js @@ -0,0 +1,4 @@ +import { QSelect } from 'quasar'; +import setDefault from './setDefault'; + +setDefault(QSelect, 'dense', true); diff --git a/src/boot/quasar.defaults.js b/src/boot/quasar.defaults.js index c792100d7c..9638e2057e 100644 --- a/src/boot/quasar.defaults.js +++ b/src/boot/quasar.defaults.js @@ -1 +1,3 @@ export * from './defaults/qTable'; +export * from './defaults/qInput'; +export * from './defaults/qSelect'; diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue index d93ad74657..1246eedcd4 100644 --- a/src/components/common/VnInput.vue +++ b/src/components/common/VnInput.vue @@ -130,24 +130,4 @@ const mixinRules = [ .q-field__append { padding-inline: 0; } - -.q-field__append.q-field__marginal.row.no-wrap.items-center.row { - height: 20px; -} -.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row { - height: auto; -} -.q-field__control { - height: unset; -} - -.q-field--labeled { - .q-field__native, - .q-field__prefix, - .q-field__suffix, - .q-field__input { - padding-bottom: 0; - min-height: 15px; - } -} diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index 84ab4b4b61..aa629767d5 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -283,15 +283,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val); .q-field--outlined { max-width: 100%; } -.q-field__inner { - .q-field__control { - min-height: auto !important; - - display: flex; - align-items: flex-end; - .q-field__native.row { - min-height: auto !important; - } - } -} diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue index 545bfbbb40..7dca197705 100644 --- a/src/components/ui/CatalogItem.vue +++ b/src/components/ui/CatalogItem.vue @@ -31,7 +31,7 @@ const dialog = ref(null);
- +
.vn-row { display: flex; - align-items: flex-end; > :deep(*) { flex: 1; } diff --git a/src/css/app.scss b/src/css/app.scss index c77af41f92..905934d4c4 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -288,14 +288,3 @@ input::-webkit-inner-spin-button { color: $info; } } -.q-field__inner { - .q-field__control { - min-height: auto !important; - display: flex; - align-items: flex-end; - padding-bottom: 2px; - .q-field__native.row { - min-height: auto !important; - } - } -} diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index bf2e7db48b..801a043420 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`; :label="t('invoiceIn.summary.company')" :value="entity.company?.code" /> - + diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue index bf4e023a94..d1c0856b56 100644 --- a/src/pages/InvoiceIn/InvoiceInFilter.vue +++ b/src/pages/InvoiceIn/InvoiceInFilter.vue @@ -116,7 +116,7 @@ const activities = ref([]); [ { align: 'left', name: 'isBooked', - label: t('invoiceIn.list.isBooked'), + label: t('invoiceIn.isBooked'), columnFilter: false, }, { diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml index 824fd6e12b..b09340c81d 100644 --- a/src/pages/InvoiceIn/locale/en.yml +++ b/src/pages/InvoiceIn/locale/en.yml @@ -1,5 +1,6 @@ invoiceIn: serial: Serial + isBooked: Is booked list: ref: Reference supplier: Supplier @@ -7,7 +8,6 @@ invoiceIn: serial: Serial file: File issued: Issued - isBooked: Is booked awb: AWB amount: Amount card: @@ -31,7 +31,6 @@ invoiceIn: sage: Sage withholding vat: Undeductible VAT company: Company - booked: Booked expense: Expense taxableBase: Taxable base rate: Rate diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml index 944708364d..31d41fc977 100644 --- a/src/pages/InvoiceIn/locale/es.yml +++ b/src/pages/InvoiceIn/locale/es.yml @@ -1,5 +1,6 @@ invoiceIn: serial: Serie + isBooked: Contabilizada list: ref: Referencia supplier: Proveedor @@ -7,7 +8,6 @@ invoiceIn: shortIssued: F. emisión file: Fichero issued: Fecha emisión - isBooked: Conciliada awb: AWB amount: Importe card: @@ -31,7 +31,6 @@ invoiceIn: sage: Retención sage vat: Iva no deducible company: Empresa - booked: Contabilizada expense: Gasto taxableBase: Base imp. rate: Tasa diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue index 1b5eb28f0c..6f31d0cf84 100644 --- a/src/pages/Item/Card/ItemTags.vue +++ b/src/pages/Item/Card/ItemTags.vue @@ -171,7 +171,6 @@ const insertTag = (rows) => { (stateStore.rightDrawer = false)); diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue index 175c956e18..5aec976fa9 100644 --- a/src/pages/Order/Card/OrderLines.vue +++ b/src/pages/Order/Card/OrderLines.vue @@ -278,7 +278,11 @@ watch( > + diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index 05d2e5eda5..a8c0e69cbc 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -161,15 +161,6 @@ const columns = computed(() => [ cardVisible: true, create: true, }, - { - align: 'left', - name: 'daysOnward', - label: t('travel.travelList.tableVisibleColumns.daysOnward'), - visible: false, - columnFilter: { - inWhere: false, - }, - }, { align: 'right', label: '', diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue index 8fee52dd38..ed34e771d7 100644 --- a/src/pages/Worker/Card/WorkerSummary.vue +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -139,6 +139,7 @@ onBeforeMount(async () => { + diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml index 865e86e7ea..8276977fde 100644 --- a/src/pages/Worker/locale/en.yml +++ b/src/pages/Worker/locale/en.yml @@ -9,3 +9,4 @@ tableColumns: fi: FI SSN: SSN extension: Extension +queue: Queue diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml index b3c093ec52..9c7618bc32 100644 --- a/src/pages/Worker/locale/es.yml +++ b/src/pages/Worker/locale/es.yml @@ -14,3 +14,4 @@ tableColumns: fi: NIF SSN: NSS extension: Extensión +queue: Cola diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js index dca74dec2a..4addec1c45 100644 --- a/test/cypress/integration/entry/myEntry.spec.js +++ b/test/cypress/integration/entry/myEntry.spec.js @@ -11,7 +11,7 @@ describe('EntryMy when is supplier', () => { it('should open buyLabel when is supplier', () => { cy.get( - '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' + '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' ).click(); cy.get('.q-card__actions > .q-btn').click(); cy.window().its('open').should('be.called'); diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js index 8192b7c7ca..0ba2723a25 100644 --- a/test/cypress/integration/ticket/ticketDescriptor.spec.js +++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js @@ -1,7 +1,8 @@ /// describe('Ticket descriptor', () => { - const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)'; - const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)'; + const listItem = '[role="menu"] .q-list .q-item'; + const toCloneOpt = 'To clone ticket'; + const setWeightOpt = 'Set weight'; const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span'; const summaryHeader = '.summaryHeader > div'; const weight = 25; @@ -14,7 +15,7 @@ describe('Ticket descriptor', () => { it('should clone the ticket without warehouse', () => { cy.visit('/#/ticket/1/summary'); cy.openActionsDescriptor(); - cy.get(toCloneOpt).click(); + cy.contains(listItem, toCloneOpt).click(); cy.clickConfirm(); cy.get(warehouseValue).contains('Warehouse One'); cy.get(summaryHeader) @@ -28,7 +29,7 @@ describe('Ticket descriptor', () => { it('should set the weight of the ticket', () => { cy.visit('/#/ticket/10/summary'); cy.openActionsDescriptor(); - cy.get(setWeightOpt).click(); + cy.contains(listItem, setWeightOpt).click(); cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight'); cy.get('.q-dialog input').type(weight); cy.clickConfirm(); diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js index 78dc38899a..c1b0cf9297 100644 --- a/test/cypress/integration/vnComponent/vnLocation.spec.js +++ b/test/cypress/integration/vnComponent/vnLocation.spec.js @@ -64,7 +64,7 @@ describe('VnLocation', () => { `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon` ).click(); cy.get( - `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input` + `#q-portal--dialog--5 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input` ).should('have.value', province); }); }); @@ -133,6 +133,8 @@ describe('VnLocation', () => { ); cy.get('.q-mt-lg > .q-btn--standard').click(); cy.get(`${createForm.prefix}`).should('not.exist'); + cy.waitForElement('.q-form'); + checkVnLocation(postCode, province); }); it('Create city', () => { @@ -144,10 +146,12 @@ describe('VnLocation', () => { cy.get( `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon` ).click(); - cy.selectOption('#q-portal--dialog--2 .q-select', 'one'); - cy.get('#q-portal--dialog--2 .q-input').type(province); - cy.get('#q-portal--dialog--2 .q-btn--standard').click(); + cy.selectOption('#q-portal--dialog--3 .q-select', 'one'); + cy.get('#q-portal--dialog--3 .q-input').type(province); + cy.get('#q-portal--dialog--3 .q-btn--standard').click(); cy.get('#q-portal--dialog--1 .q-btn--standard').click(); + cy.waitForElement('.q-form'); + checkVnLocation(postCode, province); });