From df11584452da6bac3a81e27db59c12bacde05e0a Mon Sep 17 00:00:00 2001 From: jtubau Date: Mon, 19 May 2025 12:14:43 +0200 Subject: [PATCH] fix: refs #7385 rename forecast column to estimated --- src/pages/Route/Card/RouteSummary.vue | 12 +++--- src/pages/Route/RouteTickets.vue | 37 +++++++++++------- src/pages/Route/locale/en.yml | 56 +++++++++++++-------------- src/pages/Route/locale/es.yml | 52 ++++++++++++------------- 4 files changed, 81 insertions(+), 76 deletions(-) diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue index fa1d2e4a6..bb9797d0b 100644 --- a/src/pages/Route/Card/RouteSummary.vue +++ b/src/pages/Route/Card/RouteSummary.vue @@ -4,7 +4,7 @@ import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { useStateStore } from 'stores/useStateStore'; import { QIcon } from 'quasar'; -import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters'; +import { dashIfEmpty, toCurrency, toDate, toDateHourMinSec, toHour } from 'src/filters'; import { openBuscaman } from 'src/utils/buscaman'; import CardSummary from 'components/ui/CardSummary.vue'; import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue'; @@ -83,14 +83,14 @@ const ticketColumns = ref([ { name: 'delivered', label: t('route.delivered'), - field: (row) => dashIfEmpty(toDate(row?.delivered)), + field: (row) => dashIfEmpty(toDateHourMinSec(row?.delivered)), sortable: false, align: 'center', }, { - name: 'forecast', - label: t('route.forecast'), - field: (row) => dashIfEmpty(toDate(row?.forecast)), + name: 'estimated', + label: t('route.estimated'), + field: (row) => dashIfEmpty(toDateHourMinSec(row?.estimated)), sortable: false, align: 'center', }, @@ -103,7 +103,7 @@ const ticketColumns = ref([ }, { name: 'volume', - label: t('route.summary.m3'), + label: 'm³', field: (row) => row?.volume, sortable: false, align: 'center', diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue index fe2c61aca..2091f6f74 100644 --- a/src/pages/Route/RouteTickets.vue +++ b/src/pages/Route/RouteTickets.vue @@ -2,7 +2,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue'; import { useI18n } from 'vue-i18n'; import { computed, ref } from 'vue'; -import { dashIfEmpty } from 'src/filters'; +import { dashIfEmpty, toDateHourMinSec } from 'src/filters'; import VnInputDate from 'components/common/VnInputDate.vue'; import VnInput from 'components/common/VnInput.vue'; import axios from 'axios'; @@ -66,15 +66,15 @@ const columns = computed(() => [ }, { name: 'delivered', - label: t('route.ticket.delivered'), - field: (row) => dashIfEmpty(row?.delivered), + label: t('route.delivered'), + field: (row) => dashIfEmpty(toDateHourMinSec(row?.delivered)), sortable: false, align: 'left', }, { name: 'estimated', - label: t('route.ticket.estimated'), - field: (row) => dashIfEmpty(row?.estimated), + label: t('route.estimated'), + field: (row) => dashIfEmpty(toDateHourMinSec(row?.estimated)), sortable: false, align: 'left', }, @@ -254,7 +254,9 @@ const openSmsDialog = async () => { -

{{ t('route.ticket.selectStartingDate') }}

+

+ {{ t('route.ticket.selectStartingDate') }} +

@@ -265,7 +267,12 @@ const openSmsDialog = async () => { /> - + {{ t('globals.clone') }} @@ -302,11 +309,7 @@ const openSmsDialog = async () => { class="q-mr-sm" @click="setOrderedPriority" > - {{ - t('route.ticket.renumberAllTickets') - }} - + {{ t('route.ticket.renumberAllTickets') }} { @click="setHighestPriority(row, rows)" > - {{ t('route.ticket.assignHighestPriority') }} + {{ + t( + 'route.ticket.assignHighestPriority', + ) + }} { {{ value }} - {{ t('route.ticket.openBuscaman') }} + {{ + t('route.ticket.openBuscaman') + }} diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml index bce0946fd..d75f5c5ab 100644 --- a/src/pages/Route/locale/en.yml +++ b/src/pages/Route/locale/en.yml @@ -2,32 +2,32 @@ route: filter: Served: Served summary: - date: Date - agency: Agency - vehicle: Vehicle - driver: Driver - cost: Cost - started: Started time - finished: Finished time - kmStart: Km start - kmEnd: Km end - volume: Volume - packages: Packages - description: Description - tickets: Tickets - order: Order - street: Street - city: City - pc: PC - client: Client - state: State - m3: m³ - packaging: Packaging - ticket: Ticket - closed: Closed - open: Open - yes: Yes - no: No + date: Date + agency: Agency + vehicle: Vehicle + driver: Driver + cost: Cost + started: Started time + finished: Finished time + kmStart: Km start + kmEnd: Km end + volume: Volume + packages: Packages + description: Description + tickets: Tickets + order: Order + street: Street + city: City + pc: PC + client: Client + state: State + m3: m³ + packaging: Packaging + ticket: Ticket + closed: Closed + open: Open + yes: Yes + no: No extendedList: selectStartingDate: Select the starting date startingDate: Starting date @@ -103,7 +103,7 @@ route: dated: Dated preview: Preview delivered: Delivered - forecast: Forecast + estimated: Estimated cmr: search: Search Cmr searchInfo: You can search Cmr by Id @@ -129,8 +129,6 @@ route: PC: PC client: Client warehouse: Warehouse - delivered: Delivered - estimated: Estimated packages: Packages packaging: Packaging ticket: Ticket diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml index d72a6650e..20e8aa515 100644 --- a/src/pages/Route/locale/es.yml +++ b/src/pages/Route/locale/es.yml @@ -2,30 +2,30 @@ route: filter: Served: Servida summary: - date: Fecha - agency: Agencia - vehicle: Vehículo - driver: Conductor - cost: Costo - started: Hora inicio - finished: Hora fin - kmStart: Km inicio - kmEnd: Km fin - volume: Volumen - packages: Bultos - description: Descripción - tickets: Tickets - order: Orden - street: Dirección fiscal - city: Población - pc: CP - client: Cliente - state: Estado - packaging: Encajado - closed: Cerrada - open: Abierta - yes: Sí - no: No + date: Fecha + agency: Agencia + vehicle: Vehículo + driver: Conductor + cost: Costo + started: Hora inicio + finished: Hora fin + kmStart: Km inicio + kmEnd: Km fin + volume: Volumen + packages: Bultos + description: Descripción + tickets: Tickets + order: Orden + street: Dirección fiscal + city: Población + pc: CP + client: Cliente + state: Estado + packaging: Encajado + closed: Cerrada + open: Abierta + yes: Sí + no: No extendedList: selectStartingDate: Seleccione la fecha de inicio statingDate: Fecha de inicio @@ -102,7 +102,7 @@ route: dated: Fecha preview: Vista previa delivered: Entregado - forecast: Pronóstico + estimated: Pronóstico cmr: list: results: resultados @@ -124,8 +124,6 @@ route: PC: CP client: Cliente warehouse: Almacén - delivered: Entregado - estimated: Pronóstico packages: Bultos packaging: Encajado ticket: Ticket