From 9f3fe3665b0250daf6eb1fad151bf85111e498f3 Mon Sep 17 00:00:00 2001 From: carlosfonseca Date: Mon, 4 Dec 2023 12:02:47 -0500 Subject: [PATCH 1/2] Se cambia visualmente el componente que controla las descargas --- src/components/ui/CardList.vue | 2 +- src/pages/InvoiceOut/InvoiceOutList.vue | 244 +++++++++++++----------- 2 files changed, 131 insertions(+), 115 deletions(-) diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue index ae74fbd7e..f94d670c4 100644 --- a/src/components/ui/CardList.vue +++ b/src/components/ui/CardList.vue @@ -28,7 +28,7 @@ const selectedItem = (item) => {
-
+
{{ $props.title }}
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index b309a9674..95279b09d 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -45,6 +45,8 @@ const setManageCheckboxes = (downloadType) => { }; const addElement = (element) => { + showSelect.value = false; + manageCheckboxes.value = false; if (arrayElements.value.length >= 0) { const index = arrayElements.value.findIndex((item) => item.id === element.id); if (index >= 0) { @@ -124,119 +126,130 @@ const downloadCsv = (rows) => { - -
- - + @@ -245,10 +258,6 @@ const downloadCsv = (rows) => { width: 100%; max-width: 60em; } - -.dark_icon { - color: #121212; -} @@ -257,10 +266,17 @@ en: fileDenied: Browser denied file download... fileAllowed: Successful download of CSV file youCanSearchByInvoiceReference: You can search by invoice reference - + download: Download + selectRows: Select all { numberRows } row(s) + allRows: All { numberRows } row(s) + markAll: Mark all es: searchInvoice: Buscar factura emitida fileDenied: El navegador denegó la descarga de archivos... fileAllowed: Descarga exitosa de archivo CSV youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura + download: Descargar + selectRows: Seleccionar las { numberRows } filas(s) + allRows: Todo { numberRows } filas(s) + markAll: Marcar todo From ce72b52e885527ee8843a89321b381808f4e1b86 Mon Sep 17 00:00:00 2001 From: carlosfonseca Date: Mon, 4 Dec 2023 12:54:40 -0500 Subject: [PATCH 2/2] Reubicacion de textos i18n a global --- src/i18n/en/index.js | 6 +++++- src/i18n/es/index.js | 6 +++++- src/pages/InvoiceOut/InvoiceOutList.vue | 22 +++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 92a2ec206..68d581703 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -39,6 +39,10 @@ export default { }, noSelectedRows: `You don't have any line selected`, downloadCSVSuccess: 'CSV downloaded successfully', + download: 'Download', + selectRows: 'Select all { numberRows } row(s)', + allRows: 'All { numberRows } row(s)', + markAll: 'Mark all', }, errors: { statusUnauthorized: 'Access denied', @@ -439,7 +443,7 @@ export default { create: 'Create', summary: 'Summary', basicData: 'Basic Data', - log: 'Logs' + log: 'Logs', }, list: { parking: 'Parking', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 7e296a353..c7c778da3 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -39,6 +39,10 @@ export default { }, noSelectedRows: `No tienes ninguna línea seleccionada`, downloadCSVSuccess: 'Descarga de CSV exitosa', + download: 'Descargar', + selectRows: 'Seleccionar las { numberRows } filas(s)', + allRows: 'Todo { numberRows } filas(s)', + markAll: 'Marcar todo', }, errors: { statusUnauthorized: 'Acceso denegado', @@ -441,7 +445,7 @@ export default { create: 'Crear', summary: 'Resumen', basicData: 'Datos básicos', - log: 'Registros de auditoría' + log: 'Registros de auditoría', }, list: { parking: 'Parking', diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 95279b09d..5f02f175d 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -141,14 +141,14 @@ const downloadCsv = (rows) => { class="q-mr-xl" color="primary" :disable="!manageCheckboxes && arrayElements.length < 1" - :label="t('download')" + :label="t('globals.download')" v-if="!showSelect" /> @@ -156,8 +156,8 @@ const downloadCsv = (rows) => { {{ - t('allRows', { - numberRows: t(rows.length), + t('globals.allRows', { + numberRows: rows.length, }) }} @@ -168,8 +168,8 @@ const downloadCsv = (rows) => { {{ - t('selectRows', { - numberRows: t(rows.length), + t('globals.selectRows', { + numberRows: rows.length, }) }} @@ -180,7 +180,7 @@ const downloadCsv = (rows) => {