0
0
Fork 0

Merge pull request '6722-showDegrees' (!782) from 6722-showDegrees into dev

Reviewed-on: verdnatura/salix-front#782
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Javi Gallego 2024-10-01 14:05:36 +00:00
commit 38599be9bd
5 changed files with 22 additions and 8 deletions

View File

@ -289,8 +289,8 @@ globals:
createInvoiceIn: Create invoice in
myAccount: My account
noOne: No one
maxTemperature: Maximum Temperature
minTemperature: Minimum Temperatura
maxTemperature: Max
minTemperature: Min
params:
clientFk: Client id
salesPersonFk: Sales person

View File

@ -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

View File

@ -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'),

View File

@ -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>

View File

@ -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