6336-migrationClaim-v5 #531

Merged
alexm merged 11 commits from 6336-migrationClaim-v5 into dev 2024-07-09 09:42:43 +00:00
Member
No description provided.
alexm added 2 commits 2024-07-05 07:17:22 +00:00
alexm added 2 commits 2024-07-05 08:51:33 +00:00
alexm reviewed 2024-07-05 08:52:21 +00:00
@ -138,14 +138,6 @@ const showFilter = computed(
);
</script>
<template>
<div
Author
Member

Ho he tret pq he vist q sols hi ha un cas en el que es mostra, y es millor traureu i llevarli complexitat al VnFilter

Ho he tret pq he vist q sols hi ha un cas en el que es mostra, y es millor traureu i llevarli complexitat al VnFilter
alexm reviewed 2024-07-05 08:52:50 +00:00
@ -303,0 +305,4 @@
class="q-pt-sm q-px-sm ellipsis"
:class="`text-${col?.align ?? 'left'}`"
:style="
$props.columnSearch ? { 'min-height': 72 + 'px' } : ''
Author
Member

I aixina podem gastar aço i si no vols filtros te mostra per lo menos el non

I aixina podem gastar aço i si no vols filtros te mostra per lo menos el non
Member

col.columnFilter == false??
Porque no es lo mismo que poner !col.columnFilter, pregunto

col.columnFilter == false?? Porque no es lo mismo que poner !col.columnFilter, pregunto
Author
Member

Esto lo cambié

Esto lo cambié
alexm reviewed 2024-07-05 08:53:29 +00:00
@ -30,7 +30,7 @@ function setClaimStates(data) {
}
Author
Member

He menejat les traduccions del global a Claim/locale

He menejat les traduccions del global a `Claim/locale`
alexm reviewed 2024-07-05 08:53:37 +00:00
@ -2,7 +2,7 @@
import { ref, computed, onMounted } from 'vue';
Author
Member

He menejat les traduccions del global a Claim/locale

He menejat les traduccions del global a `Claim/locale`
alexm reviewed 2024-07-05 08:53:50 +00:00
@ -10,3 +10,3 @@
const $props = defineProps({
id: { type: Number, default: null },
id: { type: [Number, String], default: null },
Author
Member

Arregla warning

Arregla warning
alexm reviewed 2024-07-05 08:53:58 +00:00
@ -114,3 +114,3 @@
companyId: config.value.companyFk,
dmsTypeId: dmsType.value.id,
description: t('claim.photo.fileDescription', {
description: t('claim.fileDescription', {
Author
Member

He menejat les traduccions del global a Claim/locale

He menejat les traduccions del global a `Claim/locale`
alexm reviewed 2024-07-05 08:54:04 +00:00
@ -15,6 +15,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
Author
Member

He menejat les traduccions del global a Claim/locale

He menejat les traduccions del global a `Claim/locale`
Member

Revisalas porque creo que no están funcionando.
Ver imagen de la PR

Revisalas porque creo que no están funcionando. Ver imagen de la PR
alexm reviewed 2024-07-05 08:54:21 +00:00
@ -362,11 +312,47 @@ async function changeState(value) {
</div>
</div>
</QCard>
<QCard class="vn-two" v-if="salesClaimed.length > 0">
Author
Member

Ho meneje de lloc

Ho meneje de lloc
alexm reviewed 2024-07-05 08:54:59 +00:00
@ -16,19 +16,12 @@ const props = defineProps({
},
Author
Member

Refactor

Refactor
alexm added 1 commit 2024-07-05 12:12:04 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2e02027a00
fix: cardDescriptor
alexm added 1 commit 2024-07-05 12:58:09 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
ab5347d302
fix: e2e and min-height vnTable
alexm changed title from WIP: 6336-migrationClaim-v5 to 6336-migrationClaim-v5 2024-07-05 13:01:18 +00:00
alexm requested review from jsegarra 2024-07-05 13:02:09 +00:00
jsegarra reviewed 2024-07-07 20:57:04 +00:00
@ -59,1 +59,3 @@
entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
entity = computed(() => {
const data = Array.isArray(store.data) ? store.data[0] : store.data;
if (data) emit('onFetch', data ?? {});
Member

no veo una manera de evitar repetir data ?? {} sino es con una variable

no veo una manera de evitar repetir data ?? {} sino es con una variable
alexm marked this conversation as resolved
jsegarra reviewed 2024-07-07 21:02:58 +00:00
@ -146,7 +145,7 @@ onMounted(async () => {
color="primary"
:href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
Member

lo dejamos para la próxima?

lo dejamos para la próxima?
Member

image

![image](/attachments/8e96af9c-a396-43d1-a998-644246a1f44e)
163 KiB
jsegarra reviewed 2024-07-07 21:06:18 +00:00
@ -365,0 +335,4 @@
<span v-if="col.name != 'description'">{{
t(col.value)
}}</span>
<QBtn
Member

Tenemos la opcion de hacer template #body-cell-description??

Tenemos la opcion de hacer template #body-cell-description??
Member

En ClaimSummaryAction hemos hecho template #column-description

En ClaimSummaryAction hemos hecho template #column-description
Author
Member

Este codigo solo lo he movido de sitio

Este codigo solo lo he movido de sitio
jsegarra marked this conversation as resolved
jsegarra reviewed 2024-07-07 21:07:04 +00:00
@ -367,3 +355,1 @@
:url="claimUrl + 'development'"
:text="t('claim.summary.development')"
/>
<VnTitle :url="claimUrl + 'development'" :text="t('claim.development')" />
Member

Es correcto, pero porque usamos '' en vez de ``??

Es correcto, pero porque usamos '' en vez de ``??
alexm marked this conversation as resolved
jsegarra reviewed 2024-07-07 21:07:41 +00:00
@ -394,4 +380,4 @@
label-always
color="var()"
markers
:marker-labels="[
Member

En claimBasicData hemos definido una variable marker_labels, porque aqui no?

En claimBasicData hemos definido una variable marker_labels, porque aqui no?
alexm marked this conversation as resolved
jsegarra reviewed 2024-07-07 21:09:46 +00:00
@ -189,0 +36,4 @@
lazy-rules
is-outlined
>
<template #prepend> <QIcon name="badge" size="xs"></QIcon></template>
Member

Quitar la etiqueta de cierre de QIcon

Quitar la etiqueta de cierre de QIcon
alexm marked this conversation as resolved
jsegarra reviewed 2024-07-07 21:13:13 +00:00
@ -20,0 +55,4 @@
name: 'stateCode',
chip: {
condition: () => true,
color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
Member

A lo mejor este commit c25b04e075 puede evitar definir los colores en JS y usar los de SCSS

A lo mejor este commit https://gitea.verdnatura.es/verdnatura/salix-front/commit/c25b04e07553df5be5c5aa262233347f326d3701 puede evitar definir los colores en JS y usar los de SCSS
alexm marked this conversation as resolved
jsegarra requested changes 2024-07-07 21:14:08 +00:00
Dismissed
jsegarra left a comment
Member

Las traducciones en ClaimSummary no van bien en ingles. Ver foto de la PR

Las traducciones en ClaimSummary no van bien en ingles. Ver foto de la PR
Author
Member

A mi sin tocar nada me van bien:
image

Creo que tenias la rama desactualizada igual

A mi sin tocar nada me van bien: ![image](/attachments/890bba88-82fe-4c64-b46f-a3cd63f91788) Creo que tenias la rama desactualizada igual
416 KiB
alexm added 2 commits 2024-07-08 07:00:09 +00:00
alexm requested review from jsegarra 2024-07-08 07:00:19 +00:00
jsegarra requested changes 2024-07-08 08:03:22 +00:00
Dismissed
@ -132,3 +137,3 @@
{
name: 'worker',
label: 'claim.summary.worker',
label: 'claim.worker',
Member

No se muestra descriptor del trabajador

No se muestra descriptor del trabajador
alexm marked this conversation as resolved
@ -189,0 +128,4 @@
/>
<QCheckbox
v-model="params.myTeam"
:label="t('myTeam')"
Member

He hecho la prueba en mi local añadiendo myTeam: Mi equipo en la linea 165

He hecho la prueba en mi local añadiendo myTeam: Mi equipo en la linea 165
alexm marked this conversation as resolved
Member

image

![image](/attachments/ea2eb15d-7e4e-4ed5-91e6-d33605c9eea0)
185 KiB
alexm added 2 commits 2024-07-08 12:25:57 +00:00
alexm added 1 commit 2024-07-09 09:27:19 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
bb8f0b43f0
Merge branch 'dev' into 6336-migrationClaim-v5
alexm requested review from jsegarra 2024-07-09 09:27:20 +00:00
jsegarra approved these changes 2024-07-09 09:38:55 +00:00
alexm merged commit fd9caea5c1 into dev 2024-07-09 09:42:43 +00:00
alexm deleted branch 6336-migrationClaim-v5 2024-07-09 09:42:43 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#531
No description provided.