feat: #8443 created vehicle events #1379
|
|
@ -44,6 +44,7 @@ export default defineConfig({
|
|||
supportFile: 'test/cypress/support/index.js',
|
||||
videosFolder: 'test/cypress/videos',
|
||||
downloadsFolder: 'test/cypress/downloads',
|
||||
tmpUploadFolder: 'test/cypress/storage/tmp/dms',
|
||||
video: false,
|
||||
specPattern: 'test/cypress/integration/**/*.spec.js',
|
||||
experimentalRunAllSpecs: true,
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ describe('Axios boot', () => {
|
|||
};
|
||||
|
||||
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 () => {
|
||||
|
|
@ -83,7 +83,7 @@ describe('Axios boot', () => {
|
|||
};
|
||||
|
||||
const result = onResponseError(error);
|
||||
expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
import { boot } from 'quasar/wrappers';
|
||||
import { date as quasarDate } from 'quasar';
|
||||
const { formatDate } = quasarDate;
|
||||
|
||||
export default boot(() => {
|
||||
Date.vnUTC = () => {
|
||||
|
|
@ -25,4 +27,34 @@ export default boot(() => {
|
|||
const date = new Date(Date.vnUTC());
|
||||
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
||||
};
|
||||
|
||||
Date.getCurrentDateTimeFormatted = (
|
||||
options = {
|
||||
startOfDay: false,
|
||||
endOfDay: true,
|
||||
iso: true,
|
||||
mask: 'DD-MM-YYYY HH:mm',
|
||||
},
|
||||
) => {
|
||||
const date = Date.vnUTC();
|
||||
if (options.startOfDay) {
|
||||
date.setHours(0, 0, 0);
|
||||
}
|
||||
if (options.endOfDay) {
|
||||
date.setHours(23, 59, 0);
|
||||
}
|
||||
if (options.iso) {
|
||||
return date.toISOString();
|
||||
}
|
||||
return formatDate(date, options.mask);
|
||||
};
|
||||
|
||||
Date.convertToISODateTime = (dateTimeStr) => {
|
||||
const [datePart, timePart] = dateTimeStr.split(' ');
|
||||
const [day, month, year] = datePart.split('-');
|
||||
const [hours, minutes] = timePart.split(':');
|
||||
|
||||
const isoDate = new Date(year, month - 1, day, hours, minutes);
|
||||
return isoDate.toISOString();
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ const postcodeFormData = reactive({
|
|||
provinceFk: null,
|
||||
townFk: null,
|
||||
});
|
||||
const townFilter = ref({});
|
||||
|
||||
const countriesRef = ref(false);
|
||||
const provincesOptions = ref([]);
|
||||
|
|
@ -33,11 +32,11 @@ function onDataSaved(formData) {
|
|||
newPostcode.town = town.value.name;
|
||||
newPostcode.townFk = town.value.id;
|
||||
const provinceObject = provincesOptions.value.find(
|
||||
({ id }) => id === formData.provinceFk
|
||||
({ id }) => id === formData.provinceFk,
|
||||
);
|
||||
newPostcode.province = provinceObject?.name;
|
||||
const countryObject = countriesRef.value.opts.find(
|
||||
({ id }) => id === formData.countryFk
|
||||
({ id }) => id === formData.countryFk,
|
||||
);
|
||||
newPostcode.country = countryObject?.name;
|
||||
emit('onDataSaved', newPostcode);
|
||||
|
|
@ -67,21 +66,11 @@ function setTown(newTown, data) {
|
|||
}
|
||||
async function onCityCreated(newTown, formData) {
|
||||
newTown.province = provincesOptions.value.find(
|
||||
(province) => province.id === newTown.provinceFk
|
||||
(province) => province.id === newTown.provinceFk,
|
||||
);
|
||||
formData.townFk = newTown;
|
||||
setTown(newTown, formData);
|
||||
}
|
||||
|
||||
async function filterTowns(name) {
|
||||
if (name !== '') {
|
||||
townFilter.value.where = {
|
||||
name: {
|
||||
like: `%${name}%`,
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -107,7 +96,6 @@ async function filterTowns(name) {
|
|||
<VnSelectDialog
|
||||
:label="t('City')"
|
||||
@update:model-value="(value) => setTown(value, data)"
|
||||
@filter="filterTowns"
|
||||
:tooltip="t('Create city')"
|
||||
v-model="data.townFk"
|
||||
url="Towns/location"
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ const $props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
beforeSaveFn: {
|
||||
type: Function,
|
||||
type: [String, Function],
|
||||
default: null,
|
||||
},
|
||||
goTo: {
|
||||
|
|
@ -83,7 +83,7 @@ const isLoading = ref(false);
|
|||
const hasChanges = ref(false);
|
||||
const originalData = ref();
|
||||
const vnPaginateRef = ref();
|
||||
const formData = ref([]);
|
||||
const formData = ref();
|
||||
const saveButtonRef = ref(null);
|
||||
const watchChanges = ref();
|
||||
const formUrl = computed(() => $props.url);
|
||||
|
|
@ -298,6 +298,10 @@ watch(formUrl, async () => {
|
|||
});
|
||||
</script>
|
||||
<template>
|
||||
<SkeletonTable
|
||||
v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
|
||||
:columns="$attrs.columns?.length"
|
||||
/>
|
||||
<VnPaginate
|
||||
:url="url"
|
||||
:limit="limit"
|
||||
|
|
@ -316,10 +320,6 @@ watch(formUrl, async () => {
|
|||
></slot>
|
||||
</template>
|
||||
</VnPaginate>
|
||||
<SkeletonTable
|
||||
v-if="!formData && $attrs.autoLoad"
|
||||
:columns="$attrs.columns?.length"
|
||||
/>
|
||||
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
|
||||
<QBtnGroup push style="column-gap: 10px">
|
||||
<slot name="moreBeforeActions" />
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
|
|||
img.onerror = () => {
|
||||
notify(
|
||||
t("This photo provider doesn't allow remote downloads"),
|
||||
'negative'
|
||||
'negative',
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
@ -219,11 +219,7 @@ const makeRequest = async () => {
|
|||
color="primary"
|
||||
class="cursor-pointer"
|
||||
@click="rotateLeft()"
|
||||
>
|
||||
<!-- <QTooltip class="no-pointer-events">
|
||||
{{ t('Rotate left') }}
|
||||
</QTooltip> -->
|
||||
</QIcon>
|
||||
/>
|
||||
<div>
|
||||
<div ref="photoContainerRef" />
|
||||
</div>
|
||||
|
|
@ -233,11 +229,7 @@ const makeRequest = async () => {
|
|||
color="primary"
|
||||
class="cursor-pointer"
|
||||
@click="rotateRight()"
|
||||
>
|
||||
<!-- <QTooltip class="no-pointer-events">
|
||||
{{ t('Rotate right') }}
|
||||
</QTooltip> -->
|
||||
</QIcon>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="column">
|
||||
|
|
@ -265,7 +257,6 @@ const makeRequest = async () => {
|
|||
class="cursor-pointer q-mr-sm"
|
||||
@click="openInputFile()"
|
||||
>
|
||||
<!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
|
||||
</QIcon>
|
||||
<QIcon name="info" class="cursor-pointer">
|
||||
<QTooltip>{{
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
|
|||
const { notify } = useNotify();
|
||||
const route = useRoute();
|
||||
const myForm = ref(null);
|
||||
const attrs = useAttrs();
|
||||
const $props = defineProps({
|
||||
url: {
|
||||
type: String,
|
||||
|
|
@ -99,8 +98,12 @@ const $props = defineProps({
|
|||
type: Function,
|
||||
default: () => {},
|
||||
},
|
||||
preventSubmit: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(['onFetch', 'onDataSaved']);
|
||||
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
|
||||
const modelValue = computed(
|
||||
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
||||
).value;
|
||||
|
|
@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
|
|||
);
|
||||
}
|
||||
async function onKeyup(evt) {
|
||||
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
|
||||
if (evt.key === 'Enter' && !$props.preventSubmit) {
|
||||
const input = evt.target;
|
||||
if (input.type == 'textarea' && evt.shiftKey) {
|
||||
let { selectionStart, selectionEnd } = input;
|
||||
|
|
@ -330,6 +333,7 @@ defineExpose({
|
|||
<template>
|
||||
<div class="column items-center full-width">
|
||||
<QForm
|
||||
v-on="$attrs"
|
||||
ref="myForm"
|
||||
v-if="formData"
|
||||
@submit.prevent="save"
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ const searchModule = () => {
|
|||
<template>
|
||||
<QList padding class="column-max-width">
|
||||
<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">
|
||||
<VnInput
|
||||
v-model="search"
|
||||
|
|
@ -262,7 +262,7 @@ const searchModule = () => {
|
|||
</template>
|
||||
|
||||
<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">
|
||||
<QItemSection avatar v-if="item.icon">
|
||||
<QIcon :name="item.icon" />
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
|
|||
'no-visible': !stateQuery.isLoading().value,
|
||||
}"
|
||||
size="sm"
|
||||
data-cy="loading-spinner"
|
||||
data-cy="navBar-spinner"
|
||||
/>
|
||||
<QSpace />
|
||||
<div id="searchbar" class="searchbar"></div>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const $props = defineProps({
|
|||
required: true,
|
||||
},
|
||||
searchUrl: {
|
||||
type: String,
|
||||
type: [String, Boolean],
|
||||
default: 'table',
|
||||
},
|
||||
vertical: {
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ const $props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
create: {
|
||||
type: Object,
|
||||
type: [Boolean, Object],
|
||||
default: null,
|
||||
},
|
||||
createAsDialog: {
|
||||
|
|
@ -751,6 +751,7 @@ const rowCtrlClickFunction = computed(() => {
|
|||
withFilters
|
||||
"
|
||||
:column="col"
|
||||
:data-cy="`column-filter-${col.name}`"
|
||||
:show-title="true"
|
||||
:data-key="$attrs['data-key']"
|
||||
v-model="params[columnName(col)]"
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ function columnName(col) {
|
|||
v-bind="$attrs"
|
||||
:search-button="true"
|
||||
:disable-submit-event="true"
|
||||
:data-key="$attrs['data-key']"
|
||||
:search-url
|
||||
>
|
||||
<template #body="{ params, orders, searchFn }">
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ async function getConfig(url, filter) {
|
|||
const response = await axios.get(url, {
|
||||
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() {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ describe('VnTable', () => {
|
|||
propsData: {
|
||||
columns: [],
|
||||
},
|
||||
attrs: {
|
||||
'data-key': 'test',
|
||||
},
|
||||
});
|
||||
vm = wrapper.vm;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,7 @@ describe('CrudModel', () => {
|
|||
beforeAll(() => {
|
||||
wrapper = createWrapper(CrudModel, {
|
||||
global: {
|
||||
stubs: [
|
||||
'vnPaginate',
|
||||
'useState',
|
||||
'arrayData',
|
||||
'useStateStore',
|
||||
'vue-i18n',
|
||||
],
|
||||
stubs: ['vnPaginate', 'vue-i18n'],
|
||||
mocks: {
|
||||
validate: vi.fn(),
|
||||
},
|
||||
|
|
@ -29,7 +23,7 @@ describe('CrudModel', () => {
|
|||
dataKey: 'crudModelKey',
|
||||
model: 'crudModel',
|
||||
url: 'crudModelUrl',
|
||||
saveFn: '',
|
||||
saveFn: vi.fn(),
|
||||
},
|
||||
});
|
||||
wrapper = wrapper.wrapper;
|
||||
|
|
@ -231,7 +225,7 @@ describe('CrudModel', () => {
|
|||
expect(vm.isLoading).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 () => {
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
|
|||
vm = mount('card').vm;
|
||||
});
|
||||
|
||||
it('should get routes for card source', async () => {
|
||||
it('should get routes for card source', () => {
|
||||
vm.getRoutes();
|
||||
});
|
||||
});
|
||||
|
|
@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
|
|||
});
|
||||
|
||||
it('should get routes for main source', () => {
|
||||
vm.props.source = 'main';
|
||||
vm.getRoutes();
|
||||
expect(navigation.getModules).toHaveBeenCalled();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
|
|||
<VnInput
|
||||
v-model="model"
|
||||
ref="inputRef"
|
||||
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
|
||||
@keydown.tab="$refs.inputRef.vnInputRef.blur()"
|
||||
@blur="model = useAccountShortToStandard(model) ?? model"
|
||||
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
const model = defineModel({ type: [String, Number], required: true });
|
||||
const model = defineModel({ type: [String, Number], default: '' });
|
||||
</script>
|
||||
<template>
|
||||
<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 axios from 'axios';
|
||||
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
|
|
@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
|
|||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
const emit = defineEmits(['onDataSaved']);
|
||||
|
||||
const $props = defineProps({
|
||||
|
|
@ -61,8 +63,11 @@ function onFileChange(files) {
|
|||
|
||||
function mapperDms(data) {
|
||||
const formData = new FormData();
|
||||
const { files } = data;
|
||||
if (files) formData.append(files?.name, files);
|
||||
let files = data.files;
|
||||
if (files) {
|
||||
files = Array.isArray(files) ? files : [files];
|
||||
files.forEach((file) => formData.append(file?.name, file));
|
||||
}
|
||||
|
||||
const dms = {
|
||||
hasFile: !!data.hasFile,
|
||||
|
|
@ -83,11 +88,16 @@ function getUrl() {
|
|||
}
|
||||
|
||||
async function save() {
|
||||
const body = mapperDms(dms.value);
|
||||
const response = await axios.post(getUrl(), body[0], body[1]);
|
||||
emit('onDataSaved', body[1].params, response);
|
||||
delete dms.value.files;
|
||||
return response;
|
||||
try {
|
||||
const body = mapperDms(dms.value);
|
||||
const response = await axios.post(getUrl(), body[0], body[1]);
|
||||
emit('onDataSaved', body[1].params, response);
|
||||
notify(t('globals.dataSaved'), 'positive');
|
||||
delete dms.value.files;
|
||||
return response;
|
||||
} catch (e) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
function defaultData() {
|
||||
|
|
@ -208,7 +218,7 @@ function addDefaultData(data) {
|
|||
}
|
||||
</style>
|
||||
<i18n>
|
||||
en:
|
||||
en:
|
||||
contentTypesInfo: Allowed file types {allowedContentTypes}
|
||||
EntryDmsDescription: Reference {reference}
|
||||
WorkersDescription: Working of employee id {reference}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,12 @@ import VnDms from 'src/components/common/VnDms.vue';
|
|||
import VnConfirm from 'components/ui/VnConfirm.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
import { useSession } from 'src/composables/useSession';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
const route = useRoute();
|
||||
const quasar = useQuasar();
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
const rows = ref([]);
|
||||
const dmsRef = ref();
|
||||
const formDialog = ref({});
|
||||
|
|
@ -88,7 +90,6 @@ const dmsFilter = {
|
|||
],
|
||||
},
|
||||
},
|
||||
where: { [$props.filter]: route.params.id },
|
||||
};
|
||||
|
||||
const columns = computed(() => [
|
||||
|
|
@ -258,9 +259,16 @@ function deleteDms(dmsFk) {
|
|||
},
|
||||
})
|
||||
.onOk(async () => {
|
||||
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
|
||||
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
||||
rows.value.splice(index, 1);
|
||||
try {
|
||||
await axios.post(
|
||||
`${$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"
|
||||
:url="$props.model"
|
||||
:user-filter="dmsFilter"
|
||||
search-url="dmsFilter"
|
||||
:order="['dmsFk DESC']"
|
||||
:filter="{ where: { [$props.filter]: route.params.id } }"
|
||||
auto-load
|
||||
@on-fetch="setData"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script setup>
|
||||
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
|
||||
import { date } from 'quasar';
|
||||
import { nextTick, watch, computed, ref, useAttrs } from 'vue';
|
||||
import { date, getCssVar } from 'quasar';
|
||||
import VnDate from './VnDate.vue';
|
||||
import { useRequired } from 'src/composables/useRequired';
|
||||
|
||||
|
|
@ -20,61 +20,18 @@ const $props = defineProps({
|
|||
});
|
||||
|
||||
const vnInputDateRef = ref(null);
|
||||
const errColor = getCssVar('negative');
|
||||
const textColor = ref('');
|
||||
|
||||
const dateFormat = 'DD/MM/YYYY';
|
||||
const isPopupOpen = ref();
|
||||
const hover = ref();
|
||||
const mask = ref();
|
||||
|
||||
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(() =>
|
||||
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(() => {
|
||||
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) => {
|
||||
formattedDate.value = date;
|
||||
inputValue.value = date.split('/').reverse().join('/');
|
||||
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>
|
||||
|
||||
<template>
|
||||
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||
<QInput
|
||||
ref="vnInputDateRef"
|
||||
v-model="formattedDate"
|
||||
v-model="inputValue"
|
||||
class="vn-input-date"
|
||||
:mask="mask"
|
||||
placeholder="dd/mm/aaaa"
|
||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||
:class="{ required: isRequired }"
|
||||
:rules="mixinRules"
|
||||
:clearable="false"
|
||||
:input-style="{ color: textColor }"
|
||||
@click="isPopupOpen = !isPopupOpen"
|
||||
@keydown="isPopupOpen = false"
|
||||
@blur="formatDate"
|
||||
@keydown.enter.prevent="handleEnter"
|
||||
hide-bottom-space
|
||||
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
||||
@update:model-value="validateAndCleanInput"
|
||||
>
|
||||
<template #append>
|
||||
<QIcon
|
||||
|
|
@ -116,11 +183,12 @@ const manageDate = (date) => {
|
|||
v-if="
|
||||
($attrs.clearable == undefined || $attrs.clearable) &&
|
||||
hover &&
|
||||
model &&
|
||||
inputValue &&
|
||||
!$attrs.disable
|
||||
"
|
||||
@click="
|
||||
vnInputDateRef.focus();
|
||||
inputValue = null;
|
||||
model = null;
|
||||
isPopupOpen = false;
|
||||
"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,79 @@
|
|||
<script setup>
|
||||
import { computed, useAttrs } from 'vue';
|
||||
import { date } from 'quasar';
|
||||
import VnDate from './VnDate.vue';
|
||||
import VnTime from './VnTime.vue';
|
||||
|
||||
const $attrs = useAttrs();
|
||||
const model = defineModel({ type: [Date, String] });
|
||||
|
||||
const $props = defineProps({
|
||||
isOutlined: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
showEvent: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
const styleAttrs = computed(() => {
|
||||
return $props.isOutlined
|
||||
? {
|
||||
dense: true,
|
||||
outlined: true,
|
||||
rounded: true,
|
||||
}
|
||||
: {};
|
||||
});
|
||||
const mask = 'DD-MM-YYYY HH:mm';
|
||||
const selectedDate = computed({
|
||||
get() {
|
||||
if (!model.value) return JSON.stringify(new Date(model.value));
|
||||
return date.formatDate(new Date(model.value), mask);
|
||||
},
|
||||
set(value) {
|
||||
model.value = Date.convertToISODateTime(value);
|
||||
},
|
||||
});
|
||||
const manageDate = (date) => {
|
||||
selectedDate.value = date;
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||
<QInput
|
||||
ref="vnInputDateRef"
|
||||
v-model="selectedDate"
|
||||
class="vn-input-date"
|
||||
placeholder="dd/mm/aaaa HH:mm"
|
||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||
:clearable="false"
|
||||
@click="isPopupOpen = !isPopupOpen"
|
||||
@keydown="isPopupOpen = false"
|
||||
hide-bottom-space
|
||||
@update:model-value="manageDate"
|
||||
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
|
||||
>
|
||||
<template #prepend>
|
||||
<QIcon name="today" size="xs">
|
||||
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
||||
<VnDate :mask="mask" v-model="selectedDate" />
|
||||
</QPopupProxy>
|
||||
</QIcon>
|
||||
</template>
|
||||
<template #append>
|
||||
<QIcon name="access_time" size="xs">
|
||||
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
||||
<VnTime format24h :mask="mask" v-model="selectedDate" />
|
||||
</QPopupProxy>
|
||||
</QIcon>
|
||||
</template>
|
||||
</QInput>
|
||||
</div>
|
||||
</template>
|
||||
<i18n>
|
||||
es:
|
||||
Open date: Abrir fecha
|
||||
</i18n>
|
||||
|
|
@ -54,6 +54,10 @@ const $props = defineProps({
|
|||
type: [Array],
|
||||
default: () => [],
|
||||
},
|
||||
filterFn: {
|
||||
type: Function,
|
||||
default: null,
|
||||
},
|
||||
exprBuilder: {
|
||||
type: Function,
|
||||
default: null,
|
||||
|
|
@ -62,16 +66,12 @@ const $props = defineProps({
|
|||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
defaultFilter: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
fields: {
|
||||
type: Array,
|
||||
default: null,
|
||||
},
|
||||
include: {
|
||||
type: [Object, Array],
|
||||
type: [Object, Array, String],
|
||||
default: null,
|
||||
},
|
||||
where: {
|
||||
|
|
@ -79,7 +79,7 @@ const $props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
sortBy: {
|
||||
type: String,
|
||||
type: [String, Array],
|
||||
default: null,
|
||||
},
|
||||
limit: {
|
||||
|
|
@ -156,6 +156,8 @@ const computedSortBy = computed(() => {
|
|||
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||
});
|
||||
|
||||
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
||||
|
||||
watch(options, (newValue) => {
|
||||
setOptions(newValue);
|
||||
});
|
||||
|
|
@ -183,7 +185,7 @@ const arrayData = useArrayData(arrayDataKey, {
|
|||
searchUrl: false,
|
||||
mapKey: $attrs['map-key'],
|
||||
});
|
||||
|
||||
const someIsLoading = computed(() => isLoading.value || arrayData.isLoading);
|
||||
function findKeyInOptions() {
|
||||
if (!$props.options) return;
|
||||
return filter($props.modelValue, $props.options)?.length;
|
||||
|
|
@ -252,43 +254,41 @@ async function fetchFilter(val) {
|
|||
}
|
||||
|
||||
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;
|
||||
|
||||
if (!$props.defaultFilter) return update();
|
||||
if (
|
||||
$props.url &&
|
||||
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
|
||||
) {
|
||||
newOptions = await fetchFilter(val);
|
||||
} else newOptions = filter(val, myOptionsOriginal.value);
|
||||
update(
|
||||
() => {
|
||||
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
||||
newOptions.unshift(noOneOpt.value);
|
||||
if ($props.filterFn) update($props.filterFn(val));
|
||||
else if (!val && lastVal.value === val) update();
|
||||
else {
|
||||
const makeRequest =
|
||||
($props.url && $props.limit) ||
|
||||
(!$props.limit && Object.keys(myOptions.value).length === 0);
|
||||
newOptions = makeRequest
|
||||
? await fetchFilter(val)
|
||||
: filter(val, myOptionsOriginal.value);
|
||||
|
||||
myOptions.value = newOptions;
|
||||
},
|
||||
(ref) => {
|
||||
if (val !== '' && ref.options.length > 0) {
|
||||
ref.setOptionIndex(-1);
|
||||
ref.moveOptionSelection(1, true);
|
||||
}
|
||||
},
|
||||
);
|
||||
update(
|
||||
() => {
|
||||
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
||||
newOptions.unshift(noOneOpt.value);
|
||||
|
||||
myOptions.value = newOptions;
|
||||
},
|
||||
(ref) => {
|
||||
if (val !== '' && ref.options.length > 0) {
|
||||
ref.setOptionIndex(-1);
|
||||
ref.moveOptionSelection(1, true);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
lastVal.value = val;
|
||||
}
|
||||
|
||||
function nullishToTrue(value) {
|
||||
return value ?? true;
|
||||
}
|
||||
|
||||
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
||||
|
||||
async function onScroll({ to, direction, from, index }) {
|
||||
const lastIndex = myOptions.value.length - 1;
|
||||
|
||||
|
|
@ -366,7 +366,8 @@ function getCaption(opt) {
|
|||
virtual-scroll-slice-size="options.length"
|
||||
hide-bottom-space
|
||||
:input-debounce="useURL ? '300' : '0'"
|
||||
:loading="isLoading"
|
||||
:loading="someIsLoading"
|
||||
:disable="someIsLoading"
|
||||
@virtual-scroll="onScroll"
|
||||
@keydown="handleKeyDown"
|
||||
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
|
|||
|
||||
describe('VnDiscount', () => {
|
||||
let vm;
|
||||
|
||||
|
||||
beforeAll(() => {
|
||||
vm = createWrapper(VnDiscount, {
|
||||
props: {
|
||||
|
|
@ -12,7 +12,9 @@ describe('VnDiscount', () => {
|
|||
price: 100,
|
||||
quantity: 2,
|
||||
discount: 10,
|
||||
}
|
||||
mana: 10,
|
||||
promise: vi.fn(),
|
||||
},
|
||||
}).vm;
|
||||
});
|
||||
|
||||
|
|
@ -21,8 +23,8 @@ describe('VnDiscount', () => {
|
|||
});
|
||||
|
||||
describe('total', () => {
|
||||
it('should calculate total correctly', () => {
|
||||
it('should calculate total correctly', () => {
|
||||
expect(vm.total).toBe(180);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -41,10 +41,12 @@ describe('VnDms', () => {
|
|||
companyFk: 2,
|
||||
dmsTypeFk: 3,
|
||||
description: 'This is a test description',
|
||||
files: {
|
||||
name: 'example.txt',
|
||||
content: new Blob(['file content'], { type: 'text/plain' }),
|
||||
},
|
||||
files: [
|
||||
{
|
||||
name: 'example.txt',
|
||||
content: new Blob(['file content'], { type: 'text/plain' }),
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const expectedBody = {
|
||||
|
|
@ -83,7 +85,7 @@ describe('VnDms', () => {
|
|||
it('should map DMS data correctly and add file to FormData', () => {
|
||||
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);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import { createWrapper } from 'app/test/vitest/helper';
|
|||
import { vi, describe, expect, it } from 'vitest';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
|
||||
describe('VnInput', () => {
|
||||
let vm;
|
||||
let wrapper;
|
||||
|
|
@ -11,26 +10,28 @@ describe('VnInput', () => {
|
|||
function generateWrapper(value, isOutlined, emptyToNull, insertable) {
|
||||
wrapper = createWrapper(VnInput, {
|
||||
props: {
|
||||
modelValue: value,
|
||||
isOutlined, emptyToNull, insertable,
|
||||
maxlength: 101
|
||||
modelValue: value,
|
||||
isOutlined,
|
||||
emptyToNull,
|
||||
insertable,
|
||||
maxlength: 101,
|
||||
},
|
||||
attrs: {
|
||||
label: 'test',
|
||||
required: true,
|
||||
maxlength: 101,
|
||||
maxLength: 10,
|
||||
'max-length':20
|
||||
'max-length': 20,
|
||||
},
|
||||
});
|
||||
wrapper = wrapper.wrapper;
|
||||
vm = wrapper.vm;
|
||||
input = wrapper.find('[data-cy="test_input"]');
|
||||
};
|
||||
}
|
||||
|
||||
describe('value', () => {
|
||||
it('should emit update:modelValue when value changes', async () => {
|
||||
generateWrapper('12345', false, false, true)
|
||||
generateWrapper('12345', false, false, true);
|
||||
await input.setValue('123');
|
||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
|
||||
|
|
@ -46,37 +47,36 @@ describe('VnInput', () => {
|
|||
describe('styleAttrs', () => {
|
||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||
generateWrapper('123', false, false, false);
|
||||
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('123', true, false, false);
|
||||
expect(vm.styleAttrs.outlined).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('handleKeydown', () => {
|
||||
describe('handleKeydown', () => {
|
||||
it('should do nothing when "Backspace" key is pressed', async () => {
|
||||
generateWrapper('12345', false, false, true);
|
||||
await input.trigger('keydown', { key: 'Backspace' });
|
||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
|
||||
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
|
||||
expect(spyhandler).not.toHaveBeenCalled();
|
||||
|
||||
});
|
||||
|
||||
|
||||
/*
|
||||
TODO: #8399 REDMINE
|
||||
*/
|
||||
it.skip('handleKeydown respects insertable behavior', async () => {
|
||||
const expectedValue = '12345';
|
||||
generateWrapper('1234', false, false, true);
|
||||
vm.focus()
|
||||
vm.focus();
|
||||
await input.trigger('keydown', { key: '5' });
|
||||
await vm.$nextTick();
|
||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
|
||||
expect(vm.value).toBe( expectedValue);
|
||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
|
||||
expect(vm.value).toBe(expectedValue);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -86,6 +86,6 @@ describe('VnInput', () => {
|
|||
const focusSpy = vi.spyOn(input.element, 'focus');
|
||||
vm.focus();
|
||||
expect(focusSpy).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
|
|||
let vm;
|
||||
let wrapper;
|
||||
|
||||
function generateWrapper(date, outlined, required) {
|
||||
function generateWrapper(outlined = false, required = false) {
|
||||
wrapper = createWrapper(VnInputDate, {
|
||||
props: {
|
||||
modelValue: date,
|
||||
modelValue: '2000-12-31T23:00:00.000Z',
|
||||
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
|
||||
},
|
||||
attrs: {
|
||||
isOutlined: outlined,
|
||||
required: required
|
||||
required: required,
|
||||
},
|
||||
});
|
||||
wrapper = wrapper.wrapper;
|
||||
vm = wrapper.vm;
|
||||
};
|
||||
}
|
||||
|
||||
describe('VnInputDate', () => {
|
||||
|
||||
describe('formattedDate', () => {
|
||||
it('formats a valid date correctly', async () => {
|
||||
generateWrapper('2023-12-25', false, false);
|
||||
describe('formattedDate', () => {
|
||||
it('validateAndCleanInput should remove non-numeric characters', async () => {
|
||||
generateWrapper();
|
||||
vm.validateAndCleanInput('10a/1s2/2dd0a23');
|
||||
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 () => {
|
||||
const input = wrapper.find('input');
|
||||
await input.setValue('31/12/2023');
|
||||
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
||||
it('manageDate should reverse the date', async () => {
|
||||
generateWrapper();
|
||||
vm.manageDate('10/12/2023');
|
||||
await vm.$nextTick();
|
||||
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');
|
||||
await input.setValue('invalid-date');
|
||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
||||
});
|
||||
await input.setValue('25.12/2002');
|
||||
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', () => {
|
||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||
generateWrapper('2023-12-25', false, false);
|
||||
generateWrapper();
|
||||
await vm.$nextTick();
|
||||
expect(vm.styleAttrs).toEqual({});
|
||||
expect(vm.styleAttrs).toEqual({});
|
||||
});
|
||||
|
||||
it('should set styleAttrs when isOutlined is true', async () => {
|
||||
generateWrapper('2023-12-25', true, false);
|
||||
it('should set styleAttrs when isOutlined is true', async () => {
|
||||
generateWrapper(true, false);
|
||||
await vm.$nextTick();
|
||||
expect(vm.styleAttrs.outlined).toBe(true);
|
||||
});
|
||||
|
|
@ -58,15 +77,15 @@ describe('VnInputDate', () => {
|
|||
|
||||
describe('required', () => {
|
||||
it('should not applies required class when isRequired is false', async () => {
|
||||
generateWrapper('2023-12-25', false, false);
|
||||
generateWrapper();
|
||||
await vm.$nextTick();
|
||||
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
|
||||
});
|
||||
|
||||
|
||||
it('should applies required class when isRequired is true', async () => {
|
||||
generateWrapper('2023-12-25', false, true);
|
||||
generateWrapper(false, true);
|
||||
await vm.$nextTick();
|
||||
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -0,0 +1,81 @@
|
|||
import { createWrapper } from 'app/test/vitest/helper.js';
|
||||
import { describe, it, expect, beforeAll } from 'vitest';
|
||||
import VnInputDateTime from 'components/common/VnInputDateTime.vue';
|
||||
import vnDateBoot from 'src/boot/vnDate';
|
||||
|
||||
let vm;
|
||||
let wrapper;
|
||||
|
||||
beforeAll(() => {
|
||||
// Initialize the vnDate boot
|
||||
vnDateBoot();
|
||||
});
|
||||
function generateWrapper(date, outlined, showEvent) {
|
||||
wrapper = createWrapper(VnInputDateTime, {
|
||||
props: {
|
||||
modelValue: date,
|
||||
isOutlined: outlined,
|
||||
showEvent: showEvent,
|
||||
},
|
||||
});
|
||||
wrapper = wrapper.wrapper;
|
||||
vm = wrapper.vm;
|
||||
}
|
||||
|
||||
describe('VnInputDateTime', () => {
|
||||
describe('selectedDate', () => {
|
||||
it('formats a valid datetime correctly', async () => {
|
||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||
await vm.$nextTick();
|
||||
expect(vm.selectedDate).toBe('25-12-2023 10:30');
|
||||
});
|
||||
|
||||
it('handles null date value', async () => {
|
||||
generateWrapper(null, false, true);
|
||||
await vm.$nextTick();
|
||||
expect(vm.selectedDate).not.toBe(null);
|
||||
});
|
||||
|
||||
it('updates the model value when a new datetime is set', async () => {
|
||||
vm.selectedDate = '31-12-2023 15:45';
|
||||
await vm.$nextTick();
|
||||
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
||||
describe('styleAttrs', () => {
|
||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||
await vm.$nextTick();
|
||||
expect(vm.styleAttrs).toEqual({});
|
||||
});
|
||||
|
||||
it('should set styleAttrs when isOutlined is true', async () => {
|
||||
generateWrapper('2023-12-25T10:30:00', true, true);
|
||||
await vm.$nextTick();
|
||||
expect(vm.styleAttrs).toEqual({
|
||||
dense: true,
|
||||
outlined: true,
|
||||
rounded: true,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('component rendering', () => {
|
||||
it('should render date and time icons', async () => {
|
||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||
await vm.$nextTick();
|
||||
const icons = wrapper.findAllComponents({ name: 'QIcon' });
|
||||
expect(icons.length).toBe(2);
|
||||
expect(icons[0].props('name')).toBe('today');
|
||||
expect(icons[1].props('name')).toBe('access_time');
|
||||
});
|
||||
|
||||
it('should render popup proxies for date and time', async () => {
|
||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||
await vm.$nextTick();
|
||||
const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
|
||||
expect(popups.length).toBe(2);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -90,8 +90,10 @@ describe('VnLog', () => {
|
|||
|
||||
vm = createWrapper(VnLog, {
|
||||
global: {
|
||||
stubs: [],
|
||||
mocks: {},
|
||||
stubs: ['FetchData', 'vue-i18n'],
|
||||
mocks: {
|
||||
fetch: vi.fn(),
|
||||
},
|
||||
},
|
||||
propsData: {
|
||||
model: 'Claim',
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ describe('VnNotes', () => {
|
|||
) {
|
||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
||||
wrapper = createWrapper(VnNotes, {
|
||||
propsData: options,
|
||||
propsData: { ...defaultOptions, ...options },
|
||||
});
|
||||
wrapper = wrapper.wrapper;
|
||||
vm = wrapper.vm;
|
||||
|
|
|
|||
|
|
@ -58,7 +58,8 @@ async function getData() {
|
|||
store.filter = $props.filter ?? {};
|
||||
isLoading.value = true;
|
||||
try {
|
||||
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
||||
await arrayData.fetch({ append: false, updateRouter: false });
|
||||
const { data } = store;
|
||||
state.set($props.dataKey, data);
|
||||
emit('onFetch', data);
|
||||
} finally {
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@ const getLocale = (label) => {
|
|||
color="primary"
|
||||
style="position: fixed; z-index: 1; right: 0; bottom: 0"
|
||||
icon="search"
|
||||
data-cy="vnFilterPanel_search"
|
||||
@click="search()"
|
||||
>
|
||||
<QTooltip bottom anchor="bottom right">
|
||||
|
|
@ -229,6 +230,7 @@ const getLocale = (label) => {
|
|||
<QItemSection top side>
|
||||
<QBtn
|
||||
@click="clearFilters"
|
||||
data-cy="clearFilters"
|
||||
color="primary"
|
||||
dense
|
||||
flat
|
||||
|
|
@ -292,6 +294,7 @@ const getLocale = (label) => {
|
|||
</QList>
|
||||
</QForm>
|
||||
<QInnerLoading
|
||||
data-cy="filterPanel-spinner"
|
||||
:label="t('globals.pleaseWait')"
|
||||
:showing="isLoading"
|
||||
color="primary"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useArrayData } from 'composables/useArrayData';
|
||||
import { useAttrs } from 'vue';
|
||||
|
||||
const attrs = useAttrs();
|
||||
const { t } = useI18n();
|
||||
|
||||
const props = defineProps({
|
||||
|
|
@ -67,7 +69,7 @@ const props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
searchUrl: {
|
||||
type: String,
|
||||
type: [String, Boolean],
|
||||
default: null,
|
||||
},
|
||||
disableInfiniteScroll: {
|
||||
|
|
@ -75,7 +77,7 @@ const props = defineProps({
|
|||
default: false,
|
||||
},
|
||||
mapKey: {
|
||||
type: String,
|
||||
type: [String, Boolean],
|
||||
default: '',
|
||||
},
|
||||
keyData: {
|
||||
|
|
@ -220,7 +222,7 @@ defineExpose({
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<div class="full-width">
|
||||
<div class="full-width" v-bind="attrs">
|
||||
<div
|
||||
v-if="!store.data && !store.data?.length && !isLoading"
|
||||
class="info-row q-pa-md text-center"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ const props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
order: {
|
||||
type: String,
|
||||
type: [String, Array],
|
||||
default: '',
|
||||
},
|
||||
limit: {
|
||||
|
|
|
|||
|
|
@ -23,10 +23,15 @@ describe('CardSummary', () => {
|
|||
|
||||
beforeEach(() => {
|
||||
wrapper = createWrapper(CardSummary, {
|
||||
global: {
|
||||
mocks: {
|
||||
validate: vi.fn(),
|
||||
},
|
||||
},
|
||||
propsData: {
|
||||
dataKey: 'cardSummaryKey',
|
||||
url: 'cardSummaryUrl',
|
||||
filter: 'cardFilter',
|
||||
filter: { key: 'cardFilter' },
|
||||
},
|
||||
});
|
||||
vm = wrapper.vm;
|
||||
|
|
@ -50,7 +55,7 @@ describe('CardSummary', () => {
|
|||
|
||||
it('should set correct props to the store', () => {
|
||||
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 () => {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
|
|||
let wrapper;
|
||||
let applyFilterSpy;
|
||||
const searchText = 'Bolas de madera';
|
||||
const userParams = {staticKey: 'staticValue'};
|
||||
const userParams = { staticKey: 'staticValue' };
|
||||
|
||||
beforeEach(async () => {
|
||||
wrapper = createWrapper(VnSearchbar, {
|
||||
|
|
@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
|
|||
|
||||
vm.searchText = searchText;
|
||||
vm.arrayData.store.userParams = userParams;
|
||||
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
|
||||
|
||||
applyFilterSpy = vi
|
||||
.spyOn(vm.arrayData, 'applyFilter')
|
||||
.mockImplementation(() => {});
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
|
|
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
|
|||
});
|
||||
|
||||
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();
|
||||
|
||||
expect(resetPaginationSpy).toHaveBeenCalled();
|
||||
|
|
@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
|
|||
|
||||
expect(applyFilterSpy).toHaveBeenCalledWith({
|
||||
params: { staticKey: 'staticValue', search: searchText },
|
||||
filter: {skip: 0},
|
||||
filter: { skip: 0 },
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -68,4 +71,4 @@ describe('VnSearchbar', () => {
|
|||
});
|
||||
expect(vm.to.query.searchParam).toBe(expectedQuery);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||
import axios from 'axios';
|
||||
import { createWrapper } from 'app/test/vitest/helper';
|
||||
import VnSms from 'src/components/ui/VnSms.vue';
|
||||
|
||||
|
|
@ -12,6 +11,9 @@ describe('VnSms', () => {
|
|||
stubs: ['VnPaginate'],
|
||||
mocks: {},
|
||||
},
|
||||
propsData: {
|
||||
url: 'SmsUrl',
|
||||
},
|
||||
}).vm;
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
|
|||
import { useRouter } from 'vue-router';
|
||||
import * as vueRouter from 'vue-router';
|
||||
import { setActivePinia, createPinia } from 'pinia';
|
||||
import { defineComponent, h } from 'vue';
|
||||
import { mount } from '@vue/test-utils';
|
||||
|
||||
describe('useArrayData', () => {
|
||||
const filter = '{"limit":20,"skip":0}';
|
||||
|
|
@ -43,7 +45,7 @@ describe('useArrayData', () => {
|
|||
it('should fetch and replace url with new params', async () => {
|
||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
|
||||
|
||||
const arrayData = useArrayData('ArrayData', {
|
||||
const arrayData = mountArrayData('ArrayData', {
|
||||
url: 'mockUrl',
|
||||
searchUrl: 'params',
|
||||
});
|
||||
|
|
@ -72,7 +74,7 @@ describe('useArrayData', () => {
|
|||
data: [{ id: 1 }],
|
||||
});
|
||||
|
||||
const arrayData = useArrayData('ArrayData', {
|
||||
const arrayData = mountArrayData('ArrayData', {
|
||||
url: 'mockUrl',
|
||||
navigate: {},
|
||||
});
|
||||
|
|
@ -94,7 +96,7 @@ describe('useArrayData', () => {
|
|||
],
|
||||
});
|
||||
|
||||
const arrayData = useArrayData('ArrayData', {
|
||||
const arrayData = mountArrayData('ArrayData', {
|
||||
url: 'mockUrl',
|
||||
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(
|
||||
'login',
|
||||
() => {
|
||||
const expectedUser = {
|
||||
id: 999,
|
||||
name: `T'Challa`,
|
||||
nickname: 'Black Panther',
|
||||
lang: 'en',
|
||||
userConfig: {
|
||||
darkMode: false,
|
||||
describe('login', () => {
|
||||
const expectedUser = {
|
||||
id: 999,
|
||||
name: `T'Challa`,
|
||||
nickname: 'Black Panther',
|
||||
lang: 'en',
|
||||
userConfig: {
|
||||
darkMode: false,
|
||||
},
|
||||
worker: { department: { departmentFk: 155 } },
|
||||
};
|
||||
const rolesData = [
|
||||
{
|
||||
role: {
|
||||
name: 'salesPerson',
|
||||
},
|
||||
worker: { department: { departmentFk: 155 } },
|
||||
};
|
||||
const rolesData = [
|
||||
{
|
||||
role: {
|
||||
name: 'salesPerson',
|
||||
},
|
||||
},
|
||||
{
|
||||
role: {
|
||||
name: 'admin',
|
||||
},
|
||||
{
|
||||
role: {
|
||||
name: 'admin',
|
||||
},
|
||||
},
|
||||
];
|
||||
beforeEach(() => {
|
||||
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
||||
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
|
||||
return Promise.resolve({
|
||||
data: { roles: rolesData, user: expectedUser },
|
||||
});
|
||||
},
|
||||
];
|
||||
beforeEach(() => {
|
||||
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 () => {
|
||||
const expectedRoles = ['salesPerson', 'admin'];
|
||||
const expectedToken = 'mySessionToken';
|
||||
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
||||
const keepLogin = false;
|
||||
it('should fetch the user roles and then set token in the sessionStorage', async () => {
|
||||
const expectedRoles = ['salesPerson', 'admin'];
|
||||
const expectedToken = 'mySessionToken';
|
||||
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
||||
const keepLogin = false;
|
||||
|
||||
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).toBeNull();
|
||||
expect(sessionToken).toEqual(expectedToken);
|
||||
|
||||
await session.destroy(); // this clears token and user for any other test
|
||||
await session.login({
|
||||
token: expectedToken,
|
||||
tokenMultimedia: expectedTokenMultimedia,
|
||||
keepLogin,
|
||||
});
|
||||
|
||||
it('should fetch the user roles and then set token in the localStorage', async () => {
|
||||
const expectedRoles = ['salesPerson', 'admin'];
|
||||
const expectedToken = 'myLocalToken';
|
||||
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
|
||||
const keepLogin = true;
|
||||
const roles = state.getRoles();
|
||||
const localToken = localStorage.getItem('token');
|
||||
const sessionToken = sessionStorage.getItem('token');
|
||||
|
||||
await session.login({
|
||||
token: expectedToken,
|
||||
tokenMultimedia: expectedTokenMultimedia,
|
||||
keepLogin,
|
||||
});
|
||||
expect(roles.value).toEqual(expectedRoles);
|
||||
expect(localToken).toBeNull();
|
||||
expect(sessionToken).toEqual(expectedToken);
|
||||
|
||||
const roles = state.getRoles();
|
||||
const localToken = localStorage.getItem('token');
|
||||
const sessionToken = sessionStorage.getItem('token');
|
||||
await session.destroy(); // this clears token and user for any other test
|
||||
});
|
||||
|
||||
expect(roles.value).toEqual(expectedRoles);
|
||||
expect(localToken).toEqual(expectedToken);
|
||||
expect(sessionToken).toBeNull();
|
||||
it('should fetch the user roles and then set token in the localStorage', async () => {
|
||||
const expectedRoles = ['salesPerson', 'admin'];
|
||||
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', () => {
|
||||
const expectedToken = 'myToken';
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ globals:
|
|||
logOut: Log out
|
||||
date: Date
|
||||
dataSaved: Data saved
|
||||
openDetail: Open detail
|
||||
dataDeleted: Data deleted
|
||||
delete: Delete
|
||||
search: Search
|
||||
|
|
@ -161,6 +162,9 @@ globals:
|
|||
department: Department
|
||||
noData: No data available
|
||||
vehicle: Vehicle
|
||||
selectDocumentId: Select document id
|
||||
document: Document
|
||||
import: Import from existing
|
||||
pageTitles:
|
||||
logIn: Login
|
||||
addressEdit: Update address
|
||||
|
|
|
|||
|
|
@ -21,10 +21,11 @@ globals:
|
|||
date: Fecha
|
||||
dataSaved: Datos guardados
|
||||
dataDeleted: Datos eliminados
|
||||
dataCreated: Datos creados
|
||||
openDetail: Ver detalle
|
||||
delete: Eliminar
|
||||
search: Buscar
|
||||
changes: Cambios
|
||||
dataCreated: Datos creados
|
||||
add: Añadir
|
||||
create: Crear
|
||||
edit: Modificar
|
||||
|
|
@ -165,6 +166,9 @@ globals:
|
|||
noData: Datos no disponibles
|
||||
department: Departamento
|
||||
vehicle: Vehículo
|
||||
selectDocumentId: Seleccione el id de gestión documental
|
||||
document: Documento
|
||||
import: Importar desde existente
|
||||
pageTitles:
|
||||
logIn: Inicio de sesión
|
||||
addressEdit: Modificar consignatario
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ const claimDms = ref([
|
|||
]);
|
||||
const client = ref({});
|
||||
const inputFile = ref();
|
||||
const files = ref({});
|
||||
const files = ref([]);
|
||||
const spinnerRef = ref();
|
||||
const claimDmsRef = ref();
|
||||
const dmsType = ref({});
|
||||
|
|
@ -255,9 +255,8 @@ function onDrag() {
|
|||
icon="add"
|
||||
color="primary"
|
||||
>
|
||||
<QInput
|
||||
<QFile
|
||||
ref="inputFile"
|
||||
type="file"
|
||||
style="display: none"
|
||||
multiple
|
||||
v-model="files"
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ describe('ClaimLines', () => {
|
|||
expectedData,
|
||||
{
|
||||
signal: canceller.signal,
|
||||
}
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
@ -69,7 +69,7 @@ describe('ClaimLines', () => {
|
|||
expect.objectContaining({
|
||||
message: 'Discount updated',
|
||||
type: 'positive',
|
||||
})
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
|
|||
fetch: vi.fn(),
|
||||
},
|
||||
},
|
||||
propsData: {
|
||||
ticketId: 1,
|
||||
},
|
||||
}).vm;
|
||||
});
|
||||
|
||||
|
|
@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
|
|||
expect.objectContaining({
|
||||
message: 'Lines added to claim',
|
||||
type: 'positive',
|
||||
})
|
||||
}),
|
||||
);
|
||||
expect(vm.canceller).toEqual(null);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
|
|||
await vm.deleteDms({ index: 0 });
|
||||
|
||||
expect(axios.post).toHaveBeenCalledWith(
|
||||
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
|
||||
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
|
||||
);
|
||||
expect(vm.quasar.notify).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ type: 'positive' })
|
||||
expect.objectContaining({ type: 'positive' }),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
|
|||
data: { index: 1 },
|
||||
promise: vm.deleteDms,
|
||||
},
|
||||
})
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
|
|||
new FormData(),
|
||||
expect.objectContaining({
|
||||
params: expect.objectContaining({ hasFile: false }),
|
||||
})
|
||||
}),
|
||||
);
|
||||
expect(vm.quasar.notify).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ type: 'positive' })
|
||||
expect.objectContaining({ type: 'positive' }),
|
||||
);
|
||||
|
||||
expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ const route = useRoute();
|
|||
const { t } = useI18n();
|
||||
|
||||
const entityId = computed(() => {
|
||||
return $props.id || route.params.id;
|
||||
return Number($props.id || route.params.id);
|
||||
});
|
||||
|
||||
const data = ref(useCardDescription());
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ const $props = defineProps({
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<QPopupProxy>
|
||||
<QPopupProxy data-cy="CustomerDescriptor">
|
||||
<CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
|
||||
</QPopupProxy>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
|
|||
:required="true"
|
||||
:rules="validate('client.socialName')"
|
||||
clearable
|
||||
uppercase="true"
|
||||
:uppercase="true"
|
||||
v-model="data.socialName"
|
||||
>
|
||||
<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 summary = ref();
|
||||
const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
|
|||
option-value="id"
|
||||
option-label="name"
|
||||
url="Departments"
|
||||
no-one="true"
|
||||
:no-one="true"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
|
|||
expect.objectContaining({
|
||||
message: 'Payment confirmed',
|
||||
type: 'positive',
|
||||
})
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
|
|||
const initialData = reactive({});
|
||||
const entityId = computed(() => route.params.id);
|
||||
const customer = computed(() => useArrayData('Customer').store?.data);
|
||||
const filterEmailUsers = { where: { userFk: user.value.id } };
|
||||
const filterClientsAddresses = {
|
||||
include: [
|
||||
{ relation: 'province', scope: { fields: ['name'] } },
|
||||
|
|
@ -73,7 +72,7 @@ onBeforeMount(async () => {
|
|||
|
||||
const setEmailUser = (data) => {
|
||||
optionsEmailUsers.value = data;
|
||||
initialData.replyTo = data[0]?.email;
|
||||
initialData.replyTo = data[0]?.notificationEmail;
|
||||
};
|
||||
|
||||
const setClientsAddresses = (data) => {
|
||||
|
|
@ -182,10 +181,12 @@ const toCustomerSamples = () => {
|
|||
|
||||
<template>
|
||||
<FetchData
|
||||
:filter="filterEmailUsers"
|
||||
:filter="{
|
||||
where: { id: customer.departmentFk },
|
||||
}"
|
||||
@on-fetch="setEmailUser"
|
||||
auto-load
|
||||
url="EmailUsers"
|
||||
url="Departments"
|
||||
/>
|
||||
<FetchData
|
||||
:filter="filterClientsAddresses"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
|
|||
const $props = defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
required: true,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -164,6 +164,7 @@ onMounted(async () => {
|
|||
unelevated
|
||||
filled
|
||||
dense
|
||||
data-cy="formSubmitBtn"
|
||||
/>
|
||||
<QBtn
|
||||
v-else
|
||||
|
|
@ -174,6 +175,7 @@ onMounted(async () => {
|
|||
filled
|
||||
dense
|
||||
@click="getStatus = 'stopping'"
|
||||
data-cy="formStopBtn"
|
||||
/>
|
||||
</QForm>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@ const insertTag = (rows) => {
|
|||
:default-remove="false"
|
||||
:user-filter="{
|
||||
fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
|
||||
where: { itemFk: route.params.id },
|
||||
include: {
|
||||
relation: 'tag',
|
||||
scope: {
|
||||
|
|
@ -97,6 +96,7 @@ const insertTag = (rows) => {
|
|||
},
|
||||
},
|
||||
}"
|
||||
:filter="{ where: { itemFk: route.params.id } }"
|
||||
order="priority"
|
||||
auto-load
|
||||
@on-fetch="onItemTagsFetched"
|
||||
|
|
|
|||
|
|
@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
|
|||
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
|
||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||
import axios from 'axios';
|
||||
import notifyResults from 'src/utils/notifyResults';
|
||||
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import { useState } from 'src/composables/useState';
|
||||
|
||||
const MATCH = 'match';
|
||||
const { notifyResults } = displayResults();
|
||||
|
||||
const { t } = useI18n();
|
||||
const $props = defineProps({
|
||||
|
|
@ -18,14 +20,20 @@ const $props = defineProps({
|
|||
required: true,
|
||||
default: () => {},
|
||||
},
|
||||
filter: {
|
||||
type: Object,
|
||||
required: true,
|
||||
default: () => {},
|
||||
},
|
||||
replaceAction: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
required: true,
|
||||
default: false,
|
||||
},
|
||||
|
||||
sales: {
|
||||
type: Array,
|
||||
required: false,
|
||||
required: true,
|
||||
default: () => [],
|
||||
},
|
||||
});
|
||||
|
|
@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
|
|||
const sale = computed(() => $props.sales[0]);
|
||||
const saleFk = computed(() => sale.value.saleFk);
|
||||
const filter = computed(() => ({
|
||||
where: $props.filter,
|
||||
|
||||
itemFk: $props.itemLack.itemFk,
|
||||
sales: saleFk.value,
|
||||
}));
|
||||
|
|
@ -228,11 +238,15 @@ async function handleTicketConfig(data) {
|
|||
url="TicketConfigs"
|
||||
:filter="{ fields: ['lackAlertPrice'] }"
|
||||
@on-fetch="handleTicketConfig"
|
||||
auto-load
|
||||
></FetchData>
|
||||
<QInnerLoading
|
||||
:showing="isLoading"
|
||||
:label="t && t('globals.pleaseWait')"
|
||||
color="primary"
|
||||
/>
|
||||
|
||||
<VnTable
|
||||
v-if="ticketConfig"
|
||||
v-if="!isLoading"
|
||||
auto-load
|
||||
data-cy="proposalTable"
|
||||
ref="proposalTableRef"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
<script setup>
|
||||
import ItemProposal from './ItemProposal.vue';
|
||||
import { useDialogPluginComponent } from 'quasar';
|
||||
|
||||
const $props = defineProps({
|
||||
itemLack: {
|
||||
type: Object,
|
||||
required: true,
|
||||
default: () => {},
|
||||
},
|
||||
filter: {
|
||||
type: Object,
|
||||
required: true,
|
||||
default: () => {},
|
||||
},
|
||||
replaceAction: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
|
|
@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
|
|||
<QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
|
||||
<QCard class="dialog-width">
|
||||
<QCardSection class="row items-center q-pb-none">
|
||||
<span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
|
||||
<span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
|
||||
<QSpace />
|
||||
<QBtn icon="close" flat round dense v-close-popup />
|
||||
</QCardSection>
|
||||
|
|
|
|||
|
|
@ -11,26 +11,19 @@ export function cloneItem() {
|
|||
const router = useRouter();
|
||||
const cloneItem = async (entityId) => {
|
||||
const { id } = entityId;
|
||||
try {
|
||||
const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
|
||||
router.push({ name: 'ItemTags', params: { id: data.id } });
|
||||
} catch (err) {
|
||||
console.error('Error cloning item');
|
||||
}
|
||||
const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
|
||||
router.push({ name: 'ItemTags', params: { id: data.id } });
|
||||
};
|
||||
|
||||
const openCloneDialog = async (entityId) => {
|
||||
quasar
|
||||
.dialog({
|
||||
component: VnConfirm,
|
||||
componentProps: {
|
||||
title: t('item.descriptor.clone.title'),
|
||||
message: t('item.descriptor.clone.subTitle'),
|
||||
},
|
||||
})
|
||||
.onOk(async () => {
|
||||
await cloneItem(entityId);
|
||||
});
|
||||
quasar.dialog({
|
||||
component: VnConfirm,
|
||||
componentProps: {
|
||||
title: t('item.descriptor.clone.title'),
|
||||
message: t('item.descriptor.clone.subTitle'),
|
||||
promise: () => cloneItem(entityId),
|
||||
},
|
||||
});
|
||||
};
|
||||
return { openCloneDialog };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ import VnRow from 'src/components/ui/VnRow.vue';
|
|||
class="q-pa-md"
|
||||
:style="{ 'flex-direction': $q.screen.lt.lg ? 'column' : 'row', gap: '0px' }"
|
||||
>
|
||||
<div style="flex: 0.3">
|
||||
<div style="flex: 0.3" data-cy="clientsOnWebsite">
|
||||
<span
|
||||
class="q-ml-md text-body1"
|
||||
v-text="$t('salesMonitor.clientsOnWebsite')"
|
||||
/>
|
||||
<SalesClientTable />
|
||||
</div>
|
||||
<div style="flex: 0.7">
|
||||
<div style="flex: 0.7" data-cy="recentOrderActions">
|
||||
<span
|
||||
class="q-ml-md text-body1"
|
||||
v-text="$t('salesMonitor.recentOrderActions')"
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
|
|||
import { toCurrency } from 'src/filters';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import axios from 'axios';
|
||||
import VnDateBadge from 'src/components/common/VnDateBadge.vue';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
|
@ -165,16 +166,7 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
|
|||
</div>
|
||||
</template>
|
||||
<template #column-dateSend="{ row }">
|
||||
<QTd>
|
||||
<QBadge
|
||||
:color="getBadgeColor(row.date_send)"
|
||||
text-color="black"
|
||||
class="q-pa-sm"
|
||||
style="font-size: 14px"
|
||||
>
|
||||
{{ toDateFormat(row.date_send) }}
|
||||
</QBadge>
|
||||
</QTd>
|
||||
<VnDateBadge :date="row.date_send" />
|
||||
</template>
|
||||
|
||||
<template #column-clientFk="{ row }">
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
|||
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
|
||||
import FetchData from 'src/components/FetchData.vue';
|
||||
import { dateRange } from 'src/filters';
|
||||
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
||||
|
||||
defineProps({ dataKey: { type: String, required: true } });
|
||||
const { t, te } = useI18n();
|
||||
|
|
@ -209,7 +210,7 @@ const getLocale = (label) => {
|
|||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<QCheckbox
|
||||
<VnCheckbox
|
||||
:label="t('params.myTeam')"
|
||||
v-model="params.myTeam"
|
||||
toggle-indeterminate
|
||||
|
|
@ -218,7 +219,7 @@ const getLocale = (label) => {
|
|||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<QCheckbox
|
||||
<VnCheckbox
|
||||
:label="t('params.problems')"
|
||||
v-model="params.problems"
|
||||
toggle-indeterminate
|
||||
|
|
@ -227,7 +228,7 @@ const getLocale = (label) => {
|
|||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<QCheckbox
|
||||
<VnCheckbox
|
||||
:label="t('params.pending')"
|
||||
v-model="params.pending"
|
||||
toggle-indeterminate
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
|
||||
|
|
@ -168,9 +167,11 @@ const columns = computed(() => [
|
|||
component: 'select',
|
||||
name: 'provinceFk',
|
||||
attrs: {
|
||||
options: provinceOpts.value,
|
||||
'option-value': 'id',
|
||||
'option-label': 'name',
|
||||
url: 'Provinces',
|
||||
fields: ['id', 'name'],
|
||||
sortBy: ['name ASC'],
|
||||
optionValue: 'id',
|
||||
optionLabel: 'name',
|
||||
dense: true,
|
||||
},
|
||||
},
|
||||
|
|
@ -183,9 +184,11 @@ const columns = computed(() => [
|
|||
component: 'select',
|
||||
name: 'stateFk',
|
||||
attrs: {
|
||||
options: stateOpts.value,
|
||||
'option-value': 'id',
|
||||
'option-label': 'name',
|
||||
sortBy: ['name ASC'],
|
||||
url: 'States',
|
||||
fields: ['id', 'name'],
|
||||
optionValue: 'id',
|
||||
optionLabel: 'name',
|
||||
dense: true,
|
||||
},
|
||||
},
|
||||
|
|
@ -212,9 +215,12 @@ const columns = computed(() => [
|
|||
component: 'select',
|
||||
name: 'zoneFk',
|
||||
attrs: {
|
||||
options: zoneOpts.value,
|
||||
'option-value': 'id',
|
||||
'option-label': 'name',
|
||||
url: 'Zones',
|
||||
fields: ['id', 'name'],
|
||||
sortBy: ['name ASC'],
|
||||
|
||||
optionValue: 'id',
|
||||
optionLabel: 'name',
|
||||
dense: true,
|
||||
},
|
||||
},
|
||||
|
|
@ -225,11 +231,12 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
columnFilter: {
|
||||
component: 'select',
|
||||
url: 'PayMethods',
|
||||
attrs: {
|
||||
options: PayMethodOpts.value,
|
||||
optionValue: 'id',
|
||||
url: 'PayMethods',
|
||||
fields: ['id', 'name'],
|
||||
sortBy: ['id ASC'],
|
||||
optionLabel: 'name',
|
||||
optionValue: 'id',
|
||||
dense: true,
|
||||
},
|
||||
},
|
||||
|
|
@ -254,7 +261,9 @@ const columns = computed(() => [
|
|||
columnFilter: {
|
||||
component: 'select',
|
||||
attrs: {
|
||||
options: DepartmentOpts.value,
|
||||
url: 'Departments',
|
||||
fields: ['id', 'name'],
|
||||
sortBy: ['id ASC'],
|
||||
dense: true,
|
||||
},
|
||||
},
|
||||
|
|
@ -265,11 +274,12 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
columnFilter: {
|
||||
component: 'select',
|
||||
url: 'ItemPackingTypes',
|
||||
attrs: {
|
||||
options: ItemPackingTypeOpts.value,
|
||||
'option-value': 'code',
|
||||
'option-label': 'code',
|
||||
url: 'ItemPackingTypes',
|
||||
fields: ['code'],
|
||||
sortBy: ['code ASC'],
|
||||
optionValue: 'code',
|
||||
optionCode: 'code',
|
||||
dense: true,
|
||||
},
|
||||
},
|
||||
|
|
@ -324,60 +334,6 @@ const totalPriceColor = (ticket) => {
|
|||
const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
url="Provinces"
|
||||
:filter="{
|
||||
fields: ['id', 'name'],
|
||||
order: 'name ASC',
|
||||
}"
|
||||
auto-load
|
||||
@on-fetch="(data) => (provinceOpts = data)"
|
||||
/>
|
||||
<FetchData
|
||||
url="States"
|
||||
:filter="{
|
||||
fields: ['id', 'name'],
|
||||
order: 'name ASC',
|
||||
}"
|
||||
auto-load
|
||||
@on-fetch="(data) => (stateOpts = data)"
|
||||
/>
|
||||
<FetchData
|
||||
url="Zones"
|
||||
:filter="{
|
||||
fields: ['id', 'name'],
|
||||
order: 'name ASC',
|
||||
}"
|
||||
auto-load
|
||||
@on-fetch="(data) => (zoneOpts = data)"
|
||||
/>
|
||||
<FetchData
|
||||
url="ItemPackingTypes"
|
||||
:filter="{
|
||||
fields: ['code'],
|
||||
order: 'code ASC',
|
||||
}"
|
||||
auto-load
|
||||
@on-fetch="(data) => (ItemPackingTypeOpts = data)"
|
||||
/>
|
||||
<FetchData
|
||||
url="Departments"
|
||||
:filter="{
|
||||
fields: ['id', 'name'],
|
||||
order: 'id ASC',
|
||||
}"
|
||||
auto-load
|
||||
@on-fetch="(data) => (DepartmentOpts = data)"
|
||||
/>
|
||||
<FetchData
|
||||
url="PayMethods"
|
||||
:filter="{
|
||||
fields: ['id', 'name'],
|
||||
order: 'id ASC',
|
||||
}"
|
||||
auto-load
|
||||
@on-fetch="(data) => (PayMethodOpts = data)"
|
||||
/>
|
||||
<MonitorTicketSearchbar />
|
||||
<RightMenu>
|
||||
<template #right-panel>
|
||||
|
|
|
|||
|
|
@ -120,7 +120,6 @@ watch(
|
|||
:data-key="dataKey"
|
||||
:tag-value="tagValue"
|
||||
:tags="tags"
|
||||
:initial-catalog-params="catalogParams"
|
||||
:arrayData
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ const getTotalRef = ref();
|
|||
const total = ref(0);
|
||||
|
||||
const entityId = computed(() => {
|
||||
return $props.id || route.params.id;
|
||||
return Number($props.id || route.params.id);
|
||||
});
|
||||
|
||||
const orderTotal = computed(() => state.get('orderTotal') ?? 0);
|
||||
|
|
|
|||
|
|
@ -233,10 +233,10 @@ const ticketColumns = ref([
|
|||
</span>
|
||||
</QTd>
|
||||
</template>
|
||||
<template #body-cell-client="{ value, row }">
|
||||
<QTd auto-width>
|
||||
<template #body-cell-client="{ row }">
|
||||
<QTd>
|
||||
<span class="link">
|
||||
{{ value }}
|
||||
{{ row.clientFk }}
|
||||
<CustomerDescriptorProxy :id="row?.clientFk" />
|
||||
</span>
|
||||
</QTd>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -20,3 +20,5 @@ vehicle:
|
|||
params:
|
||||
vehicleTypeFk: Type
|
||||
vehicleStateFk: State
|
||||
errors:
|
||||
documentIdEmpty: The document identifier can't be empty
|
||||
|
|
|
|||
|
|
@ -20,3 +20,5 @@ vehicle:
|
|||
params:
|
||||
vehicleTypeFk: Tipo
|
||||
vehicleStateFk: Estado
|
||||
errors:
|
||||
documentIdEmpty: El número de documento no puede estar vacío
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ const columns = computed(() => [
|
|||
<VnTable
|
||||
:data-key="dataKey"
|
||||
:columns="columns"
|
||||
is-editable="false"
|
||||
:is-editable="false"
|
||||
:right-search="false"
|
||||
:use-model="true"
|
||||
:disable-option="{ table: true }"
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ const onDataSaved = ({ id }) => {
|
|||
<VnTable
|
||||
:data-key="dataKey"
|
||||
:columns="columns"
|
||||
is-editable="false"
|
||||
:is-editable="false"
|
||||
:right-search="false"
|
||||
:use-model="true"
|
||||
:disable-option="{ table: true }"
|
||||
|
|
|
|||
|
|
@ -65,15 +65,13 @@ function findBankFk(value, row) {
|
|||
if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
|
||||
}
|
||||
|
||||
function bankEntityFilter(val, update) {
|
||||
update(() => {
|
||||
const needle = val.toLowerCase();
|
||||
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
|
||||
(bank) =>
|
||||
bank.bic.toLowerCase().startsWith(needle) ||
|
||||
bank.name.toLowerCase().includes(needle),
|
||||
);
|
||||
});
|
||||
function bankEntityFilter(val) {
|
||||
const needle = val.toLowerCase();
|
||||
filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
|
||||
(bank) =>
|
||||
bank.bic.toLowerCase().startsWith(needle) ||
|
||||
bank.name.toLowerCase().includes(needle),
|
||||
);
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
|
|
@ -82,7 +80,8 @@ function bankEntityFilter(val, update) {
|
|||
url="BankEntities"
|
||||
@on-fetch="
|
||||
(data) => {
|
||||
(bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
|
||||
bankEntitiesOptions = data;
|
||||
filteredBankEntitiesOptions = data;
|
||||
}
|
||||
"
|
||||
auto-load
|
||||
|
|
@ -135,10 +134,8 @@ function bankEntityFilter(val, update) {
|
|||
:label="t('worker.create.bankEntity')"
|
||||
v-model="row.bankEntityFk"
|
||||
:options="filteredBankEntitiesOptions"
|
||||
:default-filter="false"
|
||||
@filter="(val, update) => bankEntityFilter(val, update)"
|
||||
:filter-fn="bankEntityFilter"
|
||||
option-label="bic"
|
||||
option-value="id"
|
||||
hide-selected
|
||||
:required="true"
|
||||
:roles-allowed-to-create="['financial']"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
|
|||
const $props = defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
required: true,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
|||
import VnLocation from 'src/components/common/VnLocation.vue';
|
||||
import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
|
||||
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
||||
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
|
||||
const arrayData = useArrayData('Supplier');
|
||||
const sageTaxTypesOptions = ref([]);
|
||||
const sageWithholdingsOptions = ref([]);
|
||||
const sageTransactionTypesOptions = ref([]);
|
||||
|
|
@ -89,6 +89,7 @@ function handleLocation(data, location) {
|
|||
}"
|
||||
auto-load
|
||||
:clear-store-on-unmount="false"
|
||||
@on-data-saved="arrayData.fetch({})"
|
||||
>
|
||||
<template #form="{ data, validate }">
|
||||
<VnRow>
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ const onNextStep = async () => {
|
|||
t('basicData.negativesConfirmMessage'),
|
||||
submitWithNegatives,
|
||||
);
|
||||
else submit();
|
||||
else await submit();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ const props = defineProps({
|
|||
|
||||
onMounted(() => {
|
||||
restoreTicket();
|
||||
hasDocuware();
|
||||
});
|
||||
|
||||
watch(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup>
|
||||
import TicketDescriptor from './TicketDescriptor.vue';
|
||||
import TicketSummary from './TicketSummary.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
|
|
@ -10,7 +9,7 @@ const $props = defineProps({
|
|||
});
|
||||
</script>
|
||||
<template>
|
||||
<QPopupProxy>
|
||||
<QPopupProxy data-cy="TicketDescriptor">
|
||||
<TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
|
||||
</QPopupProxy>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ const importDms = async () => {
|
|||
dmsId.value = null;
|
||||
emit('onDataSaved');
|
||||
} catch (e) {
|
||||
throw new Error(e.message);
|
||||
throw e;
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -49,7 +49,7 @@ const importDms = async () => {
|
|||
<FormModelPopup
|
||||
url-create="genera"
|
||||
model="DmsImport"
|
||||
:title="t('Select document id')"
|
||||
:title="t('globals.selectDocumentId')"
|
||||
:form-initial-data="{}"
|
||||
:save-fn="importDms"
|
||||
>
|
||||
|
|
@ -70,7 +70,6 @@ const importDms = async () => {
|
|||
|
||||
<i18n>
|
||||
es:
|
||||
Select document id: Introduzca id de gestion documental
|
||||
Document: Documento
|
||||
The document indentifier can't be empty: El número de documento no puede estar vacío
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -773,6 +773,7 @@ watch(
|
|||
v-model="row.itemFk"
|
||||
:use-like="false"
|
||||
@update:model-value="changeItem(row)"
|
||||
autofocus
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ import { ref } from 'vue';
|
|||
|
||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||
import split from './components/split';
|
||||
const emit = defineEmits(['ticketTransfered']);
|
||||
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||
const { notifyResults } = displayResults();
|
||||
const emit = defineEmits(['ticketTransferred']);
|
||||
|
||||
const $props = defineProps({
|
||||
ticket: {
|
||||
|
|
@ -16,13 +18,20 @@ const splitDate = ref(Date.vnNew());
|
|||
|
||||
const splitSelectedRows = async () => {
|
||||
const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
|
||||
await split(tickets, splitDate.value);
|
||||
emit('ticketTransfered', tickets);
|
||||
const results = await split(tickets, splitDate.value);
|
||||
notifyResults(results, 'ticketFk');
|
||||
emit('ticketTransferred', tickets);
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
|
||||
<VnInputDate
|
||||
class="q-mr-sm"
|
||||
:label="$t('New date')"
|
||||
v-model="splitDate"
|
||||
clearable
|
||||
autofocus
|
||||
/>
|
||||
<QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
|
||||
</template>
|
||||
<style lang="scss">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
|||
import TicketTransferForm from './TicketTransferForm.vue';
|
||||
|
||||
import { toDateFormat } from 'src/filters/date.js';
|
||||
const emit = defineEmits(['ticketTransfered']);
|
||||
const emit = defineEmits(['ticketTransferred']);
|
||||
|
||||
const $props = defineProps({
|
||||
mana: {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import TicketTransfer from './TicketTransfer.vue';
|
||||
import Split from './TicketSplit.vue';
|
||||
const emit = defineEmits(['ticketTransfered']);
|
||||
import TicketSplit from './TicketSplit.vue';
|
||||
const emit = defineEmits(['ticketTransferred']);
|
||||
|
||||
const $props = defineProps({
|
||||
mana: {
|
||||
|
|
@ -35,7 +35,7 @@ const transferRef = ref(null);
|
|||
<template>
|
||||
<QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
|
||||
<div class="flex row items-center q-ma-lg" v-if="$props.split">
|
||||
<Split
|
||||
<TicketSplit
|
||||
ref="splitRef"
|
||||
@splitSelectedRows="splitSelectedRows"
|
||||
:ticket="$props.ticket"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
import axios from 'axios';
|
||||
import notifyResults from 'src/utils/notifyResults';
|
||||
|
||||
export default async function (data, date) {
|
||||
const reducedData = data.reduce((acc, item) => {
|
||||
const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
|
||||
if (existing) {
|
||||
existing.sales.push(item.saleFk);
|
||||
} else {
|
||||
acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
|
||||
acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
|
||||
}
|
||||
return acc;
|
||||
}, []);
|
||||
|
|
@ -16,7 +14,5 @@ export default async function (data, date) {
|
|||
|
||||
const results = await Promise.allSettled(promises);
|
||||
|
||||
notifyResults(results, 'ticketFk');
|
||||
|
||||
return results;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ const tableRef = ref();
|
|||
const changeItemDialogRef = ref(null);
|
||||
const changeStateDialogRef = ref(null);
|
||||
const changeQuantityDialogRef = ref(null);
|
||||
const showProposalDialog = ref(false);
|
||||
const showChangeQuantityDialog = ref(false);
|
||||
const selectedRows = ref([]);
|
||||
const route = useRoute();
|
||||
|
|
@ -63,6 +62,7 @@ const showItemProposal = () => {
|
|||
.dialog({
|
||||
component: ItemProposalProxy,
|
||||
componentProps: {
|
||||
filter: filter.value,
|
||||
itemLack: tableRef.value.itemLack,
|
||||
replaceAction: true,
|
||||
sales: selectedRows.value,
|
||||
|
|
@ -117,21 +117,17 @@ const showItemProposal = () => {
|
|||
sales: selectedRows,
|
||||
lastActiveTickets: selectedRows.map((row) => row.id),
|
||||
}"
|
||||
@ticket-transfered="reload"
|
||||
@ticket-transferred="reload"
|
||||
></TicketTransferProxy>
|
||||
</template>
|
||||
</QBtn>
|
||||
<QBtn
|
||||
color="primary"
|
||||
@click="showProposalDialog = true"
|
||||
:disable="selectedRows.length < 1"
|
||||
@click="showItemProposal"
|
||||
:disable="!(selectedRows.length === 1)"
|
||||
data-cy="itemProposal"
|
||||
>
|
||||
<QIcon
|
||||
name="import_export"
|
||||
class="rotate-90"
|
||||
@click="showItemProposal"
|
||||
></QIcon>
|
||||
<QIcon name="import_export" class="rotate-90" />
|
||||
<QTooltip bottom anchor="bottom right">
|
||||
{{ t('itemProposal') }}
|
||||
</QTooltip>
|
||||
|
|
@ -139,7 +135,7 @@ const showItemProposal = () => {
|
|||
<VnPopupProxy
|
||||
data-cy="changeItem"
|
||||
icon="sync"
|
||||
:disable="selectedRows.length < 1"
|
||||
:disable="!(selectedRows.length === 1)"
|
||||
:tooltip="t('negative.detail.modal.changeItem.title')"
|
||||
>
|
||||
<template #extraIcon> <QIcon name="vn:item" /> </template>
|
||||
|
|
@ -153,7 +149,7 @@ const showItemProposal = () => {
|
|||
<VnPopupProxy
|
||||
data-cy="changeState"
|
||||
icon="sync"
|
||||
:disable="selectedRows.length < 1"
|
||||
:disable="!(selectedRows.length === 1)"
|
||||
:tooltip="t('negative.detail.modal.changeState.title')"
|
||||
>
|
||||
<template #extraIcon> <QIcon name="vn:eye" /> </template>
|
||||
|
|
@ -167,7 +163,7 @@ const showItemProposal = () => {
|
|||
<VnPopupProxy
|
||||
data-cy="changeQuantity"
|
||||
icon="sync"
|
||||
:disable="selectedRows.length < 1"
|
||||
:disable="!(selectedRows.length === 1)"
|
||||
:tooltip="t('negative.detail.modal.changeQuantity.title')"
|
||||
@click="showChangeQuantityDialog = true"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
|
|||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import VnInputDateTime from 'src/components/common/VnInputDateTime.vue';
|
||||
const { t } = useI18n();
|
||||
const props = defineProps({
|
||||
dataKey: {
|
||||
|
|
@ -66,6 +67,7 @@ const setUserParams = (params) => {
|
|||
:data-key="props.dataKey"
|
||||
:search-button="true"
|
||||
@set-user-params="setUserParams"
|
||||
:unremovable-params="['warehouseFk']"
|
||||
>
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
|
|
@ -77,12 +79,11 @@ const setUserParams = (params) => {
|
|||
<QList dense class="q-gutter-y-sm q-mt-sm">
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput
|
||||
v-model="params.days"
|
||||
:label="t('negative.days')"
|
||||
<VnInputDateTime
|
||||
v-model="params.availabled"
|
||||
:label="t('negative.availabled')"
|
||||
dense
|
||||
filled
|
||||
type="number"
|
||||
@update:model-value="
|
||||
(value) => {
|
||||
setUserParams(params);
|
||||
|
|
|
|||
|
|
@ -21,14 +21,13 @@ const selectedRows = ref([]);
|
|||
const tableRef = ref();
|
||||
const filterParams = ref({});
|
||||
const negativeParams = reactive({
|
||||
days: useRole().likeAny('buyer') ? 2 : 0,
|
||||
warehouseFk: useState().getUser().value.warehouseFk,
|
||||
availabled: Date.getCurrentDateTimeFormatted(),
|
||||
});
|
||||
const redirectToCreateView = ({ itemFk }) => {
|
||||
router.push({
|
||||
name: 'NegativeDetail',
|
||||
params: { id: itemFk },
|
||||
query: { days: filterParams.value.days ?? negativeParams.days },
|
||||
});
|
||||
};
|
||||
const columns = computed(() => [
|
||||
|
|
@ -65,15 +64,19 @@ const columns = computed(() => [
|
|||
columnFilter: {
|
||||
component: 'input',
|
||||
type: 'number',
|
||||
columnClass: 'shrink',
|
||||
inWhere: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'longName',
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
label: t('negative.longName'),
|
||||
field: ({ longName }) => longName,
|
||||
|
||||
columnFilter: {
|
||||
component: 'input',
|
||||
inWhere: false,
|
||||
useLike: true,
|
||||
},
|
||||
sortable: true,
|
||||
headerStyle: 'width: 350px',
|
||||
cardVisible: true,
|
||||
|
|
@ -94,6 +97,11 @@ const columns = computed(() => [
|
|||
field: ({ inkFk }) => inkFk,
|
||||
sortable: true,
|
||||
cardVisible: true,
|
||||
columnFilter: {
|
||||
component: 'input',
|
||||
columnClass: 'shrink',
|
||||
inWhere: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'size',
|
||||
|
|
@ -155,7 +163,6 @@ const setUserParams = (params) => {
|
|||
<TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
|
||||
</template>
|
||||
</RightMenu>
|
||||
{{ filterRef }}
|
||||
<VnTable
|
||||
ref="tableRef"
|
||||
data-key="NegativeList"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { computed, ref, watch } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import axios from 'axios';
|
||||
import FetchData from 'src/components/FetchData.vue';
|
||||
import { toDate, toHour } from 'src/filters';
|
||||
import { toDate } from 'src/filters';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
|
@ -22,14 +22,6 @@ const $props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
watch(
|
||||
() => $props.filter,
|
||||
(v) => {
|
||||
filterLack.value.where = v;
|
||||
tableRef.value.reload(filterLack);
|
||||
},
|
||||
);
|
||||
|
||||
const filterLack = ref({
|
||||
include: [
|
||||
{
|
||||
|
|
@ -90,6 +82,7 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
name: 'alertLevelCode',
|
||||
field: 'alertLevelCode',
|
||||
label: t('negative.detail.state'),
|
||||
columnFilter: {
|
||||
name: 'alertLevelCode',
|
||||
|
|
@ -158,7 +151,6 @@ const saveChange = async (field, { row }) => {
|
|||
fetchItemLack.value.fetch();
|
||||
} catch (err) {
|
||||
console.error('Error saving changes', err);
|
||||
f;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -171,7 +163,11 @@ function onBuysFetched(data) {
|
|||
<FetchData
|
||||
ref="fetchItemLack"
|
||||
:url="`Tickets/itemLack`"
|
||||
:params="{ id: entityId }"
|
||||
:params="{
|
||||
itemFk: entityId,
|
||||
warehouseFk: $props.filter.warehouseFk,
|
||||
availabled: Date.getCurrentDateTimeFormatted(),
|
||||
}"
|
||||
@on-fetch="(data) => (itemLack = data[0])"
|
||||
auto-load
|
||||
/>
|
||||
|
|
@ -207,6 +203,7 @@ function onBuysFetched(data) {
|
|||
dense
|
||||
:is-editable="true"
|
||||
:row-click="false"
|
||||
:search-url="false"
|
||||
:right-search="false"
|
||||
:right-search-icon="false"
|
||||
v-model:selected="selectedRows"
|
||||
|
|
@ -214,7 +211,6 @@ function onBuysFetched(data) {
|
|||
>
|
||||
<template #top-left>
|
||||
<div style="display: flex; align-items: center" v-if="itemLack">
|
||||
<!-- <VnImg :id="itemLack.itemFk" class="rounded image-wrapper"></VnImg> -->
|
||||
<div class="flex column" style="align-items: center">
|
||||
<QBadge
|
||||
ref="badgeLackRef"
|
||||
|
|
@ -239,7 +235,7 @@ function onBuysFetched(data) {
|
|||
|
||||
<template #column-status="{ row }">
|
||||
<QTd style="min-width: 150px">
|
||||
<div class="icon-container">
|
||||
<div class="flex items-start q-ma-sm">
|
||||
<QIcon
|
||||
v-if="row.isBasket"
|
||||
name="vn:basket"
|
||||
|
|
@ -266,9 +262,10 @@ function onBuysFetched(data) {
|
|||
size="xs"
|
||||
>
|
||||
<QTooltip>{{
|
||||
t('negative.detail.hasObservation')
|
||||
}}</QTooltip> </QIcon
|
||||
><QIcon
|
||||
row?.note || t('negative.detail.hasObservation')
|
||||
}}</QTooltip>
|
||||
</QIcon>
|
||||
<QIcon
|
||||
v-if="row.isRookie"
|
||||
name="vn:Person"
|
||||
size="xs"
|
||||
|
|
@ -305,9 +302,9 @@ function onBuysFetched(data) {
|
|||
</span>
|
||||
</template>
|
||||
<template #column-ticketFk="{ row }">
|
||||
<span class="q-pa-sm link">
|
||||
{{ row.id }}
|
||||
<TicketDescriptorProxy :id="row.id" />
|
||||
<span class="link" @click.stop>
|
||||
{{ row.ticketFk }}
|
||||
<TicketDescriptorProxy :id="row.ticketFk" />
|
||||
</span>
|
||||
</template>
|
||||
<template #column-alertLevelCode="props">
|
||||
|
|
@ -335,15 +332,6 @@ function onBuysFetched(data) {
|
|||
</VnTable>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.icon-container {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 0.2fr);
|
||||
row-gap: 5px; /* Ajusta el espacio entre los iconos según sea necesario */
|
||||
}
|
||||
.icon-container > * {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
.list-enter-active,
|
||||
.list-leave-active {
|
||||
transition: all 1s ease;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
import { ref } from 'vue';
|
||||
import axios from 'axios';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import notifyResults from 'src/utils/notifyResults';
|
||||
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||
|
||||
const { notifyResults } = displayResults();
|
||||
const emit = defineEmits(['update-item']);
|
||||
|
||||
const showChangeItemDialog = ref(false);
|
||||
|
|
@ -37,7 +39,6 @@ const updateItem = async () => {
|
|||
<template>
|
||||
<QCard class="q-pa-sm">
|
||||
<QCardSection class="row items-center justify-center column items-stretch">
|
||||
{{ showChangeItemDialog }}
|
||||
<span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
|
||||
<VnSelect
|
||||
url="Items/WithName"
|
||||
|
|
@ -47,6 +48,7 @@ const updateItem = async () => {
|
|||
option-label="name"
|
||||
option-value="id"
|
||||
v-model="newItem"
|
||||
autofocus
|
||||
>
|
||||
</VnSelect>
|
||||
</QCardSection>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
import { ref } from 'vue';
|
||||
import axios from 'axios';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import notifyResults from 'src/utils/notifyResults';
|
||||
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||
|
||||
const { notifyResults } = displayResults();
|
||||
const showChangeQuantityDialog = ref(false);
|
||||
const newQuantity = ref(null);
|
||||
const $props = defineProps({
|
||||
|
|
@ -16,15 +17,16 @@ const emit = defineEmits(['update-quantity']);
|
|||
const updateQuantity = async () => {
|
||||
try {
|
||||
showChangeQuantityDialog.value = true;
|
||||
const rowsToUpdate = $props.selectedRows.map(({ saleFk }) =>
|
||||
const rowsToUpdate = $props.selectedRows.map(({ saleFk, ticketFk }) =>
|
||||
axios.post(`Sales/${saleFk}/updateQuantity`, {
|
||||
saleFk,
|
||||
ticketFk,
|
||||
quantity: +newQuantity.value,
|
||||
}),
|
||||
);
|
||||
|
||||
const result = await Promise.allSettled(rowsToUpdate);
|
||||
notifyResults(result, 'saleFk');
|
||||
notifyResults(result, 'ticketFk');
|
||||
|
||||
emit('update-quantity', newQuantity.value);
|
||||
} catch (err) {
|
||||
|
|
@ -42,6 +44,7 @@ const updateQuantity = async () => {
|
|||
:min="0"
|
||||
:label="$t('negative.detail.modal.changeQuantity.placeholder')"
|
||||
v-model="newQuantity"
|
||||
autofocus
|
||||
/>
|
||||
</QCardSection>
|
||||
<QCardActions align="right">
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@ import { ref } from 'vue';
|
|||
import axios from 'axios';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import notifyResults from 'src/utils/notifyResults';
|
||||
import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
|
||||
|
||||
const { notifyResults } = displayResults();
|
||||
const emit = defineEmits(['update-state']);
|
||||
const editableStates = ref([]);
|
||||
const showChangeStateDialog = ref(false);
|
||||
|
|
@ -49,6 +50,7 @@ const updateState = async () => {
|
|||
:options="editableStates"
|
||||
option-label="name"
|
||||
option-value="code"
|
||||
autofocus
|
||||
/>
|
||||
</QCardSection>
|
||||
<QCardActions align="right">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
import { Notify } from 'quasar';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
export function displayResults() {
|
||||
const { t } = useI18n();
|
||||
|
||||
const createSuccessNotification = (id, path) => {
|
||||
Notify.create({
|
||||
type: 'positive',
|
||||
message: t('globals.dataSaved'),
|
||||
actions: [
|
||||
{
|
||||
label: t('globals.openDetail'),
|
||||
color: 'white',
|
||||
handler: () => useOpenURL(`#/ticket/${id}/${path}`),
|
||||
},
|
||||
],
|
||||
});
|
||||
};
|
||||
|
||||
const handleResult = (result, key, path) => {
|
||||
if (result.status !== 'fulfilled') {
|
||||
const data = JSON.parse(result.reason.config.data);
|
||||
const error =
|
||||
result.reason.response?.data?.error?.message ?? result.reason.message;
|
||||
Notify.create({
|
||||
type: 'negative',
|
||||
message: `Ticket ${data[key]}: ${error}`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const data = JSON.parse(result.value.config.data);
|
||||
let id = data[key];
|
||||
|
||||
if (result.value.data.status === 'noSplit') {
|
||||
Notify.create({
|
||||
type: 'warning',
|
||||
message: `Ticket ${id}: ${t('negative.split.noSplit')}`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (result.value.data.status === 'split') {
|
||||
id = result.value.data.newTicket;
|
||||
}
|
||||
|
||||
createSuccessNotification(id, path);
|
||||
};
|
||||
|
||||
const notifyResults = (results, key, path = 'sale') =>
|
||||
results.forEach((result) => handleResult(result, key, path));
|
||||
|
||||
return { notifyResults };
|
||||
}
|
||||
|
|
@ -42,11 +42,7 @@ const groupedStates = ref([]);
|
|||
auto-load
|
||||
/>
|
||||
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
||||
<VnFilterPanel
|
||||
:data-key="props.dataKey"
|
||||
:search-button="true"
|
||||
:unremovableParams="['from', 'to']"
|
||||
>
|
||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
||||
|
|
@ -188,16 +184,6 @@ const groupedStates = ref([]);
|
|||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<QCheckbox
|
||||
v-model="params.problems"
|
||||
@update:model-value="searchFn()"
|
||||
:label="t('With problems')"
|
||||
toggle-indeterminate
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection v-if="!provinces">
|
||||
<QSkeleton type="QInput" class="full-width" />
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ const columns = computed(() => [
|
|||
columnFilter: false,
|
||||
label: t('ticketList.hour'),
|
||||
format: (row) => toTimeFormat(row.shipped),
|
||||
orderBy: false,
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
@ -136,6 +137,7 @@ const columns = computed(() => [
|
|||
columnFilter: false,
|
||||
label: t('ticketList.closure'),
|
||||
format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
|
||||
orderBy: false,
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
@ -477,7 +479,7 @@ function setReference(data) {
|
|||
prefix="card"
|
||||
:array-data-props="{
|
||||
url: 'Tickets/filter',
|
||||
order: ['shipped DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
|
||||
order: ['shipped DESC', 'id DESC'],
|
||||
exprBuilder,
|
||||
}"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -236,6 +236,7 @@ negative:
|
|||
minTimed: minTimed
|
||||
negativeAction: Negative
|
||||
totalNegative: Total negatives
|
||||
availabled: Availabled
|
||||
days: Days
|
||||
buttonsUpdate:
|
||||
item: Item
|
||||
|
|
@ -265,7 +266,7 @@ negative:
|
|||
isRookie: Is rookie
|
||||
turno: Turn line
|
||||
isBasket: Basket
|
||||
hasObservation: Has substitution
|
||||
hasObservation: Has substitution note
|
||||
hasToIgnore: VIP
|
||||
modal:
|
||||
changeItem:
|
||||
|
|
@ -288,3 +289,4 @@ negative:
|
|||
newTicket: New ticket
|
||||
status: Result
|
||||
message: Message
|
||||
noSplit: No split
|
||||
|
|
|
|||
|
|
@ -216,7 +216,8 @@ ticketList:
|
|||
negative:
|
||||
hour: Hora
|
||||
id: Id Articulo
|
||||
longName: Articulo
|
||||
longName: Artículo
|
||||
itemFk: Artículo
|
||||
supplier: Productor
|
||||
colour: Color
|
||||
size: Medida
|
||||
|
|
@ -232,6 +233,7 @@ negative:
|
|||
inkFk: Color
|
||||
timed: Hora
|
||||
date: Fecha
|
||||
availabled: Disponible
|
||||
minTimed: Hora
|
||||
type: Tipo
|
||||
negativeAction: Negativo
|
||||
|
|
@ -265,7 +267,7 @@ negative:
|
|||
isRookie: Cliente nuevo
|
||||
turno: Linea turno
|
||||
isBasket: Cesta
|
||||
hasObservation: Tiene sustitución
|
||||
hasObservation: Tiene nota de sustitución
|
||||
hasToIgnore: VIP
|
||||
modal:
|
||||
changeItem:
|
||||
|
|
@ -284,10 +286,11 @@ negative:
|
|||
title: Gestionar tickets spliteados
|
||||
subTitle: Confir fecha y agencia
|
||||
split:
|
||||
ticket: Ticket viejo
|
||||
ticket: Ticket origen
|
||||
newTicket: Ticket nuevo
|
||||
status: Estado
|
||||
message: Mensaje
|
||||
noSplit: No se puede splitar
|
||||
rounding: Redondeo
|
||||
noVerifiedData: Sin datos comprobados
|
||||
purchaseRequest: Petición de compra
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ const $props = defineProps({
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<QPopupProxy>
|
||||
<QPopupProxy data-cy="DepartmentDescriptor">
|
||||
<DepartmentDescriptor
|
||||
v-if="$props.id"
|
||||
:id="$props.id"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ const entityId = computed(() => {
|
|||
<template>
|
||||
<EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
|
||||
<template #menu="{ entity }">
|
||||
<ZoneDescriptorMenuItems :zone="entity" />
|
||||
<ZoneDescriptorMenuItems />
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<VnLv :label="$t('list.agency')" :value="entity.agencyMode?.name" />
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ const columns = computed(() => [
|
|||
optionLabel: 'name',
|
||||
optionValue: 'id',
|
||||
},
|
||||
columnClass: 'expand',
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
@ -247,74 +248,70 @@ const closeEventForm = () => {
|
|||
</QBtnGroup>
|
||||
</template>
|
||||
</VnSubToolbar>
|
||||
<div class="table-container">
|
||||
<div class="column items-center">
|
||||
<VnTable
|
||||
ref="tableRef"
|
||||
:data-key="dataKey"
|
||||
:columns="columns"
|
||||
redirect="Zone"
|
||||
:create="{
|
||||
urlCreate: 'Zones',
|
||||
title: t('list.createZone'),
|
||||
onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
|
||||
formInitialData: {},
|
||||
}"
|
||||
table-height="85vh"
|
||||
v-model:selected="selectedRows"
|
||||
:table="{
|
||||
'row-key': 'id',
|
||||
selection: 'multiple',
|
||||
}"
|
||||
>
|
||||
<template #column-addressFk="{ row }">
|
||||
{{ dashIfEmpty(formatRow(row)) }}
|
||||
</template>
|
||||
<template #more-create-dialog="{ data }">
|
||||
<VnSelect
|
||||
url="AgencyModes"
|
||||
v-model="data.agencyModeFk"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
:label="t('list.agency')"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.price"
|
||||
:label="t('list.price')"
|
||||
min="0"
|
||||
type="number"
|
||||
required="true"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.bonus"
|
||||
:label="t('zone.bonus')"
|
||||
min="0"
|
||||
type="number"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.travelingDays"
|
||||
:label="t('zone.travelingDays')"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
<VnInputTime v-model="data.hour" :label="t('list.close')" />
|
||||
<VnSelect
|
||||
url="Warehouses"
|
||||
v-model="data.warehouseFK"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
:label="t('list.warehouse')"
|
||||
:options="warehouseOptions"
|
||||
/>
|
||||
<QCheckbox
|
||||
v-model="data.isVolumetric"
|
||||
:label="t('list.isVolumetric')"
|
||||
:toggle-indeterminate="false"
|
||||
/>
|
||||
</template>
|
||||
</VnTable>
|
||||
</div>
|
||||
</div>
|
||||
<VnTable
|
||||
ref="tableRef"
|
||||
:data-key="dataKey"
|
||||
:columns="columns"
|
||||
redirect="Zone"
|
||||
:create="{
|
||||
urlCreate: 'Zones',
|
||||
title: t('list.createZone'),
|
||||
onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
|
||||
formInitialData: {},
|
||||
}"
|
||||
table-height="85vh"
|
||||
v-model:selected="selectedRows"
|
||||
:table="{
|
||||
'row-key': 'id',
|
||||
selection: 'multiple',
|
||||
}"
|
||||
>
|
||||
<template #column-addressFk="{ row }">
|
||||
{{ dashIfEmpty(formatRow(row)) }}
|
||||
</template>
|
||||
<template #more-create-dialog="{ data }">
|
||||
<VnSelect
|
||||
url="AgencyModes"
|
||||
v-model="data.agencyModeFk"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
:label="t('list.agency')"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.price"
|
||||
:label="t('list.price')"
|
||||
min="0"
|
||||
type="number"
|
||||
required="true"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.bonus"
|
||||
:label="t('zone.bonus')"
|
||||
min="0"
|
||||
type="number"
|
||||
/>
|
||||
<VnInput
|
||||
v-model="data.travelingDays"
|
||||
:label="t('zone.travelingDays')"
|
||||
type="number"
|
||||
min="0"
|
||||
/>
|
||||
<VnInputTime v-model="data.hour" :label="t('list.close')" />
|
||||
<VnSelect
|
||||
url="Warehouses"
|
||||
v-model="data.warehouseFK"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
:label="t('list.warehouse')"
|
||||
:options="warehouseOptions"
|
||||
/>
|
||||
<QCheckbox
|
||||
v-model="data.isVolumetric"
|
||||
:label="t('list.isVolumetric')"
|
||||
:toggle-indeterminate="false"
|
||||
/>
|
||||
</template>
|
||||
</VnTable>
|
||||
</template>
|
||||
</VnSection>
|
||||
<QDialog v-model="showZoneEventForm" @hide="closeEventForm()">
|
||||
|
|
@ -333,24 +330,6 @@ const closeEventForm = () => {
|
|||
/>
|
||||
</QDialog>
|
||||
</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>
|
||||
es:
|
||||
Search zone: Buscar zona
|
||||
|
|
|
|||
|
|
@ -166,7 +166,12 @@ const vehicleCard = {
|
|||
component: () => import('src/pages/Route/Vehicle/Card/VehicleCard.vue'),
|
||||
redirect: { name: 'VehicleSummary' },
|
||||
meta: {
|
||||
menu: ['VehicleBasicData', 'VehicleNotes', 'VehicleEvents'],
|
||||
menu: [
|
||||
'VehicleBasicData',
|
||||
'VehicleNotes',
|
||||
'VehicleDms',
|
||||
'VehicleEvents'
|
||||
],
|
||||
},
|
||||
children: [
|
||||
{
|
||||
|
|
@ -197,13 +202,13 @@ const vehicleCard = {
|
|||
component: () => import('src/pages/Route/Vehicle/Card/VehicleNotes.vue'),
|
||||
},
|
||||
{
|
||||
name: 'VehicleEvents',
|
||||
path: 'events',
|
||||
name: 'VehicleDms',
|
||||
path: 'dms',
|
||||
meta: {
|
||||
title: 'calendar',
|
||||
icon: 'vn:calendar',
|
||||
title: 'dms',
|
||||
icon: 'cloud_upload',
|
||||
},
|
||||
component: () => import('src/pages/Route/Vehicle/Card/VehicleEvents.vue'),
|
||||
component: () => import('src/pages/Route/Vehicle/VehicleDms.vue'),
|
||||
},
|
||||
],
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
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';
|
||||
|
||||
describe('useStateQueryStore', () => {
|
||||
beforeAll(() => {
|
||||
createWrapper({}, {});
|
||||
});
|
||||
|
||||
const stateQueryStore = useStateQueryStore();
|
||||
const { add, isLoading, remove, reset } = useStateQueryStore();
|
||||
let stateQueryStore;
|
||||
let add, isLoading, remove, reset;
|
||||
const firstQuery = { url: 'myQuery' };
|
||||
|
||||
function getQueries() {
|
||||
return stateQueryStore.queries;
|
||||
}
|
||||
beforeAll(() => {
|
||||
setActivePinia(createPinia());
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
stateQueryStore = useStateQueryStore();
|
||||
({ add, isLoading, remove, reset } = useStateQueryStore());
|
||||
reset();
|
||||
expect(getQueries().size).toBeFalsy();
|
||||
});
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue