8627-devToTest #1421

Merged
alexm merged 768 commits from 8627-devToTest into test 2025-02-18 12:37:37 +00:00
1 changed files with 6 additions and 7 deletions
Showing only changes of commit 69e77b57ba - Show all commits

View File

@ -15,7 +15,6 @@ import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
import useNotify from 'src/composables/useNotify.js';
import { useState } from 'src/composables/useState';
import { toDateTimeFormat } from 'src/filters/date.js';
import { toDateFormat } from 'src/filters/date.js';
import axios from 'axios';
const state = useState();
@ -188,8 +187,8 @@ watch(
destinationElRef.value.textContent = `${t(
'advanceTickets.destination',
)} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
)} ${toDateTimeFormat(vnTableRef.value.params.dateToAdvance)}`;
originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateTimeFormat(
vnTableRef.value.params.dateFuture,
)}`;
@ -205,8 +204,8 @@ watch(
if (originElRef.value && destinationElRef.value) {
destinationElRef.value.textContent = `${t(
'advanceTickets.destination',
)} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
)} ${toDateTimeFormat(vnTableRef.value.params.dateToAdvance)}`;
originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateTimeFormat(
vnTableRef.value.params.dateFuture,
)}`;
}
@ -360,7 +359,7 @@ watch(
</span>
</template>
<template #column-id="{ row }">
<QBtn flat class="link">
<QBtn flat class="link" @click.stop>
{{ row.id }}
<TicketDescriptorProxy :id="row.id" />
</QBtn>
@ -401,7 +400,7 @@ watch(
</QBadge>
</template>
<template #column-futureId="{ row }">
<QBtn flat class="link" dense>
<QBtn flat class="link" @click.stop dense>
{{ row.futureId }}
<TicketDescriptorProxy :id="row.futureId" />
</QBtn>