From 3c467c8c0e0410fb7ae933f7b89503ab78729059 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:08:01 +0200 Subject: [PATCH 01/28] feat: refs #6683 add property module and routes to navigation --- src/router/modules/index.js | 2 + src/router/modules/property.js | 100 +++++++++++++++++++++++++++++++ src/router/routes.js | 2 + src/stores/useNavigationStore.js | 1 + 4 files changed, 105 insertions(+) create mode 100644 src/router/modules/property.js diff --git a/src/router/modules/index.js b/src/router/modules/index.js index 19a17be63..400e9b405 100644 --- a/src/router/modules/index.js +++ b/src/router/modules/index.js @@ -15,6 +15,7 @@ import Entry from './entry'; import Zone from './zone'; import Account from './account'; import Monitor from './monitor'; +import Property from './property'; export default [ Item, @@ -34,4 +35,5 @@ export default [ Zone, Account, Monitor, + Property, ]; diff --git a/src/router/modules/property.js b/src/router/modules/property.js new file mode 100644 index 000000000..ab3bc6318 --- /dev/null +++ b/src/router/modules/property.js @@ -0,0 +1,100 @@ +import { RouterView } from 'vue-router'; + +const propertyCard = { + name: 'PropertyCard', + path: ':id', + component: () => import('src/pages/Property/Card/PropertyCard.vue'), + redirect: { name: 'PropertySummary' }, + meta: { + menu: ['PropertyBasicData', 'PropertyDms', 'PropertyNotes', 'PropertyLog'], + }, + children: [ + { + name: 'PropertySummary', + path: 'summary', + meta: { + title: 'summary', + icon: 'view_list', + }, + component: () => import('pages/Property/Card/PropertySummary.vue'), + }, + { + name: 'PropertyBasicData', + path: 'basic-data', + meta: { + title: 'basicData', + icon: 'vn:settings', + }, + component: () => import('pages/Property/Card/PropertyBasicData.vue'), + }, + { + name: 'PropertyDms', + path: 'dms', + meta: { + title: 'dms', + icon: 'cloud_upload', + }, + component: () => import('pages/Property/Card/PropertyDms.vue'), + }, + { + name: 'PropertyNotes', + path: 'notes', + meta: { + title: 'notes', + icon: 'note', + }, + component: () => import('pages/Property/Card/PropertyNotes.vue'), + }, + { + name: 'PropertyLog', + path: 'history', + meta: { + title: 'history', + icon: 'history', + }, + component: () => import('pages/Property/Card/PropertyLog.vue'), + }, + ], +}; + +export default { + name: 'Property', + path: '/property', + meta: { + title: 'properties', + icon: 'vn:property', + moduleName: 'Property', + menu: ['PropertyList'], + }, + component: RouterView, + redirect: { name: 'PropertyMain' }, + children: [ + { + name: 'PropertyMain', + path: '', + component: () => import('src/components/common/VnModule.vue'), + redirect: { name: 'PropertyIndexMain' }, + children: [ + { + path: '', + name: 'PropertyIndexMain', + component: () => import('src/pages/Property/PropertyList.vue'), + redirect: { name: 'PropertyList' }, + children: [ + { + name: 'PropertyList', + path: 'list', + meta: { + title: 'list', + icon: 'view_list', + }, + component: () => + import('src/pages/Property/PropertyList.vue'), + }, + propertyCard, + ], + }, + ], + }, + ], +}; diff --git a/src/router/routes.js b/src/router/routes.js index ed1c7afb6..7d9c9634b 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -15,6 +15,7 @@ import entry from 'src/router/modules/entry'; import zone from 'src/router/modules/zone'; import account from './modules/account'; import monitor from 'src/router/modules/monitor'; +import property from 'src/router/modules/property'; const routes = [ { @@ -83,6 +84,7 @@ const routes = [ entry, zone, account, + property, { path: '/:catchAll(.*)*', name: 'NotFound', diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js index 4a819bf19..e66fa8ae4 100644 --- a/src/stores/useNavigationStore.js +++ b/src/stores/useNavigationStore.js @@ -18,6 +18,7 @@ export const useNavigationStore = defineStore('navigationStore', () => { 'monitor', 'supplier', 'claim', + 'property', 'route', 'ticket', 'worker', -- 2.40.1 From 70298cb96a03554b4332ee5022463464e3090634 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:09:00 +0200 Subject: [PATCH 02/28] feat: refs #6683 add PropertyCard component for displaying property details --- src/pages/Property/Card/PropertyCard.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/pages/Property/Card/PropertyCard.vue diff --git a/src/pages/Property/Card/PropertyCard.vue b/src/pages/Property/Card/PropertyCard.vue new file mode 100644 index 000000000..3743a4d18 --- /dev/null +++ b/src/pages/Property/Card/PropertyCard.vue @@ -0,0 +1,12 @@ + + -- 2.40.1 From 5619e9c2ca1f40cd7734d4b06137203c3fcd8066 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:09:11 +0200 Subject: [PATCH 03/28] feat: refs #6683 add PropertyDescriptor component for enhanced property details display --- .../Property/Card/PropertyDescriptor.vue | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/pages/Property/Card/PropertyDescriptor.vue diff --git a/src/pages/Property/Card/PropertyDescriptor.vue b/src/pages/Property/Card/PropertyDescriptor.vue new file mode 100644 index 000000000..1423fdc3e --- /dev/null +++ b/src/pages/Property/Card/PropertyDescriptor.vue @@ -0,0 +1,50 @@ + + -- 2.40.1 From 5847734ef76fe7f75e70183986aa8212dbde4660 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:09:32 +0200 Subject: [PATCH 04/28] feat: refs #6683 add PropertyBasicData component for property details form --- src/pages/Property/Card/PropertyBasicData.vue | 208 ++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 src/pages/Property/Card/PropertyBasicData.vue diff --git a/src/pages/Property/Card/PropertyBasicData.vue b/src/pages/Property/Card/PropertyBasicData.vue new file mode 100644 index 000000000..1fbf1b599 --- /dev/null +++ b/src/pages/Property/Card/PropertyBasicData.vue @@ -0,0 +1,208 @@ + + + -- 2.40.1 From c6b9b3646fe404177e1199c8f2869b0f24799d32 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:09:39 +0200 Subject: [PATCH 05/28] feat: refs #6683 add PropertySummary component for detailed property overview --- src/pages/Property/Card/PropertySummary.vue | 302 ++++++++++++++++++++ 1 file changed, 302 insertions(+) create mode 100644 src/pages/Property/Card/PropertySummary.vue diff --git a/src/pages/Property/Card/PropertySummary.vue b/src/pages/Property/Card/PropertySummary.vue new file mode 100644 index 000000000..8dd1471de --- /dev/null +++ b/src/pages/Property/Card/PropertySummary.vue @@ -0,0 +1,302 @@ + + + + -- 2.40.1 From c0c85000635d46e7abd5b4094779d05aa09472c3 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:09:50 +0200 Subject: [PATCH 06/28] feat: refs #6683 add PropertyList component for displaying list of properties with filters --- src/pages/Property/PropertyList.vue | 140 ++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 src/pages/Property/PropertyList.vue diff --git a/src/pages/Property/PropertyList.vue b/src/pages/Property/PropertyList.vue new file mode 100644 index 000000000..7e9e82e40 --- /dev/null +++ b/src/pages/Property/PropertyList.vue @@ -0,0 +1,140 @@ + + + -- 2.40.1 From 56ce26223f3037bdb692e9ffea8667424373da2e Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:09:57 +0200 Subject: [PATCH 07/28] feat: refs #6683 add PropertyFilter component for advanced property filtering options --- src/pages/Property/PropertyFilter.vue | 175 ++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 src/pages/Property/PropertyFilter.vue diff --git a/src/pages/Property/PropertyFilter.vue b/src/pages/Property/PropertyFilter.vue new file mode 100644 index 000000000..2fac8625e --- /dev/null +++ b/src/pages/Property/PropertyFilter.vue @@ -0,0 +1,175 @@ + + + -- 2.40.1 From 37cf083b7a74cfd279934fb53176d8f61de683f6 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:10:19 +0200 Subject: [PATCH 08/28] feat: refs #6683 add PropertyDms and PropertyDmsImportForm components --- src/pages/Property/Card/PropertyDms.vue | 42 ++++++++++++ .../Property/Card/PropertyDmsImportForm.vue | 65 +++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 src/pages/Property/Card/PropertyDms.vue create mode 100644 src/pages/Property/Card/PropertyDmsImportForm.vue diff --git a/src/pages/Property/Card/PropertyDms.vue b/src/pages/Property/Card/PropertyDms.vue new file mode 100644 index 000000000..e100f3a5c --- /dev/null +++ b/src/pages/Property/Card/PropertyDms.vue @@ -0,0 +1,42 @@ + + diff --git a/src/pages/Property/Card/PropertyDmsImportForm.vue b/src/pages/Property/Card/PropertyDmsImportForm.vue new file mode 100644 index 000000000..7c1af443d --- /dev/null +++ b/src/pages/Property/Card/PropertyDmsImportForm.vue @@ -0,0 +1,65 @@ + + + -- 2.40.1 From 23c42ba33c5ee4bf745a2df48d1bd2c14d74eee0 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:10:38 +0200 Subject: [PATCH 09/28] feat: refs #6683 add PropertyLog and PropertyNotes components --- src/pages/Property/Card/PropertyLog.vue | 6 ++++ src/pages/Property/Card/PropertyNotes.vue | 34 +++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 src/pages/Property/Card/PropertyLog.vue create mode 100644 src/pages/Property/Card/PropertyNotes.vue diff --git a/src/pages/Property/Card/PropertyLog.vue b/src/pages/Property/Card/PropertyLog.vue new file mode 100644 index 000000000..9173519bb --- /dev/null +++ b/src/pages/Property/Card/PropertyLog.vue @@ -0,0 +1,6 @@ + + diff --git a/src/pages/Property/Card/PropertyNotes.vue b/src/pages/Property/Card/PropertyNotes.vue new file mode 100644 index 000000000..99056a647 --- /dev/null +++ b/src/pages/Property/Card/PropertyNotes.vue @@ -0,0 +1,34 @@ + + + -- 2.40.1 From c4a95c8d4ef71c3821a0df4f9b653d592d9731dc Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 1 Apr 2025 15:10:43 +0200 Subject: [PATCH 10/28] feat: refs #6683 add localization for Property pages in English and Spanish --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Property/locale/en.yml | 44 ++++++++++++++++++++++++++++++++ src/pages/Property/locale/es.yml | 44 ++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 src/pages/Property/locale/en.yml create mode 100644 src/pages/Property/locale/es.yml diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 7bcf90793..bd362ec45 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -341,6 +341,7 @@ globals: parking: Parking vehicleList: Vehicles vehicle: Vehicle + properties: Properties unsavedPopup: title: Unsaved changes will be lost subtitle: Are you sure exit without saving? diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index b2512193d..593da083b 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -344,6 +344,7 @@ globals: parking: Parking vehicleList: Vehículos vehicle: Vehículo + properties: Propiedades unsavedPopup: title: Los cambios que no haya guardado se perderán subtitle: ¿Seguro que quiere salir sin guardar? diff --git a/src/pages/Property/locale/en.yml b/src/pages/Property/locale/en.yml new file mode 100644 index 000000000..733be1b6b --- /dev/null +++ b/src/pages/Property/locale/en.yml @@ -0,0 +1,44 @@ +property: + search: Search property + searchInfo: Search property by id or name + id: Id + name: Name + cadaster: Cadaster + smallHolding: Small holding + area: Area + town: Town + registry: Registry + volume: Volume + book: Book + page: Page + farm: Farm + registration: Registration + value: Value + group: Group + m2: m2 + owner: Owner + allocation: Allocation + tome: Tome + map: Map + protocol: Notarial protocol + purchased: Purchased date + booked: Booked date + createProperty: Create property + goToMap: Link to map + hasFormalization: Formalization + hasSimpleCopy: Simple copy + hasOriginalPropertyDeed: Original property deed + hasFundProvision: Fund provision + params: + id: Id + name: Name + propertyGroupFk: Group + protocol: Notarial protocol + companyFk: Owner + purchased: Purchased date + booked: Booked date + cadaster: Cadaster + hasFormalization: Formalization + hasSimpleCopy: Simple copy + hasOriginalPropertyDeed: Original property deed + hasFundProvision: Fund provision diff --git a/src/pages/Property/locale/es.yml b/src/pages/Property/locale/es.yml new file mode 100644 index 000000000..09c035412 --- /dev/null +++ b/src/pages/Property/locale/es.yml @@ -0,0 +1,44 @@ +property: + search: Buscar propiedad + searchInfo: Buscar propiedad por id o nombre + id: Id + name: Nombre + cadaster: Ref. catastral + smallHolding: Parcela + area: Polígono + town: Municipio + registry: R.U. + volume: Volumen + book: Libro + page: Folio + farm: Finca + registration: Inscripción + value: Valor + group: Grupo + m2: m2 + owner: Propietario + allocation: Partida + tome: Volumen + map: Mapa + protocol: Protocolo notarial + purchased: F. compra + booked: F. finalización + createProperty: Nueva propiedad + goToMap: Ir al mapa + hasFormalization: Formalización + hasSimpleCopy: Copia simple + hasOriginalPropertyDeed: Escritura original + hasFundProvision: Provisión de fondos + params: + id: Id + name: Nombre + propertyGroupFk: Grupo + protocol: Protocolo notarial + companyFk: Propietario + purchased: F. compra + booked: F. finalización + cadaster: Ref. catastral + hasFormalization: Formalización + hasSimpleCopy: Copia simple + hasOriginalPropertyDeed: Escritura original + hasFundProvision: Provisión de fondos -- 2.40.1 From c34af4d888a87021d03d409dbaf2d7d3f695d2f2 Mon Sep 17 00:00:00 2001 From: jtubau Date: Wed, 2 Apr 2025 08:55:13 +0200 Subject: [PATCH 11/28] refactor: refs #6683 update Property components for improved data handling and display --- src/pages/Property/Card/PropertyBasicData.vue | 1 - .../Property/Card/PropertyDmsImportForm.vue | 2 +- src/pages/Property/Card/PropertyNotes.vue | 1 - src/pages/Property/PropertyList.vue | 67 ++++++++++++++++++- src/pages/Route/Vehicle/Card/VehicleNotes.vue | 1 - 5 files changed, 65 insertions(+), 7 deletions(-) diff --git a/src/pages/Property/Card/PropertyBasicData.vue b/src/pages/Property/Card/PropertyBasicData.vue index 1fbf1b599..380a99ffe 100644 --- a/src/pages/Property/Card/PropertyBasicData.vue +++ b/src/pages/Property/Card/PropertyBasicData.vue @@ -63,7 +63,6 @@ const isNew = Boolean(!route.params.id); option-value="id" option-label="code" hide-selected - @update:model-value="onClientChange" > diff --git a/src/pages/Property/PropertyList.vue b/src/pages/Property/PropertyList.vue index 7e9e82e40..842a69c85 100644 --- a/src/pages/Property/PropertyList.vue +++ b/src/pages/Property/PropertyList.vue @@ -48,12 +48,17 @@ const columns = computed(() => [ align: 'right', name: 'id', label: t('property.id'), - width: '70px', + width: '35px', + chip: { + condition: () => true, + }, + isId: true, }, { align: 'left', name: 'name', label: t('property.name'), + isTitle: true, }, { align: 'left', @@ -66,17 +71,25 @@ const columns = computed(() => [ optionValue: 'id', optionLabel: 'description', }, - format: ({description}) => description, + format: ({ propertyGroup }) => propertyGroup, + }, + { + label: t('property.group'), + name: 'propertyGroup', + cardVisible: true, + visible: false, }, { align: 'left', name: 'protocol', label: t('property.protocol'), + cardVisible: true, }, { align: 'left', name: 'cadaster', label: t('property.cadaster'), + cardVisible: true, }, { align: 'left', @@ -89,7 +102,13 @@ const columns = computed(() => [ optionValue: 'id', optionLabel: 'code', }, - format: ({code}) => code, + format: ({ companyCode }) => companyCode, + }, + { + label: t('property.owner'), + name: 'companyCode', + cardVisible: true, + visible: false, }, { align: 'left', @@ -98,6 +117,13 @@ const columns = computed(() => [ component: 'date', format: ({ purchased }) => toDate(purchased), }, + { + label: t('property.purchased'), + name: 'purchased', + format: ({ purchased }) => toDate(purchased), + cardVisible: true, + visible: false, + }, { align: 'left', name: 'booked', @@ -105,6 +131,41 @@ const columns = computed(() => [ component: 'date', format: ({ booked }) => toDate(booked), }, + { + label: t('property.booked'), + name: 'booked', + format: ({ booked }) => toDate(booked), + cardVisible: true, + visible: false, + }, + { + label: t('property.hasFormalization'), + name: 'hasFormalization', + component: 'checkbox', + cardVisible: true, + visible: false, + }, + { + label: t('property.hasSimpleCopy'), + name: 'hasSimpleCopy', + component: 'checkbox', + cardVisible: true, + visible: false, + }, + { + label: t('property.hasOriginalPropertyDeed'), + name: 'hasOriginalPropertyDeed', + component: 'checkbox', + cardVisible: true, + visible: false, + }, + { + label: t('property.hasFundProvision'), + name: 'hasFundProvision', + component: 'checkbox', + cardVisible: true, + visible: false, + }, ]); diff --git a/src/pages/Route/Vehicle/Card/VehicleNotes.vue b/src/pages/Route/Vehicle/Card/VehicleNotes.vue index 0afc3c3ed..36a8712a2 100644 --- a/src/pages/Route/Vehicle/Card/VehicleNotes.vue +++ b/src/pages/Route/Vehicle/Card/VehicleNotes.vue @@ -28,7 +28,6 @@ const body = { :add-note="true" :filter="noteFilter" :body="body" - style="overflow-y: auto" required deletable /> -- 2.40.1 From bf6d4f0c5fe5d79397e898769e81be7182410414 Mon Sep 17 00:00:00 2001 From: jtubau Date: Wed, 2 Apr 2025 10:16:45 +0200 Subject: [PATCH 12/28] feat: refs #6683 add localization for document management features in English and Spanish --- src/i18n/locale/en.yml | 4 ++++ src/i18n/locale/es.yml | 4 ++++ src/pages/Property/Card/PropertyDms.vue | 4 ++-- src/pages/Property/Card/PropertyDmsImportForm.vue | 4 ++-- src/pages/Ticket/Card/TicketDms.vue | 7 +------ src/pages/Ticket/Card/TicketDmsImportForm.vue | 15 ++++----------- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index bd362ec45..d543f9630 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -160,6 +160,9 @@ globals: department: Department noData: No data available vehicle: Vehicle + selectDocumentId: Select document id + import: Import from existing + document: Document pageTitles: logIn: Login addressEdit: Update address @@ -390,6 +393,7 @@ errors: updateUserConfig: Error updating user config tokenConfig: Error fetching token config writeRequest: The requested operation could not be completed + documentIdEmpty: The document identifier can't be empty login: title: Login username: Username diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 593da083b..1e04ca6de 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -164,6 +164,9 @@ globals: noData: Datos no disponibles department: Departamento vehicle: Vehículo + selectDocumentId: Introduzca id de gestión documental + import: Importar desde existente + document: Documento pageTitles: logIn: Inicio de sesión addressEdit: Modificar consignatario @@ -386,6 +389,7 @@ errors: updateUserConfig: Error al actualizar la configuración de usuario tokenConfig: Error al obtener configuración de token writeRequest: No se pudo completar la operación solicitada + documentIdEmpty: El número de documento no puede estar vacío login: title: Inicio de sesión username: Nombre de usuario diff --git a/src/pages/Property/Card/PropertyDms.vue b/src/pages/Property/Card/PropertyDms.vue index e100f3a5c..74759c9c2 100644 --- a/src/pages/Property/Card/PropertyDms.vue +++ b/src/pages/Property/Card/PropertyDms.vue @@ -19,7 +19,7 @@ const onDataSaved = () => dmsListRef.value.dmsRef.fetch(); update-model="propertyDms" delete-model="propertyDms" download-model="dms" - default-dms-code="propertyDms" + default-dms-code="property" filter="propertyFk" /> @@ -35,7 +35,7 @@ const onDataSaved = () => dmsListRef.value.dmsRef.fetch(); data-cy="importBtn" > - {{ t('property.dms.import') }} + {{ t('globals.import') }} diff --git a/src/pages/Property/Card/PropertyDmsImportForm.vue b/src/pages/Property/Card/PropertyDmsImportForm.vue index 22b3067f1..34e9a0ff7 100644 --- a/src/pages/Property/Card/PropertyDmsImportForm.vue +++ b/src/pages/Property/Card/PropertyDmsImportForm.vue @@ -6,8 +6,8 @@ import { useRoute } from 'vue-router'; import VnSelect from 'src/components/common/VnSelect.vue'; import FormModelPopup from 'components/FormModelPopup.vue'; import FetchData from 'components/FetchData.vue'; -import useNotify from 'src/composables/useNotify.js'; +import useNotify from 'src/composables/useNotify.js'; import axios from 'axios'; const emit = defineEmits(['onDataSaved']); @@ -53,7 +53,7 @@ const importDms = async () => { > - - -es: - Import from existing: Importar desde existente - diff --git a/src/pages/Ticket/Card/TicketDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue index 4b6b9c6cd..e21f0a4ec 100644 --- a/src/pages/Ticket/Card/TicketDmsImportForm.vue +++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue @@ -22,7 +22,7 @@ const dmsId = ref(null); const importDms = async () => { try { - if (!dmsId.value) throw new Error(t(`The document identifier can't be empty`)); + if (!dmsId.value) throw new Error(t(`globals.errors.documentIdEmpty`)); const data = { ticketFk: route.params.id, @@ -34,7 +34,7 @@ const importDms = async () => { dmsId.value = null; emit('onDataSaved'); } catch (e) { - throw new Error(e.message); + throw e; } }; @@ -49,14 +49,14 @@ const importDms = async () => { - - -es: - Select document id: Introduzca id de gestion documental - Document: Documento - The document indentifier can't be empty: El número de documento no puede estar vacío - -- 2.40.1 From 223890a1bc48fd57cda735391385ed160ff6ba9d Mon Sep 17 00:00:00 2001 From: jtubau Date: Wed, 2 Apr 2025 10:17:04 +0200 Subject: [PATCH 13/28] feat: refs #6683 add search functionality to PropertyFilter inputs --- src/pages/Property/PropertyFilter.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/Property/PropertyFilter.vue b/src/pages/Property/PropertyFilter.vue index 2fac8625e..797c5b3ae 100644 --- a/src/pages/Property/PropertyFilter.vue +++ b/src/pages/Property/PropertyFilter.vue @@ -111,6 +111,7 @@ const propertyGroups = ref([]); Date: Wed, 2 Apr 2025 10:17:13 +0200 Subject: [PATCH 14/28] refactor: refs #6683 update PropertyList component to enhance checkbox visibility and organization --- src/pages/Property/PropertyList.vue | 51 ++++++++--------------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/src/pages/Property/PropertyList.vue b/src/pages/Property/PropertyList.vue index 842a69c85..949688476 100644 --- a/src/pages/Property/PropertyList.vue +++ b/src/pages/Property/PropertyList.vue @@ -12,38 +12,6 @@ const tableRef = ref(); const dataKey = 'PropertyList'; const columns = computed(() => [ - { - labelAbbreviation: 'Fo', - label: t('property.hasFormalization'), - toolTip: t('property.hasFormalization'), - name: 'hasFormalization', - component: 'checkbox', - width: '35px', - }, - { - labelAbbreviation: 'SC', - label: t('property.hasSimpleCopy'), - toolTip: t('property.hasSimpleCopy'), - name: 'hasSimpleCopy', - component: 'checkbox', - width: '35px', - }, - { - labelAbbreviation: 'OP', - label: t('property.hasOriginalPropertyDeed'), - toolTip: t('property.hasOriginalPropertyDeed'), - name: 'hasOriginalPropertyDeed', - component: 'checkbox', - width: '35px', - }, - { - labelAbbreviation: 'FP', - label: t('property.hasFundProvision'), - toolTip: t('property.hasFundProvision'), - name: 'hasFundProvision', - component: 'checkbox', - width: '35px', - }, { align: 'right', name: 'id', @@ -139,32 +107,40 @@ const columns = computed(() => [ visible: false, }, { + labelAbbreviation: 'Fo', label: t('property.hasFormalization'), + toolTip: t('property.hasFormalization'), name: 'hasFormalization', component: 'checkbox', + width: '35px', cardVisible: true, - visible: false, }, { + labelAbbreviation: 'SC', label: t('property.hasSimpleCopy'), + toolTip: t('property.hasSimpleCopy'), name: 'hasSimpleCopy', component: 'checkbox', + width: '35px', cardVisible: true, - visible: false, }, { + labelAbbreviation: 'OP', label: t('property.hasOriginalPropertyDeed'), + toolTip: t('property.hasOriginalPropertyDeed'), name: 'hasOriginalPropertyDeed', component: 'checkbox', + width: '35px', cardVisible: true, - visible: false, }, { + labelAbbreviation: 'FP', label: t('property.hasFundProvision'), + toolTip: t('property.hasFundProvision'), name: 'hasFundProvision', component: 'checkbox', + width: '35px', cardVisible: true, - visible: false, }, ]); @@ -172,7 +148,6 @@ const columns = computed(() => [ diff --git a/src/pages/Property/Card/PropertySummary.vue b/src/pages/Property/Card/PropertySummary.vue index d67fccc0d..97776cd84 100644 --- a/src/pages/Property/Card/PropertySummary.vue +++ b/src/pages/Property/Card/PropertySummary.vue @@ -140,6 +140,7 @@ onMounted(async () => {
@@ -158,6 +159,7 @@ onMounted(async () => { :href="`${entity?.url}`" target="_blank" class="grafana" + data-cy="propertyMapLink" > {{ t('property.goToMap') }} @@ -187,6 +189,7 @@ onMounted(async () => {
{
{