Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8113-mapData
gitea/salix-front/pipeline/pr-master This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-12-18 09:53:20 +01:00
commit 9052b2f1a2
10 changed files with 19 additions and 16 deletions

View File

@ -29,7 +29,7 @@ const exprBuilder = (param, value) => {
return { 'a.supplierName': value }; return { 'a.supplierName': value };
case 'routeFk': case 'routeFk':
return { 'a.routeFk': value }; return { 'a.routeFk': value };
case 'created': case 'dated':
case 'agencyFk': case 'agencyFk':
case 'packages': case 'packages':
case 'm3': case 'm3':
@ -145,7 +145,7 @@ const exprBuilder = (param, value) => {
<QItem class="q-my-sm"> <QItem class="q-my-sm">
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
v-model="params.created" v-model="params.dated"
:label="t('Date')" :label="t('Date')"
is-outlined is-outlined
/> />

View File

@ -28,7 +28,7 @@ const filter = {
'id', 'id',
'workerFk', 'workerFk',
'agencyModeFk', 'agencyModeFk',
'created', 'dated',
'm3', 'm3',
'warehouseFk', 'warehouseFk',
'description', 'description',
@ -78,7 +78,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
@on-fetch="setData" @on-fetch="setData"
> >
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('Date')" :value="toDate(entity?.created)" /> <VnLv :label="t('Date')" :value="toDate(entity?.dated)" />
<VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" /> <VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" />
<VnLv :label="t('Zone')" :value="entity?.zone?.name" /> <VnLv :label="t('Zone')" :value="entity?.zone?.name" />
<VnLv <VnLv

View File

@ -19,7 +19,7 @@ const shelvingId = ref(route.params?.id || null);
const isNew = Boolean(!shelvingId.value); const isNew = Boolean(!shelvingId.value);
const defaultInitialData = { const defaultInitialData = {
agencyModeFk: null, agencyModeFk: null,
created: null, dated: null,
description: '', description: '',
vehicleFk: null, vehicleFk: null,
workerFk: null, workerFk: null,
@ -32,7 +32,7 @@ const routeFilter = {
'id', 'id',
'workerFk', 'workerFk',
'agencyModeFk', 'agencyModeFk',
'created', 'dated',
'm3', 'm3',
'warehouseFk', 'warehouseFk',
'description', 'description',
@ -134,7 +134,7 @@ const onSave = (data, response) => {
option-label="name" option-label="name"
:input-debounce="0" :input-debounce="0"
/> />
<VnInputDate v-model="data.created" :label="t('Created')" /> <VnInputDate v-model="data.dated" :label="t('Dated')" />
</VnRow> </VnRow>
<template v-if="!isNew"> <template v-if="!isNew">
<VnRow> <VnRow>
@ -188,7 +188,7 @@ es:
Hour finished: Hora fin Hour finished: Hora fin
Description: Descripción Description: Descripción
Is served: Se ha servido Is served: Se ha servido
Created: Creado Dated: Fecha
The km can not exceed: La distancia debe ser inferior a {maxDistance} The km can not exceed: La distancia debe ser inferior a {maxDistance}
en: en:
The km can not exceed: Distance must be lesser than {maxDistance} The km can not exceed: Distance must be lesser than {maxDistance}

View File

@ -139,7 +139,7 @@ const ticketColumns = ref([
<QCard class="vn-one"> <QCard class="vn-one">
<VnLv <VnLv
:label="t('route.summary.date')" :label="t('route.summary.date')"
:value="toDate(entity?.route.created)" :value="toDate(entity?.route.dated)"
/> />
<VnLv <VnLv
:label="t('route.summary.agency')" :label="t('route.summary.agency')"

View File

@ -46,10 +46,10 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'created', name: 'dated',
label: t('Date'), label: t('Date'),
columnFilter: false, columnFilter: false,
format: ({ created }) => toDate(created), format: ({ dated }) => toDate(dated),
}, },
{ {
align: 'left', align: 'left',

View File

@ -111,7 +111,7 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'created', name: 'dated',
label: t('route.Date'), label: t('route.Date'),
columnFilter: false, columnFilter: false,
cardVisible: true, cardVisible: true,

View File

@ -45,7 +45,7 @@ const columns = computed(() => [
columnFilter: { columnFilter: {
inWhere: true, inWhere: true,
}, },
format: ({ created }) => toDate(created), format: ({ dated }) => toDate(dated),
cardVisible: true, cardVisible: true,
}, },
{ {

View File

@ -109,7 +109,7 @@ const ticketList = ref([]);
const cloneRoutes = () => { const cloneRoutes = () => {
axios.post('Routes/clone', { axios.post('Routes/clone', {
created: startingDate.value, dated: startingDate.value,
ids: selectedRows.value.map((row) => row?.id), ids: selectedRows.value.map((row) => row?.id),
}); });
refreshKey.value++; refreshKey.value++;

View File

@ -5,7 +5,7 @@ route:
Description: Description Description: Description
hourStarted: H.Start hourStarted: H.Start
hourFinished: H.End hourFinished: H.End
createRoute: Create route dated: Dated
From: From From: From
To: To To: To
Date: Date Date: Date

View File

@ -103,9 +103,12 @@ const formattedWeekTotalHours = computed(() =>
const onInputChange = async (date) => { const onInputChange = async (date) => {
if (!date) return; if (!date) return;
const { year, month, day } = date.scope.timestamp; const { timestamp, outside } = date.scope;
const { year, month, day } = timestamp;
const _date = new Date(year, month - 1, day); const _date = new Date(year, month - 1, day);
setDate(_date); setDate(_date);
if (outside) getMailStates(_date);
}; };
const setDate = async (date) => { const setDate = async (date) => {