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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6105-createClaimNotes

This commit is contained in:
Jorge Penadés 2023-08-18 12:07:29 +02:00
parent 822fdb75cb c2b10ba271
commit 97180b8490
9 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/ui/CardList.vue
View File

@ -5,19 +5,19 @@ const $props = defineProps({
}); });
</script> </script>
<template> <template>
<QCard class="card q-mb-md cursor-pointer q-hoverable bg-white-7"> <QCard class="card q-mb-md cursor-pointer q-hoverable bg-white-7 q-pa-lg">
<div> <div>
<slot name="title"> <slot name="title">
<div class="title"> <div class="title text-primary text-weight-bold text-h5">
{{ $props.title ?? `#${$props.id}` }} {{ $props.title ?? `#${$props.id}` }}
</div> </div>
</slot> </slot>
<div class="card-list-body"> <div class="card-list-body row">
<div class="list-items"> <div class="list-items row flex-wrap-wrap q-mt-md">
<slot name="list-items" /> <slot name="list-items" />
</div> </div>
<div class="actions"> <div class="actions column justify-center">
<slot name="actions" /> <slot name="actions" />
</div> </div>
</div> </div>
@ -66,30 +66,17 @@ const $props = defineProps({
<style lang="scss" scoped> <style lang="scss" scoped>
.card { .card {
padding: 30px;
transition: background-color 0.2s; transition: background-color 0.2s;
} }
.card-list-body {
display: flex;
justify-content: space-between;
}
.card:hover { .card:hover {
background-color: var(--vn-gray); background-color: var(--vn-gray);
} }
.title {
color: $primary;
font-size: 22px;
font-weight: bold;
}
.list-items { .list-items {
width: 100%; width: 90%;
margin-top: 20px;
display: flex;
flex-wrap: wrap;
} }
.actions { @media (max-width: $breakpoint-xs) {
display: flex; .list-items {
flex-direction: column; width: 85%;
justify-content: center; }
} }
</style> </style>

6
src/pages/Claim/ClaimList.vue
View File

@ -112,18 +112,18 @@ function viewSummary(id) {
<QBtn <QBtn
flat flat
icon="arrow_circle_right" icon="arrow_circle_right"
@click="navigate(row.id)" @click.stop="navigate(row.id)"
> >
<QTooltip> <QTooltip>
{{ t('components.smartCard.openCard') }} {{ t('components.smartCard.openCard') }}
</QTooltip> </QTooltip>
</QBtn> </QBtn>
<QBtn flat icon="preview" @click="viewSummary(row.id)"> <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
<QTooltip> <QTooltip>
{{ t('components.smartCard.openSummary') }} {{ t('components.smartCard.openSummary') }}
</QTooltip> </QTooltip>
</QBtn> </QBtn>
<QBtn flat icon="vn:client"> <QBtn flat icon="vn:client" @click.stop>
<QTooltip> <QTooltip>
{{ t('components.smartCard.viewDescription') }} {{ t('components.smartCard.viewDescription') }}
</QTooltip> </QTooltip>

4
src/pages/Customer/CustomerList.vue
View File

@ -84,7 +84,7 @@ function viewSummary(id) {
flat flat
color="primary" color="primary"
icon="arrow_circle_right" icon="arrow_circle_right"
@click="navigate(row.id)" @click.stop="navigate(row.id)"
> >
<QTooltip> <QTooltip>
{{ t('components.smartCard.openCard') }} {{ t('components.smartCard.openCard') }}
@ -94,7 +94,7 @@ function viewSummary(id) {
flat flat
color="grey-7" color="grey-7"
icon="preview" icon="preview"
@click="viewSummary(row.id)" @click.stop="viewSummary(row.id)"
> >
<QTooltip> <QTooltip>
{{ t('components.smartCard.openSummary') }} {{ t('components.smartCard.openSummary') }}

2
src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
View File

@ -143,7 +143,7 @@ const ticketsColumns = ref([
<div class="header"> <div class="header">
{{ t('invoiceOut.summary.tickets') }} {{ t('invoiceOut.summary.tickets') }}
</div> </div>
<QTable :columns="ticketsColumns" :rows="tickets" flat> <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
<template #header="props"> <template #header="props">
<QTr :props="props"> <QTr :props="props">
<QTh v-for="col in props.cols" :key="col.name" :props="props"> <QTh v-for="col in props.cols" :key="col.name" :props="props">

4
src/pages/InvoiceOut/InvoiceOutList.vue
View File

@ -113,13 +113,13 @@ function viewSummary(id) {
<QBtn <QBtn
flat flat
icon="arrow_circle_right" icon="arrow_circle_right"
@click="navigate(row.id)" @click.stop="navigate(row.id)"
> >
<QTooltip> <QTooltip>
{{ t('components.smartCard.openCard') }} {{ t('components.smartCard.openCard') }}
</QTooltip> </QTooltip>
</QBtn> </QBtn>
<QBtn flat icon="preview" @click="viewSummary(row.id)"> <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
<QTooltip> <QTooltip>
{{ t('components.smartCard.openSummary') }} {{ t('components.smartCard.openSummary') }}
</QTooltip> </QTooltip>

6
src/pages/Ticket/Card/TicketDescriptor.vue
View File

@ -105,10 +105,10 @@ const setData = (entity) =>
<VnLv :label="t('ticket.summary.salesPerson')"> <VnLv :label="t('ticket.summary.salesPerson')">
<template #value> <template #value>
<span class="link"> <span class="link">
{{ ticket.client?.salesPersonUser?.name }} {{ entity.client.salesPersonUser.name }}
<WorkerDescriptorProxy <WorkerDescriptorProxy
:id="ticket.client.salesPersonFk" :id="entity.client.salesPersonFk"
v-if="ticket.client.salesPersonFk" v-if="entity.client.salesPersonFk"
/> />
</span> </span>
</template> </template>

2
src/pages/Ticket/TicketList.vue
View File

@ -120,7 +120,7 @@ function viewSummary(id) {
/> />
</template> </template>
<template #actions> <template #actions>
<QBtn flat icon="preview" @click="viewSummary(row.id)"> <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
<QTooltip> <QTooltip>
{{ t('components.smartCard.openSummary') }} {{ t('components.smartCard.openSummary') }}
</QTooltip> </QTooltip>

4
src/pages/Worker/WorkerList.vue
View File

@ -87,13 +87,13 @@ function viewSummary(id) {
<QBtn <QBtn
flat flat
icon="arrow_circle_right" icon="arrow_circle_right"
@click="navigate(row.id)" @click.stop="navigate(row.id)"
> >
<QTooltip> <QTooltip>
{{ t('components.smartCard.openCard') }} {{ t('components.smartCard.openCard') }}
</QTooltip> </QTooltip>
</QBtn> </QBtn>
<QBtn flat icon="preview" @click="viewSummary(row.id)"> <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
<QTooltip> <QTooltip>
{{ t('components.smartCard.openSummary') }} {{ t('components.smartCard.openSummary') }}
</QTooltip> </QTooltip>

23
test/cypress/integration/workerList.spec.js
View File

@ -6,18 +6,21 @@ describe('WorkerList', () => {
}); });
it('should load workers', () => { it('should load workers', () => {
cy.get('div[class="q-item__label text-h6"]').eq(0).should('have.text', 'Jessica Jones'); cy.get('.list-items > .vn-label-value:nth-child(2) > .value')
cy.get('div[class="q-item__label text-h6"]').eq(1).should('have.text', 'Bruce Banner'); .eq(0)
cy.get('div[class="q-item__label text-h6"]').eq(2).should('have.text', 'Charles Xavier'); .should('have.text', 'JessicaJones');
cy.get('.list-items > .vn-label-value:nth-child(2) > .value')
.eq(1)
.should('have.text', 'BruceBanner');
cy.get('.list-items > .vn-label-value:nth-child(2) > .value')
.eq(2)
.should('have.text', 'CharlesXavier');
}); });
it('should open the worker summary', () => { it('should open the worker summary', () => {
cy.get('div.text-h6') cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(0).click();
.parentsUntil('div.q-card') cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones');
.find('div.q-card__actions') cy.get('.summary .header').eq(0).invoke('text').should('include', 'Basic data');
.find('button').first().click(); cy.get('.summary .header').eq(1).should('have.text', 'User data');
cy.get('div[class="header bg-primary q-pa-sm q-mb-md"').should('have.text', '1110 - Jessica Jones');
cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(0).should('have.text', 'Basic data');
cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(1).should('have.text', 'User data');
}); });
}); });