diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index e3b690042..acfdefb67 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -830,6 +830,8 @@ travel: CloneTravelAndEntries: Clone travel and his entries deleteTravel: Delete travel AddEntry: Add entry + availabled: Availabled + availabledHour: Availabled hour thermographs: Thermographs hb: HB basicData: diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index e0d4cf27d..6bf3affc0 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -917,6 +917,8 @@ travel: deleteTravel: Eliminar envío AddEntry: Añadir entrada thermographs: Termógrafos + availabled: F. Disponible + availabledHour: Hora Disponible hb: HB basicData: daysInForward: Desplazamiento automatico (redada) diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue index eef9d55b5..f3949bb32 100644 --- a/src/pages/Customer/Card/CustomerConsumption.vue +++ b/src/pages/Customer/Card/CustomerConsumption.vue @@ -232,7 +232,6 @@ const updateDateParams = (value, params) => { :include="'category'" :sortBy="'name ASC'" dense - @update:model-value="(data) => updateDateParams(data, params)" > - - -es: - raidDays: El travel se desplaza automáticamente cada día para estar desde hoy al número de días indicado. Si se deja vacio no se moverá -en: - raidDays: The travel adjusts itself daily to match the number of days set, starting from today. If left blank, it won’t move - diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js index f5f4520fd..05436834f 100644 --- a/src/pages/Travel/Card/TravelFilter.js +++ b/src/pages/Travel/Card/TravelFilter.js @@ -11,6 +11,7 @@ export default { 'agencyModeFk', 'isRaid', 'daysInForward', + 'availabled', ], include: [ { diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index 16d42f104..9f9552611 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -10,6 +10,8 @@ import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue' import FetchData from 'src/components/FetchData.vue'; import VnRow from 'components/ui/VnRow.vue'; import { toDate, toCurrency, toCelsius } from 'src/filters'; +import { toDateTimeFormat } from 'src/filters/date.js'; +import { dashIfEmpty } from 'src/filters'; import axios from 'axios'; import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue'; @@ -333,6 +335,12 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; + diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index e90c01be2..b227afcb2 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -10,6 +10,9 @@ import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js'; import TravelFilter from './TravelFilter.vue'; import VnInputNumber from 'src/components/common/VnInputNumber.vue'; import VnSection from 'src/components/common/VnSection.vue'; +import VnInputTime from 'src/components/common/VnInputTime.vue'; +import VnInputDate from 'src/components/common/VnInputDate.vue'; +import { toDateTimeFormat } from 'src/filters/date'; const { viewSummary } = useSummaryDialog(); const router = useRouter(); @@ -167,6 +170,17 @@ const columns = computed(() => [ cardVisible: true, create: true, }, + { + align: 'left', + name: 'availabled', + label: t('travel.summary.availabled'), + component: 'input', + columnClass: 'expand', + columnField: { + component: null, + }, + format: (row, dashIfEmpty) => dashIfEmpty(toDateTimeFormat(row.availabled)), + }, { align: 'right', label: '', @@ -269,6 +283,16 @@ const columns = computed(() => [ :class="{ 'is-active': row.isReceived }" /> +