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

Merge pull request 'chore: run eslint fix and prettier write' (!1782) from run_eslint_and_prettier into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1782
Reviewed-by: Jon Elias <jon@verdnatura.es>
This commit is contained in:
Alex Moreno 2025-05-07 08:22:01 +00:00
parent f8b1966c2a b3c2df5940
commit 8ae5d8b238
138 changed files with 4905 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.husky/addReferenceTag.js
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);
}
}

5
cypress.config.js
View File

@ -1,6 +1,9 @@
import { defineConfig } from 'cypress';
let urlHost, reporter, reporterOptions, timeouts;
let urlHost;
let reporter;
let reporterOptions;
let timeouts;
if (process.env.CI) {
urlHost = 'front';

9
index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<title><%= productName %></title>
@ -12,7 +12,12 @@
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" />

2
package.json
View File

@ -89,4 +89,4 @@
"vite": "^6.0.11",
"vitest": "^0.31.1"
}
}
}

1
postcss.config.js
View File

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

2
quasar.config.js
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(function (/* ctx */) {
export default configure((/* ctx */) => {
return {
eslint: {
// fix: true,

4
quasar.extensions.json
View File

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

8
quasar.testing.json
View File

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

2
src/App.vue
View File

@ -39,7 +39,7 @@ quasar.iconMapFn = (iconName) => {
<template>
<RouterView />
<VnScroll/>
<VnScroll />
</template>
<style lang="scss">

4
src/boot/defaults/setDefault.js
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}`);
}
}

2
src/boot/mainShortcutMixin.js
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;
}, {});

1
src/boot/quasar.defaults.js
View File

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

9
src/boot/quasar.js
View File

@ -24,12 +24,9 @@ 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';

2
src/components/CreateNewProvinceForm.vue
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);
};

14
src/components/CrudModel.vue
View File

@ -347,8 +347,16 @@ 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') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:disable="!hasChanges"
color="primary"
icon="save"
@ -397,4 +405,4 @@ watch(formUrl, async () => {
:label="t && t('globals.pleaseWait')"
color="primary"
/>
</template>
</template>

20
src/components/EntityCalendar.vue
View File

@ -8,10 +8,8 @@ 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 formatDate = (dateToFormat, format = 'YYYY-MM-DD') =>
date.formatDate(dateToFormat, format);
const props = defineProps({
year: {
@ -64,10 +62,10 @@ const handleDateClick = (timestamp) => {
const event = getEventByTimestamp(timestamp);
const { year, month, day } = timestamp;
const date = new Date(year, month - 1, day);
emit('onDateSelected', {
date,
emit('onDateSelected', {
date,
isNewMode: !event,
event: event?.[0] || null
event: event?.[0] || null,
});
};
@ -107,7 +105,11 @@ defineExpose({ getEventByTimestamp, handleDateClick });
mini-mode
>
<template #day="{ scope: { timestamp } }">
<slot name="day" :timestamp="timestamp" :getEventAttrs="getEventAttrs">
<slot
name="day"
:timestamp="timestamp"
:getEventAttrs="getEventAttrs"
>
<QBtn
v-if="getEventByTimestamp(timestamp)"
v-bind="{ ...getEventAttrs(timestamp) }"
@ -149,4 +151,4 @@ defineExpose({ getEventByTimestamp, handleDateClick });
opacity: 0.8;
}
}
</style>
</style>

164
src/components/EntityCalendarGrid.vue
View File

@ -5,18 +5,18 @@ 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: () => ({}),
}
dataKey: {
type: String,
required: true,
},
calendarComponent: {
type: Object,
required: true,
},
additionalProps: {
type: Object,
default: () => ({}),
},
});
const stateStore = useStateStore();
@ -28,99 +28,99 @@ 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;
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',
'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();
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);
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);
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);
}
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');
},
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])}`;
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;
const newDate = new Date(date.value);
newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
date.value = newDate;
};
defineExpose({
firstDay,
lastDay
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>
<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>

12
src/components/FormModel.vue
View File

@ -380,8 +380,16 @@ 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') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:title="
t('globals.saveAndContinue') +
' ' +
t('globals.' + $props.goTo.split('/').pop())
"
:disable="!hasChanges"
color="primary"
icon="save"

2
src/components/PinnedModules.vue
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'));
}

4
src/components/RefundInvoiceForm.vue
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)
)
"

2
src/components/VnSelectProvince.vue
View File

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

2
src/components/VnTable/filters/tableFooter.js
View File

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

2
src/components/__tests__/CrudModel.spec.js
View File

@ -241,7 +241,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)));

6
src/components/__tests__/Leftmenu.spec.js
View File

@ -142,14 +142,14 @@ describe('getRoutes', () => {
const fn = (props) => getRoutes(props, getMethodA, getMethodB);
it('should call getMethodB when source is card', () => {
let props = { source: 'methodB' };
const props = { source: 'methodB' };
fn(props);
expect(getMethodB).toHaveBeenCalled();
expect(getMethodA).not.toHaveBeenCalled();
});
it('should call getMethodA when source is main', () => {
let props = { source: 'methodA' };
const 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', () => {
let props = { source: 'methodC' };
const props = { source: 'methodC' };
expect(() => fn(props)).toThrowError('Method not defined');
expect(getMethodA).not.toHaveBeenCalled();

2
src/components/common/VnBreadcrumbs.vue
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;

4
src/components/common/VnLocation.vue
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(', ');

50
src/components/common/VnScroll.vue
View File

@ -2,7 +2,7 @@
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
const props = defineProps({
scrollTarget: { type: [String, Object], default: 'window' }
scrollTarget: { type: [String, Object], default: 'window' },
});
const scrollPosition = ref(0);
@ -11,9 +11,9 @@ let scrollContainer = null;
const onScroll = () => {
if (!scrollContainer) return;
scrollPosition.value =
typeof props.scrollTarget === 'object'
? scrollContainer.scrollTop
scrollPosition.value =
typeof props.scrollTarget === 'object'
? scrollContainer.scrollTop
: window.scrollY;
};
@ -28,18 +28,18 @@ const scrollToTop = () => {
};
const updateScrollContainer = (container) => {
if (container) {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
if (container) {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
}
scrollContainer = container;
scrollContainer.addEventListener('scroll', onScroll);
onScroll();
}
scrollContainer = container;
scrollContainer.addEventListener('scroll', onScroll);
onScroll();
}
};
defineExpose({
updateScrollContainer
updateScrollContainer,
});
const initScrollContainer = async () => {
@ -51,11 +51,10 @@ const initScrollContainer = async () => {
scrollContainer = window;
}
if (!scrollContainer) return
scrollContainer.addEventListener('scroll', onScroll);
if (!scrollContainer) return;
scrollContainer.addEventListener('scroll', onScroll);
};
onMounted(() => {
initScrollContainer();
});
@ -82,19 +81,18 @@ onUnmounted(() => {
<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;
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);
transform: translateX(-50%) scale(1.2);
cursor: pointer;
filter: brightness(0.8);
}
</style>

4
src/components/common/__tests__/VnChangePassword.spec.js
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',
})
}),
);
});

2
src/components/common/__tests__/VnInputTime.spec.js
View File

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

24
src/components/common/__tests__/VnLocation.spec.js
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,7 +47,12 @@ 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');
});
@ -61,7 +66,7 @@ describe('showLabel', () => {
code: '46680',
town: 'Algemesi',
province: 'Valencia',
country: 'Spain'
country: 'Spain',
};
});
@ -84,8 +89,13 @@ 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');
});
});
});

17
src/components/common/__tests__/VnSmsDialog.spec.js
View File

@ -2,13 +2,14 @@ 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';
@ -17,13 +18,13 @@ describe('VnSmsDialog', () => {
propsData: {
data: {
orderId,
shipped
shipped,
},
template,
locale,
phone,
promise
}
promise,
},
}).vm;
});
@ -35,7 +36,9 @@ 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.`,
);
});
});
@ -47,7 +50,7 @@ describe('VnSmsDialog', () => {
orderId,
shipped,
destination: phone,
message: vm.message
message: vm.message,
};
await vm.send();

8
src/components/ui/SkeletonForm.vue
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>

2
src/components/ui/VnAvatar.vue
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);

2
src/components/ui/VnLogo.vue
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;
},
});

55
src/components/ui/VnNotes.vue
View File

@ -1,7 +1,7 @@
<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, onMounted, nextTick } from 'vue';
import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import { useStateStore } from 'stores/useStateStore';
@ -34,7 +34,7 @@ const $props = defineProps({
addNote: { type: Boolean, default: false },
selectType: { type: Boolean, default: false },
justInput: { type: Boolean, default: false },
goTo: { type: String, default: '', },
goTo: { type: String, default: '' },
});
const { t } = useI18n();
@ -47,8 +47,8 @@ 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;
@ -132,14 +132,13 @@ function fetchData([data]) {
const handleObservationTypes = (data) => {
observationTypes.value = data;
if(defaultObservationType.value) {
if (defaultObservationType.value) {
newNote.observationTypeFk = defaultObservationType.value;
}
};
onMounted(() => {
nextTick(() => (componentIsRendered.value = true));
nextTick(() => (componentIsRendered.value = true));
});
async function saveAndGo() {
@ -150,16 +149,32 @@ async function saveAndGo() {
}
</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>
<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"
@ -234,9 +249,7 @@ async function saveAndGo() {
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">

2
src/components/ui/VnSms.vue
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">

3
src/components/ui/VnSubToolbar.vue
View File

@ -37,8 +37,7 @@ 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">

2
src/components/ui/VnUserLink.vue
View File

@ -11,7 +11,7 @@ defineProps({
<template>
<slot name="link">
<span :class="{ link: workerId }">
{{ defaultName ? name ?? $t('globals.system') : name }}
{{ defaultName ? (name ?? $t('globals.system')) : name }}
</span>
</slot>
<WorkerDescriptorProxy v-if="workerId" :id="workerId" />

2
src/components/ui/__tests__/FetchedTags.spec.js
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);

35
src/components/ui/__tests__/VnImg.spec.js
View File

@ -9,30 +9,29 @@ 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();
});
@ -47,13 +46,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');
});
@ -63,7 +62,9 @@ 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 () => {
@ -71,7 +72,9 @@ 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',
);
});
});
@ -82,8 +85,8 @@ describe('VnImg', () => {
wrapper.vm.reload();
const newTimestamp = wrapper.vm.timeStamp;
expect(initialTimestamp).not.toEqual(newTimestamp);
});
});
});
});

18
src/composables/__tests__/useAcl.spec.js
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,13 +80,15 @@ 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();
});
});
@ -96,7 +98,7 @@ describe('useAcl', () => {
expect(
acl.hasAny([
{ model: 'TpvTransaction', props: 'start', accessType: 'READ' },
])
]),
).toBeFalsy();
});
@ -104,7 +106,7 @@ describe('useAcl', () => {
expect(
acl.hasAny([
{ model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
])
]),
).toBeTruthy();
});
});

2
src/composables/downloadFile.js
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,
});

2
src/composables/getColAlign.js
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'}`;
}

6
src/composables/getDateQBadgeColor.js
View File

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

2
src/composables/getValueFromPath.js
View File

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

7
src/composables/getWeekdays.js
View File

@ -2,9 +2,8 @@ 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);
const firstDay = moment().weekday(1).day();
const weekdays = [...Array(7).keys()].map(i => (i + firstDay) % 7);
return ref(weekdays);
return ref(weekdays);
}

2
src/composables/updateMinPriceBeforeSave.js
View File

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

5
src/composables/useCardSize.js
View File

@ -1,7 +1,6 @@
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';
}

2
src/composables/useColor.js
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 = [

12
src/composables/usePrintService.js
View File

@ -15,18 +15,16 @@ 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 = Object.assign(
{
access_token: getTokenMultimedia(),
},
params
);
params = {
access_token: getTokenMultimedia(),
...params,
};
const query = new URLSearchParams(params).toString();
window.open(`api/${path}?${query}`, isNewTab);

2
src/composables/useSession.js
View File

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

4
src/composables/useVnConfirm.js
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();

2
src/css/app.scss
View File

@ -359,4 +359,4 @@ input::-webkit-inner-spin-button {
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}
}

4094
src/css/fonts/selection.json
View File

File diff suppressed because one or more lines are too long

344
src/css/icons.scss
View File

@ -1,453 +1,455 @@
@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';
}

18
src/filters/date.js
View File

@ -30,10 +30,12 @@ export function isValidDate(date) {
export function toDateFormat(date, locale = 'es-ES', opts = {}) {
if (!isValidDate(date)) return '';
const format = Object.assign(
{ year: 'numeric', month: '2-digit', day: '2-digit' },
opts
);
const format = {
year: 'numeric',
month: '2-digit',
day: '2-digit',
...opts,
};
return new Date(date).toLocaleDateString(locale, format);
}
@ -104,17 +106,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) {
let today = Date.vnNew();
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
date = new Date(date);

20
src/filters/filterPanel.js
View File

@ -5,12 +5,12 @@
* @return {Object} The fields as object
*/
function fieldsToObject(fields) {
let fieldsObj = {};
const fieldsObj = {};
if (Array.isArray(fields)) {
for (let field of fields) fieldsObj[field] = true;
for (const field of fields) fieldsObj[field] = true;
} else if (typeof fields == 'object') {
for (let field in fields) {
for (const 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) {
let fields = {};
const 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) {
let and = [];
const 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) {
let res = Object.assign({}, dst);
const res = { ...dst };
if (!src) return res;
@ -80,12 +80,12 @@ function simplifyOperation(operation, operator) {
}
function buildFilter(params, builderFunc) {
let and = [];
const and = [];
for (let param in params) {
let value = params[param];
for (const param in params) {
const value = params[param];
if (value == null) continue;
let expr = builderFunc(param, value);
const expr = builderFunc(param, value);
if (expr) and.push(expr);
}
return simplifyOperation(and, 'and');

6
src/filters/getDifferences.js
View File

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

6
src/filters/toDateString.js
View File

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

4
src/filters/toLowerCamel.js
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);
}
}

2
src/filters/toRelativeDate.js
View File

@ -9,7 +9,7 @@ export default function formatDate(dateVal) {
const dateZeroTime = new Date(dateVal);
dateZeroTime.setHours(0, 0, 0, 0);
const diff = Math.trunc(
(today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24)
(today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24),
);
let format;
if (diff === 0) format = t('globals.today');

6
src/i18n/index.js
View File

@ -11,14 +11,14 @@ for (const file in files) {
translations[lang] = g.default;
})
.finally(() => {
const actualLang = lang + '.yml';
const actualLang = `${lang}.yml`;
for (const module in modules) {
if (!module.endsWith(actualLang)) continue;
modules[module]().then((t) => {
Object.assign(translations[lang], t.default);
})
});
}
});
});
}
export const localeEquivalence = {

2
src/pages/Account/AccountConnections.vue
View File

@ -80,7 +80,7 @@ const killSession = async ({ userId, created }) => {
openConfirmationModal(
t('Session will be killed'),
t('Are you sure you want to continue?'),
() => killSession(row)
() => killSession(row),
)
"
outline

12
src/pages/Account/AccountList.vue
View File

@ -149,12 +149,12 @@ const columns = computed(() => [
:right-search="false"
>
<template #more-create-dialog="{ data }">
<VnInputPassword
:label="t('Password')"
v-model="data.password"
:required="true"
autocomplete="new-password"
/>
<VnInputPassword
:label="t('Password')"
v-model="data.password"
:required="true"
autocomplete="new-password"
/>
</template>
</VnTable>
</template>

4
src/pages/Account/Alias/Card/AliasUsers.vue
View File

@ -57,7 +57,7 @@ watch(
store.url = urlPath.value;
store.filter = filter;
fetchAliases();
}
},
);
const fetchAliases = () => paginateRef.value.fetch();
@ -91,7 +91,7 @@ const fetchAliases = () => paginateRef.value.fetch();
openConfirmationModal(
t('User will be removed from alias'),
t('Are you sure you want to continue?'),
() => deleteAlias(row)
() => deleteAlias(row),
)
"
>

4
src/pages/Account/Card/AccountMailForwarding.vue
View File

@ -28,7 +28,7 @@ const loading = ref(false);
const hasDataChanged = computed(
() =>
formData.value.forwardTo !== initialData.value.forwardTo ||
initialData.value.hasData !== hasData.value
initialData.value.hasData !== hasData.value,
);
const fetchMailForwards = async () => {
@ -77,7 +77,7 @@ const setInitialData = async () => {
watch(
() => route.params.id,
() => setInitialData()
() => setInitialData(),
);
onMounted(async () => await setInitialData());

2
src/pages/Account/Card/AccountPrivileges.vue
View File

@ -14,7 +14,7 @@ const rolesOptions = ref([]);
const formModelRef = ref();
watch(
() => route.params.id,
() => formModelRef.value.reset()
() => formModelRef.value.reset(),
);
</script>
<template>

2
src/pages/Account/InheritedRoles.vue
View File

@ -44,7 +44,7 @@ watch(
store.filter = filter.value;
store.limit = 0;
fetchSubRoles();
}
},
);
const fetchSubRoles = () => paginateRef.value.fetch();

2
src/pages/Account/Role/Card/InheritedRoles.vue
View File

@ -43,7 +43,7 @@ watch(
store.url = urlPath.value;
store.filter = filter.value;
fetchSubRoles();
}
},
);
const fetchSubRoles = () => paginateRef.value.fetch();

4
src/pages/Claim/Card/ClaimAction.vue
View File

@ -178,7 +178,7 @@ async function save(data) {
}
async function importToNewRefundTicket() {
try{
try {
await post(`ClaimBeginnings/${claimId}/importToNewRefundTicket`);
await claimActionsForm.value.reload();
quasar.notify({
@ -187,7 +187,7 @@ async function importToNewRefundTicket() {
});
} catch (error) {
const errorMessage = error.response?.data?.error?.message;
notify( t(errorMessage), 'negative' );
notify(t(errorMessage), 'negative');
}
}

4
src/pages/Claim/Card/ClaimDevelopment.vue
View File

@ -238,7 +238,9 @@ const columns = computed(() => [
<style lang="scss" scoped>
.grid-style-transition {
transition: transform 0.28s, background-color 0.28s;
transition:
transform 0.28s,
background-color 0.28s;
}
</style>

25
src/pages/Claim/Card/ClaimLines.vue
View File

@ -79,7 +79,7 @@ const columns = computed(() => [
field: ({ sale }) => sale.quantity,
sortable: true,
style: 'padding-right: 2%;',
headerStyle: 'padding-right: 2%;'
headerStyle: 'padding-right: 2%;',
},
{
name: 'claimed',
@ -113,7 +113,7 @@ const columns = computed(() => [
format: (value) => toCurrency(value),
sortable: true,
style: 'padding-right: 2%;',
headerStyle: 'padding-right: 2%;'
headerStyle: 'padding-right: 2%;',
},
]);
@ -160,7 +160,7 @@ function fillClaimedQuantities() {
const formData = claimLinesForm.value.formData;
let hasChanges = false;
const selectedRows = formData.filter(row => selected.value.includes(row));
const selectedRows = formData.filter((row) => selected.value.includes(row));
for (const row of selectedRows) {
if (row.quantity === 0 || row.quantity === null) {
@ -170,10 +170,10 @@ function fillClaimedQuantities() {
}
if (hasChanges) {
quasar.notify({
message: t('Quantities filled automatically'),
type: 'positive',
});
quasar.notify({
message: t('Quantities filled automatically'),
type: 'positive',
});
} else {
quasar.notify({
message: t('No quantities to fill'),
@ -181,8 +181,6 @@ function fillClaimedQuantities() {
});
}
}
</script>
<template>
<Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
@ -210,7 +208,6 @@ function fillClaimedQuantities() {
auto-load
/>
<div class="q-pa-md">
<CrudModel
data-key="claimLines"
ref="claimLinesForm"
@ -236,12 +233,7 @@ function fillClaimedQuantities() {
>
<template #body-cell-claimed="{ row }">
<QTd auto-width align="right" class="text-primary shrink">
<QInput
v-model.number="row.quantity"
type="number"
dense
/>
<QInput v-model.number="row.quantity" type="number" dense />
</QTd>
</template>
<template #body-cell-description="{ row, value }">
@ -297,7 +289,6 @@ function fillClaimedQuantities() {
type="number"
dense
autofocus
/>
</QItemLabel>
</template>

2
src/pages/Claim/Card/ClaimNotes.vue
View File

@ -35,7 +35,7 @@ const body = {
workerFk: user.value.id,
};
</script>
<template>
<VnNotes
url="claimObservations"

6
src/pages/Claim/Card/ClaimPhoto.vue
View File

@ -210,7 +210,7 @@ function onDrag() {
class="all-pointer-events absolute delete-button zindex"
@click.stop="viewDeleteDms(index)"
round
:data-cy="`delete-button-${index+1}`"
:data-cy="`delete-button-${index + 1}`"
/>
<QIcon
name="play_circle"
@ -228,7 +228,7 @@ function onDrag() {
class="rounded-borders cursor-pointer fit"
@click="openDialog(media.dmsFk)"
v-if="!media.isVideo"
:data-cy="`file-${index+1}`"
:data-cy="`file-${index + 1}`"
>
</QImg>
<video
@ -237,7 +237,7 @@ function onDrag() {
muted="muted"
v-if="media.isVideo"
@click="openDialog(media.dmsFk)"
:data-cy="`file-${index+1}`"
:data-cy="`file-${index + 1}`"
/>
</QCard>
</div>

2
src/pages/Claim/Card/__tests__/ClaimDescriptorMenu.spec.js
View File

@ -27,7 +27,7 @@ describe('ClaimDescriptorMenu', () => {
await vm.remove();
expect(vm.quasar.notify).toHaveBeenCalledWith(
expect.objectContaining({ type: 'positive' })
expect.objectContaining({ type: 'positive' }),
);
});
});

7
src/pages/Customer/Card/CustomerUnpaid.vue
View File

@ -50,8 +50,11 @@ const filterClientFindOne = {
>
<template #form="{ data }">
<VnRow>
<QCheckbox :label="t('Unpaid client')" v-model="data.unpaid"
data-cy="UnpaidCheckBox" />
<QCheckbox
:label="t('Unpaid client')"
v-model="data.unpaid"
data-cy="UnpaidCheckBox"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md" v-show="data.unpaid">

2
src/pages/Customer/components/CustomerFileManagementCreate.vue
View File

@ -224,7 +224,7 @@ const toCustomerFileManagement = () => {
<QTooltip max-width="30rem">
{{
`${t(
'Allowed content types'
'Allowed content types',
)}: ${allowedContentTypes.join(', ')}`
}}
</QTooltip>

2
src/pages/Customer/components/CustomerFileManagementEdit.vue
View File

@ -200,7 +200,7 @@ const toCustomerFileManagement = () => {
<QTooltip max-width="30rem">
{{
`${t(
'Allowed content types'
'Allowed content types',
)}: ${allowedContentTypes.join(', ')}`
}}
</QTooltip>

2
src/pages/Customer/composables/getClient.js
View File

@ -13,4 +13,4 @@ export async function getClient(clientId, _filter = {}) {
};
const params = { filter: JSON.stringify(filter) };
return await axios.get('Clients', { params });
};
}

2
src/pages/Entry/Card/EntryBuysImport.vue
View File

@ -126,7 +126,7 @@ const fetchBuys = async (buys) => {
const params = { buys };
const { data } = await axios.post(
`Entries/${route.params.id}/importBuysPreview`,
params
params,
);
importData.value.buys = data;
};

2
src/pages/InvoiceIn/composables/setRectificative.js
View File

@ -3,7 +3,7 @@ import axios from 'axios';
export async function setRectificative(route) {
const card = route.matched.find((route) => route.name === 'InvoiceInCard');
const corrective = card.children.find(
(route) => route.name === 'InvoiceInCorrective'
(route) => route.name === 'InvoiceInCorrective',
);
corrective.meta.hidden = !(

2
src/pages/Login/ResetPassword.vue
View File

@ -37,7 +37,7 @@ async function onSubmit() {
await axios.post(
'VnUsers/reset-password',
{ newPassword: newPassword.value },
{ headers }
{ headers },
);
router.push('Login');
quasar.notify({

4
src/pages/Order/Card/OrderVolume.vue
View File

@ -71,9 +71,7 @@ onMounted(async () => (stateStore.rightDrawer = false));
auto-load
/>
<QCard v-if="volumeSummary" class="order-volume-summary q-pa-lg">
<VnLv
:label="`${t('total')}: `"
:value="`${volumeSummary?.totalVolume} m³`" />
<VnLv :label="`${t('total')}: `" :value="`${volumeSummary?.totalVolume} m³`" />
<VnLv
:label="`${t('boxes')}: `"
:value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"

7
src/pages/Route/Agency/Card/AgencyCard.vue
View File

@ -3,5 +3,10 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
import VnCard from 'src/components/common/VnCard.vue';
</script>
<template>
<VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" :filter="{ where: { id: $route.params.id } }" />
<VnCard
data-key="Agency"
url="Agencies"
:descriptor="AgencyDescriptor"
:filter="{ where: { id: $route.params.id } }"
/>
</template>

2
src/pages/Route/Agency/composables/getAgencies.js
View File

@ -9,7 +9,7 @@ export async function getAgencies(formData, client, _filter = {}) {
};
let agency = null;
let params = {
const params = {
filter: JSON.stringify(filter),
warehouseFk: formData.warehouseId,
addressFk: formData.addressId,

2
src/pages/Route/Card/RouteDescriptorMenu.vue
View File

@ -23,7 +23,7 @@ async function openRouteReport() {
const token = getTokenMultimedia();
window.open(
`${url}/api/Routes/${routeId}/driver-route-pdf?access_token=${token}`,
'_blank'
'_blank',
);
}

4
src/pages/Route/Card/RouteListTicketsDialog.vue
View File

@ -106,8 +106,8 @@ const setTicketsRoute = async () => {
(selectedRows.value || [])
.filter((ticket) => ticket?.id)
.map((ticket) =>
axios.patch(`Routes/${$props.id}/insertTicket`, { ticketId: ticket.id })
)
axios.patch(`Routes/${$props.id}/insertTicket`, { ticketId: ticket.id }),
),
);
await axios.post(`Routes/${$props.id}/updateVolume`);
emit('ok');

60
src/pages/Route/Cmr/locale/en.yml
View File

@ -1,31 +1,31 @@
cmr:
search: Search Cmr
searchInfo: You can search Cmr by Id
params:
agency: Agency
client: Client
cmrFk: CMR id
country: Country
created: Created
destination: Destination
downloadCmrs: Download CMRs
etd: ETD
etdTooltip: Estimated Time Delivery
hasCmrDms: Attached in gestdoc
observation: Observation
packageList: Package List
paymentInstructions: Payment instructions
routeFk: Route id
results: results
search: General search
sender: Sender
senderInstructions: Sender instructions
shipped: Shipped
specialAgreements: Special agreements
supplier: Carrier
ticketFk: Ticket id
vehiclePlate: Vehicle plate
viewCmr: View CMR
warehouse: Warehouse
'true': 'Yes'
'false': 'No'
search: Search Cmr
searchInfo: You can search Cmr by Id
params:
agency: Agency
client: Client
cmrFk: CMR id
country: Country
created: Created
destination: Destination
downloadCmrs: Download CMRs
etd: ETD
etdTooltip: Estimated Time Delivery
hasCmrDms: Attached in gestdoc
observation: Observation
packageList: Package List
paymentInstructions: Payment instructions
routeFk: Route id
results: results
search: General search
sender: Sender
senderInstructions: Sender instructions
shipped: Shipped
specialAgreements: Special agreements
supplier: Carrier
ticketFk: Ticket id
vehiclePlate: Vehicle plate
viewCmr: View CMR
warehouse: Warehouse
'true': 'Yes'
'false': 'No'

60
src/pages/Route/Cmr/locale/es.yml
View File

@ -1,31 +1,31 @@
cmr:
search: Buscar Cmr
searchInfo: Puedes buscar cmr por id
params:
agency: Agencia
client: Cliente
cmrFk: Id cmr
country: País
created: Creado
destination: Destinatario
downloadCmrs: Descargar CMRs
etd: ETD
etdTooltip: Fecha estimada de entrega
hasCmrDms: Adjunto en gestdoc
observation: Observaciones
packageList: Listado embalajes
paymentInstructions: Instrucciones de pago
routeFk: Id ruta
results: Resultados
search: Busqueda general
sender: Remitente
senderInstructions: Instrucciones de envío
shipped: F. envío
specialAgreements: Acuerdos especiales
supplier: Transportista
ticketFk: Id ticket
vehiclePlate: Matrícula
viewCmr: Ver CMR
warehouse: Almacén
'true': 'Si'
'false': 'No'
search: Buscar Cmr
searchInfo: Puedes buscar cmr por id
params:
agency: Agencia
client: Cliente
cmrFk: Id cmr
country: País
created: Creado
destination: Destinatario
downloadCmrs: Descargar CMRs
etd: ETD
etdTooltip: Fecha estimada de entrega
hasCmrDms: Adjunto en gestdoc
observation: Observaciones
packageList: Listado embalajes
paymentInstructions: Instrucciones de pago
routeFk: Id ruta
results: Resultados
search: Busqueda general
sender: Remitente
senderInstructions: Instrucciones de envío
shipped: F. envío
specialAgreements: Acuerdos especiales
supplier: Transportista
ticketFk: Id ticket
vehiclePlate: Matrícula
viewCmr: Ver CMR
warehouse: Almacén
'true': 'Si'
'false': 'No'

38
src/pages/Route/Vehicle/Card/VehicleEventInclusionForm.vue
View File

@ -68,17 +68,13 @@ onMounted(() => {
const createVehicleEvent = async () => {
vehicleFormData.value.vehicleFk = route.params.id;
vehicleFormData.value.userFk = user.value.id;
if (isNew.value) {
await axios.post(`VehicleEvents`, vehicleFormData.value);
} else {
await axios.patch(
`VehicleEvents/${props.event?.id}`,
vehicleFormData.value,
);
await axios.patch(`VehicleEvents/${props.event?.id}`, vehicleFormData.value);
}
await refetchEvents();
};
const deleteVehicleEvent = async () => {
@ -88,36 +84,34 @@ const deleteVehicleEvent = async () => {
};
const refetchEvents = async () => {
await arrayData.refresh({
await arrayData.refresh({
append: false,
params: {
filter: {
where: {
vehicleFk: route.params.id,
and: [
{
{
or: [
{ started: { lte: props.lastDay?.toISOString() } },
{ started: null }
]
{ started: null },
],
},
{
{
or: [
{ finished: { gte: props.firstDay?.toISOString() } },
{ finished: null }
]
}
]
}
}
}
{ finished: null },
],
},
],
},
},
},
});
emit('refresh-events');
notify(t('globals.dataSaved'), 'positive');
emit('closeForm');
};
</script>
<template>
@ -139,8 +133,8 @@ const refetchEvents = async () => {
/>
</VnRow>
<VnInput
v-model="vehicleFormData.description"
:label="t('globals.description')"
v-model="vehicleFormData.description"
:label="t('globals.description')"
/>
</template>
<template #custom-buttons>

25
src/pages/Route/Vehicle/Card/VehicleEvents.vue
View File

@ -24,7 +24,7 @@ const vehicleEventsFormProps = reactive({
});
const refreshEvents = async () => {
await vehicleEventsPanelRef.value.fetchData();
await vehicleEventsPanelRef.value.fetchData();
};
const openForm = (data) => {
@ -38,21 +38,20 @@ const onVehicleEventFormClose = () => {
showVehicleEventForm.value = false;
vehicleEventsFormProps.value = {};
};
</script>
<template>
<RightMenu>
<template #right-panel v-if="stateStore.isHeaderMounted()">
<VehicleEventsPanel
ref="vehicleEventsPanelRef"
:first-day="firstDay"
:last-day="lastDay"
:events="events"
@update:events="events = $event"
/>
</template>
</RightMenu>
<RightMenu>
<template #right-panel v-if="stateStore.isHeaderMounted()">
<VehicleEventsPanel
ref="vehicleEventsPanelRef"
:first-day="firstDay"
:last-day="lastDay"
:events="events"
@update:events="events = $event"
/>
</template>
</RightMenu>
<QPage class="q-pa-md flex justify-center">
<VehicleCalendarGrid
v-model:events="events"

35
src/pages/Route/Vehicle/Card/VehicleEventsPanel.vue
View File

@ -55,7 +55,7 @@ const arrayData = useArrayData('VehicleEvents', {
const fetchData = async () => {
if (!params.value.vehicleFk || !props.firstDay || !props.lastDay) return;
try {
await arrayData.applyFilter({
params: {
@ -63,18 +63,22 @@ const fetchData = async () => {
where: {
vehicleFk: route.params.id,
and: [
{ or: [
{ started: { lte: props.lastDay } },
{ started: null }
]},
{ or: [
{ finished: { gte: props.firstDay } },
{ finished: null }
]}
]
}
}
}
{
or: [
{ started: { lte: props.lastDay } },
{ started: null },
],
},
{
or: [
{ finished: { gte: props.firstDay } },
{ finished: null },
],
},
],
},
},
},
});
emit('update:events', arrayData.store.data || []);
} catch (error) {
@ -95,7 +99,7 @@ watch(
(newEvents) => {
emit('update:events', newEvents);
},
{ deep: true }
{ deep: true },
);
const deleteEvent = async (id) => {
@ -119,9 +123,8 @@ onMounted(async () => {
});
defineExpose({
fetchData
fetchData,
});
</script>
<template>

8
src/pages/Route/Vehicle/VehicleCalendar.vue
View File

@ -2,12 +2,8 @@
import EntityCalendar from 'src/components/EntityCalendar.vue';
const emit = defineEmits(['onDateSelected']);
</script>
<template>
<EntityCalendar
v-bind="$props"
@onDateSelected="(e) => emit('onDateSelected', e)"
/>
</template>
<EntityCalendar v-bind="$props" @onDateSelected="(e) => emit('onDateSelected', e)" />
</template>

37
src/pages/Route/Vehicle/VehicleCalendarGrid.vue
View File

@ -24,26 +24,26 @@ const events = ref([]);
const refreshEvents = () => {
days.value = {};
if (!events.value?.length || !firstDay.value || !lastDay.value) return;
let day = new Date(firstDay.value.getTime());
let endDate = new Date(lastDay.value.getTime());
while (day <= endDate) {
let stamp = day.getTime();
let dayEvents = [];
for (let event of events.value) {
const eventStart = event.started ? new Date(event.started).getTime() : null;
const eventEnd = event.finished ? new Date(event.finished).getTime() : null;
let match = (!eventStart || stamp >= eventStart) &&
(!eventEnd || stamp <= eventEnd);
let match =
(!eventStart || stamp >= eventStart) && (!eventEnd || stamp <= eventEnd);
if (match) {
dayEvents.push(event);
}
}
if (dayEvents.length) {
days.value[stamp] = dayEvents;
}
@ -57,7 +57,7 @@ watch(
(value) => {
_data.value = value;
events.value = Array.isArray(value) ? value : [];
function toStamp(date) {
return date && new Date(date).setHours(0, 0, 0, 0);
}
@ -75,14 +75,19 @@ watch(
{ immediate: true },
);
watch(() => entityCalendarRef.value?.firstDay, (newVal) => {
if (newVal) firstDay.value = new Date(newVal);
});
watch(() => entityCalendarRef.value?.lastDay, (newVal) => {
if (newVal) lastDay.value = new Date(newVal);
});
watch(
() => entityCalendarRef.value?.firstDay,
(newVal) => {
if (newVal) firstDay.value = new Date(newVal);
},
);
watch(
() => entityCalendarRef.value?.lastDay,
(newVal) => {
if (newVal) lastDay.value = new Date(newVal);
},
);
</script>
<template>
@ -94,4 +99,4 @@ watch(() => entityCalendarRef.value?.lastDay, (newVal) => {
@refresh-events="refreshEvents"
v-bind="$attrs"
/>
</template>
</template>

2
src/pages/Shelving/Parking/locale/en.yml
View File

@ -2,4 +2,4 @@ parking:
pickingOrder: Picking order
sector: Sector
search: Search parking
searchInfo: You can search by parking code
searchInfo: You can search by parking code

2
src/pages/Shelving/Parking/locale/es.yml
View File

@ -2,4 +2,4 @@ parking:
pickingOrder: Orden de recogida
sector: Sector
search: Buscar parking
searchInfo: Puedes buscar por código de parking
searchInfo: Puedes buscar por código de parking

2
src/pages/Shelving/locale/en.yml
View File

@ -6,4 +6,4 @@ shelving:
summary:
recyclable: Recyclable
search: Search shelving
searchInfo: You can search by shelving reference
searchInfo: You can search by shelving reference

2
src/pages/Shelving/locale/es.yml
View File

@ -6,4 +6,4 @@ shelving:
summary:
recyclable: Reciclable
search: Buscar carro
searchInfo: Puedes buscar por referencia del carro
searchInfo: Puedes buscar por referencia del carro

2
src/pages/Supplier/Card/SupplierSummary.vue
View File

@ -76,7 +76,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
{{
dashIfEmpty(
supplier.companySize &&
t('globals.' + supplier.companySize)
t('globals.' + supplier.companySize),
)
}}
</span>

2
src/pages/Ticket/Card/TicketComponents.vue
View File

@ -38,7 +38,7 @@ watch(
if (ticketData.value?.zone && ticketData.value?.zone?.isVolumetric)
getTicketVolume();
},
{ immediate: true }
{ immediate: true },
);
const salesFilter = computed(() => ({

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