From b09ecefad4ec93451ef9f6d70bfe927ddc7eb771 Mon Sep 17 00:00:00 2001 From: guillermo Date: Thu, 4 Apr 2024 14:12:16 +0200 Subject: [PATCH 1/4] feat: refs #6636 Added pickup in claim --- src/components/common/VnLog.vue | 4 +-- src/i18n/en/index.js | 9 +++++- src/i18n/es/index.js | 9 +++++- src/pages/Claim/Card/ClaimBasicData.vue | 28 ++++++++++++++----- src/pages/Claim/Card/ClaimSummary.vue | 7 ++--- .../__tests__/components/common/VnLog.spec.js | 4 +-- 6 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 794e4cc8f..c1cc78f54 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -1030,7 +1030,7 @@ en: ticketCreated: Created created: Created isChargedToMana: Charged to mana - hasToPickUp: Has to pick Up + pickup: Type of pickup dmsFk: Document ID text: Description claimStateFk: Claim State @@ -1069,7 +1069,7 @@ es: ticketCreated: Creado created: Creado isChargedToMana: Cargado a maná - hasToPickUp: Se debe recoger + pickup: Se debe recoger dmsFk: ID documento text: Descripción claimStateFk: Estado de la reclamación diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 5e0bba5c0..650ae78ce 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -545,6 +545,7 @@ export default { assignedTo: 'Assigned', attendedBy: 'Attended by', created: 'Created', + pickup: 'Pickup', state: 'State', details: 'Details', item: 'Item', @@ -566,13 +567,19 @@ export default { responsible: 'Responsible', worker: 'Worker', redelivery: 'Redelivery', + null: 'No', + agency: 'Agency', + delivery: 'Delivery', }, basicData: { customer: 'Customer', assignedTo: 'Assigned', created: 'Created', state: 'State', - picked: 'Picked', + pickup: 'Pickup', + null: 'No', + agency: 'Agency', + delivery: 'Delivery', }, photo: { fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index a4aa9d8cc..1525f6ac6 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -544,6 +544,7 @@ export default { assignedTo: 'Asignada a', attendedBy: 'Atendida por', created: 'Creada', + pickup: 'Recogida', state: 'Estado', details: 'Detalles', item: 'Artículo', @@ -565,13 +566,19 @@ export default { responsible: 'Responsable', worker: 'Trabajador', redelivery: 'Devolución', + null: 'No', + agency: 'Agencia', + delivery: 'Reparto', }, basicData: { customer: 'Cliente', assignedTo: 'Asignada a', created: 'Creada', state: 'Estado', - picked: 'Recogida', + pickup: 'Recogida', + null: 'No', + agency: 'Agencia', + delivery: 'Reparto', }, photo: { fileDescription: diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index c7c5ab8a2..57ecc6cad 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -24,7 +24,7 @@ const claimFilter = { 'workerFk', 'claimStateFk', 'packages', - 'hasToPickUp', + 'pickup', ], include: [ { @@ -51,6 +51,13 @@ function setClaimStates(data) { claimStatesCopy.value = data; } +// Simulate ENUM +let optionsList = [ + { id: null, description: t('claim.basicData.null') }, + { id: 'agency', description: t('claim.basicData.agency') }, + { id: 'delivery', description: t('claim.basicData.delivery') }, +]; + const workerFilter = { options: workers, filterFn: (options, value) => { @@ -168,13 +175,20 @@ const statesFilter = { type="number" /> - -
- + +
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index 612e0d755..19e3f00ef 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -220,10 +220,9 @@ function openDialog(dmsId) { /> - diff --git a/test/vitest/__tests__/components/common/VnLog.spec.js b/test/vitest/__tests__/components/common/VnLog.spec.js index b654bff9b..53d2732a0 100644 --- a/test/vitest/__tests__/components/common/VnLog.spec.js +++ b/test/vitest/__tests__/components/common/VnLog.spec.js @@ -38,10 +38,10 @@ describe('VnLog', () => { action: 'update', changedModel: 'Claim', oldInstance: { - hasToPickUp: false, + pickup: null, }, newInstance: { - hasToPickUp: true, + pickup: 'agency', }, creationDate: '2023-09-18T12:25:34.000Z', changedModelId: '1', From 58b9eb1c78735d22404bf5ad170fe50d67910e57 Mon Sep 17 00:00:00 2001 From: guillermo Date: Fri, 5 Apr 2024 07:29:25 +0200 Subject: [PATCH 2/4] feat: refs #6636 Requested changes --- src/pages/Claim/Card/ClaimBasicData.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index 57ecc6cad..38d5d1ed5 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -185,7 +185,6 @@ const statesFilter = { :label="t('claim.basicData.pickup')" map-options use-input - @filter="(value, update) => filter(value, update, statesFilter)" :input-debounce="0" > From 9310d863aa719790fd2e94028b6afff8e21003d4 Mon Sep 17 00:00:00 2001 From: guillermo Date: Fri, 5 Apr 2024 07:39:05 +0200 Subject: [PATCH 3/4] fix: refs #6636 Icon save and reset --- src/components/FormModel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 060a18bcc..39e8a72f5 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -132,12 +132,12 @@ const formUrl = computed(() => $props.url); const defaultButtons = computed(() => ({ save: { color: 'primary', - icon: 'restart_alt', + icon: 'save', label: 'globals.save', }, reset: { color: 'primary', - icon: 'save', + icon: 'restart_alt', label: 'globals.reset', }, ...$props.defaultButtons, From 1a15ccec2c96e51ab289899d7e8d686479e11e86 Mon Sep 17 00:00:00 2001 From: guillermo Date: Fri, 5 Apr 2024 11:01:48 +0200 Subject: [PATCH 4/4] fix: refs #6636 Call getEnumValues method --- src/pages/Claim/Card/ClaimBasicData.vue | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index 38d5d1ed5..56717c628 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -9,6 +9,7 @@ import VnRow from 'components/ui/VnRow.vue'; import VnInput from 'src/components/common/VnInput.vue'; import VnInputDate from 'components/common/VnInputDate.vue'; +import axios from 'axios'; import { useSession } from 'src/composables/useSession'; const route = useRoute(); @@ -50,13 +51,20 @@ function setClaimStates(data) { claimStates.value = data; claimStatesCopy.value = data; } - -// Simulate ENUM -let optionsList = [ - { id: null, description: t('claim.basicData.null') }, - { id: 'agency', description: t('claim.basicData.agency') }, - { id: 'delivery', description: t('claim.basicData.delivery') }, -]; +let optionsList; +async function getEnumValues() { + optionsList = [{ id: null, description: t('claim.basicData.null') }]; + const { data } = await axios.get(`Applications/get-enum-values`, { + params: { + schema: 'vn', + table: 'claim', + column: 'pickup', + }, + }); + for (let value of data) + optionsList.push({ id: value, description: t(`claim.basicData.${value}`) }); +} +getEnumValues(); const workerFilter = { options: workers,