Merge branch 'dev' into 8322-route

src/components/CreateNewPostcodeForm.vue

@@ -62,6 +62,7 @@ async function setProvince(id, data) {
     postcodeFormData.provinceFk = id;
     await fetchTowns();
 }
+
 async function onProvinceCreated(data) {
     postcodeFormData.provinceFk = data.id;
 }

src/components/RegularizeStockForm.vue

@@ -55,6 +55,7 @@ const onDataSaved = (data) => {
                     v-model.number="data.quantity"
                     type="number"
                     autofocus
+                    data-cy="regularizeStockInput"
                 />
             </VnRow>
             <VnRow>

src/components/VnTable/VnTableFilter.vue

@@ -1,6 +1,5 @@
 <script setup>
 import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnFilter from 'components/VnTable/VnFilter.vue';
@@ -11,16 +10,11 @@ defineProps({
         type: Array,
         required: true,
     },
-    chipLocale: {
-        type: String,
-        default: null,
-    },
     searchUrl: {
         type: [String, Boolean],
         default: 'table',
     },
 });
-const { t } = useI18n();
 
 const tableFilterRef = ref([]);
 
@@ -62,9 +56,9 @@ function columnName(col) {
                 :columns="columns"
             />
         </template>
-        <template #tags="{ tag, formatFn }" v-if="chipLocale">
+        <template #tags="{ tag, formatFn, getLocale }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(`${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>

src/components/common/VnInput.vue

@@ -141,13 +141,16 @@ const handleInsertMode = (e) => {
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="
+                    :style="{
+                        visibility:
                             hover &&
                             value &&
                             !$attrs.disabled &&
                             !$attrs.readonly &&
                             $props.clearable
-                    "
+                                ? 'visible'
+                                : 'hidden',
+                    }"
                     @click="
                         () => {
                             value = null;

src/components/common/VnInputDate.vue

@@ -1,14 +1,12 @@
 <script setup>
 import { onMounted, watch, computed, ref, useAttrs } from 'vue';
 import { date } from 'quasar';
-import { useI18n } from 'vue-i18n';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
 const model = defineModel({ type: [String, Date] });
-const { t } = useI18n();
 
 const $props = defineProps({
     isOutlined: {

src/components/common/VnInputTime.vue

@@ -1,13 +1,11 @@
 <script setup>
 import { computed, ref, useAttrs } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import VnTime from './VnTime.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
-const { t } = useI18n();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {

src/components/common/VnSelect.vue

@@ -113,8 +113,15 @@ const $props = defineProps({
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
-const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
-    toRefs($props);
+const {
+    optionLabel,
+    optionValue,
+    optionCaption,
+    optionFilter,
+    optionFilterValue,
+    options,
+    modelValue,
+} = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -198,10 +205,10 @@ function filter(val, options) {
         }
 
         if (!row) return;
-        const id = row[$props.optionValue];
+        const id = String(row[$props.optionValue]);
         const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
-        return id == search || optionLabel.includes(search);
+        return id.includes(search) || optionLabel.includes(search);
     });
 }
 
@@ -321,6 +328,11 @@ function handleKeyDown(event) {
         }
     }
 }
+
+function getCaption(opt) {
+    if (optionCaption.value === false) return;
+    return opt[optionCaption.value] || opt[optionValue.value];
+}
 </script>
 
 <template>
@@ -391,8 +403,8 @@ function handleKeyDown(event) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="optionCaption !== false">
-                        {{ `#${opt[optionCaption] || opt[optionValue]}` }}
+                    <QItemLabel caption v-if="getCaption(opt)">
+                        {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

src/components/common/VnSelectWorker.vue

@@ -51,6 +51,7 @@ const url = computed(() => {
         option-value="id"
         option-label="nickname"
         :fields="['id', 'name', 'nickname', 'code']"
+        :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
@@ -71,7 +72,7 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

src/components/common/__tests__/VnJsonValue.spec.js

@@ -0,0 +1,95 @@
+import { describe, it, expect } from 'vitest';
+import VnJsonValue from 'src/components/common/VnJsonValue.vue';
+import { createWrapper } from 'app/test/vitest/helper';
+
+const buildComponent = (props) => {
+    return createWrapper(VnJsonValue, {
+        props,
+    }).wrapper;
+};
+
+describe('VnJsonValue', () => {
+    it('renders null value correctly', async () => {
+        const wrapper = buildComponent({ value: null });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('∅');
+        expect(span.classes()).toContain('json-null');
+    });
+
+    it('renders boolean true correctly', async () => {
+        const wrapper = buildComponent({ value: true });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('✓');
+        expect(span.classes()).toContain('json-true');
+    });
+
+    it('renders boolean false correctly', async () => {
+        const wrapper = buildComponent({ value: false });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('✗');
+        expect(span.classes()).toContain('json-false');
+    });
+
+    it('renders a short string correctly', async () => {
+        const wrapper = buildComponent({ value: 'Hello' });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('Hello');
+        expect(span.classes()).toContain('json-string');
+    });
+
+    it('renders a long string correctly with ellipsis', async () => {
+        const longString = 'a'.repeat(600);
+        const wrapper = buildComponent({ value: longString });
+        const span = wrapper.find('span');
+        expect(span.text()).toContain('...');
+        expect(span.text().length).toBeLessThanOrEqual(515);
+        expect(span.attributes('title')).toBe(longString);
+        expect(span.classes()).toContain('json-string');
+    });
+
+    it('renders a number correctly', async () => {
+        const wrapper = buildComponent({ value: 123.4567 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('123.457');
+        expect(span.classes()).toContain('json-number');
+    });
+
+    it('renders an integer correctly', async () => {
+        const wrapper = buildComponent({ value: 42 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('42');
+        expect(span.classes()).toContain('json-number');
+    });
+
+    it('renders a date correctly', async () => {
+        const date = new Date('2023-01-01');
+        const wrapper = buildComponent({ value: date });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('2023-01-01');
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('renders an object correctly', async () => {
+        const obj = { key: 'value' };
+        const wrapper = buildComponent({ value: obj });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe(obj.toString());
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('renders an array correctly', async () => {
+        const arr = [1, 2, 3];
+        const wrapper = buildComponent({ value: arr });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe(arr.toString());
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('updates value when prop changes', async () => {
+        const wrapper = buildComponent({ value: true });
+        await wrapper.setProps({ value: 123 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('123');
+        expect(span.classes()).toContain('json-number');
+    });
+});

src/components/common/__tests__/VnNotes.spec.js

@@ -0,0 +1,107 @@
+import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnNotes from 'src/components/ui/VnNotes.vue';
+
+describe('VnNotes', () => {
+    let vm;
+    let wrapper;
+    let spyFetch;
+    let postMock;
+    let expectedBody;
+    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
+
+    function generateExpectedBody() {
+        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+    }
+
+    async function setTestParams(text, observationType, type){
+        vm.newNote.text = text;
+        vm.newNote.observationTypeFk = observationType;
+        wrapper.setProps({ selectType: type });
+    }
+
+    beforeAll(async () => {        
+        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
+
+        wrapper = createWrapper(VnNotes, {
+            propsData: {
+                url: '/test',
+                body: { name: 'Tony', lastName: 'Stark' },
+            }
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    beforeEach(() => {
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
+        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+        expectedBody = {};
+    });
+
+    describe('insert', () => {
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
+            await setTestParams( null, null, true );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
+            await setTestParams( "", null, false );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
+            await setTestParams( "Test Note", null, true );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
+            await setTestParams( "Test Note", null, false );
+
+            generateExpectedBody();
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
+            await setTestParams( "Test Note", 1, false );
+
+            generateExpectedBody();
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
+            await setTestParams( "Test Note", 1, true );
+
+            generateExpectedBody();
+            
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+    });
+});

src/components/ui/VnFilterPanel.vue

@@ -190,7 +190,7 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else return t(`${route.meta.moduleName}.params.${param}`);
+    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
 };
 </script>
 

src/components/ui/VnSearchbar.vue

@@ -1,14 +1,16 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'src/stores/useStateStore';
+import { useRoute } from 'vue-router';
 
 const quasar = useQuasar();
 const { t } = useI18n();
 const state = useStateStore();
+const route = useRoute();
 
 const props = defineProps({
     dataKey: {
@@ -83,6 +85,17 @@ if (props.redirect)
     };
 let arrayData = useArrayData(props.dataKey, arrayDataProps);
 let store = arrayData.store;
+const to = computed(() => {
+    const url = { path: route.path, query: { ...(route.query ?? {}) } };
+    const searchUrl = arrayData.store.searchUrl;
+    const currentFilter = {
+        ...arrayData.store.currentFilter,
+        search: searchText.value || undefined,
+    };
+
+    if (searchUrl) url.query[searchUrl] = JSON.stringify(currentFilter);
+    return url;
+});
 
 watch(
     () => props.dataKey,
@@ -132,23 +145,32 @@ async function search() {
 <template>
     <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
         <QForm @submit="search" id="searchbarForm">
-            <VnInput
-                id="searchbar"
-                v-model.trim="searchText"
-                :placeholder="t(props.label)"
-                dense
-                standout
-                autofocus
-                data-cy="vnSearchBar"
+            <RouterLink
+                :to="to"
+                @click="
+                    !$event.shiftKey && !$event.ctrlKey && search();
+                    $refs.input.focus();
+                "
             >
-                <template #prepend>
                 <QIcon
                     v-if="!quasar.platform.is.mobile"
                     class="cursor-pointer"
                     name="search"
-                        @click="search"
-                    />
-                </template>
+                    size="sm"
+                >
+                    <QTooltip>{{ t('link') }}</QTooltip>
+                </QIcon>
+            </RouterLink>
+            <VnInput
+                id="searchbar"
+                ref="input"
+                v-model.trim="searchText"
+                :placeholder="t(props.label)"
+                dense
+                autofocus
+                data-cy="vn-searchbar"
+                borderless
+            >
                 <template #append>
                     <QIcon
                         v-if="props.info && $q.screen.gt.xs"
@@ -173,20 +195,52 @@ async function search() {
 .q-field {
     transition: width 0.36s;
 }
-</style>
 
-<style lang="scss">
+:deep(.q-field__native) {
+    padding-top: 10px;
+    padding-left: 5px;
+}
+
+:deep(.q-field--dark .q-field__native:focus) {
+    color: black;
+}
+
+:deep(.q-field--focused) {
+    .q-icon {
+        color: black;
+    }
+}
+
 .cursor-info {
     cursor: help;
 }
-#searchbar {
-    .q-field--standout.q-field--highlighted .q-field__control {
+
+.q-form {
+    display: flex;
+    align-items: center;
+    border-radius: 4px;
+    padding: 0 5px;
+    background-color: var(--vn-search-color);
+
+    &:hover {
+        background-color: var(--vn-search-color-hover);
+    }
+    &:focus-within {
         background-color: white;
-        color: black;
-        .q-field__native,
+
         .q-icon {
-            color: black !important;
+            color: black;
         }
     }
 }
+
+.q-icon {
+    color: var(--vn-label-color);
+}
 </style>
+<i18n>
+en:
+    link: click to search, ctrl + click to open in a new tab, shift + click to open in a new window
+es:
+    link: clic para buscar, ctrl + clic para abrir en una nueva pestaña, shift + clic para abrir en una nueva ventana
+</i18n>

src/composables/useArrayData.js

@@ -76,26 +76,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         cancelRequest();
         canceller = new AbortController();
-
-        const filter = {
-            limit: store.limit,
-        };
-        let userParams = { ...store.userParams };
-
-        Object.assign(filter, store.userFilter);
-
-        let where;
-        if (filter?.where || store.filter?.where)
-            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
-        Object.assign(filter, store.filter);
-        filter.where = where;
-        const params = { filter };
-
-        Object.assign(params, userParams);
-        if (params.filter) params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
-        if (store.order?.length) params.filter.order = [...store.order];
-        else delete params.filter.order;
+        const { params, limit } = getCurrentFilter();
 
         store.currentFilter = JSON.parse(JSON.stringify(params));
         delete store.currentFilter.filter.include;
@@ -121,7 +102,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             params,
         });
 
-        const { limit } = filter;
         store.hasMoreData = limit && response.data.length >= limit;
 
         processData(response.data, { map: !!store.mapKey, append });
@@ -291,6 +271,31 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         router.replace(newUrl);
     }
 
+    function getCurrentFilter() {
+        const filter = {
+            limit: store.limit,
+        };
+
+        let userParams = { ...store.userParams };
+
+        Object.assign(filter, store.userFilter);
+
+        let where;
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        Object.assign(filter, store.filter);
+        filter.where = where;
+        const params = { filter };
+
+        Object.assign(params, userParams);
+        if (params.filter) params.filter.skip = store.skip;
+        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order?.length) params.filter.order = [...store.order];
+        else delete params.filter.order;
+
+        return { filter, params, limit: filter.limit };
+    }
+
     function processData(data, { map = true, append = true }) {
         if (!append) {
             store.data = [];
@@ -323,6 +328,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         fetch,
         applyFilter,
         addFilter,
+        getCurrentFilter,
         addFilterWhere,
         addOrder,
         deleteOrder,

src/css/app.scss

@@ -10,6 +10,8 @@ body.body--light {
     --vn-text-color: black;
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
+    --vn-search-color: #d4d4d4;
+    --vn-search-color-hover: #cfcfcf;
     --vn-empty-tag: #acacac;
     --vn-black-text-color: black;
     --vn-text-color-contrast: white;
@@ -28,6 +30,8 @@ body.body--dark {
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
+    --vn-search-color: #4b4b4b;
+    --vn-search-color-hover: #5b5b5b;
     --vn-empty-tag: #2d2d2d;
     --vn-black-text-color: black;
     --vn-text-color-contrast: black;

src/i18n/locale/en.yml

@@ -456,6 +456,11 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
 ticket:
+    params:
+        ticketFk: Ticket ID
+        weekDay: Weekday
+        agencyModeFk: Agency
+        id: Worker
     card:
         customerId: Customer ID
         customerCard: Customer card
@@ -697,6 +702,11 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
+    params:
+        label: Label
+        plate: Plate
+        volume: Volume
+        name: Name
 
 supplier:
     list:

src/i18n/locale/es.yml

@@ -457,6 +457,11 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
 ticket:
+    params:
+        ticketFk: ID de ticket
+        weekDay: Salida
+        agencyModeFk: Agencia
+        id: Comercial
     card:
         customerId: ID cliente
         customerCard: Ficha del cliente
@@ -700,6 +705,11 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
+    params:
+        label: Etiqueta
+        plate: Matrícula
+        volume: Volumen
+        name: Nombre
 supplier:
     list:
         payMethod: Método de pago

src/pages/Account/locale/en.yml

@@ -1,4 +1,18 @@
 account:
+    params:
+        id: Id
+        name: Name
+        roleFk: Role
+        nickname: Nickname
+        password: Password
+        active: Active
+        search: Id
+        description: Description
+        alias: Alias
+        model: Model
+        principalId: Role
+        property: Property
+        accessType: Access
     card:
         nickname: User
         role: Role

src/pages/Account/locale/es.yml

@@ -1,4 +1,20 @@
+accessType: Acceso
+property: Propiedad
 account:
+    params:
+        id: Id
+        name: Nombre
+        roleFk: Rol
+        nickname: Nickname
+        password: Contraseña
+        active: Activo
+        search: Id
+        description: Descripción
+        alias: Alias
+        model: Modelo
+        principalId: Rol
+        property: Propiedad
+        accessType: Acceso
     card:
         nickname: Usuario
         role: Rol

src/pages/Claim/ClaimFilter.vue

@@ -93,16 +93,7 @@ defineExpose({ states });
                     outlined
                     rounded
                     dense
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                />
                 <VnSelect
                     :label="t('claim.responsible')"
                     v-model="params.claimResponsibleFk"

src/pages/Customer/locale/en.yml

@@ -94,3 +94,12 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
+    params:
+        isWorker: Is Worker
+        payMethod: Payment Method
+        workerFk: Author
+        observation: Last Observation
+        created: Last Update Date
+        creditInsurance: Credit Insurance
+        defaulterSinced: Defaulted Since
+        hasRecovery: Has Recovery

src/pages/Customer/locale/es.yml

@@ -96,3 +96,12 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
+    params:
+        isWorker: Es trabajador
+        payMethod: F. Pago
+        workerFk: Autor
+        observation: Última observación
+        created: Fecha Ú. O.
+        creditInsurance: Crédito A.
+        defaulterSinced: Desde
+        hasRecovery: Tiene recobro

src/pages/Department/Card/DepartmentCard.vue

@@ -1,9 +1,9 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         class="q-pa-md column items-center"
         v-bind="{ ...$attrs }"
         data-key="Department"

src/pages/Department/Card/DepartmentSummary.vue

@@ -40,7 +40,7 @@ onMounted(async () => {
         <template #body="{ entity: department }">
             <QCard class="column">
                 <VnTitle
-                    :url="`#/department/department/${entityId}/basic-data`"
+                    :url="`#/worker/department/${entityId}/basic-data`"
                     :text="t('Basic data')"
                 />
                 <div class="full-width row wrap justify-between content-between">

src/pages/Entry/Card/EntrySummary.vue

@@ -12,6 +12,8 @@ import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -149,7 +151,6 @@ async function setEntryData(data) {
 const fetchEntryBuys = async () => {
     const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
     if (data) entryBuys.value = data;
-
 };
 </script>
 
@@ -173,13 +174,10 @@ const fetchEntryBuys = async () => {
         </template>
         <template #body>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
-                    class="header header-link"
-                >
-                    {{ t('globals.summary.basicData') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
+                <VnTitle
+                    :url="`#/entry/${entityId}/basic-data`"
+                    :text="t('globals.summary.basicData')"
+                />
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
                 <VnLv
                     :label="t('entry.summary.currency')"
@@ -193,13 +191,10 @@ const fetchEntryBuys = async () => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
-                    class="header header-link"
-                >
-                    {{ t('globals.summary.basicData') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
+                <VnTitle
+                    :url="`#/entry/${entityId}/basic-data`"
+                    :text="t('globals.summary.basicData')"
+                />
                 <VnLv :label="t('entry.summary.travelReference')">
                     <template #value>
                         <span class="link">
@@ -217,56 +212,37 @@ const fetchEntryBuys = async () => {
                     :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
                 />
-                <QCheckbox
+                <VnLv
                     :label="t('entry.summary.travelDelivered')"
-                    v-model="entry.travel.isDelivered"
-                    :disable="true"
+                    :value="entry.travel.isDelivered"
                 />
                 <VnLv :label="t('globals.landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('globals.warehouseIn')"
                     :value="entry.travel.warehouseIn?.name"
                 />
-                <QCheckbox
+                <VnLv
                     :label="t('entry.summary.travelReceived')"
-                    v-model="entry.travel.isReceived"
-                    :disable="true"
+                    :value="entry.travel.isReceived"
                 />
             </QCard>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'TravelSummary', params: { id: entry.travel.id } }"
-                    class="header header-link"
-                >
-                    {{ t('Travel data') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
-                <QCheckbox
-                    :label="t('entry.summary.ordered')"
-                    v-model="entry.isOrdered"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('globals.confirmed')"
-                    v-model="entry.isConfirmed"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('entry.summary.booked')"
-                    v-model="entry.isBooked"
-                    :disable="true"
-                />
-                <QCheckbox
+                <VnTitle :url="`#/travel/${entityId}/summary`" :text="t('Travel data')" />
+                <VnRow class="block">
+                    <VnLv :label="t('entry.summary.ordered')" :value="entry.isOrdered" />
+                    <VnLv :label="t('globals.confirmed')" :value="entry.isConfirmed" />
+                    <VnLv :label="t('entry.summary.booked')" :value="entry.isBooked" />
+                    <VnLv
                         :label="t('entry.summary.excludedFromAvailable')"
-                    v-model="entry.isExcludedFromAvailable"
-                    :disable="true"
+                        :value="entry.isExcludedFromAvailable"
                     />
+                </VnRow>
             </QCard>
-            <QCard class="vn-two" style="min-width: 100%">
-                <a class="header header-link">
-                    {{ t('entry.summary.buys') }}
-                    <QIcon name="open_in_new" />
-                </a>
+            <QCard class="vn-max">
+                <VnTitle
+                    :url="`#/entry/${entityId}/buys`"
+                    :text="t('entry.summary.buys')"
+                />
                 <QTable
                     :rows="entryBuys"
                     :columns="entriesTableColumns"

src/pages/Entry/EntryFilter.vue

@@ -123,6 +123,7 @@ const companiesOptions = ref([]);
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="nickname"
                         hide-selected
                         dense
@@ -132,9 +133,12 @@ const companiesOptions = ref([]);
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -69,12 +69,14 @@ const tagValues = ref([]);
                         use-input
                         @update:model-value="searchFn()"
                     >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ opt.nickname }}
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>

src/pages/Entry/EntryList.vue

@@ -1,9 +1,8 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
@@ -12,7 +11,6 @@ import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
 

src/pages/Entry/locale/en.yml

@@ -19,3 +19,11 @@ myEntries:
     daysAgo: Days ago
 wasteRecalc:
     recalcOk: The wastes were successfully recalculated
+entry:
+    params:
+        toShipped: To
+        fromShipped: From
+        warehouseiNFk: Warehouse
+        daysOnward: Days onward
+        daysAgo: Days ago
+        

src/pages/Entry/locale/es.yml

@@ -22,3 +22,11 @@ myEntries:
     daysAgo: Días atras
 wasteRecalc:
     recalcOk: Se han recalculado las mermas correctamente
+entry:
+    params:
+        toShipped: Hasta
+        fromShipped: Desde
+        warehouseInFk: Alm. entrada
+        daysOnward: Días adelante
+        daysAgo: Días atras
+        

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -68,13 +68,26 @@ function handleDaysAgo(params, daysAgo) {
                     <VnSelect
                         v-model="params.supplierFk"
                         url="Suppliers"
-                        :fields="['id', 'nickname']"
+                        :fields="['id', 'nickname', 'name']"
                         :label="getLocale('supplierFk')"
                         option-label="nickname"
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>

src/pages/InvoiceIn/InvoiceInList.vue

@@ -165,18 +165,18 @@ const cols = computed(() => [
             <VnSelect
                 v-model="data.supplierFk"
                 url="Suppliers"
-                :fields="['id', 'nickname']"
+                :fields="['id', 'nickname', 'name']"
                 :label="t('globals.supplier')"
                 option-value="id"
                 option-label="nickname"
-                :filter-options="['id', 'name']"
+                :filter-options="['id', 'name', 'nickname']"
                 :required="true"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
                             <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }}, {{  scope.opt?.name }} </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -101,17 +101,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>
-                                #{{ scope.opt?.id }} {{ scope.opt?.name }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
+            />
             <VnSelect
                 :label="t('invoiceOutSerialType')"
                 v-model="formData.serialType"

src/pages/InvoiceOut/locale/en.yml

@@ -25,3 +25,15 @@ negativeBases:
     hasToInvoice: Has to invoice
     verifiedData: Verified data
     commercial: Commercial
+invoiceout:
+    params:
+        company: Company
+        country: Country
+        clientId: Client ID
+        clientSocialName: Client
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Active
+        hasToInvoice: Has to invoice
+        hasVerifiedData: Verified data
+        workerName: Worker

src/pages/InvoiceOut/locale/es.yml

@@ -28,3 +28,15 @@ negativeBases:
     hasToInvoice: Debe facturar
     verifiedData: Datos verificados
     commercial: Comercial
+invoiceout:
+    params:
+        company: Empresa
+        country: País
+        clientId: ID del cliente
+        clientSocialName: Cliente
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Activo
+        hasToInvoice: Debe facturar
+        hasVerifiedData: Datos verificados
+        workerName: Comercial

src/pages/Item/Card/ItemBotanical.vue

@@ -52,6 +52,7 @@ const entityId = computed(() => {
                     :fields="['id', 'name']"
                     sort-by="name ASC"
                     hide-selected
+                    data-cy="AddGenusSelectDialog"
                 >
                     <template #form>
                         <CreateGenusForm
@@ -68,6 +69,7 @@ const entityId = computed(() => {
                     :fields="['id', 'name']"
                     sort-by="name ASC"
                     hide-selected
+                    data-cy="AddSpeciesSelectDialog"
                 >
                     <template #form>
                         <CreateSpecieForm

src/pages/Item/Card/ItemTags.vue

@@ -107,7 +107,7 @@ const submitTags = async (data) => {
                 @on-fetch="onItemTagsFetched"
             >
                 <template #body="{ rows, validate }">
-                    <QCard class="q-px-lg q-pt-md q-pb-sm">
+                    <QCard class="q-px-lg q-pt-md q-pb-sm" data-cy="itemTags">
                         <VnRow
                             v-for="(row, index) in rows"
                             :key="index"

src/pages/Item/ItemFixedPrice.vue

@@ -35,6 +35,7 @@ const editTableCellDialogRef = ref(null);
 const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
+const hasSelectedRows = computed(() => rowsSelected.value.length > 0);
 const rowsSelected = ref([]);
 const itemFixedPriceFilterRef = ref();
 
@@ -368,9 +369,9 @@ function handleOnDataSave({ CrudModelRef }) {
         </template>
     </RightMenu>
     <VnSubToolbar>
-        <template #st-data>
+        <template #st-actions>
             <QBtn
-                v-if="rowsSelected.length"
+                :disable="!hasSelectedRows"
                 @click="openEditTableCellDialog()"
                 color="primary"
                 icon="edit"
@@ -380,13 +381,13 @@ function handleOnDataSave({ CrudModelRef }) {
                 </QTooltip>
             </QBtn>
             <QBtn
+                :disable="!hasSelectedRows"
                 :label="tMobile('globals.remove')"
                 color="primary"
                 icon="delete"
                 flat
                 @click="(row) => confirmRemove(row, true)"
                 :title="t('globals.remove')"
-                v-if="rowsSelected.length"
             />
         </template>
     </VnSubToolbar>

src/pages/Item/ItemList.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -15,6 +15,9 @@ import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue
 import { cloneItem } from 'src/pages/Item/composables/cloneItem';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemListFilter from './ItemListFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import axios from 'axios';
 
 const entityId = computed(() => route.params.id);
 const { openCloneDialog } = cloneItem();
@@ -22,7 +25,9 @@ const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const tableRef = ref();
 const route = useRoute();
-
+const validPriorities = ref([]);
+const defaultTag = ref();
+const defaultPriority = ref();
 const itemFilter = {
     include: [
         {
@@ -90,7 +95,6 @@ const columns = computed(() => [
         label: t('globals.description'),
         name: 'description',
         align: 'left',
-        create: true,
         columnFilter: {
             name: 'search',
         },
@@ -132,13 +136,23 @@ const columns = computed(() => [
                 fields: ['id', 'name'],
             },
         },
-        create: true,
         visible: false,
     },
     {
         label: t('item.list.typeName'),
         name: 'typeName',
         align: 'left',
+        component: 'select',
+        columnFilter: {
+            name: 'typeFk',
+            attrs: {
+                url: 'ItemTypes',
+                fields: ['id', 'name'],
+            },
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
         label: t('item.list.category'),
@@ -161,6 +175,11 @@ const columns = computed(() => [
         name: 'intrastat',
         align: 'left',
         component: 'select',
+        attrs: {
+            url: 'Intrastats',
+            optionValue: 'description',
+            optionLabel: 'description',
+        },
         columnFilter: {
             name: 'intrastat',
             attrs: {
@@ -172,7 +191,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        create: true,
         cardVisible: true,
     },
     {
@@ -198,7 +216,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        create: true,
         cardVisible: true,
     },
     {
@@ -297,12 +314,21 @@ const columns = computed(() => [
         ],
     },
 ]);
+
+onBeforeMount(async () => {
+    const { data } = await axios.get('ItemConfigs');
+    defaultTag.value = data[0].defaultTag;
+    defaultPriority.value = data[0].defaultPriority;
+    data.forEach((priority) => {
+        validPriorities.value = priority.validPriorities;
+    });
+});
 </script>
 <template>
     <VnSearchbar
         data-key="ItemList"
         :label="t('item.searchbar.label')"
-        :info="t('You can search by id')"
+        :info="t('item.searchbar.info')"
     />
     <RightMenu>
         <template #right-panel>
@@ -310,15 +336,18 @@ const columns = computed(() => [
         </template>
     </RightMenu>
     <VnTable
+        v-if="defaultTag"
         ref="tableRef"
         data-key="ItemList"
         url="Items/filter"
         :create="{
-            urlCreate: 'Items',
-            title: t('Create Item'),
-            onDataSaved: () => tableRef.redirect(),
+            urlCreate: 'Items/new',
+            title: t('item.list.newItem'),
+            onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
             formInitialData: {
                 editorFk: entityId,
+                tag: defaultTag,
+                priority: defaultPriority,
             },
         }"
         :order="['isActive DESC', 'name', 'id']"
@@ -364,6 +393,96 @@ const columns = computed(() => [
             </div>
             <FetchedTags :item="row" :columns="3" />
         </template>
+        <template #more-create-dialog="{ data }">
+            <VnInput
+                v-model="data.provisionalName"
+                :label="t('globals.description')"
+                :is-required="true"
+            />
+            <VnSelect
+                url="Tags"
+                v-model="data.tag"
+                :label="t('globals.tag')"
+                :fields="['id', 'name']"
+                option-label="name"
+                option-value="id"
+                :is-required="true"
+                :sort-by="['name ASC']"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                :options="validPriorities"
+                v-model="data.priority"
+                :label="t('item.create.priority')"
+                :is-required="true"
+            />
+            <VnSelect
+                url="ItemTypes"
+                v-model="data.typeFk"
+                :label="t('item.list.typeName')"
+                :fields="['id', 'code', 'name']"
+                option-label="name"
+                option-value="id"
+                :is-required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption>
+                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                url="Intrastats"
+                v-model="data.intrastatFk"
+                :label="t('globals.intrastat')"
+                :fields="['id', 'description']"
+                option-label="description"
+                option-value="id"
+                :is-required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                url="Origins"
+                v-model="data.originFk"
+                :label="t('globals.origin')"
+                :fields="['id', 'code', 'name']"
+                option-label="code"
+                option-value="id"
+                :is-required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption>
+                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+        </template>
     </VnTable>
 </template>
 <style lang="scss" scoped>

src/pages/Item/ItemListFilter.vue

@@ -199,17 +199,7 @@ onMounted(async () => {
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.name}`)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -265,6 +255,7 @@ onMounted(async () => {
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="name ASC"
                         hide-selected
                         dense
@@ -274,9 +265,12 @@ onMounted(async () => {
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -375,6 +369,7 @@ onMounted(async () => {
                         :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
+                        option-value="label"                        
                         dense
                         outlined
                         rounded

src/pages/Item/ItemRequestFilter.vue

@@ -149,7 +149,6 @@ onMounted(async () => {
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
-                        :fields="['id', 'name']"
                         :params="{ departmentCodes: ['VT'] }"
                         hide-selected
                         dense

src/pages/Item/locale/en.yml

@@ -107,6 +107,7 @@ item:
         scopeDays: Scope days
     searchbar:
         label: Search item
+        info: You can search by id
     descriptor:
         item: Item
         buyer: Buyer
@@ -139,6 +140,7 @@ item:
         stemMultiplier: Multiplier
         producer: Producer
         landed: Landed
+        newItem: New item
     basicData:
         type: Type
         reference: Reference

src/pages/Item/locale/es.yml

@@ -109,6 +109,7 @@ item:
         scopeDays: Días en adelante
     searchbar:
         label: Buscar artículo
+        info: Puedes buscar por id
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -141,6 +142,7 @@ item:
         stemMultiplier: Multiplicador
         producer: Productor
         landed: F. entrega
+        newItem: Nuevo artículo
     basicData:
         type: Tipo
         reference: Referencia

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -110,15 +110,13 @@ const columns = computed(() => [
         name: 'salesPersonFk',
         field: 'userName',
         align: 'left',
-        optionFilter: 'firstName',
         columnFilter: {
             component: 'select',
             attrs: {
-                url: 'Workers/activeWithInheritedRole',
-                fields: ['id', 'name'],
+                url: 'Workers/search?departmentCodes=["VT"]',
+                fields: ['id', 'name', 'nickname', 'code'],
                 sortBy: 'nickname ASC',
-                where: { role: 'salesPerson' },
-                useLike: false,
+                optionLabel: 'nickname',
             },
         },
     },

src/pages/Order/Card/OrderFilter.vue

@@ -97,6 +97,7 @@ const sourceList = ref([]);
                     v-model="params.sourceApp"
                     :options="sourceList"
                     option-label="value"
+                    option-value="value"
                     dense
                     outlined
                     rounded

src/pages/Route/Agency/locale/es.yml

@@ -10,3 +10,4 @@ agency:
     searchBar:
         info: Puedes buscar por nombre o id
         label: Buscar agencia...
+

src/pages/Route/locale/es.yml

@@ -1,4 +1,18 @@
 route:
+    params:
+        agencyModeName: Agencia Ruta
+        agencyAgreement: Agencia Acuerdo
+        id: Id
+        name: Troncal
+        etd: ETD
+        tractorPlate: Matrícula
+        price: Precio
+        observations: Observaciones
+        cmrFk: Id CMR
+        hasCmrDms: Gestdoc
+        ticketFk: Id ticket
+        routeFK: Id ruta
+        shipped: Fecha preparación
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo

src/pages/Ticket/TicketFilter.vue

@@ -101,7 +101,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="states">
-                    <QSelect
+                    <VnSelect
                         :label="t('State')"
                         v-model="params.stateFk"
                         @update:model-value="searchFn()"
@@ -122,7 +122,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="groupedStates">
-                    <QSelect
+                    <VnSelect
                         :label="t('Grouped state')"
                         v-model="params.groupedStates"
                         @update:model-value="searchFn()"
@@ -217,7 +217,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="provinces">
-                    <QSelect
+                    <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -238,7 +238,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="agencies">
-                    <QSelect
+                    <VnSelect
                         :label="t('Agency')"
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
@@ -259,7 +259,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="warehouses">
-                    <QSelect
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="params.warehouseFk"
                         @update:model-value="searchFn()"

src/pages/Travel/ExtraCommunityFilter.vue

@@ -221,7 +221,20 @@ warehouses();
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -232,6 +245,7 @@ warehouses();
                         :options="continentsOptions"
                         option-value="code"
                         option-label="name"
+                        :filter-options="['code', 'name']"
                         hide-selected
                         dense
                         outlined

src/pages/Travel/TravelFilter.vue

@@ -140,10 +140,10 @@ en:
         Id: Contains
         ref: Reference
         agency: Agency
-        warehouseInFk: W. In
+        warehouseInFk: Warehouse In
         shipped: Shipped
         shipmentHour: Shipment Hour
-        warehouseOut: W. Out
+        warehouseOut: Warehouse Out
         landed: Landed
         landingHour: Landing Hour
         totalEntries: Σ
@@ -156,7 +156,7 @@ es:
         warehouseInFk: Alm.Entrada
         shipped: F.Envío
         shipmentHour: Hora de envío
-        warehouseOut: Alm.Entrada
+        warehouseOut: Alm.Salida
         landed: F.Entrega
         landingHour: Hora de entrega
         totalEntries: Σ

src/pages/Worker/Card/WorkerCard.vue

@@ -1,21 +1,7 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
-import WorkerFilter from '../WorkerFilter.vue';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCard
-        data-key="Worker"
-        custom-url="Workers/summary"
-        :descriptor="WorkerDescriptor"
-        :filter-panel="WorkerFilter"
-        search-data-key="WorkerList"
-        :searchbar-props="{
-            url: 'Workers/filter',
-            label: 'Search worker',
-            info: 'You can search by worker id or name',
-            order: 'id DESC',
-        }"
-        :redirect-on-error="true"
-    />
+    <VnCardBeta data-key="Worker" custom-url="Workers/summary" :descriptor="WorkerDescriptor" />
 </template>

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -208,13 +208,30 @@ const getWorkedHours = async (from, to) => {
 };
 
 const getAbsences = async () => {
-    const params = {
-        workerFk: route.params.id,
-        businessFk: null,
-        year: startOfWeek.value.getFullYear(),
+    const startYear = startOfWeek.value.getFullYear();
+    const endYear = endOfWeek.value.getFullYear();
+    const defaultParams = { workerFk: route.params.id, businessFk: null };
+
+    const startData = (
+        await axios.get('Calendars/absences', {
+            params: { ...defaultParams, year: startYear },
+        })
+    ).data;
+
+    let endData;
+    if (startYear !== endYear) {
+        endData = (
+            await axios.get('Calendars/absences', {
+                params: { ...defaultParams, year: endYear },
+            })
+        ).data;
+    }
+
+    const data = {
+        holidays: [...(startData?.holidays || []), ...(endData?.holidays || [])],
+        absences: [...(startData?.absences || []), ...(endData?.absences || [])],
     };
 
-    const { data } = await axios.get('Calendars/absences', { params });
     if (data) addEvents(data);
 };
 

src/pages/Worker/WorkerCreate.vue

@@ -1,254 +0,0 @@
-<script setup>
-import { onBeforeMount, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-import { useState } from 'src/composables/useState';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
-const { t } = useI18n();
-const user = useState().getUser();
-
-const companiesOptions = ref([]);
-const payMethodsOptions = ref([]);
-const bankEntitiesOptions = ref([]);
-const formData = ref({ companyFk: user.value.companyFk, isFreelance: false });
-const defaultPayMethod = ref();
-
-onBeforeMount(async () => {
-    defaultPayMethod.value = (
-        await axios.get('WorkerConfigs/findOne', {
-            params: { field: ['payMethodFk'] },
-        })
-    ).data.payMethodFk;
-    formData.value.payMethodFk = defaultPayMethod.value;
-});
-
-function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postcode = code;
-    data.city = town;
-    data.provinceFk = provinceFk;
-    data.countryFk = countryFk;
-}
-
-function generateCodeUser(worker) {
-    if (!worker.firstName || !worker.lastNames) return;
-
-    const totalName = worker.firstName.concat(' ' + worker.lastNames).toLowerCase();
-    const totalNameArray = totalName.split(' ');
-    let newCode = '';
-
-    for (let part of totalNameArray) newCode += part.charAt(0);
-
-    worker.code = newCode.toUpperCase().slice(0, 3);
-    worker.name = totalNameArray[0] + newCode.slice(1);
-
-    if (!worker.companyFk) worker.companyFk = user.companyFk;
-}
-
-async function autofillBic(worker) {
-    if (!worker || !worker.iban) return;
-
-    let bankEntityId = parseInt(worker.iban.substr(4, 4));
-    let filter = { where: { id: bankEntityId } };
-
-    const { data } = await axios.get(`BankEntities`, { params: { filter } });
-    const hasData = data && data[0];
-    if (hasData) worker.bankEntityFk = data[0].id;
-    else if (!hasData) worker.bankEntityFk = undefined;
-}
-</script>
-<template>
-    <FetchData
-        url="Companies"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Paymethods"
-        @on-fetch="(data) => (payMethodsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="BankEntities"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        auto-load
-    />
-    <QPage>
-        <VnSubToolbar>
-            <template #st-data>
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="false"
-                    :label="`${t('Internal')}`"
-                    @update:model-value="formData.payMethodFk = defaultPayMethod"
-                />
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="true"
-                    :label="`${t('External')}`"
-                    @update:model-value="delete formData.payMethodFk"
-                />
-            </template>
-        </VnSubToolbar>
-        <FormModel
-            url-create="Workers/new"
-            model="worker"
-            :form-initial-data="formData"
-            @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
-        >
-            <template #form="{ data, validate }">
-                <VnRow>
-                    <VnInput
-                        v-model="data.firstName"
-                        :label="t('globals.name')"
-                        :rules="validate('Worker.firstName')"
-                        @update:model-value="generateCodeUser(data)"
-                    />
-                    <VnInput
-                        v-model="data.lastNames"
-                        :label="t('worker.create.lastName')"
-                        :rules="validate('Worker.lastNames')"
-                        @update:model-value="generateCodeUser(data)"
-                    />
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('worker.create.code')"
-                        :rules="validate('Worker.code')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('worker.create.webUser')"
-                        :rules="validate('Worker.name')"
-                    />
-                    <VnInput
-                        v-model="data.email"
-                        :label="t('worker.create.personalEmail')"
-                        :rules="validate('Worker.email')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('globals.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        hide-selected
-                        :rules="validate('Worker.company')"
-                    />
-                    <VnSelectWorker
-                        :label="t('worker.summary.boss')"
-                        v-model="data.bossFk"
-                        :rules="validate('Worker.boss')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.fi"
-                        :label="t('worker.create.fi')"
-                        :rules="validate('Worker.fi')"
-                    />
-                    <VnInputDate
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :rules="validate('Worker.birth')"
-                        :disable="formData.isFreelance"
-                    />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('globals.phone')"
-                        :rules="validate('Worker.phone')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                        :disable="formData.isFreelance"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        :label="t('globals.street')"
-                        v-model="data.street"
-                        :rules="validate('Worker.street')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.payMethods')"
-                        v-model="data.payMethodFk"
-                        :options="payMethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        :rules="validate('Worker.payMethodFk')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="(val) => !val && delete formData.payMethodFk"
-                    />
-                    <VnInput
-                        v-model="data.iban"
-                        :label="t('worker.create.iban')"
-                        :rules="validate('Worker.iban')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="autofillBic(data)"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                    <VnSelectDialog
-                        :label="t('worker.create.bankEntity')"
-                        v-model="data.bankEntityFk"
-                        :options="bankEntitiesOptions"
-                        option-label="name"
-                        option-value="id"
-                        hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
-                        :rules="validate('Worker.bankEntity')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="autofillBic(data)"
-                        :filter-options="['bic', 'name']"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>

src/pages/Worker/WorkerDepartment.vue

@@ -1,11 +1,16 @@
 <script setup>
+import VnSection from 'src/components/common/VnSection.vue';
 import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md">
+    <VnSection data-key="WorkerDepartment">
+        <template #body>
+            <div class="flex flex-center q-pa-md">
                 <WorkerDepartmentTree />
-    </QPage>
+            </div>
+        </template>
+    </VnSection>
 </template>
 
 <i18n>

src/pages/Worker/WorkerDepartmentTree.vue

@@ -111,18 +111,16 @@ function handleEvent(type, event, node) {
     switch (type) {
         case 'path':
             state.set('TreeState', lastId);
-            node.id && router.push({ path: `/department/department/${node.id}/summary` });
+            node.id && router.push({ path: `/worker/department/${node.id}/summary` });
             break;
 
         case 'tab':
             state.set('TreeState', lastId);
-            node.id &&
-                window.open(`#/department/department/${node.id}/summary`, '_blank');
+            node.id && window.open(`#/worker/department/${node.id}/summary`, '_blank');
             break;
 
         default:
-            node.id &&
-                router.push({ path: `#/department/department/${node.id}/summary` });
+            node.id && router.push({ path: `#/worker/department/${node.id}/summary` });
             break;
     }
 }

src/pages/Worker/WorkerList.vue

@@ -2,7 +2,6 @@
 import { onBeforeMount, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import WorkerSummary from './Card/WorkerSummary.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
@@ -14,12 +13,11 @@ import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import FetchData from 'src/components/FetchData.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import WorkerFilter from './WorkerFilter.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
+import VnSection from 'src/components/common/VnSection.vue';
 const { t } = useI18n();
 const tableRef = ref();
 const { viewSummary } = useSummaryDialog();
@@ -31,6 +29,7 @@ const postcodesOptions = ref([]);
 const user = useState().getUser();
 const defaultPayMethod = ref();
 const bankEntitiesRef = ref();
+const dataKey = 'WorkerList';
 const columns = computed(() => [
     {
         align: 'left',
@@ -170,11 +169,6 @@ async function autofillBic(worker) {
 }
 </script>
 <template>
-    <VnSearchbar
-        data-key="WorkerList"
-        :label="t('Search worker')"
-        :info="t('You can search by worker id or name')"
-    />
     <FetchData
         url="Companies"
         @on-fetch="(data) => (companiesOptions = data)"
@@ -191,16 +185,24 @@ async function autofillBic(worker) {
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
+
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="workerSearch"
+        :array-data-props="{
+            url: 'Workers/filter',
+            order: ['id DESC'],
+        }"
+    >
+        <template #rightMenu>
             <WorkerFilter data-key="WorkerList" />
         </template>
-    </RightMenu>
+        <template #body>
             <VnTable
                 v-if="defaultPayMethod"
                 ref="tableRef"
-        data-key="WorkerList"
-        url="Workers/filter"
+                :data-key="dataKey"
                 :create="{
                     urlCreate: 'Workers/new',
                     title: t('Create worker'),
@@ -211,11 +213,10 @@ async function autofillBic(worker) {
                         isFreelance: false,
                     },
                 }"
-        :columns="columns"
                 default-mode="table"
+                :columns="columns"
                 redirect="worker"
                 :right-search="false"
-        :order="['id DESC']"
             >
                 <template #more-create-dialog="{ data }">
                     <div class="q-pa-lg full-width">
@@ -243,10 +244,16 @@ async function autofillBic(worker) {
                                 :label="t('worker.create.lastName')"
                                 @update:model-value="generateCodeUser(data)"
                             />
-                    <VnInput v-model="data.code" :label="t('worker.create.code')" />
+                            <VnInput
+                                v-model="data.code"
+                                :label="t('worker.create.code')"
+                            />
                         </VnRow>
                         <VnRow>
-                    <VnInput v-model="data.name" :label="t('worker.create.webUser')" />
+                            <VnInput
+                                v-model="data.name"
+                                :label="t('worker.create.webUser')"
+                            />
                             <VnInput
                                 v-model="data.email"
                                 type="email"
@@ -283,9 +290,13 @@ async function autofillBic(worker) {
                         <VnRow>
                             <VnLocation
                                 :roles-allowed-to-create="['deliveryAssistant']"
-                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                                :acls="[
+                                    { model: 'Town', props: '*', accessType: 'WRITE' },
+                                ]"
                                 :options="postcodesOptions"
-                        @update:model-value="(location) => handleLocation(data, location)"
+                                @update:model-value="
+                                    (location) => handleLocation(data, location)
+                                "
                                 :disable="data.isFreelance"
                             >
                             </VnLocation>
@@ -308,7 +319,9 @@ async function autofillBic(worker) {
                                 map-options
                                 hide-selected
                                 :disable="data.isFreelance"
-                        @update:model-value="(val) => !val && delete data.payMethodFk"
+                                @update:model-value="
+                                    (val) => !val && delete data.payMethodFk
+                                "
                             />
                             <VnInput
                                 v-model="data.iban"
@@ -318,7 +331,9 @@ async function autofillBic(worker) {
                             >
                                 <template #append>
                                     <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                                        <QTooltip>{{
+                                            t('components.iban_tooltip')
+                                        }}</QTooltip>
                                     </QIcon>
                                 </template>
                             </VnInput>
@@ -331,7 +346,13 @@ async function autofillBic(worker) {
                                 option-label="name"
                                 option-value="id"
                                 hide-selected
-                        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
+                                :acls="[
+                                    {
+                                        model: 'BankEntity',
+                                        props: '*',
+                                        accessType: 'WRITE',
+                                    },
+                                ]"
                                 :disable="data.isFreelance"
                                 @update:model-value="autofillBic(data)"
                                 :filter-options="['bic', 'name']"
@@ -359,6 +380,8 @@ async function autofillBic(worker) {
                 </template>
             </VnTable>
         </template>
+    </VnSection>
+</template>
 
 <i18n>
 es:

src/pages/Worker/locale/en.yml

@@ -1,3 +1,6 @@
+workerSearch:
+    search: Search worker
+    searchInfo: Search worker by id or name
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
     id: ID

src/pages/Worker/locale/es.yml

@@ -1,5 +1,6 @@
-Search worker: Buscar trabajador
-You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+workerSearch:
+    search: Buscar trabajador
+    searchInfo: Buscar trabajador por id o nombre
 Locker: Taquilla
 Internal: Interno
 External: Externo

src/router/modules/department.js

@@ -1,47 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: '/department',
-    name: 'Department',
-    meta: {
-        title: 'department',
-        icon: 'vn:greuge',
-        moduleName: 'Department',
-    },
-    component: RouterView,
-    redirect: { name: 'WorkerDepartment' },
-    menus: {
-        main: [],
-        card: ['DepartmentBasicData'],
-    },
-    children: [
-        {
-            name: 'DepartmentCard',
-            path: 'department/:id',
-            component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
-            redirect: { name: 'DepartmentSummary' },
-            children: [
-                {
-                    name: 'DepartmentSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () =>
-                        import('src/pages/Department/Card/DepartmentSummary.vue'),
-                },
-                {
-                    name: 'DepartmentBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Department/Card/DepartmentBasicData.vue'),
-                },
-            ],
-        },
-    ],
-};

src/router/modules/index.js

@@ -11,7 +11,6 @@ import Route from './route';
 import Supplier from './supplier';
 import Travel from './travel';
 import Order from './order';
-import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
@@ -35,7 +34,6 @@ export default [
     Travel,
     Order,
     invoiceIn,
-    Department,
     Entry,
     roadmap,
     Parking,

src/router/modules/worker.js

@@ -1,19 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    path: '/worker',
-    name: 'Worker',
+const workerCard = {
+    name: 'WorkerCard',
+    path: ':id',
+    component: () => import('src/pages/Worker/Card/WorkerCard.vue'),
+    redirect: { name: 'WorkerSummary' },
     meta: {
-        title: 'workers',
-        icon: 'vn:worker',
-        moduleName: 'Worker',
-        keyBinding: 'w',
-    },
-    component: RouterView,
-    redirect: { name: 'WorkerMain' },
-    menus: {
-        main: ['WorkerList', 'WorkerDepartment'],
-        card: [
+        menu: [
             'WorkerBasicData',
             'WorkerNotes',
             'WorkerPda',
@@ -31,47 +24,6 @@ export default {
             'WorkerOperator',
         ],
     },
-    children: [
-        {
-            path: '',
-            name: 'WorkerMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'WorkerList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'WorkerList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Worker/WorkerList.vue'),
-                },
-                {
-                    path: 'department',
-                    name: 'WorkerDepartment',
-                    meta: {
-                        title: 'department',
-                        icon: 'vn:greuge',
-                    },
-                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'WorkerCreate',
-                    meta: {
-                        title: 'workerCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
-                },
-            ],
-        },
-        {
-            name: 'WorkerCard',
-            path: ':id',
-            component: () => import('src/pages/Worker/Card/WorkerCard.vue'),
-            redirect: { name: 'WorkerSummary' },
     children: [
         {
             name: 'WorkerSummary',
@@ -110,8 +62,7 @@ export default {
                         title: 'notes',
                         icon: 'vn:notes',
                     },
-                            component: () =>
-                                import('src/pages/Worker/Card/WorkerNotes.vue'),
+                    component: () => import('src/pages/Worker/Card/WorkerNotes.vue'),
                 },
             ],
         },
@@ -122,8 +73,7 @@ export default {
                 title: 'timeControl',
                 icon: 'access_time',
             },
-                    component: () =>
-                        import('src/pages/Worker/Card/WorkerTimeControl.vue'),
+            component: () => import('src/pages/Worker/Card/WorkerTimeControl.vue'),
         },
         {
             name: 'WorkerCalendar',
@@ -236,6 +186,89 @@ export default {
             component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
         },
     ],
+};
+
+const departmentCard = {
+    name: 'DepartmentCard',
+    path: ':id',
+    component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
+    redirect: { name: 'DepartmentSummary' },
+    meta: {
+        menu: ['DepartmentBasicData'],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'DepartmentSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Department/Card/DepartmentSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'DepartmentBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Department/Card/DepartmentBasicData.vue'),
+        },
+    ],
+};
+
+export default {
+    name: 'Worker',
+    path: '/worker',
+    meta: {
+        title: 'workers',
+        icon: 'vn:worker',
+        moduleName: 'Worker',
+        keyBinding: 'w',
+        menu: ['WorkerList', 'WorkerDepartment'],
+    },
+    component: RouterView,
+    redirect: { name: 'WorkerMain' },
+    children: [
+        {
+            path: '',
+            name: 'WorkerMain',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'WorkerIndexMain' },
+            children: [
+                {
+                    path: '',
+                    name: 'WorkerIndexMain',
+                    redirect: { name: 'WorkerList' },
+                    component: () => import('src/pages/Worker/WorkerList.vue'),
+                    children: [
+                        {
+                            name: 'WorkerList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        workerCard,
+                    ],
+                },
+                {
+                    path: 'department',
+                    name: 'Department',
+                    redirect: { name: 'WorkerDepartment' },
+                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
+                    children: [
+                        {
+                            name: 'WorkerDepartment',
+                            path: 'list',
+                            meta: { title: 'department', icon: 'vn:greuge' },
+                        },
+                        departmentCard,
+                    ],
+                },
+            ],
         },
     ],
 };

src/router/routes.js

@@ -9,7 +9,6 @@ import invoiceIn from './modules/invoiceIn';
 import wagon from './modules/wagon';
 import supplier from './modules/supplier';
 import travel from './modules/travel';
-import department from './modules/department';
 import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
@@ -85,7 +84,6 @@ const routes = [
             route,
             supplier,
             travel,
-            department,
             roadmap,
             entry,
             parking,

test/cypress/integration/Order/orderCatalog.spec.js

@@ -41,7 +41,7 @@ describe('OrderCatalog', () => {
             }
         });
         cy.get(
-            '[data-cy="vnSearchBar"] > .q-field > .q-field__inner > .q-field__control'
+            '[data-cy="vn-searchbar"] > .q-field > .q-field__inner > .q-field__control'
         ).type('{enter}');
         cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
         cy.dataCy('catalogFilterValueDialogBtn').last().click();

test/cypress/integration/item/itemBarcodes.spec.js

@@ -0,0 +1,25 @@
+/// <reference types="cypress" />
+describe('Item shelving', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/list`);
+        cy.typeSearchbar('1{enter}');
+    });
+
+    it('should throw an error if the barcode exists', () => {
+        cy.get('[href="#/item/1/barcode"]').click();
+        cy.get('.q-card > .q-btn > .q-btn__content > .q-icon').click();
+        cy.dataCy('Code_input').eq(3).type('1111111111');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Codes can not be repeated');
+    });
+
+    it('should create a new barcode', () => {
+        cy.get('[href="#/item/1/barcode"]').click();
+        cy.get('.q-card > .q-btn > .q-btn__content > .q-icon').click();
+        cy.dataCy('Code_input').eq(3).type('1231231231');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+    });
+});

test/cypress/integration/item/itemBotanical.spec.js

@@ -0,0 +1,31 @@
+/// <reference types="cypress" />
+describe('Item botanical', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/botanical`);
+    });
+
+    it('should modify the botanical', () => {
+        cy.dataCy('AddGenusSelectDialog').type('Abies');
+        cy.get('.q-menu .q-item').contains('Abies').click();
+        cy.dataCy('AddSpeciesSelectDialog').type('dealbata');
+        cy.get('.q-menu .q-item').contains('dealbata').click();
+        cy.get('.q-btn-group > .q-btn--standard').click();
+        cy.checkNotification('Data saved');
+    });
+
+    it('should create a new Genus', () => {
+        cy.dataCy('Genus_icon').click();
+        cy.dataCy('Latin genus name_input').type('Test');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+
+    it('should create a new specie', () => {
+        cy.dataCy('Species_icon').click();
+        cy.dataCy('Latin species name_input').type('Test specie');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+});

test/cypress/integration/item/itemList.spec.js

@@ -0,0 +1,34 @@
+/// <reference types="cypress" />
+
+describe('Item list', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/list`);
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('should filter the items and redirect to the summary', () => {
+        cy.dataCy('Category_select').type('Plant');
+        cy.get('.q-menu .q-item').contains('Plant').click();
+        cy.dataCy('Type_select').type('Anthurium');
+        cy.get('.q-menu .q-item').contains('Anthurium').click();
+        cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
+    });
+
+    it('should create an item', () => {
+        const data = {
+            Description: { val: `Test item` },
+            Type: { val: `Crisantemo`, type: 'select' },
+            Intrastat: { val: `Coral y materiales similares`, type: 'select' },
+            Origin: { val: `SPA`, type: 'select' },
+        };
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(data);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.get(
+            ':nth-child(2) > .q-drawer > .q-drawer__content > .q-scrollarea > .q-scrollarea__container > .q-scrollarea__content'
+        ).should('be.visible');
+    });
+});

test/cypress/integration/item/itemSummary.spec.js

@@ -0,0 +1,24 @@
+/// <reference types="cypress" />
+describe('Item summary', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/summary`);
+    });
+
+    it('should clone the item', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(2) > .q-item__section').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.waitForElement('[data-cy="itemTags"]');
+        cy.dataCy('itemTags').should('be.visible');
+    });
+
+    it('should regularize stock', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(1) > .q-item__section').click();
+        cy.dataCy('regularizeStockInput').type('10');
+        cy.dataCy('Warehouse_select').type('Warehouse One{enter}');
+        cy.checkNotification('Data created');
+    });
+});

test/cypress/integration/item/itemTag.spec.js

@@ -0,0 +1,39 @@
+/// <reference types="cypress" />
+describe('Item tag', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/tags`);
+    });
+
+    it('should throw an error adding an existent tag', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.get('.q-page-sticky > div').click();
+        cy.get('.q-page-sticky > div').click();
+        cy.dataCy('Tag_select').eq(7).type('Tallos');
+        cy.get('.q-menu .q-item').contains('Tallos').click();
+        cy.get(
+            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
+        ).type('1');
+        +cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification("The tag or priority can't be repeated for an item");
+    });
+
+    it('should add a new tag', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.get('.q-page-sticky > div').click();
+        cy.get('.q-page-sticky > div').click();
+        cy.dataCy('Tag_select').eq(7).click();
+        cy.get('.q-menu .q-item').contains('Ancho de la base').click();
+        cy.get(
+            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
+        ).type('50');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+        cy.get(
+            '[data-cy="itemTags"] > :nth-child(7) > .justify-center > .q-icon'
+        ).click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('Data saved');
+    });
+});

test/cypress/integration/item/itemTax.spec.js

@@ -0,0 +1,14 @@
+/// <reference types="cypress" />
+describe('Item tax', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/tax`);
+    });
+
+    it('should modify the tax for Spain', () => {
+        cy.dataCy('Class_select').eq(1).type('General VAT{enter}');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+    });
+});

test/cypress/integration/item/itemType.spec.js

@@ -0,0 +1,40 @@
+/// <reference types="cypress" />
+describe('Item type', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/item-type`);
+    });
+
+    it('should throw an error if the code already exists', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
+        ).type('ALS');
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
+        ).type('Alstroemeria');
+        cy.dataCy('Worker_select').type('employeeNick');
+        cy.get('.q-menu .q-item').contains('employeeNick').click();
+        cy.dataCy('ItemCategory_select').type('Artificial');
+        cy.get('.q-menu .q-item').contains('Artificial').click();
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('An item type with the same code already exists');
+    });
+
+    it('should create a new type', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
+        ).type('LIL');
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
+        ).type('Lilium');
+        cy.dataCy('Worker_select').type('buyerNick');
+        cy.get('.q-menu .q-item').contains('buyerNick').click();
+        cy.dataCy('ItemCategory_select').type('Flower');
+        cy.get('.q-menu .q-item').contains('Flower').click();
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+});

test/cypress/integration/ticket/ticketList.spec.js

@@ -9,9 +9,9 @@ describe('TicketList', () => {
     });
 
     const searchResults = (search) => {
-        cy.dataCy('vnSearchBar').find('input').focus();
-        if (search) cy.dataCy('vnSearchBar').find('input').type(search);
-        cy.dataCy('vnSearchBar').find('input').type('{enter}');
+        cy.dataCy('vn-searchbar').find('input').focus();
+        if (search) cy.dataCy('vn-searchbar').find('input').type(search);
+        cy.dataCy('vn-searchbar').find('input').type('{enter}');
         cy.dataCy('ticketListTable').should('exist');
         cy.get(firstRow).should('exist');
     };

test/cypress/integration/vnComponent/VnSearchBar.spec.js

@@ -16,17 +16,17 @@ describe('VnSearchBar', () => {
     });
 
     it('should stay on the list page if there are several results or none', () => {
-        cy.writeSearchbar('salesA{enter}');
+        cy.typeSearchbar('salesA{enter}');
         checkTableLength(2);
 
         cy.clearSearchbar();
-        cy.writeSearchbar('0{enter}');
+        cy.typeSearchbar('0{enter}');
         checkTableLength(0);
     });
 
     const searchAndCheck = (searchTerm, expectedText) => {
         cy.clearSearchbar();
-        cy.writeSearchbar(`${searchTerm}{enter}`);
+        cy.typeSearchbar(`${searchTerm}{enter}`);
         cy.get(idGap).should('have.text', expectedText);
     };
 

test/cypress/support/commands.js

@@ -274,15 +274,11 @@ Cypress.Commands.add('openLeftMenu', (element) => {
 
 Cypress.Commands.add('clearSearchbar', (element) => {
     if (element) cy.waitForElement(element);
-    cy.get(
-        '#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input'
-    ).clear();
+    cy.get('[data-cy="vn-searchbar"]').clear();
 });
 
 Cypress.Commands.add('writeSearchbar', (value) => {
-    cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type(
-        value
-    );
+    cy.get('[data-cy="vn-searchbar"]').type(value);
 });
 
 Cypress.Commands.add('validateContent', (selector, expectedValue) => {