Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4774-traducciones

.husky/addReferenceTag.js

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

.husky/commit-msg

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

.vscode/settings.json

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

CHANGELOG.md

@@ -1,3 +1,673 @@
+# Version 24.38 - 2024-09-17
+
+### Added 🆕
+
+-   chore: refs #6772 fix e2e (origin/6772-warmfix-fixE2e) by:jorgep
+-   chore: refs #7323 worker changes by:jorgep
+-   chore: refs #7353 fix warnings by:jorgep
+-   chore: refs #7353 use Vue component nomenclature by:jorgep
+-   chore: refs #7356 fix type by:jorgep
+-   feat(AccountConnections): use VnToken by:alexm
+-   feat: add key to routerView by:Javier Segarra
+-   feat: add plus shortcut in VnTable by:Javier Segarra
+-   feat: add row by:Javier Segarra
+-   feat: addRow withour dialog by:Javier Segarra
+-   feat: apply mixin by:Javier Segarra
+-   feat by:Javier Segarra
+-   feat: change navBar buttons by:Javier Segarra
+-   feat: dense rows by:Javier Segarra
+-   feat: fields with wrong name by:jgallego
+-   feat: fix bugs and filters by:Javier Segarra
+-   feat: fix refund parameters by:jgallego
+-   feat: handle create row by:Javier Segarra
+-   feat: handle dates by:Javier Segarra
+-   feat: handle qCheckbox 3rd state by:Javier Segarra
+-   feat: imrpove VnInputTime to set cursor at start by:Javier Segarra
+-   feat: keyShortcut directive by:Javier Segarra
+-   feat: minor fixes by:jgallego
+-   feat: only filter by isDestiny by:Javier Segarra
+-   feat: refs #211153 businessDataLinkGrafana by:robert
+-   feat: refs #7129 add km start and end on create form by:pablone
+-   feat: refs #7353 add filter & fix customTags by:jorgep
+-   feat: refs #7353 add locale by:jorgep
+-   feat: refs #7353 add no one opt by:jorgep
+-   feat: refs #7353 add right icons by:jorgep
+-   feat: refs #7353 imporve toDateFormat by:jorgep
+-   feat: refs #7353 salesPerson nickname & id by:jorgep
+-   feat: refs #7353 split sections by:jorgep
+-   feat: refs #7847 remove reload btn by:jorgep
+-   feat: refs #7847 remove reload fn by:jorgep
+-   feat: refs #7889 added shortcuts to modules by:Jon
+-   feat: refs #7911 added shortcut to modules by:Jon
+-   feat: refuncInvoiceForm component by:jgallego
+-   feat: remove duplicity by:Javier Segarra
+-   feat: remove future itemFixedPrices by:Javier Segarra
+-   feat: replace stickyButtons by subtoolbar by:Javier Segarra
+-   feat: required validation by:Javier Segarra
+-   feat: show bad dates by:Javier Segarra
+-   feat: showdate icons by:Javier Segarra
+-   feat: solve ItemFixedFilterPanel by:Javier Segarra
+-   feat: transfer an invoice by:jgallego
+-   feat: try to fix ItemFixedFilterPanel by:Javier Segarra
+-   feat: unnecessary changes by:Javier Segarra
+-   feat: update changelog (origin/7896_down_devToTest_2436) by:Javier Segarra
+-   feat: updates by:Javier Segarra
+-   feat: update version and changelog by:Javier Segarra
+-   feat: vnInput\* by:Javier Segarra
+-   feat: with VnTable by:Javier Segarra
+-   refs #6772 feat: fix approach by:Javier Segarra
+-   refs #6772 feat: refresh shelving.basic-data by:Javier Segarra
+-   style: show subName value by:Javier Segarra
+
+### Changed 📦
+
+-   perf: add v-shortcut in VnCard by:Javier Segarra
+-   perf: approach by:Javier Segarra
+-   perf: change directive location by:Javier Segarra
+-   perf: change slots order by:Javier Segarra
+-   perf: examples by:Javier Segarra
+-   perf: hide icon for VnInputDate by:Javier Segarra
+-   perf: improve ItemFixedPricefilterPanel by:Javier Segarra
+-   perf: improve mainShrotcutMixin by:Javier Segarra
+-   perf: minor clean code by:Javier Segarra
+-   perf: onRowchange by:Javier Segarra
+-   perf: order by by:Javier Segarra
+-   perf: order components by:Javier Segarra
+-   perf: refs #7889 perf shortcut test by:Jon
+-   perf: remove console.log by:Javier Segarra
+-   perf: remove icons in header slot by:Javier Segarra
+-   perf: remove print variables by:Javier Segarra
+-   perf: restore CustomerBasicData by:Javier Segarra
+-   refactor: deleted useless prop by:Jon
+-   refactor: deleted useless prop in FetchedTags by:Jon
+-   refactor: refs #7323 drop useless code by:jorgep
+-   refactor: refs #7353 clients correction by:jorgep
+-   refactor: refs #7353 clients correction wip by:jorgep
+-   refactor: refs #7353 ease logic by:jorgep
+-   refactor: refs #7353 order correction by:jorgep
+-   refactor: refs #7353 simplify code by:jorgep
+-   refactor: refs #7353 tickets correction by:jorgep
+-   refactor: refs #7353 use global locales by:jorgep
+-   refactor: refs #7354 changed descriptor menu options by:Jon
+-   refactor: refs #7354 changed icon color in table and notification when deleting a zone by:Jon
+-   refactor: refs #7354 fix tableFilters by:Jon
+-   refactor: refs #7354 modified VnInputTime by:Jon
+-   refactor: refs #7354 refactor deliveryPanel by:Jon
+-   refactor: refs #7354 refactor zones section and fixed e2e tests by:Jon
+-   refactor: refs #7354 requested changes by:Jon
+-   refactor: refs #7354 reverse deliveryPanel changes by:Jon
+-   refactor: refs #7354 Zone migration changes by:Jon
+-   refactor: refs #7889 deleted subtitle attr and use keyBinding instead by:Jon
+-   refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu by:Jon
+-   refs #6722 perf: not fetch when id not exists by:Javier Segarra
+-   refs #6772 perf: change variable name by:JAVIER SEGARRA MARTINEZ
+-   refs #6772 perf: use ArrayData (6772_reload_sections) by:Javier Segarra
+-   refs #7283 refactor fix ItemDescriptor by:carlossa
+-   refs #7283 refactor ItexDescriptor by:carlossa
+
+### Fixed 🛠️
+
+-   chore: refs #6772 fix e2e (origin/6772-warmfix-fixE2e) by:jorgep
+-   chore: refs #7353 fix warnings by:jorgep
+-   chore: refs #7356 fix type by:jorgep
+-   feat: fix bugs and filters by:Javier Segarra
+-   feat: fix refund parameters by:jgallego
+-   feat: minor fixes by:jgallego
+-   feat: refs #7353 add filter & fix customTags by:jorgep
+-   feat: try to fix ItemFixedFilterPanel by:Javier Segarra
+-   fix: add border-top by:Javier Segarra
+-   fix: added missing descriptors and small details by:Jon
+-   fix branch by:carlossa
+-   fix: call upsert when crudModel haschanges by:Javier Segarra
+-   fix(ClaimList): fix summary by:alexm
+-   fix: cli warnings by:Javier Segarra
+-   fix: editTableOptions by:Javier Segarra
+-   fix events and descriptor menu by:Jon
+-   fix: InvoiceIn sections (origin/6772_reload_sections) by:Javier Segarra
+-   fix: minor changes by:Javier Segarra
+-   fix: minor error whit dates by:Javier Segarra
+-   fix: module icon by:Javier Segarra
+-   fix: options QDate by:Javier Segarra
+-   fix: refs #6900 e2e error by:jorgep
+-   fix: refs #6900 rollback by:jorgep
+-   fix: refs #7353 css by:jorgep
+-   fix: refs #7353 hide search param (origin/7353-warmfix-fixSearchbar) by:jorgep
+-   fix: refs #7353 iron out filter by:jorgep
+-   fix: refs #7353 iron out ticket table by:jorgep
+-   fix: refs #7353 padding by:jorgep
+-   fix: refs #7353 salesClientTable by:jorgep
+-   fix: refs #7353 salesorderTable by:jorgep
+-   fix: refs #7353 saleTicketMonitors by:jorgep
+-   fix: refs #7353 use same datakey by:jorgep
+-   fix: refs #7353 vnTable colors by:jorgep
+-   fix: refs #7354 e2e tests by:Jon
+-   fix: refs #7354 fix delivery days by:Jon
+-   fix: refs #7354 fix list searchbar and filters by:Jon
+-   fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests by:Jon
+-   fix: refs #7354 fix VnTable filters and agency field by:Jon
+-   fix: refs #7354 fix zoneSearchbar by:Jon
+-   fix: refs #7354 requested changes by:Jon
+-   fix: refs #7356 colors by:jorgep
+-   fix: refs #7356 create claim dialog by:jorgep
+-   fix: refs #7889 fixed shortcut test by:Jon
+-   fix: refs #7903 fixed ticket's search bar and keybinding tooltip by:Jon
+-   fix: refs #7911 fixed shortcut and related files by:Jon
+-   fix: remove condition duplicated by:Javier Segarra
+-   fix: remove property by:Javier Segarra
+-   fix tootltip by:carlossa
+-   fix traduction by:carlossa
+-   fix(VnSectionMain): add QPage by:alexm
+-   fix(zone): zoneLocation and the others searchbar by:alexm
+-   refactor: refs #7354 fix tableFilters by:Jon
+-   refactor: refs #7354 refactor zones section and fixed e2e tests by:Jon
+-   refs #6772 feat: fix approach by:Javier Segarra
+-   refs #6772 fix: claimPhoto reload by:Javier Segarra
+-   refs #6896 fix searchbar by:carlossa
+-   refs #6897 fix entry by:carlossa
+-   refs #6899 fix invoiceFix by:carlossa
+-   refs #6899 fix order by:carlossa
+-   refs #7283 fix by:carlossa
+-   refs #7283 fix ItemDescriptor warehouse by:carlossa
+-   refs #7283 refactor fix ItemDescriptor by:carlossa
+-   refs #7355 #7366 fix account, summary, list, travelList, tooltip by:carlossa
+-   refs #7355 fix accountPrivileges by:carlossa
+-   refs #7355 fix accounts, vnTable by:carlossa
+-   refs #7355 fix privileges by:carlossa
+-   refs #7355 fix roles filters by:carlossa
+-   refs #7355 fix total by:carlossa
+-   refs #7355 fix views summarys, entryList, travelList refact by:carlossa
+-   refs #7366 fix travel hours by:carlossa
+-   test: fix e2e by:Javier Segarra
+
+# Version 24.36 - 2024-08-27
+
+### Added 🆕
+
+-   feat(FormModel): trim data by default by:alexm
+-   feat(orderBasicData): add notes by:alexm
+-   feat(orderList): correct create order by:alexm
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra
+-   feat: add recover password and reset password by:alexm
+-   feat: refs #7346 add seriaType option by:jgallego
+-   feat: refs #7346 elimino === by:jgallego
+-   feat: refs #7346 formdata uses serialType by:jgallego
+-   feat: refs #7346 refactor by:jgallego
+-   feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego
+-   feat: refs #7710 uses cloneAll by:jgallego
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+
+### Changed 📦
+
+-   feat: refs #7346 refactor by:jgallego
+-   perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra
+-   perf: refs #7717 right menu filter by:Jon
+-   perf: use ref at component start by:Javier Segarra
+-   refactor: refs #7717 delete useless function and import by:Jon
+-   refactor: refs #7717 deleted useless code by:Jon
+
+### Fixed 🛠️
+
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   fix(VnTable): orderBy v-model by:alexm
+-   fix(account_card): redirection by:carlossa
+-   fix(orderLines): reload when delete and redirect when confirm by:alexm
+-   fix: #6336 ClaimListStates by:Javier Segarra
+-   fix: account subsections cards by:carlossa
+-   fix: duplicate key by:Jon
+-   fix: order description to vnTable by:alexm
+-   fix: orderCatalogFilter order by:alexm
+-   fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+-   fix: refs #7717 fix basic data form & minor errors by:Jon
+-   fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon
+-   fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon
+-   fix: refs #7717 fix order sections by:Jon
+-   fix: refs #7717 fix volume and lines redirect by:Jon
+-   fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon
+-   fix: test by:alexm
+-   fix: ticketDescriptorMenu by:Javier Segarra
+-   refs #7355 account fixes by:carlossa
+
+# Version 24.34 - 2024-08-20
+
+### Added 🆕
+
+-   chore: #6900 order params by:jorgep
+-   chore: refs #6900 drop console log by:jorgep
+-   chore: refs #6900 drop vnCurrency by:jorgep
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #6900 mv rectificative logic by:jorgep
+-   chore: refs #6900 responsive code by:jorgep
+-   chore: refs #7283 drop array types by:jorgep
+-   chore: refs #7283 drop import by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7283 update VnAvatar title handling by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   chore: refs #7323 remove unused import by:jorgep
+-   chore: refs #7323drop commented code by:jorgep
+-   feat(VnCard): use props searchbar by:alexm
+-   feat(customer): improve basicData to balance by:alexm
+-   feat(customer_balance): refs #6943 add functionality from salix by:alexm
+-   feat(customer_balance): refs #6943 translations by:alexm
+-   feat: refs #6130 husky commitLint config by:pablone
+-   feat: refs #6130 husky hooks by:pablone
+-   feat: refs #6900 add InvoiceInSerial by:jorgep
+-   feat: refs #6900 add locale by:jorgep
+-   feat: refs #6900 use VnTable & sort filter fields by:jorgep
+-   feat: refs #7323 add flex-wrap by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   feat: refs #7323 improve test by:jorgep
+
+### Changed 📦
+
+-   refactor(customer_log: use VnLog by:alexm
+-   refactor(customer_recovery): to vnTable by:alexm
+-   refactor(customer_webAccess): FormModel by:alexm
+-   refactor: refs #7283 update avatar size and color by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   fix #7355 fix acls list by:carlossa
+-   fix(VnFilterPanel): emit userParams better by:alexm
+-   fix(claim_summary): url links (HEAD -> 7864_testToMaster_2434, origin/test, origin/7864_testToMaster_2434, test) by:alexm
+-   fix(customer_sms: fix reload by:alexm
+-   fix(twoFactor): unify code login and twoFactor by:alexm
+-   fix: VnCard VnSearchbar props by:alexm
+-   fix: accountMailAlias by:alexm
+-   fix: refs #6130 add commit lint modules by:pablone
+-   fix: refs #6130 pnpm-lock.yml by:pablone
+-   fix: refs #6900 improve loading by:jorgep
+-   fix: refs #6900 improve logic (origin/6900-addSerial) by:jorgep
+-   fix: refs #6900 improve logic by:jorgep
+-   fix: refs #6900 rectificative btn reactivity by:jorgep
+-   fix: refs #6900 use type number by:jorgep
+-   fix: refs #6900 vat & dueday by:jorgep
+-   fix: refs #6900 vat, dueday & intrastat by:jorgep
+-   fix: refs #6989 show entity name & default time from config table by:jorgep
+-   fix: refs #7283 basicData locale by:jorgep
+-   fix: refs #7283 itemLastEntries filter by:jorgep
+-   fix: refs #7283 itemTags & VnImg by:jorgep
+-   fix: refs #7283 locale by:jorgep
+-   fix: refs #7283 min-width vnImg by:jorgep
+-   fix: refs #7283 use vnAvatar & add optional zoom by:jorgep
+-   fix: refs #7283 userPanel pic by:jorgep
+-   fix: refs #7323 add department popup by:jorgep
+-   fix: refs #7323 add locale by:jorgep
+-   fix: refs #7323 css righ menu by:jorgep
+-   fix: refs #7323 data-key & add select by:jorgep
+-   fix: refs #7323 load all opts by:jorgep
+-   fix: refs #7323 righ menu bug by:jorgep
+-   fix: refs #7323 use global locale by:jorgep
+-   fix: refs #7323 use workerFilter (origin/7323-warmfix-fixErrors) by:jorgep
+-   fix: refs #7323 vnsubtoolbar css by:jorgep
+-   fix: refs #7323 wrong css by:jorgep
+-   refs #7355 fix Rol, alias by:carlossa
+-   refs #7355 fix accountAlias by:carlossa
+-   refs #7355 fix alias summary by:carlossa
+-   refs #7355 fix conflicts by:carlossa
+-   refs #7355 fix create Rol by:carlossa
+-   refs #7355 fix list by:carlossa
+-   refs #7355 fix lists redirects summary by:carlossa
+-   refs #7355 fix roles by:carlossa
+-   refs #7355 fix search exprBuilder by:carlossa
+-   refs #7355 fix vnTable by:carlossa
+
+# Version 24.32 - 2024-08-06
+
+### Added 🆕
+
+-   chore: refs #7197 drop space by:jorgep
+-   chore: refs #7197 drop useless attr by:jorgep
+-   chore: refs #7197 fix test by:jorgep
+-   chore: refs #7197 fix tests by:jorgep
+-   chore: refs #7197 fix unit tests by:jorgep
+-   chore: refs #7197 idrop useless class by:jorgep
+-   chore: refs #7197 improve form filling in Cypress tests by:jorgep
+-   chore: refs #7197 remove unused import by:jorgep
+-   feat: customerPayments card view by:alexm
+-   feat: refs #6943 lock grid mode by:jorgep
+-   feat: refs #6943 wip consumption filter by:jorgep
+-   feat: refs #7197 add correcting filter by:jorgep
+-   feat: refs #7197 add supplier activities filter option by:jorgep
+-   feat: refs #7197 summary responsive by:jorgep
+-   feat: refs #7323 fix descriptors, added VnTable and minor changes by:Jon
+-   feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate by:Jon
+-   feat: refs #7356 list & weekly to VnTable and style fixes by:Jon
+-   feat: refs #7401 add menu options by:pablone
+-   feat: SalesClientTable by:Javier Segarra
+-   feat: salesOrderTable by:Javier Segarra
+-   feat: salesTicketTable by:Javier Segarra
+-   feat: VnTable SalesTicketTable by:Javier Segarra
+-   fix: columns style by:alexm
+
+### Changed 📦
+
+-   perf: LeftMenu show/hide by:Javier Segarra
+-   perf: refs #7356 TicketList state column by:Jon
+-   perf: VnFilterPanel (origin/7323_WorkerMigration_End) by:Javier Segarra
+-   perf: width SalesTicketsTable by:Javier Segarra
+-   refactor: #6943 wip use vnTable CustomerCredits by:jorgep
+-   refactor: CustomerNotifications use VnTable by:alexm
+-   refactor: CustomerPayments use VnTable by:alexm
+-   refactor: refs #7014 deleted main files and changed route files by:Jon
+-   refactor: refs #7014 improved route.js & deleted RouteMain by:Jon
+-   refactor: refs #7014 refactor <module>Main.vue by:Jon
+-   refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality by:Jon
+-   refactor: refs #7197 use invoiceInSearchbar & queryParams by:jorgep
+-   refactor: refs #7323 hidden column filter proposal by:Jon
+-   refactor: refs #7356 fixed VnTable filters by:Jon
+-   refactor: refs #7356 requested changes by:Jon
+-   refactor: wip use vnTable CustomerCredits by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #7197 fix test by:jorgep
+-   chore: refs #7197 fix tests by:jorgep
+-   chore: refs #7197 fix unit tests by:jorgep
+-   feat: refs #7323 fix descriptors, added VnTable and minor changes by:Jon
+-   feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate by:Jon
+-   feat: refs #7356 list & weekly to VnTable and style fixes by:Jon
+-   fix(claim): small details (6336-claim-v6) by:alexm
+-   fix: columns style by:alexm
+-   fix: customer defaulter add amount order (6943-fixCustomer) by:alexm
+-   fix: customerDefaulter correct functionality by:alexm
+-   fix: customerNotifications filter by:alexm
+-   fix: fix conflicts by:Jon
+-   fix: refs #6101 fix TicketList by:Jon
+-   fix: refs #6891 worker tests by:jorgep
+-   fix: refs #6943 drop padding-left checkbox & create wrap mode vnRow by:jorgep
+-   fix: refs #6943 prevent undefined by:jorgep
+-   fix: refs #7014 fix tests by:Jon
+-   fix: refs #7014 fix wagon module by:Jon
+-   fix: refs #7197 add url InvoiceInSearchbar by:jorgep
+-   fix: refs #7197 amount reactivity by:jorgep
+-   fix: refs #7197 drop character by:jorgep
+-   fix: refs #7197 reactivity invoiceCorrection by:jorgep
+-   fix: refs #7197 responsive summary layout by:jorgep
+-   fix: refs #7197 rollback by:jorgep
+-   fix: refs #7197 rollback crudModel by:jorgep
+-   fix: refs #7197 setInvoiceInCorrecition by:jorgep
+-   fix: refs #7197 vat, intrastat, filter and list sections by:jorgep
+-   fix: refs #7323 fix department & email table filter by:Jon
+-   fix: refs #7323 fixed left filter by:Jon
+-   fix: refs #7323 fix workerTimeControl form by:Jon
+-   fix: refs #7401 fix routeForm by:pablone
+-   fix: refs #7401 remove console.log by:pablone
+-   fix: refs CAU 207504 fix itemDiary and logs by:Jon
+-   fix: workerCreate form street field to be always upperCase by:Jon
+-   hotfix: refs CAU #207614 fix sale.concept field by:Jon
+-   refactor: refs #7356 fixed VnTable filters by:Jon
+-   refs #6898 fix by:carlossa
+-   Ticket expedition initial load fix by:wbuezas
+
+# Version 24.28 - 2024-07-09
+
+### Added 🆕
+
+-   Change header titles style by:wbuezas
+-   chore: refs #7436 fix e2e (origin/7436-showQCheckbox) by:jorgep
+-   feat: #7196 eslint (origin/7196-cjsToEsm) by:jgallego
+-   feat: adapt tu VnTable → CrudModel by:alexm
+-   feat(CustomerFIlter): use correct table by:alexm
+-   feat(customerList): add searchbar by:alexm
+-   feat: customerList is customerExtendedList by:alexm
+-   feat: fixes #7196 by:jgallego
+-   feat: refs #6739 transferInvoice new checkbox and functionality by:Jon
+-   feat: refs #6825 create vnTable and add in CustomerExtendedList by:alexm
+-   feat: refs #6825 create vnTableColumn, cardActions by:alexm
+-   feat: refs #6825 fix modes by:alexm
+-   feat: refs #6825 qchip color by:alexm
+-   feat: refs #6825 right filter panel (6825-vnTable) by:alexm
+-   feat: refs #6825 scroll for table mode by:alexm
+-   feat: refs #6825 share filters, create popup by:alexm
+-   feat: refs #6825 VnComponent mix component and attrs Form to create new row by:alexm
+-   feat: refs #6825 VnTableFilter and VnPanelFilter init by:alexm
+-   feat: refs #6826 added rol summary link by:Jon
+-   feat: refs #6896 created VnImg and added to order module by:Jon
+-   feat: refs #6896 new filters by:Jon
+-   feat: refs #7129 fix some code and add order by:pablone
+-   feat: refs #7436 show checkbox by:jorgep
+-   feat: refs #7545 Deleted hasIncoterms client column (origin/7545-hasIncoterms) by:guillermo
+-   feat(TicketService): use correct format by:alexm
+-   feat(url): sepate filters by:alexm
+-   feat(VnFilter): merge objects by:alexm
+-   feat(VnTable): is-editable and use-model. fix: checkbox by:alexm
+-   feat(VnTable): refs #6825 actions sticky by:alexm
+-   feat(VnTable): refs #6825 addInWhere by:alexm
+-   feat(VnTable): refs #6825 dinamic columns by:alexm
+-   feat(VnTable): refs #6825 execute function when create by:alexm
+-   feat(VnTable): refs #6825 fix ellipsis and add titles by:alexm
+-   feat(VnTable): refs #6825 merge where's by:alexm
+-   feat(VnTable): refs #6825 move to folder. fix checkboxs by:alexm
+-   feat(VnTable): refs #6825 remove field prop. Add actions in table by:alexm
+-   feat(VnTable): refs #6825 use checkbox if startsWith 'is' or 'has' by:alexm
+-   feat(VnTable): refs #6825 VnTableChip component by:alexm
+-   feat(vnTable): reload data when change url by:alexm
+-   feat(WorkerFormation): add columnFilter by:alexm
+-   feat(WorkerFormation): is-editable and use-model by:alexm
+-   fix: notify icon style by:Javier Segarra
+-   refactor: refs #6896 fixed styles by:Jon
+-   Revert "feat: fixes #7196" by:alexm
+-   style: refs #6464 changed checkbox and qbtn styles by:Jon
+
+### Changed 📦
+
+-   perf: Remove div.col by:Javier Segarra
+-   perf: remove ItemPicture by:Javier Segarra
+-   perf: replace ItemPicture in favour of VnImg by:Javier Segarra
+-   refactor by:wbuezas
+-   refactor: refs #5447 changed warehouse filter by:Jon
+-   refactor: refs #5447 changed warehouse out filter behavior by:Jon
+-   refactor: refs #5447 fixed filter if continent not selected by:Jon
+-   refactor: refs #5447 fix request by:Jon
+-   refactor: refs #5447 refactor filters by:Jon
+-   refactor: refs #6739 changed invoice functions' name by:Jon
+-   refactor: refs #6739 changed router.push by:Jon
+-   refactor: refs #6739 deleted useless const by:Jon
+-   refactor: refs #6739 fix redirect transferInvoice by:Jon
+-   refactor: refs #6739 new confirmation window by:Jon
+-   refactor: refs #6739 requested changes by:Jon
+-   refactor: refs #6739 updated transferInvoice function by:Jon
+-   refactor: refs #6896 changes requested in PR by:Jon
+-   refactor: refs #6896 end migration orders by:Jon
+-   refactor: refs #6896 fixed styles by:Jon
+-   refactor: refs #6896 fix qdrawer by:Jon
+-   refactor: refs #6896 refactor VnImg by:Jon
+-   refactor: refs #6896 requested changes by:Jon
+-   refactor: refs #6977 fix VnImg props (origin/6977-ClonedURL) by:Jon
+-   refactor: refs #6977 refactor VnImg by:Jon
+-   refactor: refs #6977 use VnImg by:Jon
+-   refactors by:alexm
+
+### Fixed 🛠️
+
+-   chore: refs #7436 fix e2e (origin/7436-showQCheckbox) by:jorgep
+-   feat: fixes #7196 by:jgallego
+-   feat: refs #6825 fix modes by:alexm
+-   feat: refs #7129 fix some code and add order by:pablone
+-   feat(VnTable): is-editable and use-model. fix: checkbox by:alexm
+-   feat(VnTable): refs #6825 fix ellipsis and add titles by:alexm
+-   feat(VnTable): refs #6825 move to folder. fix checkboxs by:alexm
+-   fix(ArrayData): refs #6825 router.replace and use filter.where by:alexm
+-   fix: bug replace by:alexm
+-   fix: column hidden v-if by:Javier Segarra
+-   fix: comment 4 by:Javier Segarra
+-   fix: comments by:Javier Segarra
+-   fix: cypress.config to mjs by:alexm
+-   fix(EntryBuys): fix VnSubtoolbar by:alexm
+-   fixes: fix vnFilter params and redirect by:alexm
+-   fix: fix warnings by:alexm
+-   fix: invoiceDueDay test by:alexm
+-   fix log view not refreshing when changing id param by:wbuezas
+-   fix: map selected by:Javier Segarra
+-   fix: merge dev by:Javier Segarra
+-   fix: notify icon style by:Javier Segarra
+-   fix: point 1 by:Javier Segarra
+-   fix: point 3 by:Javier Segarra
+-   fix: refs #5447 deleted console.log by:Jon
+-   fix: refs 6464 deleted useless class in checkbox by:Jon
+-   fix: refs #6464 fix error isLoading by:Jon
+-   fix: refs #6739 changed checkbox field by:Jon
+-   fix: refs #6825 css by:carlossa
+-   fix: refs #6826 fix redirect by:Jon
+-   fix: refs #6826 fix roleDescriptor by:Jon
+-   fix: refs #7129 fix e2e by:pablone
+-   fix: refs #7129 fix module routes by:pablone
+-   fix: refs #7129 fix some issues on load and tools by:pablone
+-   fix: refs #7129 remove consoleLog by:pablone
+-   fix: refs #7129 remove fix from claim lines by:pablone
+-   fix: refs #7274 fix duplicate rows by:jorgep
+-   fix: refs #7433 skeleton by:jorgep
+-   fix: refs #7623 bugs & tests by:jorgep
+-   fix: refs #7623 disable router update by:jorgep
+-   fix: refs #7623 redirect by:jorgep
+-   fix: refs #7623 test by:jorgep
+-   fix: refs #7623 update add updateRoute prop in VnPaginate by:jorgep
+-   fix: refs #7623 updating skip param by:jorgep
+-   fix: revert cypress mjs by:alexm
+-   fix: SkeletonTable by:alexm
+-   fix: state translations by:Javier Segarra
+-   fix: ticket order by:Javier Segarra
+-   fix(ticket router): typo by:alexm
+-   fix(TicketService): pay use selected by:alexm
+-   fix: TravelLog by:Javier Segarra
+-   fix(url): filter by:alexm
+-   fix(url): redirect by:alexm
+-   fix(VnFilter): filter with params by:alexm
+-   fix(VnFilterPanel): remove key by:alexm
+-   fix(VnTable): create scss by:alexm
+-   fix(VnTable): duplicate fetch by:alexm
+-   fix(VnTable): Qtable v-bind by:alexm
+-   fix(VnTable): refs #6825 checkbox align and color by:alexm
+-   fix(VnTable): refs #6825 fix click sticky column by:alexm
+-   fix(VnTable): refs #6825 fix events and css by:alexm
+-   fix(VnTable): refs #6825 VnInputDate by:alexm
+-   fix(VnTable): showLabel by:alexm
+-   fix(VnTable): warns by:alexm
+-   fix: WorkerNotificationsManager test by:alexm
+-   fix: WorkerSelect option format by:Javier Segarra
+-   refactor: refs #5447 fixed filter if continent not selected by:Jon
+-   refactor: refs #5447 fix request by:Jon
+-   refactor: refs #6739 fix redirect transferInvoice by:Jon
+-   refactor: refs #6896 fixed styles by:Jon
+-   refactor: refs #6896 fix qdrawer by:Jon
+-   refactor: refs #6977 fix VnImg props (origin/6977-ClonedURL) by:Jon
+-   refs #6504 fix formModel claimFilter claimCard (origin/6504-fixCardClaim) by:carlossa
+-   refs #7406 fix components by:carlossa
+-   refs #7406 fix pr by:carlossa
+-   refs #7406 fix props by:carlossa
+-   refs #7406 fix Tb components create by:carlossa
+-   refs #7406 fix trad by:carlossa
+-   refs #7406 fix url by:carlossa
+-   refs #7406 fix VnTable columns by:carlossa
+-   refs #7409 fix balance and formation by:carlossa
+-   refs #7409 fix trad by:carlossa
+-   Revert "feat: fixes #7196" by:alexm
+-   test: fix intermitent e2e by:alexm
+-   test: fix vnSearchbar adapt to vnTable (origin/7648_dev_customerEntries) by:alexm
+
+# 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 +677,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
+
+

commitlint.config.js

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

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.42.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -13,7 +13,10 @@
         "test:e2e:ci": "cd ../salix && gulp docker && cd ../salix-front && cypress run",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:unit": "vitest",
-        "test:unit:ci": "vitest run"
+        "test:unit:ci": "vitest run",
+        "commitlint": "commitlint --edit",
+        "prepare": "npx husky install",
+        "addReferenceTag": "node .husky/addReferenceTag.js"
     },
     "dependencies": {
         "@quasar/cli": "^2.3.0",
@@ -29,6 +32,8 @@
         "vue-router": "^4.2.1"
     },
     "devDependencies": {
+        "@commitlint/cli": "^19.2.1",
+        "@commitlint/config-conventional": "^19.1.0",
         "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
         "@quasar/app-vite": "^1.7.3",
@@ -41,6 +46,7 @@
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-cypress": "^2.13.3",
         "eslint-plugin-vue": "^9.14.1",
+        "husky": "^8.0.0",
         "postcss": "^8.4.23",
         "prettier": "^2.8.8",
         "vitest": "^0.31.1"

quasar.config.js

@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.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,13 +1,14 @@
 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();
+const baseUrl = '/api/';
 
-axios.defaults.baseURL = '/api/';
+axios.defaults.baseURL = baseUrl;
+const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
     const token = session.getToken();
@@ -27,10 +28,7 @@ const onResponse = (response) => {
 
     const isSaveRequest = method === 'patch';
     if (isSaveRequest) {
-        Notify.create({
+        notify('globals.dataSaved', 'positive');
-            message: t('globals.dataSaved'),
-            type: 'positive',
-        });
     }
 
     return response;
@@ -47,6 +45,15 @@ const onResponseError = (error) => {
     }
 
     switch (response?.status) {
+        case 422:
+            if (error.name == 'ValidationError')
+                message +=
+                    ' "' +
+                    responseError.details.context +
+                    '.' +
+                    Object.keys(responseError.details.codes).join(',') +
+                    '"';
+            break;
         case 500:
             message = 'errors.statusInternalServerError';
             break;
@@ -59,23 +66,22 @@ const onResponseError = (error) => {
     }
 
     if (session.isLoggedIn() && response?.status === 401) {
-        session.destroy();
+        session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
-        Router.push({ path: url });
+        Router.push(`/login?redirect=${url}`);
     } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }
 
-    Notify.create({
+    notify(message, 'negative');
-        message: t(message),
-        type: 'negative',
-    });
 
     return Promise.reject(error);
 };
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
+axiosNoError.interceptors.request.use(onRequest);
+axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError };
+export { onRequest, onResponseError, axiosNoError };

src/boot/keyShortcut.js

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

src/boot/mainShortcutMixin.js

@@ -0,0 +1,38 @@
+import routes from 'src/router/modules';
+import { useRouter } from 'vue-router';
+
+let isNotified = false;
+
+export default {
+    created: function () {
+        const router = useRouter();
+        const keyBindingMap = routes
+            .filter((route) => route.meta.keyBinding)
+            .reduce((map, route) => {
+                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
+                return map;
+            }, {});
+
+        const handleKeyDown = (event) => {
+            const { ctrlKey, altKey, code } = event;
+
+            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
+                event.preventDefault();
+                router.push(keyBindingMap[code]);
+                isNotified = true;
+            }
+        };
+
+        const handleKeyUp = (event) => {
+            const { ctrlKey, altKey } = event;
+
+            // Resetea la bandera cuando se sueltan las teclas ctrl o alt
+            if (!ctrlKey || !altKey) {
+                isNotified = false;
+            }
+        };
+
+        window.addEventListener('keydown', handleKeyDown);
+        window.addEventListener('keyup', handleKeyUp);
+    },
+};

src/boot/qformMixin.js

@@ -1,21 +1,30 @@
 import { getCurrentInstance } from 'vue';
 
-const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
-const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
-
-
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
-        if (vm.type.name === 'QForm')
+        if (vm.type.name === 'QForm') {
-            if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
+            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
-                // AUTOFOCUS
+                // TODO: AUTOFOCUS IS NOT FOCUSING
-                const elementsArray = Array.from(this.$el.elements);
+                const that = this;
-                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
+                this.$el.addEventListener('keyup', function (evt) {
-
+                    if (evt.key === 'Enter') {
-                if (firstInputElement) {
+                        const input = evt.target;
-                    firstInputElement.focus();
+                        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/boot/quasar.js

@@ -1,6 +1,16 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
+import mainShortcutMixin from './mainShortcutMixin';
+import keyShortcut from './keyShortcut';
+import useNotify from 'src/composables/useNotify.js';
+const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
+    app.mixin(mainShortcutMixin);
+    app.directive('shortcut', keyShortcut);
+    app.config.errorHandler = function (err) {
+        console.error(err);
+        notify('globals.error', 'negative', 'error');
+    };
 });

src/components/CreateBankEntityForm.vue

@@ -1,32 +1,32 @@
 <script setup>
-import { reactive, ref, onMounted, nextTick } from 'vue';
+import { reactive, ref, onMounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
+import { useState } from 'src/composables/useState';
 
-const props = defineProps({
+defineProps({ showEntityField: { type: Boolean, default: true } });
-    showEntityField: {
-        type: Boolean,
-        default: true,
-    },
-});
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: null,
+    countryFk: customer.value?.countryFk,
     id: null,
 });
 
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
 };
 
 const countriesOptions = ref([]);
@@ -57,33 +57,29 @@ onMounted(async () => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
-                <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">
+            <VnRow>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('country')"
                         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

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import VnInputDate from './common/VnInputDate.vue';
@@ -46,18 +46,6 @@ const onDataSaved = async (formData, requestResponse) => {
         @on-fetch="(data) => (taxAreasOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Tickets"
-        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
-        @on-fetch="(data) => (ticketsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Clients"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (clientsOptions = data)"
-        auto-load
-    />
     <FormModelPopup
         ref="formModelPopupRef"
         :title="t('Create manual invoice')"
@@ -71,72 +59,65 @@ const onDataSaved = async (formData, requestResponse) => {
                 <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
                 {{ t('Invoicing in progress...') }}
             </span>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
-                <div class="col">
+                <VnSelect
-                    <VnSelectFilter
+                    :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"
+                    url="Tickets"
-                    >
+                    :where="{ refFk: null }"
-                        <template #option="scope">
+                    :fields="['id', 'nickname']"
-                            <QItem v-bind="scope.itemProps">
+                    :filter-options="{ order: 'shipped DESC' }"
-                                <QItemSection>
+                >
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                    <template #option="scope">
-                                    <QItemLabel caption>{{
+                        <QItem v-bind="scope.itemProps">
-                                        scope.opt?.nickname
+                            <QItemSection>
-                                    }}</QItemLabel>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                </QItemSection>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
-                            </QItem>
+                            </QItemSection>
-                        </template>
+                        </QItem>
-                    </VnSelectFilter>
+                    </template>
-                </div>
+                </VnSelect>
                 <span class="row items-center" style="max-width: max-content">{{
                     t('Or')
                 }}</span>
-                <div class="col">
+                <VnSelect
-                    <VnSelectFilter
+                    :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"
+                    url="Clients"
-                    />
+                    :fields="['id', 'name']"
-                </div>
+                    :filter-options="{ order: 'name ASC' }"
-                <div class="col">
+                />
-                    <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
+                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-                </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
-                <div class="col">
+                <VnSelect
-                    <VnSelectFilter
+                    :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"
+                <VnSelect
-                    />
+                    :label="t('Area')"
-                </div>
+                    :options="taxAreasOptions"
-                <div class="col">
+                    hide-selected
-                    <VnSelectFilter
+                    option-label="code"
-                        :label="t('Area')"
+                    option-value="code"
-                        :options="taxAreasOptions"
+                    v-model="data.taxArea"
-                        hide-selected
+                />
-                        option-label="code"
-                        option-value="code"
-                        v-model="data.taxArea"
-                        :required="true"
-                    />
-                </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Reference')"
                     type="textarea"

src/components/CreateNewCityForm.vue

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

src/components/CreateNewExpenseForm.vue

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

src/components/CreateNewPostcodeForm.vue

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

src/components/CreateNewProvinceForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -16,11 +16,23 @@ const provinceFormData = reactive({
     name: null,
     autonomyFk: null,
 });
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const autonomiesOptions = ref([]);
 
-const onDataSaved = (dataSaved) => {
+const onDataSaved = (dataSaved, requestResponse) => {
-    emit('onDataSaved', dataSaved);
+    requestResponse.autonomy = autonomiesOptions.value.find(
+        (autonomy) => autonomy.id == requestResponse.autonomyFk
+    );
+    emit('onDataSaved', dataSaved, requestResponse);
 };
 </script>
 
@@ -28,7 +40,12 @@ const onDataSaved = (dataSaved) => {
     <FetchData
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
-        url="Autonomies"
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
+        url="Autonomies/location"
     />
     <FormModelPopup
         :title="t('New province')"
@@ -36,28 +53,33 @@ const onDataSaved = (dataSaved) => {
         url-create="provinces"
         model="province"
         :form-initial-data="provinceFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
-                <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"
-                    <VnSelectFilter
+                    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"
+                    <template #option="{ itemProps, opt }">
-                        :rules="validate('province.autonomyFk')"
+                        <QItem v-bind="itemProps">
-                    />
+                            <QItemSection>
-                </div>
+                                <QItemLabel>{{ opt.name }}</QItemLabel>
+                                <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CreateThermographForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -50,55 +50,46 @@ const onDataSaved = (dataSaved) => {
         model="thermograph"
         :title="t('New thermograph')"
         :form-initial-data="thermographFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="(_, response) => onDataSaved(response)"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
-                <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
-                    <VnSelectFilter
+                    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
-                    <VnSelectFilter
+                    :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"
-                    <VnSelectFilter
+                    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, onBeforeRouteLeave } 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,27 +93,47 @@ defineExpose({
     hasChanges,
     saveChanges,
     getChanges,
+    formData,
+    vnPaginateRef,
+});
+
+onBeforeRouteLeave((to, from, next) => {
+    if (hasChanges.value)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
+                promise: () => next(),
+            },
+        });
+    else next();
 });
 
 async function fetch(data) {
+    resetData(data);
+    emit('onFetch', data);
+    return data;
+}
+
+function resetData(data) {
+    if (!data) return;
     if (data && Array.isArray(data)) {
         let $index = 0;
         data.map((d) => (d.$index = $index++));
     }
+    originalData.value = JSON.parse(JSON.stringify(data));
+    formData.value = JSON.parse(JSON.stringify(data));
 
-    originalData.value = data && JSON.parse(JSON.stringify(data));
+    if (watchChanges.value) watchChanges.value(); //destoy watcher
-    formData.value = data && JSON.parse(JSON.stringify(data));
+    watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
-    watch(formData, () => (hasChanges.value = true), { deep: true });
-
-    emit('onFetch', data);
-    return data;
 }
 
 async function reset() {
     await fetch(originalData.value);
     hasChanges.value = false;
 }
-// eslint-disable-next-line vue/no-dupe-keys
+
 function filter(value, update, filterOptions) {
     update(
         () => {
@@ -124,11 +156,21 @@ async function onSubmit() {
         });
     }
     isLoading.value = true;
-    await saveChanges();
+    await saveChanges($props.saveFn ? formData.value : null);
+}
+
+async function onSubmitAndGo() {
+    await onSubmit();
+    push({ path: $props.goTo });
 }
 
 async function saveChanges(data) {
-    if ($props.saveFn) return $props.saveFn(data, getChanges);
+    if ($props.saveFn) {
+        $props.saveFn(data, getChanges);
+        isLoading.value = false;
+        hasChanges.value = false;
+        return;
+    }
     const changes = data || getChanges();
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
@@ -147,11 +189,11 @@ async function saveChanges(data) {
     });
 }
 
-async function insert() {
+async function insert(pushData = $props.dataRequired) {
     const $index = formData.value.length
         ? formData.value[formData.value.length - 1].$index + 1
         : 0;
-    formData.value.push(Object.assign({ $index }, $props.dataRequired));
+    formData.value.push(Object.assign({ $index }, pushData));
     hasChanges.value = true;
 }
 
@@ -192,6 +234,8 @@ async function remove(data) {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
+    } else {
+        reset();
     }
     emit('update:selected', []);
 }
@@ -253,8 +297,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 () => {
@@ -266,10 +311,11 @@ watch(formUrl, async () => {
     <VnPaginate
         :url="url"
         :limit="limit"
-        v-bind="$attrs"
         @on-fetch="fetch"
+        @on-change="fetch"
         :skeleton="false"
         ref="vnPaginateRef"
+        v-bind="$attrs"
     >
         <template #body v-if="formData">
             <slot
@@ -280,8 +326,11 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable v-if="!formData" />
+    <SkeletonTable
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+        v-if="!formData && $attrs.autoLoad"
+        :columns="$attrs.columns?.length"
+    />
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn
@@ -304,7 +353,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"
@@ -312,7 +394,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                v-if="$props.defaultSave"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/EditPictureForm.vue

@@ -2,7 +2,7 @@
 import { reactive, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -155,7 +155,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" />
@@ -245,62 +245,56 @@ const makeRequest = async () => {
                 </div>
 
                 <div class="column">
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
-                        <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">
+                    <VnRow>
-                        <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">
+                    <VnRow>
-                        <div class="col">
+                        <VnSelect
-                            <VnSelectFilter
+                            :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

@@ -2,7 +2,7 @@
 import { ref, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -36,7 +36,7 @@ const inputs = {
     number: markRaw(VnInput),
     date: markRaw(VnInputDate),
     checkbox: markRaw(QCheckbox),
-    select: markRaw(VnSelectFilter),
+    select: markRaw(VnSelect),
 };
 
 const newValue = ref(null);
@@ -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" />
@@ -82,8 +82,8 @@ const closeForm = () => {
             <span class="title">{{ t('Edit') }}</span>
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Field to edit')"
                     :options="fieldsOptions"
                     hide-selected

src/components/FetchData.vue

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

src/components/FilterItemForm.vue

@@ -1,21 +1,26 @@
 <script setup>
 import { ref, reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 
+const props = defineProps({
+    url: {
+        type: String,
+        required: true,
+    },
+});
+
 const emit = defineEmits(['itemSelected']);
 
 const { t } = useI18n();
-const route = useRoute();
 
 const itemFilter = {
     include: [
@@ -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">
+            <VnRow>
-                <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"
-                    <VnSelectFilter
+                    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"
-                    <VnSelectFilter
+                    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">
-                    <VnSelectFilter
-                        :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

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -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">
+            <VnRow>
-                <div class="col">
+                <VnSelect
-                    <VnSelectFilter
+                    :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"
-                    <VnSelectFilter
+                    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"
-                    <VnSelectFilter
+                    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,14 +11,18 @@ import useNotify from 'src/composables/useNotify.js';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
 
+const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
-
+const route = useRoute();
+const myForm = ref(null);
 const $props = defineProps({
     url: {
         type: String,
@@ -26,7 +30,7 @@ const $props = defineProps({
     },
     model: {
         type: String,
-        default: '',
+        default: null,
     },
     filter: {
         type: Object,
@@ -74,40 +78,98 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    goTo: {
+        type: String,
+        default: '',
+        description: 'It is used for redirect on click "save and continue"',
+    },
+    reload: {
+        type: Boolean,
+        default: false,
+    },
+    defaultTrim: {
+        type: Boolean,
+        default: true,
+    },
 });
-
 const emit = defineEmits(['onFetch', 'onDataSaved']);
-
+const modelValue = computed(
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
+).value;
 const componentIsRendered = ref(false);
+const arrayData = useArrayData(modelValue);
+const isLoading = ref(false);
+// Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
+const isResetting = ref(false);
+const hasChanges = ref(!$props.observeFormChanges);
+const originalData = ref({});
+const formData = computed(() => state.get(modelValue));
+const defaultButtons = computed(() => ({
+    save: {
+        color: 'primary',
+        icon: 'save',
+        label: 'globals.save',
+        click: () => myForm.value.submit(),
+        type: 'submit',
+    },
+    reset: {
+        color: 'primary',
+        icon: 'restart_alt',
+        label: 'globals.reset',
+        click: () => 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();
+        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
+    }
     if ($props.observeFormChanges) {
-        setTimeout(() => {
+        watch(
-            startFormWatcher();
+            () => formData.value,
-        }, 100);
+            (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(
+    () => [$props.url, $props.filter],
+    async () => {
+        originalData.value = null;
+        reset();
+        await fetch();
+    }
+);
+
 onBeforeRouteLeave((to, from, next) => {
     if (hasChanges.value && $props.observeFormChanges)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('Unsaved changes will be lost'),
+                title: t('globals.unsavedPopup.title'),
-                message: t('Are you sure exit without saving?'),
+                message: t('globals.unsavedPopup.subtitle'),
                 promise: () => next(),
             },
         });
@@ -116,92 +178,60 @@ 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 {
+        formData.value = trimData(formData.value);
         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;
@@ -223,21 +253,34 @@ function filter(value, update, filterOptions) {
     );
 }
 
-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);
+}
+
+function trimData(data) {
+    if (!$props.defaultTrim) return data;
+    for (const key in data) {
+        if (typeof data[key] == 'string') data[key] = data[key].trim();
+    }
+    return data;
+}
 
 defineExpose({
     save,
     isLoading,
     hasChanges,
+    reset,
+    fetch,
 });
 </script>
 <template>
     <div class="column items-center full-width">
         <QForm
+            ref="myForm"
             v-if="formData"
             @submit="save"
             @reset="reset"
@@ -246,42 +289,78 @@ defineExpose({
         >
             <QCard>
                 <slot
+                    v-if="formData"
                     name="form"
                     :data="formData"
                     :validate="validate"
                     :filter="filter"
                 />
+                <SkeletonForm v-else />
             </QCard>
         </QForm>
     </div>
     <Teleport
         to="#st-actions"
-        v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
+        v-if="
+            $props.defaultActions &&
+            stateStore?.isSubToolbarShown() &&
+            componentIsRendered
+        "
     >
-        <div v-if="$props.defaultActions">
+        <QBtnGroup push class="q-gutter-x-sm">
-            <QBtnGroup push class="q-gutter-x-sm">
+            <slot name="moreActions" />
-                <slot name="moreActions" />
+            <QBtn
-                <QBtn
+                :label="tMobile(defaultButtons.reset.label)"
-                    :label="tMobile(defaultButtons.reset.label)"
+                :color="defaultButtons.reset.color"
-                    :color="defaultButtons.reset.color"
+                :icon="defaultButtons.reset.icon"
-                    :icon="defaultButtons.reset.icon"
+                flat
-                    flat
+                @click="defaultButtons.reset.click"
-                    @click="reset"
+                :disable="!hasChanges"
-                    :disable="!hasChanges"
+                :title="t(defaultButtons.reset.label)"
-                    :title="t(defaultButtons.reset.label)"
+            />
-                />
+            <QBtnDropdown
-                <QBtn
+                v-if="$props.goTo"
-                    :label="tMobile(defaultButtons.save.label)"
+                @click="saveAndGo"
-                    :color="defaultButtons.save.color"
+                :label="tMobile('globals.saveAndContinue')"
-                    :icon="defaultButtons.save.icon"
+                :title="t('globals.saveAndContinue')"
-                    @click="save"
+                :disable="!hasChanges"
-                    :disable="!hasChanges"
+                color="primary"
-                    :title="t(defaultButtons.save.label)"
+                icon="save"
-                />
+                split
-            </QBtnGroup>
+            >
-        </div>
+                <QList>
+                    <QItem
+                        clickable
+                        v-close-popup
+                        @click="save"
+                        :title="t('globals.save')"
+                    >
+                        <QItemSection>
+                            <QItemLabel>
+                                <QIcon
+                                    name="save"
+                                    color="white"
+                                    class="q-mr-sm"
+                                    size="sm"
+                                />
+                                {{ t('globals.save').toUpperCase() }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QBtnDropdown>
+            <QBtn
+                v-else
+                :label="tMobile('globals.save')"
+                color="primary"
+                icon="save"
+                @click="defaultButtons.save.click"
+                :disable="!hasChanges"
+                :title="t(defaultButtons.save.label)"
+            />
+        </QBtnGroup>
     </Teleport>
-    <SkeletonForm v-if="!formData" />
+
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"
@@ -302,8 +381,3 @@ defineExpose({
     padding: 32px;
 }
 </style>
-<i18n>
-es:
-    Unsaved changes will be lost: Los cambios que no haya guardado se perderán
-    Are you sure exit without saving?: ¿Seguro que quiere salir sin guardar?
-</i18n>

src/components/FormModelPopup.vue

@@ -4,9 +4,9 @@ import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
 
-const emit = defineEmits(['onDataSaved']);
+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,29 +23,24 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
+    if (closeButton.value) closeButton.value.click();
     emit('onDataSaved', formData, requestResponse);
-    closeForm();
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
 
-const closeForm = async () => {
-    if (closeButton.value) closeButton.value.click();
-};
-
 defineExpose({
     isLoading,
+    onDataSaved,
 });
 </script>
 
 <template>
     <FormModel
         ref="formModelRef"
-        :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :default-actions="false"
-        :url-create="urlCreate"
+        v-bind="$attrs"
-        :model="model"
         @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
@@ -84,6 +59,7 @@ defineExpose({
                     flat
                     :disabled="isLoading"
                     :loading="isLoading"
+                    @click="emit('onDataCanceled')"
                     v-close-popup
                 />
                 <QBtn
@@ -91,6 +67,7 @@ defineExpose({
                     :title="t('globals.save')"
                     type="submit"
                     color="primary"
+                    class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                 />

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/ItemsFilterPanel.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 import axios from 'axios';
@@ -112,6 +112,7 @@ const getCategoryClass = (category, params) => {
 
 const getSelectedTagValues = async (tag) => {
     try {
+        if (!tag?.selectedTag?.id) return;
         tag.value = null;
         const filter = {
             fields: ['value'],
@@ -158,8 +159,8 @@ const removeTag = (index, params, search) => {
     />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :expr-builder="exprBuilder"
+        :expr-builder="props.exprBuilder"
-        :custom-tags="customTags"
+        :custom-tags="props.customTags"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
@@ -207,7 +208,7 @@ const removeTag = (index, params, search) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.typeFk')"
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
@@ -235,7 +236,7 @@ const removeTag = (index, params, search) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QSeparator />
@@ -246,7 +247,7 @@ const removeTag = (index, params, search) => {
                 class="q-mt-md filter-value"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
@@ -261,7 +262,7 @@ const removeTag = (index, params, search) => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!value?.selectedTag?.isFree && value.valueOptions"
                         :label="t('components.itemsFilterPanel.value')"
                         v-model="value.value"
@@ -296,11 +297,12 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
+                <QBtn
-                    name="add_circle"
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="fill-icon-on-hover q-px-xs"
                     color="primary"
-                    size="sm"
                     @click="tagValues.push({})"
                 />
             </QItem>

src/components/LeftMenu.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, ref, reactive } from 'vue';
+import { onMounted, watch, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -29,6 +29,15 @@ onMounted(async () => {
     getRoutes();
 });
 
+watch(
+    () => route.matched,
+    () => {
+        items.value = [];
+        getRoutes();
+    },
+    { deep: true }
+);
+
 function findMatches(search, item) {
     const matches = [];
     function findRoute(search, item) {
@@ -58,6 +67,7 @@ function addChildren(module, route, parent) {
 }
 
 const items = ref([]);
+
 function getRoutes() {
     if (props.source === 'main') {
         const modules = Object.assign([], navigation.getModules().value);
@@ -66,9 +76,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,16 +20,32 @@ const itemComputed = computed(() => {
 });
 </script>
 <template>
-    <QItem active-class="bg-hover" :to="{ name: itemComputed.name }" clickable v-ripple>
+    <QItem
+        active-class="bg-vn-hover"
+        class="min-height"
+        :to="{ name: itemComputed.name }"
+        clickable
+        v-ripple
+    >
         <QItemSection avatar v-if="itemComputed.icon">
             <QIcon :name="itemComputed.icon" />
         </QItemSection>
         <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
+        <QItemSection>
+            {{ t(itemComputed.title) }}
+            <QTooltip v-if="item.keyBinding">
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
+            </QTooltip>
+        </QItemSection>
         <QItemSection side>
             <slot name="side" :item="itemComputed" />
         </QItemSection>
     </QItem>
 </template>
+<style lang="scss" scoped>
+.q-item {
+    min-height: 5vh;
+}
+</style>

src/components/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 VnAvatar from './ui/VnAvatar.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());
@@ -26,7 +24,13 @@ const pinnedModulesRef = ref();
 <template>
     <QHeader color="white" elevated>
         <QToolbar class="q-py-sm q-px-md">
-            <QBtn @click="stateStore.toggleLeftDrawer()" icon="menu" round dense flat>
+            <QBtn
+                @click="stateStore.toggleLeftDrawer()"
+                icon="dock_to_right"
+                round
+                dense
+                flat
+            >
                 <QTooltip bottom anchor="bottom right">
                     {{ t('globals.collapseMenu') }}
                 </QTooltip>
@@ -74,21 +78,13 @@ const pinnedModulesRef = ref();
                     </QTooltip>
                     <PinnedModules ref="pinnedModulesRef" />
                 </QBtn>
-                <QBtn
+                <QBtn class="q-pa-none" rounded dense flat no-wrap id="user">
-                    :class="{ 'q-pa-none': quasar.platform.is.mobile }"
+                    <VnAvatar
-                    rounded
+                        :worker-id="user.id"
-                    dense
+                        :title="user.name"
-                    flat
+                        size="lg"
-                    no-wrap
+                        color="transparent"
-                    id="user"
+                    />
-                >
-                    <QAvatar size="lg">
-                        <QImg
-                            :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                            spinner-color="primary"
-                        >
-                        </QImg>
-                    </QAvatar>
                     <QTooltip bottom>
                         {{ t('globals.userPanel') }}
                     </QTooltip>

src/components/RefundInvoiceForm.vue

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

src/components/RegularizeStockForm.vue

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

src/components/TransferInvoiceForm.vue

@@ -2,12 +2,12 @@
 import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
+import { useQuasar, useDialogPluginComponent } from 'quasar';
+import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -18,33 +18,64 @@ const $props = defineProps({
     },
 });
 
+const { dialogRef } = useDialogPluginComponent();
+const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
 
-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 checked = ref(true);
+const transferInvoiceParams = reactive({
+    id: $props.invoiceOutData?.id,
+});
 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,
+        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
+        invoiceCorrectionTypeFk: transferInvoiceParams.invoiceCorrectionTypeFk,
+        newClientFk: transferInvoiceParams.newClientFk,
+        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/transfer', 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 +83,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
@@ -75,16 +114,16 @@ const transferInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
-    <FormPopup
+    <QDialog ref="dialogRef">
-        @on-submit="transferInvoice()"
+        <FormPopup
-        :title="t('Transfer invoice')"
+            @on-submit="makeInvoice()"
-        :custom-submit-button-label="t('Transfer client')"
+            :title="t('Transfer invoice')"
-        :default-cancel-button="false"
+            :custom-submit-button-label="t('Transfer client')"
-    >
+            :default-cancel-button="false"
-        <template #form-inputs>
+        >
-            <VnRow class="row q-gutter-md q-mb-md">
+            <template #form-inputs>
-                <div class="col">
+                <VnRow>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -92,21 +131,24 @@ const transferInvoice = async () => {
                         option-value="id"
                         v-model="transferInvoiceParams.newClientFk"
                         :required="true"
+                        url="Clients"
+                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
+                        auto-load
                     >
                         <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
+                            <QItem
+                                v-bind="scope.itemProps"
+                                @click="selectedClient(scope.opt)"
+                            >
                                 <QItemSection>
                                     <QItemLabel>
-                                        #{{ scope.opt?.id }} -
+                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
-                                        {{ scope.opt?.name }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
-                </div>
+                    <VnSelect
-                <div class="col">
-                    <VnSelectFilter
                         :label="t('Rectificative type')"
                         :options="rectificativeTypeOptions"
                         hide-selected
@@ -115,11 +157,9 @@ const transferInvoice = async () => {
                         v-model="transferInvoiceParams.cplusRectificationTypeFk"
                         :required="true"
                     />
-                </div>
+                </VnRow>
-            </VnRow>
+                <VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
-                <div class="col">
-                    <VnSelectFilter
                         :label="t('Class')"
                         :options="siiTypeInvoiceOutsOptions"
                         hide-selected
@@ -138,10 +178,8 @@ const transferInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
-                </div>
+                    <VnSelect
-                <div class="col">
-                    <VnSelectFilter
                         :label="t('Type')"
                         :options="invoiceCorrectionTypesOptions"
                         hide-selected
@@ -150,13 +188,28 @@ const transferInvoice = async () => {
                         v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
                         :required="true"
                     />
-                </div>
+                </VnRow>
-            </VnRow>
+                <VnRow>
-        </template>
+                    <div>
-    </FormPopup>
+                        <QCheckbox
+                            :label="t('Bill destination client')"
+                            v-model="checked"
+                        />
+                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+            </template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
+en:
+    checkInfo: New tickets from the destination customer will be generated in the consignee by default.
+    transferInvoiceInfo: Destination customer is marked to bill in the consignee
+    confirmTransferInvoice: The destination customer has selected to bill in the consignee, do you want to continue?
 es:
     Transfer invoice: Transferir factura
     Transfer client: Transferir cliente
@@ -165,4 +218,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';
@@ -7,17 +7,21 @@ import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+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 { useRole } from 'src/composables/useRole';
+import VnAvatar from './ui/VnAvatar.vue';
+import useNotify from 'src/composables/useNotify';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
-import { useClipboard } from 'src/composables/useClipboard';
-import { ref } from 'vue';
 const { copyText } = useClipboard();
+const { notify } = useNotify();
+
 const userLocale = computed({
     get() {
         return locale.value;
@@ -48,10 +52,10 @@ const darkMode = computed({
 });
 
 const user = state.getUser();
-const token = session.getTokenMultimedia();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
+const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -69,18 +73,28 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    await axios.patch(query, {
+    try {
-        darkMode: value,
+        await axios.patch(query, {
-    });
+            darkMode: value,
-    user.value.darkMode = value;
+        });
+        user.value.darkMode = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    await axios.patch(query, {
+    try {
-        lang: value,
+        await axios.patch(query, {
-    });
+            lang: value,
-    user.value.lang = value;
+        });
+        user.value.lang = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
 
 function logout() {
@@ -91,6 +105,28 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
+
+function localUserData() {
+    state.setUser(user.value);
+}
+
+async function saveUserData(param, value) {
+    try {
+        await axios.post('UserConfigs/setUserConfig', { [param]: value });
+        localUserData();
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
+}
+
+const onDataSaved = () => {
+    notify('globals.dataSaved', 'positive');
+};
+
+const onDataError = () => {
+    notify('errors.updateUserConfig', 'negative');
+};
 </script>
 
 <template>
@@ -101,12 +137,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)"
@@ -123,7 +161,7 @@ function copyUserToken() {
                     @update:model-value="saveLanguage"
                     :label="t(`globals.lang['${userLocale}']`)"
                     icon="public"
-                    color="orange"
+                    color="primary"
                     false-value="es"
                     true-value="en"
                 />
@@ -132,7 +170,7 @@ function copyUserToken() {
                     @update:model-value="saveDarkMode"
                     :label="t(`globals.darkMode`)"
                     checked-icon="dark_mode"
-                    color="orange"
+                    color="primary"
                     unchecked-icon="light_mode"
                 />
             </div>
@@ -140,13 +178,20 @@ function copyUserToken() {
             <QSeparator vertical inset class="q-mx-lg" />
 
             <div class="col column items-center q-mb-sm">
-                <QAvatar size="80px">
+                <VnAvatar
-                    <QImg
+                    :worker-id="user.id"
-                        :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
+                    :title="user.name"
-                        spinner-color="white"
+                    size="xxl"
-                    />
+                    color="transparent"
-                </QAvatar>
+                />
-
+                <QBtn
+                    v-if="isEmployee"
+                    class="q-mt-sm q-px-md"
+                    :to="`/worker/${user.id}`"
+                    color="primary"
+                    :label="t('globals.myAccount')"
+                    dense
+                />
                 <div class="text-subtitle1 q-mt-md">
                     <strong>{{ user.nickname }}</strong>
                 </div>
@@ -158,7 +203,7 @@ function copyUserToken() {
                 </div>
                 <QBtn
                     id="logout"
-                    color="orange"
+                    color="primary"
                     flat
                     :label="t('globals.logOut')"
                     size="sm"
@@ -172,42 +217,61 @@ function copyUserToken() {
         <QSeparator inset class="q-mx-lg" />
         <div class="col q-gutter-xs q-pa-md">
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.localWarehouse')"
                     v-model="user.localWarehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
-                />
+                    input-debounce="0"
-                <VnSelectFilter
-                    :label="t('components.userPanel.localBank')"
                     hide-selected
+                    @update:model-value="localUserData"
+                />
+                <VnSelect
+                    :label="t('components.userPanel.localBank')"
                     v-model="user.localBankFk"
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
-                ></VnSelectFilter>
+                    input-debounce="0"
+                    hide-selected
+                    @update:model-value="localUserData"
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `${opt.id}: ${opt.bank}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <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"
                 />
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
                     hide-selected
                     v-model="user.warehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
+                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
                 />
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.userCompany')"
                     hide-selected
                     v-model="user.companyFk"
@@ -215,6 +279,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/VnSelectProvince.vue

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

src/components/VnTable/VnChip.vue

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

src/components/VnTable/VnColumn.vue

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

src/components/VnTable/VnFilter.vue

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

src/components/VnTable/VnOrder.vue

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

src/components/VnTable/VnTable.vue

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

src/components/VnTable/VnVisibleColumn.vue

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

src/components/common/RightMenu.vue

@@ -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="dock_to_left"
+            >
+                <QTooltip bottom anchor="bottom right">
+                    {{ t('globals.collapseMenu') }}
+                </QTooltip>
+            </QBtn>
+        </div>
+    </Teleport>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit">
+            <div id="right-panel"></div>
+            <slot v-if="!hasContent" name="right-panel" />
+        </QScrollArea>
+    </QDrawer>
+</template>

src/components/common/SendEmailDialog.vue

@@ -29,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/TableVisibleColumns.vue

@@ -52,7 +52,7 @@ const toggleMarkAll = (val) => {
 
 const getConfig = async (url, filter) => {
     const response = await axios.get(url, {
-        params: { filter: filter },
+        params: { filter: JSON.stringify(filter) },
     });
     return response.data && response.data.length > 0 ? response.data[0] : null;
 };
@@ -60,7 +60,7 @@ const getConfig = async (url, filter) => {
 const fetchViewConfigData = async () => {
     try {
         const userConfigFilter = {
-            where: { tableCode: $props.tableCode, userFk: user.id },
+            where: { tableCode: $props.tableCode, userFk: user.value.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
@@ -74,11 +74,17 @@ const fetchViewConfigData = async () => {
         const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
         if (defaultConfig) {
+            // Si el backend devuelve una configuración por defecto la usamos
             setUserConfigViewData(defaultConfig.columns);
             return;
+        } else {
+            // Si no hay configuración por defecto mostramos todas las columnas
+            const defaultColumns = {};
+            $props.allColumns.forEach((col) => (defaultColumns[col] = true));
+            setUserConfigViewData(defaultColumns);
         }
     } catch (err) {
-        console.err('Error fetching config view data', err);
+        console.error('Error fetching config view data', err);
     }
 };
 

src/components/common/VnBreadcrumbs.vue

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

src/components/common/VnCard.vue

@@ -1,77 +1,89 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
-import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { useRoute, useRouter, 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 },
     baseUrl: { type: String, default: undefined },
     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 },
-    searchbarLabel: { type: String, default: '' },
+    searchbarProps: { type: Object, default: undefined },
-    searchbarInfo: { type: String, default: '' },
+    redirectOnError: { type: Boolean, default: false },
 });
 
-const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
+const router = useRouter();
 const url = computed(() => {
-    if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
+    if (props.baseUrl) {
+        return `${props.baseUrl}/${route.params.id}`;
+    }
     return props.customUrl;
 });
-
+const searchRightDataKey = computed(() => {
+    if (!props.searchDataKey) return route.name;
+    return props.searchDataKey;
+});
 const arrayData = useArrayData(props.dataKey, {
     url: url.value,
     filter: props.filter,
 });
 
 onBeforeMount(async () => {
-    if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+    try {
-    await arrayData.fetch({ append: false });
+        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        await arrayData.fetch({ append: false, updateRouter: false });
+    } catch {
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+        router.push({ path: path.replace(/:id.*/, '') });
+    }
 });
 
 if (props.baseUrl) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${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" v-bind="props.searchbarProps" />
+    </slot>
+    <RightMenu>
+        <template #right-panel v-if="props.filterPanel">
+            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
+        </template>
+    </RightMenu>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView />
+                <RouterView :key="route.path" />
             </div>
         </QPage>
     </QPageContainer>

src/components/common/VnChangePassword.vue

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

src/components/common/VnComponent.vue

@@ -0,0 +1,59 @@
+<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, Boolean],
+        default: () => {},
+    },
+});
+
+const componentArray = computed(() => {
+    if (typeof $props.prop === 'object') return [$props.prop];
+    return $props.prop;
+});
+
+function mix(toComponent) {
+    const { component, attrs, event } = toComponent;
+    const customComponent = $props.components[component];
+    return {
+        component: customComponent?.component ?? component,
+        attrs: {
+            ...toValueAttrs(attrs),
+            ...toValueAttrs(customComponent?.attrs),
+            ...toComponent,
+            ...toValueAttrs(customComponent?.forceAttrs),
+        },
+        event: { ...customComponent?.event, ...event },
+    };
+}
+
+function toValueAttrs(attrs) {
+    if (!attrs) return;
+    return typeof attrs == 'function' ? attrs($props.value) : attrs;
+}
+</script>
+<template>
+    <span
+        v-for="toComponent of componentArray"
+        :key="toComponent.name"
+        class="column flex-center fit"
+    >
+        <component
+            v-if="toComponent?.component"
+            :is="mix(toComponent).component"
+            v-bind="mix(toComponent).attrs"
+            v-on="mix(toComponent).event ?? {}"
+            v-model="model"
+        />
+    </span>
+</template>

src/components/common/VnCurrency.vue

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

src/components/common/VnDms.vue

@@ -6,7 +6,7 @@ import axios from 'axios';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from 'components/FormModelPopup.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() {
@@ -123,7 +124,7 @@ function addDefaultData(data) {
             <div class="q-gutter-y-ms">
                 <VnRow>
                     <VnInput :label="t('globals.reference')" v-model="dms.reference" />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.company')"
                         v-model="dms.companyFk"
                         :options="companies"
@@ -133,7 +134,7 @@ function addDefaultData(data) {
                     />
                 </VnRow>
                 <VnRow>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.warehouse')"
                         v-model="dms.warehouseFk"
                         :options="warehouses"
@@ -141,7 +142,7 @@ function addDefaultData(data) {
                         option-label="name"
                         input-debounce="0"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.type')"
                         v-model="dms.dmsTypeFk"
                         :options="dmsTypes"

src/components/common/VnDmsList.vue

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

src/components/common/VnInput.vue

@@ -1,8 +1,14 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useValidator } from 'src/composables/useValidator';
 
-const emit = defineEmits(['update:modelValue', 'update:options', 'keyup.enter']);
+const emit = defineEmits([
+    'update:modelValue',
+    'update:options',
+    'keyup.enter',
+    'remove',
+]);
 
 const $props = defineProps({
     modelValue: {
@@ -13,10 +19,20 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    info: {
+        type: String,
+        default: '',
+    },
+    clearable: {
+        type: Boolean,
+        default: true,
+    },
 });
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+
 const vnInputRef = ref(null);
 const value = computed({
     get() {
@@ -37,14 +53,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const onEnterPress = () => {
-    emit('keyup.enter');
-};
-
-const handleValue = (val = null) => {
-    value.value = val;
-};
-
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -52,36 +60,94 @@ const focus = () => {
 defineExpose({
     focus,
 });
+import { useAttrs } from 'vue';
+const $attrs = useAttrs();
+
+const mixinRules = [
+    requiredFieldRule,
+    ...($attrs.rules ?? []),
+    (val) => {
+        const { min, max } = vnInputRef.value.$attrs;
+        if (!min) return null;
+        if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+        if (!max) return null;
+        if (max > 0) {
+            if (Math.floor(val) > max) return t('inputMax', { value: max });
+        }
+    },
+];
 </script>
 
 <template>
-    <div
+    <div @mouseover="hover = true" @mouseleave="hover = false">
-        @mouseover="hover = true"
-        @mouseleave="hover = false"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
-    >
         <QInput
             ref="vnInputRef"
             v-model="value"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
             :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
             :clearable="false"
+            :rules="mixinRules"
+            :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" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
+                    v-if="hover && value && !$attrs.disabled && $props.clearable"
-                    @click="handleValue(null)"
+                    @click="
+                        () => {
+                            value = null;
+                            vnInputRef.focus();
+                            emit('remove');
+                        }
+                    "
                 ></QIcon>
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
+                <QIcon v-if="info" name="info">
+                    <QTooltip max-width="350px">
+                        {{ info }}
+                    </QTooltip>
+                </QIcon>
             </template>
         </QInput>
     </div>
 </template>
+<i18n>
+    en:
+        inputMin: Must be more than {value}
+        inputMax: Must be less than {value}
+    es:
+        inputMin: Debe ser mayor a {value}
+        inputMax: Debe ser menor a {value}
+</i18n>
+<style lang="scss">
+.q-field__append {
+    padding-inline: 0;
+}
+
+.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: 20px;
+}
+.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: auto;
+}
+.q-field__control {
+    height: unset;
+}
+
+.q-field--labeled {
+    .q-field__native,
+    .q-field__prefix,
+    .q-field__suffix,
+    .q-field__input {
+        padding-bottom: 0;
+        min-height: 15px;
+    }
+}
+</style>

src/components/common/VnInputDate.vue

@@ -1,73 +1,85 @@
 <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';
+import { useAttrs } from 'vue';
 
-const props = defineProps({
+const model = defineModel({ type: [String, Date] });
-    modelValue: {
+const $props = defineProps({
-        type: String,
-        default: null,
-    },
-    readonly: {
-        type: Boolean,
-        default: false,
-    },
     isOutlined: {
         type: Boolean,
         default: false,
     },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
 });
-const hover = ref(false);
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
-const emit = defineEmits(['update:modelValue']);
+const { t } = useI18n();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const vnInputDateRef = ref(null);
 
-const joinDateAndTime = (date, time) => {
+const dateFormat = 'DD/MM/YYYY';
-    if (!date) {
+const isPopupOpen = ref();
-        return null;
+const hover = ref();
-    }
+const mask = ref();
-    if (!time) {
+const $attrs = useAttrs();
-        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 mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
-const value = computed({
+
+const formattedDate = computed({
     get() {
-        return props.modelValue;
+        if (!model.value) return model.value;
+        return date.formatDate(new Date(model.value), dateFormat);
     },
     set(value) {
-        emit('update:modelValue', joinDateAndTime(value, time.value));
+        if (value == model.value) return;
+        let newDate;
+        if (value) {
+            // parse input
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                );
+            }
+            const [year, month, day] = value.split('-').map((e) => parseInt(e));
+            newDate = new Date(year, month - 1, day);
+            if (model.value) {
+                const orgDate =
+                    model.value instanceof Date ? model.value : new Date(model.value);
+
+                newDate.setHours(
+                    orgDate.getHours(),
+                    orgDate.getMinutes(),
+                    orgDate.getSeconds(),
+                    orgDate.getMilliseconds()
+                );
+            }
+        }
+        if (!isNaN(newDate)) model.value = newDate.toISOString();
     },
 });
 
-const isPopupOpen = ref(false);
+const popupDate = computed(() =>
-
+    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
-const onDateUpdate = (date) => {
+);
-    value.value = date;
+onMounted(() => {
-    isPopupOpen.value = false;
+    // fix quasar bug
-};
+    mask.value = '##/##/####';
-
+});
-const padDate = (value) => value.toString().padStart(2, '0');
+watch(
-const formatDate = (dateString) => {
+    () => model.value,
-    const date = new Date(dateString || '');
+    (val) => (formattedDate.value = val),
-    return `${date.getFullYear()}/${padDate(date.getMonth() + 1)}/${padDate(
+    { immediate: true }
-        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,
@@ -80,39 +92,67 @@ const styleAttrs = computed(() => {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputDateRef"
+            v-model="formattedDate"
             class="vn-input-date"
-            readonly
+            :mask="mask"
-            :model-value="displayDate(value)"
+            placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
+            :class="{ required: $attrs.required }"
+            :rules="mixinRules"
+            :clearable="false"
             @click="isPopupOpen = true"
+            hide-bottom-space
         >
             <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"
+                        vnInputDateRef.focus();
-                        transition-hide="scale"
+                        model = null;
-                        :no-parent-event="props.readonly"
+                        isPopupOpen = false;
-                    >
+                    "
-                        <QDate
+                />
-                            :today-btn="true"
+                <QIcon
-                            :model-value="formatDate(value)"
+                    v-if="showEvent"
-                            @update:model-value="onDateUpdate"
+                    name="event"
-                        />
+                    class="cursor-pointer"
-                    </QPopupProxy>
+                    @click="isPopupOpen = !isPopupOpen"
-                </QIcon>
+                    :title="t('Open date')"
+                />
             </template>
+            <QMenu
+                transition-show="scale"
+                transition-hide="scale"
+                v-model="isPopupOpen"
+                anchor="bottom left"
+                self="top start"
+                :no-focus="true"
+                :no-parent-event="true"
+            >
+                <QDate
+                    v-model="popupDate"
+                    :landscape="true"
+                    :today-btn="true"
+                    :options="$attrs.options"
+                    @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;
@@ -122,3 +162,7 @@ const styleAttrs = computed(() => {
     border-style: solid;
 }
 </style>
+<i18n>
+    es:
+        Open date: Abrir fecha
+</i18n>

src/components/common/VnInputNumber.vue

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

src/components/common/VnInputTime.vue

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

src/components/common/VnLocation.vue

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

src/components/common/VnLog.vue

@@ -1,7 +1,7 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
 import { date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -12,13 +12,15 @@ import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
-import VnSelectFilter from './VnSelectFilter.vue';
+import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
+import VnPaginate from '../ui/VnPaginate.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
 const { models } = validationsStore;
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const props = defineProps({
     model: {
@@ -49,6 +51,7 @@ const filter = {
         'changedModelId',
         'changedModelValue',
         'description',
+        'summaryId',
     ],
     include: [
         {
@@ -64,9 +67,10 @@ const filter = {
             },
         },
     ],
+    where: { and: [{ originFk: route.params.id }] },
 };
 
-const workers = ref();
+const paginate = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -212,7 +216,7 @@ function getLogTree(data) {
         }
         nLogs++;
         modelLog.logs.push(log);
-
+        modelLog.summaryId = modelLog.logs[0].summaryId;
         // Changes
         const notDelete = log.action != 'delete';
         const olds = (notDelete ? log.oldInstance : null) || {};
@@ -233,9 +237,7 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree() {
+async function setLogTree(data) {
-    filter.where = { and: [{ originFk: route.params.id }] };
-    const { data } = await getLogs(filter);
     logTree.value = getLogTree(data);
 }
 
@@ -264,15 +266,7 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    const { data } = await getLogs(filter);
+    paginate.value.fetch(filter);
-
-    logTree.value = getLogTree(data);
-}
-
-async function getLogs(filter) {
-    return axios.get(props.url ?? `${props.model}Logs`, {
-        params: { filter: JSON.stringify(filter) },
-    });
 }
 
 function setDate(type) {
@@ -375,406 +369,446 @@ async function clearFilter() {
     await applyFilter();
 }
 
-setLogTree();
+onUnmounted(() => {
+    stateStore.rightDrawer = false;
+});
+
+watch(
+    () => router.currentRoute.value.params.id,
+    () => {
+        applyFilter();
+    }
+);
 </script>
 <template>
-    <FetchData
-        :url="`${props.model}Logs/${route.params.id}/editors`"
-        :filter="{
-            fields: ['id', 'nickname', 'name', 'image'],
-            order: 'nickname',
-            limit: 30,
-        }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
     <FetchData
         :url="`${props.model}Logs/${route.params.id}/models`"
         :filter="{ order: ['changedModel'] }"
         @on-fetch="
             (data) =>
                 (actions = data.map((item) => {
+                    const changedModel = item.changedModel;
                     return {
-                        locale: useCapitalize(validations[item.changedModel].locale.name),
+                        locale: useCapitalize(
-                        value: item.changedModel,
+                            validations[changedModel]?.locale?.name ?? changedModel
+                        ),
+                        value: changedModel,
                     };
                 }))
         "
         auto-load
     />
-    <div
+    <VnPaginate
-        class="column items-center logs origin-log q-mt-md"
+        ref="paginate"
-        v-for="(originLog, originLogIndex) in logTree"
+        :data-key="`${model}Log`"
-        :key="originLogIndex"
+        :url="`${model}Logs`"
+        :filter="filter"
+        :skeleton="false"
+        auto-load
+        @on-fetch="setLogTree"
+        search-url="logs"
     >
-        <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
+        <template #body>
-            <h6 class="origin-id text-grey">
+            <div
-                {{ useCapitalize(validations[props.model].locale.name) }}
+                class="column items-center logs origin-log q-mt-md"
-                #{{ originLog.originFk }}
+                v-for="(originLog, originLogIndex) in logTree"
-            </h6>
+                :key="originLogIndex"
-            <div class="line bg-grey"></div>
+            >
-        </QItem>
+                <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
-        <div
+                    <h6 class="origin-id text-grey">
-            class="user-log q-mb-sm"
+                        {{ useCapitalize(validations[props.model].locale.name) }}
-            v-for="(userLog, userIndex) in originLog.logs"
+                        #{{ originLog.originFk }}
-            :key="userIndex"
+                    </h6>
-        >
+                    <div class="line bg-grey"></div>
-            <div class="timeline">
+                </QItem>
-                <div class="user-avatar">
+                <div
-                    <VnUserLink :worker-id="userLog.user.id">
+                    class="user-log q-mb-sm"
-                        <template #link>
+                    v-for="(userLog, userIndex) in originLog.logs"
-                            <VnAvatar
+                    :key="userIndex"
-                                :class="{ 'cursor-pointer': userLog.user.id }"
-                                :worker-id="userLog.user.id"
-                                :title="userLog.user.nickname"
-                                size="lg"
-                            />
-                        </template>
-                    </VnUserLink>
-                </div>
-                <div class="arrow bg-panel" v-if="byRecord"></div>
-                <div class="line"></div>
-            </div>
-            <QList class="user-changes" v-if="userLog">
-                <QItem
-                    class="model-log column q-px-none q-py-xs"
-                    v-for="(modelLog, modelLogIndex) in userLog.logs"
-                    :key="modelLogIndex"
                 >
-                    <QItemSection>
+                    <div class="timeline">
-                        <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
+                        <div class="user-avatar">
-                            <QChip
+                            <VnUserLink :worker-id="userLog?.user?.id">
-                                dense
+                                <template #link>
-                                size="md"
+                                    <VnAvatar
-                                class="model-name q-mr-xs text-white"
+                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
-                                v-if="
+                                        :worker-id="userLog?.user?.id"
-                                    !(modelLog.changedModel && modelLog.changedModelId) &&
+                                        :title="userLog?.user?.nickname"
-                                    modelLog.model
+                                        :show-letter="!userLog?.user"
-                                "
+                                        size="lg"
-                                :style="{
+                                    />
-                                    backgroundColor: useColor(modelLog.model),
+                                </template>
-                                }"
+                            </VnUserLink>
-                                :title="modelLog.model"
+                        </div>
-                            >
+                        <div class="arrow bg-panel" v-if="byRecord"></div>
-                                {{ t(modelLog.modelI18n) }}
+                        <div class="line"></div>
-                            </QChip>
+                    </div>
-                            <span class="model-id" v-if="modelLog.id"
+                    <QList class="user-changes" v-if="userLog">
-                                >#{{ modelLog.id }}</span
+                        <QItem
-                            >
+                            class="model-log column q-px-none q-py-xs"
-                            <span class="model-value" :title="modelLog.showValue">
+                            v-for="(modelLog, modelLogIndex) in userLog.logs"
-                                {{ modelLog.showValue }}
+                            :key="modelLogIndex"
-                            </span>
-                            <QBtn
-                                flat
-                                round
-                                color="grey"
-                                class="q-mr-xs q-ml-auto"
-                                size="sm"
-                                icon="filter_alt"
-                                :title="t('recordChanges')"
-                                @click.stop="filterByRecord(modelLog)"
-                            />
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QCard
-                            class="changes-log q-py-none q-mb-xs"
-                            v-for="(log, logIndex) in modelLog.logs"
-                            :key="logIndex"
                         >
-                            <QCardSection class="change-info q-pa-none">
+                            <QItemSection>
-                                <QItem
+                                <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
-                                    class="q-px-sm q-py-xs justify-between items-center"
+                                    <QChip
-                                >
+                                        dense
-                                    <div
+                                        size="md"
-                                        class="date text-grey text-caption q-mr-sm"
+                                        class="model-name q-mr-xs text-white"
-                                        :title="
+                                        v-if="
-                                            date.formatDate(
+                                            !(
-                                                log.creationDate,
+                                                modelLog.changedModel &&
-                                                'DD/MM/YYYY hh:mm:ss'
+                                                modelLog.changedModelId
-                                            ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                                            ) && modelLog.model
                                         "
+                                        :style="{
+                                            backgroundColor: useColor(modelLog.model),
+                                        }"
+                                        :title="`${modelLog.model} #${modelLog.id}`"
                                     >
-                                        {{ toRelativeDate(log.creationDate) }}
+                                        {{ t(modelLog.modelI18n) }}
-                                    </div>
+                                    </QChip>
-                                    <div>
+
-                                        <QBtn
-                                            color="grey"
-                                            class="pit"
-                                            icon="preview"
-                                            flat
-                                            round
-                                            :title="t('pointRecord')"
-                                            padding="none"
-                                            v-if="log.action != 'insert'"
-                                            @click.stop="
-                                                openPointRecord(log.id, modelLog)
-                                            "
-                                        >
-                                            <QPopupProxy>
-                                                <QCard v-if="pointRecord">
-                                                    <div
-                                                        class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                                                    >
-                                                        {{ modelLog.modelI18n }}
-                                                        <span v-if="modelLog.id"
-                                                            >#{{ modelLog.id }}</span
-                                                        >
-                                                    </div>
-                                                    <QCardSection
-                                                        class="change-detail q-pa-sm"
-                                                    >
-                                                        <QItem
-                                                            v-for="(
-                                                                value, index
-                                                            ) in pointRecord"
-                                                            :key="index"
-                                                            class="q-pa-none"
-                                                        >
-                                                            <span
-                                                                class="json-field q-mr-xs text-grey"
-                                                                :title="value.name"
-                                                            >
-                                                                {{ value.nameI18n }}:
-                                                            </span>
-                                                            <VnJsonValue
-                                                                :value="value.val.val"
-                                                            />
-                                                        </QItem>
-                                                    </QCardSection>
-                                                </QCard>
-                                            </QPopupProxy>
-                                        </QBtn>
-                                        <QIcon
-                                            class="action q-ml-xs"
-                                            :class="actionsClass[log.action]"
-                                            :name="actionsIcon[log.action]"
-                                            :title="
-                                                t(`actions.${actionsText[log.action]}`)
-                                            "
-                                        />
-                                    </div>
-                                </QItem>
-                            </QCardSection>
-                            <QCardSection
-                                class="change-detail q-px-sm q-py-xs"
-                                :class="{ expanded: log.expand }"
-                                v-if="log.props.length || log.description"
-                            >
-                                <QIcon
-                                    class="cursor-pointer q-mr-md"
-                                    color="grey"
-                                    name="expand_more"
-                                    :title="t('globals.details')"
-                                    size="sm"
-                                    @click="log.expand = !log.expand"
-                                />
-                                <span v-if="log.props.length" class="attributes">
-                                    <span v-if="!log.expand" class="q-pa-none text-grey">
-                                        <span
-                                            v-for="(prop, propIndex) in log.props"
-                                            :key="propIndex"
-                                            class="basic-json"
-                                        >
-                                            <span class="json-field" :title="prop.name">
-                                                {{ prop.nameI18n }}:
-                                            </span>
-                                            <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="propIndex < log.props.length - 1"
-                                                >,&nbsp;
-                                            </span>
-                                        </span>
-                                    </span>
                                     <span
-                                        v-if="log.expand"
+                                        class="model-id q-mr-xs"
-                                        class="expanded-json column q-pa-none"
+                                        v-if="modelLog.summaryId"
-                                    >
+                                        v-text="`#${modelLog.summaryId}`"
-                                        <div
+                                    />
-                                            v-for="(prop, prop2Index) in log.props"
+                                    <span
-                                            :key="prop2Index"
+                                        class="model-value"
-                                            class="q-pa-none text-grey"
+                                        :title="modelLog.showValue"
+                                        v-text="modelLog.showValue"
+                                    />
+                                    <QBtn
+                                        flat
+                                        round
+                                        color="grey"
+                                        class="q-mr-xs q-ml-auto"
+                                        size="sm"
+                                        icon="filter_alt"
+                                        :title="t('recordChanges')"
+                                        @click.stop="filterByRecord(modelLog)"
+                                    />
+                                </QItemLabel>
+                            </QItemSection>
+                            <QItemSection>
+                                <QCard
+                                    class="changes-log q-py-none q-mb-xs"
+                                    v-for="(log, logIndex) in modelLog.logs"
+                                    :key="logIndex"
+                                >
+                                    <QCardSection class="change-info q-pa-none">
+                                        <QItem
+                                            class="q-px-sm q-py-xs justify-between items-center"
                                         >
-                                            <span class="json-field" :title="prop.name">
+                                            <div
-                                                {{ prop.nameI18n }}:
+                                                class="date text-grey text-caption q-mr-sm"
-                                            </span>
+                                                :title="
-                                            <VnJsonValue :value="prop.val.val" />
+                                                    date.formatDate(
-                                            <span v-if="prop.val.id" class="id-value">
+                                                        log.creationDate,
-                                                #{{ prop.val.id }}
+                                                        'DD/MM/YYYY hh:mm:ss'
-                                            </span>
+                                                    ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
-                                            <span v-if="log.action == 'update'">
+                                                "
-                                                ←
+                                            >
-                                                <VnJsonValue :value="prop.old.val" />
+                                                {{ toRelativeDate(log.creationDate) }}
-                                                <span v-if="prop.old.id" class="id-value">
+                                            </div>
-                                                    #{{ prop.old.id }}
+                                            <div>
+                                                <QBtn
+                                                    color="grey"
+                                                    class="pit"
+                                                    icon="preview"
+                                                    flat
+                                                    round
+                                                    :title="t('pointRecord')"
+                                                    padding="none"
+                                                    v-if="log.action != 'insert'"
+                                                    @click.stop="
+                                                        openPointRecord(log.id, modelLog)
+                                                    "
+                                                >
+                                                    <QPopupProxy>
+                                                        <QCard v-if="pointRecord">
+                                                            <div
+                                                                class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
+                                                            >
+                                                                {{ modelLog.modelI18n }}
+                                                                <span v-if="modelLog.id"
+                                                                    >#{{
+                                                                        modelLog.id
+                                                                    }}</span
+                                                                >
+                                                            </div>
+                                                            <QCardSection
+                                                                class="change-detail q-pa-sm"
+                                                            >
+                                                                <QItem
+                                                                    v-for="(
+                                                                        value, index
+                                                                    ) in pointRecord"
+                                                                    :key="index"
+                                                                    class="q-pa-none"
+                                                                >
+                                                                    <span
+                                                                        class="json-field q-mr-xs text-grey"
+                                                                        :title="
+                                                                            value.name
+                                                                        "
+                                                                    >
+                                                                        {{
+                                                                            value.nameI18n
+                                                                        }}:
+                                                                    </span>
+                                                                    <VnJsonValue
+                                                                        :value="
+                                                                            value.val.val
+                                                                        "
+                                                                    />
+                                                                </QItem>
+                                                            </QCardSection>
+                                                        </QCard>
+                                                    </QPopupProxy>
+                                                </QBtn>
+                                                <QIcon
+                                                    class="action q-ml-xs"
+                                                    :class="actionsClass[log.action]"
+                                                    :name="actionsIcon[log.action]"
+                                                    :title="
+                                                        t(
+                                                            `actions.${
+                                                                actionsText[log.action]
+                                                            }`
+                                                        )
+                                                    "
+                                                />
+                                            </div>
+                                        </QItem>
+                                    </QCardSection>
+                                    <QCardSection
+                                        class="change-detail q-px-sm q-py-xs"
+                                        :class="{ expanded: log.expand }"
+                                        v-if="log.props.length || log.description"
+                                    >
+                                        <QIcon
+                                            class="cursor-pointer q-mr-md"
+                                            color="grey"
+                                            name="expand_more"
+                                            :title="t('globals.details')"
+                                            size="sm"
+                                            @click="log.expand = !log.expand"
+                                        />
+                                        <span v-if="log.props.length" class="attributes">
+                                            <span
+                                                v-if="!log.expand"
+                                                class="q-pa-none text-grey"
+                                            >
+                                                <span
+                                                    v-for="(prop, propIndex) in log.props"
+                                                    :key="propIndex"
+                                                    class="basic-json"
+                                                >
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
+                                                        {{ prop.nameI18n }}:
+                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="
+                                                            propIndex <
+                                                            log.props.length - 1
+                                                        "
+                                                        >,&nbsp;
+                                                    </span>
                                                 </span>
                                             </span>
-                                        </div>
+                                            <span
-                                    </span>
+                                                v-if="log.expand"
-                                </span>
+                                                class="expanded-json column q-pa-none"
-                                <span v-if="!log.props.length" class="description">
+                                            >
-                                    {{ log.description }}
+                                                <div
-                                </span>
+                                                    v-for="(
-                            </QCardSection>
+                                                        prop, prop2Index
-                        </QCard>
+                                                    ) in log.props"
-                    </QItemSection>
+                                                    :key="prop2Index"
-                </QItem>
+                                                    class="q-pa-none text-grey"
-            </QList>
+                                                >
-        </div>
+                                                    <span
-    </div>
+                                                        class="json-field"
-    <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
+                                                        :title="prop.name"
-        <div class="row q-gutter-x-sm">
+                                                    >
-            <QBtn
+                                                        {{ prop.nameI18n }}:
-                flat
+                                                    </span>
-                @click.stop="stateStore.toggleRightDrawer()"
+                                                    <VnJsonValue :value="prop.val.val" />
-                round
+                                                    <span
-                dense
+                                                        v-if="prop.val.id"
-                icon="menu"
+                                                        class="id-value"
-            >
+                                                    >
-                <QTooltip bottom anchor="bottom right">
+                                                        #{{ prop.val.id }}
-                    {{ t('globals.collapseMenu') }}
+                                                    </span>
-                </QTooltip>
+                                                    <span v-if="log.action == 'update'">
-            </QBtn>
+                                                        ←
-        </div>
+                                                        <VnJsonValue
-    </Teleport>
+                                                            :value="prop.old.val"
-    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
+                                                        />
-        <QScrollArea class="fit text-grey-8">
+                                                        <span
-            <QList dense>
+                                                            v-if="prop.old.id"
-                <QSeparator />
+                                                            class="id-value"
-                <QItem class="q-mt-sm">
+                                                        >
-                    <QInput
+                                                            #{{ prop.old.id }}
-                        :label="t('globals.search')"
+                                                        </span>
-                        v-model="searchInput"
+                                                    </span>
-                        class="full-width"
+                                                </div>
-                        clearable
+                                            </span>
-                        clear-icon="close"
+                                        </span>
-                        @keyup.enter="() => selectFilter('search')"
+                                        <span
-                        @focusout="() => selectFilter('search')"
+                                            v-if="!log.props.length"
-                        @clear="() => selectFilter('search')"
+                                            class="description"
-                    >
+                                        >
-                        <template #append>
+                                            {{ log.description }}
-                            <QIcon name="info" class="cursor-pointer">
+                                        </span>
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                                    </QCardSection>
-                            </QIcon>
+                                </QCard>
-                        </template>
+                            </QItemSection>
-                    </QInput>
+                        </QItem>
-                </QItem>
+                    </QList>
-                <QItem>
+                </div>
-                    <VnSelectFilter
+            </div>
-                        class="full-width"
+        </template>
-                        :label="t('globals.entity')"
+    </VnPaginate>
-                        v-model="selectedFilters.changedModel"
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-                        option-label="locale"
+        <QList dense>
-                        option-value="value"
+            <QSeparator />
-                        :options="actions"
+            <QItem class="q-mt-sm">
-                        @update:model-value="selectFilter('action')"
+                <QInput
-                        hide-selected
+                    :label="t('globals.search')"
-                    />
+                    v-model="searchInput"
-                </QItem>
+                    class="full-width"
-                <QItem class="q-mt-sm">
+                    clearable
-                    <QOptionGroup
+                    clear-icon="close"
-                        size="sm"
+                    @keyup.enter="() => selectFilter('search')"
-                        v-model="userRadio"
+                    @focusout="() => selectFilter('search')"
-                        :options="userTypes"
+                    @clear="() => selectFilter('search')"
-                        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">
-                        <VnSelectFilter
-                            class="full-width"
-                            :label="t('globals.user')"
-                            v-model="userSelect"
-                            option-label="name"
-                            option-value="id"
-                            :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>
-                        </VnSelectFilter>
-                    </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>{{ t('tooltips.search') }}</QTooltip>
-                        :label="t(`actions.${checkboxOption.label}`)"
+                        </QIcon>
-                        @update:model-value="selectFilter"
+                    </template>
-                    />
+                </QInput>
-                </QItem>
+            </QItem>
-                <QItem class="q-mt-sm">
+            <QItem>
-                    <QInput
+                <VnSelect
+                    class="full-width"
+                    :label="t('globals.entity')"
+                    v-model="selectedFilters.changedModel"
+                    option-label="locale"
+                    option-value="value"
+                    :options="actions"
+                    @update:model-value="selectFilter('action')"
+                    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 }">
+                        {{ t(`Users.${label}`) }}
+                    </template>
+                </QOptionGroup>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QItemSection v-if="userRadio !== null">
+                    <VnSelect
                         class="full-width"
-                        :label="t('globals.date')"
+                        :label="t('globals.user')"
-                        @click="dateFromDialog = true"
+                        v-model="userSelect"
-                        @focus="(evt) => evt.target.blur()"
+                        option-label="name"
-                        @clear="selectFilter('date', 'to')"
+                        option-value="id"
-                        v-model="dateFrom"
+                        :url="`${model}Logs/${$route.params.id}/editors`"
-                        clearable
+                        :fields="['id', 'nickname', 'name', 'image']"
-                        clear-icon="close"
+                        sort-by="nickname"
-                    />
+                        @update:model-value="selectFilter('userSelect')"
-                </QItem>
+                        hide-selected
-                <QItem class="q-mt-sm">
+                    >
-                    <QInput
+                        <template #option="{ opt, itemProps }">
-                        class="full-width"
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
-                        :label="t('to')"
+                                <QItemSection class="col-3 items-center">
-                        @click="dateToDialog = true"
+                                    <VnAvatar :worker-id="opt.id" />
-                        @focus="(evt) => evt.target.blur()"
+                                </QItemSection>
-                        @clear="selectFilter('date', 'from')"
+                                <QItemSection class="col-9 justify-center">
-                        v-model="dateTo"
+                                    <span>{{ opt.name }}</span>
-                        clearable
+                                    <span class="text-grey">{{ opt.nickname }}</span>
-                        clear-icon="close"
+                                </QItemSection>
-                    />
+                            </QItem>
-                </QItem>
+                        </template>
-            </QList>
+                    </VnSelect>
-        </QScrollArea>
+                </QItemSection>
-    </QDrawer>
+            </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
+                    size="sm"
+                    v-model="checkboxOption.selected"
+                    :label="t(`actions.${checkboxOption.label}`)"
+                    @update:model-value="selectFilter"
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('globals.date')"
+                    @click="dateFromDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'to')"
+                    v-model="dateFrom"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+            <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/VnSectionMain.vue

@@ -1,8 +1,19 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
+import { onMounted } from 'vue';
+import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
+const $props = defineProps({
+    leftDrawer: {
+        type: Boolean,
+        default: true,
+    },
+});
+onMounted(
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+);
 </script>
 
 <template>
@@ -12,6 +23,8 @@ const stateStore = useStateStore();
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <RouterView></RouterView>
+        <QPage>
+            <RouterView />
+        </QPage>
     </QPageContainer>
 </template>

src/components/common/VnSelect.vue

@@ -0,0 +1,297 @@
+<script setup>
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'src/components/FetchData.vue';
+import { useValidator } from 'src/composables/useValidator';
+const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
+
+const $props = defineProps({
+    modelValue: {
+        type: [String, Number, Object],
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: () => [],
+    },
+    optionLabel: {
+        type: [String],
+        default: 'name',
+    },
+    optionValue: {
+        type: String,
+        default: 'id',
+    },
+    optionFilter: {
+        type: String,
+        default: null,
+    },
+    optionFilterValue: {
+        type: String,
+        default: null,
+    },
+    url: {
+        type: String,
+        default: null,
+    },
+    filterOptions: {
+        type: [Array],
+        default: () => [],
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
+    isClearable: {
+        type: Boolean,
+        default: true,
+    },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
+    fields: {
+        type: Array,
+        default: null,
+    },
+    include: {
+        type: [Object, Array],
+        default: null,
+    },
+    where: {
+        type: Object,
+        default: null,
+    },
+    sortBy: {
+        type: String,
+        default: null,
+    },
+    limit: {
+        type: [Number, String],
+        default: '30',
+    },
+    focusOnMount: {
+        type: Boolean,
+        default: false,
+    },
+    useLike: {
+        type: Boolean,
+        default: true,
+    },
+    params: {
+        type: Object,
+        default: null,
+    },
+    noOne: {
+        type: Boolean,
+        default: false,
+    },
+});
+const { validations } = useValidator();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const $attrs = useAttrs();
+const { t } = useI18n();
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
+const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
+    toRefs($props);
+const myOptions = ref([]);
+const myOptionsOriginal = ref([]);
+const vnSelectRef = ref();
+const dataRef = ref();
+const lastVal = ref();
+const noOneText = t('globals.noOne');
+const noOneOpt = ref({
+    [optionValue.value]: false,
+    [optionLabel.value]: noOneText,
+});
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        setOptions(myOptionsOriginal.value);
+        emit('update:modelValue', value);
+    },
+});
+
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
+
+watch(modelValue, async (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        await fetchFilter(newValue);
+
+    if ($props.noOne) myOptions.value.unshift(noOneOpt.value);
+});
+
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue && !findKeyInOptions())
+        fetchFilter($props.modelValue);
+    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
+
+function findKeyInOptions() {
+    if (!$props.options) return;
+    return filter($props.modelValue, $props.options)?.length;
+}
+
+function setOptions(data) {
+    myOptions.value = JSON.parse(JSON.stringify(data));
+    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+}
+
+function filter(val, options) {
+    const search = val?.toString()?.toLowerCase();
+
+    if (!search) return options;
+
+    return options.filter((row) => {
+        if ($props.filterOptions.length) {
+            return $props.filterOptions.some((prop) => {
+                const propValue = String(row[prop]).toLowerCase();
+                return propValue.includes(search);
+            });
+        }
+
+        if (!row) return;
+        const id = row[$props.optionValue];
+        const optionLabel = String(row[$props.optionLabel]).toLowerCase();
+
+        return id == search || optionLabel.includes(search);
+    });
+}
+
+async function fetchFilter(val) {
+    if (!$props.url || !dataRef.value) return;
+
+    const { fields, include, sortBy, limit } = $props;
+    const key =
+        optionFilterValue.value ??
+        (new RegExp(/\d/g).test(val)
+            ? optionValue.value
+            : optionFilter.value ?? optionLabel.value);
+
+    let defaultWhere = {};
+    if ($props.filterOptions.length) {
+        defaultWhere = $props.filterOptions.reduce((obj, prop) => {
+            if (!obj.or) obj.or = [];
+            obj.or.push({ [prop]: getVal(val) });
+            return obj;
+        }, {});
+    } else defaultWhere = { [key]: getVal(val) };
+    const where = { ...(val ? defaultWhere : {}), ...$props.where };
+    $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
+    const fetchOptions = { where, include, limit };
+    if (fields) fetchOptions.fields = fields;
+    if (sortBy) fetchOptions.order = sortBy;
+
+    return dataRef.value.fetch(fetchOptions);
+}
+
+async function filterHandler(val, update) {
+    if (!val && lastVal.value === val) {
+        lastVal.value = val;
+        return update();
+    }
+    lastVal.value = val;
+    let newOptions;
+
+    if (!$props.defaultFilter) return update();
+    if (
+        $props.url &&
+        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
+    ) {
+        newOptions = await fetchFilter(val);
+    } else newOptions = filter(val, myOptionsOriginal.value);
+    update(
+        () => {
+            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
+                newOptions.unshift(noOneOpt.value);
+
+            myOptions.value = newOptions;
+        },
+        (ref) => {
+            if (val !== '' && ref.options.length > 0) {
+                ref.setOptionIndex(-1);
+                ref.moveOptionSelection(1, true);
+            }
+        }
+    );
+}
+
+function nullishToTrue(value) {
+    return value ?? true;
+}
+
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+</script>
+
+<template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
+    <QSelect
+        v-model="value"
+        :options="myOptions"
+        :option-label="optionLabel"
+        :option-value="optionValue"
+        v-bind="$attrs"
+        @filter="filterHandler"
+        :emit-value="nullishToTrue($attrs['emit-value'])"
+        :map-options="nullishToTrue($attrs['map-options'])"
+        :use-input="nullishToTrue($attrs['use-input'])"
+        :hide-selected="nullishToTrue($attrs['hide-selected'])"
+        :fill-input="nullishToTrue($attrs['fill-input'])"
+        ref="vnSelectRef"
+        lazy-rules
+        :class="{ required: $attrs.required }"
+        :rules="mixinRules"
+        virtual-scroll-slice-size="options.length"
+        hide-bottom-space
+    >
+        <template v-if="isClearable" #append>
+            <QIcon
+                v-show="value"
+                name="close"
+                @click.stop="
+                    () => {
+                        value = null;
+                        emit('remove');
+                    }
+                "
+                class="cursor-pointer"
+                size="xs"
+            />
+        </template>
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
+    </QSelect>
+</template>
+
+<style scoped lang="scss">
+.q-field--outlined {
+    max-width: 100%;
+}
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+
+        display: flex;
+        align-items: flex-end;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
+</style>

src/components/common/VnSelectCache.vue

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

src/components/common/VnSelectDialog.vue

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

src/components/common/VnSelectEnum.vue

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

src/components/common/VnSelectFilter.vue

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

src/components/common/VnSmsDialog.vue

@@ -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
@@ -199,9 +200,11 @@ es:
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
-        minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
+        minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
-            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+            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
@@ -221,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
@@ -239,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">
+        <div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
-            <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,38 @@ 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);
+const menuRef = ref();
+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(() => {
+        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        if (data) emit('onFetch', data);
+        return 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,14 +85,50 @@ async function getData() {
         isLoading.value = false;
     }
 }
+
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.toString().split('.');
+    let current = entity.value;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}
+
 const emit = defineEmits(['onFetch']);
+
+const iconModule = computed(() => route.matched[1].meta.icon);
+const toModule = computed(() =>
+    route.matched[1].path.split('/').length > 2
+        ? route.matched[1].redirect
+        : route.matched[1].children[0].redirect
+);
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action" />
+                <slot name="header-extra-action"
+                    ><QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        :icon="iconModule"
+                        color="white"
+                        class="link"
+                        :to="$attrs['to-module'] ?? toModule"
+                    >
+                        <QTooltip>
+                            {{ t('globals.goToModuleIndex') }}
+                        </QTooltip>
+                    </QBtn></slot
+                >
+
                 <QBtn
                     @click.stop="viewSummary(entity.id, $props.summary)"
                     round
@@ -108,20 +160,20 @@ 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') }}
                     </QTooltip>
-                    <QMenu>
+                    <QMenu :ref="menuRef">
                         <QList>
-                            <slot name="menu" :entity="entity" />
+                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>
                     </QMenu>
                 </QBtn>
@@ -131,8 +183,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 +195,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 +287,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/CatalogItem.vue

@@ -3,16 +3,14 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnLv from 'components/ui/VnLv.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
-import { useSession } from 'composables/useSession';
+import { toCurrency } from 'filters/index';
-import toCurrency from '../../../filters/toCurrency';
 
 const DEFAULT_PRICE_KG = 0;
 
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const { t } = useI18n();
 
 defineProps({
@@ -20,6 +18,10 @@ defineProps({
         type: Object,
         required: true,
     },
+    isCatalog: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const dialog = ref(null);
@@ -29,15 +31,8 @@ const dialog = ref(null);
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <QImg
+                <VnImg :id="item.id" class="image" />
-                    :src="`/api/Images/catalog/200x200/${item.id}/download?access_token=${token}`"
+                <div v-if="item.hex && isCatalog" class="item-color-container">
-                    spinner-color="primary"
-                    :ratio="1"
-                    height="192"
-                    width="192"
-                    class="image"
-                />
-                <div v-if="item.hex" class="item-color-container">
                     <div
                         class="item-color"
                         :style="{ backgroundColor: `#${item.hex}` }"
@@ -57,10 +52,18 @@ const dialog = ref(null);
                         :value="item?.[`value${index + 4}`]"
                     />
                 </template>
+                <div v-if="item.minQuantity" class="min-quantity">
+                    <QIcon name="production_quantity_limits" size="xs" />
+                    {{ item.minQuantity }}
+                </div>
                 <div class="footer">
                     <div class="price">
-                        <p>{{ item.available }} {{ t('to') }} {{ item.price }}</p>
+                        <p v-if="isCatalog">
-                        <QIcon name="add_circle" class="icon">
+                            {{ item.available }} {{ t('to') }}
+                            {{ toCurrency(item.price) }}
+                        </p>
+                        <slot name="price" />
+                        <QIcon v-if="isCatalog" name="add_circle" class="icon">
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
@@ -124,16 +127,16 @@ const dialog = ref(null);
     flex-direction: column;
     gap: 4px;
 
-    .subName {
-        color: var(--vn-label-color);
-        text-transform: uppercase;
-    }
-
     p {
         margin-bottom: 0;
     }
 }
 
+.min-quantity {
+    text-align: right;
+    color: $negative !important;
+}
+
 .footer {
     .price {
         overflow: hidden;

src/components/ui/FetchedTags.vue

@@ -1,60 +1,45 @@
 <script setup>
-defineProps({
+import { computed } from 'vue';
-    maxLength: {
+
-        type: Number,
+const $props = defineProps({
-        required: true,
-    },
     item: {
         type: Object,
         required: true,
     },
+    tag: {
+        type: String,
+        required: false,
+        default: 'tag',
+    },
+    value: {
+        type: String,
+        required: false,
+        default: 'value',
+    },
+});
+const tags = computed(() => {
+    return Object.keys($props.item)
+        .filter((i) => i.startsWith(`${$props.tag}`))
+        .reduce((acc, tag) => {
+            const n = tag.split(`${$props.tag}`)[1];
+            const key = `${$props.tag}${n}`;
+            const value = `${$props.value}${n}`;
+            acc[$props.item[key] ?? key] = $props.item[value] ?? '';
+            return acc;
+        }, {});
 });
 </script>
 <template>
     <div class="fetchedTags">
         <div class="wrap">
             <div
+                v-for="(val, key) in tags"
+                :key="key"
                 class="inline-tag"
-                :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 +57,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 +68,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

@@ -52,19 +52,17 @@ const containerClasses = computed(() => {
     --calendar-border-current: #84d0e2 2px solid;
     --calendar-current-color-dark: #84d0e2;
     // Colores de fondo del calendario en dark mode
-    --calendar-outside-background-dark: #222;
+    --calendar-outside-background-dark: var(--vn-section-color);
-    --calendar-background-dark: #222;
+    --calendar-background-dark: var(--vn-section-color);
 }
 
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
 .q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    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 {
@@ -72,8 +70,26 @@ const containerClasses = computed(() => {
     text-transform: capitalize;
 }
 
+.q-calendar-month__head--workweek,
+.q-calendar-month__head--weekday,
+// .q-calendar-month__workweek.q-past-day,
+.q-calendar-month__week :nth-child(n+6):nth-child(-n+7) {
+    color: var(--vn-label-color);
+}
+
+.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span {
+    /* color: transparent; */
+    visibility: hidden;
+    // position: absolute;
+}
+.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span:after {
+    content: 'X';
+    visibility: visible;
+    left: 33%;
+    position: absolute;
+}
 .transparent-background {
-    --calendar-background-dark: transparent;
+    // --calendar-background-dark: transparent;
     --calendar-background: transparent;
     --calendar-outside-background-dark: transparent;
 }
@@ -108,17 +124,11 @@ 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
-        color: #777777;
-    }
-
     .q-calendar-month__week--wrapper {
         margin-bottom: 4px;
     }
@@ -127,6 +137,7 @@ const containerClasses = computed(() => {
         height: 32px;
         display: flex;
         justify-content: center;
+        color: var(--vn-label-color);
     }
 
     .q-calendar__button--bordered {
@@ -150,7 +161,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: var(--vn-label-color);
         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 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 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>
+    <div class="row q-gutter-md q-mb-md">
+        <QSkeleton type="QInput" class="col" square />
+        <QSkeleton type="QInput" class="col" square />       
+    </div>
+    <div class="row q-gutter-md q-mb-md">
+        <QSkeleton type="QInput" class="col" square />
+        <QSkeleton type="QInput" class="col" square />       
+    </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/VnAvatar.vue

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

src/components/ui/VnConfirm.vue

@@ -15,7 +15,7 @@ const props = defineProps({
         default: null,
     },
     message: {
-        type: String,
+        type: [String, Boolean],
         default: null,
     },
     data: {
@@ -31,11 +31,15 @@ const props = defineProps({
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
 const title = props.title || t('Confirm');
-const message = props.message || t('Are you sure you want to continue?');
+const message =
+    props.message ||
+    (props.message !== false ? t('Are you sure you want to continue?') : false);
+
 const isLoading = ref(false);
 
 async function confirm() {
@@ -61,12 +65,15 @@ async function confirm() {
                     size="xl"
                     v-if="icon"
                 />
-                <span class="text-h6 text-grey">{{ title }}</span>
+                <span class="text-h6">{{ title }}</span>
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row items-center">
+            <QCardSection class="q-pb-none">
-                <span v-html="message"></span>
+                <span v-if="message !== false" v-html="message" />
+            </QCardSection>
+            <QCardSection class="row items-center q-pt-none">
+                <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
                 <QBtn

src/components/ui/VnFilterPanel.vue

@@ -4,25 +4,22 @@ 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,
     },
     searchButton: {
         type: Boolean,
-        required: false,
         default: false,
     },
-    params: {
-        type: Object,
-        required: false,
-        default: null,
-    },
     showAll: {
         type: Boolean,
         default: true,
@@ -31,8 +28,8 @@ const props = defineProps({
         type: Array,
         required: false,
         default: () => [],
-        description:
+        description: `Some filters come with default search parameters and require a value.
-            'Algunos filtros vienen con parametros de búsqueda por default y necesitan tener si o si un valor, por eso de ser necesario, esta prop nos sirve para saber que filtros podemos remover y cuales no',
+            This prop helps us determine which filters can be removed and which cannot.`,
     },
     exprBuilder: {
         type: Function,
@@ -40,131 +37,181 @@ const props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => [],
+        default: () => ['filter', 'search', 'or', 'and'],
     },
     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']);
+defineExpose({ search, sanitizer });
+const emit = defineEmits([
+    'update:modelValue',
+    'refresh',
+    'clear',
+    'search',
+    'init',
+    'remove',
+    'setUserParams',
+]);
 
-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 || Object.keys(watchedParams).length == 0) return;
+
+    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+    if (typeof watchedParams?.filter == 'string')
+        watchedParams.filter = JSON.parse(watchedParams.filter);
+
+    watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
+    const order = watchedParams.filter?.order;
+
+    delete watchedParams.filter;
+    userParams.value = sanitizer(watchedParams);
+    emit('setUserParams', userParams.value, order);
+}
+
 watch(
-    () => route.query.params,
+    () => route.query[$props.searchUrl],
-    (val) => {
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
-        if (!val) {
+);
-            userParams.value = {};
+
-        } else {
+watch(
-            const parsedParams = JSON.parse(val);
+    () => arrayData.store.userParams,
-            userParams.value = { ...parsedParams };
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
-        }
+);
-    }
+
+watch(
+    () => $props.modelValue,
+    (val) => (userParams.value = val ?? {})
 );
 
 const isLoading = ref(false);
-async function search() {
+async function search(evt) {
-    isLoading.value = true;
+    try {
-    const params = { ...userParams.value };
+        if (evt && $props.disableSubmitEvent) return;
-    store.userParamsChanged = true;
-    store.filter.skip = 0;
-    store.skip = 0;
-    const { params: newParams } = await arrayData.addFilter({ params });
-    userParams.value = newParams;
 
-    if (!props.showAll && !Object.values(params).length) store.data = [];
+        store.filter.where = {};
+        isLoading.value = true;
+        const filter = { ...userParams.value, ...$props.modelValue };
+        store.userParamsChanged = true;
+        const { params: newParams } = await arrayData.addFilter({
+            params: filter,
+        });
+        userParams.value = newParams;
 
-    isLoading.value = false;
+        if (!$props.showAll && !Object.values(filter).length) store.data = [];
-    emit('search');
+        emit('search');
-}
+    } finally {
-
+        isLoading.value = false;
-async function reload() {
+    }
-    isLoading.value = true;
-    const params = Object.values(userParams.value).filter((param) => param);
-
-    await arrayData.fetch({ append: false });
-    if (!props.showAll && !params.length) store.data = [];
-    isLoading.value = false;
-    emit('refresh');
 }
 
 async function clearFilters() {
-    isLoading.value = true;
+    try {
-    store.userParamsChanged = true;
+        isLoading.value = true;
-    store.filter.skip = 0;
+        store.userParamsChanged = true;
-    store.skip = 0;
+        arrayData.reset(['skip', 'filter.skip', 'page']);
-    // Filtrar los params no removibles
+        // Filtrar los params no removibles
-    const removableFilters = Object.keys(userParams.value).filter((param) =>
+        const removableFilters = Object.keys(userParams.value).filter((param) =>
-        props.unremovableParams.includes(param)
+            $props.unremovableParams.includes(param)
-    );
+        );
-    const newParams = {};
+        const newParams = {};
-    // Conservar solo los params que no son removibles
+        // Conservar solo los params que no son removibles
-    for (const key of removableFilters) {
+        for (const key of removableFilters) {
-        newParams[key] = userParams.value[key];
+            newParams[key] = userParams.value[key];
-    }
+        }
-    userParams.value = { ...newParams }; // Actualizar los params con los removibles
+        userParams.value = {};
-    await arrayData.applyFilter({ params: 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 = [];
+            store.data = [];
+        }
+        emit('clear');
+        emit('update:modelValue', userParams.value);
+    } finally {
+        isLoading.value = false;
     }
-
-    isLoading.value = false;
-    emit('clear');
 }
 
-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.label));
-);
+});
 const customTags = computed(() =>
-    tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
+    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
 );
 
 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}"`;
 }
+
+function sanitizer(params) {
+    for (const [key, value] of Object.entries(params)) {
+        if (value && typeof value === 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+        }
+    }
+    return params;
+}
 </script>
 
 <template>
-    <QForm @submit="search" id="filterPanelForm">
+    <QBtn
+        class="q-mt-lg q-mr-xs q-mb-lg"
+        round
+        color="primary"
+        style="position: fixed; z-index: 1; right: 0; bottom: 0"
+        icon="search"
+        @click="search()"
+    ></QBtn>
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
@@ -173,32 +220,18 @@ function formatValue(value) {
                     </QItemLabel>
                 </QItemSection>
                 <QItemSection top side>
-                    <div class="q-gutter-xs">
+                    <QBtn
-                        <QBtn
+                        @click="clearFilters"
-                            @click="clearFilters"
+                        color="primary"
-                            color="primary"
+                        dense
-                            dense
+                        flat
-                            flat
+                        icon="filter_list_off"
-                            icon="filter_list_off"
+                        padding="none"
-                            padding="none"
+                        round
-                            round
+                        size="sm"
-                            size="sm"
+                    >
-                        >
+                        <QTooltip>{{ t('Remove filters') }}</QTooltip>
-                            <QTooltip>{{ t('Remove filters') }}</QTooltip>
+                    </QBtn>
-                        </QBtn>
-                        <QBtn
-                            @click="reload"
-                            color="primary"
-                            dense
-                            flat
-                            icon="refresh"
-                            padding="none"
-                            round
-                            size="sm"
-                        >
-                            <QTooltip>{{ t('Refresh') }}</QTooltip>
-                        </QBtn>
-                    </div>
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
@@ -212,13 +245,13 @@ function formatValue(value) {
                     <VnFilterPanelChip
                         v-for="chip of tags"
                         :key="chip.label"
-                        :removable="!unremovableParams.includes(chip.label)"
+                        :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
                         <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>
@@ -235,25 +268,8 @@ function formatValue(value) {
             <QSeparator />
         </QList>
         <QList dense class="list q-gutter-y-sm q-mt-sm">
-            <slot name="body" :params="userParams" :search-fn="search"></slot>
+            <slot name="body" :params="sanitizer(userParams)" :search-fn="search"></slot>
         </QList>
-        <template v-if="props.searchButton">
-            <QItem>
-                <QItemSection class="q-py-sm">
-                    <QBtn
-                        :label="t('Search')"
-                        class="full-width"
-                        color="primary"
-                        dense
-                        icon="search"
-                        rounded
-                        type="submit"
-                        unelevated
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-        </template>
     </QForm>
     <QInnerLoading
         :label="t('globals.pleaseWait')"
@@ -261,7 +277,6 @@ function formatValue(value) {
         color="primary"
     />
 </template>
-
 <style scoped lang="scss">
 .list {
     width: 256px;

src/components/ui/VnImg.vue

@@ -0,0 +1,88 @@
+<script setup>
+import { ref } from 'vue';
+import { useSession } from 'src/composables/useSession';
+import noImage from '/no-user.png';
+import { useRole } from 'src/composables/useRole';
+
+const $props = defineProps({
+    storage: {
+        type: [String, Number],
+        default: 'Images',
+    },
+    collection: {
+        type: String,
+        default: 'catalog',
+    },
+    resolution: {
+        type: String,
+        default: '200x200',
+    },
+    zoomResolution: {
+        type: String,
+        default: null,
+    },
+    zoom: {
+        type: Boolean,
+        default: true,
+    },
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+const show = ref(false);
+const token = useSession().getTokenMultimedia();
+const timeStamp = ref(`timestamp=${Date.now()}`);
+const isEmployee = useRole().isEmployee();
+
+const getUrl = (zoom = false) => {
+    const curResolution = zoom
+        ? $props.zoomResolution || $props.resolution
+        : $props.resolution;
+    if ($props.storage === 'dms')
+        return `/api/${$props.storage}/${$props.id}/downloadFile?access_token=${token}`;
+    return isEmployee
+        ? `/api/${$props.storage}/${$props.collection}/${curResolution}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+        : noImage;
+};
+const reload = () => {
+    timeStamp.value = `timestamp=${Date.now()}`;
+};
+defineExpose({
+    reload,
+});
+</script>
+<template>
+    <QImg
+        :draggable="true"
+        :class="{ zoomIn: zoom }"
+        :src="getUrl()"
+        v-bind="$attrs"
+        @click.stop="show = $props.zoom ? true : false"
+        spinner-color="primary"
+    />
+    <QDialog v-if="$props.zoom" v-model="show">
+        <QImg
+            :draggable="true"
+            :src="getUrl(true)"
+            v-bind="$attrs"
+            spinner-color="primary"
+            class="img_zoom"
+            :ratio="0"
+        />
+    </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

@@ -1,13 +1,18 @@
 <script setup>
-import VnAvatar from 'src/components/ui/VnAvatar.vue';
-import { toDateHourMin } from 'src/filters';
-import { ref } from 'vue';
 import axios from 'axios';
+import { ref } from 'vue';
+import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnPaginate from './VnPaginate.vue';
+import { useQuasar } from 'quasar';
-import VnUserLink from '../ui/VnUserLink.vue';
+
+import { toDateHourMin } from 'src/filters';
 import { useState } from 'src/composables/useState';
 
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnUserLink from 'components/ui/VnUserLink.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnAvatar from 'components/ui/VnAvatar.vue';
+
 const $props = defineProps({
     url: { type: String, default: null },
     filter: { type: Object, default: () => {} },
@@ -17,17 +22,36 @@ const $props = defineProps({
 
 const { t } = useI18n();
 const state = useState();
+const quasar = useQuasar();
 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 });
+    const newBody = { ...body, ...{ text: newNote.value } };
-    await axios.post($props.url, body);
+    await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
     newNote.value = '';
 }
+
+onBeforeRouteLeave((to, from, next) => {
+    if (newNote.value)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
 </script>
 <template>
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
@@ -48,12 +72,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 +97,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 +155,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/VnOutForm.vue

@@ -0,0 +1,32 @@
+<script setup>
+const emit = defineEmits(['submit']);
+defineProps({
+    icon: { type: String, required: false, default: 'phonelink_lock' },
+    title: { type: String, required: true },
+});
+</script>
+<template>
+    <QForm @submit="emit('submit')" class="q-gutter-y-md q-pa-lg formCard">
+        <div class="column items-center">
+            <QIcon v-if="icon != false" :name="icon" size="xl" color="primary" />
+            <h5 class="text-center q-my-md">
+                {{ title }}
+            </h5>
+        </div>
+        <slot></slot>
+        <div class="q-mt-lg">
+            <slot name="buttons"></slot>
+        </div>
+    </QForm>
+</template>
+<style lang="scss" scoped>
+.formCard {
+    max-width: 350px;
+    min-width: 300px;
+}
+@media (max-width: $breakpoint-xs-max) {
+    .formCard {
+        min-width: 100%;
+    }
+}
+</style>

src/components/ui/VnPaginate.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -10,6 +10,10 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    class: {
+        type: String,
+        default: '',
+    },
     autoLoad: {
         type: Boolean,
         default: false,
@@ -26,6 +30,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     where: {
         type: Object,
         default: null,
@@ -42,6 +50,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    keepOpts: {
+        type: Array,
+        default: () => [],
+    },
     offset: {
         type: Number,
         default: 0,
@@ -54,14 +66,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,
@@ -71,18 +88,24 @@ const pagination = ref({
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     where: props.where,
     limit: props.limit,
     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;
 });
 
+onBeforeUnmount(() => arrayData.reset());
+
 watch(
     () => props.data,
     () => {
@@ -90,16 +113,27 @@ watch(
     }
 );
 
+watch(
+    () => store.data,
+    (data) => emit('onChange', data)
+);
+
+watch(
+    () => [props.url, props.filter],
+    ([url, filter]) => mounted.value && fetch({ url, filter })
+);
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
 };
 
-async function fetch() {
+async function fetch(params) {
+    useArrayData(props.dataKey, params);
+    arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
+    if (!store.hasMoreData) isLoading.value = false;
-        isLoading.value = false;
+
-    }
     emit('onFetch', store.data);
+    return store.data;
 }
 
 async function paginate() {
@@ -131,7 +165,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);
 
@@ -143,7 +177,7 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({ fetch, addFilter });
+defineExpose({ fetch, addFilter, paginate });
 </script>
 
 <template>
@@ -183,24 +217,25 @@ defineExpose({ fetch, addFilter });
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        class="full-width"
+        :class="['full-width', props.class]"
         :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
-        <div v-if="isLoading" class="info-row q-pa-md text-center">
+        <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
-            <QSpinner color="orange" size="md" />
+            <QSpinner color="primary" 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>
+.spinner {
+    z-index: 1;
+    align-content: end;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+}
 .info-row {
     width: 100%;
 

src/components/ui/VnRow.vue

@@ -1,18 +1,27 @@
+<script setup>
+defineProps({ wrap: { type: Boolean, default: false } });
+</script>
 <template>
     <div class="vn-row q-gutter-md q-mb-md">
-        <slot></slot>
+        <slot />
     </div>
 </template>
-<style lang="scss" scopped>
+<style lang="scss" scoped>
 .vn-row {
     display: flex;
-    > * {
+    align-items: flex-end;
+    > :deep(*) {
         flex: 1;
     }
+    &[wrap] {
+        flex-wrap: wrap;
+    }
 }
 @media screen and (max-width: 800px) {
     .vn-row {
-        flex-direction: column;
+        &:not(.wrap) {
+            flex-direction: column;
+        }
     }
 }
 </style>

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: '',
     },
+    whereFilter: {
+        type: Function,
+        default: undefined,
+    },
 });
 
-const router = useRouter();
+const searchText = ref();
-const arrayData = useArrayData(props.dataKey, { ...props });
+let arrayDataProps = { ...props };
-const { store } = arrayData;
+if (props.redirect)
-const searchText = ref('');
+    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;
@@ -78,69 +100,57 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.entries(store.userParams).filter(
+    const staticParams = Object.entries(store.userParams);
-        ([key, value]) => value && (props.staticParams || []).includes(key)
+    arrayData.reset(['skip', 'page']);
-    );
+
-    await arrayData.applyFilter({
+    const filter = {
         params: {
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
-    });
+        ...{ filter: props.filter },
-    if (!props.redirect) return;
+    };
 
-    if (props.customRouteRedirectName)
+    if (props.whereFilter) {
-        return router.push({
+        filter.filter = {
-            name: props.customRouteRedirectName,
+            where: props.whereFilter(searchText.value),
-            params: { id: searchText.value },
+        };
-        });
+        delete filter.params.search;
-
+    }
-    const { matched: matches } = router.currentRoute.value;
+    await arrayData.applyFilter(filter);
-    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`);
-    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.trim="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/VnSms.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount } from 'vue';
+import { computed } from 'vue';
 import { date } from 'quasar';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnAvatar from '../ui/VnAvatar.vue';
@@ -10,31 +10,32 @@ const $props = defineProps({
     where: { type: Object, default: () => {} },
 });
 
-const filter = {
+const filter = computed(() => {
-    fields: ['smsFk'],
+    return {
-    include: {
+        fields: ['smsFk'],
-        relation: 'sms',
+        include: {
-        scope: {
+            relation: 'sms',
-            fields: [
+            scope: {
-                'senderFk',
+                fields: [
-                'sender',
+                    'senderFk',
-                'destination',
+                    'sender',
-                'message',
+                    'destination',
-                'statusCode',
+                    'message',
-                'status',
+                    'statusCode',
-                'created',
+                    'status',
-            ],
+                    'created',
-            include: {
+                ],
-                relation: 'sender',
+                include: {
-                scope: {
+                    relation: 'sender',
-                    fields: ['name'],
+                    scope: {
+                        fields: ['name'],
+                    },
                 },
             },
         },
-    },
+        ...{ where: $props.where },
-};
+    };
-
+});
-onBeforeMount(() => (filter.where = $props.where));
 
 function formatNumber(number) {
     if (number.length <= 10) return number;