verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 63 Releases Wiki Activity

6157-actionClaim #106

Merged
carlossa merged 22 commits from 6157-actionClaim into dev 2023-11-24 07:46:30 +00:00
Conversation 0 Commits 22 Files Changed 19 +235 -249
4 changed files with 235 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6db52e00ea - Show all commits

2
src/components/CrudModel.vue
View File

@ -268,7 +268,7 @@ watch(formUrl, async () => {
</VnPaginate>
<SkeletonTable v-if="!formData" />
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
<QBtnGroup push class="q-gutter-x-sm">
<QBtnGroup push style="column-gap: 10px">
carlossa marked this conversation as resolved Outdated
jsegarra commented 2023-11-08 07:00:15 +00:00
Outdated
Review
Copy Link

Este estilo, es el que corregimos que permitía separar los botones pero tenerlos pegados al margen?
Si es así, quizás, ese estilo, puede ser usado en un futuro o recurrente en otros componentes, por lo que la propiedad column-gap la movería a una clase

Este estilo, es el que corregimos que permitía separar los botones pero tenerlos pegados al margen? Si es así, quizás, ese estilo, puede ser usado en un futuro o recurrente en otros componentes, por lo que la propiedad column-gap la movería a una clase
<slot name="moreBeforeActions" />
<QBtn
:label="tMobile('globals.remove')"

76
src/pages/Claim/Card/ClaimAction.vue
View File

@ -33,7 +33,7 @@ const dialogGreuge = ref(false);
const columns = computed(() => [
{
name: 'Id',
label: t('Id'),
label: t('Id item'),
field: (row) => row.itemFk,
},
{
@ -119,6 +119,7 @@ async function updateDestinations(claimDestinationFk) {
}
async function updateDestination(claimDestinationFk, row) {
carlossa marked this conversation as resolved
jsegarra commented 2023-11-08 07:04:22 +00:00
Review
Copy Link

Y esto también!!

Y esto también!!
console.log(claimDestinationFk, row);
if (claimDestinationFk) {
await axios.post('Claims/updateClaimDestination', {
claimDestinationFk,
@ -238,7 +239,6 @@ async function importToNewRefundTicket() {
show-if-above
v-if="claim"
>
<QScrollArea class="fit text-grey-8 q-mt-lg">
<div class="totalClaim q-mb-md">
{{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
</div>
@ -252,9 +252,7 @@ async function importToNewRefundTicket() {
class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
v-model="claim.responsibility"
:label-value="t('claim.summary.responsibility')"
@update:model-value="
(value) => save({ responsibility: value })
"
@update:model-value="(value) => save({ responsibility: value })"
label-always
color="primary"
markers
@ -275,10 +273,8 @@ async function importToNewRefundTicket() {
/>
<span>{{ t('mana') }}</span>
</QItemLabel>
</QScrollArea>
</QDrawer>
<Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
<div class="claim-action">
<CrudModel
v-if="claim"
data-key="ClaimEnds"
@ -313,16 +309,18 @@ async function importToNewRefundTicket() {
</span>
</QTd>
</template>
<template #body-cell-destination="{ rowIndex }">
<template #body-cell-destination="{ row }">
<QTd>
<VnSelectFilter
v-model="destinations[rowIndex]"
v-model="row.claimDestinationFk"
:options="destinationTypes"
option-value="id"
option-label="description"
@update:model-value="
(value) => updateDestination(value, rows[rowIndex])
"
option-value="id"
:autofocus="true"
dense
input-debounce="0"
hide-selected
@update:model-value="(value) => updateDestination(value, row)"
/>
</QTd>
</template>
@ -336,22 +334,6 @@ async function importToNewRefundTicket() {
{{ toCurrency(value) }}
</QTd>
</template>
<template #body-cell-delete="{ rowIndex }">
<QTd>
<QBtn
icon="delete"
color="primary"
padding="xs"
round
flat
@click="deleteSale(rows[rowIndex])"
>
<QTooltip>
{{ t('Remove line') }}
</QTooltip>
</QBtn>
</QTd>
</template>
<!-- View for grid mode -->
<template #item="props">
<div class="q-mb-md col-12 grid-style-transition">
@ -363,19 +345,14 @@ async function importToNewRefundTicket() {
<QSeparator inset />
<QList dense>
<QItem
v-for="column of props.cols"
:key="column.name"
>
<QItem v-for="column of props.cols" :key="column.name">
<QItemSection>
<QItemLabel caption>
{{ column.label }}
</QItemLabel>
</QItemSection>
<QItemSection side>
<QItemLabel
v-if="column.name === 'destination'"
>
<QItemLabel v-if="column.name === 'destination'">
{{ column.value.description }}
</QItemLabel>
<QItemLabel v-else>
@ -433,21 +410,20 @@ async function importToNewRefundTicket() {
<QBtn icon="close" flat round dense v-close-popup />
</QItem>
</QCardSection>
<QCardSection>
<QItemSection>
<VnSelectFilter
v-model="claimDestinationFk"
:options="destinationTypes"
option-label="description"
option-value="id"
:autofocus="true"
dense
input-debounce="0"
hide-selected
/>
</QCardSection>
</QItemSection>
<QCardActions class="justify-end q-mr-sm">
<QBtn
flat
:label="t('globals.close')"
color="primary"
v-close-popup
/>
<QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
<QBtn
:disable="!claimDestinationFk"
:label="t('globals.save')"
@ -467,12 +443,7 @@ async function importToNewRefundTicket() {
<QBtn icon="close" flat round dense v-close-popup />
</QItem>
<QCardActions class="justify-end q-mr-sm">
<QBtn
flat
:label="t('globals.close')"
color="primary"
v-close-popup
/>
<QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
<QBtn
:label="t('globals.save')"
color="primary"
@ -482,7 +453,6 @@ async function importToNewRefundTicket() {
</QCardActions>
</QCardSection>
</QDialog>
</div>
</template>
<style lang="scss">
.claim-action {
@ -514,10 +484,11 @@ async function importToNewRefundTicket() {
}
}
carlossa marked this conversation as resolved
alexm commented 2023-11-07 12:41:05 +00:00
Review
Copy Link

Aço si ja esta en els descriptors, en els summarys te que haver alguna clase ja feta (si no fesla)

Aço si ja esta en els descriptors, en els summarys te que haver alguna clase ja feta (si no fesla)
.totalClaim {
border: 3px solid black;
background-color: #313131;
color: white;
padding: 10px;
margin: 5px;
border-radius: 8px;
}
.responsibility {
max-width: 100%;
@ -555,4 +526,5 @@ es:
Remove: Eliminar
dialogGreuge title: Insertar greuges en la ficha del cliente
ClaimGreugeDescription: Id reclamación
Id item: Id artículo
</i18n>

11
src/pages/Claim/Card/ClaimCard.vue
View File

@ -43,17 +43,6 @@ onMounted(async () => {
<QSeparator />
<LeftMenu source="card" />
<QSeparator />
<QList>
<QItem
active-class="text-primary"
clickable
v-ripple
:href="`${salixUrl}/action`"
>
<QItemSection avatar><QIcon name="vn:actions"></QIcon></QItemSection>
<QItemSection>{{ t('Action') }}</QItemSection>
</QItem>
</QList>
</QScrollArea>
</QDrawer>
<QPageContainer>

25
test/cypress/integration/claimAction.spec.js Normal file
View File

@ -0,0 +1,25 @@
/// <reference types="cypress" />
describe('ClaimAction', () => {
const claimId = 2;
const firstLineReason = 'tbody > :nth-child(1) > :nth-child(2)';
const firstRow = 'tbody > :nth-child(1)';
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/claim/${claimId}/action`);
});
it('should import claim', () => {
cy.get('[title="Import claim"]').click();
});
it('should change destination', () => {
const rowData = [true, null, null, 'Bueno', null, null, null, null, null, null];
carlossa marked this conversation as resolved Outdated
alexm commented 2023-11-07 13:09:59 +00:00
Outdated
Review
Copy Link

Crec q els ultims nulls no fan falta

Crec q els ultims nulls no fan falta
cy.fillRow(firstRow, rowData);
});
it('should regularize', () => {
cy.get('[title="Regularize"]').click();
carlossa marked this conversation as resolved Outdated
alexm commented 2023-11-07 13:10:16 +00:00
Outdated
Review
Copy Link

Aci deuries comprovar que fa lo que esperes

Aci deuries comprovar que fa lo que esperes
});
});
carlossa marked this conversation as resolved Outdated
alexm commented 2023-11-07 13:10:37 +00:00
Outdated
Review
Copy Link

Te falta per fer tests a un boto no?
I borrar per a netejar les fixtures

Te falta per fer tests a un boto no? I borrar per a netejar les fixtures