.husky/addReferenceTag.js

@@ -1,33 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-function getCurrentBranchName(p = process.cwd()) {
-    if (!fs.existsSync(p)) return false;
-
-    const gitHeadPath = path.join(p, '.git', 'HEAD');
-
-    if (!fs.existsSync(gitHeadPath))
-        return getCurrentBranchName(path.resolve(p, '..'));
-
-    const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
-    return headContent.trim().split('/')[2];
-}
-
-const branchName = getCurrentBranchName();
-
-if (branchName) {
-    const msgPath = `.git/COMMIT_EDITMSG`;
-    const msg = fs.readFileSync(msgPath, 'utf-8');
-    const reference = branchName.match(/^\d+/);
-
-    const referenceTag = `refs #${reference}`;
-    if (!msg.includes(referenceTag) && reference) {
-        const splitedMsg = msg.split(':');
-
-        if (splitedMsg.length > 1) {
-            const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
-            fs.writeFileSync(msgPath, finalMsg);
-        }
-    }
-}
-

.husky/commit-msg

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-echo "Running husky commit-msg hook"
-npx --no-install commitlint --edit
-echo "Adding reference tag to commit message"
-node .husky/addReferenceTag.js
-

.vscode/settings.json

@@ -14,5 +14,5 @@
     "[vue]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "cSpell.words": ["axios", "composables"]
+    "cSpell.words": ["axios"]
 }

Jenkinsfile

@@ -54,6 +54,7 @@ pipeline {
     }
     environment {
         PROJECT_NAME = 'lilium'
+        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
         stage('Install') {
@@ -94,7 +95,7 @@ pipeline {
                 sh 'quasar build'
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                    env.VERSION = packageJson.version
                 }
                 dockerBuild()
             }
@@ -103,18 +104,15 @@ pipeline {
             when {
                 expression { PROTECTED_BRANCH }
             }
+            environment {
+                DOCKER_HOST = "${env.SWARM_HOST}"
+            }
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                    env.VERSION = packageJson.version
-                }
-                withKubeConfig([
-                    serverUrl: "$KUBERNETES_API",
-                    credentialsId: 'kubernetes',
-                    namespace: 'lilium'
-                ]) {
-                    sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
                 }
+                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
             }
         }
     }

changelog.sh

@@ -1,34 +0,0 @@
-features_types=(chore feat style)
-changes_types=(refactor perf)
-fix_types=(fix revert)
-file="CHANGELOG.md"
-file_tmp="temp_log.txt"
-file_current_tmp="temp_current_log.txt"
-
-setType(){
-    echo "### $1" >> $file_tmp
-    arr=("$@")
-    echo "" > $file_current_tmp
-    for i in "${arr[@]}"
-    do
-        git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
-    done
-    # remove duplicates
-    sort -o $file_current_tmp -u $file_current_tmp
-    cat $file_current_tmp >> $file_tmp
-    echo "" >> $file_tmp
-    # remove tmp current file
-    [ -e $file_current_tmp ] && rm $file_current_tmp
-}
-
-echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
-echo "" >> $file_tmp
-
-setType "Added 🆕" "${features_types[@]}"
-setType "Changed 📦" "${changes_types[@]}"
-setType "Fixed 🛠️" "${fix_types[@]}"
-
-cat $file >> $file_tmp
-mv $file_tmp $file
-
-

commitlint.config.js

@@ -1 +0,0 @@
-module.exports = { extends: ['@commitlint/config-conventional'] };

cypress.config.js

@@ -1,7 +1,4 @@
 const { defineConfig } = require('cypress');
-// https://docs.cypress.io/app/tooling/reporters
-// https://docs.cypress.io/app/references/configuration
-// https://www.npmjs.com/package/cypress-mochawesome-reporter
 
 module.exports = defineConfig({
     e2e: {
@@ -14,23 +11,12 @@ module.exports = defineConfig({
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,
-        watchForFileChanges: true,
-        reporter: 'cypress-mochawesome-reporter',
-        reporterOptions: {
-            charts: true,
-            reportPageTitle: 'Cypress Inline Reporter',
-            reportFilename: '[status]_[datetime]-report',
-            embeddedScreenshots: true,
-            reportDir: 'test/cypress/reports',
-            inlineAssets: true,
-        },
         component: {
             componentFolder: 'src',
             testFiles: '**/*.spec.js',
             supportFile: 'test/cypress/support/unit.js',
         },
         setupNodeEvents(on, config) {
-            require('cypress-mochawesome-reporter/plugin')(on);
             // implement node event listeners here
         },
     },

docker-compose.yml

@@ -1,7 +1,17 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
+    image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
     build:
       context: .
       dockerfile: ./Dockerfile
+    ports:
+      - 4000
+    deploy:
+      replicas: ${FRONT_REPLICAS:?}
+      placement:
+        constraints:
+          - node.role == worker
+      resources:
+        limits:
+          memory: 1G

package.json

@@ -1,23 +1,19 @@
 {
     "name": "salix-front",
-    "version": "24.50.0",
+    "version": "24.18.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
     "private": true,
     "packageManager": "pnpm@8.15.1",
     "scripts": {
-        "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
         "test:e2e": "cypress open",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test:e2e:ci": "cd ../salix && gulp docker && cd ../salix-front && cypress run",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:unit": "vitest",
-        "test:unit:ci": "vitest run",
+        "test:unit:ci": "vitest run"
-        "commitlint": "commitlint --edit",
-        "prepare": "npx husky install",
-        "addReferenceTag": "node .husky/addReferenceTag.js"
     },
     "dependencies": {
         "@quasar/cli": "^2.3.0",
@@ -33,22 +29,17 @@
         "vue-router": "^4.2.1"
     },
     "devDependencies": {
-        "@commitlint/cli": "^19.2.1",
-        "@commitlint/config-conventional": "^19.1.0",
         "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
         "@quasar/app-vite": "^1.7.3",
-        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^13.6.6",
-        "cypress-mochawesome-reporter": "^3.8.2",
         "eslint": "^8.41.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-cypress": "^2.13.3",
         "eslint-plugin-vue": "^9.14.1",
-        "husky": "^8.0.0",
         "postcss": "^8.4.23",
         "prettier": "^2.8.8",
         "vitest": "^0.31.1"

quasar.config.js

@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],

quasar.extensions.json

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

src/boot/axios.js

@@ -1,23 +1,20 @@
 import axios from 'axios';
+import { Notify } from 'quasar';
 import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
-import useNotify from 'src/composables/useNotify.js';
+import { i18n } from './i18n';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
 const session = useSession();
-const { notify } = useNotify();
+const { t } = i18n.global;
-const stateQuery = useStateQueryStore();
-const baseUrl = '/api/';
 
-axios.defaults.baseURL = baseUrl;
+axios.defaults.baseURL = '/api/';
-const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
     const token = session.getToken();
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
     }
-    stateQuery.add(config);
+
     return config;
 };
 
@@ -26,34 +23,59 @@ const onRequestError = (error) => {
 };
 
 const onResponse = (response) => {
-    const config = response.config;
+    const { method } = response.config;
-    stateQuery.remove(config);
 
-    if (config.method === 'patch') {
+    const isSaveRequest = method === 'patch';
-        notify('globals.dataSaved', 'positive');
+    if (isSaveRequest) {
+        Notify.create({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
     }
 
     return response;
 };
 
 const onResponseError = (error) => {
-    stateQuery.remove(error.config);
+    let message = '';
 
-    if (session.isLoggedIn() && error.response?.status === 401) {
+    const response = error.response;
-        session.destroy(false);
+    const responseData = response && response.data;
+    const responseError = responseData && response.data.error;
+    if (responseError) {
+        message = responseError.message;
+    }
+
+    switch (response?.status) {
+        case 500:
+            message = 'errors.statusInternalServerError';
+            break;
+        case 502:
+            message = 'errors.statusBadGateway';
+            break;
+        case 504:
+            message = 'errors.statusGatewayTimeout';
+            break;
+    }
+
+    if (session.isLoggedIn() && response?.status === 401) {
+        session.destroy();
         const hash = window.location.hash;
         const url = hash.slice(1);
-        Router.push(`/login?redirect=${url}`);
+        Router.push({ path: url });
     } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }
 
+    Notify.create({
+        message: t(message),
+        type: 'negative',
+    });
+
     return Promise.reject(error);
 };
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
-axiosNoError.interceptors.request.use(onRequest);
-axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError, axiosNoError };
+export { onRequest, onResponseError };

src/boot/defaults/qInput.js

@@ -1,4 +0,0 @@
-import { QInput } from 'quasar';
-import setDefault from './setDefault';
-
-setDefault(QInput, 'dense', true);

src/boot/defaults/qSelect.js

@@ -1,4 +0,0 @@
-import { QSelect } from 'quasar';
-import setDefault from './setDefault';
-
-setDefault(QSelect, 'dense', true);

src/boot/i18n.js

@@ -1,6 +1,7 @@
 import { boot } from 'quasar/wrappers';
 import { createI18n } from 'vue-i18n';
 import messages from 'src/i18n';
+import { locales } from 'src/i18n/handle';
 
 const i18n = createI18n({
     locale: navigator.language || navigator.userLanguage,
@@ -12,8 +13,9 @@ const i18n = createI18n({
     legacy: false,
 });
 
-export default boot(({ app }) => {
+export default boot(async ({ app }) => {
     // Set i18n instance on app
+    await locales();
     app.use(i18n);
 });
 

src/boot/keyShortcut.js

@@ -1,34 +0,0 @@
-export default {
-    mounted: function (el, binding) {
-        const shortcut = binding.value ?? '+';
-
-        const { key, ctrl, alt, callback } =
-            typeof shortcut === 'string'
-                ? {
-                      key: shortcut,
-                      ctrl: true,
-                      alt: true,
-                      callback: () =>
-                          document
-                              .querySelector(`button[shortcut="${shortcut}"]`)
-                              ?.click(),
-                  }
-                : binding.value;
-
-        const handleKeydown = (event) => {
-            if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) {
-                callback();
-            }
-        };
-
-        // Attach the event listener to the window
-        window.addEventListener('keydown', handleKeydown);
-
-        el._handleKeydown = handleKeydown;
-    },
-    unmounted: function (el) {
-        if (el._handleKeydown) {
-            window.removeEventListener('keydown', el._handleKeydown);
-        }
-    },
-};

src/boot/qformMixin.js

@@ -1,29 +1,20 @@
 import { getCurrentInstance } from 'vue';
 
+const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
+const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
+
+
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
-        if (vm.type.name === 'QForm') {
+        if (vm.type.name === 'QForm')
             if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
-                // TODO: AUTOFOCUS IS NOT FOCUSING
+                // AUTOFOCUS
-                const that = this;
+                const elementsArray = Array.from(this.$el.elements);
-                this.$el.addEventListener('keyup', function (evt) {
+                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
-                    if (evt.key === 'Enter') {
+
-                        const input = evt.target;
+                if (firstInputElement) {
-                        if (input.type == 'textarea' && evt.shiftKey) {
+                    firstInputElement.focus();
-                            evt.preventDefault();
-                            let { selectionStart, selectionEnd } = input;
-                            input.value =
-                                input.value.substring(0, selectionStart) +
-                                '\n' +
-                                input.value.substring(selectionEnd);
-                            selectionStart = selectionEnd = selectionStart + 1;
-                            return;
-                        }
-                        evt.preventDefault();
-                        that.onSubmit();
-                    }
-                });
                 }
             }
     },

src/boot/quasar.defaults.js

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

src/boot/quasar.js

@@ -1,51 +1,6 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
-import keyShortcut from './keyShortcut';
-import useNotify from 'src/composables/useNotify.js';
-import { CanceledError } from 'axios';
-
-const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
-    app.directive('shortcut', keyShortcut);
-    app.config.errorHandler = (error) => {
-        let message;
-        const response = error.response;
-        const responseData = response?.data;
-        const responseError = responseData && response.data.error;
-        if (responseError) {
-            message = responseError.message;
-        }
-
-        switch (response?.status) {
-            case 422:
-                if (error.name == 'ValidationError')
-                    message +=
-                        ' "' +
-                        responseError.details.context +
-                        '.' +
-                        Object.keys(responseError.details.codes).join(',') +
-                        '"';
-                break;
-            case 500:
-                message = 'errors.statusInternalServerError';
-                break;
-            case 502:
-                message = 'errors.statusBadGateway';
-                break;
-            case 504:
-                message = 'errors.statusGatewayTimeout';
-                break;
-        }
-
-        console.error(error);
-        if (error instanceof CanceledError) {
-            const env = process.env.NODE_ENV;
-            if (env && env !== 'development') return;
-            message = 'Duplicate request';
-        }
-
-        notify(message ?? 'globals.error', 'negative', 'error');
-    };
 });

src/components/CreateBankEntityForm.vue

@@ -1,35 +1,38 @@
 <script setup>
-import { reactive, ref, onMounted, nextTick, computed } from 'vue';
+import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
-import { useState } from 'src/composables/useState';
+
+const props = defineProps({
+    showEntityField: {
+        type: Boolean,
+        default: true,
+    },
+});
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
-const state = useState();
-
-const customer = computed(() => state.get('customer'));
-
-const countriesFilter = {
-    fields: ['id', 'name', 'code'],
-};
-
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: customer.value?.countryFk,
+    countryFk: null,
+    id: null,
 });
 
+const countriesFilter = {
+    fields: ['id', 'country', 'code'],
+};
+
 const countriesOptions = ref([]);
 
-const onDataSaved = (...args) => {
+const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', ...args);
+    emit('onDataSaved', formData, requestResponse);
 };
 
 onMounted(async () => {
@@ -41,6 +44,7 @@ onMounted(async () => {
 <template>
     <FetchData
         url="Countries"
+        :filter="countriesFilter"
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
@@ -50,17 +54,19 @@ onMounted(async () => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
-        :filter="countriesFilter"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
                     <VnInput
                         :label="t('name')"
                         v-model="data.name"
                         :required="true"
                         :rules="validate('bankEntity.name')"
                     />
+                </div>
+                <div class="col">
                     <VnInput
                         ref="bicInputRef"
                         :label="t('swift')"
@@ -68,27 +74,22 @@ onMounted(async () => {
                         :required="true"
                         :rules="validate('bankEntity.bic')"
                     />
+                </div>
             </VnRow>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelect
+                    <VnSelectFilter
                         :label="t('country')"
                         v-model="data.countryFk"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="name"
+                        option-label="country"
                         hide-selected
                         :required="true"
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div
+                <div v-if="showEntityField" class="col">
-                    v-if="
-                        countriesOptions.find((c) => c.id === data.countryFk)?.code ==
-                        'ES'
-                    "
-                    class="col"
-                >
                     <VnInput
                         :label="t('id')"
                         v-model="data.id"

src/components/CreateDepartmentChild.vue

@@ -40,7 +40,6 @@ onMounted(() => {
 
 <template>
     <FormModel
-        model="createDepartmentChild"
         :form-initial-data="departmentChildData"
         :observe-form-changes="false"
         :default-actions="false"
@@ -53,7 +52,9 @@ onMounted(() => {
             </span>
             <h1 class="title">{{ t('New department') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
+                <div class="col">
                     <VnInput :label="t('Name')" v-model="data.name" />
+                </div>
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn

src/components/CreateManualInvoiceForm.vue

@@ -0,0 +1,174 @@
+<script setup>
+import { reactive, ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+import VnInputDate from './common/VnInputDate.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const router = useRouter();
+
+const manualInvoiceFormData = reactive({
+    maxShipped: Date.vnNew(),
+});
+
+const formModelPopupRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const taxAreasOptions = ref([]);
+const ticketsOptions = ref([]);
+const clientsOptions = ref([]);
+const isLoading = computed(() => formModelPopupRef.value?.isLoading);
+
+const onDataSaved = async (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+    if (requestResponse && requestResponse.id)
+        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="InvoiceOutSerials"
+        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
+        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="TaxAreas"
+        :filter="{ order: ['code'] }"
+        @on-fetch="(data) => (taxAreasOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Tickets"
+        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
+        @on-fetch="(data) => (ticketsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Clients"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        @on-fetch="(data) => (clientsOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        ref="formModelPopupRef"
+        :title="t('Create manual invoice')"
+        url-create="InvoiceOuts/createManualInvoice"
+        model="invoiceOut"
+        :form-initial-data="manualInvoiceFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <span v-if="isLoading" class="text-primary invoicing-text">
+                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
+                {{ t('Invoicing in progress...') }}
+            </span>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Ticket')"
+                        :options="ticketsOptions"
+                        hide-selected
+                        option-label="id"
+                        option-value="id"
+                        v-model="data.ticketFk"
+                        @update:model-value="data.clientFk = null"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.nickname
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <span class="row items-center" style="max-width: max-content">{{
+                    t('Or')
+                }}</span>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Client')"
+                        :options="clientsOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.clientFk"
+                        @update:model-value="data.ticketFk = null"
+                    />
+                </div>
+                <div class="col">
+                    <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Serial')"
+                        :options="invoiceOutSerialsOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="code"
+                        v-model="data.serial"
+                        :required="true"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Area')"
+                        :options="taxAreasOptions"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="data.taxArea"
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('Reference')"
+                    type="textarea"
+                    v-model="data.reference"
+                    fill-input
+                    autogrow
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<style lang="scss" scoped>
+.invoicing-text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: $primary;
+    font-size: 24px;
+    margin-bottom: 8px;
+}
+</style>
+
+<i18n>
+es:
+    Create manual invoice: Crear factura manual
+    Ticket: Ticket
+    Client: Cliente
+    Max date: Fecha límite
+    Serial: Serie
+    Area: Area
+    Reference: Referencia
+    Or: O
+    Invoicing in progress...: Facturación en progreso...
+</i18n>

src/components/CreateNewCityForm.vue

@@ -1,60 +1,63 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectProvince from 'components/VnSelectProvince.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import VnInput from 'components/common/VnInput.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
-const $props = defineProps({
+
-    countryFk: {
-        type: Number,
-        default: null,
-    },
-    provinceSelected: {
-        type: Number,
-        default: null,
-    },
-});
 const { t } = useI18n();
 
-const cityFormData = ref({
+const cityFormData = reactive({
     name: null,
     provinceFk: null,
 });
-onMounted(() => {
+
-    cityFormData.value.provinceFk = $props.provinceSelected;
+const provincesOptions = ref([]);
-});
+
-const onDataSaved = (...args) => {
+const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', ...args);
+    emit('onDataSaved', dataSaved);
 };
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
     <FormModelPopup
         :title="t('New city')"
         :subtitle="t('Please, ensure you put the correct data!')"
         :form-initial-data="cityFormData"
         url-create="towns"
         model="city"
-        @on-data-saved="onDataSaved"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
                     <VnInput
                         :label="t('Name')"
                         v-model="data.name"
                         :rules="validate('city.name')"
-                    required
                     />
-                <VnSelectProvince
+                </div>
-                    :province-selected="$props.provinceSelected"
+                <div class="col">
-                    :country-fk="$props.countryFk"
+                    <VnSelectFilter
+                        :label="t('Province')"
+                        :options="provincesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
                         v-model="data.provinceFk"
-                    required
+                        :rules="validate('city.provinceFk')"
                     />
+                </div>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CreateNewExpenseForm.vue

@@ -1,50 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-const { t } = useI18n();
-</script>
-<template>
-    <FormModelPopup
-        url-create="Expenses"
-        model="Expense"
-        :title="t('New expense')"
-        :form-initial-data="{ id: null, isWithheld: false, name: null }"
-        @on-data-saved="emit('onDataSaved', $event)"
-    >
-        <template #form-inputs="{ data, validate }">
-            <VnRow>
-                <VnInput
-                    :label="`${t('globals.code')}`"
-                    v-model="data.id"
-                    :required="true"
-                    :rules="validate('expense.code')"
-                />
-                <QCheckbox
-                    dense
-                    size="sm"
-                    :label="`${t('It\'s a withholding')}`"
-                    v-model="data.isWithheld"
-                    :rules="validate('expense.isWithheld')"
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="`${t('globals.description')}`"
-                    v-model="data.name"
-                    :required="true"
-                    :rules="validate('expense.description')"
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-es:
-    New expense: Nuevo gasto
-    It's a withholding: Es una retención
-</i18n>

src/components/CreateNewPostcodeForm.vue

@@ -1,13 +1,13 @@
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import VnSelectProvince from 'src/components/VnSelectProvince.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CreateNewCityForm from './CreateNewCityForm.vue';
+import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -22,185 +22,139 @@ const postcodeFormData = reactive({
     townFk: null,
 });
 
-const townsFetchDataRef = ref(false);
+const townsFetchDataRef = ref(null);
-const countriesRef = ref(false);
+const provincesFetchDataRef = ref(null);
-const townsRef = ref(false);
+const countriesOptions = ref([]);
-const provincesFetchDataRef = ref(false);
 const provincesOptions = ref([]);
-const town = ref({});
+const townsLocationOptions = ref([]);
-const townFilter = ref({});
-const countryFilter = ref({});
 
-function onDataSaved(formData) {
+const onDataSaved = (formData) => {
     const newPostcode = {
-        ...formData,
+        ...formData
     };
-    newPostcode.town = town.value.name;
+    const townObject = townsLocationOptions.value.find(
-    newPostcode.townFk = town.value.id;
+        ({id}) => id === formData.townFk
+    );
+    newPostcode.town = townObject?.name;
     const provinceObject = provincesOptions.value.find(
         ({id}) => id === formData.provinceFk
     );
     newPostcode.province = provinceObject?.name;
-    const countryObject = countriesRef.value.opts.find(
+    const countryObject = countriesOptions.value.find(
         ({id}) => id === formData.countryFk
     );
-    newPostcode.country = countryObject?.name;
+    newPostcode.country = countryObject?.country;
     emit('onDataSaved', newPostcode);  
-}
-
-async function onCityCreated(newTown, formData) {
-    await provincesFetchDataRef.value.fetch();
-    newTown.province = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk
-    );
-    formData.townFk = newTown;
-    setTown(newTown, formData);
-}
-
-function setTown(newTown, data) {
-    town.value = newTown;
-    data.provinceFk = newTown?.provinceFk ?? newTown;
-    data.countryFk = newTown?.province?.countryFk ?? newTown;
-}
-
-async function setCountry(countryFk, data) {
-    data.townFk = null;
-    data.provinceFk = null;
-    data.countryFk = countryFk;
-}
-
-async function handleProvinces(data) {
-    provincesOptions.value = data;
-}
-
-async function setProvince(id, data) {
-    const newProvince = provincesOptions.value.find((province) => province.id == id);
-    if (!newProvince) return;
-
-    data.countryFk = newProvince.countryFk;
-}
-
-async function onProvinceCreated(data) {
-    await provincesFetchDataRef.value.fetch({
-        where: { countryFk: postcodeFormData.countryFk },
-    });
-    postcodeFormData.provinceFk = data.id;
-}
-
-const whereTowns = computed(() => {
-    return {
-        provinceFk: {
-            inq: provincesOptions.value.map(({ id }) => id),
-        },
 };
-});
+
+const onCityCreated = async ({ name, provinceFk }, formData) => {
+    await townsFetchDataRef.value.fetch();
+    formData.townFk = townsLocationOptions.value.find((town) => town.name === name).id;
+    formData.provinceFk = provinceFk;
+    formData.countryFk = provincesOptions.value.find(
+        (province) => province.id === provinceFk
+    ).countryFk;
+};
+
+const onProvinceCreated = async ({ name }, formData) => {
+    await provincesFetchDataRef.value.fetch();
+    formData.provinceFk = provincesOptions.value.find(
+        (province) => province.name === name
+    ).id;
+};
 </script>
 
 <template>
     <FetchData
-        ref="provincesFetchDataRef"
+        ref="townsFetchDataRef"
-        @on-fetch="handleProvinces"
+        @on-fetch="(data) => (townsLocationOptions = data)"
-        :sort-by="['name ASC']"
-        :limit="30"
         auto-load
-        url="Provinces/location"
+        url="Towns/location"
+    />
+    <FetchData
+        ref="provincesFetchDataRef"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+        url="Countries"
     />
-
     <FormModelPopup
         url-create="postcodes"
         model="postcode"
         :title="t('New postcode')"
         :subtitle="t('Please, ensure you put the correct data!')"
         :form-initial-data="postcodeFormData"
-        :mapper="(data) => (data.townFk = data.townFk.id) && data"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
                     <VnInput
                         :label="t('Postcode')"
                         v-model="data.code"
                         :rules="validate('postcode.code')"
-                    clearable
-                    required
                     />
+                </div>
+                <div class="col">
                     <VnSelectDialog
-                    ref="townsRef"
-                    :sort-by="['name ASC']"
-                    :limit="30"
-                    auto-load
-                    url="Towns/location"
-                    :where="whereTowns"
                         :label="t('City')"
-                    @update:model-value="(value) => setTown(value, data)"
+                        :options="townsLocationOptions"
-                    :tooltip="t('Create city')"
                         v-model="data.townFk"
-                    option-label="name"
-                    option-value="id"
-                    :rules="validate('postcode.city')"
-                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
-                    :emit-value="false"
-                    :clearable="true"
-                    required
-                >
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ opt.name }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ opt.province.name }},
-                                    {{ opt.province.country.name }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                    <template #form>
-                        <CreateNewCityForm
-                            :country-fk="data.countryFk"
-                            :province-selected="data.provinceFk"
-                            @on-data-saved="
-                                (_, requestResponse) =>
-                                    onCityCreated(requestResponse, data)
-                            "
-                        />
-                    </template>
-                </VnSelectDialog>
-            </VnRow>
-            <VnRow>
-                <VnSelectProvince
-                    :country-fk="data.countryFk"
-                    :province-selected="data.provinceFk"
-                    @update:model-value="(value) => setProvince(value, data)"
-                    v-model="data.provinceFk"
-                    @on-province-fetched="handleProvinces"
-                    @on-province-created="onProvinceCreated"
-                    required
-                />
-                <VnSelect
-                    ref="countriesRef"
-                    :limit="30"
-                    :filter="countryFilter"
-                    :sort-by="['name ASC']"
-                    auto-load
-                    url="Countries"
-                    required
-                    :label="t('Country')"
                         hide-selected
                         option-label="name"
                         option-value="id"
+                        :rules="validate('postcode.city')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                    >
+                        <template #form>
+                            <CreateNewCityForm
+                                @on-data-saved="onCityCreated($event, data)"
+                            />
+                        </template>
+                    </VnSelectDialog>
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl">
+                <div class="col">
+                    <VnSelectDialog
+                        :label="t('Province')"
+                        :options="provincesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.provinceFk"
+                        :rules="validate('postcode.provinceFk')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                    >
+                        <template #form>
+                            <CreateNewProvinceForm
+                                @on-data-saved="onProvinceCreated($event, data)"
+                            />
+                        </template>
+                    </VnSelectDialog>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Country')"
+                        :options="countriesOptions"
+                        hide-selected
+                        option-label="country"
+                        option-value="id"
                         v-model="data.countryFk"
                         :rules="validate('postcode.countryFk')"
-                    @update:model-value="(value) => setCountry(value, data)"
                     />
-            </VnRow>
+                </div> </VnRow
-        </template>
+        ></template>
     </FormModelPopup>
 </template>
 
 <i18n>
 es:
     New postcode: Nuevo código postal
-    Create city: Crear población
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
     City: Población
     Province: Provincia

src/components/CreateNewProvinceForm.vue

@@ -1,9 +1,10 @@
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -15,69 +16,48 @@ const provinceFormData = reactive({
     name: null,
     autonomyFk: null,
 });
-const $props = defineProps({
-    countryFk: {
-        type: Number,
-        default: null,
-    },
-});
-const autonomiesRef = ref([]);
 
-const onDataSaved = (dataSaved, requestResponse) => {
+const autonomiesOptions = ref([]);
-    requestResponse.autonomy = autonomiesRef.value.opts.find(
+
-        (autonomy) => autonomy.id == requestResponse.autonomyFk
+const onDataSaved = (dataSaved) => {
-    );
+    emit('onDataSaved', dataSaved);
-    emit('onDataSaved', dataSaved, requestResponse);
 };
-const where = computed(() => {
-    if (!$props.countryFk) {
-        return {};
-    }
-    return { countryFk: $props.countryFk };
-});
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (autonomiesOptions = data)"
+        auto-load
+        url="Autonomies"
+    />
     <FormModelPopup
         :title="t('New province')"
         :subtitle="t('Please, ensure you put the correct data!')"
         url-create="provinces"
         model="province"
         :form-initial-data="provinceFormData"
-        @on-data-saved="onDataSaved"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
                     <VnInput
                         :label="t('Name')"
                         v-model="data.name"
                         :rules="validate('province.name')"
-                    required
                     />
-                <VnSelect
+                </div>
-                    required
+                <div class="col">
-                    ref="autonomiesRef"
+                    <VnSelectFilter
-                    auto-load
-                    :where="where"
-                    url="Autonomies/location"
-                    :sort-by="['name ASC']"
-                    :limit="30"
                         :label="t('Autonomy')"
+                        :options="autonomiesOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
                         v-model="data.autonomyFk"
                         :rules="validate('province.autonomyFk')"
-                >
+                    />
-                    <template #option="{ itemProps, opt }">
+                </div>
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ opt.name }}</QItemLabel>
-                                <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CreateThermographForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
         url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
     />
     <FetchData
         @on-fetch="(data) => (temperaturesOptions = data)"
@@ -50,17 +50,21 @@ const onDataSaved = (dataSaved) => {
         model="thermograph"
         :title="t('New thermograph')"
         :form-initial-data="thermographFormData"
-        @on-data-saved="(_, response) => onDataSaved(response)"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
                     <VnInput
                         :label="t('Identifier')"
                         v-model="data.thermographId"
                         :required="true"
                         :rules="validate('thermograph.id')"
                     />
-                <VnSelect
+                </div>
+
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Model')"
                         :options="thermographsModels"
                         hide-selected
@@ -70,9 +74,11 @@ const onDataSaved = (dataSaved) => {
                         :required="true"
                         :rules="validate('thermograph.model')"
                     />
+                </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
-                <VnSelect
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Warehouse')"
                         :options="warehousesOptions"
                         hide-selected
@@ -81,7 +87,9 @@ const onDataSaved = (dataSaved) => {
                         v-model="data.warehouseId"
                         :required="true"
                     />
-                <VnSelect
+                </div>
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Temperature')"
                         :options="temperaturesOptions"
                         hide-selected
@@ -90,6 +98,7 @@ const onDataSaved = (dataSaved) => {
                         v-model="data.temperatureFk"
                         :required="true"
                     />
+                </div>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CrudModel.vue

@@ -1,7 +1,6 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
-import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -10,9 +9,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
-import getDifferences from 'src/filters/getDifferences';
 
-const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -27,10 +24,6 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    limit: {
-        type: Number,
-        default: 20,
-    },
     saveUrl: {
         type: String,
         default: null,
@@ -63,24 +56,14 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
-    goTo: {
-        type: String,
-        default: '',
-        description: 'It is used for redirect on click "save and continue"',
-    },
-    hasSubToolbar: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref([]);
+const formData = ref();
 const saveButtonRef = ref(null);
-const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@@ -93,49 +76,27 @@ defineExpose({
     reset,
     hasChanges,
     saveChanges,
-    getChanges,
-    formData,
-    originalData,
-    vnPaginateRef,
-});
-
-onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('globals.unsavedPopup.title'),
-                message: t('globals.unsavedPopup.subtitle'),
-                promise: () => next(),
-            },
-        });
-    else next();
 });
 
 async function fetch(data) {
-    resetData(data);
-    emit('onFetch', data);
-    return data;
-}
-
-function resetData(data) {
-    if (!data) return;
     if (data && Array.isArray(data)) {
         let $index = 0;
         data.map((d) => (d.$index = $index++));
     }
-    originalData.value = JSON.parse(JSON.stringify(data));
-    formData.value = JSON.parse(JSON.stringify(data));
 
-    if (watchChanges.value) watchChanges.value(); //destoy watcher
+    originalData.value = data && JSON.parse(JSON.stringify(data));
-    watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
+    formData.value = data && JSON.parse(JSON.stringify(data));
+    watch(formData, () => (hasChanges.value = true), { deep: true });
+
+    emit('onFetch', data);
+    return data;
 }
 
 async function reset() {
     await fetch(originalData.value);
     hasChanges.value = false;
 }
-
+// eslint-disable-next-line vue/no-dupe-keys
 function filter(value, update, filterOptions) {
     update(
         () => {
@@ -158,31 +119,22 @@ async function onSubmit() {
         });
     }
     isLoading.value = true;
-    await saveChanges($props.saveFn ? formData.value : null);
+    await saveChanges();
-}
-
-async function onSubmitAndGo() {
-    await onSubmit();
-    push({ path: $props.goTo });
 }
 
 async function saveChanges(data) {
-    if ($props.saveFn) {
+    if ($props.saveFn) return $props.saveFn(data, getChanges);
-        $props.saveFn(data, getChanges);
-        isLoading.value = false;
-        hasChanges.value = false;
-        return;
-    }
     const changes = data || getChanges();
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
-    } finally {
+    } catch (e) {
-        isLoading.value = false;
+        return (isLoading.value = false);
     }
     originalData.value = JSON.parse(JSON.stringify(formData.value));
     if (changes.creates?.length) await vnPaginateRef.value.fetch();
 
     hasChanges.value = false;
+    isLoading.value = false;
     emit('saveChanges', data);
     quasar.notify({
         type: 'positive',
@@ -190,11 +142,11 @@ async function saveChanges(data) {
     });
 }
 
-async function insert(pushData = $props.dataRequired) {
+async function insert() {
     const $index = formData.value.length
         ? formData.value[formData.value.length - 1].$index + 1
         : 0;
-    formData.value.push(Object.assign({ $index }, pushData));
+    formData.value.push(Object.assign({ $index }, $props.dataRequired));
     hasChanges.value = true;
 }
 
@@ -235,8 +187,6 @@ async function remove(data) {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
-    } else {
-        reset();
     }
     emit('update:selected', []);
 }
@@ -268,6 +218,28 @@ function getChanges() {
     return changes;
 }
 
+function getDifferences(obj1, obj2) {
+    let diff = {};
+    delete obj1.$index;
+    delete obj2.$index;
+
+    for (let key in obj1) {
+        if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
+            diff[key] = obj2[key];
+        }
+    }
+    for (let key in obj2) {
+        if (
+            obj1[key] === undefined ||
+            JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
+        ) {
+            diff[key] = obj2[key];
+        }
+    }
+
+    return diff;
+}
+
 function isEmpty(obj) {
     if (obj == null) return true;
     if (obj === undefined) return true;
@@ -276,9 +248,8 @@ function isEmpty(obj) {
     if (obj.length > 0) return false;
 }
 
-async function reload(params) {
+async function reload() {
-    const data = await vnPaginateRef.value.fetch(params);
+    vnPaginateRef.value.fetch();
-    fetch(data);
 }
 
 watch(formUrl, async () => {
@@ -289,12 +260,10 @@ watch(formUrl, async () => {
 <template>
     <VnPaginate
         :url="url"
-        :limit="limit"
+        v-bind="$attrs"
         @on-fetch="fetch"
-        @on-change="fetch"
         :skeleton="false"
         ref="vnPaginateRef"
-        v-bind="$attrs"
     >
         <template #body v-if="formData">
             <slot
@@ -305,11 +274,8 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable
+    <SkeletonTable v-if="!formData" />
-        v-if="!formData && $attrs.autoLoad"
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
-        :columns="$attrs.columns?.length"
-    />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn
@@ -332,40 +298,7 @@ watch(formUrl, async () => {
                 :title="t('globals.reset')"
                 v-if="$props.defaultReset"
             />
-            <QBtnDropdown
-                v-if="$props.goTo && $props.defaultSave"
-                @click="onSubmitAndGo"
-                :label="tMobile('globals.saveAndContinue')"
-                :title="t('globals.saveAndContinue')"
-                :disable="!hasChanges"
-                color="primary"
-                icon="save"
-                split
-            >
-                <QList>
-                    <QItem
-                        color="primary"
-                        clickable
-                        v-close-popup
-                        @click="onSubmit"
-                        :title="t('globals.save')"
-                    >
-                        <QItemSection>
-                            <QItemLabel>
-                                <QIcon
-                                    name="save"
-                                    color="white"
-                                    class="q-mr-sm"
-                                    size="sm"
-                                />
-                                {{ t('globals.save').toUpperCase() }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </QList>
-            </QBtnDropdown>
             <QBtn
-                v-else-if="!$props.goTo && $props.defaultSave"
                 :label="tMobile('globals.save')"
                 ref="saveButtonRef"
                 color="primary"
@@ -373,7 +306,7 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                data-cy="crudModelDefaultSaveBtn"
+                v-if="$props.defaultSave"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/EditPictureForm.vue

@@ -2,7 +2,7 @@
 import { reactive, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -155,7 +155,8 @@ const rotateRight = () => {
     editor.value.rotate(-90);
 };
 
-const onSubmit = () => {
+const onUploadAccept = () => {
+    try {
         if (!newPhoto.files && !newPhoto.url) {
             notify(t('Select an image'), 'negative');
             return;
@@ -172,6 +173,9 @@ const onSubmit = () => {
                 newPhoto.blob = file;
             })
             .then(() => makeRequest());
+    } catch (err) {
+        console.error('Error uploading image');
+    }
 };
 
 const makeRequest = async () => {
@@ -202,7 +206,7 @@ const makeRequest = async () => {
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <QForm @submit="onSubmit()" class="all-pointer-events">
+    <QForm @submit="onUploadAccept()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
@@ -241,14 +245,17 @@ const makeRequest = async () => {
                 </div>
 
                 <div class="column">
-                    <VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
                             <QOptionGroup
                                 :options="uploadMethodsOptions"
                                 type="radio"
                                 v-model="uploadMethodSelected"
                             />
+                        </div>
                     </VnRow>
-                    <VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
                             <QFile
                                 v-if="uploadMethodSelected === 'computer'"
                                 ref="inputFileRef"
@@ -282,15 +289,18 @@ const makeRequest = async () => {
                                 @update:model-value="updatePhotoPreview($event)"
                                 placeholder="https://"
                             />
+                        </div>
                     </VnRow>
-                    <VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
-                        <VnSelect
+                        <div class="col">
+                            <VnSelectFilter
                                 :label="t('Orientation')"
                                 :options="viewportTypes"
                                 hide-selected
                                 option-label="description"
                                 v-model="viewportSelection"
                             />
+                        </div>
                     </VnRow>
                     <div class="q-mt-lg row justify-end">
                         <QBtn

src/components/EditTableCellValueForm.vue

@@ -1,12 +1,9 @@
 <script setup>
-import { ref, markRaw } from 'vue';
+import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import { QCheckbox } from 'quasar';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -31,16 +28,11 @@ const $props = defineProps({
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const inputs = {
+const formData = reactive({
-    input: markRaw(VnInput),
+    field: null,
-    number: markRaw(VnInput),
+    newValue: null,
-    date: markRaw(VnInputDate),
+});
-    checkbox: markRaw(QCheckbox),
-    select: markRaw(VnSelect),
-};
 
-const newValue = ref(null);
-const selectedField = ref(null);
 const closeButton = ref(null);
 const isLoading = ref(false);
 
@@ -50,18 +42,22 @@ const onDataSaved = () => {
     closeForm();
 };
 
-const onSubmit = async () => {
+const submitData = async () => {
+    try {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
         const payload = {
-        field: selectedField.value.field,
+            field: formData.field,
-        newValue: newValue.value,
+            newValue: formData.newValue,
             lines: rowsToEdit,
         };
 
         await axios.post($props.editUrl, payload);
         onDataSaved();
         isLoading.value = false;
+    } catch (err) {
+        console.error('Error submitting table cell edit');
+    }
 };
 
 const closeForm = () => {
@@ -70,7 +66,7 @@ const closeForm = () => {
 </script>
 
 <template>
-    <QForm @submit="onSubmit()" class="all-pointer-events">
+    <QForm @submit="submitData()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
@@ -78,21 +74,20 @@ const closeForm = () => {
             <span class="title">{{ t('Edit') }}</span>
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Field to edit')"
                         :options="fieldsOptions"
                         hide-selected
                         option-label="label"
-                    v-model="selectedField"
+                        option-value="field"
-                />
+                        v-model="formData.field"
-                <component
-                    :is="inputs[selectedField?.component || 'input']"
-                    v-bind="selectedField?.attrs || {}"
-                    v-model="newValue"
-                    :label="t('Value')"
-                    style="width: 200px"
                     />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Value')" v-model="formData.newValue" />
+                </div>
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn

src/components/FetchData.vue

@@ -24,7 +24,7 @@ const $props = defineProps({
         default: '',
     },
     limit: {
-        type: [String, Number],
+        type: String,
         default: '',
     },
     params: {
@@ -44,7 +44,7 @@ onMounted(async () => {
 
 async function fetch(fetchFilter = {}) {
     try {
-        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
+        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
         if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;

src/components/FilterItemForm.vue

@@ -1,26 +1,21 @@
 <script setup>
 import { ref, reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'components/common/VnSelect.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 
-const props = defineProps({
-    url: {
-        type: String,
-        required: true,
-    },
-});
-
 const emit = defineEmits(['itemSelected']);
 
 const { t } = useI18n();
+const route = useRoute();
 
 const itemFilter = {
     include: [
@@ -50,25 +45,25 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('globals.id'),
+        label: t('entry.buys.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('globals.name'),
+        label: t('entry.buys.name'),
         name: 'name',
         field: 'name',
         align: 'left',
     },
     {
-        label: t('globals.size'),
+        label: t('entry.buys.size'),
         name: 'size',
         field: 'size',
         align: 'left',
     },
     {
-        label: t('globals.producer'),
+        label: t('entry.buys.producer'),
         name: 'producerName',
         field: 'producer',
         align: 'left',
@@ -78,12 +73,13 @@ const tableColumns = computed(() => [
     {
         label: t('entry.buys.color'),
         name: 'ink',
-        field: (row) => row?.ink?.name,
+        field: 'inkName',
         align: 'left',
     },
 ]);
 
-const onSubmit = async () => {
+const fetchResults = async () => {
+    try {
         let filter = itemFilter;
         const params = itemFilterParams;
         const where = {};
@@ -104,10 +100,13 @@ const onSubmit = async () => {
         }
         filter.where = where;
 
-    const { data } = await axios.get(props.url, {
+        const { data } = await axios.get(`Entries/${route.params.id}/lastItemBuys`, {
             params: { filter: JSON.stringify(filter) },
         });
         tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching entries items');
+    }
 };
 
 const closeForm = () => {
@@ -141,32 +140,47 @@ const selectItem = ({ id }) => {
         @on-fetch="(data) => (InksOptions = data)"
         auto-load
     />
-    <QForm @submit="onSubmit()" class="all-pointer-events">
+    <QForm @submit="fetchResults()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput :label="t('globals.name')" v-model="itemFilterParams.name" />
+                <div class="col">
-                <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
+                    <VnInput
-                <VnSelect
+                        :label="t('entry.buys.name')"
-                    :label="t('globals.producer')"
+                        v-model="itemFilterParams.name"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        :label="t('entry.buys.size')"
+                        v-model="itemFilterParams.size"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.buys.producer')"
                         :options="producersOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
                         v-model="itemFilterParams.producerFk"
                     />
-                <VnSelect
+                </div>
-                    :label="t('globals.type')"
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.buys.type')"
                         :options="ItemTypesOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
                         v-model="itemFilterParams.typeFk"
                     />
-                <VnSelect
+                </div>
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('entry.buys.color')"
                         :options="InksOptions"
                         hide-selected
@@ -174,6 +188,7 @@ const selectItem = ({ id }) => {
                         option-value="id"
                         v-model="itemFilterParams.inkFk"
                     />
+                </div>
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn

src/components/FilterTravelForm.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelect from 'components/common/VnSelect.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -48,13 +48,13 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('globals.id'),
+        label: t('entry.basicData.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('globals.warehouseOut'),
+        label: t('entry.basicData.warehouseOut'),
         name: 'warehouseOutFk',
         field: 'warehouseOutFk',
         align: 'left',
@@ -62,7 +62,7 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('globals.warehouseIn'),
+        label: t('entry.basicData.warehouseIn'),
         name: 'warehouseInFk',
         field: 'warehouseInFk',
         align: 'left',
@@ -70,14 +70,14 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('globals.shipped'),
+        label: t('entry.basicData.shipped'),
         name: 'shipped',
         field: 'shipped',
         align: 'left',
         format: (val) => toDate(val),
     },
     {
-        label: t('globals.landed'),
+        label: t('entry.basicData.landed'),
         name: 'landed',
         field: 'landed',
         align: 'left',
@@ -85,7 +85,8 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const onSubmit = async () => {
+const fetchResults = async () => {
+    try {
         let filter = travelFilter;
         const params = travelFilterParams;
         const where = {};
@@ -108,6 +109,9 @@ const onSubmit = async () => {
             params: { filter: JSON.stringify(filter) },
         });
         tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching travels');
+    }
 };
 
 const closeForm = () => {
@@ -134,45 +138,55 @@ const selectTravel = ({ id }) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
-    <QForm @submit="onSubmit()" class="all-pointer-events">
+    <QForm @submit="fetchResults()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('Filter travels') }}</h1>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
+                <div class="col">
-                    :label="t('globals.agency')"
+                    <VnSelectFilter
+                        :label="t('entry.basicData.agency')"
                         :options="agenciesOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
                         v-model="travelFilterParams.agencyModeFk"
                     />
-                <VnSelect
+                </div>
-                    :label="t('globals.warehouseOut')"
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.basicData.warehouseOut')"
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
                         v-model="travelFilterParams.warehouseOutFk"
                     />
-                <VnSelect
+                </div>
-                    :label="t('globals.warehouseIn')"
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.basicData.warehouseIn')"
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
                         v-model="travelFilterParams.warehouseInFk"
                     />
+                </div>
+                <div class="col">
                     <VnInputDate
-                    :label="t('globals.shipped')"
+                        :label="t('entry.basicData.shipped')"
                         v-model="travelFilterParams.shipped"
                     />
+                </div>
+                <div class="col">
                     <VnInputDate
-                    :label="t('globals.landed')"
+                        :label="t('entry.basicData.landed')"
                         v-model="travelFilterParams.landed"
                     />
+                </div>
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn

src/components/FormModel.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
-import { onBeforeRouteLeave, useRouter } from 'vue-router';
+import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -11,18 +11,14 @@ import useNotify from 'src/composables/useNotify.js';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
-import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute } from 'vue-router';
 
-const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
-const route = useRoute();
+
-const myForm = ref(null);
 const $props = defineProps({
     url: {
         type: String,
@@ -30,7 +26,7 @@ const $props = defineProps({
     },
     model: {
         type: String,
-        default: null,
+        default: '',
     },
     filter: {
         type: Object,
@@ -78,104 +74,39 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
-    goTo: {
-        type: String,
-        default: '',
-        description: 'It is used for redirect on click "save and continue"',
-    },
-    reload: {
-        type: Boolean,
-        default: false,
-    },
-    defaultTrim: {
-        type: Boolean,
-        default: true,
-    },
-    maxWidth: {
-        type: [String, Boolean],
-        default: '800px',
-    },
 });
+
 const emit = defineEmits(['onFetch', 'onDataSaved']);
-const modelValue = computed(
+
-    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
-).value;
 const componentIsRendered = ref(false);
-const arrayData = useArrayData(modelValue);
-const isLoading = ref(false);
-// Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
-const isResetting = ref(false);
-const hasChanges = ref(!$props.observeFormChanges);
-const originalData = ref({});
-const formData = computed(() => state.get(modelValue));
-const defaultButtons = computed(() => ({
-    save: {
-        dataCy: 'saveDefaultBtn',
-        color: 'primary',
-        icon: 'save',
-        label: 'globals.save',
-        click: () => myForm.value.submit(),
-        type: 'submit',
-    },
-    reset: {
-        dataCy: 'resetDefaultBtn',
-        color: 'primary',
-        icon: 'restart_alt',
-        label: 'globals.reset',
-        click: () => reset(),
-    },
-    ...$props.defaultButtons,
-}));
 
 onMounted(async () => {
-    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
+    nextTick(() => {
-
+        componentIsRendered.value = true;
-    nextTick(() => (componentIsRendered.value = true));
+    });
 
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set(modelValue, $props.formInitialData);
+    state.set($props.model, $props.formInitialData);
-
+    if ($props.autoLoad && !$props.formInitialData) {
-    if (!$props.formInitialData) {
+        await fetch();
-        if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
     }
+
+    // Si así se desea disparamos el watcher del form después de 100ms, asi darle tiempo de que se haya cargado la data inicial
+    // para evitar que detecte cambios cuando es data inicial default
     if ($props.observeFormChanges) {
-        watch(
+        setTimeout(() => {
-            () => formData.value,
+            startFormWatcher();
-            (newVal, oldVal) => {
+        }, 100);
-                if (!oldVal) return;
-                hasChanges.value =
-                    !isResetting.value &&
-                    JSON.stringify(newVal) !== JSON.stringify(originalData.value);
-                isResetting.value = false;
-            },
-            { deep: true }
-        );
     }
 });
 
-if (!$props.url)
-    watch(
-        () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val)
-    );
-
-watch(
-    () => [$props.url, $props.filter],
-    async () => {
-        originalData.value = null;
-        reset();
-        await fetch();
-    }
-);
-
 onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value && $props.observeFormChanges)
+    if (hasChanges.value)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('globals.unsavedPopup.title'),
+                title: t('Unsaved changes will be lost'),
-                message: t('globals.unsavedPopup.subtitle'),
+                message: t('Are you sure exit without saving?'),
                 promise: () => next(),
             },
         });
@@ -184,59 +115,88 @@ onBeforeRouteLeave((to, from, next) => {
 
 onUnmounted(() => {
     // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
-    if (hasChanges.value) return state.set(modelValue, originalData.value);
+    if (hasChanges.value) {
-    if ($props.clearStoreOnUnmount) state.unset(modelValue);
+        state.set($props.model, originalData.value);
+        return;
+    }
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
 });
 
+const isLoading = ref(false);
+// Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
+const isResetting = ref(false);
+const hasChanges = ref(!$props.observeFormChanges);
+const originalData = ref({ ...$props.formInitialData });
+const formData = computed(() => state.get($props.model));
+const formUrl = computed(() => $props.url);
+const defaultButtons = computed(() => ({
+    save: {
+        color: 'primary',
+        icon: 'save',
+        label: 'globals.save',
+    },
+    reset: {
+        color: 'primary',
+        icon: 'restart_alt',
+        label: 'globals.reset',
+    },
+    ...$props.defaultButtons,
+}));
+const startFormWatcher = () => {
+    watch(
+        () => formData.value,
+        (val) => {
+            hasChanges.value = !isResetting.value && val;
+            isResetting.value = false;
+        },
+        { deep: true }
+    );
+};
+
 async function fetch() {
-    try {
+    const { data } = await axios.get($props.url, {
-        let { data } = await axios.get($props.url, {
         params: { filter: JSON.stringify($props.filter) },
     });
-        if (Array.isArray(data)) data = data[0] ?? {};
 
-        updateAndEmit('onFetch', data);
+    state.set($props.model, data);
-    } catch (e) {
+    originalData.value = data && JSON.parse(JSON.stringify(data));
-        state.set(modelValue, {});
+
-        originalData.value = {};
+    emit('onFetch', state.get($props.model));
-    }
 }
 
 async function save() {
-    if ($props.observeFormChanges && !hasChanges.value)
+    if ($props.observeFormChanges && !hasChanges.value) {
-        return notify('globals.noChanges', 'negative');
+        notify('globals.noChanges', 'negative');
-
+        return;
+    }
     isLoading.value = true;
+
     try {
-        formData.value = trimData(formData.value);
+        const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
-        const body = $props.mapper
-            ? $props.mapper(formData.value, originalData.value)
-            : formData.value;
-        const method = $props.urlCreate ? 'post' : 'patch';
-        const url =
-            $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
         let response;
-
         if ($props.saveFn) response = await $props.saveFn(body);
-        else response = await axios[method](url, body);
+        else
-
+            response = await axios[$props.urlCreate ? 'post' : 'patch'](
+                $props.urlCreate || $props.urlUpdate || $props.url,
+                body
+            );
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
-        updateAndEmit('onDataSaved', formData.value, response?.data);
+        emit('onDataSaved', formData.value, response?.data);
-        if ($props.reload) await arrayData.fetch({});
+        originalData.value = JSON.parse(JSON.stringify(formData.value));
         hasChanges.value = false;
-    } finally {
+    } catch (err) {
+        console.error(err);
+        notify('errors.writeRequest', 'negative');
+    }
     isLoading.value = false;
 }
-}
-
-async function saveAndGo() {
-    await save();
-    push({ path: $props.goTo });
-}
 
 function reset() {
-    updateAndEmit('onFetch', originalData.value);
+    state.set($props.model, originalData.value);
+    originalData.value = JSON.parse(JSON.stringify(originalData.value));
+
+    emit('onFetch', state.get($props.model));
     if ($props.observeFormChanges) {
         hasChanges.value = false;
         isResetting.value = true;
@@ -258,62 +218,42 @@ function filter(value, update, filterOptions) {
     );
 }
 
-function updateAndEmit(evt, val, res) {
+watch(formUrl, async () => {
-    state.set(modelValue, val);
+    originalData.value = null;
-    originalData.value = val && JSON.parse(JSON.stringify(val));
+    reset();
-    if (!$props.url) arrayData.store.data = val;
+    fetch();
-
+});
-    emit(evt, state.get(modelValue), res);
-}
-
-function trimData(data) {
-    if (!$props.defaultTrim) return data;
-    for (const key in data) {
-        if (typeof data[key] == 'string') data[key] = data[key].trim();
-    }
-    return data;
-}
 
 defineExpose({
     save,
     isLoading,
     hasChanges,
-    reset,
-    fetch,
-    formData,
 });
 </script>
 <template>
     <div class="column items-center full-width">
         <QForm
-            ref="myForm"
             v-if="formData"
             @submit="save"
             @reset="reset"
             class="q-pa-md"
-            :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
         >
             <QCard>
                 <slot
-                    v-if="formData"
                     name="form"
                     :data="formData"
                     :validate="validate"
                     :filter="filter"
                 />
-                <SkeletonForm v-else />
             </QCard>
         </QForm>
     </div>
     <Teleport
         to="#st-actions"
-        v-if="
+        v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
-            $props.defaultActions &&
-            stateStore?.isSubToolbarShown() &&
-            componentIsRendered
-        "
     >
+        <div v-if="$props.defaultActions">
             <QBtnGroup push class="q-gutter-x-sm">
                 <slot name="moreActions" />
                 <QBtn
@@ -321,54 +261,22 @@ defineExpose({
                     :color="defaultButtons.reset.color"
                     :icon="defaultButtons.reset.icon"
                     flat
-                @click="defaultButtons.reset.click"
+                    @click="reset"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.reset.label)"
                 />
-            <QBtnDropdown
-                data-cy="saveAndContinueDefaultBtn"
-                v-if="$props.goTo"
-                @click="saveAndGo"
-                :label="tMobile('globals.saveAndContinue')"
-                :title="t('globals.saveAndContinue')"
-                :disable="!hasChanges"
-                color="primary"
-                icon="save"
-                split
-            >
-                <QList>
-                    <QItem
-                        clickable
-                        v-close-popup
-                        @click="save"
-                        :title="t('globals.save')"
-                    >
-                        <QItemSection>
-                            <QItemLabel>
-                                <QIcon
-                                    name="save"
-                                    color="white"
-                                    class="q-mr-sm"
-                                    size="sm"
-                                />
-                                {{ t('globals.save').toUpperCase() }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </QList>
-            </QBtnDropdown>
                 <QBtn
-                v-else
+                    :label="tMobile(defaultButtons.save.label)"
-                :label="tMobile('globals.save')"
+                    :color="defaultButtons.save.color"
-                color="primary"
+                    :icon="defaultButtons.save.icon"
-                icon="save"
+                    @click="save"
-                @click="defaultButtons.save.click"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.save.label)"
                 />
             </QBtnGroup>
+        </div>
     </Teleport>
-
+    <SkeletonForm v-if="!formData" />
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"
@@ -381,6 +289,7 @@ defineExpose({
     color: black;
 }
 #formModel {
+    max-width: 800px;
     width: 100%;
 }
 
@@ -388,3 +297,8 @@ defineExpose({
     padding: 32px;
 }
 </style>
+<i18n>
+es:
+    Unsaved changes will be lost: Los cambios que no haya guardado se perderán
+    Are you sure exit without saving?: ¿Seguro que quiere salir sin guardar?
+</i18n>

src/components/FormModelPopup.vue

@@ -4,9 +4,9 @@ import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
 
-const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
+const emit = defineEmits(['onDataSaved']);
 
-defineProps({
+const $props = defineProps({
     title: {
         type: String,
         default: '',
@@ -15,6 +15,26 @@ defineProps({
         type: String,
         default: '',
     },
+    url: {
+        type: String,
+        default: '',
+    },
+    model: {
+        type: String,
+        default: '',
+    },
+    filter: {
+        type: Object,
+        default: null,
+    },
+    urlCreate: {
+        type: String,
+        default: null,
+    },
+    formInitialData: {
+        type: Object,
+        default: () => {},
+    },
 });
 
 const { t } = useI18n();
@@ -23,24 +43,29 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    if (closeButton.value) closeButton.value.click();
     emit('onDataSaved', formData, requestResponse);
+    closeForm();
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
 
+const closeForm = async () => {
+    if (closeButton.value) closeButton.value.click();
+};
+
 defineExpose({
     isLoading,
-    onDataSaved,
 });
 </script>
 
 <template>
     <FormModel
         ref="formModelRef"
+        :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :default-actions="false"
-        v-bind="$attrs"
+        :url-create="urlCreate"
+        :model="model"
         @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
@@ -51,27 +76,24 @@ defineExpose({
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" :data="data" :validate="validate" />
             <div class="q-mt-lg row justify-end">
+                <QBtn
+                    :label="t('globals.save')"
+                    :title="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
                 <QBtn
                     :label="t('globals.cancel')"
                     :title="t('globals.cancel')"
                     type="reset"
                     color="primary"
                     flat
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    @click="emit('onDataCanceled')"
-                    v-close-popup
-                    data-cy="FormModelPopup_cancel"
-                />
-                <QBtn
-                    :label="t('globals.save')"
-                    :title="t('globals.save')"
-                    type="submit"
-                    color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
-                    data-cy="FormModelPopup_save"
+                    v-close-popup
                 />
             </div>
         </template>

src/components/FormPopup.vue

@@ -25,21 +25,16 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    submitOnEnter: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const { t } = useI18n();
+
 const closeButton = ref(null);
 const isLoading = ref(false);
 
 const onSubmit = () => {
-    if ($props.submitOnEnter) {
     emit('onSubmit');
     closeForm();
-    }
 };
 
 const closeForm = () => {
@@ -61,6 +56,14 @@ const closeForm = () => {
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" />
             <div class="q-mt-lg row justify-end">
+                <QBtn
+                    v-if="defaultSubmitButton"
+                    :label="customSubmitButtonLabel || t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
                 <QBtn
                     v-if="defaultCancelButton"
                     :label="t('globals.cancel')"
@@ -71,15 +74,7 @@ const closeForm = () => {
                     :loading="isLoading"
                     v-close-popup
                 />
-                <QBtn
+                <slot name="customButtons" />
-                    v-if="defaultSubmitButton"
-                    :label="customSubmitButtonLabel || t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
-                <slot name="custom-buttons" />
             </div>
         </QCard>
     </QForm>

src/components/ItemsFilterPanel.vue

@@ -1,353 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnInput from 'components/common/VnInput.vue';
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
-
-import axios from 'axios';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    customTags: {
-        type: Array,
-        default: () => [],
-    },
-    exprBuilder: {
-        type: Function,
-        default: null,
-    },
-});
-
-const itemCategories = ref([]);
-const selectedCategoryFk = ref(null);
-const selectedTypeFk = ref(null);
-const itemTypesOptions = ref([]);
-const suppliersOptions = ref([]);
-const tagOptions = ref([]);
-const tagValues = ref([]);
-
-const categoryList = computed(() => {
-    return (itemCategories.value || [])
-        .filter((category) => category.display)
-        .map((category) => ({
-            ...category,
-            icon: `vn:${(category.icon || '').split('-')[1]}`,
-        }));
-});
-
-const selectedCategory = computed(() =>
-    (itemCategories.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value
-    )
-);
-
-const selectedType = computed(() => {
-    return (itemTypesOptions.value || []).find(
-        (type) => type?.id === selectedTypeFk.value
-    );
-});
-
-const selectCategory = async (params, categoryId, search) => {
-    if (params.categoryFk === categoryId) {
-        resetCategory(params);
-        search();
-        return;
-    }
-    selectedCategoryFk.value = categoryId;
-    params.categoryFk = categoryId;
-    await fetchItemTypes(categoryId);
-    search();
-};
-
-const resetCategory = (params) => {
-    selectedCategoryFk.value = null;
-    itemTypesOptions.value = null;
-    if (params) {
-        params.categoryFk = null;
-        params.typeFk = null;
-    }
-};
-
-const applyTags = (params, search) => {
-    params.tags = tagValues.value
-        .filter((tag) => tag.selectedTag && tag.value)
-        .map((tag) => ({
-            tagFk: tag.selectedTag.id,
-            tagName: tag.selectedTag.name,
-            value: tag.value,
-        }));
-    search();
-};
-
-const fetchItemTypes = async (id) => {
-    const filter = {
-        fields: ['id', 'name', 'categoryFk'],
-        where: { categoryFk: id },
-        include: 'category',
-        order: 'name ASC',
-    };
-    const { data } = await axios.get('ItemTypes', {
-        params: { filter: JSON.stringify(filter) },
-    });
-    itemTypesOptions.value = data;
-};
-
-const getCategoryClass = (category, params) => {
-    if (category.id === params?.categoryFk) {
-        return 'active';
-    }
-};
-
-const getSelectedTagValues = async (tag) => {
-    if (!tag?.selectedTag?.id) return;
-    tag.value = null;
-    const filter = {
-        fields: ['value'],
-        order: 'value ASC',
-        limit: 30,
-    };
-
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
-        params,
-    });
-    tag.valueOptions = data;
-};
-
-const removeTag = (index, params, search) => {
-    (tagValues.value || []).splice(index, 1);
-    applyTags(params, search);
-};
-</script>
-
-<template>
-    <FetchData
-        url="ItemCategories"
-        limit="30"
-        auto-load
-        @on-fetch="(data) => (itemCategories = data)"
-    />
-    <FetchData
-        url="Suppliers"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-    />
-    <FetchData
-        url="Tags"
-        :filter="{ fields: ['id', 'name', 'isFree'] }"
-        auto-load
-        limit="30"
-        @on-fetch="(data) => (tagOptions = data)"
-    />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :expr-builder="props.exprBuilder"
-        :custom-tags="props.customTags"
-    >
-        <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
-                {{ t(selectedType?.name || '') }}
-            </strong>
-            <div v-else class="q-gutter-x-xs">
-                <strong>{{ t(`components.itemsFilterPanel.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #customTags="{ tags, params }">
-            <template v-for="tag in tags" :key="tag.label">
-                <VnFilterPanelChip
-                    v-for="chip in tag.value"
-                    :key="chip"
-                    removable
-                    @remove="removeTagChip(chip, params, searchFn)"
-                >
-                    <div class="q-gutter-x-xs">
-                        <strong>{{ chip.tagName }}: </strong>
-                        <span>"{{ chip.value }}"</span>
-                    </div>
-                </VnFilterPanelChip>
-            </template>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem class="category-filter q-mt-md">
-                <QBtn
-                    dense
-                    flat
-                    round
-                    v-for="category in categoryList"
-                    :key="category.name"
-                    :class="['category', getCategoryClass(category, params)]"
-                    :icon="category.icon"
-                    @click="selectCategory(params, category.id, searchFn)"
-                >
-                    <QTooltip>
-                        {{ t(category.name) }}
-                    </QTooltip>
-                </QBtn>
-            </QItem>
-            <QItem class="q-my-md">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('components.itemsFilterPanel.typeFk')"
-                        v-model="params.typeFk"
-                        :options="itemTypesOptions"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        use-input
-                        :disable="!selectedCategoryFk"
-                        @update:model-value="
-                            (value) => {
-                                selectedTypeFk = value;
-                                searchFn();
-                            }
-                        "
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ opt.categoryName }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <slot name="body" :params="params" :search-fn="searchFn" />
-            <QItem
-                v-for="(value, index) in tagValues"
-                :key="value"
-                class="q-mt-md filter-value"
-            >
-                <QItemSection class="col">
-                    <VnSelect
-                        :label="t('globals.tag')"
-                        v-model="value.selectedTag"
-                        :options="tagOptions"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        :emit-value="false"
-                        use-input
-                        :is-clearable="false"
-                        @update:model-value="getSelectedTagValues(value)"
-                    />
-                </QItemSection>
-                <QItemSection class="col">
-                    <VnSelect
-                        v-if="!value?.selectedTag?.isFree && value.valueOptions"
-                        :label="t('components.itemsFilterPanel.value')"
-                        v-model="value.value"
-                        :options="value.valueOptions || []"
-                        option-value="value"
-                        option-label="value"
-                        dense
-                        outlined
-                        rounded
-                        emit-value
-                        use-input
-                        :disable="!value"
-                        :is-clearable="false"
-                        @update:model-value="applyTags(params, searchFn)"
-                    />
-                    <VnInput
-                        v-else
-                        v-model="value.value"
-                        :label="t('components.itemsFilterPanel.value')"
-                        :disable="!value"
-                        is-outlined
-                        :is-clearable="false"
-                        @keyup.enter="applyTags(params, searchFn)"
-                    />
-                </QItemSection>
-                <QIcon
-                    name="delete"
-                    class="fill-icon-on-hover q-px-xs"
-                    color="primary"
-                    size="sm"
-                    @click="removeTag(index, params, searchFn)"
-                />
-            </QItem>
-            <QItem class="q-mt-lg">
-                <QBtn
-                    icon="add_circle"
-                    shortcut="+"
-                    flat
-                    class="fill-icon-on-hover q-px-xs"
-                    color="primary"
-                    @click="tagValues.push({})"
-                />
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<style lang="scss" scoped>
-.category-filter {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 12px;
-
-    .category {
-        padding: 8px;
-        width: 60px;
-        height: 60px;
-        font-size: 1.4rem;
-        background-color: var(--vn-accent-color);
-
-        &.active {
-            background-color: $primary;
-        }
-    }
-}
-
-.filter-value {
-    display: flex;
-    align-items: center;
-}
-</style>
-
-<i18n>
-en:
-    params:
-        supplier: Supplier
-        from: From
-        to: To
-        active: Is active
-        visible: Is visible
-        floramondo: Is floramondo
-        salesPersonFk: Buyer
-        categoryFk: Category
-
-es:
-    params:
-        supplier: Proveedor
-        from: Desde
-        to: Hasta
-        active: Activo
-        visible: Visible
-        floramondo: Floramondo
-        salesPersonFk: Comprador
-        categoryFk: Categoría
-</i18n>

src/components/LeftMenu.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, watch, ref, reactive, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -9,7 +9,6 @@ import { toLowerCamel } from 'src/filters';
 import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
-import VnInput from './common/VnInput.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -22,58 +21,12 @@ const props = defineProps({
         default: 'main',
     },
 });
-const initialized = ref(false);
-const items = ref([]);
-const expansionItemElements = reactive({});
-const pinnedModules = computed(() => {
-    const map = new Map();
-    items.value.forEach((item) => item.isPinned && map.set(item.name, item));
-    return map;
-});
-const search = ref(null);
-
-const filteredItems = computed(() => {
-    if (!search.value) return items.value;
-    const normalizedSearch = normalize(search.value);
-    return items.value.filter((item) => {
-        const locale = normalize(t(item.title));
-        return locale.includes(normalizedSearch);
-    });
-});
-
-const filteredPinnedModules = computed(() => {
-    if (!search.value) return pinnedModules.value;
-    const normalizedSearch = search.value
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-    const map = new Map();
-    for (const [key, pinnedModule] of pinnedModules.value) {
-        const locale = t(pinnedModule.title)
-            .normalize('NFD')
-            .replace(/[\u0300-\u036f]/g, '')
-            .toLowerCase();
-        if (locale.includes(normalizedSearch)) map.set(key, pinnedModule);
-    }
-    return map;
-});
 
 onMounted(async () => {
     await navigation.fetchPinned();
     getRoutes();
-    initialized.value = true;
 });
 
-watch(
-    () => route.matched,
-    () => {
-        if (!initialized.value) return;
-        items.value = [];
-        getRoutes();
-    },
-    { deep: true }
-);
-
 function findMatches(search, item) {
     const matches = [];
     function findRoute(search, item) {
@@ -102,6 +55,7 @@ function addChildren(module, route, parent) {
     }
 }
 
+const items = ref([]);
 function getRoutes() {
     if (props.source === 'main') {
         const modules = Object.assign([], navigation.getModules().value);
@@ -110,9 +64,10 @@ function getRoutes() {
             const moduleDef = routes.find(
                 (route) => toLowerCamel(route.name) === item.module
             );
-            if (!moduleDef) continue;
             item.children = [];
 
+            if (!moduleDef) continue;
+
             addChildren(item.module, moduleDef, item.children);
         }
 
@@ -153,61 +108,21 @@ async function togglePinned(item, event) {
         type: 'positive',
     });
 }
-
-const handleItemExpansion = (itemName) => {
-    expansionItemElements[itemName].scrollToLastElement();
-};
-
-function normalize(text) {
-    return text
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-}
 </script>
 
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
             <template v-if="$route?.matched[1]?.name === 'Dashboard'">
-                <QItem class="q-pb-md">
+                <QItem class="header">
-                    <VnInput
+                    <QItemSection avatar>
-                        v-model="search"
+                        <QIcon name="view_module" />
-                        :label="t('Search modules')"
+                    </QItemSection>
-                        class="full-width"
+                    <QItemSection> {{ t('globals.modules') }}</QItemSection>
-                        filled
-                        dense
-                    />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size">
+                <template v-for="item in items" :key="item.name">
-                    <LeftMenuItem
+                    <template v-if="item.children">
-                        v-for="[key, pinnedModule] of filteredPinnedModules"
-                        :key="key"
-                        :item="pinnedModule"
-                        group="modules"
-                    >
-                        <template #side>
-                            <QBtn
-                                v-if="pinnedModule.isPinned === true"
-                                @click="togglePinned(pinnedModule, $event)"
-                                icon="remove_circle"
-                                size="xs"
-                                flat
-                                round
-                            >
-                                <QTooltip>
-                                    {{ t('components.leftMenu.removeFromPinned') }}
-                                </QTooltip>
-                            </QBtn>
-                        </template>
-                    </LeftMenuItem>
-                    <QSeparator />
-                </template>
-                <template v-for="item in filteredItems" :key="item.name">
-                    <template
-                        v-if="item.children && !filteredPinnedModules.has(item.name)"
-                    >
                         <LeftMenuItem :item="item" group="modules">
                             <template #side>
                                 <QBtn
@@ -298,12 +213,8 @@ function normalize(text) {
                         :icon="item.icon"
                         :label="t(item.title)"
                         :content-inset-level="0.5"
-                        @after-show="handleItemExpansion(item.name)"
                     >
-                        <LeftMenuItemGroup
+                        <LeftMenuItemGroup :item="item" />
-                            :ref="(el) => (expansionItemElements[item.name] = el)"
-                            :item="item"
-                        />
                     </QExpansionItem>
                 </QList>
             </template>
@@ -326,7 +237,3 @@ function normalize(text) {
     color: var(--vn-label-color);
 }
 </style>
-<i18n>
-    es:
-        Search modules: Buscar módulos
-</i18n>

src/components/LeftMenuItem.vue

@@ -20,32 +20,16 @@ const itemComputed = computed(() => {
 });
 </script>
 <template>
-    <QItem
+    <QItem active-class="bg-hover" :to="{ name: itemComputed.name }" clickable v-ripple>
-        active-class="bg-vn-hover"
-        class="min-height"
-        :to="{ name: itemComputed.name }"
-        clickable
-        v-ripple
-    >
         <QItemSection avatar v-if="itemComputed.icon">
             <QIcon :name="itemComputed.icon" />
         </QItemSection>
         <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>
+        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
-            {{ t(itemComputed.title) }}
-            <QTooltip v-if="item.keyBinding">
-                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
-            </QTooltip>
-        </QItemSection>
         <QItemSection side>
             <slot name="side" :item="itemComputed" />
         </QItemSection>
     </QItem>
 </template>
-<style lang="scss" scoped>
-.q-item {
-    min-height: 5vh;
-}
-</style>

src/components/LeftMenuItemGroup.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import LeftMenuItem from './LeftMenuItem.vue';
-import { elementIsVisibleInViewport } from 'src/composables/elementIsVisibleInViewport';
 
 const props = defineProps({
     item: {
@@ -14,27 +13,10 @@ const props = defineProps({
     },
 });
 
-const groupEnd = ref(null);
-
-const scrollToLastElement = () => {
-    if (groupEnd.value && !elementIsVisibleInViewport(groupEnd.value)) {
-        groupEnd.value.scrollIntoView({
-            behavior: 'smooth',
-            block: 'end',
-        });
-    }
-};
-
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
-
-defineExpose({
-    scrollToLastElement,
-});
 </script>
-
 <template>
     <template v-for="section in item.children" :key="section.name">
         <LeftMenuItem :item="section" />
     </template>
-    <div ref="groupEnd" />
 </template>

src/components/NavBar.vue

@@ -1,21 +1,21 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useSession } from 'src/composables/useSession';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
 import VnBreadcrumbs from './common/VnBreadcrumbs.vue';
-import VnAvatar from './ui/VnAvatar.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
 const quasar = useQuasar();
-const stateQuery = useStateQueryStore();
 const state = useState();
 const user = state.getUser();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
@@ -26,13 +26,7 @@ const pinnedModulesRef = ref();
 <template>
     <QHeader color="white" elevated>
         <QToolbar class="q-py-sm q-px-md">
-            <QBtn
+            <QBtn @click="stateStore.toggleLeftDrawer()" icon="menu" round dense flat>
-                @click="stateStore.toggleLeftDrawer()"
-                icon="dock_to_right"
-                round
-                dense
-                flat
-            >
                 <QTooltip bottom anchor="bottom right">
                     {{ t('globals.collapseMenu') }}
                 </QTooltip>
@@ -52,14 +46,6 @@ const pinnedModulesRef = ref();
                 </QBtn>
             </RouterLink>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
-            <QSpinner
-                color="primary"
-                class="q-ml-md"
-                :class="{
-                    'no-visible': !stateQuery.isLoading().value,
-                }"
-                size="xs"
-            />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>
             <QSpace />
@@ -88,13 +74,21 @@ const pinnedModulesRef = ref();
                     </QTooltip>
                     <PinnedModules ref="pinnedModulesRef" />
                 </QBtn>
-                <QBtn class="q-pa-none" rounded dense flat no-wrap id="user">
+                <QBtn
-                    <VnAvatar
+                    :class="{ 'q-pa-none': quasar.platform.is.mobile }"
-                        :worker-id="user.id"
+                    rounded
-                        :title="user.name"
+                    dense
-                        size="lg"
+                    flat
-                        color="transparent"
+                    no-wrap
-                    />
+                    id="user"
+                >
+                    <QAvatar size="lg">
+                        <QImg
+                            :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
+                            spinner-color="primary"
+                        >
+                        </QImg>
+                    </QAvatar>
                     <QTooltip bottom>
                         {{ t('globals.userPanel') }}
                     </QTooltip>

src/components/RefundInvoiceForm.vue

@@ -1,170 +0,0 @@
-<script setup>
-import { ref, reactive } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useDialogPluginComponent } from 'quasar';
-import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import FormPopup from './FormPopup.vue';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    invoiceOutData: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const { dialogRef } = useDialogPluginComponent();
-const { t } = useI18n();
-const router = useRouter();
-const { notify } = useNotify();
-
-const rectificativeTypeOptions = ref([]);
-const siiTypeInvoiceOutsOptions = ref([]);
-const invoiceParams = reactive({
-    id: $props.invoiceOutData?.id,
-    inheritWarehouse: true,
-});
-const invoiceCorrectionTypesOptions = ref([]);
-
-const refund = async () => {
-    const params = {
-        id: invoiceParams.id,
-        withWarehouse: invoiceParams.inheritWarehouse,
-        cplusRectificationTypeFk: invoiceParams.cplusRectificationTypeFk,
-        siiTypeInvoiceOutFk: invoiceParams.siiTypeInvoiceOutFk,
-        invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
-    };
-
-    const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
-    notify(t('Refunded invoice'), 'positive');
-    const [id] = data?.refundId || [];
-    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
-};
-</script>
-
-<template>
-    <FetchData
-        url="CplusRectificationTypes"
-        :filter="{ order: 'description' }"
-        @on-fetch="
-            (data) => (
-                (rectificativeTypeOptions = data),
-                (invoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias'
-                )[0].id)
-            )
-        "
-        auto-load
-    />
-    <FetchData
-        url="SiiTypeInvoiceOuts"
-        :filter="{ where: { code: { like: 'R%' } } }"
-        @on-fetch="
-            (data) => (
-                (siiTypeInvoiceOutsOptions = data),
-                (invoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4'
-                )[0].id)
-            )
-        "
-        auto-load
-    />
-    <FetchData
-        url="InvoiceCorrectionTypes"
-        @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
-        auto-load
-    />
-
-    <QDialog ref="dialogRef">
-        <FormPopup
-            @on-submit="refund()"
-            :custom-submit-button-label="t('Accept')"
-            :default-cancel-button="false"
-        >
-            <template #form-inputs>
-                <VnRow>
-                    <VnSelect
-                        :label="t('Rectificative type')"
-                        :options="rectificativeTypeOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="invoiceParams.cplusRectificationTypeFk"
-                        :required="true"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('Class')"
-                        :options="siiTypeInvoiceOutsOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="invoiceParams.siiTypeInvoiceOutFk"
-                        :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.code }} -
-                                        {{ scope.opt?.description }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </VnRow>
-
-                <VnRow>
-                    <VnSelect
-                        :label="t('Type')"
-                        :options="invoiceCorrectionTypesOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="invoiceParams.invoiceCorrectionTypeFk"
-                        :required="true"
-                    /> </VnRow
-                ><VnRow>
-                    <div>
-                        <QCheckbox
-                            :label="t('Inherit warehouse')"
-                            v-model="invoiceParams.inheritWarehouse"
-                        />
-                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                            <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>
-                        </QIcon>
-                    </div>
-                </VnRow>
-            </template>
-        </FormPopup>
-    </QDialog>
-</template>
-
-<i18n>
-en:
-    Refund invoice: Refund invoice
-    Rectificative type: Rectificative type
-    Class: Class
-    Type: Type
-    Refunded invoice: Refunded invoice
-    Inherit warehouse: Inherit the warehouse
-    Inherit warehouse tooltip: Select this option to inherit the warehouse when refunding the invoice
-    Accept: Accept
-    Error refunding invoice: Error refunding invoice
-es:
-    Refund invoice: Abonar factura
-    Rectificative type: Tipo rectificativa
-    Class: Clase
-    Type: Tipo
-    Refunded invoice: Factura abonada
-    Inherit warehouse: Heredar el almacén
-    Inherit warehouse tooltip: Seleccione esta opción para heredar el almacén al abonar la factura.
-    Accept: Aceptar
-    Error refunding invoice: Error abonando factura
-</i18n>

src/components/RegularizeStockForm.vue

@@ -2,7 +2,7 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
@@ -15,7 +15,7 @@ const props = defineProps({
         default: null,
     },
     warehouseFk: {
-        type: Number,
+        type: Boolean,
         default: null,
     },
 });
@@ -23,7 +23,7 @@ const props = defineProps({
 const { t } = useI18n();
 
 const regularizeFormData = reactive({
-    itemFk: Number(props.itemFk),
+    itemFk: props.itemFk,
     warehouseFk: props.warehouseFk,
     quantity: null,
 });
@@ -49,19 +49,19 @@ const onDataSaved = (data) => {
         @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
                     <QInput
                         :label="t('Type the visible quantity')"
                         v-model.number="data.quantity"
-                    type="number"
-                    autofocus
                     />
+                </div>
             </VnRow>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelect
+                    <VnSelectFilter
                         :label="t('Warehouse')"
-                        v-model.number="data.warehouseFk"
+                        v-model="data.warehouseFk"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"

src/components/TicketProblems.vue

@@ -1,40 +0,0 @@
-<script setup>
-defineProps({ row: { type: Object, required: true } });
-</script>
-<template>
-    <span>
-        <QIcon
-            v-if="row.isTaxDataChecked === 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row.risk"
-            name="vn:risk"
-            :color="row.hasHighRisk ? 'negative' : 'primary'"
-            size="xs"
-        >
-            <QTooltip>
-                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
-            </QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
-        </QIcon>
-    </span>
-</template>

src/components/TransferInvoiceForm.vue

@@ -2,12 +2,12 @@
 import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useQuasar, useDialogPluginComponent } from 'quasar';
+
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FormPopup from './FormPopup.vue';
+
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -18,91 +18,56 @@ const $props = defineProps({
     },
 });
 
-const { dialogRef } = useDialogPluginComponent();
-const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
 
-const rectificativeTypeOptions = ref([]);
-const siiTypeInvoiceOutsOptions = ref([]);
-const checked = ref(true);
 const transferInvoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    refFk: $props.invoiceOutData?.ref,
 });
+const closeButton = ref(null);
+const clientsOptions = ref([]);
+const rectificativeTypeOptions = ref([]);
+const siiTypeInvoiceOutsOptions = ref([]);
 const invoiceCorrectionTypesOptions = ref([]);
 
-const selectedClient = (client) => {
+const closeForm = () => {
-    transferInvoiceParams.selectedClientData = client;
+    if (closeButton.value) closeButton.value.click();
 };
 
-const makeInvoice = async () => {
+const transferInvoice = async () => {
-    const hasToInvoiceByAddress =
+    try {
-        transferInvoiceParams.selectedClientData.hasToInvoiceByAddress;
+        const { data } = await axios.post(
-
+            'InvoiceOuts/transferInvoice',
-    const params = {
+            transferInvoiceParams
-        id: transferInvoiceParams.id,
+        );
-        cplusRectificationTypeFk: transferInvoiceParams.cplusRectificationTypeFk,
-        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
-        invoiceCorrectionTypeFk: transferInvoiceParams.invoiceCorrectionTypeFk,
-        newClientFk: transferInvoiceParams.newClientFk,
-        makeInvoice: checked.value,
-    };
-
-    if (checked.value && hasToInvoiceByAddress) {
-        const response = await new Promise((resolve) => {
-            quasar
-                .dialog({
-                    component: VnConfirm,
-                    componentProps: {
-                        title: t('Bill destination client'),
-                        message: t('transferInvoiceInfo'),
-                    },
-                })
-                .onOk(() => {
-                    resolve(true);
-                })
-                .onCancel(() => {
-                    resolve(false);
-                });
-        });
-        if (!response) {
-            return;
-        }
-    }
-
-    const { data } = await axios.post('InvoiceOuts/transfer', params);
         notify(t('Transferred invoice'), 'positive');
-    const id = data?.[0];
+        closeForm();
-    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+        router.push('InvoiceOutSummary', { id: data.id });
+    } catch (err) {
+        console.error('Error transfering invoice', err);
+    }
 };
 </script>
 
 <template>
+    <FetchData
+        url="Clients"
+        @on-fetch="(data) => (clientsOptions = data)"
+        :filter="{ fields: ['id', 'name'], order: 'id', limit: 30 }"
+        auto-load
+    />
     <FetchData
         url="CplusRectificationTypes"
         :filter="{ order: 'description' }"
-        @on-fetch="
+        @on-fetch="(data) => (rectificativeTypeOptions = data)"
-            (data) => (
-                (rectificativeTypeOptions = data),
-                (transferInvoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias'
-                )[0].id)
-            )
-        "
         auto-load
     />
     <FetchData
         url="SiiTypeInvoiceOuts"
         :filter="{ where: { code: { like: 'R%' } } }"
-        @on-fetch="
+        @on-fetch="(data) => (siiTypeInvoiceOutsOptions = data)"
-            (data) => (
-                (siiTypeInvoiceOutsOptions = data),
-                (transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4'
-                )[0].id)
-            )
-        "
         auto-load
     />
     <FetchData
@@ -110,16 +75,16 @@ const makeInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
-    <QDialog ref="dialogRef">
     <FormPopup
-            @on-submit="makeInvoice()"
+        @on-submit="transferInvoice()"
         :title="t('Transfer invoice')"
         :custom-submit-button-label="t('Transfer client')"
         :default-cancel-button="false"
     >
         <template #form-inputs>
-                <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelect
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -127,24 +92,21 @@ const makeInvoice = async () => {
                         option-value="id"
                         v-model="transferInvoiceParams.newClientFk"
                         :required="true"
-                        url="Clients"
-                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
-                        auto-load
                     >
                         <template #option="scope">
-                            <QItem
+                            <QItem v-bind="scope.itemProps">
-                                v-bind="scope.itemProps"
-                                @click="selectedClient(scope.opt)"
-                            >
                                 <QItemSection>
                                     <QItemLabel>
-                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
+                                        #{{ scope.opt?.id }} -
+                                        {{ scope.opt?.name }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelect>
+                    </VnSelectFilter>
-                    <VnSelect
+                </div>
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Rectificative type')"
                         :options="rectificativeTypeOptions"
                         hide-selected
@@ -153,9 +115,11 @@ const makeInvoice = async () => {
                         v-model="transferInvoiceParams.cplusRectificationTypeFk"
                         :required="true"
                     />
+                </div>
             </VnRow>
-                <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelect
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Class')"
                         :options="siiTypeInvoiceOutsOptions"
                         hide-selected
@@ -174,8 +138,10 @@ const makeInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelect>
+                    </VnSelectFilter>
-                    <VnSelect
+                </div>
+                <div class="col">
+                    <VnSelectFilter
                         :label="t('Type')"
                         :options="invoiceCorrectionTypesOptions"
                         hide-selected
@@ -184,28 +150,13 @@ const makeInvoice = async () => {
                         v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
                         :required="true"
                     />
-                </VnRow>
-                <VnRow>
-                    <div>
-                        <QCheckbox
-                            :label="t('Bill destination client')"
-                            v-model="checked"
-                        />
-                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
-                        </QIcon>
                 </div>
             </VnRow>
         </template>
     </FormPopup>
-    </QDialog>
 </template>
 
 <i18n>
-en:
-    checkInfo: New tickets from the destination customer will be generated in the consignee by default.
-    transferInvoiceInfo: Destination customer is marked to bill in the consignee
-    confirmTransferInvoice: The destination customer has selected to bill in the consignee, do you want to continue?
 es:
     Transfer invoice: Transferir factura
     Transfer client: Transferir cliente
@@ -214,7 +165,4 @@ es:
     Class: Clase
     Type: Tipo
     Transferred invoice: Factura transferida
-    Bill destination client: Facturar cliente destino
-    transferInvoiceInfo: Los nuevos tickets del cliente destino, serán generados en el consignatario por defecto.
-    confirmTransferInvoice: El cliente destino tiene marcado facturar por consignatario, desea continuar?
 </i18n>

src/components/UserPanel.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed, ref } from 'vue';
+import { onMounted, computed } from 'vue';
 import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -7,21 +7,17 @@ import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import { useClipboard } from 'src/composables/useClipboard';
-import { useRole } from 'src/composables/useRole';
-import VnAvatar from './ui/VnAvatar.vue';
-import useNotify from 'src/composables/useNotify';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
+import { useClipboard } from 'src/composables/useClipboard';
+import { ref } from 'vue';
 const { copyText } = useClipboard();
-const { notify } = useNotify();
-
 const userLocale = computed({
     get() {
         return locale.value;
@@ -52,10 +48,10 @@ const darkMode = computed({
 });
 
 const user = state.getUser();
+const token = session.getTokenMultimedia();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
-const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -73,28 +69,18 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    try {
     await axios.patch(query, {
         darkMode: value,
     });
     user.value.darkMode = value;
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    try {
     await axios.patch(query, {
         lang: value,
     });
     user.value.lang = value;
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
 }
 
 function logout() {
@@ -105,28 +91,6 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
-
-function localUserData() {
-    state.setUser(user.value);
-}
-
-async function saveUserData(param, value) {
-    try {
-        await axios.post('UserConfigs/setUserConfig', { [param]: value });
-        localUserData();
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
-}
-
-const onDataSaved = () => {
-    notify('globals.dataSaved', 'positive');
-};
-
-const onDataError = () => {
-    notify('errors.updateUserConfig', 'negative');
-};
 </script>
 
 <template>
@@ -137,14 +101,12 @@ const onDataError = () => {
         auto-load
     />
     <FetchData
-        v-if="isEmployee"
         url="Companies"
         order="name"
         @on-fetch="(data) => (companiesData = data)"
         auto-load
     />
     <FetchData
-        v-if="isEmployee"
         url="Accountings"
         order="name"
         @on-fetch="(data) => (accountBankData = data)"
@@ -161,7 +123,7 @@ const onDataError = () => {
                     @update:model-value="saveLanguage"
                     :label="t(`globals.lang['${userLocale}']`)"
                     icon="public"
-                    color="primary"
+                    color="orange"
                     false-value="es"
                     true-value="en"
                 />
@@ -170,7 +132,7 @@ const onDataError = () => {
                     @update:model-value="saveDarkMode"
                     :label="t(`globals.darkMode`)"
                     checked-icon="dark_mode"
-                    color="primary"
+                    color="orange"
                     unchecked-icon="light_mode"
                 />
             </div>
@@ -178,20 +140,13 @@ const onDataError = () => {
             <QSeparator vertical inset class="q-mx-lg" />
 
             <div class="col column items-center q-mb-sm">
-                <VnAvatar
+                <QAvatar size="80px">
-                    :worker-id="user.id"
+                    <QImg
-                    :title="user.name"
+                        :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                    size="xxl"
+                        spinner-color="white"
-                    color="transparent"
-                />
-                <QBtn
-                    v-if="isEmployee"
-                    class="q-mt-sm q-px-md"
-                    :to="`/worker/${user.id}`"
-                    color="primary"
-                    :label="t('globals.myAccount')"
-                    dense
                     />
+                </QAvatar>
+
                 <div class="text-subtitle1 q-mt-md">
                     <strong>{{ user.nickname }}</strong>
                 </div>
@@ -203,7 +158,7 @@ const onDataError = () => {
                 </div>
                 <QBtn
                     id="logout"
-                    color="primary"
+                    color="orange"
                     flat
                     :label="t('globals.logOut')"
                     size="sm"
@@ -217,61 +172,42 @@ const onDataError = () => {
         <QSeparator inset class="q-mx-lg" />
         <div class="col q-gutter-xs q-pa-md">
             <VnRow>
-                <VnSelect
+                <VnSelectFilter
                     :label="t('components.userPanel.localWarehouse')"
                     v-model="user.localWarehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
-                    input-debounce="0"
-                    hide-selected
-                    @update:model-value="localUserData"
                 />
-                <VnSelect
+                <VnSelectFilter
                     :label="t('components.userPanel.localBank')"
+                    hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
-                    input-debounce="0"
+                ></VnSelectFilter>
-                    hide-selected
-                    @update:model-value="localUserData"
-                >
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>
-                                    {{ `${opt.id}: ${opt.bank}` }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
             </VnRow>
             <VnRow>
-                <VnSelect
+                <VnSelectFilter
                     :label="t('components.userPanel.localCompany')"
                     hide-selected
-                    v-model="user.localCompanyFk"
+                    v-model="user.companyFk"
                     :options="companiesData"
                     option-label="code"
                     option-value="id"
-                    input-debounce="0"
-                    @update:model-value="localUserData"
                 />
-                <VnSelect
+                <VnSelectFilter
                     :label="t('components.userPanel.userWarehouse')"
                     hide-selected
                     v-model="user.warehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
-                    input-debounce="0"
-                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
                 />
             </VnRow>
             <VnRow>
-                <VnSelect
+                <VnSelectFilter
                     :label="t('components.userPanel.userCompany')"
                     hide-selected
                     v-model="user.companyFk"
@@ -279,9 +215,6 @@ const onDataError = () => {
                     option-label="code"
                     option-value="id"
                     style="flex: 0"
-                    dense
-                    input-debounce="0"
-                    @update:model-value="(v) => saveUserData('companyFk', v)"
                 />
             </VnRow>
         </div>

src/components/VnSelectProvince.vue

@@ -1,96 +0,0 @@
-<script setup>
-import { ref, watch } from 'vue';
-import { useValidator } from 'src/composables/useValidator';
-import { useI18n } from 'vue-i18n';
-
-import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
-
-const emit = defineEmits(['onProvinceCreated', 'onProvinceFetched']);
-const $props = defineProps({
-    countryFk: {
-        type: Number,
-        default: null,
-    },
-    provinceSelected: {
-        type: Number,
-        default: null,
-    },
-});
-const provinceFk = defineModel({ type: Number, default: null });
-
-const { validate } = useValidator();
-const { t } = useI18n();
-const filter = ref({
-    include: { relation: 'country' },
-    where: {
-        countryFk: $props.countryFk,
-    },
-});
-const provincesOptions = ref($props.provinces);
-const provincesFetchDataRef = ref();
-provinceFk.value = $props.provinceSelected;
-if (!$props.countryFk) {
-    filter.value.where = {};
-}
-async function onProvinceCreated(_, data) {
-    await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
-    provinceFk.value = data.id;
-    emit('onProvinceCreated', data);
-}
-async function handleProvinces(data) {
-    provincesOptions.value = data;
-}
-
-watch(
-    () => $props.countryFk,
-    async () => {
-        if ($props.countryFk) {
-            filter.value.where.countryFk = $props.countryFk;
-        } else filter.value.where = {};
-        await provincesFetchDataRef.value.fetch({});
-        emit('onProvinceFetched', provincesOptions.value);
-    }
-);
-</script>
-
-<template>
-    <FetchData
-        ref="provincesFetchDataRef"
-        :filter="filter"
-        @on-fetch="handleProvinces"
-        url="Provinces"
-        auto-load
-    />
-    <VnSelectDialog
-        :label="t('Province')"
-        :options="provincesOptions"
-        :tooltip="t('Create province')"
-        hide-selected
-        :clearable="true"
-        v-model="provinceFk"
-        :rules="validate && validate('postcode.provinceFk')"
-        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
-    >
-        <template #option="{ itemProps, opt }">
-            <QItem v-bind="itemProps">
-                <QItemSection>
-                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                    <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
-                </QItemSection>
-            </QItem>
-        </template>
-        <template #form>
-            <CreateNewProvinceForm
-                :country-fk="$props.countryFk"
-                @on-data-saved="onProvinceCreated"
-            />
-        </template>
-    </VnSelectDialog>
-</template>
-<i18n>
-    es:
-        Province: Provincia
-        Create province: Crear provincia
-</i18n>

src/components/VnTable/VnChip.vue

@@ -1,57 +0,0 @@
-<script setup>
-defineProps({
-    columns: {
-        type: Array,
-        required: true,
-    },
-    row: {
-        type: Object,
-        default: null,
-    },
-});
-
-function stopEventPropagation(event) {
-    event.preventDefault();
-    event.stopPropagation();
-}
-</script>
-<template>
-    <slot name="beforeChip" :row="row"></slot>
-    <span
-        v-for="col of columns"
-        :key="col.name"
-        @click="stopEventPropagation"
-        class="cursor-text"
-    >
-        <QChip
-            v-if="col.chip.condition(row[col.name], row)"
-            :title="col.label"
-            :class="[
-                col.chip.color
-                    ? col.chip.color(row)
-                    : !col.chip.icon && 'bg-chip-secondary',
-                col.chip.icon && 'q-px-none',
-            ]"
-            dense
-            square
-        >
-            <span v-if="!col.chip.icon">
-                {{ col.format ? col.format(row) : row[col.name] }}
-            </span>
-            <QIcon v-else :name="col.chip.icon" color="primary-light" />
-        </QChip>
-    </span>
-    <slot name="afterChip" :row="row"></slot>
-</template>
-<style lang="scss">
-.bg-chip-secondary {
-    background-color: var(--vn-page-color);
-    color: var(--vn-text-color);
-}
-
-.cursor-text {
-    pointer-events: all;
-    cursor: text;
-    user-select: all;
-}
-</style>

src/components/VnTable/VnColumn.vue

@@ -1,190 +0,0 @@
-<script setup>
-import { markRaw, computed } from 'vue';
-import { QIcon, QCheckbox } from 'quasar';
-import { dashIfEmpty } from 'src/filters';
-
-/* basic input */
-import VnSelect from 'components/common/VnSelect.vue';
-import VnSelectCache from 'components/common/VnSelectCache.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputNumber from 'components/common/VnInputNumber.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnComponent from 'components/common/VnComponent.vue';
-import VnUserLink from 'components/ui/VnUserLink.vue';
-
-const model = defineModel(undefined, { required: true });
-const $props = defineProps({
-    column: {
-        type: Object,
-        required: true,
-    },
-    row: {
-        type: Object,
-        default: () => {},
-    },
-    default: {
-        type: [Object, String],
-        default: null,
-    },
-    componentProp: {
-        type: String,
-        default: null,
-    },
-    isEditable: {
-        type: Boolean,
-        default: true,
-    },
-    components: {
-        type: Object,
-        default: null,
-    },
-    showLabel: {
-        type: Boolean,
-        default: null,
-    },
-});
-
-const defaultSelect = {
-    attrs: {
-        row: $props.row,
-        disable: !$props.isEditable,
-        class: 'fit',
-    },
-    forceAttrs: {
-        label: $props.showLabel && $props.column.label,
-    },
-};
-
-const defaultComponents = {
-    input: {
-        component: markRaw(VnInput),
-        attrs: {
-            disable: !$props.isEditable,
-            class: 'fit',
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
-    },
-    number: {
-        component: markRaw(VnInputNumber),
-        attrs: {
-            disable: !$props.isEditable,
-            class: 'fit',
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
-    },
-    date: {
-        component: markRaw(VnInputDate),
-        attrs: {
-            readonly: !$props.isEditable,
-            disable: !$props.isEditable,
-            style: 'min-width: 125px',
-            class: 'fit',
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
-    },
-    time: {
-        component: markRaw(VnInputTime),
-        attrs: {
-            disable: !$props.isEditable,
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
-    },
-    checkbox: {
-        component: markRaw(QCheckbox),
-        attrs: ({ model }) => {
-            const defaultAttrs = {
-                disable: !$props.isEditable,
-                'model-value': Boolean(model),
-                class: 'no-padding fit',
-            };
-
-            if (typeof model == 'number') {
-                defaultAttrs['true-value'] = 1;
-                defaultAttrs['false-value'] = 0;
-            }
-            return defaultAttrs;
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
-    },
-    select: {
-        component: markRaw(VnSelectCache),
-        ...defaultSelect,
-    },
-    rawSelect: {
-        component: markRaw(VnSelect),
-        ...defaultSelect,
-    },
-    icon: {
-        component: markRaw(QIcon),
-    },
-    userLink: {
-        component: markRaw(VnUserLink),
-    },
-};
-
-const value = computed(() => {
-    return $props.column.format
-        ? $props.column.format($props.row, dashIfEmpty)
-        : dashIfEmpty($props.row[$props.column.name]);
-});
-
-const col = computed(() => {
-    let newColumn = { ...$props.column };
-    const specific = newColumn[$props.componentProp];
-    if (specific) {
-        newColumn = {
-            ...newColumn,
-            ...specific,
-            ...specific.attrs,
-            ...specific.forceAttrs,
-        };
-    }
-    if (
-        (/^is[A-Z]/.test(newColumn.name) || /^has[A-Z]/.test(newColumn.name)) &&
-        newColumn.component == null
-    )
-        newColumn.component = 'checkbox';
-    if ($props.default && !newColumn.component) newColumn.component = $props.default;
-
-    return newColumn;
-});
-
-const components = computed(() => $props.components ?? defaultComponents);
-</script>
-<template>
-    <div class="row no-wrap">
-        <VnComponent
-            v-if="col.before"
-            :prop="col.before"
-            :components="components"
-            :value="{ row, model }"
-            v-model="model"
-        />
-        <VnComponent
-            v-if="col.component"
-            :prop="col"
-            :components="components"
-            :value="{ row, model }"
-            v-model="model"
-        />
-        <span :title="value" v-else>{{ value }}</span>
-        <VnComponent
-            v-if="col.after"
-            :prop="col.after"
-            :components="components"
-            :value="{ row, model }"
-            v-model="model"
-        />
-    </div>
-</template>

src/components/VnTable/VnFilter.vue

@@ -1,167 +0,0 @@
-<script setup>
-import { markRaw, computed } from 'vue';
-import { QCheckbox } from 'quasar';
-import { useArrayData } from 'composables/useArrayData';
-
-/* basic input */
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnTableColumn from 'components/VnTable/VnColumn.vue';
-
-const $props = defineProps({
-    column: {
-        type: Object,
-        required: true,
-    },
-    showTitle: {
-        type: Boolean,
-        default: false,
-    },
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    searchUrl: {
-        type: String,
-        default: 'table',
-    },
-});
-
-defineExpose({ addFilter, props: $props });
-
-const model = defineModel(undefined, { required: true });
-const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
-const columnFilter = computed(() => $props.column?.columnFilter);
-
-const updateEvent = { 'update:modelValue': addFilter };
-const enterEvent = {
-    'keyup.enter': () => addFilter(model.value),
-    remove: () => addFilter(null),
-};
-
-const defaultAttrs = {
-    filled: !$props.showTitle,
-    class: 'q-px-xs q-pb-xs q-pt-none fit',
-    dense: true,
-};
-
-const forceAttrs = {
-    label: $props.showTitle ? '' : columnFilter.value?.label ?? $props.column.label,
-};
-
-const selectComponent = {
-    component: markRaw(VnSelect),
-    event: updateEvent,
-    attrs: {
-        class: 'q-px-sm q-pb-xs q-pt-none fit',
-        dense: true,
-        filled: !$props.showTitle,
-    },
-    forceAttrs,
-};
-
-const components = {
-    input: {
-        component: markRaw(VnInput),
-        event: enterEvent,
-        attrs: {
-            ...defaultAttrs,
-            clearable: true,
-        },
-        forceAttrs,
-    },
-    number: {
-        component: markRaw(VnInput),
-        event: enterEvent,
-        attrs: {
-            ...defaultAttrs,
-            clearable: true,
-            type: 'number',
-        },
-        forceAttrs,
-    },
-    date: {
-        component: markRaw(VnInputDate),
-        event: updateEvent,
-        attrs: {
-            ...defaultAttrs,
-            style: 'min-width: 150px',
-        },
-        forceAttrs,
-    },
-    time: {
-        component: markRaw(VnInputTime),
-        event: updateEvent,
-        attrs: {
-            ...defaultAttrs,
-            disable: !$props.isEditable,
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
-    },
-    checkbox: {
-        component: markRaw(QCheckbox),
-        event: updateEvent,
-        attrs: {
-            dense: true,
-            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs fit',
-            'toggle-indeterminate': true,
-        },
-        forceAttrs,
-    },
-    select: selectComponent,
-    rawSelect: selectComponent,
-};
-
-async function addFilter(value, name) {
-    value ??= undefined;
-    if (value && typeof value === 'object') value = model.value;
-    value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name ?? name;
-
-    if (columnFilter.value?.inWhere) {
-        if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
-        return await arrayData.addFilterWhere({ [field]: value });
-    }
-    await arrayData.addFilter({ params: { [field]: value } });
-}
-
-function alignRow() {
-    switch ($props.column.align) {
-        case 'left':
-            return 'justify-start items-start';
-        case 'right':
-            return 'justify-end items-end';
-        default:
-            return 'flex-center';
-    }
-}
-
-const showFilter = computed(
-    () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
-);
-
-const onTabPressed = async () => {
-    if (model.value) enterEvent['keyup.enter']();
-};
-</script>
-<template>
-    <div
-        v-if="showFilter"
-        class="full-width"
-        :class="alignRow()"
-        style="max-height: 45px; overflow: hidden"
-    >
-        <VnTableColumn
-            :column="$props.column"
-            default="input"
-            v-model="model"
-            :components="components"
-            component-prop="columnFilter"
-            @keydown.tab="onTabPressed"
-        />
-    </div>
-</template>

src/components/VnTable/VnOrder.vue

@@ -1,95 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useArrayData } from 'composables/useArrayData';
-const model = defineModel({ type: Object });
-const $props = defineProps({
-    name: {
-        type: [String, Boolean],
-        default: '',
-    },
-    label: {
-        type: String,
-        default: undefined,
-    },
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    searchUrl: {
-        type: String,
-        default: 'table',
-    },
-    vertical: {
-        type: Boolean,
-        default: false,
-    },
-});
-const hover = ref();
-const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
-
-async function orderBy(name, direction) {
-    if (!name) return;
-    switch (direction) {
-        case 'DESC':
-            direction = undefined;
-            break;
-        case undefined:
-            direction = 'ASC';
-            break;
-        case 'ASC':
-            direction = 'DESC';
-            break;
-    }
-    if (!direction) return await arrayData.deleteOrder(name);
-    await arrayData.addOrder(name, direction);
-}
-
-defineExpose({ orderBy });
-</script>
-<template>
-    <div
-        @mouseenter="hover = true"
-        @mouseleave="hover = false"
-        @click="orderBy(name, model?.direction)"
-        class="row items-center no-wrap cursor-pointer"
-    >
-        <span :title="label">{{ label }}</span>
-        <QChip
-            v-if="name"
-            :label="!vertical ? model?.index : ''"
-            :icon="
-                (model?.index || hover) && !vertical
-                    ? model?.direction == 'DESC'
-                        ? 'arrow_downward'
-                        : 'arrow_upward'
-                    : undefined
-            "
-            :size="vertical ? '' : 'sm'"
-            :class="[
-                model?.index ? 'color-vn-text' : 'bg-transparent',
-                vertical ? 'q-px-none' : '',
-            ]"
-            class="no-box-shadow"
-            :clickable="true"
-            style="min-width: 40px"
-        >
-            <div
-                class="column flex-center"
-                v-if="vertical"
-                :style="!model?.index && 'color: #5d5d5d'"
-            >
-                {{ model?.index }}
-                <QIcon
-                    :name="
-                        model?.index
-                            ? model?.direction == 'DESC'
-                                ? 'arrow_downward'
-                                : 'arrow_upward'
-                            : 'swap_vert'
-                    "
-                    size="xs"
-                />
-            </div>
-        </QChip>
-    </div>
-</template>

src/components/VnTable/VnTable.vue

@@ -1,942 +0,0 @@
-<script setup>
-import { ref, onBeforeMount, onMounted, computed, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-import { useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
-
-import CrudModel from 'src/components/CrudModel.vue';
-import FormModelPopup from 'components/FormModelPopup.vue';
-
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnTableColumn from 'components/VnTable/VnColumn.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
-import VnTableChip from 'components/VnTable/VnChip.vue';
-import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
-
-const $props = defineProps({
-    columns: {
-        type: Array,
-        required: true,
-    },
-    defaultMode: {
-        type: String,
-        default: 'table', // 'table', 'card'
-    },
-    columnSearch: {
-        type: Boolean,
-        default: true,
-    },
-    rightSearch: {
-        type: Boolean,
-        default: true,
-    },
-    rowClick: {
-        type: [Function, Boolean],
-        default: null,
-    },
-    rowCtrlClick: {
-        type: [Function, Boolean],
-        default: null,
-    },
-    redirect: {
-        type: String,
-        default: null,
-    },
-    create: {
-        type: Object,
-        default: null,
-    },
-    createAsDialog: {
-        type: Boolean,
-        default: true,
-    },
-    bottom: {
-        type: Object,
-        default: null,
-    },
-    cardClass: {
-        type: String,
-        default: 'flex-one',
-    },
-    searchUrl: {
-        type: [String, Boolean],
-        default: 'table',
-    },
-    isEditable: {
-        type: Boolean,
-        default: false,
-    },
-    useModel: {
-        type: Boolean,
-        default: false,
-    },
-    hasSubToolbar: {
-        type: Boolean,
-        default: null,
-    },
-    disableOption: {
-        type: Object,
-        default: () => ({ card: false, table: false }),
-    },
-    withoutHeader: {
-        type: Boolean,
-        default: false,
-    },
-    tableCode: {
-        type: String,
-        default: null,
-    },
-    table: {
-        type: Object,
-        default: () => ({}),
-    },
-    crudModel: {
-        type: Object,
-        default: () => ({}),
-    },
-    tableHeight: {
-        type: String,
-        default: '90vh',
-    },
-    chipLocale: {
-        type: String,
-        default: null,
-    },
-    footer: {
-        type: Boolean,
-        default: false,
-    },
-    disabledAttr: {
-        type: Boolean,
-        default: false,
-    },
-});
-const { t } = useI18n();
-const stateStore = useStateStore();
-const route = useRoute();
-const router = useRouter();
-const quasar = useQuasar();
-
-const CARD_MODE = 'card';
-const TABLE_MODE = 'table';
-const mode = ref(CARD_MODE);
-const selected = ref([]);
-const hasParams = ref(false);
-const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
-const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
-const orders = ref(parseOrder(routeQuery.filter?.order));
-const CrudModelRef = ref({});
-const showForm = ref(false);
-const splittedColumns = ref({ columns: [] });
-const columnsVisibilitySkipped = ref();
-const createForm = ref();
-const tableFilterRef = ref([]);
-const tableRef = ref();
-
-const tableModes = [
-    {
-        icon: 'view_column',
-        title: t('table view'),
-        value: TABLE_MODE,
-        disable: $props.disableOption?.table,
-    },
-    {
-        icon: 'grid_view',
-        title: t('grid view'),
-        value: CARD_MODE,
-        disable: $props.disableOption?.card,
-    },
-];
-onBeforeMount(() => {
-    const urlParams = route.query[$props.searchUrl];
-    hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
-});
-
-onMounted(() => {
-    mode.value =
-        quasar.platform.is.mobile && !$props.disableOption?.card
-            ? CARD_MODE
-            : $props.defaultMode;
-    stateStore.rightDrawer = quasar.screen.gt.xs;
-    columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
-        ...['tableActions'],
-    ];
-    createForm.value = $props.create;
-    if ($props.create && route?.query?.createForm) {
-        showForm.value = true;
-        createForm.value = {
-            ...createForm.value,
-            ...{ formInitialData: JSON.parse(route?.query?.createForm) },
-        };
-    }
-});
-
-watch(
-    () => $props.columns,
-    (value) => splitColumns(value),
-    { immediate: true }
-);
-
-watch(
-    () => route.query[$props.searchUrl],
-    (val) => setUserParams(val),
-    { immediate: true, deep: true }
-);
-
-const isTableMode = computed(() => mode.value == TABLE_MODE);
-
-function setUserParams(watchedParams, watchedOrder) {
-    if (!watchedParams) return;
-
-    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-    const filter =
-        typeof watchedParams?.filter == 'string'
-            ? JSON.parse(watchedParams?.filter ?? '{}')
-            : watchedParams?.filter;
-    const where = filter?.where;
-    const order = watchedOrder ?? filter?.order;
-
-    watchedParams = { ...watchedParams, ...where };
-    delete watchedParams.filter;
-    delete params.value?.filter;
-    params.value = { ...params.value, ...sanitizer(watchedParams) };
-    orders.value = parseOrder(order);
-}
-
-function sanitizer(params) {
-    for (const [key, value] of Object.entries(params)) {
-        if (value && typeof value == 'object') {
-            const param = Object.values(value)[0];
-            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
-        }
-    }
-    return params;
-}
-
-function splitColumns(columns) {
-    splittedColumns.value = {
-        columns: [],
-        chips: [],
-        create: [],
-        cardVisible: [],
-    };
-
-    for (const col of columns) {
-        if (col.name == 'tableActions') {
-            col.orderBy = false;
-            splittedColumns.value.actions = col;
-        }
-        if (col.chip) splittedColumns.value.chips.push(col);
-        if (col.isTitle) splittedColumns.value.title = col;
-        if (col.create) splittedColumns.value.create.push(col);
-        if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
-        if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel && col.columnFilter !== false)
-            col.columnFilter = { inWhere: true, ...col.columnFilter };
-        splittedColumns.value.columns.push(col);
-    }
-    // Status column
-    if (splittedColumns.value.chips.length) {
-        splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
-            (c) => !c.isId
-        );
-        if (splittedColumns.value.columnChips.length)
-            splittedColumns.value.columns.unshift({
-                align: 'left',
-                label: t('status'),
-                name: 'tableStatus',
-                columnFilter: false,
-                orderBy: false,
-            });
-    }
-}
-
-const rowClickFunction = computed(() => {
-    if ($props.rowClick != undefined) return $props.rowClick;
-    if ($props.redirect) return ({ id }) => redirectFn(id);
-    return () => {};
-});
-
-const rowCtrlClickFunction = computed(() => {
-    if ($props.rowCtrlClick != undefined) return $props.rowCtrlClick;
-    if ($props.redirect)
-        return (evt, { id }) => {
-            stopEventPropagation(evt);
-            window.open(`/#/${$props.redirect}/${id}`, '_blank');
-        };
-    return () => {};
-});
-
-function redirectFn(id) {
-    router.push({ path: `/${$props.redirect}/${id}` });
-}
-
-function stopEventPropagation(event) {
-    event.preventDefault();
-    event.stopPropagation();
-}
-
-function reload(params) {
-    selected.value = [];
-    CrudModelRef.value.reload(params);
-}
-
-function columnName(col) {
-    const column = { ...col, ...col.columnFilter };
-    let name = column.name;
-    if (column.alias) name = column.alias + '.' + name;
-    return name;
-}
-
-function getColAlign(col) {
-    return 'text-' + (col.align ?? 'left');
-}
-
-function parseOrder(urlOrders) {
-    const orderObject = {};
-    if (!urlOrders) return orderObject;
-    if (typeof urlOrders == 'string') urlOrders = [urlOrders];
-    for (const [index, orders] of urlOrders.entries()) {
-        const [name, direction] = orders.split(' ');
-        orderObject[name] = { direction, index: index + 1 };
-    }
-    return orderObject;
-}
-
-const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
-defineExpose({
-    create: createForm,
-    reload,
-    redirect: redirectFn,
-    selected,
-    CrudModelRef,
-    params,
-    tableRef,
-});
-
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
-    else $props.create.onDataSaved(_);
-}
-
-function handleScroll() {
-    if ($props.crudModel.disableInfiniteScroll) return;
-
-    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
-    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
-    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
-    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
-}
-
-function handleSelection({ evt, added, rows: selectedRows }, rows) {
-    if (evt?.shiftKey && added) {
-        const rowIndex = selectedRows[0].$index;
-        const selectedIndexes = new Set(selected.value.map((row) => row.$index));
-        for (const row of rows) {
-            if (row.$index == rowIndex) break;
-            if (!selectedIndexes.has(row.$index)) {
-                selected.value.push(row);
-                selectedIndexes.add(row.$index);
-            }
-        }
-    }
-}
-</script>
-<template>
-    <QDrawer
-        v-if="$props.rightSearch"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-    >
-        <QScrollArea class="fit">
-            <VnFilterPanel
-                :data-key="$attrs['data-key']"
-                :search-button="true"
-                v-model="params"
-                :search-url="searchUrl"
-                :redirect="!!redirect"
-                @set-user-params="setUserParams"
-                :disable-submit-event="true"
-                @remove="
-                    (key) =>
-                        tableFilterRef
-                            .find((f) => f.props?.column.name == key)
-                            ?.addFilter()
-                "
-            >
-                <template #body>
-                    <div
-                        class="row no-wrap flex-center"
-                        v-for="col of splittedColumns.columns.filter(
-                            (c) => c.columnFilter ?? true
-                        )"
-                        :key="col.id"
-                    >
-                        <VnFilter
-                            ref="tableFilterRef"
-                            :column="col"
-                            :data-key="$attrs['data-key']"
-                            v-model="params[columnName(col)]"
-                            :search-url="searchUrl"
-                        />
-                        <VnTableOrder
-                            v-if="
-                                col?.columnFilter !== false &&
-                                col?.name !== 'tableActions'
-                            "
-                            v-model="orders[col.orderBy ?? col.name]"
-                            :name="col.orderBy ?? col.name"
-                            :data-key="$attrs['data-key']"
-                            :search-url="searchUrl"
-                            :vertical="false"
-                        />
-                    </div>
-                    <slot
-                        name="moreFilterPanel"
-                        :params="params"
-                        :columns="splittedColumns.columns"
-                    />
-                </template>
-                <template #tags="{ tag, formatFn }" v-if="chipLocale">
-                    <div class="q-gutter-x-xs">
-                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
-                        <span>{{ formatFn(tag.value) }}</span>
-                    </div>
-                </template>
-            </VnFilterPanel>
-        </QScrollArea>
-    </QDrawer>
-    <CrudModel
-        v-bind="$attrs"
-        :class="$attrs['class'] ?? 'q-px-md'"
-        :limit="$attrs['limit'] ?? 20"
-        ref="CrudModelRef"
-        @on-fetch="(...args) => emit('onFetch', ...args)"
-        :search-url="searchUrl"
-        :disable-infinite-scroll="isTableMode"
-        @save-changes="reload"
-        :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
-        :auto-load="hasParams || $attrs['auto-load']"
-    >
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-        </template>
-        <template #body="{ rows }">
-            <QTable
-                ref="tableRef"
-                v-bind="table"
-                class="vnTable"
-                :class="{ 'last-row-sticky': $props.footer }"
-                :columns="splittedColumns.columns"
-                :rows="rows"
-                v-model:selected="selected"
-                :grid="!isTableMode"
-                table-header-class="bg-header"
-                card-container-class="grid-three"
-                flat
-                :style="isTableMode && `max-height: ${tableHeight}`"
-                :virtual-scroll="isTableMode"
-                @virtual-scroll="handleScroll"
-                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
-                @update:selected="emit('update:selected', $event)"
-                @selection="(details) => handleSelection(details, rows)"
-            >
-                <template #top-left v-if="!$props.withoutHeader">
-                    <slot name="top-left"></slot>
-                </template>
-                <template #top-right v-if="!$props.withoutHeader">
-                    <VnVisibleColumn
-                        v-if="isTableMode"
-                        v-model="splittedColumns.columns"
-                        :table-code="tableCode ?? route.name"
-                        :skip="columnsVisibilitySkipped"
-                    />
-                    <QBtnToggle
-                        v-model="mode"
-                        toggle-color="primary"
-                        class="bg-vn-section-color"
-                        dense
-                        :options="tableModes.filter((mode) => !mode.disable)"
-                    />
-                    <QBtn
-                        v-if="$props.rightSearch"
-                        icon="filter_alt"
-                        class="bg-vn-section-color q-ml-sm"
-                        dense
-                        @click="stateStore.toggleRightDrawer()"
-                    />
-                </template>
-                <template #header-cell="{ col }">
-                    <QTh
-                        v-if="col.visible ?? true"
-                        :style="col.headerStyle"
-                        :class="col.headerClass"
-                    >
-                        <div
-                            class="column self-start q-ml-xs ellipsis"
-                            :class="`text-${col?.align ?? 'left'}`"
-                            :style="$props.columnSearch ? 'height: 75px' : ''"
-                        >
-                            <div class="row items-center no-wrap" style="height: 30px">
-                                <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
-                                <VnTableOrder
-                                    v-model="orders[col.orderBy ?? col.name]"
-                                    :name="col.orderBy ?? col.name"
-                                    :label="col?.label"
-                                    :data-key="$attrs['data-key']"
-                                    :search-url="searchUrl"
-                                />
-                            </div>
-                            <VnFilter
-                                v-if="$props.columnSearch"
-                                :column="col"
-                                :show-title="true"
-                                :data-key="$attrs['data-key']"
-                                v-model="params[columnName(col)]"
-                                :search-url="searchUrl"
-                                class="full-width"
-                            />
-                        </div>
-                    </QTh>
-                </template>
-                <template #header-cell-tableActions>
-                    <QTh auto-width class="sticky" />
-                </template>
-                <template #body-cell-tableStatus="{ col, row }">
-                    <QTd auto-width :class="getColAlign(col)">
-                        <VnTableChip :columns="splittedColumns.columnChips" :row="row">
-                            <template #afterChip>
-                                <slot name="afterChip" :row="row"></slot>
-                            </template>
-                        </VnTableChip>
-                    </QTd>
-                </template>
-                <template #body-cell="{ col, row, rowIndex }">
-                    <!-- Columns -->
-                    <QTd
-                        auto-width
-                        class="no-margin q-px-xs"
-                        :class="[getColAlign(col), col.columnClass]"
-                        :style="col.style"
-                        v-if="col.visible ?? true"
-                        @click.ctrl="
-                            ($event) =>
-                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
-                        "
-                    >
-                        <slot
-                            :name="`column-${col.name}`"
-                            :col="col"
-                            :row="row"
-                            :row-index="rowIndex"
-                        >
-                            <VnTableColumn
-                                :column="col"
-                                :row="row"
-                                :is-editable="col.isEditable ?? isEditable"
-                                v-model="row[col.name]"
-                                component-prop="columnField"
-                            />
-                        </slot>
-                    </QTd>
-                </template>
-                <template #body-cell-tableActions="{ col, row }">
-                    <QTd
-                        auto-width
-                        :class="getColAlign(col)"
-                        class="sticky no-padding"
-                        @click="stopEventPropagation($event)"
-                        :style="col.style"
-                    >
-                        <QBtn
-                            v-for="(btn, index) of col.actions"
-                            v-show="btn.show ? btn.show(row) : true"
-                            :key="index"
-                            :title="btn.title"
-                            :icon="btn.icon"
-                            class="q-pa-xs"
-                            flat
-                            dense
-                            :class="
-                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
-                            "
-                            :style="`visibility: ${
-                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
-                            }`"
-                            @click="btn.action(row)"
-                        />
-                    </QTd>
-                </template>
-                <template #bottom v-if="bottom">
-                    <slot name="bottom-table">
-                        <QBtn
-                            @click="
-                                () =>
-                                    createAsDialog
-                                        ? (showForm = !showForm)
-                                        : handleOnDataSaved(create)
-                            "
-                            class="cursor-pointer fill-icon"
-                            color="primary"
-                            icon="add_circle"
-                            size="md"
-                            round
-                            flat
-                            shortcut="+"
-                            :disabled="!disabledAttr"
-                        />
-                        <QTooltip>
-                            {{ createForm.title }}
-                        </QTooltip>
-                    </slot>
-                </template>
-                <template #item="{ row, colsMap }">
-                    <component
-                        :is="$props.redirect ? 'router-link' : 'span'"
-                        :to="`/${$props.redirect}/` + row.id"
-                    >
-                        <QCard
-                            bordered
-                            flat
-                            class="row no-wrap justify-between cursor-pointer"
-                            @click="
-                                (_, row) => {
-                                    $props.rowClick && $props.rowClick(row);
-                                }
-                            "
-                        >
-                            <QCardSection
-                                vertical
-                                class="no-margin no-padding"
-                                :class="colsMap.tableActions ? 'w-80' : 'fit'"
-                            >
-                                <!-- Chips -->
-                                <QCardSection
-                                    v-if="splittedColumns.chips.length"
-                                    class="no-margin q-px-xs q-py-none"
-                                >
-                                    <VnTableChip
-                                        :columns="splittedColumns.chips"
-                                        :row="row"
-                                    >
-                                        <template #afterChip>
-                                            <slot name="afterChip" :row="row"></slot>
-                                        </template>
-                                    </VnTableChip>
-                                </QCardSection>
-                                <!-- Title -->
-                                <QCardSection
-                                    v-if="splittedColumns.title"
-                                    class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
-                                >
-                                    <span
-                                        :title="row[splittedColumns.title.name]"
-                                        @click="stopEventPropagation($event)"
-                                        class="cursor-text"
-                                    >
-                                        {{ row[splittedColumns.title.name] }}
-                                    </span>
-                                </QCardSection>
-                                <!-- Fields -->
-                                <QCardSection
-                                    class="q-pl-sm q-pr-lg q-py-xs"
-                                    :class="$props.cardClass"
-                                >
-                                    <div
-                                        v-for="(
-                                            col, index
-                                        ) of splittedColumns.cardVisible"
-                                        :key="col.name"
-                                        class="fields"
-                                    >
-                                        <VnLv
-                                            :label="
-                                                !col.component && col.label
-                                                    ? `${col.label}:`
-                                                    : ''
-                                            "
-                                        >
-                                            <template #value>
-                                                <span
-                                                    @click="stopEventPropagation($event)"
-                                                >
-                                                    <slot
-                                                        :name="`column-${col.name}`"
-                                                        :col="col"
-                                                        :row="row"
-                                                        :row-index="index"
-                                                    >
-                                                        <VnTableColumn
-                                                            :column="col"
-                                                            :row="row"
-                                                            :is-editable="false"
-                                                            v-model="row[col.name]"
-                                                            component-prop="columnField"
-                                                            :show-label="true"
-                                                        />
-                                                    </slot>
-                                                </span>
-                                            </template>
-                                        </VnLv>
-                                    </div>
-                                </QCardSection>
-                            </QCardSection>
-                            <!-- Actions -->
-                            <QCardSection
-                                v-if="colsMap.tableActions"
-                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
-                                @click="stopEventPropagation($event)"
-                            >
-                                <QBtn
-                                    v-for="(btn, index) of splittedColumns.actions
-                                        .actions"
-                                    :key="index"
-                                    :title="btn.title"
-                                    :icon="btn.icon"
-                                    class="q-pa-xs"
-                                    flat
-                                    :class="
-                                        btn.isPrimary
-                                            ? 'text-primary-light'
-                                            : 'color-vn-text '
-                                    "
-                                    @click="btn.action(row)"
-                                />
-                            </QCardSection>
-                        </QCard>
-                    </component>
-                </template>
-                <template #bottom-row="{ cols }" v-if="$props.footer">
-                    <QTr v-if="rows.length" style="height: 30px">
-                        <QTh
-                            v-for="col of cols.filter((cols) => cols.visible ?? true)"
-                            :key="col?.id"
-                            class="text-center"
-                            :class="getColAlign(col)"
-                        >
-                            <slot :name="`column-footer-${col.name}`" />
-                        </QTh>
-                    </QTr>
-                </template>
-            </QTable>
-        </template>
-    </CrudModel>
-    <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
-        <QBtn
-            @click="
-                () =>
-                    createAsDialog ? (showForm = !showForm) : handleOnDataSaved(create)
-            "
-            color="primary"
-            fab
-            icon="add"
-            shortcut="+"
-            data-cy="vnTableCreateBtn"
-        />
-        <QTooltip self="top right">
-            {{ createForm?.title }}
-        </QTooltip>
-    </QPageSticky>
-    <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
-        <FormModelPopup
-            v-bind="createForm"
-            :model="$attrs['data-key'] + 'Create'"
-            @on-data-saved="(_, res) => createForm.onDataSaved(res)"
-        >
-            <template #form-inputs="{ data }">
-                <div class="grid-create">
-                    <slot
-                        v-for="column of splittedColumns.create"
-                        :key="column.name"
-                        :name="`column-create-${column.name}`"
-                        :data="data"
-                        :column-name="column.name"
-                        :label="column.label"
-                    >
-                        <VnTableColumn
-                            :column="column"
-                            :row="{}"
-                            default="input"
-                            v-model="data[column.name]"
-                            :show-label="true"
-                            component-prop="columnCreate"
-                        />
-                    </slot>
-                    <slot name="more-create-dialog" :data="data" />
-                </div>
-            </template>
-        </FormModelPopup>
-    </QDialog>
-</template>
-<i18n>
-en:
-    status: Status
-    table view: Table view
-    grid view: Grid view
-es:
-    status: Estados
-    table view: Vista en tabla
-    grid view: Vista en cuadrícula
-</i18n>
-
-<style lang="scss">
-.bg-chip-secondary {
-    background-color: var(--vn-page-color);
-    color: var(--vn-text-color);
-}
-
-.bg-header {
-    background-color: var(--vn-accent-color);
-    color: var(--vn-text-color);
-}
-
-.color-vn-text {
-    color: var(--vn-text-color);
-}
-
-.grid-three {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
-    max-width: 100%;
-    grid-gap: 20px;
-    margin: 0 auto;
-}
-
-.grid-create {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
-    max-width: 100%;
-    grid-gap: 20px;
-    margin: 0 auto;
-}
-
-.flex-one {
-    display: flex;
-    flex-flow: row wrap;
-    div.fields {
-        width: 100%;
-        .vn-label-value {
-            display: flex;
-            gap: 2%;
-        }
-    }
-}
-
-.q-table {
-    th {
-        padding: 0;
-    }
-
-    &__top {
-        padding: 12px 0px;
-        top: 0;
-    }
-}
-
-.vnTable {
-    thead tr th {
-        position: sticky;
-        z-index: 2;
-    }
-    thead tr:first-child th {
-        top: 0;
-    }
-    .q-table__top {
-        top: 0;
-        padding: 12px 0;
-    }
-    tbody {
-        .q-checkbox {
-            display: flex;
-            margin-bottom: 9px;
-            & .q-checkbox__label {
-                margin-left: 31px;
-                color: var(--vn-text-color);
-            }
-            & .q-checkbox__inner {
-                position: absolute;
-                left: 0;
-                color: var(--vn-label-color);
-            }
-        }
-    }
-    .sticky {
-        position: sticky;
-        right: 0;
-    }
-    td.sticky {
-        background-color: var(--vn-section-color);
-        z-index: 1;
-    }
-    table tbody th {
-        position: relative;
-    }
-}
-
-.last-row-sticky {
-    tbody:nth-last-child(1) {
-        @extend .bg-header;
-        position: sticky;
-        z-index: 2;
-        bottom: 0;
-    }
-}
-
-.vn-label-value {
-    display: flex;
-    flex-direction: row;
-    color: var(--vn-text-color);
-    .value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        pointer-events: all;
-        cursor: text;
-        user-select: all;
-    }
-}
-
-.cardEllipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.grid-two {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
-    max-width: 100%;
-    margin: 0 auto;
-    overflow: scroll;
-    white-space: wrap;
-    width: 100%;
-}
-
-.w-80 {
-    width: 80%;
-}
-
-.w-20 {
-    width: 20%;
-}
-
-.cursor-text {
-    pointer-events: all;
-    cursor: text;
-    user-select: all;
-}
-
-.q-table__container {
-    background-color: transparent;
-}
-
-.q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
-    background-color: var(--vn-section-color);
-}
-</style>

src/components/VnTable/VnVisibleColumn.vue

@@ -1,189 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { ref, computed, onMounted } from 'vue';
-
-import { useState } from 'src/composables/useState';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const columns = defineModel({ type: Object, default: [] });
-const $props = defineProps({
-    tableCode: {
-        type: String,
-        default: '',
-    },
-    skip: {
-        type: Array,
-        default: () => [],
-    },
-});
-
-const { notify } = useNotify();
-const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
-const popupProxyRef = ref();
-const initialUserConfigViewData = ref();
-const localColumns = ref([]);
-
-const areAllChecksMarked = computed(() => {
-    return localColumns.value.every((col) => col.visible);
-});
-
-function setUserConfigViewData(data, isLocal) {
-    if (!data) return;
-    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-    if (!isLocal) localColumns.value = [];
-    // Array to Object
-    const skippeds = $props.skip.reduce((a, v) => ({ ...a, [v]: v }), {});
-
-    for (let column of columns.value) {
-        const { label, name } = column;
-        if (skippeds[name]) continue;
-        column.visible = data[name] ?? true;
-        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
-    }
-}
-
-function toggleMarkAll(val) {
-    localColumns.value.forEach((col) => (col.visible = val));
-}
-
-async function getConfig(url, filter) {
-    const response = await axios.get(url, {
-        params: { filter: filter },
-    });
-    return response.data && response.data.length > 0 ? response.data[0] : null;
-}
-
-async function fetchViewConfigData() {
-    try {
-        const defaultFilter = {
-            where: { tableCode: $props.tableCode },
-        };
-
-        const userConfig = await getConfig('UserConfigViews', {
-            where: {
-                ...defaultFilter.where,
-                ...{ userFk: user.value.id },
-            },
-        });
-
-        if (userConfig) {
-            initialUserConfigViewData.value = userConfig;
-            setUserConfigViewData(userConfig.configuration);
-            return;
-        }
-
-        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
-        if (defaultConfig) {
-            setUserConfigViewData(defaultConfig.columns);
-            return;
-        }
-    } catch (err) {
-        console.error('Error fetching config view data', err);
-    }
-}
-
-async function saveConfig() {
-    const configuration = {};
-    for (const { name, visible } of localColumns.value)
-        configuration[name] = visible ?? true;
-    setUserConfigViewData(configuration, true);
-    if (!$props.tableCode) return popupProxyRef.value.hide();
-
-    try {
-        const params = {};
-        // Si existe una view config del usuario hacemos un update si no la creamos
-        if (initialUserConfigViewData.value) {
-            params.updates = [
-                {
-                    data: {
-                        configuration,
-                    },
-                    where: {
-                        id: initialUserConfigViewData.value.id,
-                    },
-                },
-            ];
-        } else {
-            params.creates = [
-                {
-                    userFk: user.value.id,
-                    tableCode: $props.tableCode,
-                    tableConfig: $props.tableCode,
-                    configuration,
-                },
-            ];
-        }
-
-        const response = await axios.post('UserConfigViews/crud', params);
-        if (response.data && response.data[0]) {
-            initialUserConfigViewData.value = response.data[0];
-        }
-        notify('globals.dataSaved', 'positive');
-        popupProxyRef.value.hide();
-    } catch (err) {
-        console.error('Error saving user view config', err);
-        notify('errors.writeRequest', 'negative');
-    }
-}
-
-onMounted(async () => {
-    setUserConfigViewData({});
-    await fetchViewConfigData();
-});
-</script>
-<template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-sm q-px-sm" dense>
-        <QPopupProxy ref="popupProxyRef">
-            <QCard class="column q-pa-md">
-                <QIcon name="info" size="sm" class="info-icon">
-                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
-                </QIcon>
-                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
-                <QCheckbox
-                    :label="t('Tick all')"
-                    :model-value="areAllChecksMarked"
-                    @update:model-value="toggleMarkAll($event)"
-                    class="q-mb-sm"
-                />
-                <div v-if="columns.length > 0" class="checks-layout">
-                    <QCheckbox
-                        v-for="col in localColumns"
-                        :key="col.name"
-                        :label="col.label"
-                        v-model="col.visible"
-                    />
-                </div>
-                <QBtn
-                    class="full-width q-mt-md"
-                    color="primary"
-                    @click="saveConfig()"
-                    :label="t('globals.save')"
-                />
-            </QCard>
-        </QPopupProxy>
-        <QTooltip>{{ t('Visible columns') }}</QTooltip>
-    </QBtn>
-</template>
-
-<style lang="scss" scoped>
-.info-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-}
-
-.checks-layout {
-    display: grid;
-    grid-template-columns: repeat(3, 200px);
-}
-</style>
-
-<i18n>
-    es:
-        Check the columns you want to see: Marca las columnas que quieres ver
-        Visible columns: Columnas visibles
-        Tick all: Marcar todas
-</i18n>

src/components/common/RightMenu.vue

@@ -1,54 +0,0 @@
-<script setup>
-import { ref, onMounted, useSlots } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
-
-const slots = useSlots();
-const hasContent = ref(false);
-const rightPanel = ref(null);
-
-onMounted(() => {
-    rightPanel.value = document.querySelector('#right-panel');
-    if (!rightPanel.value) return;
-
-    // Check if there's content to display
-    const observer = new MutationObserver(() => {
-        hasContent.value = rightPanel.value.childNodes.length;
-    });
-
-    observer.observe(rightPanel.value, {
-        subtree: true,
-        childList: true,
-        attributes: true,
-    });
-
-    if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
-});
-
-const { t } = useI18n();
-const stateStore = useStateStore();
-</script>
-<template>
-    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
-        <div class="row q-gutter-x-sm">
-            <QBtn
-                v-if="hasContent || $slots['right-panel']"
-                flat
-                @click="stateStore.toggleRightDrawer()"
-                round
-                dense
-                icon="dock_to_left"
-            >
-                <QTooltip bottom anchor="bottom right">
-                    {{ t('globals.collapseMenu') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-    </Teleport>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit">
-            <div id="right-panel"></div>
-            <slot v-if="!hasContent" name="right-panel" />
-        </QScrollArea>
-    </QDrawer>
-</template>

src/components/common/SendEmailDialog.vue

@@ -29,12 +29,10 @@ async function confirm() {
     const response = { address: address.value };
     if (props.promise) {
         isLoading.value = true;
+        const { address: _address, ...restData } = props.data;
 
         try {
-            const dataCopy = JSON.parse(JSON.stringify({ ...props.data }));
+            Object.assign(response, restData);
-            delete dataCopy.address;
-
-            Object.assign(response, dataCopy);
             await props.promise(response);
         } finally {
             isLoading.value = false;

src/components/common/TableVisibleColumns.vue

@@ -52,14 +52,15 @@ const toggleMarkAll = (val) => {
 
 const getConfig = async (url, filter) => {
     const response = await axios.get(url, {
-        params: { filter: JSON.stringify(filter) },
+        params: { filter: filter },
     });
     return response.data && response.data.length > 0 ? response.data[0] : null;
 };
 
 const fetchViewConfigData = async () => {
+    try {
         const userConfigFilter = {
-        where: { tableCode: $props.tableCode, userFk: user.value.id },
+            where: { tableCode: $props.tableCode, userFk: user.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
@@ -73,18 +74,16 @@ const fetchViewConfigData = async () => {
         const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
         if (defaultConfig) {
-        // Si el backend devuelve una configuración por defecto la usamos
             setUserConfigViewData(defaultConfig.columns);
             return;
-    } else {
+        }
-        // Si no hay configuración por defecto mostramos todas las columnas
+    } catch (err) {
-        const defaultColumns = {};
+        console.err('Error fetching config view data', err);
-        $props.allColumns.forEach((col) => (defaultColumns[col] = true));
-        setUserConfigViewData(defaultColumns);
     }
 };
 
 const saveConfig = async () => {
+    try {
         const params = {};
         const configuration = {};
 
@@ -123,6 +122,9 @@ const saveConfig = async () => {
         emitSavedConfig();
         notify('globals.dataSaved', 'positive');
         popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+    }
 };
 
 const emitSavedConfig = () => {

src/components/common/VnAccountNumber.vue

@@ -1,24 +1,20 @@
 <script setup>
-import { nextTick, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 import { QInput } from 'quasar';
 
-const $props = defineProps({
+const props = defineProps({
     modelValue: {
         type: String,
         default: '',
     },
-    insertable: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
 
-let internalValue = ref($props.modelValue);
+let internalValue = ref(props.modelValue);
 
 watch(
-    () => $props.modelValue,
+    () => props.modelValue,
     (newVal) => {
         internalValue.value = newVal;
     }
@@ -32,46 +28,8 @@ watch(
     }
 );
 
-const handleKeydown = (e) => {
-    if (e.key === 'Backspace') return;
-    if (e.key === '.') {
-        accountShortToStandard();
-        // TODO: Fix this setTimeout, with nextTick doesn't work
-        setTimeout(() => {
-            setCursorPosition(0, e.target);
-        }, 1);
-        return;
-    }
-
-    if ($props.insertable && e.key.match(/[0-9]/)) {
-        handleInsertMode(e);
-    }
-};
-function setCursorPosition(pos, el = vnInputRef.value) {
-    el.focus();
-    el.setSelectionRange(pos, pos);
-}
-const vnInputRef = ref(false);
-const handleInsertMode = (e) => {
-    e.preventDefault();
-    const input = e.target;
-    const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
-    let currentValue = internalValue.value;
-    if (!currentValue) currentValue = e.key;
-    const newValue = e.key;
-    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
-        internalValue.value =
-            currentValue.substring(0, cursorPos) +
-            newValue +
-            currentValue.substring(cursorPos + 1);
-    }
-    nextTick(() => {
-        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
-    });
-};
 function accountShortToStandard() {
-    internalValue.value = internalValue.value?.replace(
+    internalValue.value = internalValue.value.replace(
         '.',
         '0'.repeat(11 - internalValue.value.length)
     );
@@ -79,5 +37,5 @@ function accountShortToStandard() {
 </script>
 
 <template>
-    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
+    <q-input v-model="internalValue" />
 </template>

src/components/common/VnBreadcrumbs.vue

@@ -18,7 +18,7 @@ watchEffect(() => {
         (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
-    if (!matched.value[0]) return;
+
     if (matched.value[0].name != 'Dashboard') {
         root.value = useCamelCase(matched.value[0].path.substring(1).toLowerCase());
 

src/components/common/VnBtnSelect.vue

@@ -1,19 +0,0 @@
-<script setup>
-import VnSelect from './VnSelect.vue';
-
-defineProps({
-    selectProps: { type: Object, required: true },
-    promise: { type: Function, default: () => {} },
-});
-</script>
-<template>
-    <QBtnDropdown v-bind="$attrs" color="primary">
-        <VnSelect
-            v-bind="selectProps"
-            hide-selected
-            hide-dropdown-icon
-            focus-on-mount
-            @update:model-value="promise"
-        />
-    </QBtnDropdown>
-</template>

src/components/common/VnCard.vue

@@ -1,90 +0,0 @@
-<script setup>
-import { onBeforeMount, computed } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
-import useCardSize from 'src/composables/useCardSize';
-import VnSubToolbar from '../ui/VnSubToolbar.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import RightMenu from 'components/common/RightMenu.vue';
-const props = defineProps({
-    dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
-    filter: { type: Object, default: () => {} },
-    descriptor: { type: Object, required: true },
-    filterPanel: { type: Object, default: undefined },
-    searchDataKey: { type: String, default: undefined },
-    searchbarProps: { type: Object, default: undefined },
-    redirectOnError: { type: Boolean, default: false },
-});
-
-const stateStore = useStateStore();
-const route = useRoute();
-const router = useRouter();
-const url = computed(() => {
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
-const searchRightDataKey = computed(() => {
-    if (!props.searchDataKey) return route.name;
-    return props.searchDataKey;
-});
-const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
-    filter: props.filter,
-});
-
-onBeforeMount(async () => {
-    try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-        await arrayData.fetch({ append: false, updateRouter: false });
-    } catch {
-        const { matched: matches } = router.currentRoute.value;
-        const { path } = matches.at(-1);
-        router.push({ path: path.replace(/:id.*/, '') });
-    }
-});
-
-if (props.baseUrl) {
-    onBeforeRouteUpdate(async (to, from) => {
-        if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-            await arrayData.fetch({ append: false, updateRouter: false });
-        }
-    });
-}
-</script>
-<template>
-    <QDrawer
-        v-model="stateStore.leftDrawer"
-        show-if-above
-        :width="256"
-        v-if="stateStore.isHeaderMounted()"
-    >
-        <QScrollArea class="fit">
-            <component :is="descriptor" />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <slot name="searchbar" v-if="props.searchDataKey">
-        <VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
-    </slot>
-    <RightMenu>
-        <template #right-panel v-if="props.filterPanel">
-            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
-        </template>
-    </RightMenu>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.path" />
-            </div>
-        </QPage>
-    </QPageContainer>
-</template>

src/components/common/VnChangePassword.vue

@@ -1,136 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import VnRow from '../ui/VnRow.vue';
-import VnInput from './VnInput.vue';
-import FetchData from '../FetchData.vue';
-import useNotify from 'src/composables/useNotify';
-
-const props = defineProps({
-    submitFn: { type: Function, default: () => {} },
-    askOldPass: { type: Boolean, default: false },
-});
-const emit = defineEmits(['onSubmit']);
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const form = ref();
-const changePassDialog = ref();
-const passwords = ref({ newPassword: null, repeatPassword: null });
-const requirements = ref([]);
-const isLoading = ref(false);
-
-const validate = async () => {
-    const { newPassword, repeatPassword, oldPassword } = passwords.value;
-
-    if (!newPassword) {
-        notify(t('You must enter a new password'), 'negative');
-        return;
-    }
-    if (newPassword !== repeatPassword) {
-        notify(t("Passwords don't match"), 'negative');
-        return;
-    }
-
-    try {
-        isLoading.value = true;
-        await props.submitFn(newPassword, oldPassword);
-        emit('onSubmit');
-    } catch (e) {
-        notify('errors.writeRequest', 'negative');
-    } finally {
-        changePassDialog.value.hide();
-        isLoading.value = false;
-    }
-};
-
-defineExpose({ show: () => changePassDialog.value.show() });
-</script>
-<template>
-    <FetchData
-        url="UserPasswords/findOne"
-        auto-load
-        @on-fetch="(data) => (requirements = data)"
-    />
-    <QDialog ref="changePassDialog">
-        <QCard style="width: 350px">
-            <QCardSection>
-                <slot name="header">
-                    <VnRow class="items-center" style="flex-direction: row">
-                        <span class="text-h6" v-text="t('globals.changePass')" />
-                        <QIcon
-                            class="cursor-pointer"
-                            name="close"
-                            size="xs"
-                            style="flex: 0"
-                            v-close-popup
-                        />
-                    </VnRow>
-                </slot>
-            </QCardSection>
-            <QForm ref="form">
-                <QCardSection>
-                    <VnInput
-                        v-if="props.askOldPass"
-                        :label="t('Old password')"
-                        v-model="passwords.oldPassword"
-                        type="password"
-                        :required="true"
-                        autofocus
-                    />
-                    <VnInput
-                        :label="t('New password')"
-                        v-model="passwords.newPassword"
-                        type="password"
-                        :required="true"
-                        :info="
-                            t('passwordRequirements', {
-                                length: requirements.length,
-                                nAlpha: requirements.nAlpha,
-                                nUpper: requirements.nUpper,
-                                nDigits: requirements.nDigits,
-                                nPunct: requirements.nPunct,
-                            })
-                        "
-                        autofocus
-                    />
-
-                    <VnInput
-                        :label="t('Repeat password')"
-                        v-model="passwords.repeatPassword"
-                        type="password"
-                    />
-                </QCardSection>
-            </QForm>
-            <QCardActions>
-                <slot name="actions">
-                    <QBtn
-                        :disabled="isLoading"
-                        :loading="isLoading"
-                        :label="t('globals.cancel')"
-                        class="q-ml-sm"
-                        color="primary"
-                        flat
-                        type="reset"
-                        v-close-popup
-                    />
-                    <QBtn
-                        :disabled="isLoading"
-                        :loading="isLoading"
-                        :label="t('globals.confirm')"
-                        color="primary"
-                        @click="validate"
-                    />
-                </slot>
-            </QCardActions>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    New password: Nueva contraseña
-    Repeat password: Repetir contraseña
-    You must enter a new password: Debes introducir la nueva contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>

src/components/common/VnComponent.vue

@@ -1,59 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-
-const model = defineModel(undefined, { required: true });
-const $props = defineProps({
-    prop: {
-        type: Object,
-        required: true,
-    },
-    components: {
-        type: Object,
-        default: () => {},
-    },
-    value: {
-        type: [Object, Number, String, Boolean],
-        default: () => {},
-    },
-});
-
-const componentArray = computed(() => {
-    if (typeof $props.prop === 'object') return [$props.prop];
-    return $props.prop;
-});
-
-function mix(toComponent) {
-    const { component, attrs, event } = toComponent;
-    const customComponent = $props.components[component];
-    return {
-        component: customComponent?.component ?? component,
-        attrs: {
-            ...toValueAttrs(attrs),
-            ...toValueAttrs(customComponent?.attrs),
-            ...toComponent,
-            ...toValueAttrs(customComponent?.forceAttrs),
-        },
-        event: { ...customComponent?.event, ...event },
-    };
-}
-
-function toValueAttrs(attrs) {
-    if (!attrs) return;
-    return typeof attrs == 'function' ? attrs($props.value) : attrs;
-}
-</script>
-<template>
-    <span
-        v-for="toComponent of componentArray"
-        :key="toComponent.name"
-        class="column flex-center fit"
-    >
-        <component
-            v-if="toComponent?.component"
-            :is="mix(toComponent).component"
-            v-bind="mix(toComponent).attrs"
-            v-on="mix(toComponent).event ?? {}"
-            v-model="model"
-        />
-    </span>
-</template>

src/components/common/VnCurrency.vue

@@ -0,0 +1,34 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useCapitalize } from 'src/composables/useCapitalize';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const props = defineProps({
+    modelValue: { type: [String, Number], default: '' },
+});
+
+const { t } = useI18n();
+const emit = defineEmits(['update:modelValue']);
+
+const amount = computed({
+    get() {
+        return props.modelValue;
+    },
+    set(val) {
+        emit('update:modelValue', val);
+    },
+});
+</script>
+<template>
+    <VnInput
+        v-model="amount"
+        type="number"
+        step="any"
+        :label="useCapitalize(t('amount'))"
+    />
+</template>
+<i18n>
+es:
+    amount: importe
+</i18n>

src/components/common/VnDate.vue

@@ -1,29 +0,0 @@
-<script setup>
-const model = defineModel({ type: [String, Number], required: true });
-</script>
-<template>
-    <QDate v-model="model" :today-btn="true" :options="$attrs.options" />
-</template>
-<style lang="scss" scoped>
-.q-date {
-    width: 245px;
-    min-width: unset;
-
-    :deep(.q-date__calendar) {
-        padding-bottom: 0;
-    }
-    :deep(.q-date__view) {
-        min-height: 245px;
-        padding: 8px;
-    }
-    :deep(.q-date__calendar-days-container) {
-        min-height: 160px;
-        height: unset;
-    }
-
-    :deep(.q-date__header) {
-        padding: 2px 2px 5px 12px;
-        height: 60px;
-    }
-}
-</style>

src/components/common/VnDms.vue

@@ -6,7 +6,7 @@ import axios from 'axios';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
@@ -31,10 +31,6 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    description: {
-        type: String,
-        default: null,
-    },
 });
 
 const warehouses = ref();
@@ -47,8 +43,7 @@ const dms = ref({});
 onMounted(() => {
     defaultData();
     if (!$props.formInitialData)
-        dms.value.description =
+        dms.value.description = t($props.model + 'Description', dms.value);
-            $props.description ?? t($props.model + 'Description', dms.value);
 });
 function onFileChange(files) {
     dms.value.hasFileAttached = !!files;
@@ -59,6 +54,7 @@ function mapperDms(data) {
     const formData = new FormData();
     const { files } = data;
     if (files) formData.append(files?.name, files);
+    delete data.files;
 
     const dms = {
         hasFile: !!data.hasFile,
@@ -82,8 +78,6 @@ async function save() {
     const body = mapperDms(dms.value);
     const response = await axios.post(getUrl(), body[0], body[1]);
     emit('onDataSaved', body[1].params, response);
-    delete dms.value.files;
-    return response;
 }
 
 function defaultData() {
@@ -129,7 +123,7 @@ function addDefaultData(data) {
             <div class="q-gutter-y-ms">
                 <VnRow>
                     <VnInput :label="t('globals.reference')" v-model="dms.reference" />
-                    <VnSelect
+                    <VnSelectFilter
                         :label="t('globals.company')"
                         v-model="dms.companyFk"
                         :options="companies"
@@ -139,7 +133,7 @@ function addDefaultData(data) {
                     />
                 </VnRow>
                 <VnRow>
-                    <VnSelect
+                    <VnSelectFilter
                         :label="t('globals.warehouse')"
                         v-model="dms.warehouseFk"
                         :options="warehouses"
@@ -147,7 +141,7 @@ function addDefaultData(data) {
                         option-label="name"
                         input-debounce="0"
                     />
-                    <VnSelect
+                    <VnSelectFilter
                         :label="t('globals.type')"
                         v-model="dms.dmsTypeFk"
                         :options="dmsTypes"
@@ -163,14 +157,13 @@ function addDefaultData(data) {
                 />
                 <QFile
                     ref="inputFileRef"
-                    :label="t('globals.file')"
+                    :label="t('entry.buys.file')"
                     v-model="dms.files"
                     :multiple="false"
                     :accept="allowedContentTypes"
                     @update:model-value="onFileChange(dms.files)"
                     class="required"
                     :display-value="dms.file"
-                    data-cy="VnDms_inputFile"
                 >
                     <template #append>
                         <QIcon

src/components/common/VnDmsList.vue

@@ -5,14 +5,12 @@ import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
 
-import VnUserLink from '../ui/VnUserLink.vue';
-import { downloadFile } from 'src/composables/downloadFile';
-import VnImg from 'components/ui/VnImg.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import { useSession } from 'src/composables/useSession';
+import VnUserLink from '../ui/VnUserLink.vue';
+import { downloadFile } from 'src/composables/downloadFile';
 
 const route = useRoute();
 const quasar = useQuasar();
@@ -20,7 +18,6 @@ const { t } = useI18n();
 const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
-const token = useSession().getTokenMultimedia();
 
 const $props = defineProps({
     model: {
@@ -38,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: undefined,
+        default: null,
     },
     defaultDmsCode: {
         type: String,
@@ -92,23 +89,6 @@ const dmsFilter = {
 };
 
 const columns = computed(() => [
-    {
-        label: '',
-        name: 'file',
-        align: 'left',
-        component: VnImg,
-        props: (prop) => {
-            return {
-                storage: 'dms',
-                collection: null,
-                resolution: null,
-                id: prop.row.file.split('.')[0],
-                token: token,
-                class: 'rounded',
-                ratio: 1,
-            };
-        },
-    },
     {
         align: 'left',
         field: 'id',
@@ -155,13 +135,19 @@ const columns = computed(() => [
         field: 'hasFile',
         label: t('globals.original'),
         name: 'hasFile',
-        toolTip: t('The documentation is available in paper form'),
         component: QCheckbox,
         props: (prop) => ({
             disable: true,
             'model-value': Boolean(prop.value),
         }),
     },
+    {
+        align: 'left',
+        field: 'file',
+        label: t('globals.file'),
+        name: 'file',
+        component: 'span',
+    },
     {
         align: 'left',
         field: 'worker',
@@ -201,7 +187,7 @@ const columns = computed(() => [
                     downloadFile(
                         prop.row.id,
                         $props.downloadModel,
-                        undefined,
+                        null,
                         prop.row.download
                     ),
             },
@@ -287,10 +273,6 @@ function shouldRenderButton(button, isExternal = false) {
     if (button.name == 'download') return true;
     return button.external === isExternal;
 }
-
-defineExpose({
-    dmsRef,
-});
 </script>
 <template>
     <VnPaginate
@@ -311,14 +293,6 @@ defineExpose({
                 row-key="clientFk"
                 :grid="$q.screen.lt.sm"
             >
-                <template #header="props">
-                    <QTr :props="props" class="bg">
-                        <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                            <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip
-                            >{{ col.label }}
-                        </QTh>
-                    </QTr>
-                </template>
                 <template #body-cell="props">
                     <QTd :props="props">
                         <QTr :props="props">
@@ -400,21 +374,14 @@ defineExpose({
         />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn
+        <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
-            fab
-            color="primary"
-            icon="add"
-            shortcut="+"
-            @click="showFormDialog()"
-            class="fill-icon"
-        >
-            <QTooltip>
-                {{ t('Upload file') }}
-            </QTooltip>
-        </QBtn>
     </QPageSticky>
 </template>
 <style scoped>
+.q-gutter-y-ms {
+    display: grid;
+    row-gap: 20px;
+}
 .labelColor {
     color: var(--vn-label-color);
 }
@@ -422,10 +389,7 @@ defineExpose({
 <i18n>
 en:
     contentTypesInfo: Allowed file types {allowedContentTypes}
-    The documentation is available in paper form: The documentation is available in paper form
 es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
-    Upload file: Subir fichero
-    the documentation is available in paper form: Se tiene la documentación en papel
 </i18n>

src/components/common/VnInput.vue

@@ -1,17 +1,8 @@
 <script setup>
-import { computed, ref, useAttrs, nextTick } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRequired } from 'src/composables/useRequired';
 
-const $attrs = useAttrs();
+const emit = defineEmits(['update:modelValue', 'update:options', 'keyup.enter']);
-const { isRequired, requiredFieldRule } = useRequired($attrs);
-const { t } = useI18n();
-const emit = defineEmits([
-    'update:modelValue',
-    'update:options',
-    'keyup.enter',
-    'remove',
-]);
 
 const $props = defineProps({
     modelValue: {
@@ -22,39 +13,20 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    info: {
-        type: String,
-        default: '',
-    },
-    clearable: {
-        type: Boolean,
-        default: true,
-    },
-    emptyToNull: {
-        type: Boolean,
-        default: true,
-    },
-    insertable: {
-        type: Boolean,
-        default: false,
-    },
-    maxlength: {
-        type: Number,
-        default: null,
-    },
 });
 
+const { t } = useI18n();
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 const vnInputRef = ref(null);
 const value = computed({
     get() {
         return $props.modelValue;
     },
     set(value) {
-        if ($props.emptyToNull && value === '') value = null;
         emit('update:modelValue', value);
     },
 });
-const hover = ref(false);
+
 const styleAttrs = computed(() => {
     return $props.isOutlined
         ? {
@@ -65,6 +37,10 @@ const styleAttrs = computed(() => {
         : {};
 });
 
+const onEnterPress = () => {
+    emit('keyup.enter');
+};
+
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -72,112 +48,23 @@ const focus = () => {
 defineExpose({
     focus,
 });
-
-const mixinRules = [
-    requiredFieldRule,
-    ...($attrs.rules ?? []),
-    (val) => {
-        const { maxlength } = vnInputRef.value;
-        if (maxlength && +val.length > maxlength)
-            return t(`maxLength`, { value: maxlength });
-        const { min, max } = vnInputRef.value.$attrs;
-        if (!min) return null;
-        if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
-        if (!max) return null;
-        if (max > 0) {
-            if (Math.floor(val) > max) return t('inputMax', { value: max });
-        }
-    },
-];
-
-const handleKeydown = (e) => {
-    if (e.key === 'Backspace') return;
-
-    if ($props.insertable && e.key.match(/[0-9]/)) {
-        handleInsertMode(e);
-    }
-};
-
-const handleInsertMode = (e) => {
-    e.preventDefault();
-    const input = e.target;
-    const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
-    let currentValue = value.value;
-    if (!currentValue) currentValue = e.key;
-    const newValue = e.key;
-    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
-        value.value =
-            currentValue.substring(0, cursorPos) +
-            newValue +
-            currentValue.substring(cursorPos + 1);
-    }
-    nextTick(() => {
-        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
-    });
-};
 </script>
 
 <template>
-    <div @mouseover="hover = true" @mouseleave="hover = false">
     <QInput
         ref="vnInputRef"
         v-model="value"
         v-bind="{ ...$attrs, ...styleAttrs }"
-            :type="$attrs.type"
+        type="text"
-            :class="{ required: isRequired }"
+        :class="{ required: $attrs.required }"
-            @keyup.enter="emit('keyup.enter')"
+        @keyup.enter="onEnterPress()"
-            @keydown="handleKeydown"
+        :rules="$attrs.required ? [requiredFieldRule] : null"
-            :clearable="false"
-            :rules="mixinRules"
-            :lazy-rules="true"
-            hide-bottom-space
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
     >
         <template v-if="$slots.prepend" #prepend>
             <slot name="prepend" />
         </template>
-            <template #append>
+        <template v-if="$slots.append" #append>
-                <QIcon
+            <slot name="append" />
-                    name="close"
-                    size="xs"
-                    v-if="
-                        hover &&
-                        value &&
-                        !$attrs.disabled &&
-                        !$attrs.readonly &&
-                        $props.clearable
-                    "
-                    @click="
-                        () => {
-                            value = null;
-                            vnInputRef.focus();
-                            emit('remove');
-                        }
-                    "
-                ></QIcon>
-                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
-                <QIcon v-if="info" name="info">
-                    <QTooltip max-width="350px">
-                        {{ info }}
-                    </QTooltip>
-                </QIcon>
         </template>
     </QInput>
-    </div>
 </template>
-<i18n>
-    en:
-        inputMin: Must be more than {value}
-        maxLength: The value exceeds {value} characters
-        inputMax: Must be less than {value}
-    es:
-        inputMin: Debe ser mayor a {value}
-        maxLength: El valor excede los {value} carácteres
-        inputMax: Debe ser menor a {value}
-</i18n>
-<style lang="scss">
-.q-field__append {
-    padding-inline: 0;
-}
-</style>

src/components/common/VnInputDate.vue

@@ -1,85 +1,72 @@
 <script setup>
-import { onMounted, watch, computed, ref, useAttrs } from 'vue';
+import { computed, ref } from 'vue';
-import { date } from 'quasar';
+import VnInput from 'components/common/VnInput.vue';
-import { useI18n } from 'vue-i18n';
+import isValidDate from "filters/isValidDate";
-import VnDate from './VnDate.vue';
-import { useRequired } from 'src/composables/useRequired';
 
-const $attrs = useAttrs();
+const props = defineProps({
-const { isRequired, requiredFieldRule } = useRequired($attrs);
+    modelValue: {
-const model = defineModel({ type: [String, Date] });
+        type: String,
-const { t } = useI18n();
+        default: null,
-
+    },
-const $props = defineProps({
+    readonly: {
+        type: Boolean,
+        default: false,
+    },
     isOutlined: {
         type: Boolean,
         default: false,
     },
-    showEvent: {
-        type: Boolean,
-        default: true,
-    },
 });
+const emit = defineEmits(['update:modelValue']);
 
-const vnInputDateRef = ref(null);
+const joinDateAndTime = (date, time) => {
+    if (!date) {
+        return null;
+    }
+    if (!time) {
+        return new Date(date).toISOString();
+    }
+    const [year, month, day] = date.split('/');
+    return new Date(`${year}-${month}-${day}T${time}`).toISOString();
+};
 
-const dateFormat = 'DD/MM/YYYY';
+const time = computed(() => (props.modelValue ? props.modelValue.split('T')?.[1] : null));
-const isPopupOpen = ref();
+const value = computed({
-const hover = ref();
-const mask = ref();
-
-const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
-
-const formattedDate = computed({
     get() {
-        if (!model.value) return model.value;
+        return props.modelValue;
-        return date.formatDate(new Date(model.value), dateFormat);
     },
     set(value) {
-        if (value == model.value) return;
+        emit('update:modelValue', joinDateAndTime(value, time.value));
-        let newDate;
-        if (value) {
-            // parse input
-            if (value.includes('/') && value.length >= 10) {
-                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                value = date.formatDate(
-                    new Date(value).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
-                );
-            }
-            const [year, month, day] = value.split('-').map((e) => parseInt(e));
-            newDate = new Date(year, month - 1, day);
-            if (model.value) {
-                const orgDate =
-                    model.value instanceof Date ? model.value : new Date(model.value);
-
-                newDate.setHours(
-                    orgDate.getHours(),
-                    orgDate.getMinutes(),
-                    orgDate.getSeconds(),
-                    orgDate.getMilliseconds()
-                );
-            }
-        }
-        if (!isNaN(newDate)) model.value = newDate.toISOString();
     },
 });
 
-const popupDate = computed(() =>
+const isPopupOpen = ref(false);
-    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
+
-);
+const onDateUpdate = (date) => {
-onMounted(() => {
+    value.value = date;
-    // fix quasar bug
+    isPopupOpen.value = false;
-    mask.value = '##/##/####';
+};
+
+const padDate = (value) => value.toString().padStart(2, '0');
+const formatDate = (dateString) => {
+    const date = new Date(dateString || '');
+    return `${date.getFullYear()}/${padDate(date.getMonth() + 1)}/${padDate(
+        date.getDate()
+    )}`;
+};
+const displayDate = (dateString) => {
+    if (!dateString || !isValidDate(dateString)) {
+        return '';
+    }
+    return new Date(dateString).toLocaleDateString([], {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
     });
-watch(
+};
-    () => model.value,
-    (val) => (formattedDate.value = val),
-    { immediate: true }
-);
 
 const styleAttrs = computed(() => {
-    return $props.isOutlined
+    return props.isOutlined
         ? {
               dense: true,
               outlined: true,
@@ -87,70 +74,35 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
-
-const manageDate = (date) => {
-    formattedDate.value = date;
-    isPopupOpen.value = false;
-};
 </script>
 
 <template>
-    <div @mouseover="hover = true" @mouseleave="hover = false">
+    <VnInput
-        <QInput
-            ref="vnInputDateRef"
-            v-model="formattedDate"
         class="vn-input-date"
-            :mask="mask"
+        :model-value="displayDate(value)"
-            placeholder="dd/mm/aaaa"
         v-bind="{ ...$attrs, ...styleAttrs }"
-            :class="{ required: isRequired }"
+        readonly
-            :rules="mixinRules"
-            :clearable="false"
         @click="isPopupOpen = true"
-            hide-bottom-space
     >
         <template #append>
-                <QIcon
+            <QIcon name="event" class="cursor-pointer">
-                    name="close"
+                <QPopupProxy
-                    size="xs"
+                    v-model="isPopupOpen"
-                    v-if="
+                    cover
-                        ($attrs.clearable == undefined || $attrs.clearable) &&
-                        hover &&
-                        model &&
-                        !$attrs.disable
-                    "
-                    @click="
-                        vnInputDateRef.focus();
-                        model = null;
-                        isPopupOpen = false;
-                    "
-                />
-                <QIcon
-                    v-if="showEvent"
-                    name="event"
-                    class="cursor-pointer"
-                    @click="isPopupOpen = !isPopupOpen"
-                    :title="t('Open date')"
-                />
-            </template>
-            <QMenu
-                v-if="$q.screen.gt.xs"
                     transition-show="scale"
                     transition-hide="scale"
-                v-model="isPopupOpen"
+                    :no-parent-event="props.readonly"
-                anchor="bottom left"
-                self="top start"
-                :no-focus="true"
-                :no-parent-event="true"
                 >
-                <VnDate v-model="popupDate" @update:model-value="manageDate" />
+                    <QDate
-            </QMenu>
+                        :model-value="formatDate(value)"
-            <QDialog v-else v-model="isPopupOpen">
+                        @update:model-value="onDateUpdate"
-                <VnDate v-model="popupDate" @update:model-value="manageDate" />
+                    />
-            </QDialog>
+                </QPopupProxy>
-        </QInput>
+            </QIcon>
-    </div>
         </template>
+    </VnInput>
+</template>
+
 <style lang="scss">
 .vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
     border-bottom-style: solid;
@@ -160,7 +112,3 @@ const manageDate = (date) => {
     border-style: solid;
 }
 </style>
-<i18n>
-    es:
-        Open date: Abrir fecha
-</i18n>

src/components/common/VnInputNumber.vue

@@ -1,13 +0,0 @@
-<script setup>
-import VnInput from 'src/components/common/VnInput.vue';
-import { ref } from 'vue';
-import { useAttrs } from 'vue';
-
-const model = defineModel({ type: [Number, String] });
-const $attrs = useAttrs();
-const step = ref($attrs.step || 0.01);
-</script>
-
-<template>
-    <VnInput v-bind="$attrs" v-model.number="model" type="number" :step="step" />
-</template>

src/components/common/VnInputTime.vue

@@ -1,16 +1,15 @@
 <script setup>
-import { computed, ref, useAttrs } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { date } from 'quasar';
+import isValidDate from 'filters/isValidDate';
-import VnTime from './VnTime.vue';
+import VnInput from "components/common/VnInput.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: {
+    modelValue: {
+        type: String,
+        default: null,
+    },
+    readonly: {
         type: Boolean,
         default: false,
     },
@@ -19,12 +18,46 @@ const props = defineProps({
         default: false,
     },
 });
-const vnInputTimeRef = ref(null);
+const { t } = useI18n();
-const initialDate = ref(model.value ?? Date.vnNew());
+const emit = defineEmits(['update:modelValue']);
-const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
+const value = computed({
-const dateFormat = 'HH:mm';
+    get() {
-const isPopupOpen = ref();
+        return props.modelValue;
-const hover = ref();
+    },
+    set(value) {
+        const [hours, minutes] = value.split(':');
+        const date = new Date(props.modelValue);
+        date.setHours(
+            Number.parseInt(hours) || 0,
+            Number.parseInt(minutes) || 0,
+            0,
+            0
+        );
+        emit('update:modelValue', value ? date.toISOString() : null);
+    },
+});
+
+const isPopupOpen = ref(false);
+const onDateUpdate = (date) => {
+    internalValue.value = date;
+};
+
+const save = () => {
+    value.value = internalValue.value;
+};
+const formatTime = (dateString) => {
+    if (!dateString || !isValidDate(dateString)) {
+        return '';
+    }
+
+    const date = new Date(dateString || '');
+    return date.toLocaleTimeString([], {
+        hour: '2-digit',
+        minute: '2-digit',
+    });
+};
+
+const internalValue = ref(formatTime(value));
 
 const styleAttrs = computed(() => {
     return props.isOutlined
@@ -35,96 +68,52 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
-
-const formattedTime = computed({
-    get() {
-        if (!model.value || model.value?.length <= 5) return model.value;
-        return dateToTime(model.value);
-    },
-    set(value) {
-        if (value == model.value) return;
-        let time = value;
-        if (time) {
-            if (time?.length > 5) time = dateToTime(time);
-            else {
-                if (time.length == 1 && parseInt(time) > 2) time = time.padStart(2, '0');
-                time = time.padEnd(5, '0');
-                if (!time.includes(':'))
-                    time = time.substring(0, 2) + ':' + time.substring(3, 5);
-            }
-            if (!props.timeOnly) {
-                const [hh, mm] = time.split(':');
-
-                const date = new Date(model.value ? model.value : initialDate.value);
-                date.setHours(hh, mm, 0);
-                time = date?.toISOString();
-            }
-        }
-        model.value = time;
-    },
-});
-
-function dateToTime(newDate) {
-    return date.formatDate(new Date(newDate), dateFormat);
-}
 </script>
+
 <template>
-    <div @mouseover="hover = true" @mouseleave="hover = false">
+    <VnInput
-        <QInput
-            ref="vnInputTimeRef"
         class="vn-input-time"
-            mask="##:##"
+        readonly
-            placeholder="--:--"
+        :model-value="formatTime(value)"
-            v-model="formattedTime"
         v-bind="{ ...$attrs, ...styleAttrs }"
-            :class="{ required: isRequired }"
+        @click="isPopupOpen = true"
-            style="min-width: 100px"
-            :rules="mixinRules"
-            @click="isPopupOpen = false"
-            type="time"
-            hide-bottom-space
     >
         <template #append>
-                <QIcon
+            <QIcon name="event" class="cursor-pointer">
-                    name="close"
+                <QPopupProxy
-                    size="xs"
+                    v-model="isPopupOpen"
-                    v-if="
+                    cover
-                        ($attrs.clearable == undefined || $attrs.clearable) &&
-                        hover &&
-                        model &&
-                        !$attrs.disable
-                    "
-                    @click="
-                        vnInputTimeRef.focus();
-                        model = null;
-                        isPopupOpen = false;
-                    "
-                />
-                <QIcon
-                    name="Schedule"
-                    class="cursor-pointer"
-                    @click="isPopupOpen = !isPopupOpen"
-                    :title="t('Open time')"
-                />
-            </template>
-            <QMenu
-                v-if="$q.screen.gt.xs"
                     transition-show="scale"
                     transition-hide="scale"
-                v-model="isPopupOpen"
+                    :no-parent-event="props.readonly"
-                anchor="bottom left"
-                self="top start"
-                :no-focus="true"
-                :no-parent-event="true"
                 >
-                <VnTime v-model="formattedTime" />
+                    <QTime
-            </QMenu>
+                        :format24h="false"
-            <QDialog v-else v-model="isPopupOpen">
+                        :model-value="formatTime(value)"
-                <VnTime v-model="formattedTime" />
+                        @update:model-value="onDateUpdate"
-            </QDialog>
+                    >
-        </QInput>
+                        <div class="row items-center justify-end q-gutter-sm">
+                            <QBtn
+                                :label="t('Cancel')"
+                                color="primary"
+                                flat
+                                v-close-popup
+                            />
+                            <QBtn
+                                label="Ok"
+                                color="primary"
+                                flat
+                                @click="save"
+                                v-close-popup
+                            />
                         </div>
+                    </QTime>
+                </QPopupProxy>
+            </QIcon>
         </template>
+    </VnInput>
+</template>
+
 <style lang="scss">
 .vn-input-time.q-field--standard.q-field--readonly .q-field__control:before {
     border-bottom-style: solid;
@@ -134,12 +123,8 @@ function dateToTime(newDate) {
     border-style: solid;
 }
 </style>
-<style lang="scss" scoped>
+
-:deep(input[type='time']::-webkit-calendar-picker-indicator) {
-    display: none;
-}
-</style>
 <i18n>
 es:
-        Open time: Abrir tiempo
+    Cancel: Cancelar
 </i18n>

src/components/common/VnLocation.vue

@@ -1,94 +1,122 @@
 <script setup>
+import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
+import FetchData from 'components/FetchData.vue';
+const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
+
-import { useAttrs } from 'vue';
-import { useRequired } from 'src/composables/useRequired';
 const { t } = useI18n();
-const emit = defineEmits(['update:model-value', 'update:options']);
+const postcodesOptions = ref([]);
-const $attrs = useAttrs();
+const postcodesRef = ref(null);
-const { isRequired, requiredFieldRule } = useRequired($attrs);
+
-const props = defineProps({
+const $props = defineProps({
-    location: {
+    modelValue: {
-        type: Object,
+        type: [String, Number, Object],
         default: null,
     },
+    options: {
+        type: Array,
+        default: () => [],
+    },
+    optionLabel: {
+        type: String,
+        default: '',
+    },
+    optionValue: {
+        type: String,
+        default: '',
+    },
+    filterOptions: {
+        type: Array,
+        default: () => [],
+    },
+    isClearable: {
+        type: Boolean,
+        default: true,
+    },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const mixinRules = [requiredFieldRule];
+const { options } = toRefs($props);
-const locationProperties = [
+const myOptions = ref([]);
-    'postcode',
+const myOptionsOriginal = ref([]);
-    (obj) =>
-        obj.city
-            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
-            : null,
-    (obj) => obj.country?.name,
-];
 
-const formatLocation = (obj, properties) => {
+const value = computed({
-    const parts = properties.map((prop) => {
+    get() {
-        if (typeof prop === 'string') {
+        return $props.modelValue;
-            return obj[prop];
+    },
-        } else if (typeof prop === 'function') {
+    set(value) {
-            return prop(obj);
+        emit(
-        }
+            'update:modelValue',
-        return null;
+            postcodesOptions.value.find((p) => p.code === value)
+        );
+    },
 });
 
-    const filteredParts = parts.filter(
+onMounted(() => {
-        (part) => part !== null && part !== undefined && part !== ''
+    locationFilter($props.modelValue);
-    );
+});
 
-    return filteredParts.join(', ');
+function setOptions(data) {
-};
+    myOptions.value = JSON.parse(JSON.stringify(data));
+    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+}
+setOptions(options.value);
 
-const modelValue = ref(
+watch(options, (newValue) => {
-    props.location ? formatLocation(props.location, locationProperties) : null
+    setOptions(newValue);
-);
+});
 
 function showLabel(data) {
-    const dataProperties = [
+    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
-        'code',
-        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
-        'country',
-    ];
-    return formatLocation(data, dataProperties);
 }
 
-const handleModelValue = (data) => {
+function locationFilter(search = '') {
-    emit('update:model-value', data);
+    if (
-};
+        search &&
+        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
+    )
+        return;
+    let where = { search };
+    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
+}
+
+function handleFetch(data) {
+    postcodesOptions.value = data;
+}
+function onDataSaved(newPostcode) {
+    postcodesOptions.value.push(newPostcode);
+    value.value = newPostcode.code;
+}
 </script>
 <template>
-    <VnSelectDialog
+    <FetchData
-        v-model="modelValue"
+        ref="postcodesRef"
-        option-filter-value="search"
-        :option-label="
-            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
-        "
         url="Postcodes/filter"
-        @update:model-value="handleModelValue"
+        @on-fetch="(data) => handleFetch(data)"
-        :use-like="false"
+    />
+    <VnSelectDialog
+        v-if="postcodesRef"
+        :option-label="(opt) => showLabel(opt) ?? 'code'"
+        :option-value="(opt) => opt.code"
+        v-model="value"
+        :options="postcodesOptions"
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
+        @input-value="locationFilter"
+        :default-filter="false"
         :input-debounce="300"
-        :class="{ required: isRequired }"
+        :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
-        :emit-value="false"
-        :tooltip="t('Create new location')"
-        :rules="mixinRules"
-        :lazy-rules="true"
     >
         <template #form>
             <CreateNewPostcode
-                @on-data-saved="
+                @on-data-saved="onDataSaved"
-                    (newValue) => {
-                        modelValue = newValue;
-                        emit('update:model-value', newValue);
-                    }
-                "
             />
         </template>
         <template #option="{ itemProps, opt }">
@@ -112,9 +140,7 @@ const handleModelValue = (data) => {
 <i18n>
 en:
     search_by_postalcode: Search by postalcode, town, province or country
-    Create new location: Create new location
 es:
     Location: Ubicación
-    Create new location: Crear nueva ubicación
     search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>

src/components/common/VnLog.vue

@@ -1,7 +1,7 @@
 <script setup>
-import { ref, onUnmounted, watch } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -12,15 +12,13 @@ import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
-import VnSelect from './VnSelect.vue';
+import VnSelectFilter from './VnSelectFilter.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
-import VnPaginate from '../ui/VnPaginate.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
 const { models } = validationsStore;
 const route = useRoute();
-const router = useRouter();
 const { t } = useI18n();
 const props = defineProps({
     model: {
@@ -51,7 +49,6 @@ const filter = {
         'changedModelId',
         'changedModelValue',
         'description',
-        'summaryId',
     ],
     include: [
         {
@@ -67,10 +64,9 @@ const filter = {
             },
         },
     ],
-    where: { and: [{ originFk: route.params.id }] },
 };
 
-const paginate = ref();
+const workers = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -216,7 +212,7 @@ function getLogTree(data) {
         }
         nLogs++;
         modelLog.logs.push(log);
-        modelLog.summaryId = modelLog.logs[0].summaryId;
+
         // Changes
         const notDelete = log.action != 'delete';
         const olds = (notDelete ? log.oldInstance : null) || {};
@@ -237,7 +233,9 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree(data) {
+async function setLogTree() {
+    filter.where = { and: [{ originFk: route.params.id }] };
+    const { data } = await getLogs(filter);
     logTree.value = getLogTree(data);
 }
 
@@ -266,7 +264,15 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    paginate.value.fetch(filter);
+    const { data } = await getLogs(filter);
+
+    logTree.value = getLogTree(data);
+}
+
+async function getLogs(filter) {
+    return axios.get(props.url ?? `${props.model}Logs`, {
+        params: { filter: JSON.stringify(filter) },
+    });
 }
 
 function setDate(type) {
@@ -369,46 +375,33 @@ async function clearFilter() {
     await applyFilter();
 }
 
-onUnmounted(() => {
+setLogTree();
-    stateStore.rightDrawer = false;
-});
-
-watch(
-    () => router.currentRoute.value.params.id,
-    () => {
-        applyFilter();
-    }
-);
 </script>
 <template>
+    <FetchData
+        :url="`${props.model}Logs/${route.params.id}/editors`"
+        :filter="{
+            fields: ['id', 'nickname', 'name', 'image'],
+            order: 'nickname',
+            limit: 30,
+        }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
     <FetchData
         :url="`${props.model}Logs/${route.params.id}/models`"
         :filter="{ order: ['changedModel'] }"
         @on-fetch="
             (data) =>
                 (actions = data.map((item) => {
-                    const changedModel = item.changedModel;
                     return {
-                        locale: useCapitalize(
+                        locale: useCapitalize(validations[item.changedModel].locale.name),
-                            validations[changedModel]?.locale?.name ?? changedModel
+                        value: item.changedModel,
-                        ),
-                        value: changedModel,
                     };
                 }))
         "
         auto-load
     />
-    <VnPaginate
-        ref="paginate"
-        :data-key="`${model}Log`"
-        :url="`${model}Logs`"
-        :filter="filter"
-        :skeleton="false"
-        auto-load
-        @on-fetch="setLogTree"
-        search-url="logs"
-    >
-        <template #body>
     <div
         class="column items-center logs origin-log q-mt-md"
         v-for="(originLog, originLogIndex) in logTree"
@@ -428,13 +421,12 @@ watch(
         >
             <div class="timeline">
                 <div class="user-avatar">
-                            <VnUserLink :worker-id="userLog?.user?.id">
+                    <VnUserLink :worker-id="userLog.user.id">
                         <template #link>
                             <VnAvatar
-                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                :class="{ 'cursor-pointer': userLog.user.id }"
-                                        :worker-id="userLog?.user?.id"
+                                :worker-id="userLog.user.id"
-                                        :title="userLog?.user?.nickname"
+                                :title="userLog.user.nickname"
-                                        :show-letter="!userLog?.user"
                                 size="lg"
                             />
                         </template>
@@ -456,29 +448,22 @@ watch(
                                 size="md"
                                 class="model-name q-mr-xs text-white"
                                 v-if="
-                                            !(
+                                    !(modelLog.changedModel && modelLog.changedModelId) &&
-                                                modelLog.changedModel &&
+                                    modelLog.model
-                                                modelLog.changedModelId
-                                            ) && modelLog.model
                                 "
                                 :style="{
                                     backgroundColor: useColor(modelLog.model),
                                 }"
-                                        :title="`${modelLog.model} #${modelLog.id}`"
+                                :title="modelLog.model"
                             >
                                 {{ t(modelLog.modelI18n) }}
                             </QChip>
-
+                            <span class="model-id" v-if="modelLog.id"
-                                    <span
+                                >#{{ modelLog.id }}</span
-                                        class="model-id q-mr-xs"
+                            >
-                                        v-if="modelLog.summaryId"
+                            <span class="model-value" :title="modelLog.showValue">
-                                        v-text="`#${modelLog.summaryId}`"
+                                {{ modelLog.showValue }}
-                                    />
+                            </span>
-                                    <span
-                                        class="model-value"
-                                        :title="modelLog.showValue"
-                                        v-text="modelLog.showValue"
-                                    />
                             <QBtn
                                 flat
                                 round
@@ -533,9 +518,7 @@ watch(
                                                     >
                                                         {{ modelLog.modelI18n }}
                                                         <span v-if="modelLog.id"
-                                                                    >#{{
+                                                            >#{{ modelLog.id }}</span
-                                                                        modelLog.id
-                                                                    }}</span
                                                         >
                                                     </div>
                                                     <QCardSection
@@ -550,18 +533,12 @@ watch(
                                                         >
                                                             <span
                                                                 class="json-field q-mr-xs text-grey"
-                                                                        :title="
+                                                                :title="value.name"
-                                                                            value.name
-                                                                        "
                                                             >
-                                                                        {{
+                                                                {{ value.nameI18n }}:
-                                                                            value.nameI18n
-                                                                        }}:
                                                             </span>
                                                             <VnJsonValue
-                                                                        :value="
+                                                                :value="value.val.val"
-                                                                            value.val.val
-                                                                        "
                                                             />
                                                         </QItem>
                                                     </QCardSection>
@@ -573,11 +550,7 @@ watch(
                                             :class="actionsClass[log.action]"
                                             :name="actionsIcon[log.action]"
                                             :title="
-                                                        t(
+                                                t(`actions.${actionsText[log.action]}`)
-                                                            `actions.${
-                                                                actionsText[log.action]
-                                                            }`
-                                                        )
                                             "
                                         />
                                     </div>
@@ -597,27 +570,17 @@ watch(
                                     @click="log.expand = !log.expand"
                                 />
                                 <span v-if="log.props.length" class="attributes">
-                                            <span
+                                    <span v-if="!log.expand" class="q-pa-none text-grey">
-                                                v-if="!log.expand"
-                                                class="q-pa-none text-grey"
-                                            >
                                         <span
                                             v-for="(prop, propIndex) in log.props"
                                             :key="propIndex"
                                             class="basic-json"
                                         >
-                                                    <span
+                                            <span class="json-field" :title="prop.name">
-                                                        class="json-field"
-                                                        :title="prop.name"
-                                                    >
                                                 {{ prop.nameI18n }}:
                                             </span>
                                             <VnJsonValue :value="prop.val.val" />
-                                                    <span
+                                            <span v-if="propIndex < log.props.length - 1"
-                                                        v-if="
-                                                            propIndex <
-                                                            log.props.length - 1
-                                                        "
                                                 >,&nbsp;
                                             </span>
                                         </span>
@@ -627,44 +590,28 @@ watch(
                                         class="expanded-json column q-pa-none"
                                     >
                                         <div
-                                                    v-for="(
+                                            v-for="(prop, prop2Index) in log.props"
-                                                        prop, prop2Index
-                                                    ) in log.props"
                                             :key="prop2Index"
                                             class="q-pa-none text-grey"
                                         >
-                                                    <span
+                                            <span class="json-field" :title="prop.name">
-                                                        class="json-field"
-                                                        :title="prop.name"
-                                                    >
                                                 {{ prop.nameI18n }}:
                                             </span>
                                             <VnJsonValue :value="prop.val.val" />
-                                                    <span
+                                            <span v-if="prop.val.id" class="id-value">
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
                                                 #{{ prop.val.id }}
                                             </span>
                                             <span v-if="log.action == 'update'">
                                                 ←
-                                                        <VnJsonValue
+                                                <VnJsonValue :value="prop.old.val" />
-                                                            :value="prop.old.val"
+                                                <span v-if="prop.old.id" class="id-value">
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                        >
                                                     #{{ prop.old.id }}
                                                 </span>
                                             </span>
                                         </div>
                                     </span>
                                 </span>
-                                        <span
+                                <span v-if="!log.props.length" class="description">
-                                            v-if="!log.props.length"
-                                            class="description"
-                                        >
                                     {{ log.description }}
                                 </span>
                             </QCardSection>
@@ -674,9 +621,23 @@ watch(
             </QList>
         </div>
     </div>
-        </template>
+    <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
-    </VnPaginate>
+        <div class="row q-gutter-x-sm">
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+            <QBtn
+                flat
+                @click.stop="stateStore.toggleRightDrawer()"
+                round
+                dense
+                icon="menu"
+            >
+                <QTooltip bottom anchor="bottom right">
+                    {{ t('globals.collapseMenu') }}
+                </QTooltip>
+            </QBtn>
+        </div>
+    </Teleport>
+    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
+        <QScrollArea class="fit text-grey-8">
             <QList dense>
                 <QSeparator />
                 <QItem class="q-mt-sm">
@@ -698,7 +659,7 @@ watch(
                     </QInput>
                 </QItem>
                 <QItem>
-                <VnSelect
+                    <VnSelectFilter
                         class="full-width"
                         :label="t('globals.entity')"
                         v-model="selectedFilters.changedModel"
@@ -724,21 +685,25 @@ watch(
                     </QOptionGroup>
                 </QItem>
                 <QItem class="q-mt-sm">
-                <QItemSection v-if="userRadio !== null">
+                    <QItemSection v-if="!workers">
-                    <VnSelect
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="workers && userRadio !== null">
+                        <VnSelectFilter
                             class="full-width"
                             :label="t('globals.user')"
                             v-model="userSelect"
                             option-label="name"
                             option-value="id"
-                        :url="`${model}Logs/${$route.params.id}/editors`"
+                            :options="workers"
-                        :fields="['id', 'nickname', 'name', 'image']"
-                        sort-by="nickname"
                             @update:model-value="selectFilter('userSelect')"
                             hide-selected
                         >
                             <template #option="{ opt, itemProps }">
-                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItem
+                                    v-bind="itemProps"
+                                    class="q-pa-xs row items-center"
+                                >
                                     <QItemSection class="col-3 items-center">
                                         <VnAvatar :worker-id="opt.id" />
                                     </QItemSection>
@@ -748,7 +713,7 @@ watch(
                                     </QItemSection>
                                 </QItem>
                             </template>
-                    </VnSelect>
+                        </VnSelectFilter>
                     </QItemSection>
                 </QItem>
                 <QItem class="q-mt-sm">
@@ -808,7 +773,8 @@ watch(
                     />
                 </QItem>
             </QList>
-    </Teleport>
+        </QScrollArea>
+    </QDrawer>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"

src/components/common/VnPopup.vue

@@ -1,23 +0,0 @@
-<script setup>
-defineProps({
-    title: { type: String, default: null },
-    content: { type: [String, Number], default: null },
-});
-</script>
-<template>
-    <QPopupProxy>
-        <QCard>
-            <slot name="title">
-                <div
-                    class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                    v-text="title"
-                />
-            </slot>
-            <slot name="content">
-                <QCardSection class="change-detail q-pa-sm">
-                    {{ content }}
-                </QCardSection>
-            </slot>
-        </QCard>
-    </QPopupProxy>
-</template>

src/components/common/VnProgressModal.vue

@@ -1,85 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
-
-const { t } = useI18n();
-
-const $props = defineProps({
-    progress: {
-        type: Number, //Progress value (1.0 > x > 0.0)
-        required: true,
-    },
-    cancelled: {
-        type: Boolean,
-        required: false,
-        default: false,
-    },
-});
-
-const emit = defineEmits(['cancel', 'close']);
-
-const dialogRef = ref(null);
-
-const showDialog = defineModel('showDialog', {
-    type: Boolean,
-    default: false,
-});
-
-const _progress = computed(() => $props.progress);
-const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
-</script>
-
-<template>
-    <QDialog ref="dialogRef" v-model="showDialog" @hide="emit('close')">
-        <QCard class="full-width dialog">
-            <QCardSection class="row">
-                <span class="text-h6">{{ t('Progress') }}</span>
-                <QSpace />
-                <QBtn icon="close" flat round dense v-close-popup />
-            </QCardSection>
-            <QCardSection>
-                <div class="column">
-                    <span>{{ t('Total progress') }}:</span>
-                    <QLinearProgress
-                        size="30px"
-                        :value="_progress"
-                        color="primary"
-                        stripe
-                        class="q-mt-sm q-mb-md"
-                    >
-                        <div class="absolute-full flex flex-center">
-                            <QBadge
-                                v-if="cancelled"
-                                text-color="white"
-                                color="negative"
-                                :label="t('Cancelled')"
-                            />
-                            <span v-else class="text-white text-subtitle1">
-                                {{ progressLabel }}
-                            </span>
-                        </div>
-                    </QLinearProgress>
-                    <slot />
-                </div>
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn
-                    v-if="!cancelled && progress < 1"
-                    type="button"
-                    flat
-                    class="text-primary"
-                    v-close-popup
-                >
-                    {{ t('globals.cancel') }}
-                </QBtn>
-            </QCardActions>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    Progress: Progreso
-    Total progress: Progreso total
-    Cancelled: Cancelado
-</i18n>

src/components/common/VnRadio.vue

@@ -1,13 +0,0 @@
-<script setup>
-const model = defineModel({ type: Boolean, required: true });
-</script>
-<template>
-    <QRadio
-        v-model="model"
-        v-bind="$attrs"
-        dense
-        :dark="true"
-        class="q-mr-sm"
-        size="xs"
-    />
-</template>

src/components/common/VnSelect.vue

@@ -1,350 +0,0 @@
-<script setup>
-import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useArrayData } from 'src/composables/useArrayData';
-import { useRequired } from 'src/composables/useRequired';
-import dataByOrder from 'src/utils/dataByOrder';
-
-const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
-const $attrs = useAttrs();
-const { t } = useI18n();
-const { isRequired, requiredFieldRule } = useRequired($attrs);
-const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
-        default: null,
-    },
-    options: {
-        type: Array,
-        default: () => [],
-    },
-    optionLabel: {
-        type: [String],
-        default: 'name',
-    },
-    optionValue: {
-        type: String,
-        default: 'id',
-    },
-    optionFilter: {
-        type: String,
-        default: null,
-    },
-    optionFilterValue: {
-        type: String,
-        default: null,
-    },
-    url: {
-        type: String,
-        default: null,
-    },
-    filterOptions: {
-        type: [Array],
-        default: () => [],
-    },
-    exprBuilder: {
-        type: Function,
-        default: null,
-    },
-    isClearable: {
-        type: Boolean,
-        default: true,
-    },
-    defaultFilter: {
-        type: Boolean,
-        default: true,
-    },
-    fields: {
-        type: Array,
-        default: null,
-    },
-    include: {
-        type: [Object, Array],
-        default: null,
-    },
-    where: {
-        type: Object,
-        default: null,
-    },
-    sortBy: {
-        type: String,
-        default: null,
-    },
-    limit: {
-        type: [Number, String],
-        default: '30',
-    },
-    focusOnMount: {
-        type: Boolean,
-        default: false,
-    },
-    useLike: {
-        type: Boolean,
-        default: true,
-    },
-    params: {
-        type: Object,
-        default: null,
-    },
-    noOne: {
-        type: Boolean,
-        default: false,
-    },
-    dataKey: {
-        type: String,
-        default: null,
-    },
-});
-
-const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
-const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
-    toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-const vnSelectRef = ref();
-const lastVal = ref();
-const noOneText = t('globals.noOne');
-const noOneOpt = ref({
-    [optionValue.value]: false,
-    [optionLabel.value]: noOneText,
-});
-const isLoading = ref(false);
-const useURL = computed(() => $props.url);
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        setOptions(myOptionsOriginal.value);
-        emit('update:modelValue', value);
-    },
-});
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
-
-watch(modelValue, async (newValue) => {
-    if (!myOptions?.value?.some((option) => option[optionValue.value] == newValue))
-        await fetchFilter(newValue);
-
-    if ($props.noOne) myOptions.value.unshift(noOneOpt.value);
-});
-
-onMounted(() => {
-    setOptions(options.value);
-    if (useURL.value && $props.modelValue && !findKeyInOptions())
-        fetchFilter($props.modelValue);
-    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
-});
-
-const arrayDataKey =
-    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
-
-const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
-
-function findKeyInOptions() {
-    if (!$props.options) return;
-    return filter($props.modelValue, $props.options)?.length;
-}
-
-function setOptions(data) {
-    data = dataByOrder(data, $props.sortBy);
-    myOptions.value = JSON.parse(JSON.stringify(data));
-    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-    emit('update:options', data);
-}
-
-function filter(val, options) {
-    const search = val?.toString()?.toLowerCase();
-
-    if (!search) return options;
-
-    return options.filter((row) => {
-        if ($props.filterOptions.length) {
-            return $props.filterOptions.some((prop) => {
-                const propValue = String(row[prop]).toLowerCase();
-                return propValue.includes(search);
-            });
-        }
-
-        if (!row) return;
-        const id = row[$props.optionValue];
-        const optionLabel = String(row[$props.optionLabel]).toLowerCase();
-
-        return id == search || optionLabel.includes(search);
-    });
-}
-
-async function fetchFilter(val) {
-    if (!$props.url) return;
-
-    const { fields, include, sortBy, limit } = $props;
-    const key =
-        optionFilterValue.value ??
-        (new RegExp(/\d/g).test(val)
-            ? optionValue.value
-            : optionFilter.value ?? optionLabel.value);
-
-    let defaultWhere = {};
-    if ($props.filterOptions.length) {
-        defaultWhere = $props.filterOptions.reduce((obj, prop) => {
-            if (!obj.or) obj.or = [];
-            obj.or.push({ [prop]: getVal(val) });
-            return obj;
-        }, {});
-    } else defaultWhere = { [key]: getVal(val) };
-    const where = { ...(val ? defaultWhere : {}), ...$props.where };
-    $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
-    const fetchOptions = { where, include, limit };
-    if (fields) fetchOptions.fields = fields;
-    if (sortBy) fetchOptions.order = sortBy;
-    arrayData.reset(['skip', 'filter.skip', 'page']);
-
-    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
-    setOptions(data);
-    return data;
-}
-
-async function filterHandler(val, update) {
-    if (!val && lastVal.value === val) {
-        lastVal.value = val;
-        return update();
-    }
-    lastVal.value = val;
-    let newOptions;
-
-    if (!$props.defaultFilter) return update();
-    if (
-        $props.url &&
-        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
-    ) {
-        newOptions = await fetchFilter(val);
-    } else newOptions = filter(val, myOptionsOriginal.value);
-    update(
-        () => {
-            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
-                newOptions.unshift(noOneOpt.value);
-
-            myOptions.value = newOptions;
-        },
-        (ref) => {
-            if (val !== '' && ref.options.length > 0) {
-                ref.setOptionIndex(-1);
-                ref.moveOptionSelection(1, true);
-            }
-        }
-    );
-}
-
-function nullishToTrue(value) {
-    return value ?? true;
-}
-
-const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
-
-async function onScroll({ to, direction, from, index }) {
-    const lastIndex = myOptions.value.length - 1;
-
-    if (from === 0 && index === 0) return;
-    if (!useURL.value && !$props.fetchRef) return;
-    if (direction === 'decrease') return;
-    if (to === lastIndex && arrayData.store.hasMoreData && !isLoading.value) {
-        isLoading.value = true;
-        await arrayData.loadMore();
-        setOptions(arrayData.store.data);
-        vnSelectRef.value.scrollTo(lastIndex);
-        isLoading.value = false;
-    }
-}
-
-defineExpose({ opts: myOptions });
-
-function handleKeyDown(event) {
-    if (event.key === 'Tab') {
-        event.preventDefault();
-
-        const inputValue = vnSelectRef.value?.inputValue;
-
-        if (inputValue) {
-            const matchingOption = myOptions.value.find(
-                (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
-            );
-
-            if (matchingOption) {
-                emit('update:modelValue', matchingOption[optionValue.value]);
-            } else {
-                emit('update:modelValue', inputValue);
-            }
-            vnSelectRef.value?.hidePopup();
-        }
-    }
-}
-</script>
-
-<template>
-    <QSelect
-        v-model="value"
-        :options="myOptions"
-        :option-label="optionLabel"
-        :option-value="optionValue"
-        v-bind="$attrs"
-        @filter="filterHandler"
-        @keydown="handleKeyDown"
-        :emit-value="nullishToTrue($attrs['emit-value'])"
-        :map-options="nullishToTrue($attrs['map-options'])"
-        :use-input="nullishToTrue($attrs['use-input'])"
-        :hide-selected="nullishToTrue($attrs['hide-selected'])"
-        :fill-input="nullishToTrue($attrs['fill-input'])"
-        ref="vnSelectRef"
-        lazy-rules
-        :class="{ required: isRequired }"
-        :rules="mixinRules"
-        virtual-scroll-slice-size="options.length"
-        hide-bottom-space
-        :input-debounce="useURL ? '300' : '0'"
-        :loading="isLoading"
-        @virtual-scroll="onScroll"
-        :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
-    >
-        <template #append>
-            <QIcon
-                v-show="isClearable && value"
-                name="close"
-                @click.stop="
-                    () => {
-                        value = null;
-                        emit('remove');
-                    }
-                "
-                class="cursor-pointer"
-                size="xs"
-            />
-        </template>
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            <div v-if="slotName == 'append'">
-                <QIcon
-                    v-show="isClearable && value"
-                    name="close"
-                    @click.stop="
-                        () => {
-                            value = null;
-                            emit('remove');
-                        }
-                    "
-                    class="cursor-pointer"
-                    size="xs"
-                />
-                <slot name="append" v-if="$slots.append" v-bind="slotData ?? {}" />
-            </div>
-            <slot v-else :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-        </template>
-    </QSelect>
-</template>
-
-<style scoped lang="scss">
-.q-field--outlined {
-    max-width: 100%;
-}
-</style>

src/components/common/VnSelectCache.vue

@@ -1,39 +0,0 @@
-<script setup>
-import { ref, onBeforeMount, useAttrs } from 'vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-
-const $props = defineProps({
-    row: {
-        type: [Object],
-        default: null,
-    },
-    find: {
-        type: [String, Object],
-        default: null,
-        description: 'search in row to add default options',
-    },
-});
-const options = ref([]);
-
-onBeforeMount(async () => {
-    const { url, optionValue, optionLabel } = useAttrs();
-    const findBy = $props.find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
-    if (!findBy || !$props.row) return;
-    // is object
-    if (typeof findBy == 'object') {
-        const { value, label } = findBy;
-        if (!$props.row[value] || !$props.row[label]) return;
-        return (options.value = [
-            {
-                [optionValue ?? 'id']: $props.row[value],
-                [optionLabel ?? 'name']: $props.row[label],
-            },
-        ]);
-    }
-    // is string
-    if ($props.row[findBy]) options.value = [$props.row[findBy]];
-});
-</script>
-<template>
-    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" />
-</template>

src/components/common/VnSelectDialog.vue

@@ -1,21 +1,25 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
-import { useRole } from 'src/composables/useRole';
+
-import { useAcl } from 'src/composables/useAcl';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+import { useRole } from 'src/composables/useRole';
 
-import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
 
-const value = defineModel({ type: [String, Number, Object] });
 const $props = defineProps({
+    modelValue: {
+        type: [String, Number, Object],
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: () => [],
+    },
     rolesAllowedToCreate: {
         type: Array,
         default: () => ['developer'],
     },
-    acls: {
-        type: Array,
-        default: () => [],
-    },
     actionIcon: {
         type: String,
         default: 'add',
@@ -27,23 +31,31 @@ const $props = defineProps({
 });
 
 const role = useRole();
-const acl = useAcl();
+const showForm = ref(false);
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
 
 const isAllowedToCreate = computed(() => {
-    if ($props.acls.length) return acl.hasAny($props.acls);
     return role.hasAny($props.rolesAllowedToCreate);
 });
+
+const toggleForm = () => {
+    showForm.value = !showForm.value;
+};
 </script>
 
 <template>
-    <VnSelect
+    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
-        v-model="value"
-        v-bind="$attrs"
-        @update:model-value="(...args) => emit('update:modelValue', ...args)"
-    >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="$refs.dialog.show()"
+                @click.stop.prevent="toggleForm()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
@@ -53,14 +65,14 @@ const isAllowedToCreate = computed(() => {
             >
                 <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
             </QIcon>
-            <QDialog ref="dialog" transition-show="scale" transition-hide="scale">
+            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
                 <slot name="form" />
             </QDialog>
         </template>
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData" :key="slotName" />
         </template>
-    </VnSelect>
+    </VnSelectFilter>
 </template>
 
 <style lang="scss" scoped>

src/components/common/VnSelectEnum.vue

@@ -1,52 +0,0 @@
-<script setup>
-import { onBeforeMount, ref, useAttrs } from 'vue';
-import axios from 'axios';
-import VnSelect from 'components/common/VnSelect.vue';
-
-const { schema, table, column, translation, defaultOptions } = defineProps({
-    schema: {
-        type: String,
-        default: 'vn',
-    },
-    table: {
-        type: String,
-        required: true,
-    },
-    column: {
-        type: String,
-        required: true,
-    },
-    translation: {
-        type: Function,
-        default: null,
-    },
-    defaultOptions: {
-        type: Array,
-        default: () => [],
-    },
-});
-
-const $attrs = useAttrs();
-const options = ref([]);
-onBeforeMount(async () => {
-    options.value = [].concat(defaultOptions);
-    const { data } = await axios.get(`Applications/get-enum-values`, {
-        params: { schema, table, column },
-    });
-
-    for (const value of data)
-        options.value.push({
-            [$attrs['option-value'] ?? 'id']: value,
-            [$attrs['option-label'] ?? 'name']: translation ? translation(value) : value,
-        });
-});
-</script>
-
-<template>
-    <VnSelect
-        v-bind="$attrs"
-        :options="options"
-        :key="options.length"
-        :input-debounce="0"
-    />
-</template>

src/components/common/VnSelectFilter.vue

@@ -0,0 +1,191 @@
+<script setup>
+import { ref, toRefs, computed, watch } from 'vue';
+import { onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'src/components/FetchData.vue';
+const emit = defineEmits(['update:modelValue', 'update:options']);
+
+const $props = defineProps({
+    modelValue: {
+        type: [String, Number, Object],
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: () => [],
+    },
+    optionLabel: {
+        type: [String],
+        default: '',
+    },
+    optionValue: {
+        type: String,
+        default: '',
+    },
+    url: {
+        type: String,
+        default: '',
+    },
+    filterOptions: {
+        type: [Array],
+        default: () => [],
+    },
+    isClearable: {
+        type: Boolean,
+        default: true,
+    },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
+    fields: {
+        type: Array,
+        default: null,
+    },
+    where: {
+        type: Object,
+        default: null,
+    },
+    sortBy: {
+        type: String,
+        default: null,
+    },
+    limit: {
+        type: [Number, String],
+        default: '30',
+    },
+});
+
+const { t } = useI18n();
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+
+const { optionLabel, optionValue, options, modelValue } = toRefs($props);
+const myOptions = ref([]);
+const myOptionsOriginal = ref([]);
+const vnSelectRef = ref();
+const dataRef = ref();
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
+
+function setOptions(data) {
+    myOptions.value = JSON.parse(JSON.stringify(data));
+    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+}
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
+});
+
+function filter(val, options) {
+    const search = val.toString().toLowerCase();
+
+    if (!search) return options;
+
+    return options.filter((row) => {
+        if ($props.filterOptions.length) {
+            return $props.filterOptions.some((prop) => {
+                const propValue = String(row[prop]).toLowerCase();
+                return propValue.includes(search);
+            });
+        }
+
+        const id = row.id;
+        const optionLabel = String(row[$props.optionLabel]).toLowerCase();
+
+        return id == search || optionLabel.includes(search);
+    });
+}
+
+async function fetchFilter(val) {
+    if (!$props.url || !dataRef.value) return;
+
+    const { fields, sortBy, limit } = $props;
+    let key = optionLabel.value;
+
+    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
+
+    const where = { [key]: { like: `%${val}%` } };
+    return dataRef.value.fetch({ fields, where, order: sortBy, limit });
+}
+
+async function filterHandler(val, update) {
+    if (!$props.defaultFilter) return update();
+    let newOptions;
+    if ($props.url) {
+        newOptions = await fetchFilter(val);
+    } else newOptions = filter(val, myOptionsOriginal.value);
+    update(
+        () => {
+            myOptions.value = newOptions;
+        },
+        (ref) => {
+            if (val !== '' && ref.options.length > 0) {
+                ref.setOptionIndex(-1);
+                ref.moveOptionSelection(1, true);
+            }
+        }
+    );
+}
+
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
+
+watch(modelValue, (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
+</script>
+
+<template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+    />
+    <QSelect
+        v-model="value"
+        :options="myOptions"
+        :option-label="optionLabel"
+        :option-value="optionValue"
+        v-bind="$attrs"
+        emit-value
+        map-options
+        use-input
+        @filter="filterHandler"
+        hide-selected
+        fill-input
+        ref="vnSelectRef"
+        :class="{ required: $attrs.required }"
+        :rules="$attrs.required ? [requiredFieldRule] : null"
+    >
+        <template v-if="isClearable" #append>
+            <QIcon
+                name="close"
+                @click.stop="value = null"
+                class="cursor-pointer"
+                size="xs"
+            />
+        </template>
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
+    </QSelect>
+</template>
+
+<style scoped lang="scss">
+.q-field--outlined {
+    max-width: 100%;
+}
+</style>

src/components/common/VnSmsDialog.vue

@@ -21,8 +21,7 @@ const props = defineProps({
     },
     template: {
         type: String,
-        required: false,
+        required: true,
-        default: '',
     },
     locale: {
         type: String,
@@ -50,7 +49,7 @@ updateMessage();
 
 function updateMessage() {
     const params = props.data;
-    const key = props.template ? `templates['${props.template}']` : '';
+    const key = `templates['${props.template}']`;
 
     message.value = t(key, params, { locale: locale.value });
 }
@@ -86,7 +85,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef" data-cy="vnSmsDialog">
+    <QDialog ref="dialogRef">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -105,14 +104,15 @@ async function send() {
                     map-options
                     :input-debounce="0"
                     rounded
+                    outlined
                     dense
                 />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput :label="t('Phone')" v-model="phone" />
+                <VnInput :label="t('Phone')" v-model="phone" is-outlined />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput v-model="subject" :label="t('Subject')" />
+                <VnInput v-model="subject" :label="t('Subject')" is-outlined />
             </QCardSection>
             <QCardSection class="q-mb-md" q-input>
                 <QInput
@@ -125,6 +125,7 @@ async function send() {
                     :bottom-slots="true"
                     :rules="[(value) => value.length < maxLength || 'Error!']"
                     stack-label
+                    outlined
                     autofocus
                 >
                     <template #append>
@@ -134,11 +135,6 @@ async function send() {
                             @click="message = ''"
                             class="cursor-pointer"
                         />
-                        <QIcon name="info" class="cursor-pointer">
-                            <QTooltip>
-                                {{ t('messageTooltip') }}
-                            </QTooltip>
-                        </QIcon>
                     </template>
                     <template #counter>
                         <QChip :color="color" dense>
@@ -161,7 +157,6 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
-                    data-cy="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>
@@ -185,27 +180,22 @@ en:
         minAmount: 'A minimum amount of 50€ (VAT excluded) is required for your order
             { orderId } of { shipped } to receive it without additional shipping costs.'
         orderChanges: 'Order {orderId} of { shipped }: { changes }'
-        productNotAvailable: 'Verdnatura communicates: Your order {ticketFk} with reception date on {landed}. {notAvailables} not available. Sorry for the inconvenience.'
     en: English
     es: Spanish
     fr: French
     pt: Portuguese
-    messageTooltip: Special characters like accents counts as multiple
 es:
     Send SMS: Enviar SMS
     Language: Idioma
     Phone: Móvil
     Subject: Asunto
     Message: Mensaje
-    messageTooltip: Carácteres especiales como acentos cuentan como varios
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
-        minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
+        minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            Te recomendamos amplíes para no generar costes extra, provocarán un incremento de tu tarifa.
+            { orderId } del día { shipped } para recibirlo sin portes adicionales.'
-            ¡Un saludo!'
+        orderChanges: 'Pedido {orderId} día { shipped }: { changes }'
-        orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
-        productNotAvailable: 'Verdnatura le comunica: Pedido {ticketFk} con fecha de recepción {landed}. {notAvailables} no disponible/s. Disculpe las molestias.'
     en: Inglés
     es: Español
     fr: Francés
@@ -217,15 +207,12 @@ fr:
     Phone: Mobile
     Subject: Affaire
     Message: Message
-    messageTooltip: Les caractères spéciaux comme les accents comptent comme plusieurs
     templates:
-        pendingPayment: 'Verdnatura : Commande en attente de règlement. Veuillez régler votre commande avant 9h.
+        pendingPayment: 'Votre commande est en attente de paiement.
-            Sinon elle sera décalée en fonction de vos jours de livraison . Merci'
+            Veuillez vous connecter sur le site web et effectuer le paiement par carte. Merci beaucoup.'
-        minAmount: 'Verdnatura vous rappelle :
+        minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande
-            Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
+            { orderId } du { shipped } afin de la recevoir sans frais de port supplémentaires.'
-            Merci.'
+        orderChanges: 'Commande { orderId } du { shipped }: { changes }'
-        orderChanges: 'Commande {orderId} livraison {landing} indisponible/s. Désolés pour le dérangement.'
-        productNotAvailable: 'Verdnatura communique : Votre commande {ticketFk} avec date de réception le {landed}. {notAvailables} non disponible. Nous sommes désolés pour les inconvénients.'
     en: Anglais
     es: Espagnol
     fr: Français
@@ -237,14 +224,12 @@ pt:
     Phone: Móvel
     Subject: Assunto
     Message: Mensagem
-    messageTooltip: Caracteres especiais como acentos contam como vários
     templates:
         pendingPayment: 'Seu pedido está pendente de pagamento.
             Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.'
         minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido
-            { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
+            { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.'
-        orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
+        orderChanges: 'Pedido { orderId } dia { shipped }: { changes }'
-        productNotAvailable: 'Verdnatura comunica: Seu pedido {ticketFk} com data de recepção em {landed}. {notAvailables} não disponível/eis. Desculpe pelo transtorno.'
     en: Inglês
     es: Espanhol
     fr: Francês

src/components/common/VnTime.vue

@@ -1,16 +0,0 @@
-<script setup>
-const model = defineModel({ type: [String, Number], required: true });
-</script>
-<template>
-    <QTime v-model="model" now-btn mask="HH:mm" />
-</template>
-<style lang="scss" scoped>
-.q-time {
-    width: 230px;
-    min-width: unset;
-    :deep(.q-time__header) {
-        min-height: unset;
-        height: 50px;
-    }
-}
-</style>

src/components/common/VnTitle.vue

@@ -1,16 +1,16 @@
 <script setup>
-defineProps({
+const $props = defineProps({
     url: { type: String, default: null },
     text: { type: String, default: null },
     icon: { type: String, default: 'open_in_new' },
 });
 </script>
 <template>
-    <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
+    <div class="titleBox">
-        <div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
+        <div class="header-link">
-            <a :href="url" :class="url ? 'link' : 'color-vn-text'" v-bind="$attrs">
+            <a :href="$props.url" :class="$props.url ? 'link' : 'color-vn-text'">
-                {{ text }}
+                {{ $props.text }}
-                <QIcon v-if="url" :name="icon" />
+                <QIcon v-if="url" :name="$props.icon" />
             </a>
         </div>
     </div>
@@ -19,4 +19,7 @@ defineProps({
 a {
     font-size: large;
 }
+.titleBox {
+    padding-bottom: 2%;
+}
 </style>

src/components/common/VnWeekdayPicker.vue

@@ -1,37 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-
-import { useWeekdayStore } from 'src/stores/useWeekdayStore';
-
-const props = defineProps({
-    wdays: {
-        type: Array,
-        default: () => [],
-    },
-});
-
-const emit = defineEmits(['update:wdays']);
-
-const weekdayStore = useWeekdayStore();
-
-const selectedWDays = computed({
-    get: () => props.wdays,
-    set: (value) => emit('update:wdays', value),
-});
-
-const toggleDay = (index) => (selectedWDays.value[index] = !selectedWDays.value[index]);
-</script>
-
-<template>
-    <div class="q-gutter-x-sm" style="width: max-content">
-        <QBtn
-            v-for="(weekday, index) in weekdayStore.getLocalesMap"
-            :key="index"
-            :label="weekday.localeChar"
-            rounded
-            style="max-width: 36px"
-            :color="selectedWDays[weekday.index] ? 'primary' : ''"
-            @click="toggleDay(weekday.index)"
-        />
-    </div>
-</template>

src/components/ui/CardDescriptor.vue

@@ -1,11 +1,10 @@
 <script setup>
-import { onBeforeMount, watch, computed, ref } from 'vue';
+import { onBeforeMount, useSlots, watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     url: {
@@ -16,21 +15,21 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    module: {
+        type: String,
+        required: true,
+    },
     title: {
         type: String,
         default: '',
     },
     subtitle: {
         type: Number,
-        default: null,
+        default: 0,
     },
     dataKey: {
         type: String,
-        default: null,
+        default: '',
-    },
-    module: {
-        type: String,
-        default: null,
     },
     summary: {
         type: Object,
@@ -39,96 +38,48 @@ const $props = defineProps({
 });
 
 const state = useState();
-const route = useRoute();
+const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-let arrayData;
+const arrayData = useArrayData($props.dataKey || $props.module, {
-let store;
-let entity;
-const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-const menuRef = ref();
-defineExpose({ getData });
-
-onBeforeMount(async () => {
-    arrayData = useArrayData($props.dataKey, {
     url: $props.url,
     filter: $props.filter,
     skip: 0,
 });
-    store = arrayData.store;
+const { store } = arrayData;
-    entity = computed(() => {
+const entity = computed(() => store.data);
-        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+const isLoading = ref(false);
-        if (data) emit('onFetch', data);
-        return data;
-    });
 
-    // It enables to load data only once if the module is the same as the dataKey
+defineExpose({
-    if (!isSameDataKey.value || !route.params.id) await getData();
+    getData,
+});
+onBeforeMount(async () => {
+    await getData();
     watch(
-        () => [$props.url, $props.filter],
+        () => $props.url,
-        async () => {
+        async () => await getData()
-            if (!isSameDataKey.value) await getData();
-        }
     );
 });
 
 async function getData() {
     store.url = $props.url;
-    store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
         state.set($props.dataKey, data);
-        emit('onFetch', Array.isArray(data) ? data[0] : data);
+        emit('onFetch', data);
     } finally {
         isLoading.value = false;
     }
 }
-
-function getValueFromPath(path) {
-    if (!path) return;
-    const keys = path.toString().split('.');
-    let current = entity.value;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}
-
 const emit = defineEmits(['onFetch']);
-
-const iconModule = computed(() => route.matched[1].meta.icon);
-const toModule = computed(() =>
-    route.matched[1].path.split('/').length > 2
-        ? route.matched[1].redirect
-        : route.matched[1].children[0].redirect
-);
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action"
+                <slot name="header-extra-action" />
-                    ><QBtn
-                        round
-                        flat
-                        dense
-                        size="md"
-                        :icon="iconModule"
-                        color="white"
-                        class="link"
-                        :to="$attrs['to-module'] ?? toModule"
-                    >
-                        <QTooltip>
-                            {{ t('globals.goToModuleIndex') }}
-                        </QTooltip>
-                    </QBtn></slot
-                >
-
                 <QBtn
                     @click.stop="viewSummary(entity.id, $props.summary)"
                     round
@@ -160,21 +111,20 @@ const toModule = computed(() =>
                     </QBtn>
                 </RouterLink>
                 <QBtn
-                    v-if="$slots.menu"
                     color="white"
                     dense
                     flat
                     icon="more_vert"
                     round
                     size="md"
-                    data-cy="descriptor-more-opts"
+                    :class="{ invisible: !slots.menu }"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu :ref="menuRef">
+                    <QMenu>
                         <QList>
-                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                            <slot name="menu" :entity="entity" />
                         </QList>
                     </QMenu>
                 </QBtn>
@@ -184,8 +134,8 @@ const toModule = computed(() =>
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
                         <div class="title">
-                            <span v-if="$props.title" :title="getValueFromPath(title)">
+                            <span v-if="$props.title" :title="$props.title">
-                                {{ getValueFromPath(title) ?? $props.title }}
+                                {{ $props.title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span :title="entity.name">
@@ -196,7 +146,7 @@ const toModule = computed(() =>
                     </QItemLabel>
                     <QItem dense>
                         <QItemLabel class="subtitle" caption>
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                            #{{ $props.subtitle ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
@@ -288,7 +238,6 @@ const toModule = computed(() =>
     width: 256px;
     .header {
         display: flex;
-        align-items: center;
     }
     .icons {
         margin: 0 10px;

src/components/ui/CardList.vue

@@ -28,7 +28,7 @@ const toggleCardCheck = (item) => {
                         <div class="title text-primary text-weight-bold text-h5">
                             {{ $props.title }}
                         </div>
-                        <QChip v-if="$props.id" class="q-chip-color" outline size="sm">
+                        <QChip class="q-chip-color" outline size="sm">
                             {{ t('ID') }}: {{ $props.id }}
                         </QChip>
                     </div>

src/components/ui/CardSummary.vue

@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { isDialogOpened } from 'src/filters';
 
 const props = defineProps({
     url: {
@@ -16,28 +15,24 @@ const props = defineProps({
         default: null,
     },
     entityId: {
-        type: [Number, String],
+        type: Number,
         default: null,
     },
     dataKey: {
         type: String,
         default: '',
     },
-    moduleName: {
-        type: String,
-        default: null,
-    },
 });
 const emit = defineEmits(['onFetch']);
 const route = useRoute();
 const isSummary = ref();
-const arrayData = useArrayData(props.dataKey, {
+const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
     url: props.url,
     filter: props.filter,
     skip: 0,
 });
 const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+const entity = computed(() => store.data);
 const isLoading = ref(false);
 
 defineExpose({
@@ -53,10 +48,9 @@ onBeforeMount(async () => {
 
 async function fetch() {
     store.url = props.url;
-    store.filter = props.filter ?? {};
     isLoading.value = true;
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    emit('onFetch', Array.isArray(data) ? data[0] : data);
+    emit('onFetch', data);
     isLoading.value = false;
 }
 </script>
@@ -69,10 +63,10 @@ async function fetch() {
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="isDialogOpened()"
+                            v-if="!isSummary && route.meta.moduleName"
                             class="header link"
                             :to="{
-                                name: `${moduleName ?? route.meta.moduleName}Summary`,
+                                name: `${route.meta.moduleName}Summary`,
                                 params: { id: entityId || entity.id },
                             }"
                         >
@@ -83,7 +77,7 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right" :entity="entity">
+                    <slot name="header-right">
                         <span></span>
                     </slot>
                 </div>
@@ -103,7 +97,6 @@ async function fetch() {
 
 .cardSummary {
     width: 100%;
-    max-height: 70vh;
     .summaryHeader {
         text-align: center;
         font-size: 20px;
@@ -141,17 +134,14 @@ async function fetch() {
             box-shadow: none;
 
             .vn-label-value {
-                &.negative > .value span {
-                    color: $alert;
-                }
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
                 .label {
                     color: var(--vn-label-color);
-                    width: 9em;
+                    width: 8em;
                     overflow: hidden;
-                    white-space: wrap;
+                    white-space: nowrap;
                     text-overflow: ellipsis;
                     margin-right: 10px;
                     flex-grow: 0;
@@ -173,10 +163,15 @@ async function fetch() {
                 color: lighten($primary, 20%);
             }
             .q-checkbox {
+                display: flex;
+                margin-bottom: 9px;
                 & .q-checkbox__label {
+                    margin-left: 31px;
                     color: var(--vn-text-color);
                 }
                 & .q-checkbox__inner {
+                    position: absolute;
+                    left: 0;
                     color: var(--vn-label-color);
                 }
             }

src/components/ui/FetchedTags.vue

@@ -1,45 +1,60 @@
 <script setup>
-import { computed } from 'vue';
+defineProps({
-
+    maxLength: {
-const $props = defineProps({
+        type: Number,
+        required: true,
+    },
     item: {
         type: Object,
         required: true,
     },
-    tag: {
-        type: String,
-        required: false,
-        default: 'tag',
-    },
-    value: {
-        type: String,
-        required: false,
-        default: 'value',
-    },
-});
-const tags = computed(() => {
-    return Object.keys($props.item)
-        .filter((i) => i.startsWith(`${$props.tag}`))
-        .reduce((acc, tag) => {
-            const n = tag.split(`${$props.tag}`)[1];
-            const key = `${$props.tag}${n}`;
-            const value = `${$props.value}${n}`;
-            acc[$props.item[key] ?? key] = $props.item[value] ?? '';
-            return acc;
-        }, {});
 });
 </script>
 <template>
     <div class="fetchedTags">
         <div class="wrap">
             <div
-                v-for="(val, key) in tags"
-                :key="key"
                 class="inline-tag"
-                :title="`${key}: ${val}`"
+                :class="{ empty: !$props.item.value5 }"
-                :class="{ empty: !val }"
+                :title="$props.item.tag5 + ': ' + $props.item.value5"
             >
-                {{ val }}
+                {{ $props.item.value5 }}
+            </div>
+            <div
+                class="inline-tag"
+                :class="{ empty: !$props.item.tag6 }"
+                :title="$props.item.tag6 + ': ' + $props.item.value6"
+            >
+                {{ $props.item.value6 }}
+            </div>
+
+            <div
+                class="inline-tag"
+                :class="{ empty: !$props.item.value7 }"
+                :title="$props.item.tag7 + ': ' + $props.item.value7"
+            >
+                {{ $props.item.value7 }}
+            </div>
+            <div
+                class="inline-tag"
+                :class="{ empty: !$props.item.value8 }"
+                :title="$props.item.tag8 + ': ' + $props.item.value8"
+            >
+                {{ $props.item.value8 }}
+            </div>
+            <div
+                class="inline-tag"
+                :class="{ empty: !$props.item.value9 }"
+                :title="$props.item.tag9 + ': ' + $props.item.value9"
+            >
+                {{ $props.item.value9 }}
+            </div>
+            <div
+                class="inline-tag"
+                :class="{ empty: !$props.item.value10 }"
+                :title="$props.item.tag10 + ': ' + $props.item.value10"
+            >
+                {{ $props.item.value10 }}
             </div>
         </div>
     </div>
@@ -57,7 +72,7 @@ const tags = computed(() => {
     .inline-tag {
         height: 1rem;
         margin: 0.05rem;
-        color: $color-font-secondary;
+        color: $secondary;
         text-align: center;
         font-size: smaller;
         padding: 1px;
@@ -68,8 +83,9 @@ const tags = computed(() => {
         min-width: 4rem;
         max-width: 4rem;
     }
+
     .empty {
-        border: 1px solid #2b2b2b;
+        border: 1px solid $color-spacer-light;
     }
 }
 </style>

src/components/ui/QCalendarMonthWrapper.vue

@@ -1,179 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useQuasar } from 'quasar';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
-
-const $props = defineProps({
-    bordered: {
-        type: Boolean,
-        default: false,
-    },
-    transparentBackground: {
-        type: Boolean,
-        default: false,
-    },
-    viewCustomization: {
-        type: String,
-        default: '',
-    },
-});
-
-const $q = useQuasar();
-
-// El objetivo de asignar las clases de personalización desde el wrapper es no tener conflictos entre vistas que usen el mismo componente
-const viewCustomizationClasses = {
-    workerCalendar: 'worker-calendar-customizations',
-};
-
-const containerClasses = computed(() => {
-    const classes = ['main-container-background'];
-    if (viewCustomizationClasses[$props.viewCustomization])
-        classes.push(viewCustomizationClasses[$props.viewCustomization]);
-    if ($props.bordered) classes.push('--bordered');
-    if ($props.transparentBackground) classes.push('transparent-background');
-    else classes.push($q.dark.isActive ? '--dark' : '--light');
-    return classes;
-});
-</script>
-
-<template>
-    <div :class="containerClasses">
-        <div class="nav-container row"><slot name="header" /></div>
-        <slot name="calendar" />
-    </div>
-</template>
-
-<style lang="scss">
-@import '../../css/quasar.variables.scss';
-
-:root {
-    // Cambia los colores del día actual del calendario por los de salix
-    --calendar-border-current-dark: #84d0e2 2px solid;
-    --calendar-border-current: #84d0e2 2px solid;
-    --calendar-current-color-dark: #84d0e2;
-    // Colores de fondo del calendario en dark mode
-    --calendar-outside-background-dark: var(--vn-section-color);
-    --calendar-background-dark: var(--vn-section-color);
-}
-
-// Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
-.q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
-    background-color: $primary !important;
-}
-
-.q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
-    background-color: $primary !important;
-}
-
-.q-calendar-month__head--weekday {
-    // Transforma los nombres de los días de la semana a mayúsculas
-    text-transform: capitalize;
-}
-
-.q-calendar-month__head--workweek,
-.q-calendar-month__head--weekday,
-// .q-calendar-month__workweek.q-past-day,
-.q-calendar-month__week :nth-child(n+6):nth-child(-n+7) {
-    color: var(--vn-label-color);
-}
-
-.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span {
-    /* color: transparent; */
-    visibility: hidden;
-    // position: absolute;
-}
-.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span:after {
-    content: 'X';
-    visibility: visible;
-    left: 33%;
-    position: absolute;
-}
-.transparent-background {
-    // --calendar-background-dark: transparent;
-    --calendar-background: transparent;
-    --calendar-outside-background-dark: transparent;
-}
-
-.q-calendar__button {
-    &:hover {
-        background-color: var(--vn-accent-color);
-        cursor: pointer;
-    }
-}
-
-.main-container-background {
-    --calendar-current-background-dark: transparent;
-
-    &.--dark {
-        background-color: var(--calendar-background-dark);
-    }
-
-    &.--light {
-        background-color: var(--calendar-background);
-    }
-
-    &.--bordered {
-        border: 1px solid #222;
-    }
-}
-
-.worker-calendar-customizations {
-    .q-calendar__button {
-        width: 32px;
-        height: 32px;
-        font-size: 13px;
-
-        &:hover {
-            background-color: var(--vn-label-color);
-            cursor: pointer;
-        }
-    }
-
-    .q-calendar-month__week--wrapper {
-        margin-bottom: 4px;
-    }
-
-    .q-calendar-month__workweek {
-        height: 32px;
-        display: flex;
-        justify-content: center;
-        color: var(--vn-label-color);
-    }
-
-    .q-calendar__button--bordered {
-        color: $info !important;
-    }
-
-    .q-calendar-month__day--content {
-        position: absolute;
-        top: 1;
-        left: 0;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-    }
-
-    .q-outside .calendar-event {
-        display: none;
-    }
-
-    .q-calendar-month__workweek,
-    .q-calendar-month__head--workweek,
-    .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
-        text-transform: capitalize;
-        color: var(--vn-label-color);
-        font-weight: bold;
-        font-size: 0.8rem;
-        text-align: center;
-    }
-}
-
-.nav-container {
-    display: flex;
-    align-items: center;
-
-    &.--bordered {
-        border: 1px solid black;
-    }
-}
-</style>

src/components/ui/SkeletonForm.vue

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

src/components/ui/SkeletonSummary.vue

@@ -3,30 +3,39 @@
         <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
@@ -34,6 +43,7 @@
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
         </div>
+    </div>
 </template>
 
 <style lang="scss" scoped>

src/components/ui/SkeletonTable.vue

@@ -1,38 +1,50 @@
-<script setup>
-defineProps({
-    columns: {
-        type: Number,
-        default: 6,
-    },
-});
-</script>
 <template>
-    <div class="q-pa-md q-mx-md container">
+    <div class="q-pa-md w">
-        <div class="row q-gutter-md q-mb-md justify-around no-wrap">
+        <div class="row q-gutter-md q-mb-md">
-            <QSkeleton type="rect" square v-for="n in columns" :key="n" class="column" />
+            <div class="col-1">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="rect" square />
+            </div>
+        </div>
+
+        <div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
+            <div class="col-1">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
+            </div>
+            <div class="col">
+                <QSkeleton type="QInput" square />
             </div>
-        <div
-            class="row q-gutter-md q-mb-md justify-around no-wrap"
-            v-for="n in 5"
-            :key="n"
-        >
-            <QSkeleton
-                type="QInput"
-                square
-                v-for="m in columns"
-                :key="m"
-                class="column"
-            />
         </div>
     </div>
 </template>
 <style lang="scss" scoped>
-.container {
+.w {
-    width: 100%;
+    width: 80vw;
-    overflow-x: hidden;
-}
-.column {
-    flex-shrink: 0;
-    width: 200px;
 }
 </style>

src/components/ui/VnAvatar.vue

@@ -1,62 +1,45 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
 import { useColor } from 'src/composables/useColor';
-import { getCssVar } from 'quasar';
 
 const $props = defineProps({
     workerId: { type: Number, required: true },
     description: { type: String, default: null },
+    size: { type: String, default: null },
     title: { type: String, default: null },
-    color: { type: String, default: null },
 });
-
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const { t } = useI18n();
 
-const src = computed(
+const title = computed(() => $props.title ?? t('globals.system'));
-    () => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`
-);
-const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
 const showLetter = ref(false);
-const backgroundColor = computed(() => {
-    const color = $props.color || useColor(title.value);
-    return getCssVar(color) || color;
-});
-
-watch(src, () => (showLetter.value = false));
 </script>
 <template>
-    <div class="column items-center">
+    <div class="avatar-picture column items-center">
         <QAvatar
-            :style="{ backgroundColor }"
+            :style="{
-            v-bind="$attrs"
+                backgroundColor: useColor(title),
-            :title="title || t('globals.system')"
+            }"
+            :size="$props.size"
+            :title="title"
         >
-            <template v-if="showLetter">
+            <template v-if="showLetter">{{ title.charAt(0) }}</template>
-                {{ title.charAt(0) }}
+            <QImg
-            </template>
+                v-else
-            <QImg v-else :src="src" spinner-color="white" @error="showLetter = true" />
+                :src="`/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`"
+                spinner-color="white"
+                @error="showLetter = true"
+            />
         </QAvatar>
         <div class="description">
-            <slot name="description" v-if="description">
+            <slot name="description" v-if="$props.description">
-                <p v-text="description" />
+                <p>
+                    {{ $props.description }}
+                </p>
             </slot>
         </div>
     </div>
 </template>
-<style lang="scss" scoped>
-[size='xxl'] {
-    .q-avatar,
-    .q-img {
-        width: 80px;
-        height: 80px;
-    }
-
-    .q-img {
-        object-fit: cover;
-    }
-}
-</style>

src/components/ui/VnConfirm.vue

@@ -15,7 +15,7 @@ const props = defineProps({
         default: null,
     },
     message: {
-        type: [String, Boolean],
+        type: String,
         default: null,
     },
     data: {
@@ -30,17 +30,12 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['confirm', 'cancel', ...useDialogPluginComponent.emits]);
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
-defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
-const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } =
+const { dialogRef, onDialogOK } = useDialogPluginComponent();
-    useDialogPluginComponent();
 
 const title = props.title || t('Confirm');
-const message =
+const message = props.message || t('Are you sure you want to continue?');
-    props.message ||
-    (props.message !== false ? t('Are you sure you want to continue?') : false);
-
 const isLoading = ref(false);
 
 async function confirm() {
@@ -54,14 +49,9 @@ async function confirm() {
     }
     onDialogOK(props.data);
 }
-
-function cancel() {
-    emit('cancel');
-    onDialogCancel();
-}
 </script>
 <template>
-    <QDialog ref="dialogRef" @hide="onDialogHide">
+    <QDialog ref="dialogRef">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <QAvatar
@@ -71,22 +61,12 @@ function cancel() {
                     size="xl"
                     v-if="icon"
                 />
-                <span class="text-h6">{{ title }}</span>
+                <span class="text-h6 text-grey">{{ title }}</span>
                 <QSpace />
-                <QBtn
+                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
-                    icon="close"
-                    :disable="isLoading"
-                    flat
-                    round
-                    dense
-                    @click="cancel()"
-                />
             </QCardSection>
-            <QCardSection class="q-pb-none">
+            <QCardSection class="row items-center">
-                <span v-if="message !== false" v-html="message" />
+                <span v-html="message"></span>
-            </QCardSection>
-            <QCardSection class="row items-center q-pt-none">
-                <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
                 <QBtn
@@ -94,7 +74,7 @@ function cancel() {
                     color="primary"
                     :disable="isLoading"
                     flat
-                    @click="cancel()"
+                    v-close-popup
                 />
                 <QBtn
                     :label="t('globals.confirm')"
@@ -103,7 +83,6 @@ function cancel() {
                     @click="confirm()"
                     unelevated
                     autofocus
-                    data-cy="VnConfirm_confirm"
                 />
             </QCardActions>
         </QCard>