From 589c672ab20c9b4118e6924c3218d7b2cc16d445 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 13:28:49 +0200
Subject: [PATCH 1/2] fix: show degrees
---
src/i18n/locale/en.yml | 4 ++--
src/i18n/locale/es.yml | 4 ++--
src/pages/Travel/Card/TravelSummary.vue | 16 +++++++++++++++-
src/pages/Travel/Card/TravelThermographs.vue | 4 ++--
src/pages/Zone/locale/es.yml | 2 +-
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index af0ba0996..d018dc207 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -289,8 +289,8 @@ globals:
createInvoiceIn: Create invoice in
myAccount: My account
noOne: No one
- maxTemperature: Maximum Temperature
- minTemperature: Minimum Temperatura
+ maxTemperature: Máx
+ minTemperature: Mín
params:
clientFk: Client id
salesPersonFk: Sales person
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f56cd6761..7eece7d78 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -293,8 +293,8 @@ globals:
createInvoiceIn: Crear factura recibida
myAccount: Mi cuenta
noOne: Nadie
- maxTemperature: Temperatura máxima
- minTemperature: Temperatura mínima
+ maxTemperature: Máx
+ minTemperature: Mín
params:
clientFk: Id cliente
salesPersonFk: Comercial
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 829eb3a17..4be198493 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -121,6 +121,20 @@ const thermographsTableColumns = computed(() => {
name: 'temperatureFk',
align: 'left',
},
+ {
+ label: t('globals.maxTemperature'),
+ field: 'maxTemperature',
+ name: 'maxTemperature',
+ align: 'left',
+ format: (val) => (val ? `${val}°` : ''),
+ },
+ {
+ label: t('globals.minTemperature'),
+ field: 'minTemperature',
+ name: 'minTemperature',
+ align: 'left',
+ format: (val) => (val ? `${val}°` : ''),
+ },
{
label: t('travel.thermographs.state'),
field: 'result',
@@ -133,7 +147,7 @@ const thermographsTableColumns = computed(() => {
name: 'destination',
align: 'left',
format: (val) =>
- warehouses.value.find((warehouse) => warehouse.id === val).name,
+ warehouses.value.find((warehouse) => warehouse.id === val)?.name,
},
{
label: t('travel.thermographs.created'),
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 38b9125b1..e308243e3 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -52,12 +52,14 @@ const TableColumns = computed(() => {
field: 'maxTemperature',
name: 'maxTemperature',
align: 'left',
+ format: (val) => (val ? `${val}°` : ''),
},
{
label: t('globals.minTemperature'),
field: 'minTemperature',
name: 'minTemperature',
align: 'left',
+ format: (val) => (val ? `${val}°` : ''),
},
{
label: t('travel.thermographs.state'),
@@ -219,6 +221,4 @@ es:
Thermograph removed: Termógrafo eliminado
Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo?
No results: Sin resultados
- Max Temperature: Temperatura máxima
- Min Temperature: Temperatura mínima
</i18n>
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index dd919a0c5..7ecfb580d 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -87,7 +87,7 @@ eventsPanel:
travelingDays: Días de viaje
price: Precio
bonus: Bonificación
- m3Max: Meidida máxima
+ m3Max: Medida máxima
everyday: Todos los días
delete: Eliminar
deleteTitle: Este elemento será eliminado
--
2.40.1
From 4399a91e9934ab27bf28f5dd5dce28f9a865e1d5 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 13:29:45 +0200
Subject: [PATCH 2/2] fix: misSpelling
---
src/i18n/locale/en.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d018dc207..3df52f4a7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -289,8 +289,8 @@ globals:
createInvoiceIn: Create invoice in
myAccount: My account
noOne: No one
- maxTemperature: Máx
- minTemperature: Mín
+ maxTemperature: Max
+ minTemperature: Min
params:
clientFk: Client id
salesPersonFk: Sales person
--
2.40.1