Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
This commit is contained in:
commit
120107cc7a
|
@ -1,50 +1,56 @@
|
|||
<script setup>
|
||||
import { onBeforeMount, computed } from 'vue';
|
||||
import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
|
||||
import { onBeforeMount } from 'vue';
|
||||
import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import useCardSize from 'src/composables/useCardSize';
|
||||
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
||||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||
import LeftMenu from 'components/LeftMenu.vue';
|
||||
import RightMenu from 'components/common/RightMenu.vue';
|
||||
|
||||
const props = defineProps({
|
||||
dataKey: { type: String, required: true },
|
||||
url: { type: String, default: undefined },
|
||||
idInWhere: { type: Boolean, default: false },
|
||||
filter: { type: Object, default: () => {} },
|
||||
descriptor: { type: Object, required: true },
|
||||
filterPanel: { type: Object, default: undefined },
|
||||
idInWhere: { type: Boolean, default: false },
|
||||
searchDataKey: { type: String, default: undefined },
|
||||
searchbarProps: { type: Object, default: undefined },
|
||||
redirectOnError: { type: Boolean, default: false },
|
||||
});
|
||||
|
||||
const stateStore = useStateStore();
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const searchRightDataKey = computed(() => {
|
||||
if (!props.searchDataKey) return route.name;
|
||||
return props.searchDataKey;
|
||||
});
|
||||
|
||||
const arrayData = useArrayData(props.dataKey, {
|
||||
url: props.url,
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
|
||||
onBeforeRouteLeave(() => {
|
||||
stateStore.cardDescriptorChangeValue(null);
|
||||
});
|
||||
|
||||
onBeforeMount(async () => {
|
||||
stateStore.cardDescriptorChangeValue(props.descriptor);
|
||||
|
||||
const route = router.currentRoute.value;
|
||||
try {
|
||||
await fetch(route.params.id);
|
||||
} catch {
|
||||
const { matched: matches } = router.currentRoute.value;
|
||||
const { matched: matches } = route;
|
||||
const { path } = matches.at(-1);
|
||||
router.push({ path: path.replace(/:id.*/, '') });
|
||||
}
|
||||
});
|
||||
|
||||
onBeforeRouteUpdate(async (to, from) => {
|
||||
if (hasRouteParam(to.params)) {
|
||||
const { matched } = router.currentRoute.value;
|
||||
const { name } = matched.at(-3);
|
||||
if (name) {
|
||||
router.push({ name, params: to.params });
|
||||
}
|
||||
}
|
||||
const id = to.params.id;
|
||||
if (id !== from.params.id) await fetch(id, true);
|
||||
});
|
||||
|
@ -56,34 +62,13 @@ async function fetch(id, append = false) {
|
|||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
||||
await arrayData.fetch({ append, updateRouter: false });
|
||||
}
|
||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||
return Object.values(params).includes(valueToCheck);
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<QDrawer
|
||||
v-model="stateStore.leftDrawer"
|
||||
show-if-above
|
||||
:width="256"
|
||||
v-if="stateStore.isHeaderMounted()"
|
||||
>
|
||||
<QScrollArea class="fit">
|
||||
<component :is="descriptor" />
|
||||
<QSeparator />
|
||||
<LeftMenu source="card" />
|
||||
</QScrollArea>
|
||||
</QDrawer>
|
||||
<slot name="searchbar" v-if="props.searchDataKey">
|
||||
<VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
|
||||
</slot>
|
||||
<RightMenu>
|
||||
<template #right-panel v-if="props.filterPanel">
|
||||
<component :is="props.filterPanel" :data-key="searchRightDataKey" />
|
||||
</template>
|
||||
</RightMenu>
|
||||
<QPageContainer>
|
||||
<QPage>
|
||||
<VnSubToolbar />
|
||||
<div :class="[useCardSize(), $attrs.class]">
|
||||
<RouterView :key="$route.path" />
|
||||
</div>
|
||||
</QPage>
|
||||
</QPageContainer>
|
||||
<VnSubToolbar />
|
||||
<div :class="[useCardSize(), $attrs.class]">
|
||||
<RouterView :key="$route.path" />
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -1,74 +0,0 @@
|
|||
<script setup>
|
||||
import { onBeforeMount } from 'vue';
|
||||
import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import useCardSize from 'src/composables/useCardSize';
|
||||
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
||||
|
||||
const props = defineProps({
|
||||
dataKey: { type: String, required: true },
|
||||
url: { type: String, default: undefined },
|
||||
idInWhere: { type: Boolean, default: false },
|
||||
filter: { type: Object, default: () => {} },
|
||||
descriptor: { type: Object, required: true },
|
||||
filterPanel: { type: Object, default: undefined },
|
||||
searchDataKey: { type: String, default: undefined },
|
||||
searchbarProps: { type: Object, default: undefined },
|
||||
redirectOnError: { type: Boolean, default: false },
|
||||
});
|
||||
|
||||
const stateStore = useStateStore();
|
||||
const router = useRouter();
|
||||
const arrayData = useArrayData(props.dataKey, {
|
||||
url: props.url,
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
|
||||
onBeforeRouteLeave(() => {
|
||||
stateStore.cardDescriptorChangeValue(null);
|
||||
});
|
||||
|
||||
onBeforeMount(async () => {
|
||||
stateStore.cardDescriptorChangeValue(props.descriptor);
|
||||
|
||||
const route = router.currentRoute.value;
|
||||
try {
|
||||
await fetch(route.params.id);
|
||||
} catch {
|
||||
const { matched: matches } = route;
|
||||
const { path } = matches.at(-1);
|
||||
router.push({ path: path.replace(/:id.*/, '') });
|
||||
}
|
||||
});
|
||||
|
||||
onBeforeRouteUpdate(async (to, from) => {
|
||||
if (hasRouteParam(to.params)) {
|
||||
const { matched } = router.currentRoute.value;
|
||||
const { name } = matched.at(-3);
|
||||
if (name) {
|
||||
router.push({ name, params: to.params });
|
||||
}
|
||||
}
|
||||
const id = to.params.id;
|
||||
if (id !== from.params.id) await fetch(id, true);
|
||||
});
|
||||
|
||||
async function fetch(id, append = false) {
|
||||
const regex = /\/(\d+)/;
|
||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
||||
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
||||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
||||
await arrayData.fetch({ append, updateRouter: false });
|
||||
}
|
||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||
return Object.values(params).includes(valueToCheck);
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<VnSubToolbar />
|
||||
<div :class="[useCardSize(), $attrs.class]">
|
||||
<RouterView :key="$route.path" />
|
||||
</div>
|
||||
</template>
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import AliasDescriptor from './AliasDescriptor.vue';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Alias"
|
||||
url="MailAliases"
|
||||
:descriptor="AliasDescriptor"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import AccountDescriptor from './AccountDescriptor.vue';
|
||||
import filter from './AccountFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
url="VnUsers/preview"
|
||||
:id-in-where="true"
|
||||
data-key="Account"
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import RoleDescriptor from './RoleDescriptor.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
url="VnRoles"
|
||||
data-key="Role"
|
||||
:id-in-where="true"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import ClaimDescriptor from './ClaimDescriptor.vue';
|
||||
import filter from './ClaimFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Claim"
|
||||
url="Claims"
|
||||
:descriptor="ClaimDescriptor"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import CustomerDescriptor from './CustomerDescriptor.vue';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Customer"
|
||||
:url="`Clients/${$route.params.id}/getCard`"
|
||||
:descriptor="CustomerDescriptor"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import EntryDescriptor from './EntryDescriptor.vue';
|
||||
import filter from './EntryFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Entry"
|
||||
url="Entries"
|
||||
:descriptor="EntryDescriptor"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
|
||||
import { onBeforeRouteUpdate } from 'vue-router';
|
||||
import { setRectificative } from '../composables/setRectificative';
|
||||
|
@ -9,7 +9,7 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="InvoiceIn"
|
||||
url="InvoiceIns"
|
||||
:descriptor="InvoiceInDescriptor"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import filter from './InvoiceOutFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="InvoiceOut"
|
||||
url="InvoiceOuts"
|
||||
:filter="filter"
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import ItemDescriptor from './ItemDescriptor.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Item"
|
||||
:url="`Items/${$route.params.id}/getCard`"
|
||||
:descriptor="ItemDescriptor"
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
|
||||
import filter from './ItemTypeFilter.js';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="ItemType"
|
||||
url="ItemTypes"
|
||||
:filter="filter"
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
|
||||
import filter from './OrderFilter.js';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Order"
|
||||
url="Orders"
|
||||
:filter="filter"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<script setup>
|
||||
import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
|
||||
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
|
||||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
|
||||
<VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
|
||||
</template>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
|
||||
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
|
||||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
import filter from './RouteFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Route"
|
||||
url="Routes"
|
||||
:filter="filter"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
|
||||
<VnCard data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
|
||||
</template>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import VehicleDescriptor from './VehicleDescriptor.vue';
|
||||
import VehicleFilter from '../VehicleFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Vehicle"
|
||||
url="Vehicles"
|
||||
:filter="VehicleFilter"
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
|
||||
import filter from './ShelvingFilter.js';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Shelving"
|
||||
url="Shelvings"
|
||||
:filter="filter"
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue';
|
||||
import filter from './ParkingFilter.js';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Parking"
|
||||
url="Parkings"
|
||||
:filter="filter"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import SupplierDescriptor from './SupplierDescriptor.vue';
|
||||
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
|
||||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
import filter from './SupplierFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Supplier"
|
||||
url="Suppliers"
|
||||
:descriptor="SupplierDescriptor"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import TicketDescriptor from './TicketDescriptor.vue';
|
||||
import filter from './TicketFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Ticket"
|
||||
url="Tickets"
|
||||
:descriptor="TicketDescriptor"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<script setup>
|
||||
import TravelDescriptor from './TravelDescriptor.vue';
|
||||
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
|
||||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
import filter from './TravelFilter.js';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Travel"
|
||||
url="Travels"
|
||||
:descriptor="TravelDescriptor"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
|
||||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta data-key="Wagon" url="Wagons" :descriptor="{}" />
|
||||
<VnCard data-key="Wagon" url="Wagons" :descriptor="{}" />
|
||||
</template>
|
||||
|
|
|
@ -96,6 +96,7 @@ async function setAdvancedSummary(data) {
|
|||
option-label="name"
|
||||
option-value="code"
|
||||
v-model="data.maritalStatus"
|
||||
data-cy="MaritalStatus"
|
||||
/>
|
||||
</VnRow>
|
||||
|
||||
|
@ -107,6 +108,7 @@ async function setAdvancedSummary(data) {
|
|||
option-label="name"
|
||||
option-value="id"
|
||||
v-model="data.originCountryFk"
|
||||
data-cy="country"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('Education level')"
|
||||
|
@ -132,7 +134,7 @@ async function setAdvancedSummary(data) {
|
|||
<VnInputDate :label="t('seniority')" v-model="data.seniority" />
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
<VnInput v-model="data.fi" :label="t('fi')" />
|
||||
<VnInput v-model="data.fi" :label="t('fi')" data-cy="fi" />
|
||||
<VnInputDate :label="t('birth')" v-model="data.birth" />
|
||||
</VnRow>
|
||||
<VnRow wrap>
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<script setup>
|
||||
import WorkerDescriptor from './WorkerDescriptor.vue';
|
||||
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
|
||||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
data-key="Worker"
|
||||
url="Workers/summary"
|
||||
:id-in-where="true"
|
||||
|
|
|
@ -98,12 +98,14 @@ watch(
|
|||
<VnInput
|
||||
:label="t('worker.operator.numberOfWagons')"
|
||||
v-model="row.numberOfWagons"
|
||||
data-cy="numberOfWagons"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('worker.operator.train')"
|
||||
:options="trainsData"
|
||||
hide-selected
|
||||
v-model="row.trainFk"
|
||||
data-cy="train"
|
||||
:required="true"
|
||||
/>
|
||||
</VnRow>
|
||||
|
@ -116,6 +118,7 @@ watch(
|
|||
option-value="code"
|
||||
v-model="row.itemPackingTypeFk"
|
||||
:required="true"
|
||||
data-cy="itemPackingType"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('worker.operator.warehouse')"
|
||||
|
@ -123,6 +126,7 @@ watch(
|
|||
hide-selected
|
||||
v-model="row.warehouseFk"
|
||||
:required="true"
|
||||
data-cy="warehouse"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
|
@ -132,6 +136,7 @@ watch(
|
|||
hide-selected
|
||||
option-label="description"
|
||||
v-model="row.sectorFk"
|
||||
data-cy="sector"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('worker.operator.labeler')"
|
||||
|
@ -139,6 +144,7 @@ watch(
|
|||
hide-selected
|
||||
option-label="name"
|
||||
v-model="row.labelerFk"
|
||||
data-cy="labeler"
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
|
@ -160,11 +166,13 @@ watch(
|
|||
:label="t('worker.operator.linesLimit')"
|
||||
v-model="row.linesLimit"
|
||||
lazy-rules
|
||||
data-cy="linesLimit"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('worker.operator.volumeLimit')"
|
||||
v-model="row.volumeLimit"
|
||||
lazy-rules
|
||||
data-cy="volumeLimit"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
|
@ -172,6 +180,7 @@ watch(
|
|||
:label="t('worker.operator.sizeLimit')"
|
||||
v-model="row.sizeLimit"
|
||||
lazy-rules
|
||||
data-cy="sizeLimit"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('worker.operator.isOnReservationMode')"
|
||||
|
|
|
@ -68,8 +68,14 @@ const deleteRelative = async (id) => {
|
|||
:label="t('familySituation')"
|
||||
clearable
|
||||
v-model="data.familySituation"
|
||||
data-cy="familySituation"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('spouseNif')"
|
||||
clearable
|
||||
v-model="data.spouseNif"
|
||||
data-cy="spouseNif"
|
||||
/>
|
||||
<VnInput :label="t('spouseNif')" clearable v-model="data.spouseNif" />
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
<VnSelect
|
||||
|
@ -93,11 +99,13 @@ const deleteRelative = async (id) => {
|
|||
clearable
|
||||
v-model="data.childPension"
|
||||
:label="t(`childPension`)"
|
||||
data-cy="childPension"
|
||||
/>
|
||||
<VnInput
|
||||
clearable
|
||||
v-model="data.spousePension"
|
||||
:label="t(`spousePension`)"
|
||||
data-cy="spousePension"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow wrap>
|
||||
|
@ -190,12 +198,14 @@ const deleteRelative = async (id) => {
|
|||
type="number"
|
||||
v-model="row.birthed"
|
||||
:label="t(`birthed`)"
|
||||
data-cy="birthed"
|
||||
/>
|
||||
|
||||
<VnInput
|
||||
type="number"
|
||||
v-model="row.adoptionYear"
|
||||
:label="t(`adoptionYear`)"
|
||||
data-cy="adoptionYear"
|
||||
/>
|
||||
<QCheckbox
|
||||
v-model="row.isDependend"
|
||||
|
|
|
@ -53,7 +53,7 @@ const title = computed(() => (isEditMode.value ? t('Edit entry') : t('Add time')
|
|||
const urlCreate = computed(() =>
|
||||
isEditMode.value
|
||||
? `WorkerTimeControls/${$props.entryId}/updateTimeEntry`
|
||||
: `WorkerTimeControls/${route.params.id}/addTimeEntry`
|
||||
: `WorkerTimeControls/${route.params.id}/addTimeEntry`,
|
||||
);
|
||||
|
||||
onBeforeMount(() => {
|
||||
|
@ -83,6 +83,7 @@ onBeforeMount(() => {
|
|||
autofocus
|
||||
:required="true"
|
||||
:is-clearable="false"
|
||||
data-cy="entryHour"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('Type')"
|
||||
|
@ -91,6 +92,7 @@ onBeforeMount(() => {
|
|||
option-value="code"
|
||||
option-label="description"
|
||||
hide-selected
|
||||
data-cy="entryType"
|
||||
/>
|
||||
</template>
|
||||
</FormModelPopup>
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import DepartmentDescriptor from 'pages/Worker/Department/Card/DepartmentDescriptor.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
||||
<VnCard
|
||||
class="q-pa-md column items-center"
|
||||
v-bind="{ ...$attrs }"
|
||||
data-key="Department"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
|
||||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
import ZoneDescriptor from './ZoneDescriptor.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
|
||||
<VnCard data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
|
||||
</template>
|
||||
|
|
|
@ -34,8 +34,8 @@ describe('OrderList', () => {
|
|||
cy.dataCy('Customer ID_input').type('1101{enter}');
|
||||
cy.dataCy('vnTableCreateBtn').click();
|
||||
cy.dataCy('landedDate').find('input').type('06/01/2001');
|
||||
cy.get(agencyCreateSelect).click();
|
||||
cy.get('.q-menu > div> .q-item:nth-child(1)').click();
|
||||
cy.selectOption(agencyCreateSelect, 1);
|
||||
|
||||
cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
|
||||
cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
|
||||
cy.wait('@orderSale');
|
||||
|
@ -60,8 +60,8 @@ describe('OrderList', () => {
|
|||
cy.get(clientCreateSelect).should('have.value', 'Bruce Wayne');
|
||||
cy.get(addressCreateSelect).should('have.value', 'Bruce Wayne');
|
||||
cy.dataCy('landedDate').find('input').type('06/01/2001');
|
||||
cy.get(agencyCreateSelect).click();
|
||||
cy.get('.q-menu > div> .q-item:nth-child(1)').click();
|
||||
cy.selectOption(agencyCreateSelect, 1);
|
||||
|
||||
cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
|
||||
cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
|
||||
cy.wait('@orderSale');
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
describe('WorkerBasicData', () => {
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.login('developer');
|
||||
cy.visit('/#/worker/1107/basic-data');
|
||||
});
|
||||
|
||||
it('should modify worker summary', () => {
|
||||
cy.dataCy('MaritalStatus').type('Married');
|
||||
cy.dataCy('fi').type('42572374H');
|
||||
cy.dataCy('country').type('Alemania');
|
||||
cy.saveCard();
|
||||
cy.checkNotification('Data saved');
|
||||
});
|
||||
});
|
|
@ -0,0 +1,34 @@
|
|||
describe('WorkerBusiness', () => {
|
||||
const saveBtn = '.q-mt-lg > .q-btn--standard';
|
||||
const contributionCode = `Representantes de comercio`;
|
||||
const contractType = `INDEFINIDO A TIEMPO COMPLETO`;
|
||||
|
||||
const Business = {
|
||||
'Start Date': { val: '26-12-2002', type: 'date' },
|
||||
Company: { val: `VNL`, type: 'select' },
|
||||
Department: { val: `RECICLAJE`, type: 'select' },
|
||||
'Professional Category': { val: `employee`, type: 'select' },
|
||||
'Work Calendar': { val: `General schedule`, type: 'select' },
|
||||
'Work Center': { val: `Silla`, type: 'select' },
|
||||
'Contract Category': { val: `INFORMATICA`, type: 'select' },
|
||||
'Contribution Code': { val: contributionCode, type: 'select' },
|
||||
Rate: { val: `5` },
|
||||
'Contract Type': { val: contractType, type: 'select' },
|
||||
'Transport Workers Salary': { val: `1000` },
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.login('hr');
|
||||
cy.visit('/#/worker/1107/business');
|
||||
cy.addCard();
|
||||
});
|
||||
|
||||
it('should create a business', () => {
|
||||
cy.fillInForm({
|
||||
...Business,
|
||||
});
|
||||
cy.get(saveBtn).click();
|
||||
cy.checkNotification('Data created');
|
||||
});
|
||||
});
|
|
@ -0,0 +1,23 @@
|
|||
/// <reference types="cypress" />
|
||||
describe('WorkerMutual', () => {
|
||||
const userId = 1106;
|
||||
const saveBtn = '.q-mt-lg > .q-btn--standard';
|
||||
const medicalReview = {
|
||||
Date: { val: '01-01-2001', type: 'date' },
|
||||
'Formation Center': { val: '1', type: 'select' },
|
||||
Invoice: { val: '24532' },
|
||||
Amount: { val: '540' },
|
||||
};
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.login('developer');
|
||||
cy.visit(`/#/worker/${userId}/medical`);
|
||||
cy.addCard();
|
||||
});
|
||||
|
||||
it('should create a medical Review', () => {
|
||||
cy.fillInForm(medicalReview);
|
||||
cy.get(saveBtn).click();
|
||||
cy.checkNotification('Data created');
|
||||
});
|
||||
});
|
|
@ -0,0 +1,13 @@
|
|||
/// <reference types="cypress" />
|
||||
describe('WorkerNotes', () => {
|
||||
const userId = 1106;
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.login('developer');
|
||||
cy.visit(`/#/worker/${userId}/notes`);
|
||||
});
|
||||
|
||||
it('Should load layout', () => {
|
||||
cy.get('.q-card').should('be.visible');
|
||||
});
|
||||
});
|
|
@ -0,0 +1,19 @@
|
|||
/// <reference types="cypress" />
|
||||
describe('WorkerOperator', () => {
|
||||
const userId = 1106;
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.login('hr');
|
||||
cy.visit(`/#/worker/${userId}/operator`);
|
||||
});
|
||||
|
||||
it('should fill the operator form', () => {
|
||||
cy.dataCy('numberOfWagons').type('4');
|
||||
cy.dataCy('linesLimit').type('6');
|
||||
cy.dataCy('volumeLimit').type('3');
|
||||
cy.dataCy('sizeLimit').type('3');
|
||||
cy.saveCard();
|
||||
|
||||
cy.checkNotification('Data saved');
|
||||
});
|
||||
});
|
|
@ -1,19 +1,5 @@
|
|||
describe('WorkerPit', () => {
|
||||
const familySituationInput = '[data-cy="Family Situation_input"]';
|
||||
const familySituation = '1';
|
||||
const childPensionInput = '[data-cy="Child Pension_input"]';
|
||||
const childPension = '120';
|
||||
const spouseNifInput = '[data-cy="Spouse Pension_input"]';
|
||||
const spouseNif = '65117125P';
|
||||
const spousePensionInput = '[data-cy="Spouse Pension_input"]';
|
||||
const spousePension = '120';
|
||||
const addRelative = '[data-cy="addRelative"]';
|
||||
const isDescendantSelect = '[data-cy="Descendant/Ascendant"]';
|
||||
const Descendant = 'Descendiente';
|
||||
const birthedInput = '[data-cy="Birth Year_input"]';
|
||||
const birthed = '2002';
|
||||
const adoptionYearInput = '[data-cy="Adoption Year_input"]';
|
||||
const adoptionYear = '2004';
|
||||
const saveRelative = '[data-cy="workerPitRelativeSaveBtn"]';
|
||||
const savePIT = '#st-actions > .q-btn-group > .q-btn--standard';
|
||||
|
||||
|
@ -24,15 +10,15 @@ describe('WorkerPit', () => {
|
|||
});
|
||||
|
||||
it('complete PIT', () => {
|
||||
cy.get(familySituationInput).type(familySituation);
|
||||
cy.get(childPensionInput).type(childPension);
|
||||
cy.get(spouseNifInput).type(spouseNif);
|
||||
cy.get(spousePensionInput).type(spousePension);
|
||||
cy.dataCy('familySituation').type('1');
|
||||
cy.dataCy('childPension').type('120');
|
||||
cy.dataCy('spouseNif').type('65117125P');
|
||||
cy.dataCy('spousePension').type('120');
|
||||
cy.get(savePIT).click();
|
||||
cy.get(addRelative).click();
|
||||
cy.get(isDescendantSelect).type(Descendant);
|
||||
cy.get(birthedInput).type(birthed);
|
||||
cy.get(adoptionYearInput).type(adoptionYear);
|
||||
cy.dataCy('Descendant/Ascendant').type('Descendiente');
|
||||
cy.dataCy('birthed').type('2002');
|
||||
cy.dataCy('adoptionYear').type('2004');
|
||||
cy.get(saveRelative).click();
|
||||
});
|
||||
});
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
describe('WorkerSummary', () => {
|
||||
const departmentDescriptor = ':nth-child(1) > :nth-child(3) > .value > .link';
|
||||
const roleDescriptor = ':nth-child(3) > :nth-child(4) > .value > .link';
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.login('developer');
|
||||
|
@ -10,7 +12,17 @@ describe('WorkerSummary', () => {
|
|||
cy.get('.summaryHeader > div').should('have.text', '19 - salesboss salesboss');
|
||||
cy.get(':nth-child(1) > :nth-child(2) > .value > span').should(
|
||||
'have.text',
|
||||
'salesBossNick'
|
||||
'salesBossNick',
|
||||
);
|
||||
});
|
||||
|
||||
it('should try descriptors', () => {
|
||||
cy.waitForElement('.summaryHeader');
|
||||
cy.get(departmentDescriptor).click();
|
||||
cy.get('.descriptor').should('be.visible');
|
||||
cy.get('.q-item > .q-item__label').should('include.text', '43');
|
||||
cy.get(roleDescriptor).click();
|
||||
cy.get('.descriptor').should('be.visible');
|
||||
cy.get('.q-item > .q-item__label').should('include.text', '19');
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue