verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 62 Releases Wiki Activity

Merge pull request '6722-thermograph' (!761) from 6722-thermograph into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #761
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Javi Gallego 2024-09-26 06:07:26 +00:00
parent 8c13ceb3fe dcfdabde32
commit 9095c579db
6 changed files with 122 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/CreateThermographForm.vue
View File

@ -50,7 +50,7 @@ const onDataSaved = (dataSaved) => {
model="thermograph"
:title="t('New thermograph')"
:form-initial-data="thermographFormData"
@on-data-saved="onDataSaved($event)"
@on-data-saved="(_, response) => onDataSaved(response)"
>
<template #form-inputs="{ data, validate }">
<VnRow>

2
src/components/common/VnSelectDialog.vue
View File

@ -1,5 +1,5 @@
<script setup>
import { ref, computed } from 'vue';
import { computed } from 'vue';
import { useRole } from 'src/composables/useRole';
import { useAcl } from 'src/composables/useAcl';

2
src/i18n/locale/en.yml
View File

@ -288,6 +288,8 @@ globals:
createInvoiceIn: Create invoice in
myAccount: My account
noOne: No one
maxTemperature: Maximum Temperature
minTemperature: Minimum Temperatura
params:
clientFk: Client id
salesPersonFk: Sales person

2
src/i18n/locale/es.yml
View File

@ -292,6 +292,8 @@ globals:
createInvoiceIn: Crear factura recibida
myAccount: Mi cuenta
noOne: Nadie
maxTemperature: Temperatura máxima
minTemperature: Temperatura mínima
params:
clientFk: Id cliente
salesPersonFk: Comercial

24
src/pages/Travel/Card/TravelThermographs.vue
View File

@ -47,6 +47,18 @@ const TableColumns = computed(() => {
name: 'temperatureFk',
align: 'left',
},
{
label: t('globals.maxTemperature'),
field: 'maxTemperature',
name: 'maxTemperature',
align: 'left',
},
{
label: t('globals.minTemperature'),
field: 'minTemperature',
name: 'minTemperature',
align: 'left',
},
{
label: t('travel.thermographs.state'),
field: 'result',
@ -92,11 +104,7 @@ const openRemoveDialog = async (id) => {
},
})
.onOk(async () => {
try {
await removeThermograph(id);
} catch (err) {
console.error('Error removing thermograph');
}
await removeThermograph(id);
});
};
@ -106,9 +114,7 @@ const redirectToThermographForm = (action, id) => {
};
if (action === 'edit' && id) {
const params = {};
params.thermographId = id;
routeDetails.params = params;
routeDetails.query = { travelThermographFk: id };
}
router.push(routeDetails);
};
@ -213,4 +219,6 @@ es:
Thermograph removed: Termógrafo eliminado
Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo?
No results: Sin resultados
Max Temperature: Temperatura máxima
Min Temperature: Temperatura mínima
</i18n>

192
src/pages/Travel/Card/TravelThermographsForm.vue
View File

@ -1,6 +1,6 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { reactive, ref, onBeforeMount } from 'vue';
import { ref, onBeforeMount } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import FetchData from 'components/FetchData.vue';
@ -14,6 +14,7 @@ import { useState } from 'src/composables/useState';
import { useStateStore } from 'stores/useStateStore';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
const props = defineProps({
viewAction: {
@ -28,24 +29,26 @@ const route = useRoute();
const router = useRouter();
const state = useState();
const { notify } = useNotify();
const thermographFilter = {
fields: ['id', 'thermographFk'],
where: {
or: [{ travelFk: null }, { travelFk: route.params.id }],
},
order: 'thermographFk ASC',
};
const fetchTravelThermographsRef = ref(null);
const allowedContentTypes = ref('');
const user = state.getUser();
const thermographsOptions = ref([]);
const dmsTypesOptions = ref([]);
const companiesOptions = ref([]);
const warehousesOptions = ref([]);
const temperaturesOptions = ref([]);
const thermographForm = ref({});
const inputFileRef = ref(null);
const thermographForm = reactive({
thermographId: null,
state: null,
reference: null,
dmsTypeId: null,
companyId: null,
warehouseId: null,
files: [],
description: null,
});
onBeforeMount(async () => {
if (props.viewAction === 'create') {
setCreateDefaultParams();
@ -65,7 +68,7 @@ const fetchDmsTypes = async () => {
try {
const params = {
filter: {
where: { code: 'miscellaneous' },
where: { code: 'thermograph' },
},
};
const { data } = await axios.get('DmsTypes/findOne', { params });
@ -77,88 +80,67 @@ const fetchDmsTypes = async () => {
const setCreateDefaultParams = async () => {
const dataResponse = await fetchDmsTypes();
thermographForm.companyId = user.value.companyFk;
thermographForm.warehouseId = user.value.warehouseFk;
thermographForm.reference = route.params.id;
thermographForm.dmsTypeId = dataResponse.id;
thermographForm.state = 'Ok';
thermographForm.description = t('travel.thermographs.travelFileDescription', {
thermographForm.value.companyId = user.value.companyFk;
thermographForm.value.warehouseId = user.value.warehouseFk;
thermographForm.value.reference = route.params.id;
thermographForm.value.dmsTypeId = dataResponse.id;
thermographForm.value.state = 'Ok';
thermographForm.value.description = t('travel.thermographs.travelFileDescription', {
travelId: route.params.id,
}).toUpperCase();
};
const setEditDefaultParams = async () => {
try {
const filterObj = { include: { relation: 'dms' } };
const filter = encodeURIComponent(JSON.stringify(filterObj));
const { data } = await axios.get(
`TravelThermographs/${route.params.thermographId}?filter=${filter}`
);
const filterObj = { include: { relation: 'dms' } };
const filter = encodeURIComponent(JSON.stringify(filterObj));
const { data } = await axios.get(
`TravelThermographs/${route.query.travelThermographFk}?filter=${filter}`
);
if (data) {
thermographForm.thermographId = data.thermographFk;
thermographForm.state = data.result;
thermographForm.reference = data.dms?.reference;
thermographForm.warehouseId = data.dms?.warehouseFk;
thermographForm.companyId = data.dms?.companyFk;
thermographForm.dmsTypeId = data.dms?.dmsTypeFk;
thermographForm.description = data.dms?.description || '';
thermographForm.hasFile = data.dms?.hasFile;
thermographForm.hasFileAttached = false;
}
} catch (err) {
console.error('Error fetching termograph');
if (data) {
thermographForm.value.thermographFk = data.thermographFk;
thermographForm.value.state = data.result;
thermographForm.value.reference = data.dms?.reference;
thermographForm.value.warehouseId = data.dms?.warehouseFk;
thermographForm.value.companyId = data.dms?.companyFk;
thermographForm.value.dmsTypeId = data.dms?.dmsTypeFk;
thermographForm.value.description = data.dms?.description || '';
thermographForm.value.hasFile = data.dms?.hasFile;
thermographForm.value.hasFileAttached = false;
thermographForm.value.maxTemperature = data.maxTemperature;
thermographForm.value.minTemperature = data.minTemperature;
thermographForm.value.temperatureFk = data.temperatureFk;
thermographForm.value.travelThermographFk = data.id;
}
};
const onSubmit = () => {
props.viewAction === 'create' ? createThermograph() : updateThermograph();
};
const createThermograph = async () => {
const onSubmit = async () => {
const formData = new FormData();
thermographForm.files.forEach((file) => {
formData.append(file.name, file);
});
try {
await axios.post(`/travels/${route.params.id}/createThermograph`, formData, {
params: thermographForm,
headers: {
'Content-Type': 'multipart/form-data',
},
if (Array.isArray(thermographForm.value.files)) {
thermographForm.value.hasFileAttached = true;
thermographForm.value.files.forEach((file) => {
formData.append(file.name, file);
});
router.push({ name: 'TravelThermographsIndex' });
notify(t('Thermograph created'), 'positive');
} catch (error) {
console.error('Error creating thermograph');
}
};
const updateThermograph = async () => {
const formData = new FormData();
thermographForm.files.forEach((file) => {
formData.append(file.name, file);
delete thermographForm.value.files;
await axios.post(`/travels/${route.params.id}/saveThermograph`, formData, {
params: thermographForm.value,
headers: {
'Content-Type': 'multipart/form-data',
},
});
try {
await axios.post(`travels/${route.params.id}/updateThermograph`, formData, {
params: thermographForm,
headers: {
'Content-Type': 'multipart/form-data',
},
});
router.push({ name: 'TravelThermographsIndex' });
notify(t('Thermograph created'), 'positive');
} catch (error) {
console.error('Error creating thermograph');
}
router.push({ name: 'TravelThermographsIndex' });
notify(t('Thermograph created'), 'positive');
};
const onThermographCreated = async (data) => {
thermographForm.thermographId = data.id;
await fetchTravelThermographsRef.value.fetch();
thermographForm.value = {
...thermographForm.value,
...data,
travelThermographFk: data.id,
warehouseId: data.warehouseFk,
};
};
</script>
<template>
@ -185,6 +167,18 @@ const onThermographCreated = async (data) => {
:filter="{ order: 'name' }"
auto-load
/>
<FetchData
@on-fetch="(data) => (temperaturesOptions = data)"
auto-load
url="Temperatures"
/>
<FetchData
ref="fetchTravelThermographsRef"
url="TravelThermographs"
@on-fetch="(data) => (thermographsOptions = data)"
:filter="thermographFilter"
auto-load
/>
<QPage class="column items-center full-width">
<QForm
model="travel"
@ -219,21 +213,15 @@ const onThermographCreated = async (data) => {
<VnRow>
<VnSelectDialog
:label="t('travel.thermographs.thermograph')"
v-model="thermographForm.thermographId"
url="TravelThermographs"
option-value="thermographFk"
v-model="thermographForm.travelThermographFk"
:options="thermographsOptions"
option-label="thermographFk"
:fields="['thermographFk']"
:where="{ travelFk: null }"
sort-by="thermographFk ASC"
:disable="viewAction === 'edit'"
:tooltip="t('New thermograph')"
>
<template #form>
<CreateThermographForm
@on-data-saved="
(data) => (thermographForm.thermographId = data.id)
"
@on-data-saved="onThermographCreated"
/>
</template>
</VnSelectDialog>
@ -271,6 +259,26 @@ const onThermographCreated = async (data) => {
option-label="name"
/>
</VnRow>
<VnRow>
<VnSelect
:label="t('travel.thermographs.temperature')"
:options="temperaturesOptions"
hide-selected
option-label="name"
option-value="code"
v-model="thermographForm.temperatureFk"
:required="true"
/>
<VnInputNumber
v-model="thermographForm.maxTemperature"
:label="t('globals.maxTemperature')"
/>
<VnInputNumber
v-model="thermographForm.minTemperature"
:label="t('globals.minTemperature')"
/>
</VnRow>
<VnRow v-if="viewAction === 'edit'" class="row q-gutter-md q-mb-md">
<QInput
:label="t('globals.description')"
@ -310,8 +318,8 @@ const onThermographCreated = async (data) => {
</QPage>
</template>
<i18n>
es:
Select files: Selecciona ficheros
Thermograph created: Termógrafo creado
New thermograph: Nuevo termógrafo
es:
Select files: Selecciona ficheros
Thermograph created: Termógrafo creado
New thermograph: Nuevo termógrafo
</i18n>