feat: #8443 created vehicle events #1379

Merged
jsegarra merged 24 commits from 8443-vehicleEvent into dev 2025-04-22 09:55:29 +00:00
2 changed files with 12 additions and 52 deletions
Showing only changes of commit 398f76c6e7 - Show all commits

View File

@ -11,6 +11,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import { useArrayData } from 'src/composables/useArrayData';
import { useVnConfirm } from 'composables/useVnConfirm';
import axios from 'axios';
import VnSelect from 'src/components/common/VnSelect.vue';
const props = defineProps({
event: {
@ -47,12 +48,13 @@ const arrayData = useArrayData('VehicleEvents');
const createVehicleEvent = async () => {
vehicleFormData.value.vehicleFk = route.params.id;
vehicleFormData.value.userFk = 3;
if (isNew.value) {
await axios.post(`Vehicles/${route.params.id}/event`, vehicleFormData.value);
} else {
await axios.put(
`Vehicles/${route.params.id}/event/${props.event?.id}`,
vehicleFormData.value
vehicleFormData.value,
);
}
@ -90,42 +92,22 @@ onMounted(() => {
:default-submit-button="false"
>
<template #form-inputs>
<VnRow>
<VnInputDate
:label="t('Started')"
v-model="vehicleFormData.started"
class="full-width"
/>
<VnInputDate
:label="t('Finished')"
v-model="vehicleFormData.finished"
class="full-width"
/>
<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" />
</VnRow>
<VnRow>
<VnInput
v-model="vehicleFormData.description"
:label="t('globals.description')"
type="text"
class="full-width"
/>
</VnRow>
<VnRow>
<VnInput
<VnSelect
url="VehicleStates"
v-model="vehicleFormData.vehicleStateFk"
:label="t('globals.state')"
type="number"
min="0"
class="full-width"
/>
</VnRow>
<VnRow>
<VnInput
v-model="vehicleFormData.userFk"
:label="t('globals.user')"
type="number"
min="0"
class="full-width"
option-value="id"
option-label="state"
/>
</VnRow>
</template>
@ -147,7 +129,7 @@ onMounted(() => {
openConfirmationModal(
t('vehicleForm.deleteTitle'),
t('vehicleForm.deleteSubtitle'),
() => deleteVehicleEvent()
() => deleteVehicleEvent(),
)
"
/>
provira marked this conversation as resolved
Review

Sacar descripcion de Vnrow

Sacar descripcion de Vnrow
@ -166,4 +148,4 @@ onMounted(() => {
Finished: Fin
Add vehicle event: Agregar evento
Edit vehicle event: Editar evento
</i18n>
</i18n>

View File

@ -38,24 +38,10 @@ const fetchVehicleState = async () => {
vehicleStates.value = vehicles.data;
};
const fetchUser = async (userId) => {
console.log(userId);
if (!userId || users.value[userId]) return;
const usersData = await axios.get(`Accounts/2/user`);
users.value[userId] = usersData.data;
console.log(users.value[userId]);
};
const getVehicleStateName = (id) => {
return vehicleStates.value[id - 1] ?? dashIfEmpty(id - 1);
};
const getUserName = (id) => {
console.log(users.value?.nickname);
return users.value?.nickname ?? dashIfEmpty(id - 1);
};
const params = computed(() => ({
vehicleFk: route.params.id,
started: props.firstDay,
@ -101,10 +87,6 @@ const openInclusionForm = (event) => {
onMounted(async () => {
weekdayStore.initStore();
await fetchVehicleState();
for (let event of props.events) {
await fetchUser(event.userFk);
}
});
</script>
@ -135,10 +117,6 @@ onMounted(async () => {
getVehicleStateName(event.vehicleStateFk).state
}}</span>
</span>
<span class="color-vn-label"
>{{ t('globals.user') }}:
<span class="color-vn-text">{{ getUserName(event.userFk) }}</span>
</span>
</QItemSection>
<QItemSection side @click="openInclusionForm(event)">
<QBtn