Merge branch 'dev' into 6449-updateVnLog

CHANGELOG.md

@@ -1,3 +1,100 @@
+# Version 24.24 - 2024-06-11
+
+### Added 🆕
+
+-   feat: 6942 hashtag in key : value summary by:jgallego
+-   feat: #6957: Rename FetchedTags instance tag by:Javier Segarra
+-   feat: refactor template by:Javier Segarra
+-   feat: refs #6600 Add option to add comment for photo motivation by:jorgep
+-   feat: refs #6942 test e2e tobook & toUnbook by:jorgep
+-   feat: refs #6942 to book summary button & reactive value by:jorgep
+-   feat: refs #6942 to unbook by:jorgep
+-   feat: refs #6942 url update by:jorgep
+-   feat: refs #6942 use correct currency in InvoiceIn components by:jorgep
+-   feat: refs #6942 vat rate total by:jorgep
+-   feat: refs #7494 new icons (7494-icons) by:alexm
+-   feat: refs #7494 new icons by:alexm
+-   feat: refs #7542 drop space by:jorgep
+-   feat: refs #7542 empty by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: style by:Javier Segarra
+-   style: color transparent when is fetive by:Javier Segarra
+-   style: fix color when is empty by:Javier Segarra
+-   style: reset poc style (6957_refactorFetechedTags) by:Javier Segarra
+-   style: reset poc style by:Javier Segarra
+-   style updates by:Javier Segarra
+
+### Changed 📦
+
+-   feat: refactor template by:Javier Segarra
+-   perf: 6957 add color as new shared variable by:Javier Segarra
+-   perf: 6957 change fetchedTags color by:Javier Segarra
+-   perf: remove local tree variable by:Javier Segarra
+-   refactor: add flat by:alexm
+-   refactor: refs #6600 replace QInput to VnInput by:jorgep
+-   refactor: refs #6652 improved defaulter section by:Jon
+-   refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue by:jorgep
+-   refactor: refs #6942 new summary layout by:jorgep
+-   refactor: refs #6942 store key & actions by:jorgep
+-   refactor: refs #6942 summary by:jorgep
+-   refactor: refs #6942 use router hook by:jorgep
+-   refactor: refs #6942 WIP summary layout by:jorgep
+
+### Fixed 🛠️
+
+-   fix: 9-12 by:Javier Segarra
+-   fix: defaulter icon by:alexm
+-   fix: refs #5186 validation by:jorgep
+-   fix: refs #6095 add reFfk null on search by:pablone
+-   fix: refs #6942 cardDescriptor use store if its popup or different source data by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: refs #6942 drop comments by:jorgep
+-   fix: refs #6942 drop console by:jorgep
+-   fix: refs #6942 drop console.log by:jorgep
+-   fix: refs #6942 e2e test (origin/6942-warmfix-fixFormModel) by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 fix emit on data saved by:jorgep
+-   fix: refs #6942 fix emit on reset by:jorgep
+-   fix: refs #6942 fix vncard by:jorgep
+-   fix: refs #6942 formModel & CardDescriptor by:jorgep
+-   fix: refs #6942 formModel watch changes & invoiceInCreate by:jorgep
+-   fix: refs #6942 import by:jorgep
+-   fix: refs #6942 reloading by:jorgep
+-   fix: refs #6942 rollback by:jorgep
+-   fix: refs #6942 selectable expense by:jorgep
+-   fix: refs #6942 skip e2e tests by:jorgep
+-   fix: refs #6942 table bottom highlight & drop isBooked field by:jorgep
+-   fix: refs #6942 tests e2e by:jorgep
+-   fix: refs #6942 tests & summary table spacing by:jorgep
+-   fix: refs #6942 unit tests by:jorgep
+-   fix: refs #6942 vnLocation by:jorgep
+-   fix: refs #6942 wip: formModel by:jorgep
+-   fix: refs #7542 use right panel by:jorgep
+-   fix: searchbar redirect by:alexm
+-   fix: style by:Javier Segarra
+-   fix: WorkerCalendarItem by:Javier Segarra
+-   mini fix by:wbuezas
+-   refs #6111 clean code fix changes by:carlossa
+-   refs #6111 fix merge, fix column by:carlossa
+-   refs #6111 fix qtable, actions, scroll by:carlossa
+-   refs #6111 fix routeList by:carlossa
+-   refs #6111 fix sticky by:carlossa
+-   refs #6111 fix trad remove logs by:carlossa
+-   refs #6111 fix visibleColumns by:carlossa
+-   refs #6111 routeList fix by:carlossa
+-   refs #6332 fix calendar by:carlossa
+-   refs #6332 fix colors by:carlossa
+-   refs #6332 fix festive by:carlossa
+-   refs #6820 fix BasicData Tickets by:carlossa
+-   refs #6820 fix error front by:carlossa
+-   refs #6820 fix traduction by:carlossa
+-   refs #7391 fix textarea by:carlossa
+-   refs #7396 fix summary by:carlossa
+-   Search childs fix by:wbuezas
+-   small fix by:wbuezas
+-   style: fix color when is empty by:Javier Segarra
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
@@ -7,12 +104,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2420.01]
 
+### Added
+
+-   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+-   (Worker) => Se añade la opción de crear un trabajador ajeno a la empresa
+-   (Route) => Ahora se muestran todos los cmrs
+
 ## [2418.01]
 
 ## [2416.01] - 2024-04-18
 
 ### Added
 
+-   (Worker) => Se crea la sección Taquilla
+-   (General) => Se mantiene el filtro lateral en cualquier parte de la seccíon.
+
 ### Fixed
 
 -   (General) => Se vuelven a mostrar los parámetros en la url al aplicar un filtro

Jenkinsfile

@@ -54,7 +54,6 @@ pipeline {
     }
     environment {
         PROJECT_NAME = 'lilium'
-        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
         stage('Install') {
@@ -95,7 +94,7 @@ pipeline {
                 sh 'quasar build'
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 dockerBuild()
             }
@@ -104,15 +103,18 @@ pipeline {
             when {
                 expression { PROTECTED_BRANCH }
             }
-            environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
-            }
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                }
+                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

@@ -0,0 +1,34 @@
+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
+
+

docker-compose.yml

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

package.json

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

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.defaults'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],

src/boot/axios.js

@@ -1,11 +1,10 @@
 import axios from 'axios';
-import { Notify } from 'quasar';
 import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
-import { i18n } from './i18n';
+import useNotify from 'src/composables/useNotify.js';
 
 const session = useSession();
-const { t } = i18n.global;
+const { notify } = useNotify();
 
 axios.defaults.baseURL = '/api/';
 
@@ -27,10 +26,7 @@ const onResponse = (response) => {
 
     const isSaveRequest = method === 'patch';
     if (isSaveRequest) {
-        Notify.create({
+        notify('globals.dataSaved', 'positive');
-            message: t('globals.dataSaved'),
-            type: 'positive',
-        });
     }
 
     return response;
@@ -67,10 +63,7 @@ const onResponseError = (error) => {
         return Promise.reject(error);
     }
 
-    Notify.create({
+    notify(message, 'negative');
-        message: t(message),
-        type: 'negative',
-    });
 
     return Promise.reject(error);
 };

src/boot/qformMixin.js

@@ -1,21 +1,47 @@
 import { getCurrentInstance } from 'vue';
 
-const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
+const filterAvailableInput = (element) => {
-const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
+    return element.classList.contains('q-field__native') && !element.disabled;
-
+};
+const filterAvailableText = (element) => {
+    return (
+        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)) {
+            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
-                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
+                const availableInputs = elementsArray.filter(filterAvailableInput);
+                const firstInputElement = availableInputs.find(filterAvailableText);
 
                 if (firstInputElement) {
                     firstInputElement.focus();
                 }
+                const that = this;
+                this.$el.addEventListener('keyup', function (evt) {
+                    if (evt.key === 'Enter') {
+                        const input = evt.target;
+                        if (input.type == 'textarea' && evt.shiftKey) {
+                            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/components/CreateBankEntityForm.vue

@@ -8,12 +8,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
-const props = defineProps({
+defineProps({ showEntityField: { type: Boolean, default: true } });
-    showEntityField: {
-        type: Boolean,
-        default: true,
-    },
-});
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
@@ -26,7 +21,7 @@ const bankEntityFormData = reactive({
 });
 
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
 };
 
 const countriesOptions = ref([]);
@@ -58,23 +53,19 @@ onMounted(async () => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnInput
-                    <VnInput
+                    :label="t('name')"
-                        :label="t('name')"
+                    v-model="data.name"
-                        v-model="data.name"
+                    :required="true"
-                        :required="true"
+                    :rules="validate('bankEntity.name')"
-                        :rules="validate('bankEntity.name')"
+                />
-                    />
+                <VnInput
-                </div>
+                    ref="bicInputRef"
-                <div class="col">
+                    :label="t('swift')"
-                    <VnInput
+                    v-model="data.bic"
-                        ref="bicInputRef"
+                    :required="true"
-                        :label="t('swift')"
+                    :rules="validate('bankEntity.bic')"
-                        v-model="data.bic"
+                />
-                        :required="true"
-                        :rules="validate('bankEntity.bic')"
-                    />
-                </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -83,7 +74,7 @@ onMounted(async () => {
                         v-model="data.countryFk"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         :required="true"
                         :rules="validate('bankEntity.countryFk')"

src/components/CreateManualInvoiceForm.vue

@@ -48,7 +48,11 @@ const onDataSaved = async (formData, requestResponse) => {
     />
     <FetchData
         url="Tickets"
-        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
+        :filter="{
+            fields: ['id', 'nickname'],
+            where: { refFk: null },
+            order: 'shipped DESC',
+        }"
         @on-fetch="(data) => (ticketsOptions = data)"
         auto-load
     />
@@ -72,69 +76,57 @@ const onDataSaved = async (formData, requestResponse) => {
                 {{ t('Invoicing in progress...') }}
             </span>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnSelect
-                    <VnSelect
+                    :label="t('Ticket')"
-                        :label="t('Ticket')"
+                    :options="ticketsOptions"
-                        :options="ticketsOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="id"
-                        option-label="id"
+                    option-value="id"
-                        option-value="id"
+                    v-model="data.ticketFk"
-                        v-model="data.ticketFk"
+                    @update:model-value="data.clientFk = null"
-                        @update:model-value="data.clientFk = null"
+                >
-                    >
+                    <template #option="scope">
-                        <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
-                            <QItem v-bind="scope.itemProps">
+                            <QItemSection>
-                                <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
-                                    <QItemLabel caption>{{
+                            </QItemSection>
-                                        scope.opt?.nickname
+                        </QItem>
-                                    }}</QItemLabel>
+                    </template>
-                                </QItemSection>
+                </VnSelect>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
                 <span class="row items-center" style="max-width: max-content">{{
                     t('Or')
                 }}</span>
-                <div class="col">
+                <VnSelect
-                    <VnSelect
+                    :label="t('Client')"
-                        :label="t('Client')"
+                    :options="clientsOptions"
-                        :options="clientsOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="name"
-                        option-label="name"
+                    option-value="id"
-                        option-value="id"
+                    v-model="data.clientFk"
-                        v-model="data.clientFk"
+                    @update:model-value="data.ticketFk = null"
-                        @update:model-value="data.ticketFk = null"
+                />
-                    />
+                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-                </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">
+                <VnSelect
-                    <VnSelect
+                    :label="t('Serial')"
-                        :label="t('Serial')"
+                    :options="invoiceOutSerialsOptions"
-                        :options="invoiceOutSerialsOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="description"
-                        option-label="description"
+                    option-value="code"
-                        option-value="code"
+                    v-model="data.serial"
-                        v-model="data.serial"
+                    :required="true"
-                        :required="true"
+                />
-                    />
+                <VnSelect
-                </div>
+                    :label="t('Area')"
-                <div class="col">
+                    :options="taxAreasOptions"
-                    <VnSelect
+                    hide-selected
-                        :label="t('Area')"
+                    option-label="code"
-                        :options="taxAreasOptions"
+                    option-value="code"
-                        hide-selected
+                    v-model="data.taxArea"
-                        option-label="code"
+                    :required="true"
-                        option-value="code"
+                />
-                        v-model="data.taxArea"
-                        :required="true"
-                    />
-                </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput

src/components/CreateNewCityForm.vue

@@ -40,24 +40,20 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnInput
-                    <VnInput
+                    :label="t('Name')"
-                        :label="t('Name')"
+                    v-model="data.name"
-                        v-model="data.name"
+                    :rules="validate('city.name')"
-                        :rules="validate('city.name')"
+                />
-                    />
+                <VnSelect
-                </div>
+                    :label="t('Province')"
-                <div class="col">
+                    :options="provincesOptions"
-                    <VnSelect
+                    hide-selected
-                        :label="t('Province')"
+                    option-label="name"
-                        :options="provincesOptions"
+                    option-value="id"
-                        hide-selected
+                    v-model="data.provinceFk"
-                        option-label="name"
+                    :rules="validate('city.provinceFk')"
-                        option-value="id"
+                />
-                        v-model="data.provinceFk"
-                        :rules="validate('city.provinceFk')"
-                    />
-                </div>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CreateNewPostcodeForm.vue

@@ -30,18 +30,18 @@ const townsLocationOptions = ref([]);
 
 const onDataSaved = (formData) => {
     const newPostcode = {
-        ...formData
+        ...formData,
     };
     const townObject = townsLocationOptions.value.find(
-        ({id}) => id === formData.townFk
+        ({ id }) => id === formData.townFk
     );
     newPostcode.town = townObject?.name;
     const provinceObject = provincesOptions.value.find(
-        ({id}) => id === formData.provinceFk
+        ({ id }) => id === formData.provinceFk
     );
     newPostcode.province = provinceObject?.name;
     const countryObject = countriesOptions.value.find(
-        ({id}) => id === formData.countryFk
+        ({ id }) => id === formData.countryFk
     );
     newPostcode.country = countryObject?.country;
     emit('onDataSaved', newPostcode);
@@ -92,63 +92,55 @@ const onProvinceCreated = async ({ name }, formData) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnInput
-                    <VnInput
+                    :label="t('Postcode')"
-                        :label="t('Postcode')"
+                    v-model="data.code"
-                        v-model="data.code"
+                    :rules="validate('postcode.code')"
-                        :rules="validate('postcode.code')"
+                />
-                    />
+                <VnSelectDialog
-                </div>
+                    :label="t('City')"
-                <div class="col">
+                    :options="townsLocationOptions"
-                    <VnSelectDialog
+                    v-model="data.townFk"
-                        :label="t('City')"
+                    hide-selected
-                        :options="townsLocationOptions"
+                    option-label="name"
-                        v-model="data.townFk"
+                    option-value="id"
-                        hide-selected
+                    :rules="validate('postcode.city')"
-                        option-label="name"
+                    :roles-allowed-to-create="['deliveryAssistant']"
-                        option-value="id"
+                >
-                        :rules="validate('postcode.city')"
+                    <template #form>
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        <CreateNewCityForm @on-data-saved="onCityCreated($event, data)" />
-                    >
+                    </template>
-                        <template #form>
+                </VnSelectDialog>
-                            <CreateNewCityForm
-                                @on-data-saved="onCityCreated($event, data)"
-                            />
-                        </template>
-                    </VnSelectDialog>
-                </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
+                <VnSelectDialog
-                    <VnSelectDialog
+                    :label="t('Province')"
-                        :label="t('Province')"
+                    :options="provincesOptions"
-                        :options="provincesOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="name"
-                        option-label="name"
+                    option-value="id"
-                        option-value="id"
+                    v-model="data.provinceFk"
-                        v-model="data.provinceFk"
+                    :rules="validate('postcode.provinceFk')"
-                        :rules="validate('postcode.provinceFk')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                >
-                    >
+                    <template #form>
-                        <template #form>
+                        <CreateNewProvinceForm
-                            <CreateNewProvinceForm
+                            @on-data-saved="onProvinceCreated($event, data)"
-                                @on-data-saved="onProvinceCreated($event, data)"
+                        />
-                            />
+                    </template> </VnSelectDialog
-                        </template>
+            ></VnRow>
-                    </VnSelectDialog>
+            <VnRow class="row q-gutter-md q-mb-xl"
-                </div>
+                ><VnSelect
-                <div class="col">
+                    :label="t('Country')"
-                    <VnSelect
+                    :options="countriesOptions"
-                        :label="t('Country')"
+                    hide-selected
-                        :options="countriesOptions"
+                    option-label="name"
-                        hide-selected
+                    option-value="id"
-                        option-label="country"
+                    v-model="data.countryFk"
-                        option-value="id"
+                    :rules="validate('postcode.countryFk')"
-                        v-model="data.countryFk"
+                />
-                        :rules="validate('postcode.countryFk')"
+            </VnRow>
-                    />
+        </template>
-                </div> </VnRow
-        ></template>
     </FormModelPopup>
 </template>
 

src/components/CreateNewProvinceForm.vue

@@ -40,24 +40,20 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnInput
-                    <VnInput
+                    :label="t('Name')"
-                        :label="t('Name')"
+                    v-model="data.name"
-                        v-model="data.name"
+                    :rules="validate('province.name')"
-                        :rules="validate('province.name')"
+                />
-                    />
+                <VnSelect
-                </div>
+                    :label="t('Autonomy')"
-                <div class="col">
+                    :options="autonomiesOptions"
-                    <VnSelect
+                    hide-selected
-                        :label="t('Autonomy')"
+                    option-label="name"
-                        :options="autonomiesOptions"
+                    option-value="id"
-                        hide-selected
+                    v-model="data.autonomyFk"
-                        option-label="name"
+                    :rules="validate('province.autonomyFk')"
-                        option-value="id"
+                />
-                        v-model="data.autonomyFk"
-                        :rules="validate('province.autonomyFk')"
-                    />
-                </div>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CreateThermographForm.vue

@@ -54,51 +54,42 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnInput
-                    <VnInput
+                    :label="t('Identifier')"
-                        :label="t('Identifier')"
+                    v-model="data.thermographId"
-                        v-model="data.thermographId"
+                    :required="true"
-                        :required="true"
+                    :rules="validate('thermograph.id')"
-                        :rules="validate('thermograph.id')"
+                />
-                    />
+                <VnSelect
-                </div>
+                    :label="t('Model')"
-
+                    :options="thermographsModels"
-                <div class="col">
+                    hide-selected
-                    <VnSelect
+                    option-label="value"
-                        :label="t('Model')"
+                    option-value="value"
-                        :options="thermographsModels"
+                    v-model="data.model"
-                        hide-selected
+                    :required="true"
-                        option-label="value"
+                    :rules="validate('thermograph.model')"
-                        option-value="value"
+                />
-                        v-model="data.model"
-                        :required="true"
-                        :rules="validate('thermograph.model')"
-                    />
-                </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
+                <VnSelect
-                    <VnSelect
+                    :label="t('Warehouse')"
-                        :label="t('Warehouse')"
+                    :options="warehousesOptions"
-                        :options="warehousesOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="name"
-                        option-label="name"
+                    option-value="id"
-                        option-value="id"
+                    v-model="data.warehouseId"
-                        v-model="data.warehouseId"
+                    :required="true"
-                        :required="true"
+                />
-                    />
+                <VnSelect
-                </div>
+                    :label="t('Temperature')"
-                <div class="col">
+                    :options="temperaturesOptions"
-                    <VnSelect
+                    hide-selected
-                        :label="t('Temperature')"
+                    option-label="name"
-                        :options="temperaturesOptions"
+                    option-value="code"
-                        hide-selected
+                    v-model="data.temperatureFk"
-                        option-label="name"
+                    :required="true"
-                        option-value="code"
+                />
-                        v-model="data.temperatureFk"
-                        :required="true"
-                    />
-                </div>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CrudModel.vue

@@ -1,6 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -10,6 +11,7 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
 
+const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -60,6 +62,15 @@ 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);
@@ -68,6 +79,7 @@ const originalData = ref();
 const vnPaginateRef = ref();
 const formData = ref();
 const saveButtonRef = ref(null);
+const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@@ -81,6 +93,8 @@ defineExpose({
     hasChanges,
     saveChanges,
     getChanges,
+    formData,
+    vnPaginateRef,
 });
 
 async function fetch(data) {
@@ -89,19 +103,26 @@ async function fetch(data) {
         data.map((d) => (d.$index = $index++));
     }
 
-    originalData.value = data && JSON.parse(JSON.stringify(data));
+    resetData(data);
-    formData.value = data && JSON.parse(JSON.stringify(data));
-    watch(formData, () => (hasChanges.value = true), { deep: true });
 
     emit('onFetch', data);
     return data;
 }
 
+function resetData(data) {
+    if (!data) return;
+    originalData.value = JSON.parse(JSON.stringify(data));
+    formData.value = JSON.parse(JSON.stringify(data));
+
+    if (watchChanges.value) watchChanges.value(); //destoy watcher
+    watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
+}
+
 async function reset() {
     await fetch(originalData.value);
     hasChanges.value = false;
 }
-// eslint-disable-next-line vue/no-dupe-keys
+
 function filter(value, update, filterOptions) {
     update(
         () => {
@@ -127,6 +148,11 @@ async function onSubmit() {
     await saveChanges($props.saveFn ? formData.value : null);
 }
 
+async function onSubmitAndGo() {
+    await onSubmit();
+    push({ path: $props.goTo });
+}
+
 async function saveChanges(data) {
     if ($props.saveFn) {
         $props.saveFn(data, getChanges);
@@ -258,8 +284,9 @@ function isEmpty(obj) {
     if (obj.length > 0) return false;
 }
 
-async function reload() {
+async function reload(params) {
-    vnPaginateRef.value.fetch();
+    const data = await vnPaginateRef.value.fetch(params);
+    fetch(data);
 }
 
 watch(formUrl, async () => {
@@ -271,10 +298,11 @@ watch(formUrl, async () => {
     <VnPaginate
         :url="url"
         :limit="limit"
-        v-bind="$attrs"
         @on-fetch="fetch"
+        @on-change="resetData"
         :skeleton="false"
         ref="vnPaginateRef"
+        v-bind="$attrs"
     >
         <template #body v-if="formData">
             <slot
@@ -285,8 +313,8 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable v-if="!formData" />
+    <SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn
@@ -309,7 +337,40 @@ 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"
@@ -317,7 +378,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                v-if="$props.defaultSave"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/EditPictureForm.vue

@@ -155,7 +155,7 @@ const rotateRight = () => {
     editor.value.rotate(-90);
 };
 
-const onUploadAccept = () => {
+const onSubmit = () => {
     try {
         if (!newPhoto.files && !newPhoto.url) {
             notify(t('Select an image'), 'negative');
@@ -206,7 +206,7 @@ const makeRequest = async () => {
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <QForm @submit="onUploadAccept()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
@@ -246,61 +246,55 @@ const makeRequest = async () => {
 
                 <div class="column">
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
+                        <QOptionGroup
-                            <QOptionGroup
+                            :options="uploadMethodsOptions"
-                                :options="uploadMethodsOptions"
+                            type="radio"
-                                type="radio"
+                            v-model="uploadMethodSelected"
-                                v-model="uploadMethodSelected"
+                        />
-                            />
-                        </div>
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
+                        <QFile
-                            <QFile
+                            v-if="uploadMethodSelected === 'computer'"
-                                v-if="uploadMethodSelected === 'computer'"
+                            ref="inputFileRef"
-                                ref="inputFileRef"
+                            :label="t('File')"
-                                :label="t('File')"
+                            :multiple="false"
-                                :multiple="false"
+                            v-model="newPhoto.files"
-                                v-model="newPhoto.files"
+                            @update:model-value="updatePhotoPreview($event)"
-                                @update:model-value="updatePhotoPreview($event)"
+                            :accept="allowedContentTypes"
-                                :accept="allowedContentTypes"
+                            class="required cursor-pointer"
-                                class="required cursor-pointer"
+                        >
-                            >
+                            <template #append>
-                                <template #append>
+                                <QIcon
-                                    <QIcon
+                                    name="vn:attach"
-                                        name="vn:attach"
+                                    class="cursor-pointer q-mr-sm"
-                                        class="cursor-pointer q-mr-sm"
+                                    @click="openInputFile()"
-                                        @click="openInputFile()"
+                                >
-                                    >
+                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
-                                        <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
+                                </QIcon>
-                                    </QIcon>
+                                <QIcon name="info" class="cursor-pointer">
-                                    <QIcon name="info" class="cursor-pointer">
+                                    <QTooltip>{{
-                                        <QTooltip>{{
+                                        t('globals.allowedFilesText', {
-                                            t('globals.allowedFilesText', {
+                                            allowedContentTypes: allowedContentTypes,
-                                                allowedContentTypes: allowedContentTypes,
+                                        })
-                                            })
+                                    }}</QTooltip>
-                                        }}</QTooltip>
+                                </QIcon>
-                                    </QIcon>
+                            </template>
-                                </template>
+                        </QFile>
-                            </QFile>
+                        <VnInput
-                            <VnInput
+                            v-if="uploadMethodSelected === 'URL'"
-                                v-if="uploadMethodSelected === 'URL'"
+                            v-model="newPhoto.url"
-                                v-model="newPhoto.url"
+                            @update:model-value="updatePhotoPreview($event)"
-                                @update:model-value="updatePhotoPreview($event)"
+                            placeholder="https://"
-                                placeholder="https://"
+                        />
-                            />
-                        </div>
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
+                        <VnSelect
-                            <VnSelect
+                            :label="t('Orientation')"
-                                :label="t('Orientation')"
+                            :options="viewportTypes"
-                                :options="viewportTypes"
+                            hide-selected
-                                hide-selected
+                            option-label="description"
-                                option-label="description"
+                            v-model="viewportSelection"
-                                v-model="viewportSelection"
+                        />
-                            />
-                        </div>
                     </VnRow>
                     <div class="q-mt-lg row justify-end">
                         <QBtn

src/components/EditTableCellValueForm.vue

@@ -50,7 +50,7 @@ const onDataSaved = () => {
     closeForm();
 };
 
-const submitData = async () => {
+const onSubmit = async () => {
     try {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
@@ -74,7 +74,7 @@ const closeForm = () => {
 </script>
 
 <template>
-    <QForm @submit="submitData()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FetchData.vue

@@ -24,7 +24,7 @@ const $props = defineProps({
         default: '',
     },
     limit: {
-        type: String,
+        type: [String, Number],
         default: '',
     },
     params: {

src/components/FilterItemForm.vue

@@ -1,7 +1,6 @@
 <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';
@@ -12,10 +11,16 @@ 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: [
@@ -73,12 +78,12 @@ const tableColumns = computed(() => [
     {
         label: t('entry.buys.color'),
         name: 'ink',
-        field: 'inkName',
+        field: (row) => row?.ink?.name,
         align: 'left',
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = itemFilter;
         const params = itemFilterParams;
@@ -100,7 +105,7 @@ const fetchResults = async () => {
         }
         filter.where = where;
 
-        const { data } = await axios.get(`Entries/${route.params.id}/lastItemBuys`, {
+        const { data } = await axios.get(props.url, {
             params: { filter: JSON.stringify(filter) },
         });
         tableRows.value = data;
@@ -140,55 +145,39 @@ const selectItem = ({ id }) => {
         @on-fetch="(data) => (InksOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" 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 class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
-                    <VnInput
+                <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
-                        :label="t('entry.buys.name')"
+                <VnSelect
-                        v-model="itemFilterParams.name"
+                    :label="t('entry.buys.producer')"
-                    />
+                    :options="producersOptions"
-                </div>
+                    hide-selected
-                <div class="col">
+                    option-label="name"
-                    <VnInput
+                    option-value="id"
-                        :label="t('entry.buys.size')"
+                    v-model="itemFilterParams.producerFk"
-                        v-model="itemFilterParams.size"
+                />
-                    />
+                <VnSelect
-                </div>
+                    :label="t('entry.buys.type')"
-                <div class="col">
+                    :options="ItemTypesOptions"
-                    <VnSelect
+                    hide-selected
-                        :label="t('entry.buys.producer')"
+                    option-label="name"
-                        :options="producersOptions"
+                    option-value="id"
-                        hide-selected
+                    v-model="itemFilterParams.typeFk"
-                        option-label="name"
+                />
-                        option-value="id"
+                <VnSelect
-                        v-model="itemFilterParams.producerFk"
+                    :label="t('entry.buys.color')"
-                    />
+                    :options="InksOptions"
-                </div>
+                    hide-selected
-                <div class="col">
+                    option-label="name"
-                    <VnSelect
+                    option-value="id"
-                        :label="t('entry.buys.type')"
+                    v-model="itemFilterParams.inkFk"
-                        :options="ItemTypesOptions"
+                />
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.typeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.buys.color')"
-                        :options="InksOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.inkFk"
-                    />
-                </div>
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn

src/components/FilterTravelForm.vue

@@ -85,7 +85,7 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = travelFilter;
         const params = travelFilterParams;
@@ -138,55 +138,45 @@ const selectTravel = ({ id }) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" 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 class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnSelect
-                    <VnSelect
+                    :label="t('entry.basicData.agency')"
-                        :label="t('entry.basicData.agency')"
+                    :options="agenciesOptions"
-                        :options="agenciesOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="name"
-                        option-label="name"
+                    option-value="id"
-                        option-value="id"
+                    v-model="travelFilterParams.agencyModeFk"
-                        v-model="travelFilterParams.agencyModeFk"
+                />
-                    />
+                <VnSelect
-                </div>
+                    :label="t('entry.basicData.warehouseOut')"
-                <div class="col">
+                    :options="warehousesOptions"
-                    <VnSelect
+                    hide-selected
-                        :label="t('entry.basicData.warehouseOut')"
+                    option-label="name"
-                        :options="warehousesOptions"
+                    option-value="id"
-                        hide-selected
+                    v-model="travelFilterParams.warehouseOutFk"
-                        option-label="name"
+                />
-                        option-value="id"
+                <VnSelect
-                        v-model="travelFilterParams.warehouseOutFk"
+                    :label="t('entry.basicData.warehouseIn')"
-                    />
+                    :options="warehousesOptions"
-                </div>
+                    hide-selected
-                <div class="col">
+                    option-label="name"
-                    <VnSelect
+                    option-value="id"
-                        :label="t('entry.basicData.warehouseIn')"
+                    v-model="travelFilterParams.warehouseInFk"
-                        :options="warehousesOptions"
+                />
-                        hide-selected
+                <VnInputDate
-                        option-label="name"
+                    :label="t('entry.basicData.shipped')"
-                        option-value="id"
+                    v-model="travelFilterParams.shipped"
-                        v-model="travelFilterParams.warehouseInFk"
+                />
-                    />
+                <VnInputDate
-                </div>
+                    :label="t('entry.basicData.landed')"
-                <div class="col">
+                    v-model="travelFilterParams.landed"
-                    <VnInputDate
+                />
-                        :label="t('entry.basicData.shipped')"
-                        v-model="travelFilterParams.shipped"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        :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 } from 'vue-router';
+import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -11,13 +11,17 @@ 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 $props = defineProps({
     url: {
@@ -26,7 +30,7 @@ const $props = defineProps({
     },
     model: {
         type: String,
-        default: '',
+        default: null,
     },
     filter: {
         type: Object,
@@ -74,31 +78,80 @@ 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,
+    },
 });
-
 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 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,
+}));
 
 onMounted(async () => {
-    originalData.value = $props.formInitialData;
+    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($props.model, $props.formInitialData);
+    state.set(modelValue, $props.formInitialData);
-    if ($props.autoLoad && !$props.formInitialData) {
-        await fetch();
-    }
 
-    // Si así se desea disparamos el watcher del form después de 100ms, asi darle tiempo de que se haya cargado la data inicial
+    if (!$props.formInitialData) {
-    // para evitar que detecte cambios cuando es data inicial default
+        if ($props.autoLoad && $props.url) await fetch();
-    if ($props.observeFormChanges) {
+        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
-        setTimeout(() => {
-            startFormWatcher();
-        }, 100);
     }
+    if ($props.observeFormChanges) {
+        watch(
+            () => formData.value,
+            (newVal, oldVal) => {
+                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(formUrl, async () => {
+    originalData.value = null;
+    reset();
+    await fetch();
 });
 
 onBeforeRouteLeave((to, from, next) => {
@@ -116,92 +169,59 @@ 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) {
+    if (hasChanges.value) return state.set(modelValue, originalData.value);
-        state.set($props.model, originalData.value);
+    if ($props.clearStoreOnUnmount) state.unset(modelValue);
-        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({});
-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) },
         });
-        state.set($props.model, data);
+        if (Array.isArray(data)) data = data[0] ?? {};
-        originalData.value = data && JSON.parse(JSON.stringify(data));
 
-        emit('onFetch', state.get($props.model));
+        updateAndEmit('onFetch', data);
-    } catch (error) {
+    } catch (e) {
-        state.set($props.model, {});
+        state.set(modelValue, {});
         originalData.value = {};
     }
 }
 
 async function save() {
-    if ($props.observeFormChanges && !hasChanges.value) {
+    if ($props.observeFormChanges && !hasChanges.value)
-        notify('globals.noChanges', 'negative');
+        return notify('globals.noChanges', 'negative');
-        return;
-    }
-    isLoading.value = true;
 
+    isLoading.value = true;
     try {
         const body = $props.mapper ? $props.mapper(formData.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
+        else response = await axios[method](url, body);
-            response = await axios[$props.urlCreate ? 'post' : 'patch'](
+
-                $props.urlCreate || $props.urlUpdate || $props.url,
-                body
-            );
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
-        emit('onDataSaved', formData.value, response?.data);
+        updateAndEmit('onDataSaved', formData.value, response?.data);
-        originalData.value = JSON.parse(JSON.stringify(formData.value));
+        if ($props.reload) await arrayData.fetch({});
         hasChanges.value = false;
     } catch (err) {
         console.error(err);
         notify('errors.writeRequest', 'negative');
+    } finally {
+        isLoading.value = false;
     }
-    isLoading.value = false;
+}
+
+async function saveAndGo() {
+    await save();
+    push({ path: $props.goTo });
 }
 
 function reset() {
-    state.set($props.model, originalData.value);
+    updateAndEmit('onFetch', 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;
@@ -219,26 +239,30 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        }
+        },
     );
 }
 
-watch(formUrl, async () => {
+function updateAndEmit(evt, val, res) {
-    originalData.value = null;
+    state.set(modelValue, val);
-    reset();
+    originalData.value = val && JSON.parse(JSON.stringify(val));
-    fetch();
+    if (!$props.url) arrayData.store.data = val;
-});
+
+    emit(evt, state.get(modelValue), res);
+}
 
 defineExpose({
     save,
     isLoading,
     hasChanges,
+    reset,
+    fetch,
 });
 </script>
 <template>
     <div class="column items-center full-width">
         <QForm
-            v-if="formData"
+            
             @submit="save"
             @reset="reset"
             class="q-pa-md"
@@ -246,11 +270,13 @@ defineExpose({
         >
             <QCard>
                 <slot
+                    v-if="formData"
                     name="form"
                     :data="formData"
                     :validate="validate"
                     :filter="filter"
                 />
+                <SkeletonForm v-else/>
             </QCard>
         </QForm>
     </div>
@@ -270,10 +296,42 @@ defineExpose({
                     :disable="!hasChanges"
                     :title="t(defaultButtons.reset.label)"
                 />
+                <QBtnDropdown
+                    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
-                    :label="tMobile(defaultButtons.save.label)"
+                    v-else
-                    :color="defaultButtons.save.color"
+                    :label="tMobile('globals.save')"
-                    :icon="defaultButtons.save.icon"
+                    color="primary"
+                    icon="save"
                     @click="save"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.save.label)"
@@ -281,7 +339,7 @@ defineExpose({
             </QBtnGroup>
         </div>
     </Teleport>
-    <SkeletonForm v-if="!formData" />
+    
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"

src/components/FormModelPopup.vue

@@ -4,9 +4,9 @@ import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
 
-const emit = defineEmits(['onDataSaved']);
+const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
@@ -15,26 +15,6 @@ const $props = 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();
@@ -43,8 +23,8 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
     closeForm();
+    emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
@@ -61,11 +41,9 @@ defineExpose({
 <template>
     <FormModel
         ref="formModelRef"
-        :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :default-actions="false"
-        :url-create="urlCreate"
+        v-bind="$attrs"
-        :model="model"
         @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
@@ -84,6 +62,7 @@ defineExpose({
                     flat
                     :disabled="isLoading"
                     :loading="isLoading"
+                    @click="emit('onDataCanceled')"
                     v-close-popup
                 />
                 <QBtn

src/components/FormPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
@@ -74,7 +74,7 @@ const closeForm = () => {
                     :disabled="isLoading"
                     :loading="isLoading"
                 />
-                <slot name="customButtons" />
+                <slot name="custom-buttons" />
             </div>
         </QCard>
     </QForm>

src/components/LeftMenu.vue

@@ -58,6 +58,7 @@ function addChildren(module, route, parent) {
 }
 
 const items = ref([]);
+
 function getRoutes() {
     if (props.source === 'main') {
         const modules = Object.assign([], navigation.getModules().value);
@@ -66,9 +67,8 @@ function getRoutes() {
             const moduleDef = routes.find(
                 (route) => toLowerCamel(route.name) === item.module
             );
-            item.children = [];
-
             if (!moduleDef) continue;
+            item.children = [];
 
             addChildren(item.module, moduleDef, item.children);
         }

src/components/LeftMenuItem.vue

@@ -20,7 +20,13 @@ const itemComputed = computed(() => {
 });
 </script>
 <template>
-    <QItem active-class="bg-hover" :to="{ name: itemComputed.name }" clickable v-ripple>
+    <QItem
+        active-class="bg-hover"
+        class="min-height"
+        :to="{ name: itemComputed.name }"
+        clickable
+        v-ripple
+    >
         <QItemSection avatar v-if="itemComputed.icon">
             <QIcon :name="itemComputed.icon" />
         </QItemSection>
@@ -33,3 +39,9 @@ const itemComputed = computed(() => {
         </QItemSection>
     </QItem>
 </template>
+
+<style lang="scss" scoped>
+.q-item {
+    min-height: 5vh;
+}
+</style>

src/components/NavBar.vue

@@ -1,21 +1,19 @@
 <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 { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
 import VnBreadcrumbs from './common/VnBreadcrumbs.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
@@ -83,11 +81,12 @@ const pinnedModulesRef = ref();
                     id="user"
                 >
                     <QAvatar size="lg">
-                        <QImg
+                        <VnImg
-                            :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
+                            :id="user.id"
-                            spinner-color="primary"
+                            collection="user"
-                        >
+                            size="160x160"
-                        </QImg>
+                            :zoom-size="null"
+                        />
                     </QAvatar>
                     <QTooltip bottom>
                         {{ t('globals.userPanel') }}

src/components/RegularizeStockForm.vue

@@ -50,13 +50,11 @@ const onDataSaved = (data) => {
     >
         <template #form-inputs="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <QInput
-                    <QInput
+                    :label="t('Type the visible quantity')"
-                        :label="t('Type the visible quantity')"
+                    v-model.number="data.quantity"
-                        v-model.number="data.quantity"
+                    autofocus
-                        autofocus
+                />
-                    />
-                </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">

src/components/TransferInvoiceForm.vue

@@ -2,7 +2,8 @@
 import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
+import { useQuasar } 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';
@@ -18,33 +19,65 @@ const $props = defineProps({
     },
 });
 
+const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
-
+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 closeForm = () => {
+const selectedClient = (client) => {
-    if (closeButton.value) closeButton.value.click();
+    transferInvoiceParams.selectedClientData = client;
 };
 
-const transferInvoice = async () => {
+const makeInvoice = async () => {
+    const hasToInvoiceByAddress =
+        transferInvoiceParams.selectedClientData.hasToInvoiceByAddress;
+
+    const params = {
+        id: transferInvoiceParams.id,
+        cplusRectificationTypeFk: transferInvoiceParams.cplusRectificationTypeFk,
+        invoiceCorrectionTypeFk: transferInvoiceParams.invoiceCorrectionTypeFk,
+        newClientFk: transferInvoiceParams.newClientFk,
+        refFk: transferInvoiceParams.refFk,
+        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
+        makeInvoice: checked.value,
+    };
+
     try {
-        const { data } = await axios.post(
+        if (checked.value && hasToInvoiceByAddress) {
-            'InvoiceOuts/transferInvoice',
+            const response = await new Promise((resolve) => {
-            transferInvoiceParams
+                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/transferInvoice', params);
         notify(t('Transferred invoice'), 'positive');
-        closeForm();
+        const id = data?.[0];
-        router.push('InvoiceOutSummary', { id: data.id });
+        if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
     } catch (err) {
         console.error('Error transfering invoice', err);
     }
@@ -52,22 +85,30 @@ const transferInvoice = async () => {
 </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="(data) => (rectificativeTypeOptions = data)"
+        @on-fetch="
+            (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="(data) => (siiTypeInvoiceOutsOptions = data)"
+        @on-fetch="
+            (data) => (
+                (siiTypeInvoiceOutsOptions = data),
+                (transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
+                    (type) => type.code == 'R4'
+                )[0].id)
+            )
+        "
         auto-load
     />
     <FetchData
@@ -76,80 +117,85 @@ const transferInvoice = async () => {
         auto-load
     />
     <FormPopup
-        @on-submit="transferInvoice()"
+        @on-submit="makeInvoice()"
         :title="t('Transfer invoice')"
         :custom-submit-button-label="t('Transfer client')"
         :default-cancel-button="false"
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnSelect
-                    <VnSelect
+                    :label="t('Client')"
-                        :label="t('Client')"
+                    :options="clientsOptions"
-                        :options="clientsOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="name"
-                        option-label="name"
+                    option-value="id"
-                        option-value="id"
+                    v-model="transferInvoiceParams.newClientFk"
-                        v-model="transferInvoiceParams.newClientFk"
+                    :required="true"
-                        :required="true"
+                    url="Clients"
-                    >
+                    :fields="['id', 'name', 'hasToInvoiceByAddress']"
-                        <template #option="scope">
+                    auto-load
-                            <QItem v-bind="scope.itemProps">
+                >
-                                <QItemSection>
+                    <template #option="scope">
-                                    <QItemLabel>
+                        <QItem
-                                        #{{ scope.opt?.id }} -
+                            v-bind="scope.itemProps"
-                                        {{ scope.opt?.name }}
+                            @click="selectedClient(scope.opt)"
-                                    </QItemLabel>
+                        >
-                                </QItemSection>
+                            <QItemSection>
-                            </QItem>
+                                <QItemLabel>
-                        </template>
+                                    #{{ scope.opt?.id }} - {{ scope.opt?.name }}
-                    </VnSelect>
+                                </QItemLabel>
-                </div>
+                            </QItemSection>
-                <div class="col">
+                        </QItem>
-                    <VnSelect
+                    </template>
-                        :label="t('Rectificative type')"
+                </VnSelect>
-                        :options="rectificativeTypeOptions"
+                <VnSelect
-                        hide-selected
+                    :label="t('Rectificative type')"
-                        option-label="description"
+                    :options="rectificativeTypeOptions"
-                        option-value="id"
+                    hide-selected
-                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                    option-label="description"
-                        :required="true"
+                    option-value="id"
-                    />
+                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                </div>
+                    :required="true"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+                <VnSelect
-                    <VnSelect
+                    :label="t('Class')"
-                        :label="t('Class')"
+                    :options="siiTypeInvoiceOutsOptions"
-                        :options="siiTypeInvoiceOutsOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="description"
-                        option-label="description"
+                    option-value="id"
-                        option-value="id"
+                    v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                    :required="true"
-                        :required="true"
+                >
-                    >
+                    <template #option="scope">
-                        <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
-                            <QItem v-bind="scope.itemProps">
+                            <QItemSection>
-                                <QItemSection>
+                                <QItemLabel>
-                                    <QItemLabel>
+                                    {{ scope.opt?.code }} -
-                                        {{ scope.opt?.code }} -
+                                    {{ scope.opt?.description }}
-                                        {{ scope.opt?.description }}
+                                </QItemLabel>
-                                    </QItemLabel>
+                            </QItemSection>
-                                </QItemSection>
+                        </QItem>
-                            </QItem>
+                    </template>
-                        </template>
+                </VnSelect>
-                    </VnSelect>
+                <VnSelect
-                </div>
+                    :label="t('Type')"
-                <div class="col">
+                    :options="invoiceCorrectionTypesOptions"
-                    <VnSelect
+                    hide-selected
-                        :label="t('Type')"
+                    option-label="description"
-                        :options="invoiceCorrectionTypesOptions"
+                    option-value="id"
-                        hide-selected
+                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                        option-label="description"
+                    :required="true"
-                        option-value="id"
+                />
-                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+            </VnRow>
-                        :required="true"
+            <VnRow class="row q-gutter-md q-mb-md">
-                    />
+                <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>
@@ -157,6 +203,10 @@ const transferInvoice = async () => {
 </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
@@ -165,4 +215,7 @@ 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 } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -10,14 +10,16 @@ import { localeEquivalence } from 'src/i18n/index';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
+import { useClipboard } from 'src/composables/useClipboard';
+import VnImg from 'src/components/ui/VnImg.vue';
+import { useRole } from 'src/composables/useRole';
 
 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 userLocale = computed({
     get() {
         return locale.value;
@@ -48,7 +50,6 @@ const darkMode = computed({
 });
 
 const user = state.getUser();
-const token = session.getTokenMultimedia();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
@@ -91,6 +92,16 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
+
+function localUserData() {
+    state.setUser(user.value);
+}
+
+function saveUserData(param, value) {
+    axios.post('UserConfigs/setUserConfig', { [param]: value });
+    localUserData();
+}
+const isEmployee = computed(() => useRole().isEmployee());
 </script>
 
 <template>
@@ -101,12 +112,14 @@ function copyUserToken() {
         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)"
@@ -141,10 +154,7 @@ function copyUserToken() {
 
             <div class="col column items-center q-mb-sm">
                 <QAvatar size="80px">
-                    <QImg
+                    <VnImg :id="user.id" collection="user" size="160x160" />
-                        :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                        spinner-color="white"
-                    />
                 </QAvatar>
 
                 <div class="text-subtitle1 q-mt-md">
@@ -178,6 +188,9 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -185,6 +198,9 @@ function copyUserToken() {
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
+                    @update:model-value="localUserData"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -201,10 +217,12 @@ function copyUserToken() {
                 <VnSelect
                     :label="t('components.userPanel.localCompany')"
                     hide-selected
-                    v-model="user.companyFk"
+                    v-model="user.localCompanyFk"
                     :options="companiesData"
                     option-label="code"
                     option-value="id"
+                    input-debounce="0"
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -213,6 +231,8 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
+                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
                 />
             </VnRow>
             <VnRow>
@@ -224,6 +244,9 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     style="flex: 0"
+                    dense
+                    input-debounce="0"
+                    @update:model-value="(v) => saveUserData('companyFk', v)"
                 />
             </VnRow>
         </div>

src/components/VnTable/VnChip.vue

@@ -0,0 +1,55 @@
+<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">{{ 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

@@ -0,0 +1,161 @@
+<script setup>
+import { markRaw, computed, defineModel } from 'vue';
+import { QIcon, QCheckbox } from 'quasar';
+import { dashIfEmpty } from 'src/filters';
+
+/* basic input */
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnComponent from 'components/common/VnComponent.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 defaultComponents = {
+    input: {
+        component: markRaw(VnInput),
+        attrs: {
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
+    number: {
+        component: markRaw(VnInput),
+        attrs: {
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
+    date: {
+        component: markRaw(VnInputDate),
+        attrs: {
+            readonly: true,
+            disable: !$props.isEditable,
+            style: 'min-width: 125px',
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
+    checkbox: {
+        component: markRaw(QCheckbox),
+        attrs: (prop) => {
+            const defaultAttrs = {
+                disable: !$props.isEditable,
+                'model-value': Boolean(prop),
+                class: 'no-padding',
+            };
+
+            if (typeof prop == 'number') {
+                defaultAttrs['true-value'] = 1;
+                defaultAttrs['false-value'] = 0;
+            }
+            return defaultAttrs;
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
+    select: {
+        component: markRaw(VnSelect),
+        attrs: {
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
+    icon: {
+        component: markRaw(QIcon),
+    },
+};
+
+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 (
+        (newColumn.name.startsWith('is') || newColumn.name.startsWith('has')) &&
+        !newColumn.component
+    )
+        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 fit">
+        <VnComponent
+            v-if="col.before"
+            :prop="col.before"
+            :components="components"
+            :value="model"
+            v-model="model"
+        />
+        <VnComponent
+            v-if="col.component"
+            :prop="col"
+            :components="components"
+            :value="model"
+            v-model="model"
+        />
+        <span :title="value" v-else>{{ value }}</span>
+        <VnComponent
+            v-if="col.after"
+            :prop="col.after"
+            :components="components"
+            :value="model"
+            v-model="model"
+        />
+    </div>
+</template>

src/components/VnTable/VnFilter.vue

@@ -0,0 +1,158 @@
+<script setup>
+import { markRaw, computed, defineModel } 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: 'params',
+    },
+});
+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-sm q-pb-xs q-pt-none',
+    dense: true,
+};
+
+const forceAttrs = {
+    label: $props.showTitle ? '' : $props.column.label,
+};
+
+const components = {
+    input: {
+        component: markRaw(VnInput),
+        event: enterEvent,
+        attrs: {
+            ...defaultAttrs,
+            clearable: true,
+        },
+        forceAttrs,
+    },
+    number: {
+        component: markRaw(VnInput),
+        event: enterEvent,
+        attrs: {
+            ...defaultAttrs,
+            clearable: true,
+        },
+        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',
+            'toggle-indeterminate': true,
+        },
+        forceAttrs,
+    },
+    select: {
+        component: markRaw(VnSelect),
+        event: updateEvent,
+        attrs: {
+            class: 'q-px-md q-pb-xs q-pt-none',
+            dense: true,
+            filled: !$props.showTitle,
+        },
+        forceAttrs,
+    },
+};
+
+async function addFilter(value) {
+    value ??= undefined;
+    if (value && typeof value === 'object') value = model.value;
+    value = value === '' ? undefined : value;
+    let field = columnFilter.value?.name ?? $props.column.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'
+);
+</script>
+<template>
+    <div
+        v-if="showTitle"
+        class="q-pt-sm q-px-sm ellipsis"
+        :class="`text-${column?.align ?? 'left'}`"
+        :style="!showFilter ? { 'min-height': 72 + 'px' } : ''"
+    >
+        {{ column?.label }}
+    </div>
+    <div v-if="showFilter" class="full-width" :class="alignRow()">
+        <VnTableColumn
+            :column="$props.column"
+            default="input"
+            v-model="model"
+            :components="components"
+            component-prop="columnFilter"
+        />
+    </div>
+</template>

src/components/VnTable/VnTable.vue

@@ -0,0 +1,652 @@
+<script setup>
+import { ref, 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 FormModelPopup from 'components/FormModelPopup.vue';
+import CrudModel from 'src/components/CrudModel.vue';
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+import VnTableColumn from 'components/VnTable/VnColumn.vue';
+import VnTableFilter from 'components/VnTable/VnFilter.vue';
+import VnTableChip from 'components/VnTable/VnChip.vue';
+
+const $props = defineProps({
+    columns: {
+        type: Array,
+        required: true,
+    },
+    defaultMode: {
+        type: String,
+        default: 'card', // 'table', 'card'
+    },
+    columnSearch: {
+        type: Boolean,
+        default: true,
+    },
+    rightSearch: {
+        type: Boolean,
+        default: true,
+    },
+    rowClick: {
+        type: Function,
+        default: null,
+    },
+    redirect: {
+        type: String,
+        default: null,
+    },
+    create: {
+        type: Object,
+        default: null,
+    },
+    cardClass: {
+        type: String,
+        default: 'flex-one',
+    },
+    searchUrl: {
+        type: String,
+        default: 'table',
+    },
+    isEditable: {
+        type: Boolean,
+        default: false,
+    },
+    useModel: {
+        type: Boolean,
+        default: false,
+    },
+    hasSubtoolbar: {
+        type: Boolean,
+        default: true,
+    },
+});
+const { t } = useI18n();
+const stateStore = useStateStore();
+const route = useRoute();
+const router = useRouter();
+const quasar = useQuasar();
+
+const DEFAULT_MODE = 'card';
+const TABLE_MODE = 'table';
+const mode = ref(DEFAULT_MODE);
+const selected = ref([]);
+const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
+const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
+const CrudModelRef = ref({});
+const showForm = ref(false);
+const splittedColumns = ref({ columns: [] });
+const tableModes = [
+    {
+        icon: 'view_column',
+        title: t('table view'),
+        value: TABLE_MODE,
+    },
+    {
+        icon: 'grid_view',
+        title: t('grid view'),
+        value: DEFAULT_MODE,
+    },
+];
+
+onMounted(() => {
+    mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
+    stateStore.rightDrawer = true;
+    setUserParams(route.query[$props.searchUrl]);
+});
+
+watch(
+    () => $props.columns,
+    (value) => splitColumns(value),
+    { immediate: true }
+);
+
+watch(
+    () => route.query[$props.searchUrl],
+    (val) => setUserParams(val)
+);
+
+function setUserParams(watchedParams) {
+    if (!watchedParams) return;
+
+    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+    const where = JSON.parse(watchedParams?.filter)?.where;
+    watchedParams = { ...watchedParams, ...where };
+    delete watchedParams.filter;
+    params.value = { ...params.value, ...watchedParams };
+}
+
+function splitColumns(columns) {
+    splittedColumns.value = {
+        columns: [],
+        chips: [],
+        create: [],
+        visible: [],
+    };
+
+    for (const col of columns) {
+        if (col.name == 'tableActions') 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.visible.push(col);
+        if ($props.isEditable && col.disable == null) col.disable = false;
+        if ($props.useModel) col.columnFilter = { ...col.columnFilter, inWhere: true };
+        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,
+            });
+    }
+}
+
+const rowClickFunction = computed(() => {
+    if ($props.rowClick) return $props.rowClick;
+    if ($props.redirect) return ({ id }) => redirectFn(id);
+    return () => {};
+});
+
+function redirectFn(id) {
+    router.push({ path: `/${$props.redirect}/${id}` });
+}
+
+function stopEventPropagation(event) {
+    event.preventDefault();
+    event.stopPropagation();
+}
+
+function reload(params) {
+    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');
+}
+
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
+defineExpose({
+    reload,
+    redirect: redirectFn,
+    selected,
+});
+</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"
+                :disable-submit-event="true"
+                :search-url="searchUrl"
+            >
+                <template #body>
+                    <VnTableFilter
+                        :column="col"
+                        :data-key="$attrs['data-key']"
+                        v-for="col of splittedColumns.columns"
+                        :key="col.id"
+                        v-model="params[columnName(col)]"
+                        :search-url="searchUrl"
+                    />
+                </template>
+                <slot
+                    name="moreFilterPanel"
+                    :params="params"
+                    :columns="splittedColumns.columns"
+                />
+            </VnFilterPanel>
+        </QScrollArea>
+    </QDrawer>
+    <!-- class in div to fix warn-->
+    <div class="q-px-md">
+        <CrudModel
+            v-bind="$attrs"
+            :limit="20"
+            ref="CrudModelRef"
+            :search-url="searchUrl"
+            :disable-infinite-scroll="mode == TABLE_MODE"
+            @save-changes="reload"
+            :has-subtoolbar="$attrs['hasSubtoolbar'] ?? isEditable"
+        >
+            <template
+                v-for="(_, slotName) in $slots"
+                #[slotName]="slotData"
+                :key="slotName"
+            >
+                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+            </template>
+            <template #body="{ rows }">
+                <QTable
+                    v-bind="$attrs['q-table']"
+                    class="vnTable"
+                    :columns="splittedColumns.columns"
+                    :rows="rows"
+                    v-model:selected="selected"
+                    :grid="mode != TABLE_MODE"
+                    table-header-class="bg-header"
+                    card-container-class="grid-three"
+                    flat
+                    :style="mode == TABLE_MODE && 'max-height: 90vh'"
+                    virtual-scroll
+                    @virtual-scroll="
+                        (event) =>
+                            event.index > rows.length - 2 &&
+                            CrudModelRef.vnPaginateRef.paginate()
+                    "
+                    @row-click="(_, row) => rowClickFunction(row)"
+                    @update:selected="emit('update:selected', $event)"
+                >
+                    <template #top-left>
+                        <slot name="top-left"></slot>
+                    </template>
+                    <template #top-right>
+                        <!-- <QBtn
+                        icon="visibility"
+                        title="asd"
+                        class="bg-vn-section-color q-mr-md"
+                        dense
+                        v-if="mode == 'table'"
+                    /> -->
+                        <QBtnToggle
+                            v-model="mode"
+                            toggle-color="primary"
+                            class="bg-vn-section-color"
+                            dense
+                            :options="tableModes"
+                        />
+                        <QBtn
+                            icon="filter_alt"
+                            title="asd"
+                            class="bg-vn-section-color q-ml-md"
+                            dense
+                            @click="stateStore.toggleRightDrawer()"
+                        />
+                    </template>
+                    <template #header-cell="{ col }">
+                        <QTh
+                            auto-width
+                            style="min-width: 100px"
+                            v-if="$props.columnSearch"
+                        >
+                            <VnTableFilter
+                                :column="col"
+                                :show-title="true"
+                                :data-key="$attrs['data-key']"
+                                v-model="params[columnName(col)]"
+                                :search-url="searchUrl"
+                            />
+                        </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 }">
+                        <!-- Columns -->
+                        <QTd
+                            auto-width
+                            class="no-margin q-px-xs"
+                            :class="getColAlign(col)"
+                        >
+                            <slot :name="`column-${col.name}`" :col="col" :row="row">
+                                <VnTableColumn
+                                    :column="col"
+                                    :row="row"
+                                    :is-editable="false"
+                                    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)"
+                        >
+                            <QBtn
+                                v-for="(btn, index) of col.actions"
+                                :key="index"
+                                :title="btn.title"
+                                :icon="btn.icon"
+                                class="q-px-sm"
+                                flat
+                                :class="
+                                    btn.isPrimary
+                                        ? 'text-primary-light'
+                                        : 'color-vn-text '
+                                "
+                                @click="btn.action(row)"
+                            />
+                        </QTd>
+                    </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 of splittedColumns.visible"
+                                            :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"
+                                                        >
+                                                            <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>
+                </QTable>
+            </template>
+        </CrudModel>
+    </div>
+    <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
+        <QBtn @click="showForm = !showForm" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ create.title }}
+        </QTooltip>
+    </QPageSticky>
+    <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+        <FormModelPopup
+            v-bind="create"
+            :model="$attrs['data-key'] + 'Create'"
+            @on-data-saved="(_, res) => create.onDataSaved(res)"
+        >
+            <template #form-inputs="{ data }">
+                <div class="grid-create">
+                    <VnTableColumn
+                        v-for="column of splittedColumns.create"
+                        :key="column.name"
+                        :column="column"
+                        :row="{}"
+                        default="input"
+                        v-model="data[column.name]"
+                        :show-label="true"
+                        component-prop="columnCreate"
+                    />
+                    <slot name="more-create-dialog" :data="data" />
+                </div>
+            </template>
+        </FormModelPopup>
+    </QDialog>
+</template>
+<i18n>
+en:
+    status: Status
+es:
+    status: Estados
+</i18n>
+
+<style lang="scss">
+.bg-chip-secondary {
+    background-color: var(--vn-page-color);
+    color: var(--vn-text-color);
+}
+
+.bg-header {
+    background-color: #5d5d5d;
+    color: var(--vn-text-color);
+}
+
+.q-table--dark .q-table__bottom,
+.q-table--dark thead,
+.q-table--dark tr,
+.q-table--dark th,
+.q-table--dark td {
+    border-color: #222222;
+}
+
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-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;
+}
+
+.vnTable {
+    thead tr th {
+        position: sticky;
+        z-index: 2;
+    }
+    thead tr:first-child th {
+        top: 0;
+    }
+    .q-table__top {
+        top: 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(--q-dark);
+        z-index: 1;
+    }
+}
+
+.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;
+}
+</style>

src/components/common/RightMenu.vue

@@ -0,0 +1,54 @@
+<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="menu"
+            >
+                <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 text-grey-8">
+            <div id="right-panel"></div>
+            <slot v-if="!hasContent" name="right-panel" />
+        </QScrollArea>
+    </QDrawer>
+</template>

src/components/common/SendEmailDialog.vue

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

src/components/common/VnCard.vue

@@ -1,13 +1,13 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 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 },
@@ -15,13 +15,16 @@ const props = defineProps({
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
-    searchbarDataKey: { type: String, default: undefined },
+    filterPanel: { type: Object, default: undefined },
-    searchbarUrl: { type: String, default: undefined },
+    searchDataKey: { type: String, default: undefined },
+    searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
+    searchCustomRouteRedirect: { type: String, default: undefined },
+    searchRedirect: { type: Boolean, default: true },
+    searchMakeFetch: { type: Boolean, default: true },
 });
 
-const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
 const url = computed(() => {
@@ -42,31 +45,41 @@ onBeforeMount(async () => {
 if (props.baseUrl) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-            await arrayData.fetch({ append: false });
+            await arrayData.fetch({ append: false, updateRouter: false });
         }
     });
 }
 </script>
 <template>
-    <Teleport
+    <QDrawer
-        to="#searchbar"
+        v-model="stateStore.leftDrawer"
-        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
+        show-if-above
+        :width="256"
+        v-if="stateStore.isHeaderMounted()"
     >
-        <VnSearchbar
-            :data-key="props.searchbarDataKey"
-            :url="props.searchbarUrl"
-            :label="t(props.searchbarLabel)"
-            :info="t(props.searchbarInfo)"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
             <component :is="descriptor" />
             <QSeparator />
             <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
+    <slot name="searchbar" v-if="props.searchDataKey">
+        <VnSearchbar
+            :data-key="props.searchDataKey"
+            :url="props.searchUrl"
+            :label="props.searchbarLabel"
+            :info="props.searchbarInfo"
+            :custom-route-redirect-name="searchCustomRouteRedirect"
+            :redirect="searchRedirect"
+        />
+    </slot>
+    <slot v-else name="searchbar" />
+    <RightMenu>
+        <template #right-panel v-if="props.filterPanel">
+            <component :is="props.filterPanel" :data-key="props.searchDataKey" />
+        </template>
+    </RightMenu>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />

src/components/common/VnComponent.vue

@@ -0,0 +1,60 @@
+<script setup>
+import { computed, defineModel } 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],
+        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: event ?? customComponent?.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"
+            class="fit"
+        />
+    </span>
+</template>

src/components/common/VnDms.vue

@@ -78,6 +78,7 @@ async function save() {
     const body = mapperDms(dms.value);
     const response = await axios.post(getUrl(), body[0], body[1]);
     emit('onDataSaved', body[1].params, response);
+    return response;
 }
 
 function defaultData() {

src/components/common/VnDmsList.vue

@@ -35,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: null,
+        default: undefined,
     },
     defaultDmsCode: {
         type: String,

src/components/common/VnInput.vue

@@ -2,7 +2,12 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-const emit = defineEmits(['update:modelValue', 'update:options', 'keyup.enter']);
+const emit = defineEmits([
+    'update:modelValue',
+    'update:options',
+    'keyup.enter',
+    'remove',
+]);
 
 const $props = defineProps({
     modelValue: {
@@ -13,6 +18,14 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    info: {
+        type: String,
+        default: '',
+    },
+    clearable: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
@@ -37,14 +50,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const onEnterPress = () => {
-    emit('keyup.enter');
-};
-
-const handleValue = (val = null) => {
-    value.value = val;
-};
-
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -52,6 +57,13 @@ const focus = () => {
 defineExpose({
     focus,
 });
+
+const inputRules = [
+    (val) => {
+        const { min } = vnInputRef.value.$attrs;
+        if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+    },
+];
 </script>
 
 <template>
@@ -66,22 +78,40 @@ defineExpose({
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
             :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
             :clearable="false"
+            :rules="inputRules"
+            :lazy-rules="true"
+            hide-bottom-space
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-
             <template #append>
-                <slot name="append" v-if="$slots.append" />
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
+                    v-if="hover && value && !$attrs.disabled && $props.clearable"
-                    @click="handleValue(null)"
+                    @click="
+                        () => {
+                            value = null;
+                            emit('remove');
+                        }
+                    "
                 ></QIcon>
+                <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}
+    es:
+        inputMin: Debe ser mayor a {value}
+</i18n>

src/components/common/VnInputDate.vue

@@ -1,80 +1,31 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { onMounted, watch, computed, ref } from 'vue';
-import isValidDate from 'filters/isValidDate';
+import { date } from 'quasar';
+import { useI18n } from 'vue-i18n';
 
-const props = defineProps({
+const model = defineModel({ type: String });
-    modelValue: {
+const $props = defineProps({
-        type: String,
-        default: null,
-    },
-    readonly: {
-        type: Boolean,
-        default: false,
-    },
     isOutlined: {
         type: Boolean,
         default: false,
     },
-    emitDateFormat: {
-        type: Boolean,
-        default: false,
-    },
-});
-const hover = ref(false);
-
-const emit = defineEmits(['update:modelValue']);
-
-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 time = computed(() => (props.modelValue ? props.modelValue.split('T')?.[1] : null));
-const value = computed({
-    get() {
-        return props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            props.emitDateFormat ? new Date(value) : joinDateAndTime(value, time.value)
-        );
-    },
 });
 
-const isPopupOpen = ref(false);
+const { t } = useI18n();
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
-const onDateUpdate = (date) => {
+const dateFormat = 'DD/MM/YYYY';
-    value.value = date;
+const isPopupOpen = ref();
-    isPopupOpen.value = false;
+const hover = ref();
-};
+const mask = ref();
 
-const padDate = (value) => value.toString().padStart(2, '0');
+onMounted(() => {
-const formatDate = (dateString) => {
+    // fix quasar bug
-    const date = new Date(dateString || '');
+    mask.value = '##/##/####';
-    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',
-    });
-};
 
 const styleAttrs = computed(() => {
-    return props.isOutlined
+    return $props.isOutlined
         ? {
               dense: true,
               outlined: true,
@@ -82,50 +33,101 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+const formattedDate = computed({
+    get() {
+        if (!model.value) return model.value;
+        return date.formatDate(new Date(model.value), dateFormat);
+    },
+    set(value) {
+        if (value == model.value) return;
+        let newDate;
+        if (value) {
+            // parse input
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                );
+            }
+            let ymd = value.split('-').map((e) => parseInt(e));
+            newDate = new Date(ymd[0], ymd[1] - 1, ymd[2]);
+            if (model.value) {
+                const orgDate =
+                    model.value instanceof Date ? model.value : new Date(model.value);
+
+                newDate.setHours(
+                    orgDate.getHours(),
+                    orgDate.getMinutes(),
+                    orgDate.getSeconds(),
+                    orgDate.getMilliseconds()
+                );
+            }
+        }
+        if (!isNaN(newDate)) model.value = newDate.toISOString();
+    },
+});
+
+const popupDate = computed(() =>
+    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
+);
+
+watch(
+    () => model.value,
+    (val) => (formattedDate.value = val),
+    { immediate: true }
+);
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            v-model="formattedDate"
             class="vn-input-date"
-            readonly
+            :mask="mask"
-            :model-value="displayDate(value)"
+            placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
-            @click="isPopupOpen = true"
+            :class="{ required: $attrs.required }"
+            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :clearable="false"
         >
             <template #append>
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
+                    v-if="
-                    @click="onDateUpdate(null)"
+                        ($attrs.clearable == undefined || $attrs.clearable) &&
-                ></QIcon>
+                        hover &&
-                <QIcon name="event" class="cursor-pointer">
+                        model &&
-                    <QPopupProxy
+                        !$attrs.disable
-                        v-model="isPopupOpen"
+                    "
-                        cover
+                    @click="
-                        transition-show="scale"
+                        model = null;
-                        transition-hide="scale"
+                        isPopupOpen = false;
-                        :no-parent-event="props.readonly"
+                    "
-                    >
+                />
-                        <QDate
+                <QIcon name="event" class="cursor-pointer" />
-                            :today-btn="true"
-                            :model-value="formatDate(value)"
-                            @update:model-value="onDateUpdate"
-                        />
-                    </QPopupProxy>
-                </QIcon>
             </template>
+            <QMenu
+                transition-show="scale"
+                transition-hide="scale"
+                v-model="isPopupOpen"
+                anchor="bottom left"
+                self="top start"
+                :no-focus="true"
+            >
+                <QDate
+                    v-model="popupDate"
+                    :today-btn="true"
+                    @update:model-value="
+                        (date) => {
+                            formattedDate = date;
+                            isPopupOpen = false;
+                        }
+                    "
+                />
+            </QMenu>
         </QInput>
     </div>
 </template>
-
-<style lang="scss">
-.vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
-    border-bottom-style: solid;
-}
-
-.vn-input-date.q-field--outlined.q-field--readonly .q-field__control:before {
-    border-style: solid;
-}
-</style>

src/components/common/VnInputTime.vue

@@ -1,14 +1,11 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import isValidDate from 'filters/isValidDate';
+import { date } from 'quasar';
 
+const model = defineModel({ type: String });
 const props = defineProps({
-    modelValue: {
+    timeOnly: {
-        type: String,
-        default: null,
-    },
-    readonly: {
         type: Boolean,
         default: false,
     },
@@ -18,41 +15,11 @@ const props = defineProps({
     },
 });
 const { t } = useI18n();
-const emit = defineEmits(['update:modelValue']);
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
-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
@@ -63,63 +30,84 @@ 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);
+            if (!props.timeOnly) {
+                const hours = time.split(':');
+                const date = new Date();
+                date.setHours(hours[0], hours[1], 0);
+                time = date.toISOString();
+            }
+        }
+        model.value = time;
+    },
+});
+
+function dateToTime(newDate) {
+    return date.formatDate(new Date(newDate), dateFormat);
+}
+
+watch(
+    () => model.value,
+    (val) => (formattedTime.value = val),
+    { immediate: true }
+);
 </script>
 
 <template>
-    <QInput
+    <div @mouseover="hover = true" @mouseleave="hover = false">
-        class="vn-input-time"
+        <QInput
-        readonly
+            class="vn-input-time"
-        :model-value="formatTime(value)"
+            mask="##:##"
-        v-bind="{ ...$attrs, ...styleAttrs }"
+            placeholder="--:--"
-        @click="isPopupOpen = true"
+            v-model="formattedTime"
-    >
+            v-bind="{ ...$attrs, ...styleAttrs }"
-        <template #append>
+            :class="{ required: $attrs.required }"
-            <QIcon name="schedule" class="cursor-pointer">
+            style="min-width: 100px"
-                <QPopupProxy
+            :rules="$attrs.required ? [requiredFieldRule] : null"
-                    v-model="isPopupOpen"
+        >
-                    cover
+            <template #append>
-                    transition-show="scale"
+                <QIcon
-                    transition-hide="scale"
+                    name="close"
-                    :no-parent-event="props.readonly"
+                    size="xs"
-                >
+                    v-if="
-                    <QTime
+                        ($attrs.clearable == undefined || $attrs.clearable) &&
-                        :format24h="false"
+                        hover &&
-                        :model-value="formatTime(value)"
+                        model &&
-                        @update:model-value="onDateUpdate"
+                        !$attrs.disable
-                    >
+                    "
-                        <div class="row items-center justify-end q-gutter-sm">
+                    @click="
-                            <QBtn
+                        model = null;
-                                :label="t('Cancel')"
+                        isPopupOpen = false;
-                                color="primary"
+                    "
-                                flat
+                />
-                                v-close-popup
+                <QIcon name="Schedule" class="cursor-pointer" />
-                            />
+            </template>
-                            <QBtn
+            <QMenu
-                                label="Ok"
+                transition-show="scale"
-                                color="primary"
+                transition-hide="scale"
-                                flat
+                v-model="isPopupOpen"
-                                @click="save"
+                anchor="bottom left"
-                                v-close-popup
+                self="top start"
-                            />
+                :no-focus="true"
-                        </div>
+            >
-                    </QTime>
+                <QTime
-                </QPopupProxy>
+                    :format24h="false"
-            </QIcon>
+                    v-model="formattedTime"
-        </template>
+                    mask="HH:mm"
-    </QInput>
+                    landscape
+                    now-btn
+                />
+            </QMenu>
+        </QInput>
+    </div>
 </template>
-
-<style lang="scss">
-.vn-input-time.q-field--standard.q-field--readonly .q-field__control:before {
-    border-bottom-style: solid;
-}
-
-.vn-input-time.q-field--outlined.q-field--readonly .q-field__control:before {
-    border-style: solid;
-}
-</style>
-
-<i18n>
-es:
-    Cancel: Cancelar
-</i18n>

src/components/common/VnLog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -377,6 +377,10 @@ async function clearFilter() {
 }
 
 setLogTree();
+
+onUnmounted(() => {
+    stateStore.rightDrawer = false;
+});
 </script>
 <template>
     <FetchData
@@ -623,160 +627,140 @@ setLogTree();
             </QList>
         </div>
     </div>
-    <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <div class="row q-gutter-x-sm">
+        <QList dense>
-            <QBtn
+            <QSeparator />
-                flat
+            <QItem class="q-mt-sm">
-                @click.stop="stateStore.toggleRightDrawer()"
+                <QInput
-                round
+                    :label="t('globals.search')"
-                dense
+                    v-model="searchInput"
-                icon="menu"
+                    class="full-width"
-            >
+                    clearable
-                <QTooltip bottom anchor="bottom right">
+                    clear-icon="close"
-                    {{ t('globals.collapseMenu') }}
+                    @keyup.enter="() => selectFilter('search')"
-                </QTooltip>
+                    @focusout="() => selectFilter('search')"
-            </QBtn>
+                    @clear="() => selectFilter('search')"
-        </div>
+                >
-    </Teleport>
+                    <template #append>
-    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
+                        <QIcon name="info" class="cursor-pointer">
-        <QScrollArea class="fit text-grey-8">
+                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-            <QList dense>
+                        </QIcon>
-                <QSeparator />
+                    </template>
-                <QItem class="q-mt-sm">
+                </QInput>
-                    <QInput
+            </QItem>
-                        :label="t('globals.search')"
+            <QItem>
-                        v-model="searchInput"
+                <VnSelect
-                        class="full-width"
+                    class="full-width"
-                        clearable
+                    :label="t('globals.entity')"
-                        clear-icon="close"
+                    v-model="selectedFilters.changedModel"
-                        @keyup.enter="() => selectFilter('search')"
+                    option-label="locale"
-                        @focusout="() => selectFilter('search')"
+                    option-value="value"
-                        @clear="() => selectFilter('search')"
+                    :options="actions"
-                    >
+                    @update:model-value="selectFilter('action')"
-                        <template #append>
+                    hide-selected
-                            <QIcon name="info" class="cursor-pointer">
+                />
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+            </QItem>
-                            </QIcon>
+            <QItem class="q-mt-sm">
-                        </template>
+                <QOptionGroup
-                    </QInput>
+                    size="sm"
-                </QItem>
+                    v-model="userRadio"
-                <QItem>
+                    :options="userTypes"
+                    color="primary"
+                    @update:model-value="selectFilter('userRadio')"
+                    right-label
+                >
+                    <template #label="{ label }">
+                        {{ t(`Users.${label}`) }}
+                    </template>
+                </QOptionGroup>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers && userRadio !== null">
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.entity')"
+                        :label="t('globals.user')"
-                        v-model="selectedFilters.changedModel"
+                        v-model="userSelect"
-                        option-label="locale"
+                        option-label="name"
-                        option-value="value"
+                        option-value="id"
-                        :options="actions"
+                        :options="workers"
-                        @update:model-value="selectFilter('action')"
+                        @update:model-value="selectFilter('userSelect')"
                         hide-selected
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QOptionGroup
-                        size="sm"
-                        v-model="userRadio"
-                        :options="userTypes"
-                        color="primary"
-                        @update:model-value="selectFilter('userRadio')"
-                        right-label
                     >
-                        <template #label="{ label }">
+                        <template #option="{ opt, itemProps }">
-                            {{ t(`Users.${label}`) }}
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItemSection class="col-3 items-center">
+                                    <VnAvatar :worker-id="opt.id" />
+                                </QItemSection>
+                                <QItemSection class="col-9 justify-center">
+                                    <span>{{ opt.name }}</span>
+                                    <span class="text-grey">{{ opt.nickname }}</span>
+                                </QItemSection>
+                            </QItem>
                         </template>
-                    </QOptionGroup>
+                    </VnSelect>
-                </QItem>
+                </QItemSection>
-                <QItem class="q-mt-sm">
+            </QItem>
-                    <QItemSection v-if="!workers">
+            <QItem class="q-mt-sm">
-                        <QSkeleton type="QInput" class="full-width" />
+                <QInput
-                    </QItemSection>
+                    :label="t('globals.changes')"
-                    <QItemSection v-if="workers && userRadio !== null">
+                    v-model="changeInput"
-                        <VnSelect
+                    class="full-width"
-                            class="full-width"
+                    clearable
-                            :label="t('globals.user')"
+                    clear-icon="close"
-                            v-model="userSelect"
+                    @keyup.enter="selectFilter('change')"
-                            option-label="name"
+                    @focusout="selectFilter('change')"
-                            option-value="id"
+                    @clear="selectFilter('change')"
-                            :options="workers"
-                            @update:model-value="selectFilter('userSelect')"
-                            hide-selected
-                        >
-                            <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
-                                    <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker-id="opt.id" />
-                                    </QItemSection>
-                                    <QItemSection class="col-9 justify-center">
-                                        <span>{{ opt.name }}</span>
-                                        <span class="text-grey">{{ opt.nickname }}</span>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.changes')"
-                        v-model="changeInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="selectFilter('change')"
-                        @focusout="selectFilter('change')"
-                        @clear="selectFilter('change')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip max-width="250px">{{
-                                    t('tooltips.changes')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem
-                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                    v-for="(checkboxOption, index) in checkboxOptions"
-                    :key="index"
                 >
-                    <QCheckbox
+                    <template #append>
-                        size="sm"
+                        <QIcon name="info" class="cursor-pointer">
-                        v-model="checkboxOption.selected"
+                            <QTooltip max-width="250px">{{
-                        :label="t(`actions.${checkboxOption.label}`)"
+                                t('tooltips.changes')
-                        @update:model-value="selectFilter"
+                            }}</QTooltip>
-                    />
+                        </QIcon>
-                </QItem>
+                    </template>
-                <QItem class="q-mt-sm">
+                </QInput>
-                    <QInput
+            </QItem>
-                        class="full-width"
+            <QItem
-                        :label="t('globals.date')"
+                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                        @click="dateFromDialog = true"
+                v-for="(checkboxOption, index) in checkboxOptions"
-                        @focus="(evt) => evt.target.blur()"
+                :key="index"
-                        @clear="selectFilter('date', 'to')"
+            >
-                        v-model="dateFrom"
+                <QCheckbox
-                        clearable
+                    size="sm"
-                        clear-icon="close"
+                    v-model="checkboxOption.selected"
-                    />
+                    :label="t(`actions.${checkboxOption.label}`)"
-                </QItem>
+                    @update:model-value="selectFilter"
-                <QItem class="q-mt-sm">
+                />
-                    <QInput
+            </QItem>
-                        class="full-width"
+            <QItem class="q-mt-sm">
-                        :label="t('to')"
+                <QInput
-                        @click="dateToDialog = true"
+                    class="full-width"
-                        @focus="(evt) => evt.target.blur()"
+                    :label="t('globals.date')"
-                        @clear="selectFilter('date', 'from')"
+                    @click="dateFromDialog = true"
-                        v-model="dateTo"
+                    @focus="(evt) => evt.target.blur()"
-                        clearable
+                    @clear="selectFilter('date', 'to')"
-                        clear-icon="close"
+                    v-model="dateFrom"
-                    />
+                    clearable
-                </QItem>
+                    clear-icon="close"
-            </QList>
+                />
-        </QScrollArea>
+            </QItem>
-    </QDrawer>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('to')"
+                    @click="dateToDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'from')"
+                    v-model="dateTo"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+        </QList>
+    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"

src/components/common/VnPopup.vue

@@ -0,0 +1,23 @@
+<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

@@ -0,0 +1,97 @@
+<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,
+    },
+    showDialog: {
+        type: Boolean,
+        required: true,
+    },
+    cancelled: {
+        type: Boolean,
+        required: false,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['cancel', 'close']);
+
+const dialogRef = ref(null);
+
+const _showDialog = computed({
+    get: () => $props.showDialog,
+    set: (value) => {
+        if (value) dialogRef.value.show();
+    },
+});
+
+const _progress = computed(() => $props.progress);
+
+const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
+
+const cancel = () => {
+    dialogRef.value.hide();
+    emit('cancel');
+};
+</script>
+
+<template>
+    <QDialog ref="dialogRef" v-model="_showDialog" @hide="onDialogHide">
+        <QCard class="full-width dialog">
+            <QCardSection class="row">
+                <span class="text-h6">{{ t('Progress') }}</span>
+                <QSpace />
+                <QBtn icon="close" flat round dense @click="emit('close')" />
+            </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"
+                    @click="cancel()"
+                >
+                    {{ t('globals.cancel') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    Progress: Progreso
+    Total progress: Progreso total
+    Cancelled: Cancelado
+</i18n>

src/components/common/VnRadio.vue

@@ -0,0 +1,6 @@
+<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" />
+</template>

src/components/common/VnSelect.vue

@@ -1,6 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch } from 'vue';
+import { ref, toRefs, computed, watch, onMounted } 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']);
@@ -16,11 +15,15 @@ const $props = defineProps({
     },
     optionLabel: {
         type: [String],
-        default: '',
+        default: 'name',
     },
     optionValue: {
         type: String,
-        default: '',
+        default: 'id',
+    },
+    optionFilter: {
+        type: String,
+        default: null,
     },
     url: {
         type: String,
@@ -54,12 +57,20 @@ const $props = defineProps({
         type: [Number, String],
         default: '30',
     },
+    focusOnMount: {
+        type: Boolean,
+        default: false,
+    },
+    useLike: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
 
-const { optionLabel, optionValue, options, modelValue } = toRefs($props);
+const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -107,12 +118,17 @@ async function fetchFilter(val) {
     if (!$props.url || !dataRef.value) return;
 
     const { fields, sortBy, limit } = $props;
-    let key = optionLabel.value;
+    let key = optionFilter.value ?? optionLabel.value;
 
     if (new RegExp(/\d/g).test(val)) key = optionValue.value;
 
-    const where = { [key]: { like: `%${val}%` } };
+    const defaultWhere = $props.useLike
-    return dataRef.value.fetch({ fields, where, order: sortBy, limit });
+        ? { [key]: { like: `%${val}%` } }
+        : { [key]: val };
+    const where = { ...defaultWhere, ...$props.where };
+    const fetchOptions = { where, order: sortBy, limit };
+    if (fields) fetchOptions.fields = fields;
+    return dataRef.value.fetch(fetchOptions);
 }
 
 async function filterHandler(val, update) {
@@ -142,6 +158,10 @@ watch(modelValue, (newValue) => {
     if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
         fetchFilter(newValue);
 });
+
+onMounted(async () => {
+    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
 </script>
 
 <template>
@@ -167,12 +187,14 @@ watch(modelValue, (newValue) => {
         hide-selected
         fill-input
         ref="vnSelectRef"
+        lazy-rules
         :class="{ required: $attrs.required }"
         :rules="$attrs.required ? [requiredFieldRule] : null"
         virtual-scroll-slice-size="options.length"
     >
         <template v-if="isClearable" #append>
             <QIcon
+                v-show="value"
                 name="close"
                 @click.stop="value = null"
                 class="cursor-pointer"

src/components/common/VnSmsDialog.vue

@@ -184,6 +184,7 @@ 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
@@ -203,6 +204,7 @@ es:
             Te recomendamos amplíes para no generar costes extra, provocarán un incremento de tu tarifa.
             ¡Un saludo!'
         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
@@ -222,6 +224,7 @@ fr:
             Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
             Merci.'
         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
@@ -240,6 +243,7 @@ pt:
         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.'
         orderChanges: 'Pedido { orderId } com chegada dia { landing }: { 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/VnTitle.vue

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

src/components/common/VnWeekdayPicker.vue

@@ -0,0 +1,37 @@
+<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

@@ -5,6 +5,7 @@ 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: {
@@ -15,21 +16,21 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    module: {
-        type: String,
-        required: true,
-    },
     title: {
         type: String,
         default: '',
     },
     subtitle: {
         type: Number,
-        default: 0,
+        default: null,
     },
     dataKey: {
         type: String,
-        default: '',
+        default: null,
+    },
+    module: {
+        type: String,
+        default: null,
     },
     summary: {
         type: Object,
@@ -38,23 +39,32 @@ const $props = defineProps({
 });
 
 const state = useState();
+const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const arrayData = useArrayData($props.dataKey || $props.module, {
+let arrayData;
-    url: $props.url,
+let store;
-    filter: $props.filter,
+let entity;
-    skip: 0,
-});
-const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
+const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+defineExpose({ getData });
 
-defineExpose({
-    getData,
-});
 onBeforeMount(async () => {
-    await getData();
+    arrayData = useArrayData($props.dataKey, {
-    watch($props, async () => await getData());
+        url: $props.url,
+        filter: $props.filter,
+        skip: 0,
+    });
+    store = arrayData.store;
+    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    // It enables to load data only once if the module is the same as the dataKey
+    if (!isSameDataKey.value || !route.params.id) await getData();
+    watch(
+        () => [$props.url, $props.filter],
+        async () => {
+            if (!isSameDataKey.value) await getData();
+        }
+    );
 });
 
 async function getData() {
@@ -69,6 +79,19 @@ async function getData() {
         isLoading.value = false;
     }
 }
+
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.toString().split('.');
+    let current = entity.value;
+
+    for (let i = 0; i < keys.length; i++) {
+        if (current[keys[i]] === undefined) return undefined;
+        else current = current[keys[i]];
+    }
+    return current;
+}
+
 const emit = defineEmits(['onFetch']);
 </script>
 
@@ -108,13 +131,13 @@ const emit = defineEmits(['onFetch']);
                     </QBtn>
                 </RouterLink>
                 <QBtn
+                    v-if="$slots.menu"
                     color="white"
                     dense
                     flat
                     icon="more_vert"
                     round
                     size="md"
-                    :class="{ invisible: !$slots.menu }"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
@@ -131,8 +154,8 @@ const emit = defineEmits(['onFetch']);
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
                         <div class="title">
-                            <span v-if="$props.title" :title="$props.title">
+                            <span v-if="$props.title" :title="getValueFromPath(title)">
-                                {{ $props.title }}
+                                {{ getValueFromPath(title) ?? $props.title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span :title="entity.name">
@@ -143,7 +166,7 @@ const emit = defineEmits(['onFetch']);
                     </QItemLabel>
                     <QItem dense>
                         <QItemLabel class="subtitle" caption>
-                            #{{ $props.subtitle ?? entity.id }}
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
@@ -235,6 +258,7 @@ const emit = defineEmits(['onFetch']);
     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 class="q-chip-color" outline size="sm">
+                        <QChip v-if="$props.id" class="q-chip-color" outline size="sm">
                             {{ t('ID') }}: {{ $props.id }}
                         </QChip>
                     </div>

src/components/ui/CardSummary.vue

@@ -22,11 +22,15 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    moduleName: {
+        type: String,
+        default: null,
+    },
 });
 const emit = defineEmits(['onFetch']);
 const route = useRoute();
 const isSummary = ref();
-const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
+const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
     skip: 0,
@@ -54,6 +58,22 @@ async function fetch() {
     emit('onFetch', Array.isArray(data) ? data[0] : data);
     isLoading.value = false;
 }
+
+const showRedirectToSummaryIcon = computed(() => {
+    const exist = existSummary(route.matched);
+    return !isSummary.value && route.meta.moduleName && exist;
+});
+
+function existSummary(routes) {
+    const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
+    if (hasSummary) return hasSummary;
+    for (const current of routes) {
+        if (current.path != '/' && current.children) {
+            const exist = existSummary(current.children);
+            if (exist) return exist;
+        }
+    }
+}
 </script>
 
 <template>
@@ -64,10 +84,10 @@ async function fetch() {
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="!isSummary && route.meta.moduleName"
+                            v-if="showRedirectToSummaryIcon"
                             class="header link"
                             :to="{
-                                name: `${route.meta.moduleName}Summary`,
+                                name: `${moduleName ?? route.meta.moduleName}Summary`,
                                 params: { id: entityId || entity.id },
                             }"
                         >
@@ -135,14 +155,17 @@ 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: 8em;
+                    width: 9em;
                     overflow: hidden;
-                    white-space: nowrap;
+                    white-space: wrap;
                     text-overflow: ellipsis;
                     margin-right: 10px;
                     flex-grow: 0;
@@ -164,15 +187,10 @@ 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,5 +1,7 @@
 <script setup>
-defineProps({
+import { computed } from 'vue';
+
+const $props = defineProps({
     maxLength: {
         type: Number,
         required: true,
@@ -8,53 +10,40 @@ defineProps({
         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"
-                :class="{ empty: !$props.item.value5 }"
+                :title="`${key}: ${val}`"
-                :title="$props.item.tag5 + ': ' + $props.item.value5"
+                :class="{ empty: !val }"
             >
-                {{ $props.item.value5 }}
+                {{ val }}
-            </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>
@@ -72,7 +61,7 @@ defineProps({
     .inline-tag {
         height: 1rem;
         margin: 0.05rem;
-        color: $secondary;
+        color: $color-font-secondary;
         text-align: center;
         font-size: smaller;
         padding: 1px;
@@ -83,9 +72,8 @@ defineProps({
         min-width: 4rem;
         max-width: 4rem;
     }
-
     .empty {
-        border: 1px solid $color-spacer-light;
+        border: 1px solid #2b2b2b;
     }
 }
 </style>

src/components/ui/QCalendarMonthWrapper.vue

@@ -59,12 +59,10 @@ const containerClasses = computed(() => {
 // 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;
-    color: white !important;
 }
 
 .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-month__head--weekday {
@@ -108,11 +106,10 @@ const containerClasses = computed(() => {
         font-size: 13px;
 
         &:hover {
-            background-color: var(--vn-accent-color);
+            background-color: var(--vn-label-color);
             cursor: pointer;
         }
     }
-
     .q-calendar-month__week--days > div:nth-child(6),
     .q-calendar-month__week--days > div:nth-child(7) {
         // Cambia el color de los días sábado y domingo
@@ -150,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: #777;
+        color: $color-font-secondary;
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/SkeletonForm.vue

@@ -1,32 +1,14 @@
 <template>
-    <div class="q-pa-md">
+    <div class="row q-gutter-md q-mb-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>
+    <div class="row q-gutter-md q-mb-md">
-            <div class="col">
+        <QSkeleton type="QInput" class="col" square />
-                <QSkeleton type="QInput" square />
+        <QSkeleton type="QInput" class="col" square />       
-            </div>
+    </div>
-        </div>
+    <div class="row q-gutter-md q-mb-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">
-            <div class="col">
-                <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,46 +3,36 @@
         <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="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 />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
-        </div>
+        <QSkeleton type="text" square />
-        <div class="col">
+        <QSkeleton type="text" square />
-            <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 />
-            <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-        </div>
+        <QSkeleton type="text" square />
-        <div class="col">
+        <QSkeleton type="text" square />
-            <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <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 />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-        </div>
+        <QSkeleton type="text" square />
-        <div class="col">
+        <QSkeleton type="rect" class="q-mb-md" square />
-            <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 />
-            <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>
 </template>
 

src/components/ui/SkeletonTable.vue

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

src/components/ui/VnConfirm.vue

@@ -67,6 +67,7 @@ async function confirm() {
             </QCardSection>
             <QCardSection class="row items-center">
                 <span v-html="message"></span>
+                <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
                 <QBtn

src/components/ui/VnFilterPanel.vue

@@ -4,11 +4,14 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
-
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+const $props = defineProps({
+    modelValue: {
+        type: Object,
+        default: () => {},
+    },
     dataKey: {
         type: String,
         required: true,
@@ -18,11 +21,6 @@ const props = defineProps({
         required: false,
         default: false,
     },
-    params: {
-        type: Object,
-        required: false,
-        default: null,
-    },
     showAll: {
         type: Boolean,
         default: true,
@@ -40,55 +38,87 @@ const props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => [],
+        default: () => ['filter'],
     },
     customTags: {
         type: Array,
         default: () => [],
     },
+    disableSubmitEvent: {
+        type: Boolean,
+        default: false,
+    },
+    searchUrl: {
+        type: String,
+        default: 'params',
+    },
+    redirect: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
+const emit = defineEmits([
+    'update:modelValue',
+    'refresh',
+    'clear',
+    'search',
+    'init',
+    'remove',
+]);
 
-const arrayData = useArrayData(props.dataKey, {
+const arrayData = useArrayData($props.dataKey, {
-    exprBuilder: props.exprBuilder,
+    exprBuilder: $props.exprBuilder,
+    searchUrl: $props.searchUrl,
+    navigate: $props.redirect ? {} : null,
 });
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
-
 onMounted(() => {
-    if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
+    userParams.value = $props.modelValue ?? {};
-    if (Object.keys(store.userParams).length > 0) {
-        userParams.value = JSON.parse(JSON.stringify(store.userParams));
-    }
     emit('init', { params: userParams.value });
 });
 
+function setUserParams(watchedParams) {
+    if (!watchedParams) return;
+
+    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+    watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
+    delete watchedParams.filter;
+    userParams.value = { ...userParams.value, ...watchedParams };
+}
+
 watch(
-    () => route.query.params,
+    () => route.query[$props.searchUrl],
-    (val) => {
+    (val) => setUserParams(val)
-        if (!val) {
+);
-            userParams.value = {};
+
-        } else {
+watch(
-            const parsedParams = JSON.parse(val);
+    () => arrayData.store.userParams,
-            userParams.value = { ...parsedParams };
+    (val) => setUserParams(val)
-        }
+);
-    }
+
+watch(
+    () => $props.modelValue,
+    (val) => (userParams.value = val ?? {})
 );
 
 const isLoading = ref(false);
-async function search() {
+async function search(evt) {
+    if (evt && $props.disableSubmitEvent) return;
+
     store.filter.where = {};
     isLoading.value = true;
-    const params = { ...userParams.value };
+    const filter = { ...userParams.value };
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
-    const { params: newParams } = await arrayData.addFilter({ params });
+    store.page = 1;
+    const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
     userParams.value = newParams;
 
-    if (!props.showAll && !Object.values(params).length) store.data = [];
+    if (!$props.showAll && !Object.values(filter).length) store.data = [];
 
     isLoading.value = false;
     emit('search');
@@ -97,9 +127,10 @@ async function search() {
 async function reload() {
     isLoading.value = true;
     const params = Object.values(userParams.value).filter((param) => param);
-
+    store.skip = 0;
+    store.page = 1;
     await arrayData.fetch({ append: false });
-    if (!props.showAll && !params.length) store.data = [];
+    if (!$props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
 }
@@ -109,56 +140,56 @@ async function clearFilters() {
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
+    store.page = 1;
     // Filtrar los params no removibles
     const removableFilters = Object.keys(userParams.value).filter((param) =>
-        props.unremovableParams.includes(param)
+        $props.unremovableParams.includes(param)
     );
     const newParams = {};
     // Conservar solo los params que no son removibles
     for (const key of removableFilters) {
         newParams[key] = userParams.value[key];
     }
+    userParams.value = {};
     userParams.value = { ...newParams }; // Actualizar los params con los removibles
     await arrayData.applyFilter({ params: userParams.value });
 
-    if (!props.showAll) {
+    if (!$props.showAll) {
         store.data = [];
     }
 
     isLoading.value = false;
     emit('clear');
+    emit('update:modelValue', userParams.value);
 }
 
-const tagsList = computed(() =>
+const tagsList = computed(() => {
-    Object.entries(userParams.value)
+    const tagList = [];
-        .filter(([key, value]) => value && !(props.hiddenTags || []).includes(key))
+    for (const key of Object.keys(userParams.value)) {
-        .map(([key, value]) => ({
+        const value = userParams.value[key];
-            label: key,
+        if (value == null || ($props.hiddenTags || []).includes(key)) continue;
-            value: value,
+        tagList.push({ label: key, value });
-        }))
+    }
-);
+    return tagList;
+});
 
-const tags = computed(() =>
+const tags = computed(() => {
-    tagsList.value.filter((tag) => !(props.customTags || []).includes(tag.label))
+    return tagsList.value.filter((tag) => !($props.customTags || []).includes(tag.key));
-);
+});
 const customTags = computed(() =>
-    tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
+    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.key))
 );
 
 async function remove(key) {
-    userParams.value[key] = null;
+    userParams.value[key] = undefined;
-    await search();
+    search();
     emit('remove', key);
+    emit('update:modelValue', userParams.value);
 }
 
 function formatValue(value) {
-    if (typeof value === 'boolean') {
+    if (typeof value === 'boolean') return value ? t('Yes') : t('No');
-        return value ? t('Yes') : t('No');
+    if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
-    }
-
-    if (isNaN(value) && !isNaN(Date.parse(value))) {
-        return toDate(value);
-    }
 
     return `"${value}"`;
 }
@@ -219,7 +250,7 @@ function formatValue(value) {
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
-                                <span>"{{ chip.value }}"</span>
+                                <span>"{{ formatValue(chip.value) }}"</span>
                             </div>
                         </slot>
                     </VnFilterPanelChip>
@@ -238,7 +269,7 @@ function formatValue(value) {
         <QList dense class="list q-gutter-y-sm q-mt-sm">
             <slot name="body" :params="userParams" :search-fn="search"></slot>
         </QList>
-        <template v-if="props.searchButton">
+        <template v-if="$props.searchButton">
             <QItem>
                 <QItemSection class="q-py-sm">
                     <QBtn
@@ -248,7 +279,7 @@ function formatValue(value) {
                         dense
                         icon="search"
                         rounded
-                        type="submit"
+                        :type="disableSubmitEvent ? 'button' : 'submit'"
                         unelevated
                     />
                 </QItemSection>
@@ -262,7 +293,6 @@ function formatValue(value) {
         color="primary"
     />
 </template>
-
 <style scoped lang="scss">
 .list {
     width: 256px;

src/components/ui/VnImg.vue

@@ -0,0 +1,78 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useSession } from 'src/composables/useSession';
+
+const $props = defineProps({
+    storage: {
+        type: [String, Number],
+        default: 'Images',
+    },
+    collection: {
+        type: String,
+        default: 'catalog',
+    },
+    size: {
+        type: String,
+        default: '200x200',
+    },
+    zoomSize: {
+        type: String,
+        required: false,
+        default: 'lg',
+    },
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+const show = ref(false);
+const token = useSession().getTokenMultimedia();
+const timeStamp = ref(`timestamp=${Date.now()}`);
+import noImage from '/public/no-user.png';
+import { useRole } from 'src/composables/useRole';
+const url = computed(() => {
+    const isEmployee = useRole().isEmployee();
+    return isEmployee
+        ? `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+        : noImage;
+});
+const reload = () => {
+    timeStamp.value = `timestamp=${Date.now()}`;
+};
+defineExpose({
+    reload,
+});
+</script>
+<template>
+    <QImg
+        :class="{ zoomIn: $props.zoomSize }"
+        :src="url"
+        v-bind="$attrs"
+        @click="show = !show"
+        spinner-color="primary"
+    />
+    <QDialog v-model="show" v-if="$props.zoomSize">
+        <QImg
+            :src="url"
+            size="full"
+            class="img_zoom"
+            v-bind="$attrs"
+            spinner-color="primary"
+        />
+    </QDialog>
+</template>
+
+<style lang="scss" scoped>
+.q-img {
+    &.zoomIn {
+        cursor: zoom-in;
+    }
+    min-width: 50px;
+}
+.rounded {
+    border-radius: 50%;
+}
+.img_zoom {
+    border-radius: 0%;
+}
+</style>

src/components/ui/VnLinkPhone.vue

@@ -1,21 +1,16 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
+defineProps({ phoneNumber: { type: [String, Number], default: null } });
-const props = defineProps({
-    phoneNumber: { type: [String, Number], default: null },
-});
-const { t } = useI18n();
 </script>
 <template>
     <QBtn
-        v-if="props.phoneNumber"
+        v-if="phoneNumber"
         flat
         round
         icon="phone"
         size="sm"
         color="primary"
         padding="none"
-        :href="`sip:${props.phoneNumber}`"
+        :href="`sip:${phoneNumber}`"
         @click.stop
     />
 </template>
-<style scoped></style>

src/components/ui/VnLv.vue

@@ -2,6 +2,7 @@
 import { dashIfEmpty } from 'src/filters';
 import { useI18n } from 'vue-i18n';
 import { useClipboard } from 'src/composables/useClipboard';
+import { computed } from 'vue';
 
 const $props = defineProps({
     label: { type: String, default: null },
@@ -24,52 +25,67 @@ function copyValueText() {
         },
     });
 }
+const val = computed(() => $props.value);
 </script>
-<style scoped>
-.label,
-.value {
-    white-space: pre-line;
-    word-wrap: break-word;
-}
-</style>
 <template>
     <div class="vn-label-value">
-        <div v-if="$props.label || $slots.label" class="label">
+        <QCheckbox
-            <slot name="label">
+            v-if="typeof value === 'boolean'"
-                <span>{{ $props.label }}</span>
+            v-model="val"
-            </slot>
+            :label="label"
-        </div>
+            disable
-        <div class="value">
+            dense
-            <slot name="value">
+        />
-                <span :title="$props.value">
+        <template v-else>
-                    {{ $props.dash ? dashIfEmpty($props.value) : $props.value }}
+            <div v-if="label || $slots.label" class="label">
-                </span>
+                <slot name="label">
-            </slot>
+                    <span>{{ label }}</span>
-        </div>
+                </slot>
-        <div class="info" v-if="$props.info">
+            </div>
-            <QIcon name="info" class="cursor-pointer" size="xs" color="grey">
+            <div class="value">
-                <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
+                <slot name="value">
-                    {{ $props.info }}
+                    <span :title="value">
-                </QTooltip>
+                        {{ dash ? dashIfEmpty(value) : value }}
-            </QIcon>
+                    </span>
-        </div>
+                </slot>
-        <div class="copy" v-if="$props.copy && $props.value" @click="copyValueText()">
+            </div>
-            <QIcon name="Content_Copy" color="primary">
+            <div class="info" v-if="info">
-                <QTooltip>{{ t('globals.copyClipboard') }}</QTooltip>
+                <QIcon name="info" class="cursor-pointer" size="xs" color="grey">
-            </QIcon>
+                    <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
-        </div>
+                        {{ info }}
+                    </QTooltip>
+                </QIcon>
+            </div>
+            <div class="copy" v-if="copy && value" @click="copyValueText()">
+                <QIcon name="Content_Copy" color="primary">
+                    <QTooltip>{{ t('globals.copyClipboard') }}</QTooltip>
+                </QIcon>
+            </div>
+        </template>
     </div>
 </template>
-
 <style lang="scss" scoped>
-.vn-label-value:hover .copy {
+.vn-label-value {
-    visibility: visible;
+    &:hover .copy {
-    cursor: pointer;
+        visibility: visible;
+        cursor: pointer;
+    }
+
+    .label,
+    .value {
+        white-space: pre-line;
+        word-wrap: break-word;
+    }
+    .copy {
+        visibility: hidden;
+    }
+
+    .info {
+        margin-left: 5px;
+    }
 }
-.copy {
+
-    visibility: hidden;
+:deep(.q-checkbox.disabled) {
-}
+    opacity: 1 !important;
-.info {
-    margin-left: 5px;
 }
 </style>

src/components/ui/VnNotes.vue

@@ -20,7 +20,12 @@ const state = useState();
 const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
-
+function handleKeyUp(event) {
+    if (event.key === 'Enter') {
+        event.preventDefault();
+        if (!event.shiftKey) insert();
+    }
+}
 async function insert() {
     const body = $props.body;
     Object.assign(body, { text: newNote.value });
@@ -48,12 +53,12 @@ async function insert() {
                 size="lg"
                 autogrow
                 autofocus
-                @keyup.ctrl.enter.stop="insert"
+                @keyup="handleKeyUp"
                 clearable
             >
-                <template #append
+                <template #append>
-                    ><QBtn
+                    <QBtn
-                        :title="t('Save (ctrl + Enter)')"
+                        :title="t('Save (Enter)')"
                         icon="save"
                         color="primary"
                         flat
@@ -73,6 +78,7 @@ async function insert() {
         ref="vnPaginateRef"
         class="show"
         v-bind="$attrs"
+        search-url="notes"
     >
         <template #body="{ rows }">
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
@@ -130,6 +136,6 @@ async function insert() {
     es:
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
-        Save (ctrl + Enter): Guardar (Ctrl + Intro)
+        Save (Enter): Guardar (Intro)
 
 </i18n>

src/components/ui/VnPaginate.vue

@@ -42,6 +42,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    keepOpts: {
+        type: Array,
+        default: () => [],
+    },
     offset: {
         type: Number,
         default: 0,
@@ -54,14 +58,19 @@ const props = defineProps({
         type: Function,
         default: null,
     },
+    searchUrl: {
+        type: String,
+        default: null,
+    },
     disableInfiniteScroll: {
         type: Boolean,
         default: false,
     },
 });
 
-const emit = defineEmits(['onFetch', 'onPaginate']);
+const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
 const isLoading = ref(false);
+const mounted = ref(false);
 const pagination = ref({
     sortBy: props.order,
     rowsPerPage: props.limit,
@@ -76,11 +85,14 @@ const arrayData = useArrayData(props.dataKey, {
     order: props.order,
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
+    keepOpts: props.keepOpts,
+    searchUrl: props.searchUrl,
 });
 const store = arrayData.store;
 
-onMounted(() => {
+onMounted(async () => {
-    if (props.autoLoad) fetch();
+    if (props.autoLoad) await fetch();
+    mounted.value = true;
 });
 
 watch(
@@ -90,11 +102,22 @@ watch(
     }
 );
 
+watch(
+    () => store.data,
+    (data) => emit('onChange', data)
+);
+
+watch(
+    () => props.url,
+    (url) => fetch({ url })
+);
+
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
 };
 
-async function fetch() {
+async function fetch(params) {
+    useArrayData(props.dataKey, params);
     store.filter.skip = 0;
     store.skip = 0;
     await arrayData.fetch({ append: false });
@@ -102,6 +125,7 @@ async function fetch() {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
+    return store.data;
 }
 
 async function paginate() {
@@ -133,7 +157,7 @@ function endPagination() {
     emit('onPaginate');
 }
 async function onLoad(index, done) {
-    if (!store.data) return done();
+    if (!store.data || !mounted.value) return done();
 
     if (store.data.length === 0 || !props.url) return done(false);
 
@@ -145,7 +169,7 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({ fetch, addFilter });
+defineExpose({ fetch, addFilter, paginate });
 </script>
 
 <template>
@@ -194,12 +218,6 @@ defineExpose({ fetch, addFilter });
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
-    <div
-        v-if="!isLoading && store.hasMoreData"
-        class="w-full flex justify-center q-mt-md"
-    >
-        <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
-    </div>
 </template>
 
 <style lang="scss" scoped>

src/components/ui/VnSearchbar.vue

@@ -1,11 +1,14 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const quasar = useQuasar();
+const { t } = useI18n();
+const state = useStateStore();
 
 const props = defineProps({
     dataKey: {
@@ -14,17 +17,14 @@ const props = defineProps({
     },
     label: {
         type: String,
-        required: false,
         default: 'Search',
     },
     info: {
         type: String,
-        required: false,
         default: '',
     },
     redirect: {
         type: Boolean,
-        required: false,
         default: true,
     },
     url: {
@@ -63,12 +63,34 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    makeFetch: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const router = useRouter();
-const arrayData = useArrayData(props.dataKey, { ...props });
-const { store } = arrayData;
 const searchText = ref('');
+let arrayDataProps = { ...props };
+if (props.redirect)
+    arrayDataProps = {
+        ...props,
+        ...{
+            navigate: {
+                customRouteRedirectName: props.customRouteRedirectName,
+                searchText: searchText.value,
+            },
+        },
+    };
+let arrayData = useArrayData(props.dataKey, arrayDataProps);
+let store = arrayData.store;
+
+watch(
+    () => props.dataKey,
+    (val) => {
+        arrayData = useArrayData(val, { ...props });
+        store = arrayData.store;
+    }
+);
 
 onMounted(() => {
     const params = store.userParams;
@@ -81,69 +103,49 @@ async function search() {
     const staticParams = Object.entries(store.userParams).filter(
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
-    // const filter =props?.where? { where: JSON.parse(props.where) }: {}
+    store.skip = 0;
-    await arrayData.applyFilter({
+    store.page = 1;
-        params: {
-            // filter ,
-            ...Object.fromEntries(staticParams),
-            search: searchText.value,
-        },
-    });
-    if (!props.redirect) return;
 
-    if (props.customRouteRedirectName)
+    if (props.makeFetch)
-        return router.push({
+        await arrayData.applyFilter({
-            name: props.customRouteRedirectName,
+            params: {
-            params: { id: searchText.value },
+                ...Object.fromEntries(staticParams),
+                search: searchText.value,
+            },
         });
-
-    const { matched: matches } = router.currentRoute.value;
-    const { path } = matches.at(-1);
-    const [, moduleName] = path.split('/');
-
-    if (!store.data.length || store.data.length > 1)
-        return router.push({ path: `/${moduleName}/list` });
-
-    const targetId = store.data[0].id;
-    let targetUrl;
-
-    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
-    if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
-    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
-
-    await router.push({ path: targetUrl });
 }
 </script>
-
 <template>
-    <QForm @submit="search" id="searchbarForm">
+    <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
-        <VnInput
+        <QForm @submit="search" id="searchbarForm">
-            id="searchbar"
+            <VnInput
-            v-model="searchText"
+                id="searchbar"
-            :placeholder="props.label"
+                v-model="searchText"
-            dense
+                :placeholder="t(props.label)"
-            standout
+                dense
-            autofocus
+                standout
-        >
+                autofocus
-            <template #prepend>
+            >
-                <QIcon
+                <template #prepend>
-                    v-if="!quasar.platform.is.mobile"
+                    <QIcon
-                    class="cursor-pointer"
+                        v-if="!quasar.platform.is.mobile"
-                    name="search"
+                        class="cursor-pointer"
-                    @click="search"
+                        name="search"
-                />
+                        @click="search"
-            </template>
+                    />
-            <template #append>
+                </template>
-                <QIcon
+                <template #append>
-                    v-if="props.info && $q.screen.gt.xs"
+                    <QIcon
-                    name="info"
+                        v-if="props.info && $q.screen.gt.xs"
-                    class="cursor-info"
+                        name="info"
-                >
+                        class="cursor-info"
-                    <QTooltip>{{ props.info }}</QTooltip>
+                    >
-                </QIcon>
+                        <QTooltip>{{ t(props.info) }}</QTooltip>
-            </template>
+                    </QIcon>
-        </VnInput>
+                </template>
-    </QForm>
+            </VnInput>
+        </QForm>
+    </Teleport>
 </template>
 
 <style lang="scss" scoped>

src/components/ui/VnSubToolbar.vue

@@ -18,7 +18,7 @@ onMounted(() => {
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value.childNodes.length + data.value.childNodes.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length)
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);

src/composables/useAcl.js

@@ -0,0 +1,33 @@
+import axios from 'axios';
+import { useState } from './useState';
+
+export function useAcl() {
+    const state = useState();
+
+    async function fetch() {
+        const { data } = await axios.get('VnUsers/acls');
+        const acls = {};
+        data.forEach((acl) => {
+            acls[acl.model] = acls[acl.model] || {};
+            acls[acl.model][acl.property] = acls[acl.model][acl.property] || {};
+            acls[acl.model][acl.property][acl.accessType] = true;
+        });
+
+        state.setAcls(acls);
+    }
+
+    function hasAny(model, prop, accessType) {
+        const acls = state.getAcls().value[model];
+        if (acls) 
+            return ['*', prop].some((key) => {
+                const acl = acls[key];
+                return acl && (acl['*'] || acl[accessType]);
+            });
+    }
+
+    return {
+        fetch,
+        hasAny,
+        state,
+    };
+}

src/composables/useArrayData.js

@@ -1,29 +1,33 @@
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
 import { buildFilter } from 'filters/filterPanel';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key, userOptions) {
+export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
 
     const store = arrayDataStore.get(key);
     const route = useRoute();
+    const router = useRouter();
     let canceller = null;
 
-    const page = ref(1);
-
     onMounted(() => {
         setOptions();
         store.skip = 0;
 
         const query = route.query;
-        if (query.params) {
+        const searchUrl = store.searchUrl;
-            store.userParams = JSON.parse(query.params);
+        if (query[searchUrl]) {
+            const params = JSON.parse(query[searchUrl]);
+            const filter = params?.filter;
+            delete params.filter;
+            store.userParams = { ...params, ...store.userParams };
+            store.userFilter = { ...JSON.parse(filter ?? '{}'), ...store.userFilter };
         }
     });
 
@@ -40,14 +44,19 @@ export function useArrayData(key, userOptions) {
             'userParams',
             'userFilter',
             'exprBuilder',
+            'searchUrl',
+            'navigate',
         ];
         if (typeof userOptions === 'object') {
             for (const option in userOptions) {
                 const isEmpty = userOptions[option] == null || userOptions[option] === '';
                 if (isEmpty || !allowedOptions.includes(option)) continue;
 
-                if (Object.prototype.hasOwnProperty.call(store, option)) {
+                if (Object.hasOwn(store, option)) {
-                    store[option] = userOptions[option];
+                    const defaultOpts = userOptions[option];
+                    store[option] = userOptions.keepOpts?.includes(option)
+                        ? Object.assign(defaultOpts, store[option])
+                        : defaultOpts;
                 }
             }
         }
@@ -62,7 +71,6 @@ export function useArrayData(key, userOptions) {
         const filter = {
             order: store.order,
             limit: store.limit,
-            skip: store.skip,
         };
 
         let exprFilter;
@@ -78,14 +86,14 @@ export function useArrayData(key, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         Object.assign(store.filter, filter);
-        const params = {
+        const params = { filter: store.filter };
-            filter: JSON.stringify(store.filter),
-        };
 
         Object.assign(params, userParams);
+        params.filter.skip = store.skip;
 
-        store.isLoading = true;
+        params.filter = JSON.stringify(params.filter);
         store.currentFilter = params;
+        store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
             params,
@@ -115,6 +123,10 @@ export function useArrayData(key, userOptions) {
         }
     }
 
+    function deleteOption(option) {
+        delete store[option];
+    }
+
     function cancelRequest() {
         if (canceller) {
             canceller.abort();
@@ -125,35 +137,40 @@ export function useArrayData(key, userOptions) {
     async function applyFilter({ filter, params }) {
         if (filter) store.userFilter = filter;
         store.filter = {};
-        if (params) store.userParams = Object.assign({}, params);
+        if (params) store.userParams = { ...params };
 
-        await fetch({ append: false });
+        const response = await fetch({ append: false });
+        return response;
     }
 
     async function addFilter({ filter, params }) {
         if (filter) store.userFilter = Object.assign(store.userFilter, filter);
 
-        let userParams = Object.assign({}, store.userParams, params);
+        let userParams = { ...store.userParams, ...params };
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
         store.skip = 0;
         store.filter.skip = 0;
-        page.value = 1;
+        store.page = 1;
-
         await fetch({ append: false });
         return { filter, params };
     }
 
+    async function addFilterWhere(where) {
+        const storedFilter = { ...store.userFilter };
+        if (!storedFilter?.where) storedFilter.where = {};
+        where = { ...storedFilter.where, ...where };
+        await addFilter({ filter: { where } });
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    const key = Object.keys(
+                    const key = Object.keys(exprBuilder ? exprBuilder(param) : param);
-                        exprBuilder && exprBuilder(param) ? exprBuilder(param) : param
-                    );
                     if (key[0]) delete store.filter.where[key[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
@@ -167,10 +184,11 @@ export function useArrayData(key, userOptions) {
     async function loadMore() {
         if (!store.hasMoreData) return;
 
-        store.skip = store.limit * page.value;
+        store.skip = store.limit * store.page;
-        page.value += 1;
+        store.page += 1;
 
         await fetch({ append: true });
+        updateStateParams();
     }
 
     async function refresh() {
@@ -178,22 +196,34 @@ export function useArrayData(key, userOptions) {
     }
 
     function updateStateParams() {
-        const query = {};
+        const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
-        if (store.order) query.order = store.order;
+        newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
-        if (store.limit) query.limit = store.limit;
-        if (store.skip) query.skip = store.skip;
-        if (store.userParams && Object.keys(store.userParams).length !== 0)
-            query.params = JSON.stringify(store.userParams);
 
-        const url = new URL(window.location.href);
+        if (store.navigate) {
-        const { hash: currentHash } = url;
+            const { customRouteRedirectName, searchText } = store.navigate;
-        const [currentRoute] = currentHash.split('?');
+            if (customRouteRedirectName)
+                return router.push({
+                    name: customRouteRedirectName,
+                    params: { id: searchText },
+                });
+            const { matched: matches } = router.currentRoute.value;
+            const { path } = matches.at(-1);
 
-        const params = new URLSearchParams();
+            const to =
-        for (const param in query) params.append(param, query[param]);
+                store?.data?.length === 1
+                    ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
+                    : path.replace(/:id.*/, '');
 
-        url.hash = currentRoute + '?' + params.toString();
+            if (route.path != to) {
-        window.history.pushState({}, '', url.hash);
+                const pushUrl = { path: to };
+                if (to.endsWith('/list') || to.endsWith('/'))
+                    pushUrl.query = newUrl.query;
+                destroy();
+                return router.push(pushUrl);
+            }
+        }
+
+        router.replace(newUrl);
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);
@@ -203,6 +233,7 @@ export function useArrayData(key, userOptions) {
         fetch,
         applyFilter,
         addFilter,
+        addFilterWhere,
         refresh,
         destroy,
         loadMore,
@@ -210,5 +241,6 @@ export function useArrayData(key, userOptions) {
         totalRows,
         updateStateParams,
         isLoading,
+        deleteOption,
     };
 }

src/composables/useRole.js

@@ -27,8 +27,12 @@ export function useRole() {
 
         return false;
     }
+    function isEmployee() {
+        return hasAny(['employee']);
+    }
 
     return {
+        isEmployee,
         fetch,
         hasAny,
         state,

src/composables/useSession.js

@@ -1,5 +1,6 @@
 import { useState } from './useState';
 import { useRole } from './useRole';
+import { useAcl } from './useAcl';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
@@ -88,6 +89,7 @@ export function useSession() {
         setSession(data);
 
         await useRole().fetch();
+        await useAcl().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
 

src/composables/useState.js

@@ -11,8 +11,11 @@ const user = ref({
     companyFk: null,
     warehouseFk: null,
 });
+if (sessionStorage.getItem('user'))
+    user.value = JSON.parse(sessionStorage.getItem('user'));
 
 const roles = ref([]);
+const acls = ref([]);
 const tokenConfig = ref({});
 const drawer = ref(true);
 const headerMounted = ref(false);
@@ -20,28 +23,15 @@ const headerMounted = ref(false);
 export function useState() {
     function getUser() {
         return computed(() => {
-            return {
+            return user.value;
-                id: user.value.id,
-                name: user.value.name,
-                nickname: user.value.nickname,
-                lang: user.value.lang,
-                darkMode: user.value.darkMode,
-                companyFk: user.value.companyFk,
-                warehouseFk: user.value.warehouseFk,
-            };
         });
     }
 
     function setUser(data) {
-        user.value = {
+        const currentUser = { ...JSON.parse(sessionStorage.getItem('user')), ...data };
-            id: data.id,
+        sessionStorage.setItem('user', JSON.stringify(currentUser));
-            name: data.name,
+        user.value = currentUser;
-            nickname: data.nickname,
+        return currentUser;
-            lang: data.lang,
-            darkMode: data.darkMode,
-            companyFk: data.companyFk,
-            warehouseFk: data.warehouseFk,
-        };
     }
 
     function getRoles() {
@@ -53,6 +43,14 @@ export function useState() {
     function setRoles(data) {
         roles.value = data;
     }
+
+    function getAcls() {
+        return computed(() => acls.value);
+    }
+
+    function setAcls(data) {
+        acls.value = data;
+    }
     function getTokenConfig() {
         return computed(() => {
             return tokenConfig.value;
@@ -80,6 +78,8 @@ export function useState() {
         setUser,
         getRoles,
         setRoles,
+        getAcls,
+        setAcls,
         getTokenConfig,
         setTokenConfig,
         set,

src/css/app.scss

@@ -76,7 +76,7 @@ select:-webkit-autofill {
 }
 
 .color-vn-label {
-    color: var(--vn-label);
+    color: var(--vn-label-color);
 }
 
 .color-vn-text {
@@ -115,6 +115,13 @@ select:-webkit-autofill {
     background-color: var(--vn-accent-color);
 }
 
+.text-primary-light {
+    color: $primary-light !important;
+}
+.bg-primary-light {
+    background: $primary-light !important;
+}
+
 .fill-icon {
     font-variation-settings: 'FILL' 1;
 }
@@ -145,6 +152,15 @@ select:-webkit-autofill {
     color: var(--vn-label-color);
 }
 
+.disabled {
+    & .q-checkbox__label {
+        color: var(--vn-text-color);
+    }
+    & .q-checkbox__inner {
+        color: var(--vn-label-color);
+    }
+}
+
 .q-chip,
 .q-notification__message,
 .q-notification__icon {
@@ -169,6 +185,13 @@ select:-webkit-autofill {
 
 /* q-notification row items-stretch q-notification--standard bg-negative text-white */
 
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
 input[type='number'] {
     -moz-appearance: textfield;
 }
@@ -182,3 +205,26 @@ input::-webkit-inner-spin-button {
 .q-scrollarea__content {
     max-width: 100%;
 }
+
+/* ===== Scrollbar CSS ===== /
+/ Firefox */
+
+* {
+    scrollbar-width: auto;
+    scrollbar-color: var(--vn-label-color) transparent;
+}
+
+/* Chrome, Edge, and Safari */
+*::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+}
+
+*::-webkit-scrollbar-thumb {
+    background-color: var(--vn-label-color);
+    border-radius: 10px;
+}
+
+*::-webkit-scrollbar-track {
+    background: transparent;
+}

src/css/icons.scss

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

src/css/quasar.variables.scss

@@ -28,11 +28,11 @@ $color-link: #66bfff;
 $color-spacer-light: #a3a3a31f;
 $color-spacer: #7979794d;
 $border-thin-light: 1px solid $color-spacer-light;
-$primary-light: lighten($primary, 35%);
+$primary-light: #f5b351;
 $dark-shadow-color: black;
 $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
 $spacing-md: 16px;
-
+$color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }

src/filters/dashOrCurrency.js

@@ -0,0 +1,6 @@
+import toCurrency from './toCurrency';
+
+export default function (value) {
+    if (value == null || value === '') return () => '-';
+    return () => toCurrency(value);
+}

src/filters/dateRange.js

@@ -1,7 +1,7 @@
 export default function dateRange(value) {
     const minHour = new Date(value);
     minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
+    const maxHour = new Date();
     maxHour.setHours(23, 59, 59, 59);
 
     return [minHour, maxHour];

src/filters/index.js

@@ -10,6 +10,7 @@ import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
 import toHour from './toHour';
+import dashOrCurrency from './dashOrCurrency';
 
 export {
     toLowerCase,
@@ -17,6 +18,7 @@ export {
     toDate,
     toHour,
     toDateString,
+    dashOrCurrency,
     toDateHourMin,
     toDateHourMinSec,
     toRelativeDate,

src/filters/toPercentage.js

@@ -8,11 +8,8 @@ export default function (value, fractionSize = 2) {
     const options = {
         style: 'percent',
         minimumFractionDigits: fractionSize,
-        maximumFractionDigits: fractionSize
+        maximumFractionDigits: fractionSize,
     };
 
-    return new Intl.NumberFormat(locale, options)
+    return new Intl.NumberFormat(locale, options).format(parseFloat(value));
-        .format(parseFloat(value));
-
-
 }

src/i18n/locale/en.yml

@@ -17,6 +17,7 @@ globals:
     date: Date
     dataSaved: Data saved
     dataDeleted: Data deleted
+    delete: Delete
     search: Search
     changes: Changes
     dataCreated: Data created
@@ -24,6 +25,7 @@ globals:
     create: Create
     edit: Edit
     save: Save
+    saveAndContinue: Save and continue
     remove: Remove
     reset: Reset
     close: Close
@@ -32,6 +34,7 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
+    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -95,11 +98,152 @@ globals:
         agency: Agency
         workCenters: Work centers
         modes: Modes
+        zones: Zones
+        zonesList: Zones
+        deliveryDays: Delivery days
+        upcomingDeliveries: Upcoming deliveries
+        role: Role
+        alias: Alias
+        aliasUsers: Users
+        subRoles: Subroles
+        inheritedRoles: Inherited Roles
+        customers: Customers
+        list: List
+        webPayments: Web Payments
+        extendedList: Extended list
+        notifications: Notifications
+        defaulter: Defaulter
+        customerCreate: New customer
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignees: Consignees
+        notes: Notes
+        credits: Credits
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recoveries
+        webAccess: Web access
+        sms: Sms
+        creditManagement: Credit management
+        creditContracts: Credit contracts
+        creditOpinion: Credit opinion
+        others: Others
+        samples: Samples
+        consumption: Consumption
+        mandates: Mandates
+        contacts: Contacts
+        webPayment: Web payment
+        fileManagement: File management
+        unpaid: Unpaid
+        entries: Entries
+        buys: Buys
+        dms: File management
+        entryCreate: New entry
+        latestBuys: Latest buys
+        tickets: Tickets
+        ticketCreate: New Tickets
+        boxing: Boxing
+        sale: Sale
+        claims: Claims
+        claimCreate: New claim
+        lines: Lines
+        photos: Photos
+        development: Development
+        action: Action
+        invoiceOuts: Invoice out
+        negativeBases: Negative Bases
+        globalInvoicing: Global invoicing
+        invoiceOutCreate: Create invoice out
+        shelving: Shelving
+        shelvingList: Shelving List
+        shelvingCreate: New shelving
+        invoiceIns: Invoices In
+        invoiceInCreate: Create invoice in
+        vat: VAT
+        dueDay: Due day
+        intrastat: Intrastat
+        corrective: Corrective
+        order: Orders
+        orderList: List
+        orderCreate: New order
+        catalog: Catalog
+        volume: Volume
+        workers: Workers
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        pbx: Private Branch Exchange
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        wagons: Wagons
+        wagonsList: Wagons List
+        wagonCreate: Create wagon
+        wagonEdit: Edit wagon
+        typesList: Types List
+        typeCreate: Create type
+        typeEdit: Edit type
+        wagonCounter: Trolley counter
+        roadmap: Roadmap
+        stops: Stops
+        routes: Routes
+        cmrsList: CMRs list
+        RouteList: List
+        routeCreate: New route
+        RouteRoadmap: Roadmaps
+        RouteRoadmapCreate: Create roadmap
+        autonomous: Autonomous
+        suppliers: Suppliers
+        supplier: Supplier
+        labeler: Labeler
+        supplierCreate: New supplier
+        accounts: Accounts
+        addresses: Addresses
+        agencyTerm: Agency agreement
+        travel: Travels
+        extraCommunity: Extra community
+        travelCreate: New travel
+        history: Log
+        thermographs: Thermograph
+        items: Items
+        diary: Diary
+        tags: Tags
+        create: Create
+        buyRequest: Buy requests
+        fixedPrice: Fixed prices
+        wasteBreakdown: Waste breakdown
+        itemCreate: New item
+        barcode: Barcodes
+        tax: Tax
+        botanical: Botanical
+        itemTypeCreate: New item type
+        family: Item Type
+        lastEntries: Last entries
+        itemType: Item type
+        monitors: Monitors
+        dashboard: Dashboard
+        users: Users
+        createTicket: Create ticket
+        ticketAdvance: Advance tickets
+        futureTickets: Future tickets
+        purchaseRequest: Purchase request
+        weeklyTickets: Weekly tickets
+        formation: Formation
+        locations: Locations
+        warehouses: Warehouses
+        roles: Roles
+        connections: Connections
+        acls: ACLs
+        mailForwarding: Mail forwarding
+        mailAlias: Mail alias
+        privileges: Privileges
     created: Created
     worker: Worker
     now: Now
     name: Name
     new: New
+    comment: Comment
+    observations: Observations
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -134,40 +278,8 @@ verifyEmail:
         verifyEmail: Email verification
 dashboard:
     pageTitles:
-        dashboard: Dashboard
+
 customer:
-    pageTitles:
-        customers: Customers
-        list: List
-        webPayments: Web Payments
-        extendedList: Extended list
-        notifications: Notifications
-        defaulter: Defaulter
-        customerCreate: New customer
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignees: Consignees
-        notes: Notes
-        credits: Credits
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recoveries
-        webAccess: Web access
-        log: Log
-        sms: Sms
-        creditManagement: Credit management
-        creditContracts: Credit contracts
-        creditOpinion: Credit opinion
-        others: Others
-        samples: Samples
-        consumption: Consumption
-        mandates: Mandates
-        contacts: Contacts
-        webPayment: Web payment
-        fileManagement: File management
-        unpaid: Unpaid
     list:
         phone: Phone
         email: Email
@@ -266,7 +378,8 @@ customer:
     extendedList:
         tableVisibleColumns:
             id: Identifier
-            name: Name
+            name: Comercial name
+            socialName: Business name
             fi: Tax number
             salesPersonFk: Salesperson
             credit: Credit
@@ -296,17 +409,6 @@ customer:
             hasCoreVnl: VNL core received
             hasSepaVnl: VNL B2B received
 entry:
-    pageTitles:
-        entries: Entries
-        list: List
-        summary: Summary
-        basicData: Basic data
-        buys: Buys
-        notes: Notes
-        dms: File management
-        log: Log
-        entryCreate: New entry
-        latestBuys: Latest buys
     list:
         newEntry: New entry
         landed: Landed
@@ -382,6 +484,7 @@ entry:
         type: Type
         color: Color
         id: ID
+        printedStickers: Printed stickers
     notes:
         observationType: Observation type
     descriptor:
@@ -406,6 +509,7 @@ entry:
         buyingValue: Buying value
         freightValue: Freight value
         comissionValue: Commission value
+        description: Description
         packageValue: Package value
         isIgnored: Is ignored
         price2: Grouping
@@ -426,6 +530,15 @@ ticket:
         boxing: Boxing
         sms: Sms
         notes: Notes
+        sale: Sale
+        volume: Volume
+        observation: Notes
+        ticketAdvance: Advance tickets
+        futureTickets: Future tickets
+        purchaseRequest: Purchase request
+        weeklyTickets: Weekly tickets
+        services: Service
+        tracking: Tracking
     list:
         nickname: Nickname
         state: State
@@ -457,6 +570,7 @@ ticket:
         agency: Agency
         zone: Zone
         warehouse: Warehouse
+        collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
@@ -499,18 +613,6 @@ ticket:
         warehouse: Warehouse
         agency: Agency
 claim:
-    pageTitles:
-        claims: Claims
-        list: List
-        claimCreate: New claim
-        summary: Summary
-        basicData: Basic Data
-        lines: Lines
-        photos: Photos
-        development: Development
-        log: Audit logs
-        notes: Notes
-        action: Action
     list:
         customer: Customer
         assignedTo: Assigned
@@ -566,19 +668,14 @@ claim:
         created: Created
         state: State
         pickup: Pick up
+        null: No
+        agency: Agency
+        delivery: Delivery
     photo:
         fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
         noData: 'There are no images/videos, click here or drag and drop the file'
         dragDrop: Drag and drop it here
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Invoice out
-        list: List
-        negativeBases: Negative Bases
-        globalInvoicing: Global invoicing
-        invoiceOutCreate: Create invoice out
-        summary: Summary
-        basicData: Basic Data
     list:
         ref: Reference
         issued: Issued
@@ -646,13 +743,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: CSV download failed
 shelving:
-    pageTitles:
-        shelving: Shelving
-        shelvingList: Shelving List
-        shelvingCreate: New shelving
-        summary: Summary
-        basicData: Basic Data
-        log: Logs
     list:
         parking: Parking
         priority: Priority
@@ -679,17 +769,6 @@ parking:
         info: You can search by parking code
         label: Search parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Invoices In
-        list: List
-        invoiceInCreate: Create invoice in
-        summary: Summary
-        basicData: Basic data
-        vat: VAT
-        dueDay: Due day
-        intrastat: Intrastat
-        corrective: Corrective
-        log: Logs
     list:
         ref: Reference
         supplier: Supplier
@@ -740,15 +819,6 @@ invoiceIn:
         stems: Stems
         country: Country
 order:
-    pageTitles:
-        order: Orders
-        orderList: List
-        orderCreate: New order
-        summary: Summary
-        basicData: Basic Data
-        catalog: Catalog
-        volume: Volume
-        lines: Lines
     field:
         salesPersonFk: Sales Person
         clientFk: Client
@@ -822,6 +892,8 @@ worker:
         log: Log
         calendar: Calendar
         timeControl: Time control
+        locker: Locker
+        balance: Balance
     list:
         name: Name
         email: Email
@@ -853,6 +925,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
+        fiDueDate: Fecha de caducidad del DNI
+        sex: Sexo
+        seniority: Antigüedad
+        fi: DNI/NIE/NIF
+        birth: Fecha de nacimiento
+        isFreelance: Autónomo
+        isSsDiscounted: Bonificación SS
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -882,17 +963,25 @@ worker:
         payMethods: Pay method
         iban: IBAN
         bankEntity: Swift / BIC
+    formation:
+        tableVisibleColumns:
+            course: Curso
+            startDate: Fecha Inicio
+            endDate: Fecha Fin
+            center: Centro Formación
+            invoice: Factura
+            amount: Importe
+            remark: Bonficado
+            hasDiploma: Diploma
     imageNotFound: Image not found
+    balance:
+        tableVisibleColumns:
+            paymentDate: Date
+            incomeType: Type
+            debit: Debt
+            credit: Have
+            concept: Concept
 wagon:
-    pageTitles:
-        wagons: Wagons
-        wagonsList: Wagons List
-        wagonCreate: Create wagon
-        wagonEdit: Edit wagon
-        typesList: Types List
-        typeCreate: Create type
-        typeEdit: Edit type
-        wagonCounter: Trolley counter
     type:
         name: Name
         submit: Submit
@@ -921,31 +1010,7 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
-route/roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
-roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
 route:
-    pageTitles:
-        routes: Routes
-        cmrsList: External CMRs list
-        RouteList: List
-        routeCreate: New route
-        basicData: Basic Data
-        summary: Summary
-        RouteRoadmap: Roadmaps
-        RouteRoadmapCreate: Create roadmap
-        tickets: Tickets
-        log: Log
-        autonomous: Autonomous
     cmr:
         list:
             results: results
@@ -960,23 +1025,19 @@ route:
             shipped: Preparation date
             viewCmr: View CMR
             downloadCmrs: Download CMRs
+    columnLabels:
+        Id: Id
+        vehicle: Vehicle
+        description: Description
+        isServed: Served
+        worker: Worker
+        date: Date
+        started: Started
+        actions: Actions
+        agency: Agency
+        volume: Volume
+        finished: Finished
 supplier:
-    pageTitles:
-        suppliers: Suppliers
-        supplier: Supplier
-        list: List
-        supplierCreate: New supplier
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        log: Log
-        accounts: Accounts
-        contacts: Contacts
-        addresses: Addresses
-        consumption: Consumption
-        agencyTerm: Agency agreement
-        dms: File management
     list:
         payMethod: Pay method
         payDeadline: Pay deadline
@@ -1068,15 +1129,6 @@ supplier:
         date: Date
         reference: Reference
 travel:
-    pageTitles:
-        travel: Travels
-        list: List
-        summary: Summary
-        extraCommunity: Extra community
-        travelCreate: New travel
-        basicData: Basic data
-        history: Log
-        thermographs: Thermograph
     summary:
         confirmed: Confirmed
         entryId: Entry Id
@@ -1123,23 +1175,6 @@ travel:
         travelFileDescription: 'Travel id { travelId }'
         file: File
 item:
-    pageTitles:
-        items: Items
-        list: List
-        diary: Diary
-        tags: Tags
-        create: Create
-        buyRequest: Buy requests
-        fixedPrice: Fixed prices
-        wasteBreakdown: Waste breakdown
-        itemCreate: New item
-        barcode: Barcodes
-        tax: Tax
-        log: Log
-        botanical: Botanical
-        itemTypeCreate: New item type
-        family: Item Type
-        lastEntries: Last entries
     descriptor:
         item: Item
         buyer: Buyer
@@ -1150,6 +1185,7 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
+        producer: Producer
     list:
         id: Identifier
         grouping: Grouping
@@ -1224,17 +1260,6 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
-item/itemType:
-    pageTitles:
-        itemType: Item type
-        basicData: Basic data
-        summary: Summary
-zone:
-    pageTitles:
-        zones: Zone
-        zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -17,6 +17,7 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    delete: Eliminar
     search: Buscar
     changes: Cambios
     dataCreated: Datos creados
@@ -24,6 +25,7 @@ globals:
     create: Crear
     edit: Modificar
     save: Guardar
+    saveAndContinue: Guardar y continuar
     remove: Eliminar
     reset: Restaurar
     close: Cerrar
@@ -59,6 +61,7 @@ globals:
     amount: Importe
     packages: Bultos
     download: Descargar
+    downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
     allRows: 'Todo { numberRows } filas(s)'
     markAll: Marcar todo
@@ -95,11 +98,153 @@ globals:
         agency: Agencia
         workCenters: Centros de trabajo
         modes: Modos
+        zones: Zonas
+        zonesList: Zonas
+        deliveryDays: Días de entrega
+        upcomingDeliveries: Próximos repartos
+        role: Role
+        alias: Alias
+        aliasUsers: Usuarios
+        subRoles: Subroles
+        inheritedRoles: Roles heredados
+        customers: Clientes
+        customerCreate: Nuevo cliente
+        list: Listado
+        webPayments: Pagos Web
+        extendedList: Listado extendido
+        notifications: Notificaciones
+        defaulter: Morosos
+        createCustomer: Crear cliente
+        fiscalData: Datos fiscales
+        billingData: Forma de pago
+        consignees: Consignatarios
+        notes: Notas
+        credits: Créditos
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recobros
+        webAccess: Acceso web
+        sms: Sms
+        creditManagement: Gestión de crédito
+        creditContracts: Contratos de crédito
+        creditOpinion: Opinión de crédito
+        others: Otros
+        samples: Plantillas
+        consumption: Consumo
+        mandates: Mandatos
+        contacts: Contactos
+        webPayment: Pago web
+        fileManagement: Gestión documental
+        unpaid: Impago
+        entries: Entradas
+        buys: Compras
+        dms: Gestión documental
+        entryCreate: Nueva entrada
+        latestBuys: Últimas compras
+        tickets: Tickets
+        ticketCreate: Nuevo ticket
+        boxing: Encajado
+        sale: Lineas del pedido
+        claims: Reclamaciones
+        claimCreate: Crear reclamación
+        lines: Líneas
+        development: Trazabilidad
+        photos: Fotos
+        action: Acción
+        invoiceOuts: Fact. emitidas
+        negativeBases: Bases Negativas
+        globalInvoicing: Facturación global
+        invoiceOutCreate: Crear fact. emitida
+        order: Cesta
+        orderList: Listado
+        orderCreate: Nueva orden
+        catalog: Catálogo
+        volume: Volumen
+        shelving: Carros
+        shelvingList: Listado de carros
+        shelvingCreate: Nuevo carro
+        invoiceIns: Fact. recibidas
+        invoiceInCreate: Crear fact. recibida
+        vat: IVA
+        labeler: Etiquetas
+        dueDay: Vencimiento
+        intrastat: Intrastat
+        corrective: Rectificativa
+        workers: Trabajadores
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        pbx: Centralita
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        wagons: Vagones
+        wagonsList: Listado vagones
+        wagonCreate: Crear tipo
+        wagonEdit: Editar tipo
+        typesList: Listado tipos
+        typeCreate: Crear tipo
+        typeEdit: Editar tipo
+        wagonCounter: Contador de carros
+        roadmap: Troncales
+        stops: Paradas
+        routes: Rutas
+        cmrsList: Listado de CMRs
+        RouteList: Listado
+        routeCreate: Nueva ruta
+        RouteRoadmap: Troncales
+        RouteRoadmapCreate: Crear troncal
+        autonomous: Autónomos
+        suppliers: Proveedores
+        supplier: Proveedor
+        supplierCreate: Nuevo proveedor
+        accounts: Cuentas
+        addresses: Direcciones
+        agencyTerm: Acuerdo agencia
+        travel: Envíos
+        create: Crear
+        extraCommunity: Extra comunitarios
+        travelCreate: Nuevo envío
+        history: Historial
+        thermographs: Termógrafos
+        items: Artículos
+        diary: Histórico
+        tags: Etiquetas
+        fixedPrice: Precios fijados
+        buyRequest: Peticiones de compra
+        wasteBreakdown: Deglose de mermas
+        itemCreate: Nuevo artículo
+        tax: 'IVA'
+        botanical: 'Botánico'
+        barcode: 'Código de barras'
+        itemTypeCreate: Nueva familia
+        family: Familia
+        lastEntries: Últimas entradas
+        itemType: Familia
+        monitors: Monitores
+        dashboard: Tablón
+        users: Usuarios
+        createTicket: Crear ticket
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        formation: Formación
+        locations: Ubicaciones
+        warehouses: Almacenes
+        roles: Roles
+        connections: Conexiones
+        acls: ACLs
+        mailForwarding: Reenvío de correo
+        mailAlias: Alias de correo
+        privileges: Privilegios
     created: Fecha creación
     worker: Trabajador
     now: Ahora
     name: Nombre
     new: Nuevo
+    comment: Comentario
+    observations: Observaciones
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -132,41 +277,8 @@ verifyEmail:
         verifyEmail: Verificación de correo
 dashboard:
     pageTitles:
-        dashboard: Tablón
+
 customer:
-    pageTitles:
-        customers: Clientes
-        customerCreate: Nuevo cliente
-        list: Listado
-        webPayments: Pagos Web
-        extendedList: Listado extendido
-        notifications: Notificaciones
-        defaulter: Morosos
-        createCustomer: Crear cliente
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        consignees: Consignatarios
-        notes: Notas
-        credits: Créditos
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recobros
-        webAccess: Acceso web
-        log: Historial
-        sms: Sms
-        creditManagement: Gestión de crédito
-        creditContracts: Contratos de crédito
-        creditOpinion: Opinión de crédito
-        others: Otros
-        samples: Plantillas
-        consumption: Consumo
-        mandates: Mandatos
-        contacts: Contactos
-        webPayment: Pago web
-        fileManagement: Gestión documental
-        unpaid: Impago
     list:
         phone: Teléfono
         email: Email
@@ -264,7 +376,8 @@ customer:
     extendedList:
         tableVisibleColumns:
             id: Identificador
-            name: Nombre
+            name: Nombre Comercial
+            socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
             credit: Crédito
@@ -294,17 +407,6 @@ customer:
             hasCoreVnl: Recibido core VNL
             hasSepaVnl: Recibido B2B VNL
 entry:
-    pageTitles:
-        entries: Entradas
-        list: Listado
-        summary: Resumen
-        basicData: Datos básicos
-        buys: Compras
-        notes: Notas
-        dms: Gestión documental
-        log: Historial
-        entryCreate: Nueva entrada
-        latestBuys: Últimas compras
     list:
         newEntry: Nueva entrada
         landed: F. entrega
@@ -380,6 +482,7 @@ entry:
         type: Tipo
         color: Color
         id: ID
+        printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
     descriptor:
@@ -404,6 +507,7 @@ entry:
         buyingValue: Coste
         freightValue: Porte
         comissionValue: Comisión
+        description: Descripción
         packageValue: Embalaje
         isIgnored: Ignorado
         price2: Grouping
@@ -424,6 +528,15 @@ ticket:
         boxing: Encajado
         sms: Sms
         notes: Notas
+        sale: Lineas del pedido
+        volume: Volumen
+        observation: Notas
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        services: Servicios
+        tracking: Estados
     list:
         nickname: Alias
         state: Estado
@@ -455,6 +568,7 @@ ticket:
         agency: Agencia
         zone: Zona
         warehouse: Almacén
+        collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
@@ -497,18 +611,6 @@ ticket:
         warehouse: Almacén
         agency: Agencia
 claim:
-    pageTitles:
-        claims: Reclamaciones
-        list: Listado
-        claimCreate: Crear reclamación
-        summary: Resumen
-        basicData: Datos básicos
-        lines: Líneas
-        development: Trazabilidad
-        photos: Fotos
-        log: Historial
-        notes: Notas
-        action: Acción
     list:
         customer: Cliente
         assignedTo: Asignada a
@@ -572,14 +674,6 @@ claim:
         noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
         dragDrop: Arrástralo y sueltalo aquí
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Fact. emitidas
-        list: Listado
-        negativeBases: Bases Negativas
-        globalInvoicing: Facturación global
-        invoiceOutCreate: Crear fact. emitida
-        summary: Resumen
-        basicData: Datos básicos
     list:
         ref: Referencia
         issued: Fecha emisión
@@ -647,15 +741,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: Error al descargar CSV
 order:
-    pageTitles:
-        order: Cesta
-        orderList: Listado
-        orderCreate: Nueva orden
-        summary: Resumen
-        basicData: Datos básicos
-        catalog: Catálogo
-        volume: Volumen
-        lines: Líneas
     field:
         salesPersonFk: Comercial
         clientFk: Cliente
@@ -697,13 +782,6 @@ order:
         price: Precio
         amount: Monto
 shelving:
-    pageTitles:
-        shelving: Carros
-        shelvingList: Listado de carros
-        shelvingCreate: Nuevo carro
-        summary: Resumen
-        basicData: Datos básicos
-        log: Historial
     list:
         parking: Parking
         priority: Prioridad
@@ -729,17 +807,6 @@ parking:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Fact. recibidas
-        list: Listado
-        invoiceInCreate: Crear fact. recibida
-        summary: Resumen
-        basicData: Datos básicos
-        vat: IVA
-        dueDay: Vencimiento
-        intrastat: Intrastat
-        corrective: Rectificativa
-        log: Historial
     list:
         ref: Referencia
         supplier: Proveedor
@@ -820,6 +887,8 @@ worker:
         log: Historial
         calendar: Calendario
         timeControl: Control de horario
+        locker: Taquilla
+        balance: Balance
     list:
         name: Nombre
         email: Email
@@ -880,17 +949,25 @@ worker:
         payMethods: Método de pago
         iban: IBAN
         bankEntity: Swift / BIC
+    formation:
+        tableVisibleColumns:
+            course: Curso
+            startDate: Fecha Inicio
+            endDate: Fecha Fin
+            center: Centro Formación
+            invoice: Factura
+            amount: Importe
+            remark: Bonficado
+            hasDiploma: Diploma
     imageNotFound: No se ha encontrado la imagen
+    balance:
+        tableVisibleColumns:
+            paymentDate: Fecha
+            incomeType: Tipo
+            debit: Debe
+            credit: Haber
+            concept: Concepto
 wagon:
-    pageTitles:
-        wagons: Vagones
-        wagonsList: Listado vagones
-        wagonCreate: Crear tipo
-        wagonEdit: Editar tipo
-        typesList: Listado tipos
-        typeCreate: Crear tipo
-        typeEdit: Editar tipo
-        wagonCounter: Contador de carros
     type:
         name: Nombre
         submit: Guardar
@@ -919,31 +996,7 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
-route/roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
-roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
 route:
-    pageTitles:
-        routes: Rutas
-        cmrsList: Listado de CMRs externos
-        RouteList: Listado
-        routeCreate: Nueva ruta
-        basicData: Datos básicos
-        summary: Resumen
-        RouteRoadmap: Troncales
-        RouteRoadmapCreate: Crear troncal
-        tickets: Tickets
-        log: Historial
-        autonomous: Autónomos
     cmr:
         list:
             results: resultados
@@ -958,23 +1011,19 @@ route:
             shipped: Fecha preparación
             viewCmr: Ver CMR
             downloadCmrs: Descargar CMRs
+    columnLabels:
+        Id: Id
+        vehicle: Vehículo
+        description: Descripción
+        isServed: Servida
+        worker: Trabajador
+        date: Fecha
+        started: Iniciada
+        actions: Acciones
+        agency: Agencia
+        volume: Volumen
+        finished: Finalizada
 supplier:
-    pageTitles:
-        suppliers: Proveedores
-        supplier: Proveedor
-        list: Listado
-        supplierCreate: Nuevo proveedor
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        log: Historial
-        accounts: Cuentas
-        contacts: Contactos
-        addresses: Direcciones
-        consumption: Consumo
-        agencyTerm: Acuerdo agencia
-        dms: Gestión documental
     list:
         payMethod: Método de pago
         payDeadline: Plazo de pago
@@ -1066,16 +1115,6 @@ supplier:
         date: Fecha
         reference: Referencia
 travel:
-    pageTitles:
-        travel: Envíos
-        list: Listado
-        create: Crear
-        summary: Resumen
-        extraCommunity: Extra comunitarios
-        travelCreate: Nuevo envío
-        basicData: Datos básicos
-        history: Historial
-        thermographs: Termógrafos
     summary:
         confirmed: Confirmado
         entryId: Id entrada
@@ -1122,23 +1161,6 @@ travel:
         travelFileDescription: 'Id envío { travelId }'
         file: Fichero
 item:
-    pageTitles:
-        items: Artículos
-        list: Listado
-        diary: Histórico
-        tags: Etiquetas
-        fixedPrice: Precios fijados
-        buyRequest: Peticiones de compra
-        wasteBreakdown: Deglose de mermas
-        itemCreate: Nuevo artículo
-        basicData: 'Datos básicos'
-        tax: 'IVA'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        log: Historial
-        itemTypeCreate: Nueva familia
-        family: Familia
-        lastEntries: Últimas entradas
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -1149,6 +1171,7 @@ item:
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
+        producer: Productor
     list:
         id: Identificador
         grouping: Grouping
@@ -1223,17 +1246,6 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
-item/itemType:
-    pageTitles:
-        itemType: Familia
-        basicData: Datos básicos
-        summary: Resumen
-zone:
-    pageTitles:
-        zones: Zona
-        zonesList: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
 components:
     topbar: {}
     itemsFilterPanel:

src/pages/Account/AccountAccounts.vue

@@ -0,0 +1,104 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const onSynchronizeAll = async () => {
+    try {
+        notify(t('Synchronizing in the background'), 'positive');
+        await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
+};
+
+const onSynchronizeRoles = async () => {
+    try {
+        await axios.patch(`RoleInherits/sync`);
+        notify(t('Roles synchronized!'), 'positive');
+    } catch (error) {
+        console.error('Error synchronizing roles', error);
+    }
+};
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :url="`AccountConfigs/${1}`"
+            :url-update="`AccountConfigs/${1}`"
+            model="AccountAccounts"
+            auto-load
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('accounts.syncAll')"
+                    @click="onSynchronizeAll()"
+                />
+                <QBtn
+                    color="primary"
+                    :label="t('accounts.syncRoles')"
+                    @click="onSynchronizeRoles()"
+                />
+            </template>
+            <template #form="{ data }">
+                <div class="q-gutter-y-sm">
+                    <VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
+                    <VnInput :label="t('accounts.shell')" v-model="data.shell" />
+                    <VnInput
+                        :label="t('accounts.idBase')"
+                        v-model="data.idBase"
+                        type="number"
+                        min="0"
+                    />
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.min')"
+                            v-model="data.min"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.max')"
+                            v-model="data.max"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.warn')"
+                            v-model="data.warn"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.inact')"
+                            v-model="data.inact"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                </div>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Roles synchronized!: ¡Roles sincronizados!
+    Synchronizing in the background: Sincronizando en segundo plano
+</i18n>

src/pages/Account/AccountAcls.vue

@@ -0,0 +1,151 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AclFilter from './Acls/AclFilter.vue';
+import AclFormView from './Acls/AclFormView.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useStateStore } from 'stores/useStateStore';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const stateStore = useStateStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref();
+const formDialog = ref(false);
+const rolesOptions = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return { model: { like: `%${value}%` } };
+        default:
+            return { [param]: value };
+    }
+};
+
+const deleteAcl = async (id) => {
+    try {
+        await axios.delete(`ACLs/${id}`);
+        paginateRef.value.fetch();
+        notify('ACL removed', 'positive');
+    } catch (error) {
+        console.error('Error deleting Acl: ', error);
+    }
+};
+function showFormDialog(data) {
+    formDialog.value = {
+        show: true,
+        formInitialData: { ...data },
+    };
+}
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+                :label="t('acls.search')"
+                :info="t('acls.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <AclFilter data-key="AccountAcls" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="`${row.model}.${row.property}`"
+                        @click="showFormDialog(row)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('acls.role')" :value="row.principalId" />
+                            <VnLv :label="t('acls.accessType')" :value="row.accessType" />
+                            <VnLv
+                                :label="t('acls.permissions')"
+                                :value="row.permission"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('globals.delete')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('ACL will be removed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => deleteAcl(row.id)
+                                    )
+                                "
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            v-model="formDialog.show"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AclFormView
+                :form-initial-data="formDialog.formInitialData"
+                @on-data-change="paginateRef.fetch()"
+                :roles-options="rolesOptions"
+            />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="showFormDialog()">
+                <QTooltip class="text-no-wrap">{{ t('New ACL') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    New ACL: Nuevo ACL
+    ACL removed: ACL eliminado
+    ACL will be removed: El ACL será eliminado
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>

src/pages/Account/AccountAliasList.vue

@@ -0,0 +1,105 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AliasSummary from './Alias/Card/AliasSummary.vue';
+import AliasCreateForm from './Alias/AliasCreateForm.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useStateStore } from 'stores/useStateStore';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+const stateStore = useStateStore();
+const aliasCreateDialogRef = ref(null);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
+
+const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
+
+const openCreateModal = () => aliasCreateDialogRef.value.show();
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+                :label="t('mailAlias.search')"
+                :info="t('mailAlias.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.alias"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
+                            </VnLv>
+                            <VnLv
+                                :label="t('mailAlias.description')"
+                                :value="row.description"
+                            >
+                            </VnLv>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, AliasSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="aliasCreateDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AliasCreateForm />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
+                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Account/AccountConnections.vue

@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { toDateTimeFormat } from 'src/filters/date.js';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+const filter = {
+    fields: ['id', 'created', 'userId'],
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['username'],
+        },
+    },
+    order: 'created DESC',
+};
+
+const urlPath = 'AccessTokens';
+
+const refresh = () => paginateRef.value.fetch();
+
+const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
+
+const killSession = async (id) => {
+    try {
+        await axios.delete(`${urlPath}/${id}`);
+        paginateRef.value.fetch();
+        notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                :data-key="urlPath"
+                ref="paginateRef"
+                :filter="filter"
+                :url="urlPath"
+                order="created DESC"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :key="row.id"
+                        :title="row.user?.username"
+                        @click="navigate(row.userId)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <div style="flex-direction: column; width: 100%">
+                                <VnLv
+                                    :label="t('connections.username')"
+                                    :value="row.user?.username"
+                                >
+                                </VnLv>
+                                <VnLv
+                                    :label="t('connections.created')"
+                                    :value="toDateTimeFormat(row.created)"
+                                >
+                                </VnLv>
+                            </div>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                class="q-mt-xs"
+                                :label="t('connections.killSession')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('Session will be killed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => killSession(row.id)
+                                    )
+                                "
+                                outline
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="refresh" color="primary" @click="refresh()">
+                <QTooltip>{{ t('connections.refresh') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Session killed: Sesión matada
+    Session will be killed: Se va a matar la sesión
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>

src/pages/Account/AccountCreate.vue

@@ -0,0 +1,81 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+
+const newAccountForm = reactive({
+    active: true,
+});
+const rolesOptions = ref([]);
+
+const redirectToAccountBasicData = (_, { id }) => {
+    router.push({ name: 'AccountBasicData', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        :title="t('account.card.newUser')"
+        url-create="VnUsers"
+        model="users"
+        :form-initial-data="newAccountForm"
+        @on-data-saved="redirectToAccountBasicData"
+    >
+        <template #form-inputs="{ data, validate }">
+            <div class="column q-gutter-sm">
+                <VnInput
+                    v-model="data.name"
+                    :label="t('account.create.name')"
+                    :rules="validate('VnUser.name')"
+                />
+                <VnInput
+                    v-model="data.nickname"
+                    :label="t('account.create.nickname')"
+                    :rules="validate('VnUser.nickname')"
+                />
+                <VnInput
+                    v-model="data.email"
+                    :label="t('account.create.email')"
+                    type="email"
+                    :rules="validate('VnUser.email')"
+                />
+                <VnSelect
+                    :label="t('account.create.role')"
+                    v-model="data.roleFk"
+                    :options="rolesOptions"
+                    option-value="id"
+                    option-label="name"
+                    map-options
+                    hide-selected
+                    :rules="validate('VnUser.roleFk')"
+                />
+                <VnInput
+                    v-model="data.password"
+                    :label="t('account.create.password')"
+                    type="password"
+                    :rules="validate('VnUser.password')"
+                />
+                <QCheckbox
+                    :label="t('account.create.active')"
+                    v-model="data.active"
+                    :toggle-indeterminate="false"
+                    :rules="validate('VnUser.active')"
+                />
+            </div>
+        </template>
+    </FormModelPopup>
+</template>

src/pages/Account/AccountFilter.vue

@@ -0,0 +1,87 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
+});
+
+const rolesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+        :redirect="false"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`account.card.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('account.card.name')"
+                        v-model="params.name"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('account.card.alias')"
+                        v-model="params.nickname"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('account.card.role')"
+                        v-model="params.roleFk"
+                        @update:model-value="searchFn()"
+                        :options="rolesOptions"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

src/pages/Account/AccountLdap.vue

@@ -0,0 +1,171 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const arrayData = useArrayData('AccountLdap');
+
+const URL_UPDATE = `LdapConfigs/${1}`;
+const URL_CREATE = `LdapConfigs`;
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    groupDn: null,
+    password: null,
+    rdn: null,
+    server: null,
+    userDn: null,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`LdapConfigs/test`);
+        notify(t('LDAP connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialLdapConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(URL_UPDATE);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        arrayData.destroy();
+        console.error('Error fetching initial LDAP config', error);
+        return null;
+    } finally {
+        // Si asignamos un valor a urlUpdate, debemos asignar null a urlCreate y viceversa, ya puede causar problemas en formModel
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(URL_UPDATE);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialLdapConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :key="initialDataLoaded"
+            model="AccountLdap"
+            :form-initial-data="initialData"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
+            auto-load
+            @on-data-saved="getInitialLdapConfig()"
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('ldap.testConnection')"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('ldap.testConnection') }}
+                    </QTooltip>
+                </QBtn>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('ldap.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('ldap.server')"
+                        clearable
+                        v-model="data.server"
+                        :required="true"
+                        :rules="validate('LdapConfig.server')"
+                    />
+                    <VnInput
+                        :label="t('ldap.rdn')"
+                        clearable
+                        v-model="data.rdn"
+                        :required="true"
+                        :rules="validate('LdapConfig.rdn')"
+                    />
+                    <VnInput
+                        :label="t('ldap.password')"
+                        clearable
+                        type="password"
+                        v-model="data.password"
+                        :required="true"
+                        :rules="validate('LdapConfig.password')"
+                    />
+                    <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
+                    <VnInput
+                        :label="t('ldap.groupDN')"
+                        clearable
+                        v-model="data.groupDn"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    LDAP connection established!: ¡Conexión con LDAP establecida!
+</i18n>

src/pages/Account/AccountList.vue

@@ -0,0 +1,144 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { computed, ref } from 'vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import AccountSummary from './Card/AccountSummary.vue';
+import AccountFilter from './AccountFilter.vue';
+import AccountCreate from './AccountCreate.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useStateStore } from 'stores/useStateStore';
+import { useRole } from 'src/composables/useRole';
+import { QDialog } from 'quasar';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const accountCreateDialogRef = ref(null);
+const showNewUserBtn = computed(() => useRole().hasAny(['itManagement']));
+
+const filter = {
+    fields: ['id', 'nickname', 'name', 'role'],
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'nickname':
+            return { [param]: { like: `%${value}%` } };
+        case 'roleFk':
+            return { [param]: value };
+    }
+};
+
+const getApiUrl = () => new URL(window.location).origin;
+
+const navigate = (event, id) => {
+    if (event.ctrlKey || event.metaKey)
+        return window.open(`${getApiUrl()}/#/account/${id}/summary`);
+    router.push({ path: `/account/${id}` });
+};
+
+const openCreateModal = () => accountCreateDialogRef.value.show();
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountList"
+                url="VnUsers/preview"
+                :expr-builder="exprBuilder"
+                :label="t('account.search')"
+                :info="t('account.searchInfo')"
+            />
+        </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <AccountFilter data-key="AccountList" :expr-builder="exprBuilder" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                :filter="filter"
+                data-key="AccountList"
+                url="VnUsers/preview"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.nickname"
+                        @click="navigate($event, row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('account.card.name')" :value="row.nickname">
+                            </VnLv>
+                            <VnLv
+                                :label="t('account.card.nickname')"
+                                :value="row.username"
+                            >
+                            </VnLv>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, AccountSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="accountCreateDialogRef"
+            transition-hide="scale"
+            transition-show="scale"
+        >
+            <AccountCreate />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]" v-if="showNewUserBtn">
+            <QBtn @click="openCreateModal" color="primary" fab icon="add" />
+            <QTooltip class="text-no-wrap">
+                {{ t('account.card.newUser') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Account/AccountMain.vue

@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>

src/pages/Account/AccountSamba.vue

@@ -0,0 +1,187 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const arrayData = useArrayData('AccountSamba');
+
+const formModel = ref(null);
+
+const URL_UPDATE = `SambaConfigs/${1}`;
+const URL_CREATE = `SambaConfigs`;
+
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    adDomain: null,
+    adController: null,
+    adUser: null,
+    adPassword: null,
+    userDn: null,
+    verifyCert: false,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`SambaConfigs/test`);
+        notify(t('Samba connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialSambaConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(URL_UPDATE);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        arrayData.destroy();
+        console.error('Error fetching initial Samba config', error);
+        return null;
+    } finally {
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(URL_UPDATE);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialSambaConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            ref="formModel"
+            :key="initialDataLoaded"
+            model="AccountSamba"
+            :form-initial-data="initialData"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
+            auto-load
+            @on-data-saved="getInitialSambaConfig()"
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('samba.testConnection')"
+                    :disable="formModel.hasChanges"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('samba.testConnection') }}
+                    </QTooltip>
+                </QBtn>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('samba.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('samba.domainAD')"
+                        clearable
+                        v-model="data.adDomain"
+                        :required="true"
+                        :rules="validate('SambaConfigs.server')"
+                    />
+                    <VnInput
+                        :label="t('samba.domainController')"
+                        clearable
+                        v-model="data.adController"
+                        :required="true"
+                        :rules="validate('SambaConfigs.adController')"
+                    />
+                    <VnInput
+                        :label="t('samba.userAD')"
+                        clearable
+                        v-model="data.adUser"
+                        :rules="validate('SambaConfigs.adUser')"
+                    />
+                    <VnInput
+                        :label="t('samba.passwordAD')"
+                        clearable
+                        type="password"
+                        v-model="data.adPassword"
+                    />
+                    <VnInput
+                        :label="t('samba.domainPart')"
+                        clearable
+                        v-model="data.userDn"
+                        :required="true"
+                        :rules="validate('SambaConfigs.userDn')"
+                    />
+                    <QCheckbox
+                        :label="t('samba.verifyCertificate')"
+                        v-model="data.verifyCert"
+                        :rules="validate('SambaConfigs.groupDn')"
+                        :toggle-indeterminate="false"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Samba connection established!: ¡Conexión con LDAP establecida!
+</i18n>