wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 8019-makeResponsiveInputs

This commit is contained in:
Jorge Penadés 2024-10-14 08:48:50 +00:00
parent e6535a5dd8 adbb745f0f
commit fdbae5c0b5
27 changed files with 59 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/boot/defaults/qInput.js Normal file
View File

@ -0,0 +1,4 @@
import { QInput } from 'quasar';
import setDefault from './setDefault';
setDefault(QInput, 'dense', true);

4
src/boot/defaults/qSelect.js Normal file
View File

@ -0,0 +1,4 @@
import { QSelect } from 'quasar';
import setDefault from './setDefault';
setDefault(QSelect, 'dense', true);

2
src/boot/quasar.defaults.js
View File

@ -1 +1,3 @@
export * from './defaults/qTable';
export * from './defaults/qInput';
export * from './defaults/qSelect';

20
src/components/common/VnInput.vue
View File

@ -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;
}
}
</style>

11
src/components/common/VnSelect.vue
View File

@ -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;
}
}
}
</style>

2
src/components/ui/CatalogItem.vue
View File

@ -31,7 +31,7 @@ const dialog = ref(null);
<div class="container order-catalog-item overflow-hidden">
<QCard class="card shadow-6">
<div class="img-wrapper">
<VnImg :id="item.id" class="image" />
<VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
<div v-if="item.hex && isCatalog" class="item-color-container">
<div
class="item-color"

2
src/components/ui/VnPaginate.vue
View File

@ -56,7 +56,7 @@ const props = defineProps({
},
offset: {
type: Number,
default: 0,
default: undefined,
},
skeleton: {
type: Boolean,

1
src/components/ui/VnRow.vue
View File

@ -9,7 +9,6 @@ defineProps({ wrap: { type: Boolean, default: false } });
<style lang="scss" scoped>
.vn-row {
display: flex;
align-items: flex-end;
> :deep(*) {
flex: 1;
}

11
src/css/app.scss
View File

@ -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;
}
}
}

5
src/pages/InvoiceIn/Card/InvoiceInSummary.vue
View File

@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
:label="t('invoiceIn.summary.company')"
:value="entity.company?.code"
/>
<VnLv
:label="t('invoiceIn.summary.booked')"
:value="invoiceIn?.isBooked"
/>
<VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
</QCard>
<QCard class="vn-one">
<QCardSection class="q-pa-none">

4
src/pages/InvoiceIn/InvoiceInFilter.vue
View File

@ -116,7 +116,7 @@ const activities = ref([]);
<QItem>
<QItemSection>
<QCheckbox
:label="t('params.isBooked')"
:label="t('invoiceIn.isBooked')"
v-model="params.isBooked"
@update:model-value="searchFn()"
toggle-indeterminate
@ -170,7 +170,7 @@ es:
awb: AWB
amount: Importe
issued: Emitida
isBooked: Conciliada
isBooked: Contabilizada
account: Cuenta contable
created: Creada
dued: Vencida

2
src/pages/InvoiceIn/InvoiceInList.vue
View File

@ -65,7 +65,7 @@ const cols = computed(() => [
{
align: 'left',
name: 'isBooked',
label: t('invoiceIn.list.isBooked'),
label: t('invoiceIn.isBooked'),
columnFilter: false,
},
{

3
src/pages/InvoiceIn/locale/en.yml
View File

@ -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

3
src/pages/InvoiceIn/locale/es.yml
View File

@ -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

1
src/pages/Item/Card/ItemTags.vue
View File

@ -171,7 +171,6 @@ const insertTag = (rows) => {
<QBtn
@click="insertTag(rows)"
class="cursor-pointer"
:disable="!validRow"
color="primary"
flat
icon="add"

3
src/pages/Item/ItemList.vue
View File

@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<QTd>
<VnImg
size="50x50"
zoom-resolution="1600x900"
:id="row.id"
height="50px"
width="50px"
class="image"
/>
</QTd>

6
src/pages/Order/Card/OrderLines.vue
View File

@ -278,7 +278,11 @@ watch(
>
<template #column-image="{ row }">
<div class="image-wrapper">
<VnImg :id="parseInt(row?.item?.image)" class="rounded" />
<VnImg
:id="parseInt(row?.item?.image)"
class="rounded"
zoom-resolution="1600x900"
/>
</div>
</template>
<template #column-id="{ row }">

10
src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
View File

@ -15,12 +15,12 @@ const route = useRoute();
const agenciesOptions = ref(null);
const newAgencyTermForm = reactive({
agencyFk: null,
minimumM3: null,
packagePrice: null,
kmPrice: null,
m3Price: null,
minimumM3: 0,
packagePrice: 0,
kmPrice: 0,
m3Price: 0,
routePrice: null,
minimumKm: null,
minimumKm: 0,
supplierFk: route.params.id,
});

7
src/pages/Ticket/Card/TicketSale.vue
View File

@ -663,6 +663,13 @@ watch(
</QTooltip>
</QIcon>
</template>
<template #body-cell-picture="{ row }">
<QTd>
<div class="image-wrapper">
<VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
</div>
</QTd>
</template>
<template #column-image="{ row }">
<div class="image-wrapper">
<VnImg :id="parseInt(row?.item?.id)" class="rounded" />

6
src/pages/Travel/TravelFilter.vue
View File

@ -124,6 +124,12 @@ defineExpose({ states });
lazy-rules
is-outlined
/>
<VnInput
:label="t('travel.travelList.tableVisibleColumns.daysOnward')"
v-model="params.daysOnward"
lazy-rules
is-outlined
/>
</div>
</template>
</VnFilterPanel>

9
src/pages/Travel/TravelList.vue
View File

@ -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: '',

1
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -139,6 +139,7 @@ onBeforeMount(async () => {
<VnLinkPhone :phone-number="worker?.sip?.extension" />
</template>
</VnLv>
<VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
</QCard>
</template>
</CardSummary>

1
src/pages/Worker/locale/en.yml
View File

@ -9,3 +9,4 @@ tableColumns:
fi: FI
SSN: SSN
extension: Extension
queue: Queue

1
src/pages/Worker/locale/es.yml
View File

@ -14,3 +14,4 @@ tableColumns:
fi: NIF
SSN: NSS
extension: Extensión
queue: Cola

2
test/cypress/integration/entry/myEntry.spec.js
View File

@ -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');

9
test/cypress/integration/ticket/ticketDescriptor.spec.js
View File

@ -1,7 +1,8 @@
/// <reference types="cypress" />
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();

12
test/cypress/integration/vnComponent/vnLocation.spec.js
View File

@ -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);
});