Compare commits

..

6 Commits

Author SHA1 Message Date
Javier Segarra 7dcfeb0fc7 test: try to fix entryBuys test
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-05-09 11:56:18 +02:00
Javier Segarra 1007a884b9 feat: remove reset selected variable
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-05-08 12:25:59 +02:00
Jon Elias 9a33945662 Merge pull request 'Hotfix[UseValidator]: Make 0 become valid in VnInputNumber when using required from useValidator composable' (!1785) from Hotfix-CustomerCredits into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1785
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-05-08 10:10:56 +00:00
Jon Elias c0f19b3131 Merge branch 'master' into Hotfix-CustomerCredits
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-05-08 10:09:21 +00:00
Jon Elias 0691d5e966 Merge branch 'master' into Hotfix-CustomerCredits
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-05-07 11:09:49 +00:00
Jon Elias 9ee69274ae fix: make 0 become valid in VnInputNumber when using required from validator
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-05-07 12:28:05 +02:00
319 changed files with 1863 additions and 9452 deletions

View File

@ -26,7 +26,7 @@ if (branchName) {
const splitedMsg = msg.split(':');
if (splitedMsg.length > 1) {
const finalMsg = `${splitedMsg[0]}: ${referenceTag}${splitedMsg.slice(1).join(':')}`;
const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
writeFileSync(msgPath, finalMsg);
}
}

View File

@ -1,9 +1,6 @@
import { defineConfig } from 'cypress';
let urlHost;
let reporter;
let reporterOptions;
let timeouts;
let urlHost, reporter, reporterOptions, timeouts;
if (process.env.CI) {
urlHost = 'front';
@ -47,7 +44,6 @@ 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,
@ -64,6 +60,5 @@ export default defineConfig({
...timeouts,
includeShadowDom: true,
waitForAnimations: true,
testIsolation: false,
},
});

View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<title><%= productName %></title>
@ -12,12 +12,7 @@
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
/>
<link
rel="icon"
type="image/png"
sizes="128x128"
href="icons/favicon-128x128.png"
/>
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png" />
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />

View File

@ -1,6 +1,6 @@
{
"name": "salix-front",
"version": "25.18.0",
"version": "25.16.0",
"description": "Salix frontend",
"productName": "Salix",
"author": "Verdnatura",

View File

@ -1,3 +1,4 @@
/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config
import autoprefixer from 'autoprefixer';

View File

@ -13,7 +13,7 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import path from 'path';
const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
export default configure((/* ctx */) => {
export default configure(function (/* ctx */) {
return {
eslint: {
// fix: true,

View File

@ -1,6 +1,8 @@
{
"@quasar/testing-unit-vitest": {
"options": ["scripts"]
"options": [
"scripts"
]
},
"@quasar/qcalendar": {}
}

View File

@ -1,5 +1,5 @@
{
"unit-vitest": {
"runnerCommand": "vitest run"
}
}
"unit-vitest": {
"runnerCommand": "vitest run"
}
}

View File

@ -2,7 +2,6 @@
import { onMounted } from 'vue';
import { useQuasar, Dark } from 'quasar';
import { useI18n } from 'vue-i18n';
import VnScroll from './components/common/VnScroll.vue';
const quasar = useQuasar();
const { availableLocales, locale, fallbackLocale } = useI18n();
@ -39,7 +38,6 @@ quasar.iconMapFn = (iconName) => {
<template>
<RouterView />
<VnScroll />
</template>
<style lang="scss">

View File

@ -67,7 +67,7 @@ describe('Axios boot', () => {
};
const result = onResponseError(error);
await expect(result).rejects.toEqual(expect.objectContaining(error));
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);
await expect(result).rejects.toEqual(expect.objectContaining(error));
expect(result).rejects.toEqual(expect.objectContaining(error));
});
});
});

View File

@ -11,8 +11,8 @@ export default function (component, key, value) {
};
break;
case 'undefined':
throw new Error(`unknown prop: ${key}`);
throw new Error('unknown prop: ' + key);
default:
throw new Error(`unhandled type: ${typeof prop}`);
throw new Error('unhandled type: ' + typeof prop);
}
}

View File

@ -9,7 +9,7 @@ export default {
const keyBindingMap = routes
.filter((route) => route.meta.keyBinding)
.reduce((map, route) => {
map[`Key${route.meta.keyBinding.toUpperCase()}`] = route.path;
map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
return map;
}, {});

View File

@ -1,3 +1,4 @@
/* eslint-disable eslint/export */
export * from './defaults/qTable';
export * from './defaults/qInput';
export * from './defaults/qSelect';

View File

@ -24,9 +24,12 @@ export default boot(({ app }) => {
switch (response?.status) {
case 422:
if (error.name == 'ValidationError')
message += ` "${responseError.details.context}.${Object.keys(
responseError.details.codes,
).join(',')}"`;
message +=
' "' +
responseError.details.context +
'.' +
Object.keys(responseError.details.codes).join(',') +
'"';
break;
case 500:
message = 'errors.statusInternalServerError';

View File

@ -20,6 +20,7 @@ const postcodeFormData = reactive({
provinceFk: null,
townFk: null,
});
const townFilter = ref({});
const countriesRef = ref(false);
const provincesOptions = ref([]);
@ -32,11 +33,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);
@ -66,11 +67,21 @@ 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>
@ -96,6 +107,7 @@ async function onCityCreated(newTown, formData) {
<VnSelectDialog
:label="t('City')"
@update:model-value="(value) => setTown(value, data)"
@filter="filterTowns"
:tooltip="t('Create city')"
v-model="data.townFk"
url="Towns/location"

View File

@ -25,7 +25,7 @@ const autonomiesRef = ref([]);
const onDataSaved = (dataSaved, requestResponse) => {
requestResponse.autonomy = autonomiesRef.value.opts.find(
(autonomy) => autonomy.id == requestResponse.autonomyFk,
(autonomy) => autonomy.id == requestResponse.autonomyFk
);
emit('onDataSaved', dataSaved, requestResponse);
};

View File

@ -1,6 +1,6 @@
<script setup>
import axios from 'axios';
import { computed, ref, useAttrs, watch, nextTick } from 'vue';
import { computed, ref, useAttrs, watch } from 'vue';
import { useRouter, onBeforeRouteLeave } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
@ -42,15 +42,7 @@ const $props = defineProps({
},
dataRequired: {
type: Object,
default: () => ({}),
},
dataDefault: {
type: Object,
default: () => ({}),
},
insertOnLoad: {
type: Boolean,
default: false,
default: () => {},
},
defaultSave: {
type: Boolean,
@ -73,7 +65,7 @@ const $props = defineProps({
default: null,
},
beforeSaveFn: {
type: [String, Function],
type: Function,
default: null,
},
goTo: {
@ -95,7 +87,6 @@ const formData = ref();
const saveButtonRef = ref(null);
const watchChanges = ref();
const formUrl = computed(() => $props.url);
const rowsContainer = ref(null);
const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@ -131,11 +122,9 @@ async function fetch(data) {
const rows = keyData ? data[keyData] : data;
resetData(rows);
emit('onFetch', rows);
$props.insertOnLoad && await insert();
return rows;
}
function resetData(data) {
if (!data) return;
if (data && Array.isArray(data)) {
@ -146,16 +135,9 @@ function resetData(data) {
formData.value = JSON.parse(JSON.stringify(data));
if (watchChanges.value) watchChanges.value(); //destroy watcher
watchChanges.value = watch(formData, (nVal) => {
hasChanges.value = false;
const filteredNewData = nVal.filter(row => !isRowEmpty(row) || row[$props.primaryKey]);
const filteredOriginal = originalData.value.filter(row => row[$props.primaryKey]);
const changes = getDifferences(filteredOriginal, filteredNewData);
hasChanges.value = !isEmpty(changes);
}, { deep: true });
watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
}
async function reset() {
await fetch(originalData.value);
hasChanges.value = false;
@ -183,9 +165,7 @@ async function onSubmit() {
});
}
isLoading.value = true;
await saveChanges($props.saveFn ? formData.value : null);
}
async function onSubmitAndGo() {
@ -194,10 +174,6 @@ async function onSubmitAndGo() {
}
async function saveChanges(data) {
formData.value = formData.value.filter(row =>
row[$props.primaryKey] || !isRowEmpty(row)
);
if ($props.saveFn) {
$props.saveFn(data, getChanges);
isLoading.value = false;
@ -227,32 +203,14 @@ async function saveChanges(data) {
});
}
async function insert(pushData = { ...$props.dataRequired, ...$props.dataDefault }) {
formData.value = formData.value.filter(row => !isRowEmpty(row));
const lastRow = formData.value.at(-1);
const isLastRowEmpty = lastRow ? isRowEmpty(lastRow) : false;
if (formData.value.length && isLastRowEmpty) return;
const $index = formData.value.length ? formData.value.at(-1).$index + 1 : 0;
const nRow = Object.assign({ $index }, pushData);
formData.value.push(nRow);
const hasChange = Object.keys(nRow).some(key => !isChange(nRow, key));
if (hasChange) hasChanges.value = true;
async function insert(pushData = $props.dataRequired) {
const $index = formData.value.length
? formData.value[formData.value.length - 1].$index + 1
: 0;
formData.value.push(Object.assign({ $index }, pushData));
hasChanges.value = true;
}
function isRowEmpty(row) {
return Object.keys(row).every(key => isChange(row, key));
}
function isChange(row,key){
return !row[key] || key == '$index' || Object.hasOwn($props.dataRequired || {}, key);
}
async function remove(data) {
if (!data.length)
return quasar.notify({
@ -269,8 +227,10 @@ async function remove(data) {
newData = newData.filter(
(form) => !preRemove.some((index) => index == form.$index),
);
formData.value = newData;
hasChanges.value = JSON.stringify(removeIndexField(formData.value)) !== JSON.stringify(removeIndexField(originalData.value));
const changes = getChanges();
if (!changes.creates?.length && !changes.updates?.length)
hasChanges.value = false;
fetch(newData);
}
if (ids.length) {
quasar
@ -288,8 +248,9 @@ async function remove(data) {
newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
fetch(newData);
});
} else {
reset();
}
emit('update:selected', []);
}
@ -300,7 +261,7 @@ function getChanges() {
const pk = $props.primaryKey;
for (const [i, row] of formData.value.entries()) {
if (!row[pk]) {
creates.push(Object.assign(row, { ...$props.dataRequired }));
creates.push(row);
} else if (originalData.value[i]) {
const data = getDifferences(originalData.value[i], row);
if (!isEmpty(data)) {
@ -326,33 +287,6 @@ function isEmpty(obj) {
return !Object.keys(obj).length;
}
function removeIndexField(data) {
if (Array.isArray(data)) {
return data.map(({ $index, ...rest }) => rest);
} else if (typeof data === 'object' && data !== null) {
const { $index, ...rest } = data;
return rest;
}
}
async function handleTab(event) {
event.preventDefault();
const { shiftKey, target } = event;
const focusableSelector = `tbody tr td:not(:first-child) :is(a, button, input, textarea, select, details):not([disabled])`;
const focusableElements = rowsContainer.value?.querySelectorAll(focusableSelector);
const currentIndex = Array.prototype.indexOf.call(focusableElements, target);
const index = shiftKey ? currentIndex - 1 : currentIndex + 1;
const isLast = target === focusableElements[focusableElements.length - 1];
const isFirst = currentIndex === 0;
if ((shiftKey && !isFirst) || (!shiftKey && !isLast))
focusableElements[index]?.focus();
else if (isLast) {
await insert();
await nextTick();
}
}
async function reload(params) {
const data = await vnPaginateRef.value.fetch(params);
fetch(data);
@ -378,14 +312,12 @@ watch(formUrl, async () => {
v-bind="$attrs"
>
<template #body v-if="formData">
<div ref="rowsContainer" @keydown.tab="handleTab">
<slot
name="body"
:rows="formData"
:validate="validate"
:filter="filter"
></slot>
</div>
<slot
name="body"
:rows="formData"
:validate="validate"
:filter="filter"
></slot>
</template>
</VnPaginate>
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
@ -415,16 +347,8 @@ watch(formUrl, async () => {
<QBtnDropdown
v-if="$props.goTo && $props.defaultSave"
@click="onSubmitAndGo"
:label="
tMobile('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:label="tMobile('globals.saveAndContinue')"
:title="t('globals.saveAndContinue')"
:disable="!hasChanges"
color="primary"
icon="save"

View File

@ -1,154 +0,0 @@
<script setup>
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { date } from 'quasar';
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import useWeekdaysOrder from 'src/composables/getWeekdays';
const formatDate = (dateToFormat, format = 'YYYY-MM-DD') =>
date.formatDate(dateToFormat, format);
const props = defineProps({
year: {
type: Number,
required: true,
},
month: {
type: Number,
required: true,
},
monthDate: {
type: Object,
default: null,
},
daysMap: {
type: Object,
default: null,
},
});
const emit = defineEmits(['onDateSelected']);
const { locale } = useI18n();
const weekdayStore = useWeekdayStore();
const weekDays = useWeekdaysOrder();
const calendarRef = ref(null);
const today = ref(formatDate(Date.vnNew()));
const todayTimestamp = computed(() => {
const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
return date.getTime();
});
const _monthDate = computed(() => formatDate(props.monthDate));
const calendarHeaderTitle = computed(() => {
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
});
const isToday = (timestamp) => {
const { year, month, day } = timestamp;
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
};
const getEventByTimestamp = ({ year, month, day }) => {
const stamp = new Date(year, month - 1, day).getTime();
return props.daysMap?.[stamp] || null;
};
const handleDateClick = (timestamp) => {
const event = getEventByTimestamp(timestamp);
const { year, month, day } = timestamp;
const date = new Date(year, month - 1, day);
emit('onDateSelected', {
date,
isNewMode: !event,
event: event?.[0] || null,
});
};
const getEventAttrs = (timestamp) => {
return {
class: '--event',
label: timestamp.day,
};
};
defineExpose({ getEventByTimestamp, handleDateClick });
</script>
<template>
<QCalendarMonthWrapper
style="height: 290px; width: 290px"
transparent-background
view-customization="workerCalendar"
>
<template #header>
<span class="full-width text-center text-body1 q-py-sm">{{
calendarHeaderTitle
}}</span>
</template>
<template #calendar>
<QCalendarMonth
ref="calendarRef"
:model-value="_monthDate"
show-work-weeks
no-outside-days
no-active-date
:weekdays="weekDays"
short-weekday-label
:locale="locale"
:now="today"
@click-date="handleDateClick($event.scope.timestamp)"
mini-mode
>
<template #day="{ scope: { timestamp } }">
<slot
name="day"
:timestamp="timestamp"
:getEventAttrs="getEventAttrs"
>
<QBtn
v-if="getEventByTimestamp(timestamp)"
v-bind="{ ...getEventAttrs(timestamp) }"
@click="handleDateClick(timestamp)"
rounded
dense
flat
class="calendar-event"
:class="{ '--today': isToday(timestamp) }"
/>
</slot>
</template>
</QCalendarMonth>
</template>
</QCalendarMonthWrapper>
</template>
<style lang="scss">
.calendar-event {
display: flex;
justify-content: center;
width: 32px;
height: 32px;
font-size: 13px;
line-height: 1.715em;
cursor: pointer;
color: white;
&.--today {
border: 2px solid $info;
}
&.--event {
background-color: $positive;
color: black;
}
&:hover {
opacity: 0.8;
}
}
</style>

View File

@ -1,126 +0,0 @@
<script setup>
import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
import { useStateStore } from 'stores/useStateStore';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import { useArrayData } from 'src/composables/useArrayData';
const props = defineProps({
dataKey: {
type: String,
required: true,
},
calendarComponent: {
type: Object,
required: true,
},
additionalProps: {
type: Object,
default: () => ({}),
},
});
const stateStore = useStateStore();
const weekdayStore = useWeekdayStore();
const nMonths = ref(4);
const _date = ref(Date.vnNew());
const firstDay = ref(Date.vnNew());
const lastDay = ref(Date.vnNew());
const months = ref([]);
const arrayData = useArrayData(props.dataKey);
onMounted(async () => {
const initialDate = Date.vnNew();
initialDate.setDate(1);
initialDate.setHours(0, 0, 0, 0);
date.value = initialDate;
await nextTick();
stateStore.rightDrawer = true;
});
onUnmounted(() => arrayData.destroy());
const emit = defineEmits([
'update:firstDay',
'update:lastDay',
'update:events',
'onDateSelected',
]);
const date = computed({
get: () => _date.value,
set: (value) => {
if (!(value instanceof Date)) return;
_date.value = value;
const stamp = value.getTime();
firstDay.value = new Date(stamp);
firstDay.value.setDate(1);
lastDay.value = new Date(stamp);
lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
lastDay.value.setDate(0);
months.value = [];
for (let i = 0; i < nMonths.value; i++) {
const monthDate = new Date(stamp);
monthDate.setMonth(value.getMonth() + i);
months.value.push(monthDate);
}
emit('update:firstDay', firstDay.value);
emit('update:lastDay', lastDay.value);
emit('refresh-events');
},
});
const headerTitle = computed(() => {
if (!months.value?.length) return '';
const getMonthName = (date) =>
`${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
});
const step = (direction) => {
const newDate = new Date(date.value);
newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
date.value = newDate;
};
defineExpose({
firstDay,
lastDay,
});
</script>
<template>
<QCard style="height: max-content">
<div class="calendars-header">
<QBtn
icon="arrow_left"
size="sm"
flat
class="full-height"
@click="step(-1)"
/>
<span>{{ headerTitle }}</span>
<QBtn
icon="arrow_right"
size="sm"
flat
class="full-height"
@click="step(1)"
/>
</div>
<div class="calendars-container">
<component
:is="calendarComponent"
v-for="(month, index) in months"
:key="index"
:month="month.getMonth() + 1"
:year="month.getFullYear()"
:month-date="month"
v-bind="additionalProps"
@on-date-selected="(data) => emit('onDateSelected', data)"
/>
</div>
</QCard>
</template>

View File

@ -156,9 +156,6 @@ const selectTravel = ({ id }) => {
option-label="name"
option-value="id"
v-model="travelFilterParams.warehouseOutFk"
:where="{
isOrigin: true,
}"
/>
<VnSelect
:label="t('globals.warehouseIn')"
@ -167,9 +164,6 @@ const selectTravel = ({ id }) => {
option-label="name"
option-value="id"
v-model="travelFilterParams.warehouseInFk"
:where="{
isDestiny: true,
}"
/>
<VnInputDate
:label="t('globals.shipped')"

View File

@ -22,6 +22,7 @@ const { validate, validations } = useValidator();
const { notify } = useNotify();
const route = useRoute();
const myForm = ref(null);
const attrs = useAttrs();
const $props = defineProps({
url: {
type: String,
@ -98,12 +99,8 @@ const $props = defineProps({
type: Function,
default: () => {},
},
preventSubmit: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
const emit = defineEmits(['onFetch', 'onDataSaved']);
const modelValue = computed(
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
).value;
@ -304,7 +301,7 @@ function onBeforeSave(formData, originalData) {
);
}
async function onKeyup(evt) {
if (evt.key === 'Enter' && !$props.preventSubmit) {
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
const input = evt.target;
if (input.type == 'textarea' && evt.shiftKey) {
let { selectionStart, selectionEnd } = input;
@ -333,7 +330,6 @@ defineExpose({
<template>
<div class="column items-center full-width">
<QForm
v-on="$attrs"
ref="myForm"
v-if="formData"
@submit.prevent="save"
@ -380,16 +376,8 @@ defineExpose({
data-cy="saveAndContinueDefaultBtn"
v-if="$props.goTo"
@click="saveAndGo"
:label="
tMobile('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:label="tMobile('globals.saveAndContinue')"
:title="t('globals.saveAndContinue')"
:disable="!hasChanges"
color="primary"
icon="save"
@ -418,7 +406,6 @@ defineExpose({
</QBtnDropdown>
<QBtn
v-else
data-cy="saveDefaultBtn"
:label="tMobile('globals.save')"
color="primary"
icon="save"

View File

@ -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" />

View File

@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
'no-visible': !stateQuery.isLoading().value,
}"
size="sm"
data-cy="navBar-spinner"
data-cy="loading-spinner"
/>
<QSpace />
<div id="searchbar" class="searchbar"></div>

View File

@ -26,7 +26,7 @@ async function redirect() {
if (route?.params?.id)
return (window.location.href = await getUrl(
`${section}/${route.params.id}/summary`,
`${section}/${route.params.id}/summary`
));
return (window.location.href = await getUrl(section + '/index'));
}

View File

@ -55,7 +55,7 @@ const refund = async () => {
(data) => (
(rectificativeTypeOptions = data),
(invoiceParams.cplusRectificationTypeFk = data.filter(
(type) => type.description == 'I Por diferencias',
(type) => type.description == 'I Por diferencias'
)[0].id)
)
"
@ -68,7 +68,7 @@ const refund = async () => {
(data) => (
(siiTypeInvoiceOutsOptions = data),
(invoiceParams.siiTypeInvoiceOutFk = data.filter(
(type) => type.code == 'R4',
(type) => type.code == 'R4'
)[0].id)
)
"

View File

@ -40,9 +40,6 @@ const onDataSaved = (data) => {
url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)"
auto-load
:where="{
isInventory: true,
}"
/>
<FormModelPopup
url-create="Items/regularize"

View File

@ -52,7 +52,7 @@ watch(
} else filter.value.where = {};
await provincesFetchDataRef.value.fetch({});
emit('onProvinceFetched', provincesOptions.value);
},
}
);
</script>

View File

@ -1,6 +1,6 @@
<script setup>
import { markRaw, computed, onBeforeMount } from 'vue';
import { QToggle } from 'quasar';
import { markRaw, computed } from 'vue';
import { QCheckbox, QToggle } from 'quasar';
import { useArrayData } from 'composables/useArrayData';
import VnSelect from 'components/common/VnSelect.vue';
import VnInput from 'components/common/VnInput.vue';
@ -150,16 +150,6 @@ const showFilter = computed(
const onTabPressed = async () => {
if (model.value) enterEvent['keyup.enter']();
};
onBeforeMount(() => {
const columnFilter = $props.column?.columnFilter;
const component = columnFilter?.component;
const defaultComponent = components[component];
const events = { update: updateEvent, enter: enterEvent };
if (!columnFilter || defaultComponent) return;
$props.column.columnFilter.event = events[columnFilter.event];
});
</script>
<template>
<div v-if="showFilter" class="full-width" style="overflow: hidden">

View File

@ -16,7 +16,7 @@ const $props = defineProps({
required: true,
},
searchUrl: {
type: [String, Boolean],
type: String,
default: 'table',
},
vertical: {

View File

@ -33,9 +33,6 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
import VnTableFilter from './VnTableFilter.vue';
import { getColAlign } from 'src/composables/getColAlign';
import RightMenu from '../common/RightMenu.vue';
import VnScroll from '../common/VnScroll.vue';
import VnCheckboxMenu from '../common/VnCheckboxMenu.vue';
import VnCheckbox from '../common/VnCheckbox.vue';
const arrayData = useArrayData(useAttrs()['data-key']);
const $props = defineProps({
@ -68,7 +65,7 @@ const $props = defineProps({
default: null,
},
create: {
type: [Boolean, Object],
type: Object,
default: null,
},
createAsDialog: {
@ -115,10 +112,6 @@ const $props = defineProps({
type: Object,
default: () => ({}),
},
multiCheck: {
type: Object,
default: () => ({}),
},
crudModel: {
type: Object,
default: () => ({}),
@ -163,7 +156,6 @@ const CARD_MODE = 'card';
const TABLE_MODE = 'table';
const mode = ref(CARD_MODE);
const selected = ref([]);
const selectAll = ref(false);
const hasParams = ref(false);
const CrudModelRef = ref({});
const showForm = ref(false);
@ -176,7 +168,6 @@ const params = ref(useFilterParams($attrs['data-key']).params);
const orders = ref(useFilterParams($attrs['data-key']).orders);
const app = inject('app');
const tableHeight = useTableHeight();
const vnScrollRef = ref(null);
const editingRow = ref(null);
const editingField = ref(null);
@ -198,17 +189,6 @@ const tableModes = [
},
];
const onVirtualScroll = ({ to }) => {
handleScroll();
const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
if (virtualScrollContainer) {
virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
if (vnScrollRef.value) {
vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
}
}
};
onBeforeMount(() => {
const urlParams = route.query[$props.searchUrl];
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@ -332,8 +312,6 @@ function stopEventPropagation(event) {
}
function reload(params) {
selected.value = [];
selectAll.value = false;
CrudModelRef.value.reload(params);
}
@ -348,13 +326,16 @@ function handleOnDataSaved(_) {
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
else $props.create.onDataSaved(_);
}
function handleScroll() {
if ($props.crudModel.disableInfiniteScroll) return;
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
}
function handleSelection({ evt, added, rows: selectedRows }, rows) {
if (evt?.shiftKey && added) {
const rowIndex = selectedRows[0].$index;
@ -646,17 +627,6 @@ const rowCtrlClickFunction = computed(() => {
};
return () => {};
});
const handleHeaderSelection = (evt, data) => {
if (evt === 'updateSelected' && selectAll.value) {
selected.value = tableRef.value.rows;
} else if (evt === 'selectAll') {
selected.value = data;
} else {
selected.value = [];
}
emit('update:selected', selected.value);
};
</script>
<template>
<RightMenu v-if="$props.rightSearch" :overlay="overlay">
@ -682,15 +652,7 @@ const handleHeaderSelection = (evt, data) => {
:class="$attrs['class'] ?? 'q-px-md'"
:limit="$attrs['limit'] ?? 100"
ref="CrudModelRef"
@on-fetch="
(...args) => {
if ($props.multiCheck.expand) {
selectAll = false;
selected = [];
}
emit('onFetch', ...args);
}
"
@on-fetch="(...args) => emit('onFetch', ...args)"
:search-url="searchUrl"
:disable-infinite-scroll="isTableMode"
:before-save-fn="removeTextValue"
@ -720,33 +682,13 @@ const handleHeaderSelection = (evt, data) => {
flat
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
:virtual-scroll="isTableMode"
@virtual-scroll="onVirtualScroll"
@virtual-scroll="handleScroll"
@row-click="(event, row) => handleRowClick(event, row)"
@update:selected="emit('update:selected', $event)"
@selection="(details) => handleSelection(details, rows)"
:hide-selected-banner="true"
:data-cy
>
<template #header-selection>
<div class="flex items-center no-wrap" style="display: flex">
<VnCheckbox
v-model="selectAll"
@click="handleHeaderSelection('updateSelected', $event)"
/>
<VnCheckboxMenu
v-if="selectAll && $props.multiCheck.expand"
:searchUrl="searchUrl"
v-model="selectAll"
:url="$attrs['url']"
@update:selected="
handleHeaderSelection('updateSelected', $event)
"
@select:all="handleHeaderSelection('selectAll', $event)"
/>
</div>
</template>
<template #top-left v-if="!$props.withoutHeader">
<slot name="top-left"> </slot>
</template>
@ -798,7 +740,6 @@ const handleHeaderSelection = (evt, data) => {
withFilters
"
:column="col"
:data-cy="`column-filter-${col.name}`"
:show-title="true"
:data-key="$attrs['data-key']"
v-model="params[columnName(col)]"
@ -1145,11 +1086,6 @@ const handleHeaderSelection = (evt, data) => {
</template>
</FormModelPopup>
</QDialog>
<VnScroll
ref="vnScrollRef"
v-if="isTableMode"
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
/>
</template>
<i18n>
en:

View File

@ -30,7 +30,6 @@ 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 }">

View File

@ -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() {

View File

@ -11,9 +11,6 @@ describe('VnTable', () => {
propsData: {
columns: [],
},
attrs: {
'data-key': 'test',
},
});
vm = wrapper.vm;

View File

@ -6,7 +6,7 @@ export default function (initialFooter, data) {
});
return acc;
},
{ ...initialFooter },
{ ...initialFooter }
);
return footer;
}

View File

@ -11,7 +11,13 @@ describe('CrudModel', () => {
beforeAll(() => {
wrapper = createWrapper(CrudModel, {
global: {
stubs: ['vnPaginate', 'vue-i18n'],
stubs: [
'vnPaginate',
'useState',
'arrayData',
'useStateStore',
'vue-i18n',
],
mocks: {
validate: vi.fn(),
},
@ -23,7 +29,7 @@ describe('CrudModel', () => {
dataKey: 'crudModelKey',
model: 'crudModel',
url: 'crudModelUrl',
saveFn: vi.fn(),
saveFn: '',
},
});
wrapper = wrapper.wrapper;
@ -193,11 +199,11 @@ describe('CrudModel', () => {
});
it('should set originalData and formatData with data and generate watchChanges', async () => {
data = [{
data = {
name: 'Tony',
lastName: 'Stark',
age: 42,
}];
};
vm.resetData(data);
@ -225,7 +231,7 @@ describe('CrudModel', () => {
expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false);
await wrapper.setProps({ saveFn: null });
await wrapper.setProps({ saveFn: '' });
});
it("should use default url if there's not saveFn", async () => {
@ -241,7 +247,7 @@ describe('CrudModel', () => {
await vm.saveChanges(data);
expect(postMock).toHaveBeenCalledWith(`${vm.url}/crud`, data);
expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false);
expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));

View File

@ -142,14 +142,14 @@ describe('getRoutes', () => {
const fn = (props) => getRoutes(props, getMethodA, getMethodB);
it('should call getMethodB when source is card', () => {
const props = { source: 'methodB' };
let props = { source: 'methodB' };
fn(props);
expect(getMethodB).toHaveBeenCalled();
expect(getMethodA).not.toHaveBeenCalled();
});
it('should call getMethodA when source is main', () => {
const props = { source: 'methodA' };
let props = { source: 'methodA' };
fn(props);
expect(getMethodA).toHaveBeenCalled();
@ -157,7 +157,7 @@ describe('getRoutes', () => {
});
it('should call getMethodA when source is not exists or undefined', () => {
const props = { source: 'methodC' };
let props = { source: 'methodC' };
expect(() => fn(props)).toThrowError('Method not defined');
expect(getMethodA).not.toHaveBeenCalled();
@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
vm = mount('card').vm;
});
it('should get routes for card source', () => {
it('should get routes for card source', async () => {
vm.getRoutes();
});
});
@ -251,6 +251,7 @@ describe('LeftMenu as main', () => {
});
it('should get routes for main source', () => {
vm.props.source = 'main';
vm.getRoutes();
expect(navigation.getModules).toHaveBeenCalled();
});

View File

@ -1,93 +0,0 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import VnInput from 'src/components/common/VnInput.vue';
import FetchData from '../FetchData.vue';
import VnSelectDialog from './VnSelectDialog.vue';
import CreateBankEntityForm from '../CreateBankEntityForm.vue';
const $props = defineProps({
iban: {
type: String,
default: null,
},
bankEntityFk: {
type: Number,
default: null,
},
disableElement: {
type: Boolean,
default: false,
},
});
const filter = {
fields: ['id', 'bic', 'name'],
order: 'bic ASC',
};
const { t } = useI18n();
const emit = defineEmits(['updateBic']);
const iban = ref($props.iban);
const bankEntityFk = ref($props.bankEntityFk);
const bankEntities = ref([]);
const autofillBic = async (bic) => {
if (!bic) return;
const bankEntityId = parseInt(bic.substr(4, 4));
const ibanCountry = bic.substr(0, 2);
if (ibanCountry != 'ES') return;
const existBank = bankEntities.value.find((b) => b.id === bankEntityId);
bankEntityFk.value = existBank ? bankEntityId : null;
emit('updateBic', { iban: iban.value, bankEntityFk: bankEntityFk.value });
};
const getBankEntities = (data) => {
bankEntityFk.value = data.id;
};
</script>
<template>
<FetchData
url="BankEntities"
:filter="filter"
auto-load
@on-fetch="(data) => (bankEntities = data)"
/>
<VnInput
:label="t('IBAN')"
clearable
v-model="iban"
@update:model-value="autofillBic($event)"
:disable="disableElement"
>
<template #append>
<QIcon name="info" class="cursor-info">
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
</QIcon>
</template>
</VnInput>
<VnSelectDialog
:label="t('Swift / BIC')"
:acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
:options="bankEntities"
hide-selected
option-label="bic"
option-value="id"
v-model="bankEntityFk"
@update:model-value="$emit('updateBic', { iban, bankEntityFk })"
:disable="disableElement"
>
<template #form>
<CreateBankEntityForm @on-data-saved="getBankEntities($event)" />
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection v-if="scope.opt">
<QItemLabel>{{ scope.opt.bic }} </QItemLabel>
<QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectDialog>
</template>

View File

@ -15,7 +15,7 @@ let root = ref(null);
watchEffect(() => {
matched.value = currentRoute.value.matched.filter(
(matched) => !!matched?.meta?.title || !!matched?.meta?.icon,
(matched) => !!matched?.meta?.title || !!matched?.meta?.icon
);
breadcrumbs.value.length = 0;
if (!matched.value[0]) return;

View File

@ -1,104 +0,0 @@
<script setup>
import { ref } from 'vue';
import VnCheckbox from './VnCheckbox.vue';
import axios from 'axios';
import { toRaw } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
const route = useRoute();
const { t } = useI18n();
const model = defineModel({ type: [Boolean] });
const props = defineProps({
url: {
type: String,
required: true,
},
searchUrl: {
type: [String, Boolean],
default: 'table',
},
});
const menuRef = ref(null);
const errorMessage = ref(null);
const rows = ref(0);
const onClick = async () => {
errorMessage.value = null;
const { filter } = JSON.parse(route.query[props.searchUrl]);
filter.limit = 0;
const params = {
params: { filter: JSON.stringify(filter) },
};
try {
const { data } = await axios.get(props.url, params);
rows.value = data;
} catch (error) {
const response = error.response;
if (response.data.error.name === 'UserError') {
errorMessage.value = t('tooManyResults');
} else {
errorMessage.value = response.data.error.message;
}
}
};
defineEmits(['update:selected', 'select:all']);
</script>
<template>
<QIcon
style="margin-left: -10px"
data-cy="btnMultiCheck"
name="expand_more"
@click="onClick"
class="cursor-pointer"
color="primary"
size="xs"
>
<QMenu
fit
anchor="bottom start"
self="top left"
ref="menuRef"
data-cy="menuMultiCheck"
>
<QList separator>
<QItem
data-cy="selectAll"
v-ripple
clickable
@click="
$refs.menuRef.hide();
$emit('select:all', toRaw(rows));
"
>
<QItemSection>
<QItemLabel>
<span v-text="t('Select all')" />
</QItemLabel>
<QItemLabel overline caption>
<span
v-if="errorMessage"
class="text-negative"
v-text="errorMessage"
/>
<span
v-else
v-text="t('records', { rows: rows?.length ?? 0 })"
/>
</QItemLabel>
</QItemSection>
</QItem>
<slot name="more-options"></slot>
</QList>
</QMenu>
</QIcon>
</template>
<i18n lang="yml">
en:
tooManyResults: Too many results. Please narrow down your search.
records: '{rows} records'
es:
Select all: Seleccionar todo
tooManyResults: Demasiados registros. Restringe la búsqueda.
records: '{rows} registros'
</i18n>

View File

@ -1,5 +1,5 @@
<script setup>
const model = defineModel({ type: [String, Number], default: '' });
const model = defineModel({ type: [String, Number], required: true });
</script>
<template>
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />

View File

@ -4,7 +4,6 @@ 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';
@ -13,7 +12,6 @@ import FormModelPopup from 'components/FormModelPopup.vue';
const route = useRoute();
const { t } = useI18n();
const { notify } = useNotify();
const emit = defineEmits(['onDataSaved']);
const $props = defineProps({
@ -63,11 +61,8 @@ function onFileChange(files) {
function mapperDms(data) {
const formData = new FormData();
let files = data.files;
if (files) {
files = Array.isArray(files) ? files : [files];
files.forEach((file) => formData.append(file?.name, file));
}
const { files } = data;
if (files) formData.append(files?.name, files);
const dms = {
hasFile: !!data.hasFile,
@ -88,16 +83,11 @@ function getUrl() {
}
async function save() {
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;
}
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;
}
function defaultData() {
@ -218,7 +208,7 @@ function addDefaultData(data) {
}
</style>
<i18n>
en:
en:
contentTypesInfo: Allowed file types {allowedContentTypes}
EntryDmsDescription: Reference {reference}
WorkersDescription: Working of employee id {reference}

View File

@ -14,12 +14,10 @@ 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({});
@ -92,6 +90,7 @@ const dmsFilter = {
],
},
},
where: { [$props.filter]: route.params.id },
};
const columns = computed(() => [
@ -256,16 +255,9 @@ function deleteDms(dmsFk) {
},
})
.onOk(async () => {
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;
}
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
const index = rows.value.findIndex((row) => row.id == dmsFk);
rows.value.splice(index, 1);
});
}
@ -303,9 +295,7 @@ 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"
>

View File

@ -0,0 +1,44 @@
<script setup>
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n();
const model = defineModel({ type: [Number, String] });
const emit = defineEmits(['updateBic']);
const getIbanCountry = (bank) => {
return bank.substr(0, 2);
};
const autofillBic = async (iban) => {
if (!iban) return;
const bankEntityId = parseInt(iban.substr(4, 4));
const ibanCountry = getIbanCountry(iban);
if (ibanCountry != 'ES') return;
const filter = { where: { id: bankEntityId } };
const params = { filter: JSON.stringify(filter) };
const { data } = await axios.get(`BankEntities`, { params });
emit('updateBic', data[0]?.id);
};
</script>
<template>
<VnInput
:label="t('IBAN')"
clearable
v-model="model"
@update:model-value="autofillBic($event)"
>
<template #append>
<QIcon name="info" class="cursor-info">
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
</QIcon>
</template>
</VnInput>
</template>

View File

@ -1,6 +1,6 @@
<script setup>
import { nextTick, watch, computed, ref, useAttrs } from 'vue';
import { date, getCssVar } from 'quasar';
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
import { date } from 'quasar';
import VnDate from './VnDate.vue';
import { useRequired } from 'src/composables/useRequired';
@ -20,18 +20,61 @@ 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
@ -43,138 +86,28 @@ const styleAttrs = computed(() => {
: {};
});
const inputValue = ref('');
const validateAndCleanInput = (value) => {
inputValue.value = value.replace(/[^0-9./-]/g, '');
};
const manageDate = (date) => {
inputValue.value = date.split('/').reverse().join('/');
formattedDate.value = date;
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="inputValue"
v-model="formattedDate"
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
@ -183,12 +116,11 @@ const handleEnter = (event) => {
v-if="
($attrs.clearable == undefined || $attrs.clearable) &&
hover &&
inputValue &&
model &&
!$attrs.disable
"
@click="
vnInputDateRef.focus();
inputValue = null;
model = null;
isPopupOpen = false;
"

View File

@ -5,7 +5,7 @@ import VnDate from './VnDate.vue';
import VnTime from './VnTime.vue';
const $attrs = useAttrs();
const model = defineModel({ type: [Date, String] });
const model = defineModel({ type: [Date] });
const $props = defineProps({
isOutlined: {
@ -29,7 +29,7 @@ const styleAttrs = computed(() => {
const mask = 'DD-MM-YYYY HH:mm';
const selectedDate = computed({
get() {
if (!model.value) return JSON.stringify(new Date(model.value));
if (!model.value) return new Date(model.value);
return date.formatDate(new Date(model.value), mask);
},
set(value) {

View File

@ -21,7 +21,7 @@ watch(
(newValue) => {
if (!modelValue.value) return;
modelValue.value = formatLocation(newValue) ?? null;
},
}
);
const mixinRules = [requiredFieldRule];
@ -45,7 +45,7 @@ const formatLocation = (obj, properties = locationProperties) => {
});
const filteredParts = parts.filter(
(part) => part !== null && part !== undefined && part !== '',
(part) => part !== null && part !== undefined && part !== ''
);
return filteredParts.join(', ');

View File

@ -1,98 +0,0 @@
<script setup>
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
const props = defineProps({
scrollTarget: { type: [String, Object], default: 'window' },
});
const scrollPosition = ref(0);
const showButton = ref(false);
let scrollContainer = null;
const onScroll = () => {
if (!scrollContainer) return;
scrollPosition.value =
typeof props.scrollTarget === 'object'
? scrollContainer.scrollTop
: window.scrollY;
};
watch(scrollPosition, (newValue) => {
showButton.value = newValue > 0;
});
const scrollToTop = () => {
if (scrollContainer) {
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
}
};
const updateScrollContainer = (container) => {
if (container) {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
}
scrollContainer = container;
scrollContainer.addEventListener('scroll', onScroll);
onScroll();
}
};
defineExpose({
updateScrollContainer,
});
const initScrollContainer = async () => {
await nextTick();
if (typeof props.scrollTarget === 'object') {
scrollContainer = props.scrollTarget;
} else {
scrollContainer = window;
}
if (!scrollContainer) return;
scrollContainer.addEventListener('scroll', onScroll);
};
onMounted(() => {
initScrollContainer();
});
onUnmounted(() => {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
scrollContainer = null;
}
});
</script>
<template>
<QIcon
v-if="showButton"
color="primary"
name="keyboard_arrow_up"
class="scroll-to-top"
@click="scrollToTop"
>
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
</QIcon>
</template>
<style scoped>
.scroll-to-top {
position: fixed;
top: 70px;
font-size: 65px;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
transition: transform 0.2s ease-in-out;
}
.scroll-to-top:hover {
transform: translateX(-50%) scale(1.2);
cursor: pointer;
filter: brightness(0.8);
}
</style>

View File

@ -54,10 +54,6 @@ const $props = defineProps({
type: [Array],
default: () => [],
},
filterFn: {
type: Function,
default: null,
},
exprBuilder: {
type: Function,
default: null,
@ -66,12 +62,16 @@ const $props = defineProps({
type: Boolean,
default: true,
},
defaultFilter: {
type: Boolean,
default: true,
},
fields: {
type: Array,
default: null,
},
include: {
type: [Object, Array, String],
type: [Object, Array],
default: null,
},
where: {
@ -79,7 +79,7 @@ const $props = defineProps({
default: null,
},
sortBy: {
type: [String, Array],
type: String,
default: null,
},
limit: {
@ -166,8 +166,6 @@ const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC';
});
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
watch(options, (newValue) => {
setOptions(newValue);
});
@ -257,41 +255,43 @@ 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.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);
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);
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;
myOptions.value = newOptions;
},
(ref) => {
if (val !== '' && ref.options.length > 0) {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
}
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;
@ -379,7 +379,7 @@ function getCaption(opt) {
>
<template #append>
<QIcon
v-show="isClearable && value != null && value !== ''"
v-show="isClearable && value"
name="close"
@click="
() => {
@ -394,7 +394,7 @@ function getCaption(opt) {
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<div v-if="slotName == 'append'">
<QIcon
v-show="isClearable && value != null && value !== ''"
v-show="isClearable && value"
name="close"
@click.stop="
() => {
@ -419,7 +419,7 @@ function getCaption(opt) {
<QItemLabel>
{{ opt[optionLabel] }}
</QItemLabel>
<QItemLabel caption v-if="getCaption(opt) !== false">
<QItemLabel caption v-if="getCaption(opt)">
{{ `#${getCaption(opt)}` }}
</QItemLabel>
</QItemSection>

View File

@ -1,50 +0,0 @@
import { createWrapper } from 'app/test/vitest/helper';
import VnBankDetailsForm from 'components/common/VnBankDetailsForm.vue';
import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
describe('VnBankDetail Component', () => {
let vm;
let wrapper;
const bankEntities = [
{ id: 2100, bic: 'CAIXESBBXXX', name: 'CaixaBank' },
{ id: 1234, bic: 'TESTBIC', name: 'Test Bank' },
];
const correctIban = 'ES6621000418401234567891';
beforeAll(() => {
wrapper = createWrapper(VnBankDetailsForm, {
$props: {
iban: null,
bankEntityFk: null,
disableElement: false,
},
});
vm = wrapper.vm;
wrapper = wrapper.wrapper;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should update bankEntityFk when IBAN exists in bankEntities', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic(correctIban);
expect(vm.bankEntityFk).toBe(2100);
});
it('should set bankEntityFk to null when IBAN bank code is not found', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic('ES1234567891324567891234');
expect(vm.bankEntityFk).toBe(null);
});
it('should not update bankEntityFk if IBAN country is not ES', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic('FR1420041010050500013M02606');
expect(vm.bankEntityFk).toBe(null);
});
});

View File

@ -35,7 +35,7 @@ describe('VnSmsDialog', () => {
expect.objectContaining({
message: 'You must enter a new password',
type: 'negative',
}),
})
);
});
@ -47,7 +47,7 @@ describe('VnSmsDialog', () => {
expect.objectContaining({
message: `Passwords don't match`,
type: 'negative',
}),
})
);
});

View File

@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
describe('VnDiscount', () => {
let vm;
beforeAll(() => {
vm = createWrapper(VnDiscount, {
props: {
@ -12,9 +12,7 @@ describe('VnDiscount', () => {
price: 100,
quantity: 2,
discount: 10,
mana: 10,
promise: vi.fn(),
},
}
}).vm;
});
@ -23,8 +21,8 @@ describe('VnDiscount', () => {
});
describe('total', () => {
it('should calculate total correctly', () => {
it('should calculate total correctly', () => {
expect(vm.total).toBe(180);
});
});
});
});

View File

@ -41,12 +41,10 @@ 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 = {
@ -85,7 +83,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')]).toStrictEqual(data.files);
expect(formData.get('example.txt')).toBe(data.files);
expect(expectedBody).toEqual(params.params);
});

View File

@ -2,6 +2,7 @@ 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;
@ -10,28 +11,26 @@ 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']);
@ -47,36 +46,37 @@ 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();
});
});
});
});

View File

@ -5,71 +5,52 @@ import VnInputDate from 'components/common/VnInputDate.vue';
let vm;
let wrapper;
function generateWrapper(outlined = false, required = false) {
function generateWrapper(date, outlined, required) {
wrapper = createWrapper(VnInputDate, {
props: {
modelValue: '2000-12-31T23:00:00.000Z',
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
modelValue: date,
},
attrs: {
isOutlined: outlined,
required: required,
required: required
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
}
};
describe('VnInputDate', () => {
describe('formattedDate', () => {
it('validateAndCleanInput should remove non-numeric characters', async () => {
generateWrapper();
vm.validateAndCleanInput('10a/1s2/2dd0a23');
describe('formattedDate', () => {
it('formats a valid date correctly', async () => {
generateWrapper('2023-12-25', false, false);
await vm.$nextTick();
expect(vm.inputValue).toBe('10/12/2023');
expect(vm.formattedDate).toBe('25/12/2023');
});
it('manageDate should reverse the date', async () => {
generateWrapper();
vm.manageDate('10/12/2023');
await vm.$nextTick();
expect(vm.inputValue).toBe('2023/12/10');
});
it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
it('updates the model value when a new date is set', async () => {
const input = wrapper.find('input');
await input.setValue('25.12/2002');
await vm.$nextTick();
await vm.formatDate();
expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
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('should format the date correctly when a valid date is entered with short year', async () => {
it('should not update the model value when an invalid date is set', 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');
});
await input.setValue('invalid-date');
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
});
});
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper();
generateWrapper('2023-12-25', false, false);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({});
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper(true, false);
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25', true, false);
await vm.$nextTick();
expect(vm.styleAttrs.outlined).toBe(true);
});
@ -77,15 +58,15 @@ describe('VnInputDate', () => {
describe('required', () => {
it('should not applies required class when isRequired is false', async () => {
generateWrapper();
generateWrapper('2023-12-25', false, false);
await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
});
it('should applies required class when isRequired is true', async () => {
generateWrapper(false, true);
generateWrapper('2023-12-25', false, true);
await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
});
});
});
});

View File

@ -33,7 +33,7 @@ describe('VnInputDateTime', () => {
it('handles null date value', async () => {
generateWrapper(null, false, true);
await vm.$nextTick();
expect(vm.selectedDate).not.toBe(null);
expect(vm.selectedDate).toBeInstanceOf(Date);
});
it('updates the model value when a new datetime is set', async () => {

View File

@ -60,4 +60,4 @@ describe('VnInputTime', () => {
expect(vm.model).toBe(previousModel);
});
});
});
});

View File

@ -6,8 +6,8 @@ function buildComponent(data) {
return createWrapper(VnLocation, {
global: {
props: {
location: data,
},
location: data
}
},
}).vm;
}
@ -24,7 +24,7 @@ describe('formatLocation', () => {
postcode: '46680',
city: 'Algemesi',
province: { name: 'Valencia' },
country: { name: 'Spain' },
country: { name: 'Spain' }
};
});
@ -47,12 +47,7 @@ describe('formatLocation', () => {
});
it('should return the country', () => {
const location = {
...locationBase,
postcode: undefined,
city: undefined,
province: undefined,
};
const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined };
const vm = buildComponent(location);
expect(vm.formatLocation(location)).toEqual('Spain');
});
@ -66,7 +61,7 @@ describe('showLabel', () => {
code: '46680',
town: 'Algemesi',
province: 'Valencia',
country: 'Spain',
country: 'Spain'
};
});
@ -89,13 +84,8 @@ describe('showLabel', () => {
});
it('should show the label with country', () => {
const location = {
...locationBase,
code: undefined,
town: undefined,
province: undefined,
};
const location = { ...locationBase, code: undefined, town: undefined, province: undefined };
const vm = buildComponent(location);
expect(vm.showLabel(location)).toEqual('Spain');
});
});
});

View File

@ -90,10 +90,8 @@ describe('VnLog', () => {
vm = createWrapper(VnLog, {
global: {
stubs: ['FetchData', 'vue-i18n', 'VnUserLink'],
mocks: {
fetch: vi.fn(),
},
stubs: ['VnUserLink'],
mocks: {},
},
propsData: {
model: 'Claim',

View File

@ -26,7 +26,7 @@ describe('VnNotes', () => {
) {
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
wrapper = createWrapper(VnNotes, {
propsData: { ...defaultOptions, ...options },
propsData: options,
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;

View File

@ -2,14 +2,13 @@ import { createWrapper } from 'app/test/vitest/helper';
import VnSmsDialog from 'components/common/VnSmsDialog.vue';
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
describe('VnSmsDialog', () => {
let vm;
const orderId = 1;
const shipped = new Date();
const phone = '012345678';
const promise = (response) => {
return response;
};
const promise = (response) => {return response;};
const template = 'minAmount';
const locale = 'en';
@ -18,13 +17,13 @@ describe('VnSmsDialog', () => {
propsData: {
data: {
orderId,
shipped,
shipped
},
template,
locale,
phone,
promise,
},
promise
}
}).vm;
});
@ -36,9 +35,7 @@ describe('VnSmsDialog', () => {
it('should update the message value with the correct template and parameters', () => {
vm.updateMessage();
expect(vm.message).toEqual(
`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`,
);
expect(vm.message).toEqual(`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`);
});
});
@ -50,7 +47,7 @@ describe('VnSmsDialog', () => {
orderId,
shipped,
destination: phone,
message: vm.message,
message: vm.message
};
await vm.send();

View File

@ -1,14 +1,14 @@
<template>
<div class="row q-gutter-md q-mb-md">
<QSkeleton type="QInput" class="col" square />
<QSkeleton type="QInput" class="col" square />
<QSkeleton type="QInput" class="col" square />
</div>
<div class="row q-gutter-md q-mb-md">
<QSkeleton type="QInput" class="col" square />
<QSkeleton type="QInput" class="col" square />
<QSkeleton type="QInput" class="col" square />
</div>
<div class="row q-gutter-md q-mb-md">
<QSkeleton type="QInput" class="col" square />
<QSkeleton type="QInput" class="col" square />
<QSkeleton type="QInput" class="col" square />
</div>
</template>
</template>

View File

@ -17,7 +17,7 @@ const token = getTokenMultimedia();
const { t } = useI18n();
const src = computed(
() => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`,
() => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`
);
const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
const showLetter = ref(false);

View File

@ -89,26 +89,24 @@ function cancel() {
<slot name="customHTML"></slot>
</QCardSection>
<QCardActions align="right">
<slot name="actions" :actions="{ confirm, cancel }">
<QBtn
:label="t('globals.cancel')"
color="primary"
:disable="isLoading"
flat
@click="cancel()"
data-cy="VnConfirm_cancel"
/>
<QBtn
:label="t('globals.confirm')"
:title="t('globals.confirm')"
color="primary"
:loading="isLoading"
@click="confirm()"
unelevated
autofocus
data-cy="VnConfirm_confirm"
/>
</slot>
<QBtn
:label="t('globals.cancel')"
color="primary"
:disable="isLoading"
flat
@click="cancel()"
data-cy="VnConfirm_cancel"
/>
<QBtn
:label="t('globals.confirm')"
:title="t('globals.confirm')"
color="primary"
:loading="isLoading"
@click="confirm()"
unelevated
autofocus
data-cy="VnConfirm_confirm"
/>
</QCardActions>
</QCard>
</QDialog>

View File

@ -212,7 +212,6 @@ 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">
@ -230,7 +229,6 @@ const getLocale = (label) => {
<QItemSection top side>
<QBtn
@click="clearFilters"
data-cy="clearFilters"
color="primary"
dense
flat
@ -294,7 +292,6 @@ const getLocale = (label) => {
</QList>
</QForm>
<QInnerLoading
data-cy="filterPanel-spinner"
:label="t('globals.pleaseWait')"
:showing="isLoading"
color="primary"

View File

@ -13,7 +13,7 @@ const src = computed({
get() {
return new URL(
`../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`,
import.meta.url,
import.meta.url
).href;
},
});

View File

@ -1,11 +1,10 @@
<script setup>
import axios from 'axios';
import { ref, reactive, useAttrs, computed, onMounted, nextTick } from 'vue';
import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
import { ref, reactive, useAttrs, computed } from 'vue';
import { onBeforeRouteLeave } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import { useStateStore } from 'stores/useStateStore';
import { tMobile } from 'src/composables/tMobile';
import { toDateHourMin } from 'src/filters';
import VnPaginate from 'components/ui/VnPaginate.vue';
@ -34,47 +33,20 @@ const $props = defineProps({
addNote: { type: Boolean, default: false },
selectType: { type: Boolean, default: false },
justInput: { type: Boolean, default: false },
goTo: { type: String, default: '' },
useUserRelation: { type: Boolean, default: true },
});
const { t } = useI18n();
const quasar = useQuasar();
const stateStore = useStateStore();
const router = useRouter();
const route = useRoute();
const componentIsRendered = ref(false);
const newNote = reactive({ text: null, observationTypeFk: null });
const observationTypes = ref([]);
const vnPaginateRef = ref();
const defaultObservationType = computed(
() => observationTypes.value.find((ot) => ot.code === 'salesPerson')?.id,
const defaultObservationType = computed(() =>
observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
);
let savedNote = false;
let originalText;
onBeforeRouteLeave((to, from, next) => {
if (
(newNote.text && !$props.justInput) ||
(newNote.text !== originalText && $props.justInput)
)
quasar.dialog({
component: VnConfirm,
componentProps: {
title: t('globals.unsavedPopup.title'),
message: t('globals.unsavedPopup.subtitle'),
promise: () => next(),
},
});
else next();
});
onMounted(() => {
nextTick(() => (componentIsRendered.value = true));
});
function handleClick(e) {
if (e.shiftKey && e.key === 'Enter') return;
if ($props.justInput) confirmAndUpdate();
@ -96,7 +68,6 @@ async function insert() {
};
await axios.post($props.url, newBody);
await vnPaginateRef.value.fetch();
savedNote = true;
}
function confirmAndUpdate() {
@ -129,6 +100,22 @@ async function update() {
);
}
onBeforeRouteLeave((to, from, next) => {
if (
(newNote.text && !$props.justInput) ||
(newNote.text !== originalText && $props.justInput)
)
quasar.dialog({
component: VnConfirm,
componentProps: {
title: t('globals.unsavedPopup.title'),
message: t('globals.unsavedPopup.subtitle'),
promise: () => next(),
},
});
else next();
});
function fetchData([data]) {
newNote.text = data?.notes;
originalText = data?.notes;
@ -137,71 +124,13 @@ function fetchData([data]) {
const handleObservationTypes = (data) => {
observationTypes.value = data;
if (defaultObservationType.value) {
if(defaultObservationType.value) {
newNote.observationTypeFk = defaultObservationType.value;
}
};
async function saveAndGo() {
savedNote = false;
await insert();
router.push({ path: $props.goTo });
}
function getUserFilter() {
const newUserFilter = $props.userFilter ?? {};
const userInclude = {
relation: 'user',
scope: {
fields: ['id', 'nickname', 'name'],
},
};
if (newUserFilter.include) {
if (Array.isArray(newUserFilter.include)) {
newUserFilter.include.push(userInclude);
} else {
newUserFilter.include = [userInclude, newUserFilter.include];
}
} else {
newUserFilter.include = userInclude;
}
if ($props.useUserRelation) {
return {
...newUserFilter,
...$props.userFilter,
};
}
return $props.filter;
}
</script>
<template>
<Teleport
to="#st-actions"
v-if="
stateStore?.isSubToolbarShown() &&
componentIsRendered &&
$props.goTo &&
!route.path.includes('summary')
"
>
<QBtn
:label="
tMobile('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
color="primary"
icon="save"
@click="saveAndGo"
data-cy="saveContinueNoteButton"
/>
</Teleport>
<FetchData
v-if="selectType"
url="ObservationTypes"
@ -247,7 +176,7 @@ function getUserFilter() {
:required="'required' in originalAttrs"
clearable
>
<template #append v-if="!$props.goTo">
<template #append>
<QBtn
:title="t('Save (Enter)')"
icon="save"
@ -269,14 +198,16 @@ function getUserFilter() {
:url="$props.url"
order="created DESC"
:limit="0"
:user-filter="getUserFilter()"
:user-filter="userFilter"
:filter="filter"
auto-load
ref="vnPaginateRef"
class="show"
v-bind="$attrs"
:search-url="false"
@on-fetch="newNote.text = ''"
@on-fetch="
newNote.text = '';
"
>
<template #body="{ rows }">
<TransitionGroup name="list" tag="div" class="column items-center full-width">
@ -288,15 +219,15 @@ function getUserFilter() {
<QCardSection horizontal>
<VnAvatar
:descriptor="false"
:worker-id="note.user?.id"
:worker-id="note.workerFk"
size="md"
:title="note.user?.nickname"
:title="note.worker?.user.nickname"
/>
<div class="full-width row justify-between q-pa-xs">
<div>
<VnUserLink
:name="`${note.user?.name}`"
:worker-id="note.user?.id"
:name="`${note.worker.user.name}`"
:worker-id="note.worker.id"
/>
<QBadge
class="q-ml-xs"

View File

@ -2,9 +2,7 @@
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({
@ -69,7 +67,7 @@ const props = defineProps({
default: null,
},
searchUrl: {
type: [String, Boolean],
type: String,
default: null,
},
disableInfiniteScroll: {
@ -77,7 +75,7 @@ const props = defineProps({
default: false,
},
mapKey: {
type: [String, Boolean],
type: String,
default: '',
},
keyData: {
@ -146,14 +144,14 @@ const addFilter = async (filter, params) => {
};
async function fetch(params) {
arrayData.setOptions(params);
useArrayData(props.dataKey, params);
arrayData.resetPagination();
await arrayData.fetch({ append: false });
return emitStoreData();
}
async function update(params) {
arrayData.setOptions(params);
useArrayData(props.dataKey, params);
const { limit, skip } = store;
store.limit = limit + skip;
store.skip = 0;

View File

@ -46,7 +46,7 @@ const props = defineProps({
default: null,
},
order: {
type: [String, Array],
type: String,
default: '',
},
limit: {

View File

@ -87,7 +87,7 @@ function formatNumber(number) {
<QItemLabel caption>{{
date.formatDate(
row.sms.created,
'YYYY-MM-DD HH:mm:ss',
'YYYY-MM-DD HH:mm:ss'
)
}}</QItemLabel>
<QItemLabel class="row center">

View File

@ -37,7 +37,8 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
class="justify-end sticky"
>
<slot name="st-data">
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }"></div>
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
</div>
</slot>
<QSpace />
<slot name="st-actions">

View File

@ -23,15 +23,10 @@ describe('CardSummary', () => {
beforeEach(() => {
wrapper = createWrapper(CardSummary, {
global: {
mocks: {
validate: vi.fn(),
},
},
propsData: {
dataKey: 'cardSummaryKey',
url: 'cardSummaryUrl',
filter: { key: 'cardFilter' },
filter: 'cardFilter',
},
});
vm = wrapper.vm;
@ -55,7 +50,7 @@ describe('CardSummary', () => {
it('should set correct props to the store', () => {
expect(vm.store.url).toEqual('cardSummaryUrl');
expect(vm.store.filter).toEqual({ key: 'cardFilter' });
expect(vm.store.filter).toEqual('cardFilter');
});
it('should respond to prop changes and refetch data', async () => {

View File

@ -54,7 +54,7 @@ describe('tags computed property', () => {
const expectedStyle = {
'grid-template-columns': 'repeat(2, 1fr)',
'max-width': '8rem',
'max-width': '8rem',
};
expect(vm.columnStyle).toEqual(expectedStyle);

View File

@ -9,29 +9,30 @@ const isEmployeeMock = vi.fn();
function generateWrapper(storage = 'images') {
wrapper = createWrapper(VnImg, {
props: {
id: 123,
id: 123,
zoomResolution: '400x400',
storage,
},
storage,
}
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
vm.timeStamp = 'timestamp';
}
vm = wrapper.vm;
vm.timeStamp = 'timestamp';
};
vi.mock('src/composables/useSession', () => ({
useSession: () => ({
getTokenMultimedia: () => 'token',
getTokenMultimedia: () => 'token',
}),
}));
vi.mock('src/composables/useRole', () => ({
useRole: () => ({
isEmployee: isEmployeeMock,
}),
}));
describe('VnImg', () => {
describe('VnImg', () => {
beforeEach(() => {
isEmployeeMock.mockReset();
});
@ -46,13 +47,13 @@ describe('VnImg', () => {
generateWrapper('dms');
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/api/dms/123/downloadFile?access_token=token');
expect(url).toBe('/api/dms/123/downloadFile?access_token=token');
});
it('should return /no-user.png when role is not employee and storage is not dms', async () => {
isEmployeeMock.mockReturnValue(false);
generateWrapper();
await vm.$nextTick();
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/no-user.png');
});
@ -62,9 +63,7 @@ describe('VnImg', () => {
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe(
'/api/images/catalog/200x200/123/download?access_token=token&timestamp',
);
expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp');
});
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
@ -72,9 +71,7 @@ describe('VnImg', () => {
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl(true);
expect(url).toBe(
'/api/images/catalog/400x400/123/download?access_token=token&timestamp',
);
expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp');
});
});
@ -85,8 +82,8 @@ describe('VnImg', () => {
wrapper.vm.reload();
const newTimestamp = wrapper.vm.timeStamp;
expect(initialTimestamp).not.toEqual(newTimestamp);
});
});
});
});

View File

@ -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,9 +23,8 @@ 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(() => {
@ -33,9 +32,7 @@ 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();
@ -51,7 +48,7 @@ describe('VnSearchbar', () => {
expect(applyFilterSpy).toHaveBeenCalledWith({
params: { staticKey: 'staticValue', search: searchText },
filter: { skip: 0 },
filter: {skip: 0},
});
});
@ -71,4 +68,4 @@ describe('VnSearchbar', () => {
});
expect(vm.to.query.searchParam).toBe(expectedQuery);
});
});
});

View File

@ -1,4 +1,5 @@
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';
@ -11,9 +12,6 @@ describe('VnSms', () => {
stubs: ['VnPaginate'],
mocks: {},
},
propsData: {
url: 'SmsUrl',
},
}).vm;
});

View File

@ -53,26 +53,26 @@ describe('useAcl', () => {
expect(
acl.hasAny([
{ model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
]),
])
).toBeFalsy();
});
it('should return false if no roles matched', async () => {
expect(
acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }]),
acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }])
).toBeTruthy();
});
describe('*', () => {
it('should return true if an acl matched', async () => {
expect(
acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }]),
acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }])
).toBeTruthy();
});
it('should return false if no acls matched', async () => {
expect(
acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }]),
acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }])
).toBeFalsy();
});
});
@ -80,15 +80,13 @@ describe('useAcl', () => {
describe('$authenticated', () => {
it('should return false if no acls matched', async () => {
expect(
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }]),
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }])
).toBeFalsy();
});
it('should return true if an acl matched', async () => {
expect(
acl.hasAny([
{ model: 'Url', props: 'getByUser', accessType: 'READ' },
]),
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }])
).toBeTruthy();
});
});
@ -98,7 +96,7 @@ describe('useAcl', () => {
expect(
acl.hasAny([
{ model: 'TpvTransaction', props: 'start', accessType: 'READ' },
]),
])
).toBeFalsy();
});
@ -106,7 +104,7 @@ describe('useAcl', () => {
expect(
acl.hasAny([
{ model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
]),
])
).toBeTruthy();
});
});

View File

@ -4,8 +4,6 @@ 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}';
@ -45,7 +43,7 @@ describe('useArrayData', () => {
it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
const arrayData = mountArrayData('ArrayData', {
const arrayData = useArrayData('ArrayData', {
url: 'mockUrl',
searchUrl: 'params',
});
@ -74,7 +72,7 @@ describe('useArrayData', () => {
data: [{ id: 1 }],
});
const arrayData = mountArrayData('ArrayData', {
const arrayData = useArrayData('ArrayData', {
url: 'mockUrl',
navigate: {},
});
@ -96,7 +94,7 @@ describe('useArrayData', () => {
],
});
const arrayData = mountArrayData('ArrayData', {
const arrayData = useArrayData('ArrayData', {
url: 'mockUrl',
oneRecord: true,
});
@ -109,17 +107,3 @@ describe('useArrayData', () => {
});
});
});
function mountArrayData(...args) {
let arrayData;
const TestComponent = defineComponent({
setup() {
arrayData = useArrayData(...args);
return () => h('div');
},
});
const asd = mount(TestComponent);
return arrayData;
}

View File

@ -64,84 +64,88 @@ describe('session', () => {
});
});
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',
describe(
'login',
() => {
const expectedUser = {
id: 999,
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
userConfig: {
darkMode: false,
},
},
{
role: {
name: 'admin',
worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
role: {
name: 'salesPerson',
},
},
},
];
beforeEach(() => {
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
return Promise.resolve({
data: { roles: rolesData, user: expectedUser },
{
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 },
});
});
});
});
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,
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
});
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
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;
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toBeNull();
expect(sessionToken).toEqual(expectedToken);
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
});
await session.destroy(); // this clears token and user for any other test
});
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
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;
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toEqual(expectedToken);
expect(sessionToken).toBeNull();
await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
await session.destroy(); // this clears token and user for any other test
});
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';

View File

@ -18,7 +18,7 @@ export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile',
export async function downloadDocuware(url, params) {
const appUrl = await getAppUrl();
const response = await axios.get(`${appUrl}/api/${url}`, {
const response = await axios.get(`${appUrl}/api/` + url, {
responseType: 'blob',
params,
});

View File

@ -20,5 +20,5 @@ export function getColAlign(col) {
if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center';
return `text-${align ?? 'center'}`;
return 'text-' + (align ?? 'center');
}

View File

@ -1,10 +1,10 @@
export function getDateQBadgeColor(date) {
const today = Date.vnNew();
let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const timeTicket = new Date(date);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
const comparation = today - timeTicket;
let comparation = today - timeTicket;
if (comparation == 0) return 'warning';
if (comparation < 0) return 'success';

View File

@ -8,4 +8,4 @@ export function getValueFromPath(root, path) {
else current = current[key];
}
return current;
}
}

View File

@ -1,9 +0,0 @@
import { ref } from 'vue';
import moment from 'moment';
export default function useWeekdaysOrder() {
const firstDay = moment().weekday(1).day();
const weekdays = [...Array(7).keys()].map((i) => (i + firstDay) % 7);
return ref(weekdays);
}

View File

@ -7,7 +7,7 @@ export async function beforeSave(data, getChanges, modelOrigin) {
const patchPromises = [];
for (const change of changes) {
const patchData = {};
let patchData = {};
if ('hasMinPrice' in change.data) {
patchData.hasMinPrice = change.data?.hasMinPrice;

View File

@ -19,7 +19,7 @@ export function useArrayData(key, userOptions) {
let canceller = null;
onMounted(() => {
setOptions(userOptions ?? {});
setOptions();
reset(['skip']);
const query = route.query;
@ -39,10 +39,9 @@ export function useArrayData(key, userOptions) {
setCurrentFilter();
});
if (userOptions) setOptions(userOptions);
if (key && userOptions) setOptions();
function setOptions(params) {
if (!params) return;
function setOptions() {
const allowedOptions = [
'url',
'filter',
@ -58,14 +57,14 @@ export function useArrayData(key, userOptions) {
'mapKey',
'oneRecord',
];
if (typeof params === 'object') {
for (const option in params) {
const isEmpty = params[option] == null || params[option] === '';
if (typeof userOptions === 'object') {
for (const option in userOptions) {
const isEmpty = userOptions[option] == null || userOptions[option] === '';
if (isEmpty || !allowedOptions.includes(option)) continue;
if (Object.hasOwn(store, option)) {
const defaultOpts = params[option];
store[option] = params.keepOpts?.includes(option)
const defaultOpts = userOptions[option];
store[option] = userOptions.keepOpts?.includes(option)
? Object.assign(defaultOpts, store[option])
: defaultOpts;
if (option === 'userParams') store.defaultParams = store[option];
@ -368,6 +367,5 @@ export function useArrayData(key, userOptions) {
deleteOption,
reset,
resetPagination,
setOptions,
};
}

View File

@ -1,6 +1,7 @@
import { useQuasar } from 'quasar';
export default function () {
export default function() {
const quasar = useQuasar();
return quasar.screen.gt.xs ? 'q-pa-md' : 'q-pa-xs';
return quasar.screen.gt.xs ? 'q-pa-md': 'q-pa-xs';
}

View File

@ -6,7 +6,7 @@ export function djb2a(string) {
}
export function useColor(value) {
return `#${colors[djb2a(value || '') % colors.length]}`;
return '#' + colors[djb2a(value || '') % colors.length];
}
const colors = [

View File

@ -15,16 +15,18 @@ export function usePrintService() {
message: t('globals.notificationSent'),
type: 'positive',
icon: 'check',
}),
})
);
}
function openReport(path, params, isNewTab = '_self') {
if (typeof params === 'string') params = JSON.parse(params);
params = {
access_token: getTokenMultimedia(),
...params,
};
params = Object.assign(
{
access_token: getTokenMultimedia(),
},
params
);
const query = new URLSearchParams(params).toString();
window.open(`api/${path}?${query}`, isNewTab);

View File

@ -17,7 +17,7 @@ export function useSession() {
let intervalId = null;
function setSession(data) {
const keepLogin = data.keepLogin;
let keepLogin = data.keepLogin;
const storage = keepLogin ? localStorage : sessionStorage;
storage.setItem(TOKEN, data.token);
storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);

View File

@ -47,7 +47,9 @@ export function useValidator() {
return !validator.isEmpty(value ? String(value) : '') || message;
},
required: (required, value) => {
return required ? !!value || t('globals.fieldRequired') : null;
return required
? value === 0 || !!value || t('globals.fieldRequired')
: null;
},
length: (value) => {
const options = {

View File

@ -8,7 +8,7 @@ export function useVnConfirm() {
message,
promise,
successFn,
customHTML = {},
customHTML = {}
) => {
const { component, props } = customHTML;
Dialog.create({
@ -19,7 +19,7 @@ export function useVnConfirm() {
message: message,
promise: promise,
},
{ customHTML: () => h(component, props) },
{ customHTML: () => h(component, props) }
),
}).onOk(async () => {
if (successFn) successFn();

View File

@ -343,20 +343,3 @@ input::-webkit-inner-spin-button {
.q-item__section--main ~ .q-item__section--side {
padding-inline: 0;
}
.calendars-header {
height: 45px;
display: flex;
justify-content: space-between;
align-items: center;
background-color: $primary;
font-weight: bold;
font-size: 16px;
}
.calendars-container {
max-width: 800px;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}

File diff suppressed because one or more lines are too long

View File

@ -1,455 +1,453 @@
@font-face {
font-family: 'icon';
src: url('fonts/icon.eot?uocffs');
src:
url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
url('fonts/icon.ttf?uocffs') format('truetype'),
url('fonts/icon.woff?uocffs') format('woff'),
url('fonts/icon.svg?uocffs#icon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
font-family: 'icon';
src: url('fonts/icon.eot?uocffs');
src: url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
url('fonts/icon.ttf?uocffs') format('truetype'),
url('fonts/icon.woff?uocffs') format('woff'),
url('fonts/icon.svg?uocffs#icon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
}
[class^='icon-'],
[class*=' icon-'] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icon' !important;
speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
[class^="icon-"], [class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icon' !important;
speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-inactive-car:before {
content: '\e978';
content: "\e978";
}
.icon-hasItemLost:before {
content: '\e957';
content: "\e957";
}
.icon-hasItemDelay:before {
content: '\e96d';
content: "\e96d";
}
.icon-add_entries:before {
content: '\e953';
content: "\e953";
}
.icon-100:before {
content: '\e901';
content: "\e901";
}
.icon-Client_unpaid:before {
content: '\e98c';
content: "\e98c";
}
.icon-History:before {
content: '\e902';
content: "\e902";
}
.icon-Person:before {
content: '\e903';
content: "\e903";
}
.icon-accessory:before {
content: '\e904';
content: "\e904";
}
.icon-account:before {
content: '\e905';
content: "\e905";
}
.icon-actions:before {
content: '\e907';
content: "\e907";
}
.icon-addperson:before {
content: '\e908';
content: "\e908";
}
.icon-agencia_tributaria:before {
content: '\e948';
content: "\e948";
}
.icon-agency:before {
content: '\e92a';
content: "\e92a";
}
.icon-agency-term:before {
content: '\e909';
content: "\e909";
}
.icon-albaran:before {
content: '\e92c';
content: "\e92c";
}
.icon-anonymous:before {
content: '\e90b';
content: "\e90b";
}
.icon-apps:before {
content: '\e90c';
content: "\e90c";
}
.icon-artificial:before {
content: '\e90d';
content: "\e90d";
}
.icon-attach:before {
content: '\e90e';
content: "\e90e";
}
.icon-barcode:before {
content: '\e90f';
content: "\e90f";
}
.icon-basket:before {
content: '\e910';
content: "\e910";
}
.icon-basketadd:before {
content: '\e911';
content: "\e911";
}
.icon-bin:before {
content: '\e913';
content: "\e913";
}
.icon-botanical:before {
content: '\e914';
content: "\e914";
}
.icon-bucket:before {
content: '\e915';
content: "\e915";
}
.icon-buscaman:before {
content: '\e916';
content: "\e916";
}
.icon-buyrequest:before {
content: '\e917';
content: "\e917";
}
.icon-calc_volum .path1:before {
content: '\e918';
color: rgb(0, 0, 0);
content: "\e918";
color: rgb(0, 0, 0);
}
.icon-calc_volum .path2:before {
content: '\e919';
margin-left: -1em;
color: rgb(0, 0, 0);
content: "\e919";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path3:before {
content: '\e91c';
margin-left: -1em;
color: rgb(0, 0, 0);
content: "\e91c";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path4:before {
content: '\e91d';
margin-left: -1em;
color: rgb(0, 0, 0);
content: "\e91d";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path5:before {
content: '\e91e';
margin-left: -1em;
color: rgb(0, 0, 0);
content: "\e91e";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path6:before {
content: '\e91f';
margin-left: -1em;
color: rgb(255, 255, 255);
content: "\e91f";
margin-left: -1em;
color: rgb(255, 255, 255);
}
.icon-calendar:before {
content: '\e920';
content: "\e920";
}
.icon-catalog:before {
content: '\e921';
content: "\e921";
}
.icon-claims:before {
content: '\e922';
content: "\e922";
}
.icon-client:before {
content: '\e923';
content: "\e923";
}
.icon-clone:before {
content: '\e924';
content: "\e924";
}
.icon-columnadd:before {
content: '\e925';
content: "\e925";
}
.icon-columndelete:before {
content: '\e926';
content: "\e926";
}
.icon-components:before {
content: '\e927';
content: "\e927";
}
.icon-consignatarios:before {
content: '\e928';
content: "\e928";
}
.icon-control:before {
content: '\e929';
content: "\e929";
}
.icon-credit:before {
content: '\e92b';
content: "\e92b";
}
.icon-defaulter:before {
content: '\e92d';
content: "\e92d";
}
.icon-deletedTicket:before {
content: '\e92e';
content: "\e92e";
}
.icon-deleteline:before {
content: '\e92f';
content: "\e92f";
}
.icon-delivery:before {
content: '\e930';
content: "\e930";
}
.icon-deliveryprices:before {
content: '\e932';
content: "\e932";
}
.icon-details:before {
content: '\e933';
content: "\e933";
}
.icon-dfiscales:before {
content: '\e934';
content: "\e934";
}
.icon-disabled:before {
content: '\e935';
content: "\e935";
}
.icon-doc:before {
content: '\e936';
content: "\e936";
}
.icon-entry:before {
content: '\e937';
content: "\e937";
}
.icon-entry_lastbuys:before {
content: '\e91a';
content: "\e91a";
}
.icon-exit:before {
content: '\e938';
content: "\e938";
}
.icon-eye:before {
content: '\e939';
content: "\e939";
}
.icon-fixedPrice:before {
content: '\e93a';
content: "\e93a";
}
.icon-flower:before {
content: '\e93b';
content: "\e93b";
}
.icon-frozen:before {
content: '\e93c';
content: "\e93c";
}
.icon-fruit:before {
content: '\e93d';
content: "\e93d";
}
.icon-funeral:before {
content: '\e93e';
content: "\e93e";
}
.icon-grafana:before {
content: '\e906';
content: "\e906";
}
.icon-greenery:before {
content: '\e93f';
content: "\e93f";
}
.icon-greuge:before {
content: '\e940';
content: "\e940";
}
.icon-grid:before {
content: '\e941';
content: "\e941";
}
.icon-handmade:before {
content: '\e942';
content: "\e942";
}
.icon-handmadeArtificial:before {
content: '\e943';
content: "\e943";
}
.icon-headercol:before {
content: '\e945';
content: "\e945";
}
.icon-info:before {
content: '\e946';
content: "\e946";
}
.icon-inventory:before {
content: '\e947';
content: "\e947";
}
.icon-invoice:before {
content: '\e968';
color: #5f5f5f;
content: "\e968";
color: #5f5f5f;
}
.icon-invoice-in:before {
content: '\e949';
content: "\e949";
}
.icon-invoice-in-create:before {
content: '\e94a';
content: "\e94a";
}
.icon-invoice-out:before {
content: '\e94b';
content: "\e94b";
}
.icon-isTooLittle:before {
content: '\e94c';
content: "\e94c";
}
.icon-item:before {
content: '\e94d';
content: "\e94d";
}
.icon-languaje:before {
content: '\e970';
content: "\e970";
}
.icon-lines:before {
content: '\e94e';
content: "\e94e";
}
.icon-linesprepaired:before {
content: '\e94f';
content: "\e94f";
}
.icon-link-to-corrected:before {
content: '\e931';
content: "\e931";
}
.icon-link-to-correcting:before {
content: '\e944';
content: "\e944";
}
.icon-logout:before {
content: '\e973';
content: "\e973";
}
.icon-mana:before {
content: '\e950';
content: "\e950";
}
.icon-mandatory:before {
content: '\e951';
content: "\e951";
}
.icon-net:before {
content: '\e952';
content: "\e952";
}
.icon-newalbaran:before {
content: '\e954';
content: "\e954";
}
.icon-niche:before {
content: '\e955';
content: "\e955";
}
.icon-no036:before {
content: '\e956';
content: "\e956";
}
.icon-noPayMethod:before {
content: '\e958';
content: "\e958";
}
.icon-notes:before {
content: '\e959';
content: "\e959";
}
.icon-noweb:before {
content: '\e95a';
content: "\e95a";
}
.icon-onlinepayment:before {
content: '\e95b';
content: "\e95b";
}
.icon-package:before {
content: '\e95c';
content: "\e95c";
}
.icon-payment:before {
content: '\e95d';
content: "\e95d";
}
.icon-pbx:before {
content: '\e95e';
content: "\e95e";
}
.icon-pets:before {
content: '\e95f';
content: "\e95f";
}
.icon-photo:before {
content: '\e960';
content: "\e960";
}
.icon-plant:before {
content: '\e961';
content: "\e961";
}
.icon-polizon:before {
content: '\e962';
content: "\e962";
}
.icon-preserved:before {
content: '\e963';
content: "\e963";
}
.icon-recovery:before {
content: '\e964';
content: "\e964";
}
.icon-regentry:before {
content: '\e965';
content: "\e965";
}
.icon-reserva:before {
content: '\e966';
content: "\e966";
}
.icon-revision:before {
content: '\e967';
content: "\e967";
}
.icon-risk:before {
content: '\e969';
content: "\e969";
}
.icon-saysimple:before {
content: '\e912';
content: "\e912";
}
.icon-services:before {
content: '\e96a';
content: "\e96a";
}
.icon-settings:before {
content: '\e96b';
content: "\e96b";
}
.icon-shipment:before {
content: '\e96c';
content: "\e96c";
}
.icon-sign:before {
content: '\e90a';
content: "\e90a";
}
.icon-sms:before {
content: '\e96e';
content: "\e96e";
}
.icon-solclaim:before {
content: '\e96f';
content: "\e96f";
}
.icon-solunion:before {
content: '\e971';
content: "\e971";
}
.icon-splitline:before {
content: '\e972';
content: "\e972";
}
.icon-splur:before {
content: '\e974';
content: "\e974";
}
.icon-stowaway:before {
content: '\e975';
content: "\e975";
}
.icon-supplier:before {
content: '\e976';
content: "\e976";
}
.icon-supplierfalse:before {
content: '\e977';
content: "\e977";
}
.icon-tags:before {
content: '\e979';
content: "\e979";
}
.icon-tax:before {
content: '\e97a';
content: "\e97a";
}
.icon-thermometer:before {
content: '\e97b';
content: "\e97b";
}
.icon-ticket:before {
content: '\e97c';
content: "\e97c";
}
.icon-ticketAdd:before {
content: '\e97e';
content: "\e97e";
}
.icon-traceability:before {
content: '\e97f';
content: "\e97f";
}
.icon-transaction:before {
content: '\e91b';
content: "\e91b";
}
.icon-treatments:before {
content: '\e980';
content: "\e980";
}
.icon-trolley:before {
content: '\e900';
content: "\e900";
}
.icon-troncales:before {
content: '\e982';
content: "\e982";
}
.icon-unavailable:before {
content: '\e983';
content: "\e983";
}
.icon-visible_columns:before {
content: '\e984';
content: "\e984";
}
.icon-volume:before {
content: '\e985';
content: "\e985";
}
.icon-wand:before {
content: '\e986';
content: "\e986";
}
.icon-web:before {
content: '\e987';
content: "\e987";
}
.icon-wiki:before {
content: '\e989';
content: "\e989";
}
.icon-worker:before {
content: '\e98a';
content: "\e98a";
}
.icon-zone:before {
content: '\e98b';
content: "\e98b";
}

View File

@ -30,12 +30,10 @@ export function isValidDate(date) {
export function toDateFormat(date, locale = 'es-ES', opts = {}) {
if (!isValidDate(date)) return '';
const format = {
year: 'numeric',
month: '2-digit',
day: '2-digit',
...opts,
};
const format = Object.assign(
{ year: 'numeric', month: '2-digit', day: '2-digit' },
opts
);
return new Date(date).toLocaleDateString(locale, format);
}
@ -106,17 +104,17 @@ export function secondsToHoursMinutes(seconds, includeHSuffix = true) {
const hours = Math.floor(seconds / 3600);
const remainingMinutes = seconds % 3600;
const minutes = Math.floor(remainingMinutes / 60);
const formattedHours = hours < 10 ? `0${hours}` : hours;
const formattedMinutes = minutes < 10 ? `0${minutes}` : minutes;
const formattedHours = hours < 10 ? '0' + hours : hours;
const formattedMinutes = minutes < 10 ? '0' + minutes : minutes;
// Append "h." if includeHSuffix is true
const suffix = includeHSuffix ? ' h.' : '';
// Return formatted string
return `${formattedHours}:${formattedMinutes}${suffix}`;
return formattedHours + ':' + formattedMinutes + suffix;
}
export function getTimeDifferenceWithToday(date) {
const today = Date.vnNew();
let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
date = new Date(date);

View File

@ -5,12 +5,12 @@
* @return {Object} The fields as object
*/
function fieldsToObject(fields) {
const fieldsObj = {};
let fieldsObj = {};
if (Array.isArray(fields)) {
for (const field of fields) fieldsObj[field] = true;
for (let field of fields) fieldsObj[field] = true;
} else if (typeof fields == 'object') {
for (const field in fields) {
for (let field in fields) {
if (fields[field]) fieldsObj[field] = true;
}
}
@ -26,7 +26,7 @@ function fieldsToObject(fields) {
* @return {Array} The merged fields as an array
*/
function mergeFields(src, dst) {
const fields = {};
let fields = {};
Object.assign(fields, fieldsToObject(src), fieldsToObject(dst));
return Object.keys(fields);
}
@ -39,7 +39,7 @@ function mergeFields(src, dst) {
* @return {Array} The merged wheres
*/
function mergeWhere(src, dst) {
const and = [];
let and = [];
if (src) and.push(src);
if (dst) and.push(dst);
return simplifyOperation(and, 'and');
@ -53,7 +53,7 @@ function mergeWhere(src, dst) {
* @return {Object} The result filter
*/
function mergeFilters(src, dst) {
const res = { ...dst };
let res = Object.assign({}, dst);
if (!src) return res;
@ -80,12 +80,12 @@ function simplifyOperation(operation, operator) {
}
function buildFilter(params, builderFunc) {
const and = [];
let and = [];
for (const param in params) {
const value = params[param];
for (let param in params) {
let value = params[param];
if (value == null) continue;
const expr = builderFunc(param, value);
let expr = builderFunc(param, value);
if (expr) and.push(expr);
}
return simplifyOperation(and, 'and');

View File

@ -1,14 +1,14 @@
export default function getDifferences(obj1, obj2) {
const diff = {};
let diff = {};
delete obj1.$index;
delete obj2.$index;
for (const key in obj1) {
for (let key in obj1) {
if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
diff[key] = obj2[key];
}
}
for (const key in obj2) {
for (let key in obj2) {
if (
obj1[key] === undefined ||
JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])

View File

@ -6,7 +6,6 @@ import toDateHourMinSec from './toDateHourMinSec';
import toRelativeDate from './toRelativeDate';
import toCurrency from './toCurrency';
import toPercentage from './toPercentage';
import toNumber from './toNumber';
import toLowerCamel from './toLowerCamel';
import dashIfEmpty from './dashIfEmpty';
import dateRange from './dateRange';
@ -35,7 +34,6 @@ export {
toRelativeDate,
toCurrency,
toPercentage,
toNumber,
dashIfEmpty,
dateRange,
getParamWhere,

View File

@ -1,10 +1,10 @@
export default function toDateString(date) {
let day = date.getDate();
let month = date.getMonth() + 1;
const year = date.getFullYear();
let year = date.getFullYear();
if (day < 10) day = `0${day}`;
if (month < 10) month = `0${month}`;
return `${year}-${month}-${day}`;
}
return `${year}-${month}-${day}`
}

View File

@ -1,5 +1,5 @@
export default function toLowerCamel(value) {
if (!value) return;
if (typeof value !== 'string') return value;
if (typeof (value) !== 'string') return value;
return value.charAt(0).toLowerCase() + value.slice(1);
}
}

Some files were not shown because too many files have changed in this diff Show More