From b25bd19bb5b21d0fd6ee42c63d5dcbc5ac8e21e5 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 15 Apr 2025 14:59:41 +0200 Subject: [PATCH] feat: refs #7385 add delivery forecast and delivered fields to route summary and descriptor --- src/pages/Route/Card/RouteDescriptor.vue | 13 +++++++++++++ src/pages/Route/Card/RouteSummary.vue | 14 ++++++++++++++ src/pages/Route/locale/en.yml | 2 ++ src/pages/Route/locale/es.yml | 2 ++ 4 files changed, 31 insertions(+) diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue index ee42d8e76..67bc88fec 100644 --- a/src/pages/Route/Card/RouteDescriptor.vue +++ b/src/pages/Route/Card/RouteDescriptor.vue @@ -68,6 +68,19 @@ onMounted(async () => { + diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue index 86bdbb5c5..435385f34 100644 --- a/src/pages/Route/Card/RouteSummary.vue +++ b/src/pages/Route/Card/RouteSummary.vue @@ -80,6 +80,20 @@ const ticketColumns = ref([ sortable: false, align: 'left', }, + { + name: 'dated', + label: t('route.delivered'), + field: (row) => dashIfEmpty(toDate(row?.landed)), + sortable: false, + align: 'center', + }, + { + name: 'prevision', + label: t('route.forecast'), + field: (row) => dashIfEmpty(toDate(row?.eta)), + sortable: false, + align: 'center', + }, { name: 'packages', label: t('route.summary.packages'), diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml index e7e2d691e..de7af53e8 100644 --- a/src/pages/Route/locale/en.yml +++ b/src/pages/Route/locale/en.yml @@ -70,6 +70,8 @@ route: searchInfo: You can search by route reference dated: Dated preview: Preview + delivered: Delivered + forecast: Forecast cmr: search: Search Cmr searchInfo: You can search Cmr by Id diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml index 2785ded31..857bebc17 100644 --- a/src/pages/Route/locale/es.yml +++ b/src/pages/Route/locale/es.yml @@ -71,6 +71,8 @@ route: searchInfo: Puedes buscar por referencia de la ruta dated: Fecha preview: Vista previa + delivered: Entregado + forecast: PronĂ³stico cmr: list: results: resultados