Merge branch 'dev' of https: refs #8050//gitea.verdnatura.es/verdnatura/salix-front into 8050-AddWorkerManagement
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
7c33bb66c2
|
@ -44,6 +44,7 @@ export default defineConfig({
|
||||||
supportFile: 'test/cypress/support/index.js',
|
supportFile: 'test/cypress/support/index.js',
|
||||||
videosFolder: 'test/cypress/videos',
|
videosFolder: 'test/cypress/videos',
|
||||||
downloadsFolder: 'test/cypress/downloads',
|
downloadsFolder: 'test/cypress/downloads',
|
||||||
|
tmpUploadFolder: 'test/cypress/storage/tmp/dms',
|
||||||
video: false,
|
video: false,
|
||||||
specPattern: 'test/cypress/integration/**/*.spec.js',
|
specPattern: 'test/cypress/integration/**/*.spec.js',
|
||||||
experimentalRunAllSpecs: true,
|
experimentalRunAllSpecs: true,
|
||||||
|
|
|
@ -67,7 +67,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
expect(result).rejects.toEqual(expect.objectContaining(error));
|
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should call to the Notify plugin with a message from the response property', async () => {
|
it('should call to the Notify plugin with a message from the response property', async () => {
|
||||||
|
@ -83,7 +83,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
expect(result).rejects.toEqual(expect.objectContaining(error));
|
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -20,7 +20,6 @@ const postcodeFormData = reactive({
|
||||||
provinceFk: null,
|
provinceFk: null,
|
||||||
townFk: null,
|
townFk: null,
|
||||||
});
|
});
|
||||||
const townFilter = ref({});
|
|
||||||
|
|
||||||
const countriesRef = ref(false);
|
const countriesRef = ref(false);
|
||||||
const provincesOptions = ref([]);
|
const provincesOptions = ref([]);
|
||||||
|
@ -33,11 +32,11 @@ function onDataSaved(formData) {
|
||||||
newPostcode.town = town.value.name;
|
newPostcode.town = town.value.name;
|
||||||
newPostcode.townFk = town.value.id;
|
newPostcode.townFk = town.value.id;
|
||||||
const provinceObject = provincesOptions.value.find(
|
const provinceObject = provincesOptions.value.find(
|
||||||
({ id }) => id === formData.provinceFk
|
({ id }) => id === formData.provinceFk,
|
||||||
);
|
);
|
||||||
newPostcode.province = provinceObject?.name;
|
newPostcode.province = provinceObject?.name;
|
||||||
const countryObject = countriesRef.value.opts.find(
|
const countryObject = countriesRef.value.opts.find(
|
||||||
({ id }) => id === formData.countryFk
|
({ id }) => id === formData.countryFk,
|
||||||
);
|
);
|
||||||
newPostcode.country = countryObject?.name;
|
newPostcode.country = countryObject?.name;
|
||||||
emit('onDataSaved', newPostcode);
|
emit('onDataSaved', newPostcode);
|
||||||
|
@ -67,21 +66,11 @@ function setTown(newTown, data) {
|
||||||
}
|
}
|
||||||
async function onCityCreated(newTown, formData) {
|
async function onCityCreated(newTown, formData) {
|
||||||
newTown.province = provincesOptions.value.find(
|
newTown.province = provincesOptions.value.find(
|
||||||
(province) => province.id === newTown.provinceFk
|
(province) => province.id === newTown.provinceFk,
|
||||||
);
|
);
|
||||||
formData.townFk = newTown;
|
formData.townFk = newTown;
|
||||||
setTown(newTown, formData);
|
setTown(newTown, formData);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function filterTowns(name) {
|
|
||||||
if (name !== '') {
|
|
||||||
townFilter.value.where = {
|
|
||||||
name: {
|
|
||||||
like: `%${name}%`,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -107,7 +96,6 @@ async function filterTowns(name) {
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
@update:model-value="(value) => setTown(value, data)"
|
@update:model-value="(value) => setTown(value, data)"
|
||||||
@filter="filterTowns"
|
|
||||||
:tooltip="t('Create city')"
|
:tooltip="t('Create city')"
|
||||||
v-model="data.townFk"
|
v-model="data.townFk"
|
||||||
url="Towns/location"
|
url="Towns/location"
|
||||||
|
|
|
@ -65,7 +65,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
beforeSaveFn: {
|
beforeSaveFn: {
|
||||||
type: Function,
|
type: [String, Function],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
goTo: {
|
goTo: {
|
||||||
|
@ -83,7 +83,7 @@ const isLoading = ref(false);
|
||||||
const hasChanges = ref(false);
|
const hasChanges = ref(false);
|
||||||
const originalData = ref();
|
const originalData = ref();
|
||||||
const vnPaginateRef = ref();
|
const vnPaginateRef = ref();
|
||||||
const formData = ref([]);
|
const formData = ref();
|
||||||
const saveButtonRef = ref(null);
|
const saveButtonRef = ref(null);
|
||||||
const watchChanges = ref();
|
const watchChanges = ref();
|
||||||
const formUrl = computed(() => $props.url);
|
const formUrl = computed(() => $props.url);
|
||||||
|
@ -298,6 +298,10 @@ watch(formUrl, async () => {
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
<SkeletonTable
|
||||||
|
v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
|
||||||
|
:columns="$attrs.columns?.length"
|
||||||
|
/>
|
||||||
<VnPaginate
|
<VnPaginate
|
||||||
:url="url"
|
:url="url"
|
||||||
:limit="limit"
|
:limit="limit"
|
||||||
|
@ -316,10 +320,6 @@ watch(formUrl, async () => {
|
||||||
></slot>
|
></slot>
|
||||||
</template>
|
</template>
|
||||||
</VnPaginate>
|
</VnPaginate>
|
||||||
<SkeletonTable
|
|
||||||
v-if="!formData && $attrs.autoLoad"
|
|
||||||
:columns="$attrs.columns?.length"
|
|
||||||
/>
|
|
||||||
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
|
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
|
||||||
<QBtnGroup push style="column-gap: 10px">
|
<QBtnGroup push style="column-gap: 10px">
|
||||||
<slot name="moreBeforeActions" />
|
<slot name="moreBeforeActions" />
|
||||||
|
|
|
@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const myForm = ref(null);
|
const myForm = ref(null);
|
||||||
const attrs = useAttrs();
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
url: {
|
url: {
|
||||||
type: String,
|
type: String,
|
||||||
|
@ -99,8 +98,12 @@ const $props = defineProps({
|
||||||
type: Function,
|
type: Function,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
preventSubmit: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const emit = defineEmits(['onFetch', 'onDataSaved']);
|
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
|
||||||
const modelValue = computed(
|
const modelValue = computed(
|
||||||
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
||||||
).value;
|
).value;
|
||||||
|
@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
async function onKeyup(evt) {
|
async function onKeyup(evt) {
|
||||||
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
|
if (evt.key === 'Enter' && !$props.preventSubmit) {
|
||||||
const input = evt.target;
|
const input = evt.target;
|
||||||
if (input.type == 'textarea' && evt.shiftKey) {
|
if (input.type == 'textarea' && evt.shiftKey) {
|
||||||
let { selectionStart, selectionEnd } = input;
|
let { selectionStart, selectionEnd } = input;
|
||||||
|
@ -330,6 +333,7 @@ defineExpose({
|
||||||
<template>
|
<template>
|
||||||
<div class="column items-center full-width">
|
<div class="column items-center full-width">
|
||||||
<QForm
|
<QForm
|
||||||
|
v-on="$attrs"
|
||||||
ref="myForm"
|
ref="myForm"
|
||||||
v-if="formData"
|
v-if="formData"
|
||||||
@submit.prevent="save"
|
@submit.prevent="save"
|
||||||
|
|
|
@ -181,7 +181,7 @@ const searchModule = () => {
|
||||||
<template>
|
<template>
|
||||||
<QList padding class="column-max-width">
|
<QList padding class="column-max-width">
|
||||||
<template v-if="$props.source === 'main'">
|
<template v-if="$props.source === 'main'">
|
||||||
<template v-if="$route?.matched[1]?.name === 'Dashboard'">
|
<template v-if="route?.matched[1]?.name === 'Dashboard'">
|
||||||
<QItem class="q-pb-md">
|
<QItem class="q-pb-md">
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="search"
|
v-model="search"
|
||||||
|
@ -262,7 +262,7 @@ const searchModule = () => {
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-for="item in items" :key="item.name">
|
<template v-for="item in items" :key="item.name">
|
||||||
<template v-if="item.name === $route?.matched[1]?.name">
|
<template v-if="item.name === route?.matched[1]?.name">
|
||||||
<QItem class="header">
|
<QItem class="header">
|
||||||
<QItemSection avatar v-if="item.icon">
|
<QItemSection avatar v-if="item.icon">
|
||||||
<QIcon :name="item.icon" />
|
<QIcon :name="item.icon" />
|
||||||
|
|
|
@ -16,7 +16,7 @@ const $props = defineProps({
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: 'table',
|
default: 'table',
|
||||||
},
|
},
|
||||||
vertical: {
|
vertical: {
|
||||||
|
|
|
@ -66,7 +66,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
create: {
|
create: {
|
||||||
type: Object,
|
type: [Boolean, Object],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
createAsDialog: {
|
createAsDialog: {
|
||||||
|
|
|
@ -30,6 +30,7 @@ function columnName(col) {
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
:search-button="true"
|
:search-button="true"
|
||||||
:disable-submit-event="true"
|
:disable-submit-event="true"
|
||||||
|
:data-key="$attrs['data-key']"
|
||||||
:search-url
|
:search-url
|
||||||
>
|
>
|
||||||
<template #body="{ params, orders, searchFn }">
|
<template #body="{ params, orders, searchFn }">
|
||||||
|
|
|
@ -58,7 +58,7 @@ async function getConfig(url, filter) {
|
||||||
const response = await axios.get(url, {
|
const response = await axios.get(url, {
|
||||||
params: { filter: filter },
|
params: { filter: filter },
|
||||||
});
|
});
|
||||||
return response.data && response.data.length > 0 ? response.data[0] : null;
|
return response?.data && response?.data?.length > 0 ? response.data[0] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchViewConfigData() {
|
async function fetchViewConfigData() {
|
||||||
|
|
|
@ -11,6 +11,9 @@ describe('VnTable', () => {
|
||||||
propsData: {
|
propsData: {
|
||||||
columns: [],
|
columns: [],
|
||||||
},
|
},
|
||||||
|
attrs: {
|
||||||
|
'data-key': 'test',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
||||||
|
|
|
@ -11,13 +11,7 @@ describe('CrudModel', () => {
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
wrapper = createWrapper(CrudModel, {
|
wrapper = createWrapper(CrudModel, {
|
||||||
global: {
|
global: {
|
||||||
stubs: [
|
stubs: ['vnPaginate', 'vue-i18n'],
|
||||||
'vnPaginate',
|
|
||||||
'useState',
|
|
||||||
'arrayData',
|
|
||||||
'useStateStore',
|
|
||||||
'vue-i18n',
|
|
||||||
],
|
|
||||||
mocks: {
|
mocks: {
|
||||||
validate: vi.fn(),
|
validate: vi.fn(),
|
||||||
},
|
},
|
||||||
|
@ -29,7 +23,7 @@ describe('CrudModel', () => {
|
||||||
dataKey: 'crudModelKey',
|
dataKey: 'crudModelKey',
|
||||||
model: 'crudModel',
|
model: 'crudModel',
|
||||||
url: 'crudModelUrl',
|
url: 'crudModelUrl',
|
||||||
saveFn: '',
|
saveFn: vi.fn(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
|
@ -231,7 +225,7 @@ describe('CrudModel', () => {
|
||||||
expect(vm.isLoading).toBe(false);
|
expect(vm.isLoading).toBe(false);
|
||||||
expect(vm.hasChanges).toBe(false);
|
expect(vm.hasChanges).toBe(false);
|
||||||
|
|
||||||
await wrapper.setProps({ saveFn: '' });
|
await wrapper.setProps({ saveFn: null });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should use default url if there's not saveFn", async () => {
|
it("should use default url if there's not saveFn", async () => {
|
||||||
|
|
|
@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
|
||||||
vm = mount('card').vm;
|
vm = mount('card').vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get routes for card source', async () => {
|
it('should get routes for card source', () => {
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get routes for main source', () => {
|
it('should get routes for main source', () => {
|
||||||
vm.props.source = 'main';
|
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
expect(navigation.getModules).toHaveBeenCalled();
|
expect(navigation.getModules).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
const model = defineModel({ type: [String, Number], required: true });
|
const model = defineModel({ type: [String, Number], default: '' });
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />
|
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />
|
||||||
|
|
|
@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const { notify } = useNotify();
|
||||||
const emit = defineEmits(['onDataSaved']);
|
const emit = defineEmits(['onDataSaved']);
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -61,8 +63,11 @@ function onFileChange(files) {
|
||||||
|
|
||||||
function mapperDms(data) {
|
function mapperDms(data) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
const { files } = data;
|
let files = data.files;
|
||||||
if (files) formData.append(files?.name, files);
|
if (files) {
|
||||||
|
files = Array.isArray(files) ? files : [files];
|
||||||
|
files.forEach((file) => formData.append(file?.name, file));
|
||||||
|
}
|
||||||
|
|
||||||
const dms = {
|
const dms = {
|
||||||
hasFile: !!data.hasFile,
|
hasFile: !!data.hasFile,
|
||||||
|
@ -83,11 +88,16 @@ function getUrl() {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
const body = mapperDms(dms.value);
|
try {
|
||||||
const response = await axios.post(getUrl(), body[0], body[1]);
|
const body = mapperDms(dms.value);
|
||||||
emit('onDataSaved', body[1].params, response);
|
const response = await axios.post(getUrl(), body[0], body[1]);
|
||||||
delete dms.value.files;
|
emit('onDataSaved', body[1].params, response);
|
||||||
return response;
|
notify(t('globals.dataSaved'), 'positive');
|
||||||
|
delete dms.value.files;
|
||||||
|
return response;
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultData() {
|
function defaultData() {
|
||||||
|
|
|
@ -13,10 +13,12 @@ import VnDms from 'src/components/common/VnDms.vue';
|
||||||
import VnConfirm from 'components/ui/VnConfirm.vue';
|
import VnConfirm from 'components/ui/VnConfirm.vue';
|
||||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
import { useSession } from 'src/composables/useSession';
|
import { useSession } from 'src/composables/useSession';
|
||||||
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const { notify } = useNotify();
|
||||||
const rows = ref([]);
|
const rows = ref([]);
|
||||||
const dmsRef = ref();
|
const dmsRef = ref();
|
||||||
const formDialog = ref({});
|
const formDialog = ref({});
|
||||||
|
@ -88,7 +90,6 @@ const dmsFilter = {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
where: { [$props.filter]: route.params.id },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
@ -258,9 +259,16 @@ function deleteDms(dmsFk) {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.onOk(async () => {
|
.onOk(async () => {
|
||||||
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
|
try {
|
||||||
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
await axios.post(
|
||||||
rows.value.splice(index, 1);
|
`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
|
||||||
|
);
|
||||||
|
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
||||||
|
rows.value.splice(index, 1);
|
||||||
|
notify(t('globals.dataDeleted'), 'positive');
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -298,7 +306,9 @@ defineExpose({
|
||||||
:data-key="$props.model"
|
:data-key="$props.model"
|
||||||
:url="$props.model"
|
:url="$props.model"
|
||||||
:user-filter="dmsFilter"
|
:user-filter="dmsFilter"
|
||||||
|
search-url="dmsFilter"
|
||||||
:order="['dmsFk DESC']"
|
:order="['dmsFk DESC']"
|
||||||
|
:filter="{ where: { [$props.filter]: route.params.id } }"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="setData"
|
@on-fetch="setData"
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
|
import { nextTick, watch, computed, ref, useAttrs } from 'vue';
|
||||||
import { date } from 'quasar';
|
import { date, getCssVar } from 'quasar';
|
||||||
import VnDate from './VnDate.vue';
|
import VnDate from './VnDate.vue';
|
||||||
import { useRequired } from 'src/composables/useRequired';
|
import { useRequired } from 'src/composables/useRequired';
|
||||||
|
|
||||||
|
@ -20,61 +20,18 @@ const $props = defineProps({
|
||||||
});
|
});
|
||||||
|
|
||||||
const vnInputDateRef = ref(null);
|
const vnInputDateRef = ref(null);
|
||||||
|
const errColor = getCssVar('negative');
|
||||||
|
const textColor = ref('');
|
||||||
|
|
||||||
const dateFormat = 'DD/MM/YYYY';
|
const dateFormat = 'DD/MM/YYYY';
|
||||||
const isPopupOpen = ref();
|
const isPopupOpen = ref();
|
||||||
const hover = ref();
|
const hover = ref();
|
||||||
const mask = ref();
|
|
||||||
|
|
||||||
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
|
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
|
||||||
|
|
||||||
const formattedDate = computed({
|
|
||||||
get() {
|
|
||||||
if (!model.value) return model.value;
|
|
||||||
return date.formatDate(new Date(model.value), dateFormat);
|
|
||||||
},
|
|
||||||
set(value) {
|
|
||||||
if (value == model.value) return;
|
|
||||||
let newDate;
|
|
||||||
if (value) {
|
|
||||||
// parse input
|
|
||||||
if (value.includes('/') && value.length >= 10) {
|
|
||||||
if (value.at(2) == '/') value = value.split('/').reverse().join('/');
|
|
||||||
value = date.formatDate(
|
|
||||||
new Date(value).toISOString(),
|
|
||||||
'YYYY-MM-DDTHH:mm:ss.SSSZ',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const [year, month, day] = value.split('-').map((e) => parseInt(e));
|
|
||||||
newDate = new Date(year, month - 1, day);
|
|
||||||
if (model.value) {
|
|
||||||
const orgDate =
|
|
||||||
model.value instanceof Date ? model.value : new Date(model.value);
|
|
||||||
|
|
||||||
newDate.setHours(
|
|
||||||
orgDate.getHours(),
|
|
||||||
orgDate.getMinutes(),
|
|
||||||
orgDate.getSeconds(),
|
|
||||||
orgDate.getMilliseconds(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isNaN(newDate)) model.value = newDate.toISOString();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const popupDate = computed(() =>
|
const popupDate = computed(() =>
|
||||||
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
|
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
|
||||||
);
|
);
|
||||||
onMounted(() => {
|
|
||||||
// fix quasar bug
|
|
||||||
mask.value = '##/##/####';
|
|
||||||
});
|
|
||||||
watch(
|
|
||||||
() => model.value,
|
|
||||||
(val) => (formattedDate.value = val),
|
|
||||||
{ immediate: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
const styleAttrs = computed(() => {
|
const styleAttrs = computed(() => {
|
||||||
return $props.isOutlined
|
return $props.isOutlined
|
||||||
|
@ -86,28 +43,138 @@ const styleAttrs = computed(() => {
|
||||||
: {};
|
: {};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const inputValue = ref('');
|
||||||
|
|
||||||
|
const validateAndCleanInput = (value) => {
|
||||||
|
inputValue.value = value.replace(/[^0-9./-]/g, '');
|
||||||
|
};
|
||||||
|
|
||||||
const manageDate = (date) => {
|
const manageDate = (date) => {
|
||||||
formattedDate.value = date;
|
inputValue.value = date.split('/').reverse().join('/');
|
||||||
isPopupOpen.value = false;
|
isPopupOpen.value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => model.value,
|
||||||
|
(nVal) => {
|
||||||
|
if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
|
||||||
|
else inputValue.value = '';
|
||||||
|
},
|
||||||
|
{ immediate: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
const formatDate = () => {
|
||||||
|
let value = inputValue.value;
|
||||||
|
if (!value || value === model.value) {
|
||||||
|
textColor.value = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const regex =
|
||||||
|
/^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
|
||||||
|
if (!regex.test(value)) {
|
||||||
|
textColor.value = errColor;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
value = value.replace(/[.-]/g, '/');
|
||||||
|
const parts = value.split('/');
|
||||||
|
if (parts.length < 2) {
|
||||||
|
textColor.value = errColor;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let [day, month, year] = parts;
|
||||||
|
if (day.length === 1) day = '0' + day;
|
||||||
|
if (month.length === 1) month = '0' + month;
|
||||||
|
|
||||||
|
const currentYear = Date.vnNew().getFullYear();
|
||||||
|
if (!year) year = currentYear;
|
||||||
|
const millennium = currentYear.toString().slice(0, 1);
|
||||||
|
|
||||||
|
switch (year.length) {
|
||||||
|
case 1:
|
||||||
|
year = `${millennium}00${year}`;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
year = `${millennium}0${year}`;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
year = `${millennium}${year}`;
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
let isoCandidate = `${year}/${month}/${day}`;
|
||||||
|
isoCandidate = date.formatDate(
|
||||||
|
new Date(isoCandidate).toISOString(),
|
||||||
|
'YYYY-MM-DDTHH:mm:ss.SSSZ',
|
||||||
|
);
|
||||||
|
const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
|
||||||
|
const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
|
||||||
|
|
||||||
|
const isValidDate =
|
||||||
|
parsedDate instanceof Date &&
|
||||||
|
!isNaN(parsedDate) &&
|
||||||
|
parsedDate.getFullYear() === parseInt(year) &&
|
||||||
|
parsedDate.getMonth() === parseInt(month) - 1 &&
|
||||||
|
parsedDate.getDate() === parseInt(day);
|
||||||
|
|
||||||
|
if (!isValidDate) {
|
||||||
|
textColor.value = errColor;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (model.value) {
|
||||||
|
const original =
|
||||||
|
model.value instanceof Date ? model.value : new Date(model.value);
|
||||||
|
parsedDate.setHours(
|
||||||
|
original.getHours(),
|
||||||
|
original.getMinutes(),
|
||||||
|
original.getSeconds(),
|
||||||
|
original.getMilliseconds(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
model.value = parsedDate.toISOString();
|
||||||
|
|
||||||
|
textColor.value = '';
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleEnter = (event) => {
|
||||||
|
formatDate();
|
||||||
|
|
||||||
|
nextTick(() => {
|
||||||
|
const newEvent = new KeyboardEvent('keydown', {
|
||||||
|
key: 'Enter',
|
||||||
|
code: 'Enter',
|
||||||
|
bubbles: true,
|
||||||
|
cancelable: true,
|
||||||
|
});
|
||||||
|
vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
|
||||||
|
});
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div @mouseover="hover = true" @mouseleave="hover = false">
|
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||||
<QInput
|
<QInput
|
||||||
ref="vnInputDateRef"
|
ref="vnInputDateRef"
|
||||||
v-model="formattedDate"
|
v-model="inputValue"
|
||||||
class="vn-input-date"
|
class="vn-input-date"
|
||||||
:mask="mask"
|
|
||||||
placeholder="dd/mm/aaaa"
|
placeholder="dd/mm/aaaa"
|
||||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
:class="{ required: isRequired }"
|
:class="{ required: isRequired }"
|
||||||
:rules="mixinRules"
|
:rules="mixinRules"
|
||||||
:clearable="false"
|
:clearable="false"
|
||||||
|
:input-style="{ color: textColor }"
|
||||||
@click="isPopupOpen = !isPopupOpen"
|
@click="isPopupOpen = !isPopupOpen"
|
||||||
@keydown="isPopupOpen = false"
|
@keydown="isPopupOpen = false"
|
||||||
|
@blur="formatDate"
|
||||||
|
@keydown.enter.prevent="handleEnter"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
||||||
|
@update:model-value="validateAndCleanInput"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
|
@ -116,11 +183,12 @@ const manageDate = (date) => {
|
||||||
v-if="
|
v-if="
|
||||||
($attrs.clearable == undefined || $attrs.clearable) &&
|
($attrs.clearable == undefined || $attrs.clearable) &&
|
||||||
hover &&
|
hover &&
|
||||||
model &&
|
inputValue &&
|
||||||
!$attrs.disable
|
!$attrs.disable
|
||||||
"
|
"
|
||||||
@click="
|
@click="
|
||||||
vnInputDateRef.focus();
|
vnInputDateRef.focus();
|
||||||
|
inputValue = null;
|
||||||
model = null;
|
model = null;
|
||||||
isPopupOpen = false;
|
isPopupOpen = false;
|
||||||
"
|
"
|
||||||
|
|
|
@ -5,7 +5,7 @@ import VnDate from './VnDate.vue';
|
||||||
import VnTime from './VnTime.vue';
|
import VnTime from './VnTime.vue';
|
||||||
|
|
||||||
const $attrs = useAttrs();
|
const $attrs = useAttrs();
|
||||||
const model = defineModel({ type: [Date] });
|
const model = defineModel({ type: [Date, String] });
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
isOutlined: {
|
isOutlined: {
|
||||||
|
@ -29,7 +29,7 @@ const styleAttrs = computed(() => {
|
||||||
const mask = 'DD-MM-YYYY HH:mm';
|
const mask = 'DD-MM-YYYY HH:mm';
|
||||||
const selectedDate = computed({
|
const selectedDate = computed({
|
||||||
get() {
|
get() {
|
||||||
if (!model.value) return new Date(model.value);
|
if (!model.value) return JSON.stringify(new Date(model.value));
|
||||||
return date.formatDate(new Date(model.value), mask);
|
return date.formatDate(new Date(model.value), mask);
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
|
|
|
@ -54,6 +54,10 @@ const $props = defineProps({
|
||||||
type: [Array],
|
type: [Array],
|
||||||
default: () => [],
|
default: () => [],
|
||||||
},
|
},
|
||||||
|
filterFn: {
|
||||||
|
type: Function,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
exprBuilder: {
|
exprBuilder: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: null,
|
default: null,
|
||||||
|
@ -62,16 +66,12 @@ const $props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
defaultFilter: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
fields: {
|
fields: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
type: [Object, Array],
|
type: [Object, Array, String],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
where: {
|
where: {
|
||||||
|
@ -79,7 +79,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
sortBy: {
|
sortBy: {
|
||||||
type: String,
|
type: [String, Array],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
@ -152,10 +152,22 @@ const value = computed({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const arrayDataKey =
|
||||||
|
$props.dataKey ??
|
||||||
|
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
|
||||||
|
|
||||||
|
const arrayData = useArrayData(arrayDataKey, {
|
||||||
|
url: $props.url,
|
||||||
|
searchUrl: false,
|
||||||
|
mapKey: $attrs['map-key'],
|
||||||
|
});
|
||||||
|
|
||||||
const computedSortBy = computed(() => {
|
const computedSortBy = computed(() => {
|
||||||
return $props.sortBy || $props.optionLabel + ' ASC';
|
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
||||||
|
|
||||||
watch(options, (newValue) => {
|
watch(options, (newValue) => {
|
||||||
setOptions(newValue);
|
setOptions(newValue);
|
||||||
});
|
});
|
||||||
|
@ -174,16 +186,7 @@ onMounted(() => {
|
||||||
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
|
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
|
||||||
});
|
});
|
||||||
|
|
||||||
const arrayDataKey =
|
const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
|
||||||
$props.dataKey ??
|
|
||||||
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
|
|
||||||
|
|
||||||
const arrayData = useArrayData(arrayDataKey, {
|
|
||||||
url: $props.url,
|
|
||||||
searchUrl: false,
|
|
||||||
mapKey: $attrs['map-key'],
|
|
||||||
});
|
|
||||||
|
|
||||||
function findKeyInOptions() {
|
function findKeyInOptions() {
|
||||||
if (!$props.options) return;
|
if (!$props.options) return;
|
||||||
return filter($props.modelValue, $props.options)?.length;
|
return filter($props.modelValue, $props.options)?.length;
|
||||||
|
@ -252,43 +255,41 @@ async function fetchFilter(val) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function filterHandler(val, update) {
|
async function filterHandler(val, update) {
|
||||||
if (isLoading.value) return update();
|
|
||||||
if (!val && lastVal.value === val) {
|
|
||||||
lastVal.value = val;
|
|
||||||
return update();
|
|
||||||
}
|
|
||||||
lastVal.value = val;
|
|
||||||
let newOptions;
|
let newOptions;
|
||||||
|
|
||||||
if (!$props.defaultFilter) return update();
|
if ($props.filterFn) update($props.filterFn(val));
|
||||||
if (
|
else if (!val && lastVal.value === val) update();
|
||||||
$props.url &&
|
else {
|
||||||
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
|
const makeRequest =
|
||||||
) {
|
($props.url && $props.limit) ||
|
||||||
newOptions = await fetchFilter(val);
|
(!$props.limit && Object.keys(myOptions.value).length === 0);
|
||||||
} else newOptions = filter(val, myOptionsOriginal.value);
|
newOptions = makeRequest
|
||||||
update(
|
? await fetchFilter(val)
|
||||||
() => {
|
: filter(val, myOptionsOriginal.value);
|
||||||
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
|
||||||
newOptions.unshift(noOneOpt.value);
|
|
||||||
|
|
||||||
myOptions.value = newOptions;
|
update(
|
||||||
},
|
() => {
|
||||||
(ref) => {
|
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
||||||
if (val !== '' && ref.options.length > 0) {
|
newOptions.unshift(noOneOpt.value);
|
||||||
ref.setOptionIndex(-1);
|
|
||||||
ref.moveOptionSelection(1, true);
|
myOptions.value = newOptions;
|
||||||
}
|
},
|
||||||
},
|
(ref) => {
|
||||||
);
|
if (val !== '' && ref.options.length > 0) {
|
||||||
|
ref.setOptionIndex(-1);
|
||||||
|
ref.moveOptionSelection(1, true);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
lastVal.value = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
function nullishToTrue(value) {
|
function nullishToTrue(value) {
|
||||||
return value ?? true;
|
return value ?? true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
|
||||||
|
|
||||||
async function onScroll({ to, direction, from, index }) {
|
async function onScroll({ to, direction, from, index }) {
|
||||||
const lastIndex = myOptions.value.length - 1;
|
const lastIndex = myOptions.value.length - 1;
|
||||||
|
|
||||||
|
@ -366,7 +367,8 @@ function getCaption(opt) {
|
||||||
virtual-scroll-slice-size="options.length"
|
virtual-scroll-slice-size="options.length"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
:input-debounce="useURL ? '300' : '0'"
|
:input-debounce="useURL ? '300' : '0'"
|
||||||
:loading="isLoading"
|
:loading="someIsLoading"
|
||||||
|
:disable="someIsLoading"
|
||||||
@virtual-scroll="onScroll"
|
@virtual-scroll="onScroll"
|
||||||
@keydown="handleKeyDown"
|
@keydown="handleKeyDown"
|
||||||
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
|
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
|
||||||
|
@ -374,7 +376,7 @@ function getCaption(opt) {
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-show="isClearable && value"
|
v-show="isClearable && value != null && value !== ''"
|
||||||
name="close"
|
name="close"
|
||||||
@click="
|
@click="
|
||||||
() => {
|
() => {
|
||||||
|
@ -389,7 +391,7 @@ function getCaption(opt) {
|
||||||
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
||||||
<div v-if="slotName == 'append'">
|
<div v-if="slotName == 'append'">
|
||||||
<QIcon
|
<QIcon
|
||||||
v-show="isClearable && value"
|
v-show="isClearable && value != null && value !== ''"
|
||||||
name="close"
|
name="close"
|
||||||
@click.stop="
|
@click.stop="
|
||||||
() => {
|
() => {
|
||||||
|
@ -414,7 +416,7 @@ function getCaption(opt) {
|
||||||
<QItemLabel>
|
<QItemLabel>
|
||||||
{{ opt[optionLabel] }}
|
{{ opt[optionLabel] }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
<QItemLabel caption v-if="getCaption(opt)">
|
<QItemLabel caption v-if="getCaption(opt) !== false">
|
||||||
{{ `#${getCaption(opt)}` }}
|
{{ `#${getCaption(opt)}` }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
|
|
@ -12,7 +12,9 @@ describe('VnDiscount', () => {
|
||||||
price: 100,
|
price: 100,
|
||||||
quantity: 2,
|
quantity: 2,
|
||||||
discount: 10,
|
discount: 10,
|
||||||
}
|
mana: 10,
|
||||||
|
promise: vi.fn(),
|
||||||
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -41,10 +41,12 @@ describe('VnDms', () => {
|
||||||
companyFk: 2,
|
companyFk: 2,
|
||||||
dmsTypeFk: 3,
|
dmsTypeFk: 3,
|
||||||
description: 'This is a test description',
|
description: 'This is a test description',
|
||||||
files: {
|
files: [
|
||||||
name: 'example.txt',
|
{
|
||||||
content: new Blob(['file content'], { type: 'text/plain' }),
|
name: 'example.txt',
|
||||||
},
|
content: new Blob(['file content'], { type: 'text/plain' }),
|
||||||
|
},
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const expectedBody = {
|
const expectedBody = {
|
||||||
|
@ -83,7 +85,7 @@ describe('VnDms', () => {
|
||||||
it('should map DMS data correctly and add file to FormData', () => {
|
it('should map DMS data correctly and add file to FormData', () => {
|
||||||
const [formData, params] = vm.mapperDms(data);
|
const [formData, params] = vm.mapperDms(data);
|
||||||
|
|
||||||
expect(formData.get('example.txt')).toBe(data.files);
|
expect([formData.get('example.txt')]).toStrictEqual(data.files);
|
||||||
expect(expectedBody).toEqual(params.params);
|
expect(expectedBody).toEqual(params.params);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
|
||||||
|
|
||||||
describe('VnInput', () => {
|
describe('VnInput', () => {
|
||||||
let vm;
|
let vm;
|
||||||
let wrapper;
|
let wrapper;
|
||||||
|
@ -12,25 +11,27 @@ describe('VnInput', () => {
|
||||||
wrapper = createWrapper(VnInput, {
|
wrapper = createWrapper(VnInput, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: value,
|
modelValue: value,
|
||||||
isOutlined, emptyToNull, insertable,
|
isOutlined,
|
||||||
maxlength: 101
|
emptyToNull,
|
||||||
|
insertable,
|
||||||
|
maxlength: 101,
|
||||||
},
|
},
|
||||||
attrs: {
|
attrs: {
|
||||||
label: 'test',
|
label: 'test',
|
||||||
required: true,
|
required: true,
|
||||||
maxlength: 101,
|
maxlength: 101,
|
||||||
maxLength: 10,
|
maxLength: 10,
|
||||||
'max-length':20
|
'max-length': 20,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
input = wrapper.find('[data-cy="test_input"]');
|
input = wrapper.find('[data-cy="test_input"]');
|
||||||
};
|
}
|
||||||
|
|
||||||
describe('value', () => {
|
describe('value', () => {
|
||||||
it('should emit update:modelValue when value changes', async () => {
|
it('should emit update:modelValue when value changes', async () => {
|
||||||
generateWrapper('12345', false, false, true)
|
generateWrapper('12345', false, false, true);
|
||||||
await input.setValue('123');
|
await input.setValue('123');
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
|
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
|
||||||
|
@ -62,7 +63,6 @@ describe('VnInput', () => {
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
|
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
|
||||||
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
|
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
|
||||||
expect(spyhandler).not.toHaveBeenCalled();
|
expect(spyhandler).not.toHaveBeenCalled();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -71,12 +71,12 @@ describe('VnInput', () => {
|
||||||
it.skip('handleKeydown respects insertable behavior', async () => {
|
it.skip('handleKeydown respects insertable behavior', async () => {
|
||||||
const expectedValue = '12345';
|
const expectedValue = '12345';
|
||||||
generateWrapper('1234', false, false, true);
|
generateWrapper('1234', false, false, true);
|
||||||
vm.focus()
|
vm.focus();
|
||||||
await input.trigger('keydown', { key: '5' });
|
await input.trigger('keydown', { key: '5' });
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
|
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
|
||||||
expect(vm.value).toBe( expectedValue);
|
expect(vm.value).toBe(expectedValue);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
let vm;
|
let vm;
|
||||||
let wrapper;
|
let wrapper;
|
||||||
|
|
||||||
function generateWrapper(date, outlined, required) {
|
function generateWrapper(outlined = false, required = false) {
|
||||||
wrapper = createWrapper(VnInputDate, {
|
wrapper = createWrapper(VnInputDate, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: date,
|
modelValue: '2000-12-31T23:00:00.000Z',
|
||||||
|
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
|
||||||
},
|
},
|
||||||
attrs: {
|
attrs: {
|
||||||
isOutlined: outlined,
|
isOutlined: outlined,
|
||||||
required: required
|
required: required,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
};
|
}
|
||||||
|
|
||||||
describe('VnInputDate', () => {
|
describe('VnInputDate', () => {
|
||||||
|
|
||||||
describe('formattedDate', () => {
|
describe('formattedDate', () => {
|
||||||
it('formats a valid date correctly', async () => {
|
it('validateAndCleanInput should remove non-numeric characters', async () => {
|
||||||
generateWrapper('2023-12-25', false, false);
|
generateWrapper();
|
||||||
|
vm.validateAndCleanInput('10a/1s2/2dd0a23');
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.formattedDate).toBe('25/12/2023');
|
expect(vm.inputValue).toBe('10/12/2023');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('updates the model value when a new date is set', async () => {
|
it('manageDate should reverse the date', async () => {
|
||||||
const input = wrapper.find('input');
|
generateWrapper();
|
||||||
await input.setValue('31/12/2023');
|
vm.manageDate('10/12/2023');
|
||||||
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
await vm.$nextTick();
|
||||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
expect(vm.inputValue).toBe('2023/12/10');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not update the model value when an invalid date is set', async () => {
|
it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
|
||||||
const input = wrapper.find('input');
|
const input = wrapper.find('input');
|
||||||
await input.setValue('invalid-date');
|
await input.setValue('25.12/2002');
|
||||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
await vm.$nextTick();
|
||||||
|
await vm.formatDate();
|
||||||
|
expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should format the date correctly when a valid date is entered with short year', async () => {
|
||||||
|
const input = wrapper.find('input');
|
||||||
|
await input.setValue('31.12-23');
|
||||||
|
await vm.$nextTick();
|
||||||
|
await vm.formatDate();
|
||||||
|
expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should format the date correctly when a valid date is entered without year', async () => {
|
||||||
|
const input = wrapper.find('input');
|
||||||
|
await input.setValue('12.03');
|
||||||
|
await vm.$nextTick();
|
||||||
|
await vm.formatDate();
|
||||||
|
expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('styleAttrs', () => {
|
describe('styleAttrs', () => {
|
||||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||||
generateWrapper('2023-12-25', false, false);
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.styleAttrs).toEqual({});
|
expect(vm.styleAttrs).toEqual({});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should set styleAttrs when isOutlined is true', async () => {
|
it('should set styleAttrs when isOutlined is true', async () => {
|
||||||
generateWrapper('2023-12-25', true, false);
|
generateWrapper(true, false);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.styleAttrs.outlined).toBe(true);
|
expect(vm.styleAttrs.outlined).toBe(true);
|
||||||
});
|
});
|
||||||
|
@ -58,13 +77,13 @@ describe('VnInputDate', () => {
|
||||||
|
|
||||||
describe('required', () => {
|
describe('required', () => {
|
||||||
it('should not applies required class when isRequired is false', async () => {
|
it('should not applies required class when isRequired is false', async () => {
|
||||||
generateWrapper('2023-12-25', false, false);
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
|
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should applies required class when isRequired is true', async () => {
|
it('should applies required class when isRequired is true', async () => {
|
||||||
generateWrapper('2023-12-25', false, true);
|
generateWrapper(false, true);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
|
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
|
||||||
});
|
});
|
||||||
|
|
|
@ -33,7 +33,7 @@ describe('VnInputDateTime', () => {
|
||||||
it('handles null date value', async () => {
|
it('handles null date value', async () => {
|
||||||
generateWrapper(null, false, true);
|
generateWrapper(null, false, true);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.selectedDate).toBeInstanceOf(Date);
|
expect(vm.selectedDate).not.toBe(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('updates the model value when a new datetime is set', async () => {
|
it('updates the model value when a new datetime is set', async () => {
|
||||||
|
|
|
@ -90,8 +90,10 @@ describe('VnLog', () => {
|
||||||
|
|
||||||
vm = createWrapper(VnLog, {
|
vm = createWrapper(VnLog, {
|
||||||
global: {
|
global: {
|
||||||
stubs: [],
|
stubs: ['FetchData', 'vue-i18n'],
|
||||||
mocks: {},
|
mocks: {
|
||||||
|
fetch: vi.fn(),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
propsData: {
|
propsData: {
|
||||||
model: 'Claim',
|
model: 'Claim',
|
||||||
|
|
|
@ -26,7 +26,7 @@ describe('VnNotes', () => {
|
||||||
) {
|
) {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
||||||
wrapper = createWrapper(VnNotes, {
|
wrapper = createWrapper(VnNotes, {
|
||||||
propsData: options,
|
propsData: { ...defaultOptions, ...options },
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
|
@ -44,8 +44,7 @@ onBeforeMount(async () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// It enables to load data only once if the module is the same as the dataKey
|
// It enables to load data only once if the module is the same as the dataKey
|
||||||
if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
|
if (!isSameDataKey.value || !route.params.id) await getData();
|
||||||
await getData();
|
|
||||||
watch(
|
watch(
|
||||||
() => [$props.url, $props.filter],
|
() => [$props.url, $props.filter],
|
||||||
async () => {
|
async () => {
|
||||||
|
|
|
@ -89,24 +89,26 @@ function cancel() {
|
||||||
<slot name="customHTML"></slot>
|
<slot name="customHTML"></slot>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
<QBtn
|
<slot name="actions" :actions="{ confirm, cancel }">
|
||||||
:label="t('globals.cancel')"
|
<QBtn
|
||||||
color="primary"
|
:label="t('globals.cancel')"
|
||||||
:disable="isLoading"
|
color="primary"
|
||||||
flat
|
:disable="isLoading"
|
||||||
@click="cancel()"
|
flat
|
||||||
data-cy="VnConfirm_cancel"
|
@click="cancel()"
|
||||||
/>
|
data-cy="VnConfirm_cancel"
|
||||||
<QBtn
|
/>
|
||||||
:label="t('globals.confirm')"
|
<QBtn
|
||||||
:title="t('globals.confirm')"
|
:label="t('globals.confirm')"
|
||||||
color="primary"
|
:title="t('globals.confirm')"
|
||||||
:loading="isLoading"
|
color="primary"
|
||||||
@click="confirm()"
|
:loading="isLoading"
|
||||||
unelevated
|
@click="confirm()"
|
||||||
autofocus
|
unelevated
|
||||||
data-cy="VnConfirm_confirm"
|
autofocus
|
||||||
/>
|
data-cy="VnConfirm_confirm"
|
||||||
|
/>
|
||||||
|
</slot>
|
||||||
</QCardActions>
|
</QCardActions>
|
||||||
</QCard>
|
</QCard>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
|
import { useAttrs } from 'vue';
|
||||||
|
|
||||||
|
const attrs = useAttrs();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -67,7 +69,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
disableInfiniteScroll: {
|
disableInfiniteScroll: {
|
||||||
|
@ -75,7 +77,7 @@ const props = defineProps({
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
mapKey: {
|
mapKey: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
keyData: {
|
keyData: {
|
||||||
|
@ -220,7 +222,7 @@ defineExpose({
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="full-width">
|
<div class="full-width" v-bind="attrs">
|
||||||
<div
|
<div
|
||||||
v-if="!store.data && !store.data?.length && !isLoading"
|
v-if="!store.data && !store.data?.length && !isLoading"
|
||||||
class="info-row q-pa-md text-center"
|
class="info-row q-pa-md text-center"
|
||||||
|
|
|
@ -46,7 +46,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
order: {
|
order: {
|
||||||
type: String,
|
type: [String, Array],
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
|
|
@ -23,10 +23,15 @@ describe('CardSummary', () => {
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
wrapper = createWrapper(CardSummary, {
|
wrapper = createWrapper(CardSummary, {
|
||||||
|
global: {
|
||||||
|
mocks: {
|
||||||
|
validate: vi.fn(),
|
||||||
|
},
|
||||||
|
},
|
||||||
propsData: {
|
propsData: {
|
||||||
dataKey: 'cardSummaryKey',
|
dataKey: 'cardSummaryKey',
|
||||||
url: 'cardSummaryUrl',
|
url: 'cardSummaryUrl',
|
||||||
filter: 'cardFilter',
|
filter: { key: 'cardFilter' },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
@ -50,7 +55,7 @@ describe('CardSummary', () => {
|
||||||
|
|
||||||
it('should set correct props to the store', () => {
|
it('should set correct props to the store', () => {
|
||||||
expect(vm.store.url).toEqual('cardSummaryUrl');
|
expect(vm.store.url).toEqual('cardSummaryUrl');
|
||||||
expect(vm.store.filter).toEqual('cardFilter');
|
expect(vm.store.filter).toEqual({ key: 'cardFilter' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should respond to prop changes and refetch data', async () => {
|
it('should respond to prop changes and refetch data', async () => {
|
||||||
|
|
|
@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let applyFilterSpy;
|
let applyFilterSpy;
|
||||||
const searchText = 'Bolas de madera';
|
const searchText = 'Bolas de madera';
|
||||||
const userParams = {staticKey: 'staticValue'};
|
const userParams = { staticKey: 'staticValue' };
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
wrapper = createWrapper(VnSearchbar, {
|
wrapper = createWrapper(VnSearchbar, {
|
||||||
|
@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
|
||||||
|
|
||||||
vm.searchText = searchText;
|
vm.searchText = searchText;
|
||||||
vm.arrayData.store.userParams = userParams;
|
vm.arrayData.store.userParams = userParams;
|
||||||
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
|
applyFilterSpy = vi
|
||||||
|
.spyOn(vm.arrayData, 'applyFilter')
|
||||||
|
.mockImplementation(() => {});
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('search resets pagination and applies filter', async () => {
|
it('search resets pagination and applies filter', async () => {
|
||||||
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
|
const resetPaginationSpy = vi
|
||||||
|
.spyOn(vm.arrayData, 'resetPagination')
|
||||||
|
.mockImplementation(() => {});
|
||||||
await vm.search();
|
await vm.search();
|
||||||
|
|
||||||
expect(resetPaginationSpy).toHaveBeenCalled();
|
expect(resetPaginationSpy).toHaveBeenCalled();
|
||||||
|
@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
|
||||||
|
|
||||||
expect(applyFilterSpy).toHaveBeenCalledWith({
|
expect(applyFilterSpy).toHaveBeenCalledWith({
|
||||||
params: { staticKey: 'staticValue', search: searchText },
|
params: { staticKey: 'staticValue', search: searchText },
|
||||||
filter: {skip: 0},
|
filter: { skip: 0 },
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnSms from 'src/components/ui/VnSms.vue';
|
import VnSms from 'src/components/ui/VnSms.vue';
|
||||||
|
|
||||||
|
@ -12,6 +11,9 @@ describe('VnSms', () => {
|
||||||
stubs: ['VnPaginate'],
|
stubs: ['VnPaginate'],
|
||||||
mocks: {},
|
mocks: {},
|
||||||
},
|
},
|
||||||
|
propsData: {
|
||||||
|
url: 'SmsUrl',
|
||||||
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import * as vueRouter from 'vue-router';
|
import * as vueRouter from 'vue-router';
|
||||||
import { setActivePinia, createPinia } from 'pinia';
|
import { setActivePinia, createPinia } from 'pinia';
|
||||||
|
import { defineComponent, h } from 'vue';
|
||||||
|
import { mount } from '@vue/test-utils';
|
||||||
|
|
||||||
describe('useArrayData', () => {
|
describe('useArrayData', () => {
|
||||||
const filter = '{"limit":20,"skip":0}';
|
const filter = '{"limit":20,"skip":0}';
|
||||||
|
@ -43,7 +45,7 @@ describe('useArrayData', () => {
|
||||||
it('should fetch and replace url with new params', async () => {
|
it('should fetch and replace url with new params', async () => {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
url: 'mockUrl',
|
url: 'mockUrl',
|
||||||
searchUrl: 'params',
|
searchUrl: 'params',
|
||||||
});
|
});
|
||||||
|
@ -72,7 +74,7 @@ describe('useArrayData', () => {
|
||||||
data: [{ id: 1 }],
|
data: [{ id: 1 }],
|
||||||
});
|
});
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
url: 'mockUrl',
|
url: 'mockUrl',
|
||||||
navigate: {},
|
navigate: {},
|
||||||
});
|
});
|
||||||
|
@ -94,7 +96,7 @@ describe('useArrayData', () => {
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
url: 'mockUrl',
|
url: 'mockUrl',
|
||||||
oneRecord: true,
|
oneRecord: true,
|
||||||
});
|
});
|
||||||
|
@ -107,3 +109,17 @@ describe('useArrayData', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function mountArrayData(...args) {
|
||||||
|
let arrayData;
|
||||||
|
|
||||||
|
const TestComponent = defineComponent({
|
||||||
|
setup() {
|
||||||
|
arrayData = useArrayData(...args);
|
||||||
|
return () => h('div');
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const asd = mount(TestComponent);
|
||||||
|
return arrayData;
|
||||||
|
}
|
||||||
|
|
|
@ -64,88 +64,84 @@ describe('session', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe(
|
describe('login', () => {
|
||||||
'login',
|
const expectedUser = {
|
||||||
() => {
|
id: 999,
|
||||||
const expectedUser = {
|
name: `T'Challa`,
|
||||||
id: 999,
|
nickname: 'Black Panther',
|
||||||
name: `T'Challa`,
|
lang: 'en',
|
||||||
nickname: 'Black Panther',
|
userConfig: {
|
||||||
lang: 'en',
|
darkMode: false,
|
||||||
userConfig: {
|
},
|
||||||
darkMode: false,
|
worker: { department: { departmentFk: 155 } },
|
||||||
|
};
|
||||||
|
const rolesData = [
|
||||||
|
{
|
||||||
|
role: {
|
||||||
|
name: 'salesPerson',
|
||||||
},
|
},
|
||||||
worker: { department: { departmentFk: 155 } },
|
},
|
||||||
};
|
{
|
||||||
const rolesData = [
|
role: {
|
||||||
{
|
name: 'admin',
|
||||||
role: {
|
|
||||||
name: 'salesPerson',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
},
|
||||||
role: {
|
];
|
||||||
name: 'admin',
|
beforeEach(() => {
|
||||||
},
|
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
||||||
},
|
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
|
||||||
];
|
return Promise.resolve({
|
||||||
beforeEach(() => {
|
data: { roles: rolesData, user: expectedUser },
|
||||||
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
|
||||||
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
|
|
||||||
return Promise.resolve({
|
|
||||||
data: { roles: rolesData, user: expectedUser },
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('should fetch the user roles and then set token in the sessionStorage', async () => {
|
it('should fetch the user roles and then set token in the sessionStorage', async () => {
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
const expectedToken = 'mySessionToken';
|
const expectedToken = 'mySessionToken';
|
||||||
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
||||||
const keepLogin = false;
|
const keepLogin = false;
|
||||||
|
|
||||||
await session.login({
|
await session.login({
|
||||||
token: expectedToken,
|
token: expectedToken,
|
||||||
tokenMultimedia: expectedTokenMultimedia,
|
tokenMultimedia: expectedTokenMultimedia,
|
||||||
keepLogin,
|
keepLogin,
|
||||||
});
|
|
||||||
|
|
||||||
const roles = state.getRoles();
|
|
||||||
const localToken = localStorage.getItem('token');
|
|
||||||
const sessionToken = sessionStorage.getItem('token');
|
|
||||||
|
|
||||||
expect(roles.value).toEqual(expectedRoles);
|
|
||||||
expect(localToken).toBeNull();
|
|
||||||
expect(sessionToken).toEqual(expectedToken);
|
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fetch the user roles and then set token in the localStorage', async () => {
|
const roles = state.getRoles();
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
const localToken = localStorage.getItem('token');
|
||||||
const expectedToken = 'myLocalToken';
|
const sessionToken = sessionStorage.getItem('token');
|
||||||
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
|
|
||||||
const keepLogin = true;
|
|
||||||
|
|
||||||
await session.login({
|
expect(roles.value).toEqual(expectedRoles);
|
||||||
token: expectedToken,
|
expect(localToken).toBeNull();
|
||||||
tokenMultimedia: expectedTokenMultimedia,
|
expect(sessionToken).toEqual(expectedToken);
|
||||||
keepLogin,
|
|
||||||
});
|
|
||||||
|
|
||||||
const roles = state.getRoles();
|
await session.destroy(); // this clears token and user for any other test
|
||||||
const localToken = localStorage.getItem('token');
|
});
|
||||||
const sessionToken = sessionStorage.getItem('token');
|
|
||||||
|
|
||||||
expect(roles.value).toEqual(expectedRoles);
|
it('should fetch the user roles and then set token in the localStorage', async () => {
|
||||||
expect(localToken).toEqual(expectedToken);
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
expect(sessionToken).toBeNull();
|
const expectedToken = 'myLocalToken';
|
||||||
|
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
|
||||||
|
const keepLogin = true;
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
await session.login({
|
||||||
|
token: expectedToken,
|
||||||
|
tokenMultimedia: expectedTokenMultimedia,
|
||||||
|
keepLogin,
|
||||||
});
|
});
|
||||||
},
|
|
||||||
{},
|
const roles = state.getRoles();
|
||||||
);
|
const localToken = localStorage.getItem('token');
|
||||||
|
const sessionToken = sessionStorage.getItem('token');
|
||||||
|
|
||||||
|
expect(roles.value).toEqual(expectedRoles);
|
||||||
|
expect(localToken).toEqual(expectedToken);
|
||||||
|
expect(sessionToken).toBeNull();
|
||||||
|
|
||||||
|
await session.destroy(); // this clears token and user for any other test
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe('RenewToken', () => {
|
describe('RenewToken', () => {
|
||||||
const expectedToken = 'myToken';
|
const expectedToken = 'myToken';
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { onMounted, computed } from 'vue';
|
import { onMounted, computed, ref } from 'vue';
|
||||||
import { useRouter, useRoute } from 'vue-router';
|
import { useRouter, useRoute } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { useArrayDataStore } from 'stores/useArrayDataStore';
|
import { useArrayDataStore } from 'stores/useArrayDataStore';
|
||||||
|
@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const totalRows = computed(() => (store.data && store.data.length) || 0);
|
const totalRows = computed(() => (store.data && store.data.length) || 0);
|
||||||
const isLoading = computed(() => store.isLoading || false);
|
const isLoading = ref(store.isLoading || false);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fetch,
|
fetch,
|
||||||
|
|
|
@ -162,6 +162,9 @@ globals:
|
||||||
department: Department
|
department: Department
|
||||||
noData: No data available
|
noData: No data available
|
||||||
vehicle: Vehicle
|
vehicle: Vehicle
|
||||||
|
selectDocumentId: Select document id
|
||||||
|
document: Document
|
||||||
|
import: Import from existing
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Login
|
logIn: Login
|
||||||
addressEdit: Update address
|
addressEdit: Update address
|
||||||
|
@ -343,6 +346,7 @@ globals:
|
||||||
parking: Parking
|
parking: Parking
|
||||||
vehicleList: Vehicles
|
vehicleList: Vehicles
|
||||||
vehicle: Vehicle
|
vehicle: Vehicle
|
||||||
|
entryPreAccount: Pre-account
|
||||||
management: Worker management
|
management: Worker management
|
||||||
unsavedPopup:
|
unsavedPopup:
|
||||||
title: Unsaved changes will be lost
|
title: Unsaved changes will be lost
|
||||||
|
|
|
@ -166,6 +166,9 @@ globals:
|
||||||
noData: Datos no disponibles
|
noData: Datos no disponibles
|
||||||
department: Departamento
|
department: Departamento
|
||||||
vehicle: Vehículo
|
vehicle: Vehículo
|
||||||
|
selectDocumentId: Seleccione el id de gestión documental
|
||||||
|
document: Documento
|
||||||
|
import: Importar desde existente
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Inicio de sesión
|
logIn: Inicio de sesión
|
||||||
addressEdit: Modificar consignatario
|
addressEdit: Modificar consignatario
|
||||||
|
@ -346,6 +349,7 @@ globals:
|
||||||
parking: Parking
|
parking: Parking
|
||||||
vehicleList: Vehículos
|
vehicleList: Vehículos
|
||||||
vehicle: Vehículo
|
vehicle: Vehículo
|
||||||
|
entryPreAccount: Precontabilizar
|
||||||
management: Gestión de trabajadores
|
management: Gestión de trabajadores
|
||||||
unsavedPopup:
|
unsavedPopup:
|
||||||
title: Los cambios que no haya guardado se perderán
|
title: Los cambios que no haya guardado se perderán
|
||||||
|
|
|
@ -23,7 +23,7 @@ const claimDms = ref([
|
||||||
]);
|
]);
|
||||||
const client = ref({});
|
const client = ref({});
|
||||||
const inputFile = ref();
|
const inputFile = ref();
|
||||||
const files = ref({});
|
const files = ref([]);
|
||||||
const spinnerRef = ref();
|
const spinnerRef = ref();
|
||||||
const claimDmsRef = ref();
|
const claimDmsRef = ref();
|
||||||
const dmsType = ref({});
|
const dmsType = ref({});
|
||||||
|
@ -255,9 +255,8 @@ function onDrag() {
|
||||||
icon="add"
|
icon="add"
|
||||||
color="primary"
|
color="primary"
|
||||||
>
|
>
|
||||||
<QInput
|
<QFile
|
||||||
ref="inputFile"
|
ref="inputFile"
|
||||||
type="file"
|
|
||||||
style="display: none"
|
style="display: none"
|
||||||
multiple
|
multiple
|
||||||
v-model="files"
|
v-model="files"
|
||||||
|
|
|
@ -52,7 +52,7 @@ describe('ClaimLines', () => {
|
||||||
expectedData,
|
expectedData,
|
||||||
{
|
{
|
||||||
signal: canceller.signal,
|
signal: canceller.signal,
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -69,7 +69,7 @@ describe('ClaimLines', () => {
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
message: 'Discount updated',
|
message: 'Discount updated',
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
|
||||||
fetch: vi.fn(),
|
fetch: vi.fn(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
propsData: {
|
||||||
|
ticketId: 1,
|
||||||
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
message: 'Lines added to claim',
|
message: 'Lines added to claim',
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
expect(vm.canceller).toEqual(null);
|
expect(vm.canceller).toEqual(null);
|
||||||
});
|
});
|
||||||
|
|
|
@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
|
||||||
await vm.deleteDms({ index: 0 });
|
await vm.deleteDms({ index: 0 });
|
||||||
|
|
||||||
expect(axios.post).toHaveBeenCalledWith(
|
expect(axios.post).toHaveBeenCalledWith(
|
||||||
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
|
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
|
||||||
);
|
);
|
||||||
expect(vm.quasar.notify).toHaveBeenCalledWith(
|
expect(vm.quasar.notify).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({ type: 'positive' })
|
expect.objectContaining({ type: 'positive' }),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
|
||||||
data: { index: 1 },
|
data: { index: 1 },
|
||||||
promise: vm.deleteDms,
|
promise: vm.deleteDms,
|
||||||
},
|
},
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
|
||||||
new FormData(),
|
new FormData(),
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
params: expect.objectContaining({ hasFile: false }),
|
params: expect.objectContaining({ hasFile: false }),
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
expect(vm.quasar.notify).toHaveBeenCalledWith(
|
expect(vm.quasar.notify).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({ type: 'positive' })
|
expect.objectContaining({ type: 'positive' }),
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();
|
expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();
|
||||||
|
|
|
@ -39,7 +39,7 @@ const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const entityId = computed(() => {
|
const entityId = computed(() => {
|
||||||
return $props.id || route.params.id;
|
return Number($props.id || route.params.id);
|
||||||
});
|
});
|
||||||
|
|
||||||
const data = ref(useCardDescription());
|
const data = ref(useCardDescription());
|
||||||
|
|
|
@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('client.socialName')"
|
:rules="validate('client.socialName')"
|
||||||
clearable
|
clearable
|
||||||
uppercase="true"
|
:uppercase="true"
|
||||||
v-model="data.socialName"
|
v-model="data.socialName"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
|
|
|
@ -25,7 +25,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const entityId = computed(() => $props.id || route.params.id);
|
const entityId = computed(() => Number($props.id || route.params.id));
|
||||||
const customer = computed(() => summary.value.entity);
|
const customer = computed(() => summary.value.entity);
|
||||||
const summary = ref();
|
const summary = ref();
|
||||||
const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
|
const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
|
||||||
|
|
|
@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
url="Departments"
|
url="Departments"
|
||||||
no-one="true"
|
:no-one="true"
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
|
|
@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
message: 'Payment confirmed',
|
message: 'Payment confirmed',
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
|
||||||
const initialData = reactive({});
|
const initialData = reactive({});
|
||||||
const entityId = computed(() => route.params.id);
|
const entityId = computed(() => route.params.id);
|
||||||
const customer = computed(() => useArrayData('Customer').store?.data);
|
const customer = computed(() => useArrayData('Customer').store?.data);
|
||||||
const filterEmailUsers = { where: { userFk: user.value.id } };
|
|
||||||
const filterClientsAddresses = {
|
const filterClientsAddresses = {
|
||||||
include: [
|
include: [
|
||||||
{ relation: 'province', scope: { fields: ['name'] } },
|
{ relation: 'province', scope: { fields: ['name'] } },
|
||||||
|
@ -73,7 +72,7 @@ onBeforeMount(async () => {
|
||||||
|
|
||||||
const setEmailUser = (data) => {
|
const setEmailUser = (data) => {
|
||||||
optionsEmailUsers.value = data;
|
optionsEmailUsers.value = data;
|
||||||
initialData.replyTo = data[0]?.email;
|
initialData.replyTo = data[0]?.notificationEmail;
|
||||||
};
|
};
|
||||||
|
|
||||||
const setClientsAddresses = (data) => {
|
const setClientsAddresses = (data) => {
|
||||||
|
@ -182,10 +181,12 @@ const toCustomerSamples = () => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<FetchData
|
||||||
:filter="filterEmailUsers"
|
:filter="{
|
||||||
|
where: { id: customer.departmentFk },
|
||||||
|
}"
|
||||||
@on-fetch="setEmailUser"
|
@on-fetch="setEmailUser"
|
||||||
auto-load
|
auto-load
|
||||||
url="EmailUsers"
|
url="Departments"
|
||||||
/>
|
/>
|
||||||
<FetchData
|
<FetchData
|
||||||
:filter="filterClientsAddresses"
|
:filter="filterClientsAddresses"
|
||||||
|
|
|
@ -0,0 +1,477 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, computed, markRaw, useTemplateRef, onBeforeMount, watch } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { toDate, toCurrency } from 'src/filters';
|
||||||
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
|
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
|
import FetchData from 'src/components/FetchData.vue';
|
||||||
|
import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
|
||||||
|
import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
|
||||||
|
import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
|
||||||
|
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
|
||||||
|
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
|
||||||
|
import axios from 'axios';
|
||||||
|
import useNotify from 'src/composables/useNotify';
|
||||||
|
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||||
|
import VnDms from 'src/components/common/VnDms.vue';
|
||||||
|
import { useState } from 'src/composables/useState';
|
||||||
|
import { useQuasar } from 'quasar';
|
||||||
|
import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
|
||||||
|
import { useStateStore } from 'src/stores/useStateStore';
|
||||||
|
import { downloadFile } from 'src/composables/downloadFile';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const quasar = useQuasar();
|
||||||
|
const { notify } = useNotify();
|
||||||
|
const user = useState().getUser();
|
||||||
|
const stateStore = useStateStore();
|
||||||
|
const updateDialog = ref();
|
||||||
|
const uploadDialog = ref();
|
||||||
|
let maxDays;
|
||||||
|
let defaultDays;
|
||||||
|
const dataKey = 'entryPreaccountingFilter';
|
||||||
|
const url = 'Entries/preAccountingFilter';
|
||||||
|
const arrayData = useArrayData(dataKey);
|
||||||
|
const daysAgo = ref();
|
||||||
|
const isBooked = ref();
|
||||||
|
const dmsData = ref();
|
||||||
|
const table = useTemplateRef('table');
|
||||||
|
const companies = ref([]);
|
||||||
|
const countries = ref([]);
|
||||||
|
const entryTypes = ref([]);
|
||||||
|
const supplierFiscalTypes = ref([]);
|
||||||
|
const warehouses = ref([]);
|
||||||
|
const defaultDmsDescription = ref();
|
||||||
|
const dmsTypeId = ref();
|
||||||
|
const selectedRows = ref([]);
|
||||||
|
const totalAmount = ref();
|
||||||
|
const totalSelectedAmount = computed(() => {
|
||||||
|
if (!selectedRows.value.length) return 0;
|
||||||
|
return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
|
||||||
|
});
|
||||||
|
let supplierRef;
|
||||||
|
let dmsFk;
|
||||||
|
const columns = computed(() => [
|
||||||
|
{
|
||||||
|
name: 'id',
|
||||||
|
label: t('entry.preAccount.id'),
|
||||||
|
isId: true,
|
||||||
|
chip: {
|
||||||
|
condition: () => true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'invoiceNumber',
|
||||||
|
label: t('entry.preAccount.invoiceNumber'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'company',
|
||||||
|
label: t('globals.company'),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'select',
|
||||||
|
name: 'companyFk',
|
||||||
|
optionLabel: 'code',
|
||||||
|
options: companies.value,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'warehouse',
|
||||||
|
label: t('globals.warehouse'),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'select',
|
||||||
|
name: 'warehouseInFk',
|
||||||
|
options: warehouses.value,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'gestDocFk',
|
||||||
|
label: t('entry.preAccount.gestDocFk'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'dmsType',
|
||||||
|
label: t('entry.preAccount.dmsType'),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'select',
|
||||||
|
label: null,
|
||||||
|
name: 'dmsTypeFk',
|
||||||
|
url: 'DmsTypes',
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'reference',
|
||||||
|
label: t('entry.preAccount.reference'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'shipped',
|
||||||
|
label: t('entry.preAccount.shipped'),
|
||||||
|
format: ({ shipped }, dashIfEmpty) => dashIfEmpty(toDate(shipped)),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'date',
|
||||||
|
name: 'shipped',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'landed',
|
||||||
|
label: t('entry.preAccount.landed'),
|
||||||
|
format: ({ landed }, dashIfEmpty) => dashIfEmpty(toDate(landed)),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'date',
|
||||||
|
name: 'landed',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'invoiceInFk',
|
||||||
|
label: t('entry.preAccount.invoiceInFk'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'supplier',
|
||||||
|
label: t('globals.supplier'),
|
||||||
|
format: (row) => row.supplier,
|
||||||
|
columnFilter: {
|
||||||
|
component: markRaw(VnSelectSupplier),
|
||||||
|
label: null,
|
||||||
|
name: 'supplierFk',
|
||||||
|
class: 'fit',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'country',
|
||||||
|
label: t('globals.country'),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'select',
|
||||||
|
name: 'countryFk',
|
||||||
|
options: countries.value,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'description',
|
||||||
|
label: t('entry.preAccount.entryType'),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'select',
|
||||||
|
label: null,
|
||||||
|
name: 'typeFk',
|
||||||
|
options: entryTypes.value,
|
||||||
|
optionLabel: 'description',
|
||||||
|
optionValue: 'code',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'payDem',
|
||||||
|
label: t('entry.preAccount.payDem'),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'number',
|
||||||
|
name: 'payDem',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'fiscalCode',
|
||||||
|
label: t('entry.preAccount.fiscalCode'),
|
||||||
|
format: ({ fiscalCode }) => t(fiscalCode),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'select',
|
||||||
|
name: 'fiscalCode',
|
||||||
|
options: supplierFiscalTypes.value,
|
||||||
|
optionLabel: 'locale',
|
||||||
|
optionValue: 'code',
|
||||||
|
sortBy: 'code',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'amount',
|
||||||
|
label: t('globals.amount'),
|
||||||
|
format: ({ amount }) => toCurrency(amount),
|
||||||
|
columnFilter: {
|
||||||
|
component: 'number',
|
||||||
|
name: 'amount',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'isAgricultural',
|
||||||
|
label: t('entry.preAccount.isAgricultural'),
|
||||||
|
component: 'checkbox',
|
||||||
|
isEditable: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'isBooked',
|
||||||
|
label: t('entry.preAccount.isBooked'),
|
||||||
|
component: 'checkbox',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'isReceived',
|
||||||
|
label: t('entry.preAccount.isReceived'),
|
||||||
|
component: 'checkbox',
|
||||||
|
isEditable: false,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
onBeforeMount(async () => {
|
||||||
|
const { data } = await axios.get('EntryConfigs/findOne', {
|
||||||
|
params: { filter: JSON.stringify({ fields: ['maxDays', 'defaultDays'] }) },
|
||||||
|
});
|
||||||
|
maxDays = data.maxDays;
|
||||||
|
defaultDays = data.defaultDays;
|
||||||
|
daysAgo.value = arrayData.store.userParams.daysAgo || defaultDays;
|
||||||
|
isBooked.value = arrayData.store.userParams.isBooked || false;
|
||||||
|
stateStore.leftDrawer = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
watch(selectedRows, (nVal, oVal) => {
|
||||||
|
const lastRow = nVal.at(-1);
|
||||||
|
if (lastRow?.isBooked) selectedRows.value.pop();
|
||||||
|
if (nVal.length > oVal.length && lastRow.invoiceInFk)
|
||||||
|
quasar.dialog({
|
||||||
|
component: VnConfirm,
|
||||||
|
componentProps: { title: t('entry.preAccount.hasInvoice') },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function filterByDaysAgo(val) {
|
||||||
|
if (!val) val = defaultDays;
|
||||||
|
else if (val > maxDays) val = maxDays;
|
||||||
|
daysAgo.value = val;
|
||||||
|
arrayData.store.userParams.daysAgo = daysAgo.value;
|
||||||
|
table.value.reload();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function preAccount() {
|
||||||
|
const entries = selectedRows.value;
|
||||||
|
const { companyFk, isAgricultural, landed } = entries.at(0);
|
||||||
|
try {
|
||||||
|
dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
|
||||||
|
if (isAgricultural) {
|
||||||
|
const year = new Date(landed).getFullYear();
|
||||||
|
supplierRef = (
|
||||||
|
await axios.get('InvoiceIns/getMaxRef', { params: { companyFk, year } })
|
||||||
|
).data;
|
||||||
|
return createInvoice();
|
||||||
|
} else if (dmsFk) {
|
||||||
|
supplierRef = (
|
||||||
|
await axios.get(`Dms/${dmsFk}`, {
|
||||||
|
params: { filter: JSON.stringify({ fields: ['reference'] }) },
|
||||||
|
})
|
||||||
|
).data?.reference;
|
||||||
|
updateDialog.value.show();
|
||||||
|
} else {
|
||||||
|
uploadFile();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function updateFile() {
|
||||||
|
await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId: dmsTypeId.value });
|
||||||
|
await createInvoice();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function uploadFile() {
|
||||||
|
const firstSelectedEntry = selectedRows.value.at(0);
|
||||||
|
const { supplier, companyFk, invoiceNumber } = firstSelectedEntry;
|
||||||
|
dmsData.value = {
|
||||||
|
dmsTypeFk: dmsTypeId.value,
|
||||||
|
warehouseFk: user.value.warehouseFk,
|
||||||
|
companyFk: companyFk,
|
||||||
|
description: supplier + defaultDmsDescription.value + invoiceNumber,
|
||||||
|
hasFile: false,
|
||||||
|
};
|
||||||
|
uploadDialog.value.show();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function afterUploadFile({ reference }, res) {
|
||||||
|
supplierRef = reference;
|
||||||
|
dmsFk = res.data[0].id;
|
||||||
|
await createInvoice();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createInvoice() {
|
||||||
|
try {
|
||||||
|
await axios.post(`Entries/addInvoiceIn`, {
|
||||||
|
ids: selectedRows.value.map((entry) => entry.id),
|
||||||
|
supplierRef,
|
||||||
|
dmsFk,
|
||||||
|
});
|
||||||
|
notify(t('entry.preAccount.success'), 'positive');
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
} finally {
|
||||||
|
supplierRef = null;
|
||||||
|
dmsFk = undefined;
|
||||||
|
selectedRows.value.length = 0;
|
||||||
|
table.value.reload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="Countries"
|
||||||
|
:filter="{ fields: ['id', 'name'] }"
|
||||||
|
@on-fetch="(data) => (countries = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="Companies"
|
||||||
|
:filter="{ fields: ['id', 'code'] }"
|
||||||
|
@on-fetch="(data) => (companies = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="Warehouses"
|
||||||
|
:filter="{ fields: ['id', 'name'] }"
|
||||||
|
@on-fetch="(data) => (warehouses = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="EntryTypes"
|
||||||
|
:filter="{ fields: ['code', 'description'] }"
|
||||||
|
@on-fetch="(data) => (entryTypes = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="supplierFiscalTypes"
|
||||||
|
:filter="{ fields: ['code'] }"
|
||||||
|
@on-fetch="
|
||||||
|
(data) =>
|
||||||
|
(supplierFiscalTypes = data.map((x) => ({ locale: t(x.code), ...x })))
|
||||||
|
"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="InvoiceInConfigs/findOne"
|
||||||
|
:filter="{ fields: ['defaultDmsDescription'] }"
|
||||||
|
@on-fetch="(data) => (defaultDmsDescription = data?.defaultDmsDescription)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="DmsTypes/findOne"
|
||||||
|
:filter="{ fields: ['id'] }"
|
||||||
|
:where="{ code: 'invoiceIn' }"
|
||||||
|
@on-fetch="(data) => (dmsTypeId = data?.id)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<VnSearchbar
|
||||||
|
:data-key
|
||||||
|
:url
|
||||||
|
:label="t('entry.preAccount.search')"
|
||||||
|
:info="t('entry.preAccount.searchInfo')"
|
||||||
|
:search-remove-params="false"
|
||||||
|
/>
|
||||||
|
<VnTable
|
||||||
|
v-model:selected="selectedRows"
|
||||||
|
:data-key
|
||||||
|
:columns
|
||||||
|
:url
|
||||||
|
:search-url="dataKey"
|
||||||
|
ref="table"
|
||||||
|
:disable-option="{ card: true }"
|
||||||
|
redirect="Entry"
|
||||||
|
:order="['landed DESC']"
|
||||||
|
:right-search="false"
|
||||||
|
:user-params="{ daysAgo, isBooked }"
|
||||||
|
:row-click="false"
|
||||||
|
:table="{ selection: 'multiple' }"
|
||||||
|
:limit="0"
|
||||||
|
:footer="true"
|
||||||
|
@on-fetch="
|
||||||
|
(data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
|
||||||
|
"
|
||||||
|
auto-load
|
||||||
|
>
|
||||||
|
<template #top-left>
|
||||||
|
<QBtn
|
||||||
|
data-cy="preAccount_btn"
|
||||||
|
icon="account_balance"
|
||||||
|
color="primary"
|
||||||
|
class="q-mr-sm"
|
||||||
|
:disable="!selectedRows.length"
|
||||||
|
@click="preAccount"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('entry.preAccount.btn') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
<VnInputNumber
|
||||||
|
v-model="daysAgo"
|
||||||
|
:label="$t('globals.daysAgo')"
|
||||||
|
dense
|
||||||
|
:step="1"
|
||||||
|
:decimal-places="0"
|
||||||
|
@update:model-value="filterByDaysAgo"
|
||||||
|
debounce="500"
|
||||||
|
:title="t('entry.preAccount.daysAgo')"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #column-id="{ row }">
|
||||||
|
<span class="link" @click.stop>
|
||||||
|
{{ row.id }}
|
||||||
|
<EntryDescriptorProxy :id="row.id" />
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
<template #column-company="{ row }">
|
||||||
|
<QBadge :color="row.color ?? 'transparent'" :label="row.company" />
|
||||||
|
</template>
|
||||||
|
<template #column-gestDocFk="{ row }">
|
||||||
|
<span class="link" @click.stop="downloadFile(row.gestDocFk)">
|
||||||
|
{{ row.gestDocFk }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
<template #column-supplier="{ row }">
|
||||||
|
<span class="link" @click.stop>
|
||||||
|
{{ row.supplier }}
|
||||||
|
<SupplierDescriptorProxy :id="row.supplierFk" />
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
<template #column-invoiceInFk="{ row }">
|
||||||
|
<span class="link" @click.stop>
|
||||||
|
{{ row.invoiceInFk }}
|
||||||
|
<InvoiceInDescriptorProxy :id="row.invoiceInFk" />
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
<template #column-footer-amount>
|
||||||
|
<div v-text="toCurrency(totalSelectedAmount)" />
|
||||||
|
<div v-text="toCurrency(totalAmount)" />
|
||||||
|
</template>
|
||||||
|
</VnTable>
|
||||||
|
<VnConfirm
|
||||||
|
ref="updateDialog"
|
||||||
|
:title="t('entry.preAccount.dialog.title')"
|
||||||
|
:message="t('entry.preAccount.dialog.message')"
|
||||||
|
>
|
||||||
|
<template #actions>
|
||||||
|
<QBtn
|
||||||
|
data-cy="updateFileYes"
|
||||||
|
:label="t('globals.yes')"
|
||||||
|
color="primary"
|
||||||
|
@click="updateFile"
|
||||||
|
autofocus
|
||||||
|
v-close-popup
|
||||||
|
/>
|
||||||
|
<QBtn
|
||||||
|
data-cy="updateFileNo"
|
||||||
|
:label="t('globals.no')"
|
||||||
|
color="primary"
|
||||||
|
flat
|
||||||
|
@click="uploadFile"
|
||||||
|
v-close-popup
|
||||||
|
/>
|
||||||
|
<QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
|
||||||
|
</template>
|
||||||
|
</VnConfirm>
|
||||||
|
<QDialog ref="uploadDialog">
|
||||||
|
<VnDms
|
||||||
|
model="dms"
|
||||||
|
:form-initial-data="dmsData"
|
||||||
|
url="Dms/uploadFile"
|
||||||
|
@on-data-saved="afterUploadFile"
|
||||||
|
/>
|
||||||
|
</QDialog>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
en:
|
||||||
|
IntraCommunity: Intra-community
|
||||||
|
NonCommunity: Non-community
|
||||||
|
CanaryIslands: Canary Islands
|
||||||
|
es:
|
||||||
|
IntraCommunity: Intracomunitaria
|
||||||
|
NonCommunity: Extracomunitaria
|
||||||
|
CanaryIsland: Islas Canarias
|
||||||
|
National: Nacional
|
||||||
|
</i18n>
|
|
@ -0,0 +1,63 @@
|
||||||
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import EntryPreAccount from '../EntryPreAccount.vue';
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
describe('EntryPreAccount', () => {
|
||||||
|
let wrapper;
|
||||||
|
let vm;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
||||||
|
if (url == 'EntryConfigs/findOne')
|
||||||
|
return { data: { maxDays: 90, defaultDays: 30 } };
|
||||||
|
return { data: [] };
|
||||||
|
});
|
||||||
|
wrapper = createWrapper(EntryPreAccount);
|
||||||
|
vm = wrapper.vm;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('filterByDaysAgo()', () => {
|
||||||
|
it('should set daysAgo to defaultDays if no value is provided', () => {
|
||||||
|
vm.filterByDaysAgo();
|
||||||
|
expect(vm.daysAgo).toBe(vm.defaultDays);
|
||||||
|
expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.defaultDays);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set daysAgo to maxDays if the value exceeds maxDays', () => {
|
||||||
|
vm.filterByDaysAgo(500);
|
||||||
|
expect(vm.daysAgo).toBe(vm.maxDays);
|
||||||
|
expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.maxDays);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set daysAgo to the provided value if it is valid', () => {
|
||||||
|
vm.filterByDaysAgo(30);
|
||||||
|
expect(vm.daysAgo).toBe(30);
|
||||||
|
expect(vm.arrayData.store.userParams.daysAgo).toBe(30);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Dialog behavior when adding a new row', () => {
|
||||||
|
it('should open the dialog if the new row has invoiceInFk', async () => {
|
||||||
|
const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
|
||||||
|
const selectedRows = [{ id: 1, invoiceInFk: 123 }];
|
||||||
|
vm.selectedRows = selectedRows;
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(dialogSpy).toHaveBeenCalledWith({
|
||||||
|
component: vm.VnConfirm,
|
||||||
|
componentProps: { title: vm.t('entry.preAccount.hasInvoice') },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not open the dialog if the new row does not have invoiceInFk', async () => {
|
||||||
|
const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
|
||||||
|
vm.selectedRows = [{ id: 1, invoiceInFk: null }];
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(dialogSpy).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -118,6 +118,33 @@ entry:
|
||||||
searchInfo: You can search by entry reference
|
searchInfo: You can search by entry reference
|
||||||
descriptorMenu:
|
descriptorMenu:
|
||||||
showEntryReport: Show entry report
|
showEntryReport: Show entry report
|
||||||
|
preAccount:
|
||||||
|
gestDocFk: Gestdoc
|
||||||
|
dmsType: Gestdoc type
|
||||||
|
invoiceNumber: Entry ref.
|
||||||
|
reference: Gestdoc ref.
|
||||||
|
shipped: Shipped
|
||||||
|
landed: Landed
|
||||||
|
id: Entry
|
||||||
|
invoiceInFk: Invoice in
|
||||||
|
supplierFk: Supplier
|
||||||
|
country: Country
|
||||||
|
description: Entry type
|
||||||
|
payDem: Payment term
|
||||||
|
isBooked: B
|
||||||
|
isReceived: R
|
||||||
|
entryType: Entry type
|
||||||
|
isAgricultural: Agricultural
|
||||||
|
fiscalCode: Account type
|
||||||
|
daysAgo: Max 365 days
|
||||||
|
search: Search
|
||||||
|
searchInfo: You can search by supplier name or nickname
|
||||||
|
btn: Pre-account
|
||||||
|
hasInvoice: This entry has already an invoice in
|
||||||
|
success: It has been successfully pre-accounted
|
||||||
|
dialog:
|
||||||
|
title: Pre-account entries
|
||||||
|
message: Do you want the invoice to inherit the entry document?
|
||||||
entryFilter:
|
entryFilter:
|
||||||
params:
|
params:
|
||||||
isExcludedFromAvailable: Excluded from available
|
isExcludedFromAvailable: Excluded from available
|
||||||
|
|
|
@ -69,6 +69,33 @@ entry:
|
||||||
observationType: Tipo de observación
|
observationType: Tipo de observación
|
||||||
search: Buscar entradas
|
search: Buscar entradas
|
||||||
searchInfo: Puedes buscar por referencia de entrada
|
searchInfo: Puedes buscar por referencia de entrada
|
||||||
|
preAccount:
|
||||||
|
gestDocFk: Gestdoc
|
||||||
|
dmsType: Tipo gestdoc
|
||||||
|
invoiceNumber: Ref. Entrada
|
||||||
|
reference: Ref. GestDoc
|
||||||
|
shipped: F. envío
|
||||||
|
landed: F. llegada
|
||||||
|
id: Entrada
|
||||||
|
invoiceInFk: Recibida
|
||||||
|
supplierFk: Proveedor
|
||||||
|
country: País
|
||||||
|
description: Tipo de Entrada
|
||||||
|
payDem: Plazo de pago
|
||||||
|
isBooked: C
|
||||||
|
isReceived: R
|
||||||
|
entryType: Tipo de entrada
|
||||||
|
isAgricultural: Agricultural
|
||||||
|
fiscalCode: Tipo de cuenta
|
||||||
|
daysAgo: Máximo 365 días
|
||||||
|
search: Buscar
|
||||||
|
searchInfo: Puedes buscar por nombre o alias de proveedor
|
||||||
|
btn: Precontabilizar
|
||||||
|
hasInvoice: Esta entrada ya tiene una f. recibida
|
||||||
|
success: Se ha precontabilizado correctamente
|
||||||
|
dialog:
|
||||||
|
title: Precontabilizar entradas
|
||||||
|
message: ¿Desea que la factura herede el documento de la entrada?
|
||||||
params:
|
params:
|
||||||
entryFk: Entrada
|
entryFk: Entrada
|
||||||
observationTypeFk: Tipo de observación
|
observationTypeFk: Tipo de observación
|
||||||
|
|
|
@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
id: {
|
id: {
|
||||||
type: Number,
|
type: Number,
|
||||||
required: true,
|
default: null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -164,6 +164,7 @@ onMounted(async () => {
|
||||||
unelevated
|
unelevated
|
||||||
filled
|
filled
|
||||||
dense
|
dense
|
||||||
|
data-cy="formSubmitBtn"
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-else
|
v-else
|
||||||
|
@ -174,6 +175,7 @@ onMounted(async () => {
|
||||||
filled
|
filled
|
||||||
dense
|
dense
|
||||||
@click="getStatus = 'stopping'"
|
@click="getStatus = 'stopping'"
|
||||||
|
data-cy="formStopBtn"
|
||||||
/>
|
/>
|
||||||
</QForm>
|
</QForm>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -89,7 +89,6 @@ const insertTag = (rows) => {
|
||||||
:default-remove="false"
|
:default-remove="false"
|
||||||
:user-filter="{
|
:user-filter="{
|
||||||
fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
|
fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
|
||||||
where: { itemFk: route.params.id },
|
|
||||||
include: {
|
include: {
|
||||||
relation: 'tag',
|
relation: 'tag',
|
||||||
scope: {
|
scope: {
|
||||||
|
@ -97,6 +96,7 @@ const insertTag = (rows) => {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}"
|
}"
|
||||||
|
:filter="{ where: { itemFk: route.params.id } }"
|
||||||
order="priority"
|
order="priority"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="onItemTagsFetched"
|
@on-fetch="onItemTagsFetched"
|
||||||
|
|
|
@ -11,26 +11,19 @@ export function cloneItem() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const cloneItem = async (entityId) => {
|
const cloneItem = async (entityId) => {
|
||||||
const { id } = entityId;
|
const { id } = entityId;
|
||||||
try {
|
const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
|
||||||
const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
|
router.push({ name: 'ItemTags', params: { id: data.id } });
|
||||||
router.push({ name: 'ItemTags', params: { id: data.id } });
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Error cloning item');
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const openCloneDialog = async (entityId) => {
|
const openCloneDialog = async (entityId) => {
|
||||||
quasar
|
quasar.dialog({
|
||||||
.dialog({
|
component: VnConfirm,
|
||||||
component: VnConfirm,
|
componentProps: {
|
||||||
componentProps: {
|
title: t('item.descriptor.clone.title'),
|
||||||
title: t('item.descriptor.clone.title'),
|
message: t('item.descriptor.clone.subTitle'),
|
||||||
message: t('item.descriptor.clone.subTitle'),
|
promise: () => cloneItem(entityId),
|
||||||
},
|
},
|
||||||
})
|
});
|
||||||
.onOk(async () => {
|
|
||||||
await cloneItem(entityId);
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
return { openCloneDialog };
|
return { openCloneDialog };
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,7 +120,6 @@ watch(
|
||||||
:data-key="dataKey"
|
:data-key="dataKey"
|
||||||
:tag-value="tagValue"
|
:tag-value="tagValue"
|
||||||
:tags="tags"
|
:tags="tags"
|
||||||
:initial-catalog-params="catalogParams"
|
|
||||||
:arrayData
|
:arrayData
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -27,7 +27,7 @@ const getTotalRef = ref();
|
||||||
const total = ref(0);
|
const total = ref(0);
|
||||||
|
|
||||||
const entityId = computed(() => {
|
const entityId = computed(() => {
|
||||||
return $props.id || route.params.id;
|
return Number($props.id || route.params.id);
|
||||||
});
|
});
|
||||||
|
|
||||||
const orderTotal = computed(() => state.get('orderTotal') ?? 0);
|
const orderTotal = computed(() => state.get('orderTotal') ?? 0);
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { useRoute } from 'vue-router';
|
||||||
|
|
||||||
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||||
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
|
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
const emit = defineEmits(['onDataSaved']);
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const { notify } = useNotify();
|
||||||
|
const route = useRoute();
|
||||||
|
|
||||||
|
const dmsOptions = ref([]);
|
||||||
|
const dmsId = ref(null);
|
||||||
|
|
||||||
|
const importDms = async () => {
|
||||||
|
try {
|
||||||
|
if (!dmsId.value) throw new Error(t(`vehicle.errors.documentIdEmpty`));
|
||||||
|
|
||||||
|
const data = {
|
||||||
|
vehicleFk: route.params.id,
|
||||||
|
dmsFk: dmsId.value,
|
||||||
|
};
|
||||||
|
|
||||||
|
await axios.post('vehicleDms', data);
|
||||||
|
notify(t('globals.dataSaved'), 'positive');
|
||||||
|
dmsId.value = null;
|
||||||
|
emit('onDataSaved');
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="Dms"
|
||||||
|
:filter="{ fields: ['id'], order: 'id ASC' }"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (dmsOptions = data)"
|
||||||
|
/>
|
||||||
|
<FormModelPopup
|
||||||
|
model="DmsImport"
|
||||||
|
:title="t('globals.selectDocumentId')"
|
||||||
|
:form-initial-data="{}"
|
||||||
|
:save-fn="importDms"
|
||||||
|
>
|
||||||
|
<template #form-inputs>
|
||||||
|
<VnSelect
|
||||||
|
:label="t('globals.document')"
|
||||||
|
:options="dmsOptions"
|
||||||
|
hide-selected
|
||||||
|
option-label="id"
|
||||||
|
option-value="id"
|
||||||
|
v-model="dmsId"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</FormModelPopup>
|
||||||
|
</template>
|
|
@ -0,0 +1,42 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import VnDmsList from 'src/components/common/VnDmsList.vue';
|
||||||
|
import VehicleDmsImportForm from 'src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
const dmsListRef = ref(null);
|
||||||
|
const showImportDialog = ref(false);
|
||||||
|
|
||||||
|
const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<VnDmsList
|
||||||
|
ref="dmsListRef"
|
||||||
|
model="VehicleDms"
|
||||||
|
update-model="vehicles"
|
||||||
|
delete-model="VehicleDms"
|
||||||
|
download-model="dms"
|
||||||
|
default-dms-code="vehicles"
|
||||||
|
filter="vehicleFk"
|
||||||
|
/>
|
||||||
|
<QDialog v-model="showImportDialog">
|
||||||
|
<VehicleDmsImportForm @on-data-saved="onDataSaved()" />
|
||||||
|
</QDialog>
|
||||||
|
<QPageSticky position="bottom-right" :offset="[25, 90]">
|
||||||
|
<QBtn
|
||||||
|
fab
|
||||||
|
color="primary"
|
||||||
|
icon="file_copy"
|
||||||
|
@click="showImportDialog = true"
|
||||||
|
class="fill-icon"
|
||||||
|
data-cy="importBtn"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('globals.import') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</QPageSticky>
|
||||||
|
</template>
|
|
@ -18,3 +18,5 @@ vehicle:
|
||||||
params:
|
params:
|
||||||
vehicleTypeFk: Type
|
vehicleTypeFk: Type
|
||||||
vehicleStateFk: State
|
vehicleStateFk: State
|
||||||
|
errors:
|
||||||
|
documentIdEmpty: The document identifier can't be empty
|
||||||
|
|
|
@ -18,3 +18,5 @@ vehicle:
|
||||||
params:
|
params:
|
||||||
vehicleTypeFk: Tipo
|
vehicleTypeFk: Tipo
|
||||||
vehicleStateFk: Estado
|
vehicleStateFk: Estado
|
||||||
|
errors:
|
||||||
|
documentIdEmpty: El número de documento no puede estar vacío
|
||||||
|
|
|
@ -80,7 +80,7 @@ const columns = computed(() => [
|
||||||
<VnTable
|
<VnTable
|
||||||
:data-key="dataKey"
|
:data-key="dataKey"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
is-editable="false"
|
:is-editable="false"
|
||||||
:right-search="false"
|
:right-search="false"
|
||||||
:use-model="true"
|
:use-model="true"
|
||||||
:disable-option="{ table: true }"
|
:disable-option="{ table: true }"
|
||||||
|
|
|
@ -90,7 +90,7 @@ const onDataSaved = ({ id }) => {
|
||||||
<VnTable
|
<VnTable
|
||||||
:data-key="dataKey"
|
:data-key="dataKey"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
is-editable="false"
|
:is-editable="false"
|
||||||
:right-search="false"
|
:right-search="false"
|
||||||
:use-model="true"
|
:use-model="true"
|
||||||
:disable-option="{ table: true }"
|
:disable-option="{ table: true }"
|
||||||
|
|
|
@ -65,15 +65,13 @@ function findBankFk(value, row) {
|
||||||
if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
|
if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
function bankEntityFilter(val, update) {
|
function bankEntityFilter(val) {
|
||||||
update(() => {
|
const needle = val.toLowerCase();
|
||||||
const needle = val.toLowerCase();
|
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
|
||||||
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
|
(bank) =>
|
||||||
(bank) =>
|
bank.bic.toLowerCase().startsWith(needle) ||
|
||||||
bank.bic.toLowerCase().startsWith(needle) ||
|
bank.name.toLowerCase().includes(needle),
|
||||||
bank.name.toLowerCase().includes(needle),
|
);
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
@ -82,7 +80,8 @@ function bankEntityFilter(val, update) {
|
||||||
url="BankEntities"
|
url="BankEntities"
|
||||||
@on-fetch="
|
@on-fetch="
|
||||||
(data) => {
|
(data) => {
|
||||||
(bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
|
bankEntitiesOptions = data;
|
||||||
|
filteredBankEntitiesOptions = data;
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
auto-load
|
auto-load
|
||||||
|
@ -135,10 +134,8 @@ function bankEntityFilter(val, update) {
|
||||||
:label="t('worker.create.bankEntity')"
|
:label="t('worker.create.bankEntity')"
|
||||||
v-model="row.bankEntityFk"
|
v-model="row.bankEntityFk"
|
||||||
:options="filteredBankEntitiesOptions"
|
:options="filteredBankEntitiesOptions"
|
||||||
:default-filter="false"
|
:filter-fn="bankEntityFilter"
|
||||||
@filter="(val, update) => bankEntityFilter(val, update)"
|
|
||||||
option-label="bic"
|
option-label="bic"
|
||||||
option-value="id"
|
|
||||||
hide-selected
|
hide-selected
|
||||||
:required="true"
|
:required="true"
|
||||||
:roles-allowed-to-create="['financial']"
|
:roles-allowed-to-create="['financial']"
|
||||||
|
|
|
@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
id: {
|
id: {
|
||||||
type: Number,
|
type: Number,
|
||||||
required: true,
|
default: null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -11,10 +11,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import VnLocation from 'src/components/common/VnLocation.vue';
|
import VnLocation from 'src/components/common/VnLocation.vue';
|
||||||
import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
|
import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
|
||||||
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
||||||
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const arrayData = useArrayData('Supplier');
|
||||||
const sageTaxTypesOptions = ref([]);
|
const sageTaxTypesOptions = ref([]);
|
||||||
const sageWithholdingsOptions = ref([]);
|
const sageWithholdingsOptions = ref([]);
|
||||||
const sageTransactionTypesOptions = ref([]);
|
const sageTransactionTypesOptions = ref([]);
|
||||||
|
@ -89,6 +89,7 @@ function handleLocation(data, location) {
|
||||||
}"
|
}"
|
||||||
auto-load
|
auto-load
|
||||||
:clear-store-on-unmount="false"
|
:clear-store-on-unmount="false"
|
||||||
|
@on-data-saved="arrayData.fetch({})"
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate }">
|
<template #form="{ data, validate }">
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
|
|
@ -34,7 +34,7 @@ const importDms = async () => {
|
||||||
dmsId.value = null;
|
dmsId.value = null;
|
||||||
emit('onDataSaved');
|
emit('onDataSaved');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(e.message);
|
throw e;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -49,7 +49,7 @@ const importDms = async () => {
|
||||||
<FormModelPopup
|
<FormModelPopup
|
||||||
url-create="genera"
|
url-create="genera"
|
||||||
model="DmsImport"
|
model="DmsImport"
|
||||||
:title="t('Select document id')"
|
:title="t('globals.selectDocumentId')"
|
||||||
:form-initial-data="{}"
|
:form-initial-data="{}"
|
||||||
:save-fn="importDms"
|
:save-fn="importDms"
|
||||||
>
|
>
|
||||||
|
@ -70,7 +70,6 @@ const importDms = async () => {
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
es:
|
es:
|
||||||
Select document id: Introduzca id de gestion documental
|
|
||||||
Document: Documento
|
Document: Documento
|
||||||
The document indentifier can't be empty: El número de documento no puede estar vacío
|
The document indentifier can't be empty: El número de documento no puede estar vacío
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -33,7 +33,7 @@ onUnmounted(() => {
|
||||||
stateStore.rightDrawer = true;
|
stateStore.rightDrawer = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
const entityId = computed(() => route.params.id);
|
const entityId = computed(() => route.params.itemFk);
|
||||||
const item = ref({});
|
const item = ref({});
|
||||||
|
|
||||||
const itemProposalSelected = ref(null);
|
const itemProposalSelected = ref(null);
|
||||||
|
|
|
@ -7,7 +7,6 @@ import { onBeforeMount } from 'vue';
|
||||||
import { dashIfEmpty, toDate, toHour } from 'src/filters';
|
import { dashIfEmpty, toDate, toHour } from 'src/filters';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import { useState } from 'src/composables/useState';
|
import { useState } from 'src/composables/useState';
|
||||||
import { useRole } from 'src/composables/useRole';
|
|
||||||
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
||||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
import TicketLackFilter from './TicketLackFilter.vue';
|
import TicketLackFilter from './TicketLackFilter.vue';
|
||||||
|
@ -25,10 +24,11 @@ const negativeParams = reactive({
|
||||||
availabled: Date.getCurrentDateTimeFormatted(),
|
availabled: Date.getCurrentDateTimeFormatted(),
|
||||||
});
|
});
|
||||||
const redirectToCreateView = ({ itemFk }) => {
|
const redirectToCreateView = ({ itemFk }) => {
|
||||||
router.push({
|
const route = {
|
||||||
name: 'NegativeDetail',
|
name: 'NegativeDetail',
|
||||||
params: { id: itemFk },
|
params: { itemFk },
|
||||||
});
|
};
|
||||||
|
router.push(route);
|
||||||
};
|
};
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{
|
{
|
||||||
|
|
|
@ -38,7 +38,7 @@ const filterLack = ref({
|
||||||
const selectedRows = ref([]);
|
const selectedRows = ref([]);
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const entityId = computed(() => route.params.id);
|
const entityId = computed(() => route.params.itemFk);
|
||||||
const item = ref({});
|
const item = ref({});
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
|
|
@ -42,11 +42,7 @@ const groupedStates = ref([]);
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
||||||
<VnFilterPanel
|
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
||||||
:data-key="props.dataKey"
|
|
||||||
:search-button="true"
|
|
||||||
:unremovableParams="['from', 'to']"
|
|
||||||
>
|
|
||||||
<template #tags="{ tag, formatFn }">
|
<template #tags="{ tag, formatFn }">
|
||||||
<div class="q-gutter-x-xs">
|
<div class="q-gutter-x-xs">
|
||||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
||||||
|
@ -188,16 +184,6 @@ const groupedStates = ref([]);
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
|
||||||
<QItemSection>
|
|
||||||
<QCheckbox
|
|
||||||
v-model="params.problems"
|
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:label="t('With problems')"
|
|
||||||
toggle-indeterminate
|
|
||||||
/>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection v-if="!provinces">
|
<QItemSection v-if="!provinces">
|
||||||
<QSkeleton type="QInput" class="full-width" />
|
<QSkeleton type="QInput" class="full-width" />
|
||||||
|
|
|
@ -128,6 +128,7 @@ const columns = computed(() => [
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
label: t('ticketList.hour'),
|
label: t('ticketList.hour'),
|
||||||
format: (row) => toTimeFormat(row.shipped),
|
format: (row) => toTimeFormat(row.shipped),
|
||||||
|
orderBy: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -136,6 +137,7 @@ const columns = computed(() => [
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
label: t('ticketList.closure'),
|
label: t('ticketList.closure'),
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
|
format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
|
||||||
|
orderBy: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -477,7 +479,7 @@ function setReference(data) {
|
||||||
prefix="card"
|
prefix="card"
|
||||||
:array-data-props="{
|
:array-data-props="{
|
||||||
url: 'Tickets/filter',
|
url: 'Tickets/filter',
|
||||||
order: ['shipped DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
|
order: ['shipped DESC', 'id DESC'],
|
||||||
exprBuilder,
|
exprBuilder,
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
|
|
|
@ -27,7 +27,7 @@ const entityId = computed(() => {
|
||||||
<template>
|
<template>
|
||||||
<EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
|
<EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
|
||||||
<template #menu="{ entity }">
|
<template #menu="{ entity }">
|
||||||
<ZoneDescriptorMenuItems :zone="entity" />
|
<ZoneDescriptorMenuItems />
|
||||||
</template>
|
</template>
|
||||||
<template #body="{ entity }">
|
<template #body="{ entity }">
|
||||||
<VnLv :label="$t('list.agency')" :value="entity.agencyMode?.name" />
|
<VnLv :label="$t('list.agency')" :value="entity.agencyMode?.name" />
|
||||||
|
|
|
@ -93,6 +93,7 @@ const columns = computed(() => [
|
||||||
optionLabel: 'name',
|
optionLabel: 'name',
|
||||||
optionValue: 'id',
|
optionValue: 'id',
|
||||||
},
|
},
|
||||||
|
columnClass: 'expand',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -247,74 +248,70 @@ const closeEventForm = () => {
|
||||||
</QBtnGroup>
|
</QBtnGroup>
|
||||||
</template>
|
</template>
|
||||||
</VnSubToolbar>
|
</VnSubToolbar>
|
||||||
<div class="table-container">
|
<VnTable
|
||||||
<div class="column items-center">
|
ref="tableRef"
|
||||||
<VnTable
|
:data-key="dataKey"
|
||||||
ref="tableRef"
|
:columns="columns"
|
||||||
:data-key="dataKey"
|
redirect="Zone"
|
||||||
:columns="columns"
|
:create="{
|
||||||
redirect="Zone"
|
urlCreate: 'Zones',
|
||||||
:create="{
|
title: t('list.createZone'),
|
||||||
urlCreate: 'Zones',
|
onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
|
||||||
title: t('list.createZone'),
|
formInitialData: {},
|
||||||
onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
|
}"
|
||||||
formInitialData: {},
|
table-height="85vh"
|
||||||
}"
|
v-model:selected="selectedRows"
|
||||||
table-height="85vh"
|
:table="{
|
||||||
v-model:selected="selectedRows"
|
'row-key': 'id',
|
||||||
:table="{
|
selection: 'multiple',
|
||||||
'row-key': 'id',
|
}"
|
||||||
selection: 'multiple',
|
>
|
||||||
}"
|
<template #column-addressFk="{ row }">
|
||||||
>
|
{{ dashIfEmpty(formatRow(row)) }}
|
||||||
<template #column-addressFk="{ row }">
|
</template>
|
||||||
{{ dashIfEmpty(formatRow(row)) }}
|
<template #more-create-dialog="{ data }">
|
||||||
</template>
|
<VnSelect
|
||||||
<template #more-create-dialog="{ data }">
|
url="AgencyModes"
|
||||||
<VnSelect
|
v-model="data.agencyModeFk"
|
||||||
url="AgencyModes"
|
option-value="id"
|
||||||
v-model="data.agencyModeFk"
|
option-label="name"
|
||||||
option-value="id"
|
:label="t('list.agency')"
|
||||||
option-label="name"
|
/>
|
||||||
:label="t('list.agency')"
|
<VnInput
|
||||||
/>
|
v-model="data.price"
|
||||||
<VnInput
|
:label="t('list.price')"
|
||||||
v-model="data.price"
|
min="0"
|
||||||
:label="t('list.price')"
|
type="number"
|
||||||
min="0"
|
required="true"
|
||||||
type="number"
|
/>
|
||||||
required="true"
|
<VnInput
|
||||||
/>
|
v-model="data.bonus"
|
||||||
<VnInput
|
:label="t('zone.bonus')"
|
||||||
v-model="data.bonus"
|
min="0"
|
||||||
:label="t('zone.bonus')"
|
type="number"
|
||||||
min="0"
|
/>
|
||||||
type="number"
|
<VnInput
|
||||||
/>
|
v-model="data.travelingDays"
|
||||||
<VnInput
|
:label="t('zone.travelingDays')"
|
||||||
v-model="data.travelingDays"
|
type="number"
|
||||||
:label="t('zone.travelingDays')"
|
min="0"
|
||||||
type="number"
|
/>
|
||||||
min="0"
|
<VnInputTime v-model="data.hour" :label="t('list.close')" />
|
||||||
/>
|
<VnSelect
|
||||||
<VnInputTime v-model="data.hour" :label="t('list.close')" />
|
url="Warehouses"
|
||||||
<VnSelect
|
v-model="data.warehouseFK"
|
||||||
url="Warehouses"
|
option-value="id"
|
||||||
v-model="data.warehouseFK"
|
option-label="name"
|
||||||
option-value="id"
|
:label="t('list.warehouse')"
|
||||||
option-label="name"
|
:options="warehouseOptions"
|
||||||
:label="t('list.warehouse')"
|
/>
|
||||||
:options="warehouseOptions"
|
<QCheckbox
|
||||||
/>
|
v-model="data.isVolumetric"
|
||||||
<QCheckbox
|
:label="t('list.isVolumetric')"
|
||||||
v-model="data.isVolumetric"
|
:toggle-indeterminate="false"
|
||||||
:label="t('list.isVolumetric')"
|
/>
|
||||||
:toggle-indeterminate="false"
|
</template>
|
||||||
/>
|
</VnTable>
|
||||||
</template>
|
|
||||||
</VnTable>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
</VnSection>
|
</VnSection>
|
||||||
<QDialog v-model="showZoneEventForm" @hide="closeEventForm()">
|
<QDialog v-model="showZoneEventForm" @hide="closeEventForm()">
|
||||||
|
@ -333,24 +330,6 @@ const closeEventForm = () => {
|
||||||
/>
|
/>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.table-container {
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
.column {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
min-width: 70%;
|
|
||||||
}
|
|
||||||
|
|
||||||
:deep(.shrink-column) {
|
|
||||||
width: 8%;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
es:
|
es:
|
||||||
Search zone: Buscar zona
|
Search zone: Buscar zona
|
||||||
|
|
|
@ -85,6 +85,7 @@ export default {
|
||||||
'EntryLatestBuys',
|
'EntryLatestBuys',
|
||||||
'EntryStockBought',
|
'EntryStockBought',
|
||||||
'EntryWasteRecalc',
|
'EntryWasteRecalc',
|
||||||
|
'EntryPreAccount',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
component: RouterView,
|
component: RouterView,
|
||||||
|
@ -94,6 +95,7 @@ export default {
|
||||||
name: 'EntryMain',
|
name: 'EntryMain',
|
||||||
path: '',
|
path: '',
|
||||||
component: () => import('src/components/common/VnModule.vue'),
|
component: () => import('src/components/common/VnModule.vue'),
|
||||||
|
props: (route) => ({ leftDrawer: route.name !== 'EntryPreAccount' }),
|
||||||
redirect: { name: 'EntryIndexMain' },
|
redirect: { name: 'EntryIndexMain' },
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
|
@ -150,6 +152,15 @@ export default {
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
|
component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'pre-account',
|
||||||
|
name: 'EntryPreAccount',
|
||||||
|
meta: {
|
||||||
|
title: 'entryPreAccount',
|
||||||
|
icon: 'account_balance',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Entry/EntryPreAccount.vue'),
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
|
@ -166,7 +166,11 @@ const vehicleCard = {
|
||||||
component: () => import('src/pages/Route/Vehicle/Card/VehicleCard.vue'),
|
component: () => import('src/pages/Route/Vehicle/Card/VehicleCard.vue'),
|
||||||
redirect: { name: 'VehicleSummary' },
|
redirect: { name: 'VehicleSummary' },
|
||||||
meta: {
|
meta: {
|
||||||
menu: ['VehicleBasicData', 'VehicleNotes'],
|
menu: [
|
||||||
|
'VehicleBasicData',
|
||||||
|
'VehicleNotes',
|
||||||
|
'VehicleDms',
|
||||||
|
],
|
||||||
},
|
},
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
|
@ -195,7 +199,16 @@ const vehicleCard = {
|
||||||
icon: 'vn:notes',
|
icon: 'vn:notes',
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Route/Vehicle/Card/VehicleNotes.vue'),
|
component: () => import('src/pages/Route/Vehicle/Card/VehicleNotes.vue'),
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
name: 'VehicleDms',
|
||||||
|
path: 'dms',
|
||||||
|
meta: {
|
||||||
|
title: 'dms',
|
||||||
|
icon: 'cloud_upload',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Route/Vehicle/VehicleDms.vue'),
|
||||||
|
},
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -251,7 +251,7 @@ export default {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'NegativeDetail',
|
name: 'NegativeDetail',
|
||||||
path: ':id',
|
path: ':itemFk',
|
||||||
meta: {
|
meta: {
|
||||||
title: 'summary',
|
title: 'summary',
|
||||||
icon: 'launch',
|
icon: 'launch',
|
||||||
|
|
|
@ -1,22 +1,23 @@
|
||||||
import { describe, expect, it, beforeEach, beforeAll } from 'vitest';
|
import { describe, expect, it, beforeEach, beforeAll } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { setActivePinia, createPinia } from 'pinia';
|
||||||
|
|
||||||
import { useStateQueryStore } from 'src/stores/useStateQueryStore';
|
import { useStateQueryStore } from 'src/stores/useStateQueryStore';
|
||||||
|
|
||||||
describe('useStateQueryStore', () => {
|
describe('useStateQueryStore', () => {
|
||||||
beforeAll(() => {
|
let stateQueryStore;
|
||||||
createWrapper({}, {});
|
let add, isLoading, remove, reset;
|
||||||
});
|
|
||||||
|
|
||||||
const stateQueryStore = useStateQueryStore();
|
|
||||||
const { add, isLoading, remove, reset } = useStateQueryStore();
|
|
||||||
const firstQuery = { url: 'myQuery' };
|
const firstQuery = { url: 'myQuery' };
|
||||||
|
|
||||||
function getQueries() {
|
function getQueries() {
|
||||||
return stateQueryStore.queries;
|
return stateQueryStore.queries;
|
||||||
}
|
}
|
||||||
|
beforeAll(() => {
|
||||||
|
setActivePinia(createPinia());
|
||||||
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
stateQueryStore = useStateQueryStore();
|
||||||
|
({ add, isLoading, remove, reset } = useStateQueryStore());
|
||||||
reset();
|
reset();
|
||||||
expect(getQueries().size).toBeFalsy();
|
expect(getQueries().size).toBeFalsy();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
describe.skip('ClaimAction', () => {
|
describe('ClaimAction', () => {
|
||||||
const claimId = 1;
|
const claimId = 1;
|
||||||
|
|
||||||
const firstRow = 'tbody > :nth-child(1)';
|
const firstRow = 'tbody > :nth-child(1)';
|
||||||
|
@ -15,13 +15,13 @@ describe.skip('ClaimAction', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// https://redmine.verdnatura.es/issues/8756
|
// https://redmine.verdnatura.es/issues/8756
|
||||||
xit('should change destination', () => {
|
it.skip('should change destination', () => {
|
||||||
const rowData = [true, null, null, 'Bueno'];
|
const rowData = [true, null, null, 'Bueno'];
|
||||||
cy.fillRow(firstRow, rowData);
|
cy.fillRow(firstRow, rowData);
|
||||||
});
|
});
|
||||||
|
|
||||||
// https://redmine.verdnatura.es/issues/8756
|
// https://redmine.verdnatura.es/issues/8756
|
||||||
xit('should change destination from other button', () => {
|
it.skip('should change destination from other button', () => {
|
||||||
const rowData = [true];
|
const rowData = [true];
|
||||||
|
|
||||||
cy.fillRow(firstRow, rowData);
|
cy.fillRow(firstRow, rowData);
|
||||||
|
@ -35,7 +35,7 @@ describe.skip('ClaimAction', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// https://redmine.verdnatura.es/issues/8756
|
// https://redmine.verdnatura.es/issues/8756
|
||||||
xit('should remove the line', () => {
|
it.skip('should remove the line', () => {
|
||||||
cy.fillRow(firstRow, [true]);
|
cy.fillRow(firstRow, [true]);
|
||||||
cy.removeCard();
|
cy.removeCard();
|
||||||
cy.clickConfirm();
|
cy.clickConfirm();
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
describe.skip('ClaimDevelopment', () => {
|
describe('ClaimDevelopment', () => {
|
||||||
const claimId = 1;
|
const claimId = 1;
|
||||||
const firstLineReason = 'tbody > :nth-child(1) > :nth-child(2)';
|
const firstLineReason = 'tbody > :nth-child(1) > :nth-child(2)';
|
||||||
const thirdRow = 'tbody > :nth-child(3)';
|
const thirdRow = 'tbody > :nth-child(3)';
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
describe.skip('Client list', () => {
|
describe('Client list', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
cy.visit('/#/customer/list', {
|
cy.visit('/#/customer/list', {
|
||||||
|
|
|
@ -7,7 +7,7 @@ Cypress.Commands.add('selectTravel', (warehouse = '1') => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.Commands.add('deleteEntry', () => {
|
Cypress.Commands.add('deleteEntry', () => {
|
||||||
cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
|
cy.dataCy('descriptor-more-opts').should('be.visible').click();
|
||||||
cy.waitForElement('div[data-cy="delete-entry"]').click();
|
cy.waitForElement('div[data-cy="delete-entry"]').click();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import '../commands.js';
|
import '../commands.js';
|
||||||
|
|
||||||
describe('EntryBasicData', () => {
|
describe.skip('EntryBasicData', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('buyer');
|
cy.login('buyer');
|
||||||
cy.visit(`/#/entry/list`);
|
cy.visit(`/#/entry/list`);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import '../commands.js';
|
import '../commands.js';
|
||||||
describe('EntryDescriptor', () => {
|
describe.skip('EntryDescriptor', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('buyer');
|
cy.login('buyer');
|
||||||
cy.visit(`/#/entry/list`);
|
cy.visit(`/#/entry/list`);
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
/// <reference types="cypress" />
|
||||||
|
describe('Entry PreAccount Functionality', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
cy.login('administrative');
|
||||||
|
cy.visit('/#/entry/pre-account');
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should pre-account without questions if it's agricultural", () => {
|
||||||
|
selectRowsByCol('id', [2]);
|
||||||
|
cy.dataCy('preAccount_btn').click();
|
||||||
|
cy.checkNotification('It has been successfully pre-accounted');
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should ask to upload a doc. if it's not agricultural and doesn't have doc. ", () => {
|
||||||
|
selectRowsByCol('id', [3]);
|
||||||
|
cy.dataCy('preAccount_btn').click();
|
||||||
|
cy.dataCy('Reference_input').type('{selectall}234343fh', { delay: 0 });
|
||||||
|
cy.dataCy('VnDms_inputFile').selectFile('test/cypress/fixtures/image.jpg', {
|
||||||
|
force: true,
|
||||||
|
});
|
||||||
|
cy.dataCy('FormModelPopup_save').click();
|
||||||
|
cy.checkNotification('It has been successfully pre-accounted');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should ask to inherit the doc. and open VnDms popup if user choose "no"', () => {
|
||||||
|
selectRowsByCol('id', [101]);
|
||||||
|
cy.dataCy('preAccount_btn').click();
|
||||||
|
cy.dataCy('updateFileNo').click();
|
||||||
|
cy.get('#formModel').should('be.visible');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should ask to inherit the doc. and open VnDms popup if user choose "yes" and pre-account', () => {
|
||||||
|
selectRowsByCol('id', [101]);
|
||||||
|
cy.dataCy('preAccount_btn').click();
|
||||||
|
cy.dataCy('updateFileYes').click();
|
||||||
|
cy.checkNotification('It has been successfully pre-accounted');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function selectRowsByCol(col = 'id', vals = []) {
|
||||||
|
for (const val of vals) {
|
||||||
|
const regex = new RegExp(`^\\s*(${val})\\s*$`);
|
||||||
|
cy.contains(`[data-col-field="${col}"]`, regex)
|
||||||
|
.parent()
|
||||||
|
.find('td > .q-checkbox')
|
||||||
|
.click();
|
||||||
|
}
|
||||||
|
}
|
|
@ -10,7 +10,7 @@ describe('EntryDms', () => {
|
||||||
cy.dataCy('recalc').should('be.disabled');
|
cy.dataCy('recalc').should('be.disabled');
|
||||||
|
|
||||||
cy.dataCy('dateFrom').should('be.visible').click().type('01-01-2001');
|
cy.dataCy('dateFrom').should('be.visible').click().type('01-01-2001');
|
||||||
cy.dataCy('dateTo').should('be.visible').click().type('01-01-2001');
|
cy.dataCy('dateTo').should('be.visible').click().type('01-01-2001{enter}');
|
||||||
|
|
||||||
cy.dataCy('recalc').should('be.enabled').click();
|
cy.dataCy('recalc').should('be.enabled').click();
|
||||||
cy.get('.q-notification__message').should(
|
cy.get('.q-notification__message').should(
|
||||||
|
|
|
@ -84,7 +84,7 @@ describe('InvoiceInDescriptor', () => {
|
||||||
|
|
||||||
beforeEach(() => cy.visit(`/#/invoice-in/${originalId}/summary`));
|
beforeEach(() => cy.visit(`/#/invoice-in/${originalId}/summary`));
|
||||||
|
|
||||||
it('should create a correcting invoice and redirect to original invoice', () => {
|
it.skip('should create a correcting invoice and redirect to original invoice', () => {
|
||||||
createCorrective();
|
createCorrective();
|
||||||
redirect(originalId);
|
redirect(originalId);
|
||||||
});
|
});
|
||||||
|
|
|
@ -28,10 +28,10 @@ describe('InvoiceOut list', () => {
|
||||||
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
|
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
|
||||||
});
|
});
|
||||||
|
|
||||||
it.skip('should open the invoice descriptor from table icon', () => {
|
it('should open the invoice descriptor from table icon', () => {
|
||||||
cy.get(firstSummaryIcon).click();
|
cy.get(firstSummaryIcon).click();
|
||||||
cy.get('.cardSummary').should('be.visible');
|
cy.get('.cardSummary').should('be.visible');
|
||||||
cy.get('.summaryHeader > div').should('include.text', 'A1111111');
|
cy.get('.summaryHeader > div').should('include.text', 'V10100001');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should open the client descriptor', () => {
|
it('should open the client descriptor', () => {
|
||||||
|
|
|
@ -15,7 +15,7 @@ describe('InvoiceOut summary', () => {
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
cy.visit(`/#/invoice-out/1/summary`);
|
cy.visit(`/#/invoice-out/1/summary`);
|
||||||
});
|
});
|
||||||
it.skip('open the descriptors', () => {
|
it('open the descriptors', () => {
|
||||||
cy.get(firstRowDescriptors(1)).click();
|
cy.get(firstRowDescriptors(1)).click();
|
||||||
cy.get('.descriptor').should('be.visible');
|
cy.get('.descriptor').should('be.visible');
|
||||||
cy.get('.q-item > .q-item__label').should('include.text', '1');
|
cy.get('.q-item > .q-item__label').should('include.text', '1');
|
||||||
|
@ -30,7 +30,7 @@ describe('InvoiceOut summary', () => {
|
||||||
cy.get('.q-item > .q-item__label').should('include.text', '1101');
|
cy.get('.q-item > .q-item__label').should('include.text', '1101');
|
||||||
});
|
});
|
||||||
|
|
||||||
it.skip('should open the ticket list', () => {
|
it('should open the ticket list', () => {
|
||||||
cy.get(toTicketList).click();
|
cy.get(toTicketList).click();
|
||||||
cy.get('[data-col-field="stateFk"]').each(($el) => {
|
cy.get('[data-col-field="stateFk"]').each(($el) => {
|
||||||
cy.wrap($el).contains('T1111111');
|
cy.wrap($el).contains('T1111111');
|
||||||
|
|
|
@ -22,6 +22,7 @@ describe('InvoiceOut global invoicing', () => {
|
||||||
cy.get('.q-date__years-content > :nth-child(2) > .q-btn').click();
|
cy.get('.q-date__years-content > :nth-child(2) > .q-btn').click();
|
||||||
cy.get('.q-date__calendar-days > :nth-child(6) > .q-btn').click();
|
cy.get('.q-date__calendar-days > :nth-child(6) > .q-btn').click();
|
||||||
cy.get('[label="Max date ticket"]').type('01-01-2001{enter}');
|
cy.get('[label="Max date ticket"]').type('01-01-2001{enter}');
|
||||||
|
cy.dataCy('formSubmitBtn').click();
|
||||||
cy.get('.q-card').should('be.visible');
|
cy.get('.q-card').should('be.visible');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
|
|
||||||
describe.skip('Item list', () => {
|
describe('Item list', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
cy.visit(`/#/item/list`);
|
cy.visit(`/#/item/list`);
|
||||||
|
|
|
@ -6,7 +6,7 @@ describe('Item tax', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should modify the tax for Spain', () => {
|
it('should modify the tax for Spain', () => {
|
||||||
cy.dataCy('Class_select').eq(1).type('General VAT{enter}');
|
cy.dataCy('Class_select').eq(1).type('IVA General{enter}');
|
||||||
cy.dataCy('crudModelDefaultSaveBtn').click();
|
cy.dataCy('crudModelDefaultSaveBtn').click();
|
||||||
cy.checkNotification('Data saved');
|
cy.checkNotification('Data saved');
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
describe.skip('Logout', () => {
|
describe('Logout', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
cy.visit(`/#/dashboard`);
|
cy.visit(`/#/dashboard`);
|
||||||
|
|
|
@ -34,7 +34,7 @@ describe('OrderCatalog', () => {
|
||||||
searchByCustomTagInput('Silver');
|
searchByCustomTagInput('Silver');
|
||||||
});
|
});
|
||||||
|
|
||||||
it.skip('filters by custom value dialog', () => {
|
it('filters by custom value dialog', () => {
|
||||||
Cypress.on('uncaught:exception', (err) => {
|
Cypress.on('uncaught:exception', (err) => {
|
||||||
if (err.message.includes('canceled')) {
|
if (err.message.includes('canceled')) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
describe.skip('RouteAutonomous', () => {
|
describe('RouteAutonomous', () => {
|
||||||
const getLinkSelector = (colField) =>
|
const getLinkSelector = (colField, link = true) =>
|
||||||
`tr:first-child > [data-col-field="${colField}"] > .no-padding > .link`;
|
`tr:first-child > [data-col-field="${colField}"] > .no-padding${link ? ' > .link' : ''}`;
|
||||||
|
|
||||||
const selectors = {
|
const selectors = {
|
||||||
reference: 'Reference_input',
|
|
||||||
date: 'tr:first-child > [data-col-field="dated"]',
|
|
||||||
total: '.value > .text-h6',
|
total: '.value > .text-h6',
|
||||||
|
routeId: getLinkSelector('routeFk', false),
|
||||||
|
agencyRoute: getLinkSelector('agencyModeName'),
|
||||||
|
agencyAgreement: getLinkSelector('agencyAgreement'),
|
||||||
received: getLinkSelector('invoiceInFk'),
|
received: getLinkSelector('invoiceInFk'),
|
||||||
autonomous: getLinkSelector('supplierName'),
|
autonomous: getLinkSelector('supplierName'),
|
||||||
firstRowCheckbox: '.q-virtual-scroll__content tr:first-child .q-checkbox__bg',
|
firstRowCheckbox: '.q-virtual-scroll__content tr:first-child .q-checkbox__bg',
|
||||||
|
@ -13,22 +14,30 @@ describe.skip('RouteAutonomous', () => {
|
||||||
createInvoiceBtn: '.q-card > .q-btn',
|
createInvoiceBtn: '.q-card > .q-btn',
|
||||||
saveFormBtn: 'FormModelPopup_save',
|
saveFormBtn: 'FormModelPopup_save',
|
||||||
summaryIcon: 'tableAction-0',
|
summaryIcon: 'tableAction-0',
|
||||||
summaryPopupBtn: '.header > :nth-child(2) > .q-btn__content > .q-icon',
|
descriptorRouteSubtitle: '[data-cy="vnDescriptor_subtitle"]',
|
||||||
summaryHeader: '.summaryHeader > :nth-child(2)',
|
descriptorAgencyAndSupplierTitle: '[data-cy="vnDescriptor_description"]',
|
||||||
descriptorHeader: '.summaryHeader > div',
|
descriptorInvoiceInTitle: '[data-cy="vnDescriptor_title"]',
|
||||||
descriptorTitle: '.q-item__label--header > .title > span',
|
descriptorOpenSummaryBtn: '.q-menu > .descriptor [data-cy="openSummaryBtn"]',
|
||||||
summaryGoToSummaryBtn: '.header > .q-icon',
|
descriptorGoToSummaryBtn: '.q-menu > .descriptor [data-cy="goToSummaryBtn"]',
|
||||||
descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn',
|
summaryGoToSummaryBtn: '.summaryHeader [data-cy="goToSummaryBtn"]',
|
||||||
};
|
};
|
||||||
|
|
||||||
const data = {
|
const newInvoice = {
|
||||||
reference: 'Test invoice',
|
Reference: { val: 'Test invoice' },
|
||||||
total: '€206.40',
|
Company: { val: 'VNL', type: 'select' },
|
||||||
supplier: 'PLANTS SL',
|
Warehouse: { val: 'Warehouse One', type: 'select' },
|
||||||
route: 'first route',
|
Type: { val: 'Vehiculos', type: 'select' },
|
||||||
|
Description: { val: 'Test description' },
|
||||||
};
|
};
|
||||||
|
|
||||||
const summaryUrl = '/summary';
|
const total = '€206.40';
|
||||||
|
|
||||||
|
const urls = {
|
||||||
|
summaryAgencyUrlRegex: /agency\/\d+\/summary/,
|
||||||
|
summaryInvoiceInUrlRegex: /invoice-in\/\d+\/summary/,
|
||||||
|
summarySupplierUrlRegex: /supplier\/\d+\/summary/,
|
||||||
|
summaryRouteUrlRegex: /route\/\d+\/summary/,
|
||||||
|
};
|
||||||
const dataSaved = 'Data saved';
|
const dataSaved = 'Data saved';
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
@ -44,10 +53,10 @@ describe.skip('RouteAutonomous', () => {
|
||||||
.should('have.length.greaterThan', 0);
|
.should('have.length.greaterThan', 0);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Should create invoice in to selected route', () => {
|
it.skip('Should create invoice in to selected route', () => {
|
||||||
cy.get(selectors.firstRowCheckbox).click();
|
cy.get(selectors.firstRowCheckbox).click();
|
||||||
cy.get(selectors.createInvoiceBtn).click();
|
cy.get(selectors.createInvoiceBtn).click();
|
||||||
cy.dataCy(selectors.reference).type(data.reference);
|
cy.fillInForm(newInvoice);
|
||||||
cy.dataCy('attachFile').click();
|
cy.dataCy('attachFile').click();
|
||||||
cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
|
cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
|
||||||
force: true,
|
force: true,
|
||||||
|
@ -59,62 +68,120 @@ describe.skip('RouteAutonomous', () => {
|
||||||
it('Should display the total price of the selected rows', () => {
|
it('Should display the total price of the selected rows', () => {
|
||||||
cy.get(selectors.firstRowCheckbox).click();
|
cy.get(selectors.firstRowCheckbox).click();
|
||||||
cy.get(selectors.secondRowCheckbox).click();
|
cy.get(selectors.secondRowCheckbox).click();
|
||||||
cy.validateContent(selectors.total, data.total);
|
cy.validateContent(selectors.total, total);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Should redirect to the summary when clicking a route', () => {
|
it('Should redirect to the summary when clicking a route', () => {
|
||||||
cy.get(selectors.date).click();
|
cy.checkRedirectionFromPopUp({
|
||||||
cy.get(selectors.summaryHeader).should('contain', data.route);
|
selectorToClick: selectors.routeId,
|
||||||
cy.url().should('include', summaryUrl);
|
expectedUrlRegex: urls.summaryRouteUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorRouteSubtitle,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Agency route pop-ups', () => {
|
||||||
|
it('Should redirect to the agency route summary from the agency route descriptor pop-up', () => {
|
||||||
|
cy.checkRedirectionFromPopUp({
|
||||||
|
selectorToClick: selectors.agencyRoute,
|
||||||
|
steps: [selectors.descriptorGoToSummaryBtn],
|
||||||
|
expectedUrlRegex: urls.summaryAgencyUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should redirect to the agency route summary from summary pop-up from the agency route descriptor pop-up', () => {
|
||||||
|
cy.checkRedirectionFromPopUp({
|
||||||
|
selectorToClick: selectors.agencyRoute,
|
||||||
|
steps: [
|
||||||
|
selectors.descriptorOpenSummaryBtn,
|
||||||
|
selectors.summaryGoToSummaryBtn,
|
||||||
|
],
|
||||||
|
expectedUrlRegex: urls.summaryAgencyUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Agency route pop-ups', () => {
|
||||||
|
it('Should redirect to the agency agreement summary from the agency agreement descriptor pop-up', () => {
|
||||||
|
cy.checkRedirectionFromPopUp({
|
||||||
|
selectorToClick: selectors.agencyAgreement,
|
||||||
|
steps: [selectors.descriptorGoToSummaryBtn],
|
||||||
|
expectedUrlRegex: urls.summaryAgencyUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should redirect to the agency agreement summary from summary pop-up from the agency agreement descriptor pop-up', () => {
|
||||||
|
cy.checkRedirectionFromPopUp({
|
||||||
|
selectorToClick: selectors.agencyAgreement,
|
||||||
|
steps: [
|
||||||
|
selectors.descriptorOpenSummaryBtn,
|
||||||
|
selectors.summaryGoToSummaryBtn,
|
||||||
|
],
|
||||||
|
expectedUrlRegex: urls.summaryAgencyUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Received pop-ups', () => {
|
describe('Received pop-ups', () => {
|
||||||
it('Should redirect to invoice in summary from the received descriptor pop-up', () => {
|
it('Should redirect to the invoice in summary from the received descriptor pop-up', () => {
|
||||||
cy.get(selectors.received).click();
|
cy.checkRedirectionFromPopUp({
|
||||||
cy.validateContent(selectors.descriptorTitle, data.reference);
|
selectorToClick: selectors.received,
|
||||||
cy.get(selectors.descriptorGoToSummaryBtn).click();
|
steps: [selectors.descriptorGoToSummaryBtn],
|
||||||
cy.get(selectors.descriptorHeader).should('contain', data.supplier);
|
expectedUrlRegex: urls.summaryInvoiceInUrlRegex,
|
||||||
cy.url().should('include', summaryUrl);
|
expectedTextSelector: selectors.descriptorInvoiceInTitle,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Should redirect to the invoiceIn summary from summary pop-up from the received descriptor pop-up', () => {
|
it('Should redirect to the invoiceIn summary from summary pop-up from the received descriptor pop-up', () => {
|
||||||
cy.get(selectors.received).click();
|
cy.checkRedirectionFromPopUp({
|
||||||
cy.validateContent(selectors.descriptorTitle, data.reference);
|
selectorToClick: selectors.received,
|
||||||
cy.get(selectors.summaryPopupBtn).click();
|
steps: [
|
||||||
cy.get(selectors.descriptorHeader).should('contain', data.supplier);
|
selectors.descriptorOpenSummaryBtn,
|
||||||
cy.get(selectors.summaryGoToSummaryBtn).click();
|
selectors.summaryGoToSummaryBtn,
|
||||||
cy.get(selectors.descriptorHeader).should('contain', data.supplier);
|
],
|
||||||
cy.url().should('include', summaryUrl);
|
expectedUrlRegex: urls.summaryInvoiceInUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorInvoiceInTitle,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Autonomous pop-ups', () => {
|
describe('Autonomous pop-ups', () => {
|
||||||
it('Should redirect to the supplier summary from the received descriptor pop-up', () => {
|
it('Should redirect to the supplier summary from the received descriptor pop-up', () => {
|
||||||
cy.get(selectors.autonomous).click();
|
cy.checkRedirectionFromPopUp({
|
||||||
cy.validateContent(selectors.descriptorTitle, data.supplier);
|
selectorToClick: selectors.autonomous,
|
||||||
cy.get(selectors.descriptorGoToSummaryBtn).click();
|
steps: [selectors.descriptorGoToSummaryBtn],
|
||||||
cy.get(selectors.summaryHeader).should('contain', data.supplier);
|
expectedUrlRegex: urls.summarySupplierUrlRegex,
|
||||||
cy.url().should('include', summaryUrl);
|
expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Should redirect to the supplier summary from summary pop-up from the autonomous descriptor pop-up', () => {
|
it('Should redirect to the supplier summary from summary pop-up from the autonomous descriptor pop-up', () => {
|
||||||
cy.get(selectors.autonomous).click();
|
cy.checkRedirectionFromPopUp({
|
||||||
cy.get(selectors.descriptorTitle).should('contain', data.supplier);
|
selectorToClick: selectors.autonomous,
|
||||||
cy.get(selectors.summaryPopupBtn).click();
|
steps: [
|
||||||
cy.get(selectors.summaryHeader).should('contain', data.supplier);
|
selectors.descriptorOpenSummaryBtn,
|
||||||
cy.get(selectors.summaryGoToSummaryBtn).click();
|
selectors.summaryGoToSummaryBtn,
|
||||||
cy.get(selectors.summaryHeader).should('contain', data.supplier);
|
],
|
||||||
cy.url().should('include', summaryUrl);
|
expectedUrlRegex: urls.summarySupplierUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Route pop-ups', () => {
|
describe('Route pop-ups', () => {
|
||||||
it('Should redirect to the summary from the route summary pop-up', () => {
|
it('Should redirect to the summary from the route summary pop-up', () => {
|
||||||
cy.dataCy(selectors.summaryIcon).first().click();
|
cy.get(selectors.routeId)
|
||||||
cy.get(selectors.summaryHeader).should('contain', data.route);
|
.invoke('text')
|
||||||
cy.get(selectors.summaryGoToSummaryBtn).click();
|
.then((routeId) => {
|
||||||
cy.get(selectors.summaryHeader).should('contain', data.route);
|
routeId = routeId.trim();
|
||||||
cy.url().should('include', summaryUrl);
|
cy.dataCy(selectors.summaryIcon).first().click();
|
||||||
|
cy.get(selectors.summaryGoToSummaryBtn).click();
|
||||||
|
cy.url().should('match', urls.summaryRouteUrlRegex);
|
||||||
|
cy.containContent(selectors.descriptorRouteSubtitle, routeId);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -69,7 +69,8 @@ describe.skip('Route extended list', () => {
|
||||||
.type(`{selectall}{backspace}${value}`);
|
.type(`{selectall}{backspace}${value}`);
|
||||||
break;
|
break;
|
||||||
case 'checkbox':
|
case 'checkbox':
|
||||||
cy.get(selector).should('be.visible').click().click();
|
cy.get(selector).should('be.visible').click()
|
||||||
|
cy.get(selector).click();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,147 @@
|
||||||
|
describe('Vehicle DMS', () => {
|
||||||
|
const getSelector = (btnPosition) =>
|
||||||
|
`tr:last-child > .text-right > .no-wrap > :nth-child(${btnPosition}) > .q-btn > .q-btn__content > .q-icon`;
|
||||||
|
|
||||||
|
const selectors = {
|
||||||
|
lastRowDownloadBtn: getSelector(1),
|
||||||
|
lastRowEditBtn: getSelector(2),
|
||||||
|
lastRowDeleteBtn: getSelector(3),
|
||||||
|
lastRowReference: 'tr:last-child > :nth-child(5) > .q-tr > :nth-child(1) > span',
|
||||||
|
firstRowReference:
|
||||||
|
'tr:first-child > :nth-child(5) > .q-tr > :nth-child(1) > span',
|
||||||
|
firstRowId: 'tr:first-child > :nth-child(2) > .q-tr > :nth-child(1) > span',
|
||||||
|
lastRowWorkerLink: 'tr:last-child > :nth-child(8) > .q-tr > .link',
|
||||||
|
descriptorTitle: '.descriptor .title',
|
||||||
|
descriptorOpenSummaryBtn: '.q-menu .descriptor [data-cy="openSummaryBtn"]',
|
||||||
|
descriptorGoToSummaryBtn: '.q-menu .descriptor [data-cy="goToSummaryBtn"]',
|
||||||
|
summaryGoToSummaryBtn: '.summaryHeader [data-cy="goToSummaryBtn"]',
|
||||||
|
summaryTitle: '.summaryHeader',
|
||||||
|
referenceInput: 'Reference_input',
|
||||||
|
companySelect: 'Company_select',
|
||||||
|
warehouseSelect: 'Warehouse_select',
|
||||||
|
typeSelect: 'Type_select',
|
||||||
|
fileInput: 'VnDms_inputFile',
|
||||||
|
importBtn: '[data-cy="importBtn"]',
|
||||||
|
addBtn: '[data-cy="addButton"]',
|
||||||
|
saveFormBtn: 'FormModelPopup_save',
|
||||||
|
};
|
||||||
|
|
||||||
|
const data = {
|
||||||
|
Reference: { val: 'Vehicle:1234-ABC' },
|
||||||
|
Company: { val: 'VNL', type: 'select' },
|
||||||
|
Warehouse: { val: 'Warehouse One', type: 'select' },
|
||||||
|
Type: { val: 'Vehiculos', type: 'select' },
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateData = {
|
||||||
|
Reference: { val: 'Vehicle:4598-FGH' },
|
||||||
|
Company: { val: 'CCs', type: 'select' },
|
||||||
|
Warehouse: { val: 'Warehouse Two', type: 'select' },
|
||||||
|
Type: { val: 'Facturas Recibidas', type: 'select' },
|
||||||
|
};
|
||||||
|
|
||||||
|
const workerSummaryUrlRegex = /worker\/\d+\/summary/;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
cy.viewport(1920, 1080);
|
||||||
|
cy.login('developer');
|
||||||
|
cy.visit(`/#/route/vehicle/1/dms`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display vehicle DMS', () => {
|
||||||
|
cy.get('.q-table')
|
||||||
|
.children()
|
||||||
|
.should('be.visible')
|
||||||
|
.should('have.length.greaterThan', 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.skip('Should download DMS', () => {
|
||||||
|
const fileName = '11.jpg';
|
||||||
|
cy.intercept('GET', /\/api\/dms\/11\/downloadFile/).as('download');
|
||||||
|
cy.get(selectors.lastRowDownloadBtn).click();
|
||||||
|
|
||||||
|
cy.wait('@download').then((interception) => {
|
||||||
|
expect(interception.response.statusCode).to.equal(200);
|
||||||
|
expect(interception.response.headers['content-disposition']).to.contain(
|
||||||
|
fileName,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should create new DMS', () => {
|
||||||
|
const formSelectors = {
|
||||||
|
actionBtn: selectors.addBtn,
|
||||||
|
fileInput: selectors.fileInput,
|
||||||
|
saveFormBtn: selectors.saveFormBtn,
|
||||||
|
};
|
||||||
|
|
||||||
|
cy.testDmsAction('create', formSelectors, data, 'Data saved');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should import DMS', () => {
|
||||||
|
const data = {
|
||||||
|
Document: { val: '10', type: 'select' },
|
||||||
|
};
|
||||||
|
const formSelectors = {
|
||||||
|
actionBtn: selectors.importBtn,
|
||||||
|
selectorContentToCheck: selectors.lastRowReference,
|
||||||
|
saveFormBtn: selectors.saveFormBtn,
|
||||||
|
};
|
||||||
|
|
||||||
|
cy.testDmsAction('import', formSelectors, data, 'Data saved', '1');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should edit DMS', () => {
|
||||||
|
const formSelectors = {
|
||||||
|
actionBtn: selectors.lastRowEditBtn,
|
||||||
|
selectorContentToCheck: selectors.lastRowReference,
|
||||||
|
saveFormBtn: selectors.saveFormBtn,
|
||||||
|
};
|
||||||
|
|
||||||
|
cy.testDmsAction(
|
||||||
|
'edit',
|
||||||
|
formSelectors,
|
||||||
|
updateData,
|
||||||
|
'Data saved',
|
||||||
|
updateData.Reference.val,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should delete DMS', () => {
|
||||||
|
const formSelectors = {
|
||||||
|
actionBtn: selectors.lastRowDeleteBtn,
|
||||||
|
selectorContentToCheck: selectors.lastRowReference,
|
||||||
|
};
|
||||||
|
|
||||||
|
cy.testDmsAction(
|
||||||
|
'delete',
|
||||||
|
formSelectors,
|
||||||
|
null,
|
||||||
|
'Data deleted',
|
||||||
|
'Vehicle:3333-BAT',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Worker pop-ups', () => {
|
||||||
|
it('Should redirect to worker summary from worker descriptor pop-up', () => {
|
||||||
|
cy.checkRedirectionFromPopUp({
|
||||||
|
selectorToClick: selectors.lastRowWorkerLink,
|
||||||
|
steps: [selectors.descriptorGoToSummaryBtn],
|
||||||
|
expectedUrlRegex: workerSummaryUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorTitle,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should redirect to worker summary from summary pop-up from worker descriptor pop-up', () => {
|
||||||
|
cy.checkRedirectionFromPopUp({
|
||||||
|
selectorToClick: selectors.lastRowWorkerLink,
|
||||||
|
steps: [
|
||||||
|
selectors.descriptorOpenSummaryBtn,
|
||||||
|
selectors.summaryGoToSummaryBtn,
|
||||||
|
],
|
||||||
|
expectedUrlRegex: workerSummaryUrlRegex,
|
||||||
|
expectedTextSelector: selectors.descriptorTitle,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -2,7 +2,7 @@
|
||||||
const firstRow = 'tbody > :nth-child(1)';
|
const firstRow = 'tbody > :nth-child(1)';
|
||||||
|
|
||||||
describe('TicketSale', () => {
|
describe('TicketSale', () => {
|
||||||
describe.skip('Ticket #23', () => {
|
describe('Ticket #23', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('claimManager');
|
cy.login('claimManager');
|
||||||
cy.viewport(1920, 1080);
|
cy.viewport(1920, 1080);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
// https://redmine.verdnatura.es/issues/8848
|
// https://redmine.verdnatura.es/issues/8848
|
||||||
describe.skip('VnShortcuts', () => {
|
describe('VnShortcuts', () => {
|
||||||
const modules = {
|
const modules = {
|
||||||
item: 'a',
|
item: 'a',
|
||||||
customer: 'c',
|
customer: 'c',
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue