Merge branch 'dev' into 8441-createVehicleInvoiceInSection
This commit is contained in:
commit
5307becf31
|
|
@ -0,0 +1,152 @@
|
|||
<script setup>
|
||||
import { ref, computed } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { date } from 'quasar';
|
||||
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
|
||||
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
|
||||
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
|
||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
import useWeekdaysOrder from 'src/composables/getWeekdays';
|
||||
|
||||
const formatDate = (dateToFormat, format = 'YYYY-MM-DD') => (
|
||||
date.formatDate(dateToFormat, format)
|
||||
);
|
||||
|
||||
|
||||
const props = defineProps({
|
||||
year: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
month: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
monthDate: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
daysMap: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['onDateSelected']);
|
||||
|
||||
const { locale } = useI18n();
|
||||
const weekdayStore = useWeekdayStore();
|
||||
const weekDays = useWeekdaysOrder();
|
||||
const calendarRef = ref(null);
|
||||
const today = ref(formatDate(Date.vnNew()));
|
||||
const todayTimestamp = computed(() => {
|
||||
const date = Date.vnNew();
|
||||
date.setHours(0, 0, 0, 0);
|
||||
return date.getTime();
|
||||
});
|
||||
const _monthDate = computed(() => formatDate(props.monthDate));
|
||||
|
||||
const calendarHeaderTitle = computed(() => {
|
||||
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
|
||||
});
|
||||
|
||||
const isToday = (timestamp) => {
|
||||
const { year, month, day } = timestamp;
|
||||
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
|
||||
};
|
||||
|
||||
const getEventByTimestamp = ({ year, month, day }) => {
|
||||
const stamp = new Date(year, month - 1, day).getTime();
|
||||
return props.daysMap?.[stamp] || null;
|
||||
};
|
||||
|
||||
const handleDateClick = (timestamp) => {
|
||||
const event = getEventByTimestamp(timestamp);
|
||||
const { year, month, day } = timestamp;
|
||||
const date = new Date(year, month - 1, day);
|
||||
emit('onDateSelected', {
|
||||
date,
|
||||
isNewMode: !event,
|
||||
event: event?.[0] || null
|
||||
});
|
||||
};
|
||||
|
||||
const getEventAttrs = (timestamp) => {
|
||||
return {
|
||||
class: '--event',
|
||||
label: timestamp.day,
|
||||
};
|
||||
};
|
||||
|
||||
defineExpose({ getEventByTimestamp, handleDateClick });
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QCalendarMonthWrapper
|
||||
style="height: 290px; width: 290px"
|
||||
transparent-background
|
||||
view-customization="workerCalendar"
|
||||
>
|
||||
<template #header>
|
||||
<span class="full-width text-center text-body1 q-py-sm">{{
|
||||
calendarHeaderTitle
|
||||
}}</span>
|
||||
</template>
|
||||
<template #calendar>
|
||||
<QCalendarMonth
|
||||
ref="calendarRef"
|
||||
:model-value="_monthDate"
|
||||
show-work-weeks
|
||||
no-outside-days
|
||||
no-active-date
|
||||
:weekdays="weekDays"
|
||||
short-weekday-label
|
||||
:locale="locale"
|
||||
:now="today"
|
||||
@click-date="handleDateClick($event.scope.timestamp)"
|
||||
mini-mode
|
||||
>
|
||||
<template #day="{ scope: { timestamp } }">
|
||||
<slot name="day" :timestamp="timestamp" :getEventAttrs="getEventAttrs">
|
||||
<QBtn
|
||||
v-if="getEventByTimestamp(timestamp)"
|
||||
v-bind="{ ...getEventAttrs(timestamp) }"
|
||||
@click="handleDateClick(timestamp)"
|
||||
rounded
|
||||
dense
|
||||
flat
|
||||
class="calendar-event"
|
||||
:class="{ '--today': isToday(timestamp) }"
|
||||
/>
|
||||
</slot>
|
||||
</template>
|
||||
</QCalendarMonth>
|
||||
</template>
|
||||
</QCalendarMonthWrapper>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
.calendar-event {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
font-size: 13px;
|
||||
line-height: 1.715em;
|
||||
cursor: pointer;
|
||||
color: white;
|
||||
|
||||
&.--today {
|
||||
border: 2px solid $info;
|
||||
}
|
||||
|
||||
&.--event {
|
||||
background-color: $positive;
|
||||
color: black;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
opacity: 0.8;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
<script setup>
|
||||
import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
|
||||
const props = defineProps({
|
||||
dataKey: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
calendarComponent: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
additionalProps: {
|
||||
type: Object,
|
||||
default: () => ({}),
|
||||
}
|
||||
});
|
||||
|
||||
const stateStore = useStateStore();
|
||||
const weekdayStore = useWeekdayStore();
|
||||
const nMonths = ref(4);
|
||||
const _date = ref(Date.vnNew());
|
||||
const firstDay = ref(Date.vnNew());
|
||||
const lastDay = ref(Date.vnNew());
|
||||
const months = ref([]);
|
||||
const arrayData = useArrayData(props.dataKey);
|
||||
onMounted(async () => {
|
||||
const initialDate = Date.vnNew();
|
||||
initialDate.setDate(1);
|
||||
initialDate.setHours(0, 0, 0, 0);
|
||||
date.value = initialDate;
|
||||
await nextTick();
|
||||
stateStore.rightDrawer = true;
|
||||
});
|
||||
|
||||
onUnmounted(() => arrayData.destroy());
|
||||
|
||||
const emit = defineEmits([
|
||||
'update:firstDay',
|
||||
'update:lastDay',
|
||||
'update:events',
|
||||
'onDateSelected',
|
||||
]);
|
||||
|
||||
const date = computed({
|
||||
get: () => _date.value,
|
||||
set: (value) => {
|
||||
if (!(value instanceof Date)) return;
|
||||
_date.value = value;
|
||||
const stamp = value.getTime();
|
||||
|
||||
firstDay.value = new Date(stamp);
|
||||
firstDay.value.setDate(1);
|
||||
|
||||
lastDay.value = new Date(stamp);
|
||||
lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
|
||||
lastDay.value.setDate(0);
|
||||
|
||||
months.value = [];
|
||||
for (let i = 0; i < nMonths.value; i++) {
|
||||
const monthDate = new Date(stamp);
|
||||
monthDate.setMonth(value.getMonth() + i);
|
||||
months.value.push(monthDate);
|
||||
}
|
||||
|
||||
emit('update:firstDay', firstDay.value);
|
||||
emit('update:lastDay', lastDay.value);
|
||||
emit('refresh-events');
|
||||
},
|
||||
});
|
||||
|
||||
const headerTitle = computed(() => {
|
||||
if (!months.value?.length) return '';
|
||||
const getMonthName = date =>
|
||||
`${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
|
||||
return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
|
||||
});
|
||||
|
||||
const step = (direction) => {
|
||||
const newDate = new Date(date.value);
|
||||
newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
|
||||
date.value = newDate;
|
||||
};
|
||||
|
||||
defineExpose({
|
||||
firstDay,
|
||||
lastDay
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QCard style="height: max-content">
|
||||
<div class="calendars-header">
|
||||
<QBtn
|
||||
icon="arrow_left"
|
||||
size="sm"
|
||||
flat
|
||||
class="full-height"
|
||||
@click="step(-1)"
|
||||
/>
|
||||
<span>{{ headerTitle }}</span>
|
||||
<QBtn
|
||||
icon="arrow_right"
|
||||
size="sm"
|
||||
flat
|
||||
class="full-height"
|
||||
@click="step(1)"
|
||||
/>
|
||||
</div>
|
||||
<div class="calendars-container">
|
||||
<component
|
||||
:is="calendarComponent"
|
||||
v-for="(month, index) in months"
|
||||
:key="index"
|
||||
:month="month.getMonth() + 1"
|
||||
:year="month.getFullYear()"
|
||||
:month-date="month"
|
||||
v-bind="additionalProps"
|
||||
@on-date-selected="data => emit('onDateSelected', data)"
|
||||
/>
|
||||
</div>
|
||||
</QCard>
|
||||
</template>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<script setup>
|
||||
import { markRaw, computed } from 'vue';
|
||||
import { QCheckbox, QToggle } from 'quasar';
|
||||
import { markRaw, computed, onBeforeMount } from 'vue';
|
||||
import { QToggle } from 'quasar';
|
||||
import { useArrayData } from 'composables/useArrayData';
|
||||
import VnSelect from 'components/common/VnSelect.vue';
|
||||
import VnInput from 'components/common/VnInput.vue';
|
||||
|
|
@ -150,6 +150,16 @@ const showFilter = computed(
|
|||
const onTabPressed = async () => {
|
||||
if (model.value) enterEvent['keyup.enter']();
|
||||
};
|
||||
|
||||
onBeforeMount(() => {
|
||||
const columnFilter = $props.column?.columnFilter;
|
||||
const component = columnFilter?.component;
|
||||
const defaultComponent = components[component];
|
||||
const events = { update: updateEvent, enter: enterEvent };
|
||||
|
||||
if (!columnFilter || defaultComponent) return;
|
||||
$props.column.columnFilter.event = events[columnFilter.event];
|
||||
});
|
||||
</script>
|
||||
<template>
|
||||
<div v-if="showFilter" class="full-width" style="overflow: hidden">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
import { ref } from 'vue';
|
||||
import moment from 'moment';
|
||||
|
||||
export default function useWeekdaysOrder() {
|
||||
|
||||
const firstDay = moment().weekday(1).day();
|
||||
const weekdays = [...Array(7).keys()].map(i => (i + firstDay) % 7);
|
||||
|
||||
return ref(weekdays);
|
||||
}
|
||||
|
|
@ -343,3 +343,20 @@ input::-webkit-inner-spin-button {
|
|||
.q-item__section--main ~ .q-item__section--side {
|
||||
padding-inline: 0;
|
||||
}
|
||||
|
||||
.calendars-header {
|
||||
height: 45px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
background-color: $primary;
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.calendars-container {
|
||||
max-width: 800px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-evenly;
|
||||
}
|
||||
|
|
@ -133,6 +133,7 @@ const columns = computed(() => [
|
|||
label: null,
|
||||
name: 'supplierFk',
|
||||
class: 'fit',
|
||||
event: 'update',
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -472,6 +473,6 @@ en:
|
|||
es:
|
||||
IntraCommunity: Intracomunitaria
|
||||
NonCommunity: Extracomunitaria
|
||||
CanaryIsland: Islas Canarias
|
||||
CanaryIslands: Islas Canarias
|
||||
National: Nacional
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,183 @@
|
|||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import FormPopup from 'components/FormPopup.vue';
|
||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import axios from 'axios';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
const props = defineProps({
|
||||
event: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
isNewMode: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
eventType: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
firstDay: {
|
||||
type: Date,
|
||||
default: null,
|
||||
},
|
||||
lastDay: {
|
||||
type: Date,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['onSubmit', 'closeForm', 'refresh-events']);
|
||||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
const state = useState();
|
||||
const user = state.getUser();
|
||||
|
||||
const isNew = computed(() => props.isNewMode);
|
||||
const vehicleFormData = ref({
|
||||
started: null,
|
||||
finished: null,
|
||||
vehicleStateFk: null,
|
||||
description: '',
|
||||
vehicleFk: null,
|
||||
userFk: null,
|
||||
});
|
||||
|
||||
const arrayData = useArrayData('VehicleEvents');
|
||||
|
||||
onMounted(() => {
|
||||
if (props.event) {
|
||||
vehicleFormData.value = props.event;
|
||||
}
|
||||
});
|
||||
|
||||
const createVehicleEvent = async () => {
|
||||
vehicleFormData.value.vehicleFk = route.params.id;
|
||||
vehicleFormData.value.userFk = user.value.id;
|
||||
|
||||
if (isNew.value) {
|
||||
await axios.post(`VehicleEvents`, vehicleFormData.value);
|
||||
} else {
|
||||
await axios.patch(
|
||||
`VehicleEvents/${props.event?.id}`,
|
||||
vehicleFormData.value,
|
||||
);
|
||||
}
|
||||
await refetchEvents();
|
||||
|
||||
};
|
||||
|
||||
const deleteVehicleEvent = async () => {
|
||||
if (!props.event) return;
|
||||
await axios.delete(`VehicleEvents/${props.event?.id}`);
|
||||
await refetchEvents();
|
||||
};
|
||||
|
||||
const refetchEvents = async () => {
|
||||
await arrayData.refresh({
|
||||
append: false,
|
||||
params: {
|
||||
filter: {
|
||||
where: {
|
||||
vehicleFk: route.params.id,
|
||||
and: [
|
||||
{
|
||||
or: [
|
||||
{ started: { lte: props.lastDay?.toISOString() } },
|
||||
{ started: null }
|
||||
]
|
||||
},
|
||||
{
|
||||
or: [
|
||||
{ finished: { gte: props.firstDay?.toISOString() } },
|
||||
{ finished: null }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
emit('refresh-events');
|
||||
notify(t('globals.dataSaved'), 'positive');
|
||||
emit('closeForm');
|
||||
};
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FormPopup
|
||||
:title="isNew ? t('Add vehicle event') : t('Edit vehicle event')"
|
||||
:default-cancel-button="false"
|
||||
:default-submit-button="false"
|
||||
>
|
||||
<template #form-inputs>
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
<VnInputDate :label="t('Started')" v-model="vehicleFormData.started" />
|
||||
<VnInputDate :label="t('Finished')" v-model="vehicleFormData.finished" />
|
||||
<VnSelect
|
||||
url="VehicleStates"
|
||||
v-model="vehicleFormData.vehicleStateFk"
|
||||
:label="t('globals.state')"
|
||||
option-label="state"
|
||||
data-cy="State_input"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnInput
|
||||
v-model="vehicleFormData.description"
|
||||
:label="t('globals.description')"
|
||||
/>
|
||||
</template>
|
||||
<template #custom-buttons>
|
||||
<QBtn
|
||||
:label="t('globals.cancel')"
|
||||
color="primary"
|
||||
flat
|
||||
class="q-mr-sm"
|
||||
v-close-popup
|
||||
/>
|
||||
<QBtn
|
||||
v-if="!isNew"
|
||||
:label="t('globals.delete')"
|
||||
color="primary"
|
||||
flat
|
||||
class="q-mr-sm"
|
||||
@click="
|
||||
openConfirmationModal(
|
||||
t('vehicle.deleteTitle'),
|
||||
t('vehicle.deleteSubtitle'),
|
||||
() => deleteVehicleEvent(),
|
||||
)
|
||||
"
|
||||
/>
|
||||
<QBtn
|
||||
:label="isNew ? t('globals.save') : t('globals.add')"
|
||||
@click="createVehicleEvent"
|
||||
color="primary"
|
||||
/>
|
||||
</template>
|
||||
</FormPopup>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Started: Inicio
|
||||
Finished: Fin
|
||||
Add vehicle event: Agregar evento
|
||||
Edit vehicle event: Editar evento
|
||||
</i18n>
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
<script setup>
|
||||
import { ref, reactive, onMounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import VehicleEventsPanel from './VehicleEventsPanel.vue';
|
||||
import VehicleCalendarGrid from '../VehicleCalendarGrid.vue';
|
||||
import VehicleEventInclusionForm from './VehicleEventInclusionForm.vue';
|
||||
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const stateStore = useStateStore();
|
||||
|
||||
const firstDay = ref();
|
||||
const lastDay = ref();
|
||||
const events = ref([]);
|
||||
const vehicleEventsPanelRef = ref(null);
|
||||
const showVehicleEventForm = ref(false);
|
||||
const vehicleEventsFormProps = reactive({
|
||||
isNewMode: true,
|
||||
date: null,
|
||||
event: null,
|
||||
});
|
||||
|
||||
const refreshEvents = async () => {
|
||||
await vehicleEventsPanelRef.value.fetchData();
|
||||
};
|
||||
|
||||
const openForm = (data) => {
|
||||
const { date = null, isNewMode, event } = data;
|
||||
Object.assign(vehicleEventsFormProps, { date, isNewMode, event });
|
||||
|
||||
showVehicleEventForm.value = true;
|
||||
};
|
||||
|
||||
const onVehicleEventFormClose = () => {
|
||||
showVehicleEventForm.value = false;
|
||||
vehicleEventsFormProps.value = {};
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<RightMenu>
|
||||
<template #right-panel v-if="stateStore.isHeaderMounted()">
|
||||
<VehicleEventsPanel
|
||||
ref="vehicleEventsPanelRef"
|
||||
:first-day="firstDay"
|
||||
:last-day="lastDay"
|
||||
:events="events"
|
||||
@update:events="events = $event"
|
||||
/>
|
||||
</template>
|
||||
</RightMenu>
|
||||
<QPage class="q-pa-md flex justify-center">
|
||||
<VehicleCalendarGrid
|
||||
v-model:events="events"
|
||||
v-model:firstDay="firstDay"
|
||||
v-model:lastDay="lastDay"
|
||||
data-key="VehicleEvents"
|
||||
@on-date-selected="openForm"
|
||||
/>
|
||||
<QDialog v-model="showVehicleEventForm" @hide="onVehicleEventFormClose()">
|
||||
<VehicleEventInclusionForm
|
||||
v-bind="vehicleEventsFormProps"
|
||||
:first-day="firstDay"
|
||||
:last-day="lastDay"
|
||||
@close-form="onVehicleEventFormClose()"
|
||||
@refresh-events="refreshEvents()"
|
||||
/>
|
||||
</QDialog>
|
||||
<QPageSticky :offset="[20, 20]">
|
||||
<QBtn
|
||||
@click="openForm({ isNewMode: true }, true)"
|
||||
color="primary"
|
||||
fab
|
||||
icon="add"
|
||||
v-shortcut="'+'"
|
||||
/>
|
||||
<QTooltip class="text-no-wrap">
|
||||
{{ t('eventsInclusionForm.addEvent') }}
|
||||
</QTooltip>
|
||||
</QPageSticky>
|
||||
</QPage>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,196 @@
|
|||
<script setup>
|
||||
import { onMounted, watch, computed, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import axios from 'axios';
|
||||
import { toDateFormat } from 'src/filters/date.js';
|
||||
import { dashIfEmpty } from 'src/filters';
|
||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
const props = defineProps({
|
||||
firstDay: {
|
||||
type: Date,
|
||||
default: null,
|
||||
},
|
||||
lastDay: {
|
||||
type: Date,
|
||||
default: null,
|
||||
},
|
||||
events: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['openVehicleForm']);
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const { notify } = useNotify();
|
||||
const weekdayStore = useWeekdayStore();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
const vehicleStates = ref({});
|
||||
const fetchVehicleState = async () => {
|
||||
const vehicles = await axios.get('VehicleStates');
|
||||
vehicleStates.value = vehicles.data;
|
||||
};
|
||||
|
||||
const getVehicleStateName = (id) => {
|
||||
return vehicleStates.value[id - 1] ?? dashIfEmpty(id - 1);
|
||||
};
|
||||
|
||||
const params = computed(() => ({
|
||||
vehicleFk: route.params.id,
|
||||
started: props.firstDay,
|
||||
finished: props.lastDay,
|
||||
}));
|
||||
|
||||
const arrayData = useArrayData('VehicleEvents', {
|
||||
params: params,
|
||||
url: `VehicleEvents`,
|
||||
});
|
||||
|
||||
const fetchData = async () => {
|
||||
if (!params.value.vehicleFk || !props.firstDay || !props.lastDay) return;
|
||||
|
||||
try {
|
||||
await arrayData.applyFilter({
|
||||
params: {
|
||||
filter: {
|
||||
where: {
|
||||
vehicleFk: route.params.id,
|
||||
and: [
|
||||
{ or: [
|
||||
{ started: { lte: props.lastDay } },
|
||||
{ started: null }
|
||||
]},
|
||||
{ or: [
|
||||
{ finished: { gte: props.firstDay } },
|
||||
{ finished: null }
|
||||
]}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
emit('update:events', arrayData.store.data || []);
|
||||
} catch (error) {
|
||||
console.error('Error fetching events:', error);
|
||||
}
|
||||
};
|
||||
|
||||
watch(
|
||||
params,
|
||||
async () => {
|
||||
await fetchData();
|
||||
},
|
||||
{ immediate: true, deep: true },
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props.events,
|
||||
(newEvents) => {
|
||||
emit('update:events', newEvents);
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
const deleteEvent = async (id) => {
|
||||
if (!id) return;
|
||||
await axios.delete(`VehicleEvents/${id}`);
|
||||
notify(t('globals.dataSaved'), 'positive');
|
||||
await fetchData();
|
||||
};
|
||||
|
||||
const openInclusionForm = (event) => {
|
||||
emit('openVehicleForm', {
|
||||
date: event.dated,
|
||||
event,
|
||||
isNewMode: false,
|
||||
});
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
weekdayStore.initStore();
|
||||
await fetchVehicleState();
|
||||
});
|
||||
|
||||
defineExpose({
|
||||
fetchData
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QForm @submit="onSubmit()">
|
||||
<div class="column q-pa-md q-gutter-y-sm"></div>
|
||||
<span class="color-vn-label text-subtitle1 q-px-md">{{
|
||||
t('eventsPanel.events')
|
||||
}}</span>
|
||||
<QList>
|
||||
<QItem v-for="(event, index) in events" :key="index" class="event-card">
|
||||
<QItemSection left @click="openInclusionForm(event)">
|
||||
<div class="q-mb-xs">
|
||||
<span
|
||||
>({{ toDateFormat(event.started) }} -
|
||||
{{ toDateFormat(event.finished) }})</span
|
||||
>
|
||||
</div>
|
||||
<span class="color-vn-label"
|
||||
>{{ t('globals.description') }}:
|
||||
<span class="color-vn-text q-ml-xs">{{
|
||||
dashIfEmpty(event.description)
|
||||
}}</span>
|
||||
</span>
|
||||
<span class="color-vn-label"
|
||||
>{{ t('globals.state') }}:
|
||||
<span class="color-vn-text">{{
|
||||
getVehicleStateName(event.vehicleStateFk).state
|
||||
}}</span>
|
||||
</span>
|
||||
</QItemSection>
|
||||
<QItemSection side @click="openInclusionForm(event)">
|
||||
<QBtn
|
||||
icon="delete"
|
||||
data-cy="delete_event"
|
||||
flat
|
||||
dense
|
||||
size="md"
|
||||
color="primary"
|
||||
@click.stop="
|
||||
openConfirmationModal(
|
||||
t('vehicle.deleteTitle'),
|
||||
t('vehicle.deleteSubtitle'),
|
||||
() => deleteEvent(event.id),
|
||||
)
|
||||
"
|
||||
>
|
||||
<QTooltip>{{ t('eventsPanel.delete') }}</QTooltip>
|
||||
</QBtn>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<span
|
||||
v-if="!events.length"
|
||||
class="flex justify-center text-h5 color-vn-label"
|
||||
>
|
||||
{{ t('globals.noResults') }}
|
||||
</span>
|
||||
</QList>
|
||||
</QForm>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.event-card {
|
||||
display: flex;
|
||||
border-bottom: $border-thin-light;
|
||||
margin: 0;
|
||||
|
||||
&:hover {
|
||||
background-color: var(--vn-accent-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<script setup>
|
||||
import EntityCalendar from 'src/components/EntityCalendar.vue';
|
||||
|
||||
const emit = defineEmits(['onDateSelected']);
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<EntityCalendar
|
||||
v-bind="$props"
|
||||
@onDateSelected="(e) => emit('onDateSelected', e)"
|
||||
/>
|
||||
</template>
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
<script setup>
|
||||
import { ref, watch } from 'vue';
|
||||
import EntityCalendarGrid from 'src/components/EntityCalendarGrid.vue';
|
||||
import VehicleCalendar from './VehicleCalendar.vue';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
|
||||
const props = defineProps({
|
||||
dataKey: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
const firstDay = ref(new Date());
|
||||
const lastDay = ref(new Date());
|
||||
const entityCalendarRef = ref(null);
|
||||
|
||||
const arrayData = useArrayData(props.dataKey);
|
||||
const { store } = arrayData;
|
||||
const _data = ref(null);
|
||||
const days = ref({});
|
||||
const events = ref([]);
|
||||
|
||||
const refreshEvents = () => {
|
||||
days.value = {};
|
||||
if (!events.value?.length || !firstDay.value || !lastDay.value) return;
|
||||
|
||||
let day = new Date(firstDay.value.getTime());
|
||||
let endDate = new Date(lastDay.value.getTime());
|
||||
|
||||
while (day <= endDate) {
|
||||
let stamp = day.getTime();
|
||||
let dayEvents = [];
|
||||
|
||||
for (let event of events.value) {
|
||||
const eventStart = event.started ? new Date(event.started).getTime() : null;
|
||||
const eventEnd = event.finished ? new Date(event.finished).getTime() : null;
|
||||
|
||||
let match = (!eventStart || stamp >= eventStart) &&
|
||||
(!eventEnd || stamp <= eventEnd);
|
||||
|
||||
if (match) {
|
||||
dayEvents.push(event);
|
||||
}
|
||||
}
|
||||
|
||||
if (dayEvents.length) {
|
||||
days.value[stamp] = dayEvents;
|
||||
}
|
||||
|
||||
day.setDate(day.getDate() + 1);
|
||||
}
|
||||
};
|
||||
|
||||
watch(
|
||||
() => store.data,
|
||||
(value) => {
|
||||
_data.value = value;
|
||||
events.value = Array.isArray(value) ? value : [];
|
||||
|
||||
function toStamp(date) {
|
||||
return date && new Date(date).setHours(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
if (events.value) {
|
||||
for (let event of events.value) {
|
||||
event.dated = toStamp(event.dated);
|
||||
event.finished = toStamp(event.finished);
|
||||
event.started = toStamp(event.started);
|
||||
}
|
||||
}
|
||||
|
||||
refreshEvents();
|
||||
},
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
watch(() => entityCalendarRef.value?.firstDay, (newVal) => {
|
||||
if (newVal) firstDay.value = new Date(newVal);
|
||||
});
|
||||
|
||||
watch(() => entityCalendarRef.value?.lastDay, (newVal) => {
|
||||
if (newVal) lastDay.value = new Date(newVal);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<EntityCalendarGrid
|
||||
ref="entityCalendarRef"
|
||||
:data-key="dataKey"
|
||||
:calendar-component="VehicleCalendar"
|
||||
:additional-props="{ daysMap: days }"
|
||||
@refresh-events="refreshEvents"
|
||||
v-bind="$attrs"
|
||||
/>
|
||||
</template>
|
||||
|
|
@ -15,6 +15,8 @@ vehicle:
|
|||
remove: Vehicle removed
|
||||
search: Search Vehicle
|
||||
searchInfo: Search by id or number plate
|
||||
deleteTitle: This item will be deleted
|
||||
deleteSubtitle: Are you sure you want to continue?
|
||||
params:
|
||||
vehicleTypeFk: Type
|
||||
vehicleStateFk: State
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ vehicle:
|
|||
remove: Vehículo eliminado
|
||||
search: Buscar Vehículo
|
||||
searchInfo: Buscar por id o matrícula
|
||||
deleteTitle: Este elemento será eliminado
|
||||
deleteSubtitle: ¿Seguro que quieres continuar?
|
||||
params:
|
||||
vehicleTypeFk: Tipo
|
||||
vehicleStateFk: Estado
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
|
|||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import axios from 'axios';
|
||||
import useWeekdaysOrder from 'src/composables/getWeekdays';
|
||||
|
||||
const props = defineProps({
|
||||
year: {
|
||||
|
|
@ -44,6 +45,7 @@ const { locale } = useI18n();
|
|||
|
||||
const calendarRef = ref(null);
|
||||
const weekdayStore = useWeekdayStore();
|
||||
const weekDays = useWeekdaysOrder();
|
||||
const selectedDate = ref();
|
||||
const calendarEventDates = [];
|
||||
const today = ref(date.formatDate(Date.vnNew(), 'YYYY-MM-DD'));
|
||||
|
|
@ -182,7 +184,7 @@ watch(_year, (newValue) => {
|
|||
no-outside-days
|
||||
:selected-dates="calendarEventDates"
|
||||
no-active-date
|
||||
:weekdays="[1, 2, 3, 4, 5, 6, 0]"
|
||||
:weekdays="weekDays"
|
||||
short-weekday-label
|
||||
:locale="locale"
|
||||
:now="today"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import { useI18n } from 'vue-i18n';
|
|||
|
||||
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
|
||||
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
|
||||
import useWeekdaysOrder from 'src/composables/getWeekdays';
|
||||
|
||||
const $props = defineProps({
|
||||
modelValue: {
|
||||
type: String,
|
||||
|
|
@ -32,6 +34,7 @@ const emit = defineEmits(['update:modelValue', 'clickDate', 'onMoved']);
|
|||
const { locale } = useI18n();
|
||||
|
||||
const calendarRef = ref(null);
|
||||
const weekDays = useWeekdaysOrder();
|
||||
|
||||
const stateClasses = {
|
||||
CONFIRMED: {
|
||||
|
|
@ -135,7 +138,7 @@ const paintWorkWeeks = async () => {
|
|||
ref="calendarRef"
|
||||
v-model="value"
|
||||
show-work-weeks
|
||||
:weekdays="[1, 2, 3, 4, 5, 6, 0]"
|
||||
:weekdays="weekDays"
|
||||
:selected-dates="selectedDates"
|
||||
:min-weekday-label="1"
|
||||
:locale="locale"
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
|
|||
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
|
||||
|
||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||
import useWeekdaysOrder from 'src/composables/getWeekdays';
|
||||
import axios from 'axios';
|
||||
|
||||
const props = defineProps({
|
||||
|
|
@ -46,6 +47,7 @@ const route = useRoute();
|
|||
|
||||
const calendarRef = ref(null);
|
||||
const weekdayStore = useWeekdayStore();
|
||||
const weekDays = useWeekdaysOrder();
|
||||
const showZoneClosingTable = ref(false);
|
||||
const zoneClosingData = ref(null);
|
||||
const today = ref(date.formatDate(Date.vnNew(), 'YYYY-MM-DD'));
|
||||
|
|
@ -161,7 +163,7 @@ const handleDateClick = (timestamp) => {
|
|||
show-work-weeks
|
||||
no-outside-days
|
||||
no-active-date
|
||||
:weekdays="[1, 2, 3, 4, 5, 6, 0]"
|
||||
:weekdays="weekDays"
|
||||
short-weekday-label
|
||||
:locale="locale"
|
||||
:now="today"
|
||||
|
|
|
|||
|
|
@ -229,22 +229,3 @@ onUnmounted(() => arrayData.destroy());
|
|||
</div>
|
||||
</QCard>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.calendars-header {
|
||||
height: 45px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
background-color: $primary;
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.calendars-container {
|
||||
max-width: 800px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-evenly;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ const vehicleCard = {
|
|||
component: () => import('src/pages/Route/Vehicle/Card/VehicleCard.vue'),
|
||||
redirect: { name: 'VehicleSummary' },
|
||||
meta: {
|
||||
menu: ['VehicleBasicData', 'VehicleInvoiceIn', 'VehicleDms', 'VehicleNotes'],
|
||||
menu: ['VehicleBasicData', 'VehicleNotes', 'VehicleDms', 'VehicleEvents'],
|
||||
},
|
||||
children: [
|
||||
{
|
||||
|
|
@ -203,6 +203,15 @@ const vehicleCard = {
|
|||
},
|
||||
component: () => import('src/pages/Route/Vehicle/VehicleDms.vue'),
|
||||
},
|
||||
{
|
||||
name: 'VehicleEvents',
|
||||
path: 'events',
|
||||
meta: {
|
||||
title: 'calendar',
|
||||
icon: 'vn:calendar',
|
||||
},
|
||||
component: () => import('src/pages/Route/Vehicle/Card/VehicleEvents.vue'),
|
||||
},
|
||||
{
|
||||
name: 'VehicleNotes',
|
||||
path: 'notes',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
describe('Vehicle', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
cy.viewport(1920, 1080);
|
||||
cy.login('deliveryAssistant');
|
||||
cy.visit(`/#/route/vehicle/3/events`);
|
||||
});
|
||||
|
||||
it('should add, edit and delete a vehicle event', () => {
|
||||
cy.get('.q-page-sticky > div > .q-btn').click();
|
||||
cy.dataCy('Started_inputDate').type('01/01/2001');
|
||||
cy.dataCy('Finished_inputDate').type('08/02/2001');
|
||||
cy.get(':nth-child(5)').find('[data-cy="Description_input"]').clear().type('Test');
|
||||
cy.selectOption('[data-cy="State_input"]', 3);
|
||||
cy.get('.q-mt-lg > .q-btn--standard').click();
|
||||
|
||||
cy.get('.q-current-day > .q-calendar-month__day--content > .q-btn').click();
|
||||
cy.dataCy('Started_inputDate').clear().type('03/02/2001');
|
||||
cy.dataCy('Finished_inputDate').clear().type('15/03/2001');
|
||||
cy.get(':nth-child(5)').find('[data-cy="Description_input"]').clear().type('Test2');
|
||||
cy.selectOption('[data-cy="State_input"]', 5);
|
||||
cy.get('.q-mt-lg > .q-btn--standard').click();
|
||||
|
||||
cy.dataCy('delete_event').eq(0).click();
|
||||
cy.dataCy('VnConfirm_confirm').click();
|
||||
});
|
||||
});
|
||||
Loading…
Reference in New Issue