fix: refs #7649 change background color

.husky/addReferenceTag.js

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

.husky/commit-msg

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

.vscode/settings.json

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

CHANGELOG.md

@@ -1,756 +1,3 @@
-# Version 24.40 - 2024-10-02
-
-### Added 🆕
-
--   chore: refs #4074 admit several acls by:jorgep
--   chore: refs #4074 drop workerCreate by:jorgep
--   chore: refs #4074 fix tests by:jorgep
--   chore: refs #4074 wip replace useRole for useAcl by:jorgep
--   chore: refs #7155 remove console.log by:alexm
--   chore: refs #7155 typo by:alexm
--   chore: refs #7663 add test by:jorgep
--   chore: refs #7663 create test wip by:jorgep
--   chore: refs #7663 drop useless code (origin/7663-setWeight) by:jorgep
--   chore: refs #7828 fix e2e by:jorgep
--   feat(AccountBasicData): add twoFactorFk by:alexm
--   feat: add max rule by:Javier Segarra
--   feat: add shortcut add event in some subSections by:Javier Segarra
--   feat: add shortcut more buttons (origin/add_shortcut_add_subSections) by:Javier Segarra
--   feat: add tooltip CustomerNewCustomAgent by:Javier Segarra
--   feat: apply color when today by:Javier Segarra
--   feat: change label because its more natural by:Javier Segarra
--   feat: change order by:Javier Segarra
--   feat: change QBadge color by:Javier Segarra
--   feat: change url CustomerList by:Javier Segarra
--   feat: copy customer countryFk by:Javier Segarra
--   feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData by:alexm
--   feat: CustomerBalance by:Javier Segarra
--   feat: CustomerConsumptionFilter by:Javier Segarra
--   feat: customer consumption (origin/7830-customerDesplegables, 7830-customerDesplegables) by:alexm
--   feat: CustomerCreateTicket by:Javier Segarra
--   feat: CustomerCredit section by:Javier Segarra
--   feat: CustomerGreuges by:Javier Segarra
--   feat: CustomerSample to VnTable by:Javier Segarra
--   feat: global handler (origin/fix_global_handler, fix_global_handler) by:alexm
--   feat: goToSupplier by:Javier Segarra
--   feat: handle newValue by:Javier Segarra
--   feat: handle same multiple CP by:Javier Segarra
--   feat: hide menus on small view (origin/hideMenu) by:jorgep
--   feat: minor changes by:Javier Segarra
--   feat: orderCreateDialog by:Javier Segarra
--   feat: refs #4074 drop useless code by:jorgep
--   feat: refs #4074 useAcl in vnSelectDialog by:jorgep
--   feat: refs #6346 new wagon type section by:Jon
--   feat: refs #7404 add m3 and fix detail by:pablone
--   feat: refs #7404 add some style to the form and reorganize fields by:pablone
--   feat: refs #7404 add travel m3 to reserves form by:pablone
--   feat: refs #7404 style dynamic text color by:pablone
--   feat: refs #7404 travel m3 form by:pablone
--   feat: refs #7500 added VnImg to show files by:Jon
--   feat: refs #7663 add setWeight menu opt (wip) by:jorgep
--   feat: refs #7663 fine tunning by:jorgep
--   feat: refs #7828 create axios instance which no manage errors (origin/7828-makeCorrectCalls) by:jorgep
--   feat: refs #7828 useAcl & cherry pick mail data worker by:jorgep
--   feat: remove cli warnings by:Javier Segarra
--   feat: show preparation field by:Javier Segarra
--   feat: stateGroupedFilter by:Javier Segarra
--   feat: translations fixed by:jgallego
--   feat(TravelList): add daysOnward by:alexm
--   feat: travel m3 by:pablone
--   feat: use disableInifiniteScroll property by:Javier Segarra
--   feat: VnImg draggable by:Javier Segarra
--   feat: vnLocation changes by:Javier Segarra
--   feat: vnSelect exprBuilder by:Javier Segarra
--   fix: refs #7404 remove some style by:pablone
--   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
--   fix: refs #7404 translates and some minor style fixes by:pablone
--   fix: styles by:Javier Segarra
--   perf: improve style by:Javier Segarra
-
-### Changed 📦
-
--   perf: CustomerBalance by:Javier Segarra
--   perf: CustomerBasicData by:Javier Segarra
--   perf: CustomerBasicData.salesPersonFk by:Javier Segarra
--   perf: CustomerSummary by:Javier Segarra
--   perf: customerSummaryTable by:Javier Segarra
--   perf: disable card option by:Javier Segarra
--   perf: i18n by:Javier Segarra
--   perf: improve by:Javier Segarra
--   perf: improve style by:Javier Segarra
--   perf: imrpove exprBuilder by:Javier Segarra
--   perf: minor comments by:Javier Segarra
--   perf: refs #6346 previous changes by:Jon
--   perf: sendEmail customerConsumption by:Javier Segarra
--   perf: solve reload CardSummary component by:Javier Segarra
--   perf: update CustommerDescriptor by:Javier Segarra
--   refactor: refs #4074 accept array by:jorgep
--   refactor: refs #4074 rollback by:jorgep
--   refactor: refs #4074 use acl & drop useless roles by:jorgep
--   refactor: refs #4074 useAcl in navigationStore & router by:jorgep
--   refactor: refs #4074 use fn (origin/4074-useAcls) by:jorgep
--   refactor: refs #4074 use VnTitle by:jorgep
--   refactor: refs #6346 deleted front error checking by:Jon
--   refactor: refs #6346 requested changes by:Jon
--   refactor: refs #6346 wagons to VnTable by:Jon
--   refactor: refs #7500 deleted useless code by:Jon
--   refactor: refs #7500 refactor vnimg when storage is dms by:Jon
--   refactor: refs #7828 wip by:jorgep
-
-### Fixed 🛠️
-
--   chore: refs #4074 fix tests by:jorgep
--   chore: refs #7828 fix e2e by:jorgep
--   feat: refs #7404 add m3 and fix detail by:pablone
--   feat: translations fixed by:jgallego
--   fix: #5938 grouped filter by:Javier Segarra
--   fix: #6943 fix customerSummaryTable by:Javier Segarra
--   fix: #6943 show nickname salesPerson by:Javier Segarra
--   fix: address-create i18n by:Javier Segarra
--   fix: comments (origin/6943_fix_customer_module, 6943_fix_customer_module) by:Javier Segarra
--   fix: CusomerSummary to Address by:Javier Segarra
--   fix: CustomerAddress mobile by:Javier Segarra
--   fix: CustomerBillingData by:Javier Segarra
--   fix: Customerconsumption by:Javier Segarra
--   fix: customer credit opinion by:alexm
--   fix: CustomerCreditOpinion workerDescriptor by:Javier Segarra
--   fix: CustomerDescriptorAccount by:Javier Segarra
--   fix: CustomerDescriptor.bussinessTypeFk by:Javier Segarra
--   fix: CustomerFilter by:Javier Segarra
--   fix: CustomerGreuges by:Javier Segarra
--   fix: CustomerMandates by:Javier Segarra
--   fix: Customer module find salesPersons out of first get by:Javier Segarra
--   fix: CustomerRecovery transalate label by:Javier Segarra
--   fix: CustomerSamples by:Javier Segarra
--   fix: customerSummaryToTicketList button by:Javier Segarra
--   fix: CustomerWebPayment by:Javier Segarra
--   fix: CustommerSummaryTable Proxy by:Javier Segarra
--   fix: deleted code by:Jon
--   fix: duplicate code by:alexm
--   fix: emit:updateModelValue by:Javier Segarra
--   fix: fixed wagon tests by:Jon
--   fix: fix wagon list reload by:Jon
--   fix: i18n en preparation label by:Javier Segarra
--   fix: infiniteScroll by:Javier Segarra
--   fix: isFullMovable checkbox by:Javier Segarra
--   fix: merge conflicts by:Javier Segarra
--   fix: merge in dev by:alexm
--   fix: missing code by:Jon
--   fix: Options VnSelect properties by:Javier Segarra
--   fix: refs #4074 await to watch by:jorgep
--   fix: refs #4074 drop wrong acl by:jorgep
--   fix: refs #4074 workerCard data-key by:jorgep
--   fix: refs #6346 fix list and create by:pablone
--   fix: refs #6943 prevent null (origin/6943-warmfix-preventNull) by:jorgep
--   fix: refs #7155 remove userParams in watcher (7155-travel_daysOnward) by:alexm
--   fix: refs #7155 use chip-locale (origin/7155-travel_daysOnward_2, 7155-travel_daysOnward_2) by:alexm
--   fix: refs #7404 remove console.log by:pablone
--   fix: refs #7404 remove from test by:pablone
--   fix: refs #7404 remove some style by:pablone
--   fix: refs #7404 revert commit prevent production access by:pablone
--   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
--   fix: refs #7404 translates and some minor style fixes by:pablone
--   fix: refs #7500 fixed e2e test by:Jon
--   fix: refs #7500 fixed showing images wrongly by:Jon
--   fix: refs #7830 customer credit by:pablone
--   fix: refs #7830 remove console.log by:pablone
--   fix: remove console.log by:pablone
--   fix: remove FetchData by:Javier Segarra
--   fix: remove FIXME (origin/6943_fix_customerSummaryTable) by:Javier Segarra
--   fix: remove print variable by:Javier Segarra
--   fix: remove promise execution by:Javier Segarra
--   fix: reset VnTable scroll properties by:Javier Segarra
--   fix: rule by:Javier Segarra
--   fix: solve conflicts from master to test by:Javier Segarra
--   fix: split params (origin/warmfix-addSearchUrl) by:jorgep
--   fix: state cell by:Javier Segarra
--   fix: stop call back event hasMoreData by:Javier Segarra
--   fix: styles by:Javier Segarra
--   fix: SupplierFiscalData VnLocation (origin/fix_supplierFD_location) by:Javier Segarra
--   fix: VnLocation test by:Javier Segarra
--   fix(VnTable): header background-color by:alexm
--   fix(VnTable): sanitizer value is defined by:carlossa
--   fix: wagon reload (origin/FixWagonRedirect) by:Jon
--   fix: workerDms filter workerFk by:alexm
--   fix(WorkerList): add type email by:alexm
--   Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable by:Javier Segarra
--   refs #7155 scopeDays fix (origin/7155-scopeDays) by:carlossa
--   revert: vnUSerLink change by:Javier Segarra
--   test: fix test (7677_vnLocation_perf) by:Javier Segarra
-
-# 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 🆕

commitlint.config.js

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.44.0",
+    "version": "24.28.1",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -13,10 +13,7 @@
         "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",
@@ -32,8 +29,6 @@
         "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",
@@ -46,7 +41,6 @@
         "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"

src/boot/axios.js

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

src/boot/defaults/qInput.js

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

src/boot/defaults/qSelect.js

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

src/boot/keyShortcut.js

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

src/boot/mainShortcutMixin.js

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

src/boot/quasar.defaults.js

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

src/boot/quasar.js

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

src/components/CreateBankEntityForm.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref, onMounted, nextTick, computed } from 'vue';
+import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -7,21 +7,16 @@ 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';
 
 defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
-const state = useState();
-
-const customer = computed(() => state.get('customer'));
-
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: customer.value?.countryFk,
+    countryFk: null,
     id: null,
 });
 
@@ -31,8 +26,8 @@ const countriesFilter = {
 
 const countriesOptions = ref([]);
 
-const onDataSaved = (...args) => {
+const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', ...args);
+    emit('onDataSaved', formData, requestResponse);
 };
 
 onMounted(async () => {
@@ -57,7 +52,7 @@ onMounted(async () => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     :label="t('name')"
                     v-model="data.name"
@@ -72,7 +67,7 @@ onMounted(async () => {
                     :rules="validate('bankEntity.bic')"
                 />
             </VnRow>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelect
                         :label="t('country')"

src/components/CreateManualInvoiceForm.vue

@@ -46,6 +46,22 @@ const onDataSaved = async (formData, requestResponse) => {
         @on-fetch="(data) => (taxAreasOptions = data)"
         auto-load
     />
+    <FetchData
+        url="Tickets"
+        :filter="{
+            fields: ['id', 'nickname'],
+            where: { refFk: null },
+            order: 'shipped DESC',
+        }"
+        @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')"
@@ -59,7 +75,7 @@ const onDataSaved = async (formData, requestResponse) => {
                 <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
                 {{ t('Invoicing in progress...') }}
             </span>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
                     :label="t('Ticket')"
                     :options="ticketsOptions"
@@ -68,10 +84,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.ticketFk"
                     @update:model-value="data.clientFk = null"
-                    url="Tickets"
-                    :where="{ refFk: null }"
-                    :fields="['id', 'nickname']"
-                    :filter-options="{ order: 'shipped DESC' }"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -93,13 +105,10 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.clientFk"
                     @update:model-value="data.ticketFk = null"
-                    url="Clients"
-                    :fields="['id', 'name']"
-                    :filter-options="{ order: 'name ASC' }"
                 />
                 <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
                     :label="t('Serial')"
                     :options="invoiceOutSerialsOptions"
@@ -107,6 +116,7 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="description"
                     option-value="code"
                     v-model="data.serial"
+                    :required="true"
                 />
                 <VnSelect
                     :label="t('Area')"
@@ -115,9 +125,10 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="code"
                     option-value="code"
                     v-model="data.taxArea"
+                    :required="true"
                 />
             </VnRow>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     :label="t('Reference')"
                     type="textarea"

src/components/CreateNewCityForm.vue

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

src/components/CreateNewExpenseForm.vue

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

src/components/CreateNewPostcodeForm.vue

@@ -1,13 +1,13 @@
 <script setup>
-import { reactive, ref, watch } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import 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,15 +26,16 @@ const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
 const countriesOptions = ref([]);
 const provincesOptions = ref([]);
-const townsOptions = ref([]);
+const townsLocationOptions = ref([]);
-const town = ref({});
 
-function onDataSaved(formData) {
+const onDataSaved = (formData) => {
     const newPostcode = {
         ...formData,
     };
-    newPostcode.town = town.value.name;
+    const townObject = townsLocationOptions.value.find(
-    newPostcode.townFk = town.value.id;
+        ({ id }) => id === formData.townFk
+    );
+    newPostcode.town = townObject?.name;
     const provinceObject = provincesOptions.value.find(
         ({ id }) => id === formData.provinceFk
     );
@@ -42,115 +43,42 @@ function onDataSaved(formData) {
     const countryObject = countriesOptions.value.find(
         ({ id }) => id === formData.countryFk
     );
-    newPostcode.country = countryObject?.name;
+    newPostcode.country = countryObject?.country;
     emit('onDataSaved', newPostcode);
-}
+};
 
-async function onCityCreated(newTown, formData) {
+const onCityCreated = async ({ name, provinceFk }, formData) => {
+    await townsFetchDataRef.value.fetch();
+    formData.townFk = townsLocationOptions.value.find((town) => town.name === name).id;
+    formData.provinceFk = provinceFk;
+    formData.countryFk = provincesOptions.value.find(
+        (province) => province.id === provinceFk
+    ).countryFk;
+};
+
+const onProvinceCreated = async ({ name }, formData) => {
     await provincesFetchDataRef.value.fetch();
-    newTown.province = provincesOptions.value.find(
+    formData.provinceFk = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk
+        (province) => province.name === name
-    );
+    ).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 (Array.isArray(newCountryFk)) {
-            newCountryFk = newCountryFk[0];
-        }
-        if (Array.isArray(oldValueFk)) {
-            oldValueFk = oldValueFk[0];
-        }
-        if (!!oldValueFk && newCountryFk !== oldValueFk) {
-            postcodeFormData.provinceFk = null;
-            postcodeFormData.townFk = null;
-        }
-        if (oldValueFk !== newCountryFk) {
-            await provincesFetchDataRef.value.fetch({
-                where: {
-                    countryFk: newCountryFk,
-                },
-            });
-            await townsFetchDataRef.value.fetch({
-                where: {
-                    provinceFk: {
-                        inq: provincesOptions.value.map(({ id }) => id),
-                    },
-                },
-            });
-        }
-    }
-);
-
-watch(
-    () => postcodeFormData.provinceFk,
-    async (newProvinceFk) => {
-        if (Array.isArray(newProvinceFk)) {
-            newProvinceFk = newProvinceFk[0];
-        }
-        if (newProvinceFk !== postcodeFormData.provinceFk) {
-            await townsFetchDataRef.value.fetch({
-                where: { provinceFk: newProvinceFk },
-            });
-        }
-    }
-);
-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"
-        :sort-by="['name ASC']"
-        :limit="30"
-        auto-load
-        url="Provinces/location"
-    />
     <FetchData
         ref="townsFetchDataRef"
-        :sort-by="['name ASC']"
+        @on-fetch="(data) => (townsLocationOptions = data)"
-        :limit="30"
-        @on-fetch="handleTowns"
         auto-load
         url="Towns/location"
     />
     <FetchData
-        @on-fetch="handleCountries"
+        ref="provincesFetchDataRef"
-        :sort-by="['name ASC']"
+        @on-fetch="(data) => (provincesOptions = data)"
-        :limit="30"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
         auto-load
         url="Countries"
     />
@@ -160,65 +88,49 @@ async function handleCountries(data) {
         :title="t('New postcode')"
         :subtitle="t('Please, ensure you put the correct data!')"
         :form-initial-data="postcodeFormData"
-        :mapper="(data) => (data.townFk = data.townFk.id) && data"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     :label="t('Postcode')"
                     v-model="data.code"
                     :rules="validate('postcode.code')"
-                    clearable
                 />
                 <VnSelectDialog
                     :label="t('City')"
-                    @update:model-value="(value) => setTown(value, data)"
+                    :options="townsLocationOptions"
-                    :tooltip="t('Create city')"
                     v-model="data.townFk"
-                    :options="townsOptions"
+                    hide-selected
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
-                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                    :roles-allowed-to-create="['deliveryAssistant']"
-                    :emit-value="false"
-                    :clearable="true"
                 >
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ opt.name }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ opt.province.name }},
-                                    {{ opt.province.country.name }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
                     <template #form>
-                        <CreateNewCityForm
+                        <CreateNewCityForm @on-data-saved="onCityCreated($event, data)" />
-                            :country-fk="data.countryFk"
-                            :province-selected="data.provinceFk"
-                            :provinces="provincesOptions"
-                            @on-data-saved="
-                                (_, requestResponse) =>
-                                    onCityCreated(requestResponse, data)
-                            "
-                        />
                     </template>
                 </VnSelectDialog>
             </VnRow>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl">
-                <VnSelectProvince
+                <VnSelectDialog
-                    :country-fk="data.countryFk"
+                    :label="t('Province')"
-                    :province-selected="data.provinceFk"
+                    :options="provincesOptions"
-                    @update:model-value="(value) => setProvince(value, data)"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
                     v-model="data.provinceFk"
-                    :clearable="true"
+                    :rules="validate('postcode.provinceFk')"
-                    :provinces="provincesOptions"
+                    :roles-allowed-to-create="['deliveryAssistant']"
-                    @on-province-created="onProvinceCreated"
+                >
-                />
+                    <template #form>
-                <VnSelect
+                        <CreateNewProvinceForm
+                            @on-data-saved="onProvinceCreated($event, data)"
+                        />
+                    </template> </VnSelectDialog
+            ></VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl"
+                ><VnSelect
                     :label="t('Country')"
                     :options="countriesOptions"
                     hide-selected
@@ -235,7 +147,6 @@ async function handleCountries(data) {
 <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

@@ -16,23 +16,11 @@ 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, requestResponse) => {
+const onDataSaved = (dataSaved) => {
-    requestResponse.autonomy = autonomiesOptions.value.find(
+    emit('onDataSaved', dataSaved);
-        (autonomy) => autonomy.id == requestResponse.autonomyFk
-    );
-    emit('onDataSaved', dataSaved, requestResponse);
 };
 </script>
 
@@ -40,14 +28,7 @@ const onDataSaved = (dataSaved, requestResponse) => {
     <FetchData
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
-        :filter="{
+        url="Autonomies"
-            where: {
-                countryFk: $props.countryFk,
-            },
-        }"
-        url="Autonomies/location"
-        :sort-by="['name ASC']"
-        :limit="30"
     />
     <FormModelPopup
         :title="t('New province')"
@@ -55,10 +36,10 @@ const onDataSaved = (dataSaved, requestResponse) => {
         url-create="provinces"
         model="province"
         :form-initial-data="provinceFormData"
-        @on-data-saved="onDataSaved"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     :label="t('Name')"
                     v-model="data.name"
@@ -72,16 +53,7 @@ const onDataSaved = (dataSaved, requestResponse) => {
                     option-value="id"
                     v-model="data.autonomyFk"
                     :rules="validate('province.autonomyFk')"
-                >
+                />
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ opt.name }}</QItemLabel>
-                                <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CreateThermographForm.vue

@@ -50,10 +50,10 @@ const onDataSaved = (dataSaved) => {
         model="thermograph"
         :title="t('New thermograph')"
         :form-initial-data="thermographFormData"
-        @on-data-saved="(_, response) => onDataSaved(response)"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     :label="t('Identifier')"
                     v-model="data.thermographId"

src/components/CrudModel.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
-import { useRouter, onBeforeRouteLeave } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -67,7 +67,7 @@ const $props = defineProps({
         default: '',
         description: 'It is used for redirect on click "save and continue"',
     },
-    hasSubToolbar: {
+    hasSubtoolbar: {
         type: Boolean,
         default: true,
     },
@@ -97,31 +97,20 @@ defineExpose({
     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) {
+    if (data && Array.isArray(data)) {
+        let $index = 0;
+        data.map((d) => (d.$index = $index++));
+    }
+
     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));
 
@@ -189,11 +178,11 @@ async function saveChanges(data) {
     });
 }
 
-async function insert(pushData = $props.dataRequired) {
+async function insert() {
     const $index = formData.value.length
         ? formData.value[formData.value.length - 1].$index + 1
         : 0;
-    formData.value.push(Object.assign({ $index }, pushData));
+    formData.value.push(Object.assign({ $index }, $props.dataRequired));
     hasChanges.value = true;
 }
 
@@ -234,8 +223,6 @@ async function remove(data) {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
-    } else {
-        reset();
     }
     emit('update:selected', []);
 }
@@ -312,7 +299,7 @@ watch(formUrl, async () => {
         :url="url"
         :limit="limit"
         @on-fetch="fetch"
-        @on-change="fetch"
+        @on-change="resetData"
         :skeleton="false"
         ref="vnPaginateRef"
         v-bind="$attrs"
@@ -326,11 +313,8 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable
+    <SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
-        v-if="!formData && $attrs.autoLoad"
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
-        :columns="$attrs.columns?.length"
-    />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn

src/components/EditPictureForm.vue

@@ -245,14 +245,14 @@ const makeRequest = async () => {
                 </div>
 
                 <div class="column">
-                    <VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
                         <QOptionGroup
                             :options="uploadMethodsOptions"
                             type="radio"
                             v-model="uploadMethodSelected"
                         />
                     </VnRow>
-                    <VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
                         <QFile
                             v-if="uploadMethodSelected === 'computer'"
                             ref="inputFileRef"
@@ -287,7 +287,7 @@ const makeRequest = async () => {
                             placeholder="https://"
                         />
                     </VnRow>
-                    <VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
                         <VnSelect
                             :label="t('Orientation')"
                             :options="viewportTypes"

src/components/EditTableCellValueForm.vue

@@ -82,7 +82,7 @@ const closeForm = () => {
             <span class="title">{{ t('Edit') }}</span>
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
                     :label="t('Field to edit')"
                     :options="fieldsOptions"

src/components/FetchData.vue

@@ -44,7 +44,7 @@ onMounted(async () => {
 
 async function fetch(fetchFilter = {}) {
     try {
-        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
+        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
         if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;

src/components/FilterItemForm.vue

@@ -151,7 +151,7 @@ const selectItem = ({ id }) => {
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
                 <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                 <VnSelect

src/components/FilterTravelForm.vue

@@ -144,7 +144,7 @@ const selectTravel = ({ id }) => {
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('Filter travels') }}</h1>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
                     :label="t('entry.basicData.agency')"
                     :options="agenciesOptions"

src/components/FormModel.vue

@@ -22,7 +22,7 @@ const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
-const myForm = ref(null);
+
 const $props = defineProps({
     url: {
         type: String,
@@ -87,10 +87,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    defaultTrim: {
-        type: Boolean,
-        default: true,
-    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
@@ -104,19 +100,17 @@ const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
 const originalData = ref({});
 const formData = computed(() => state.get(modelValue));
+const formUrl = computed(() => $props.url);
 const defaultButtons = computed(() => ({
     save: {
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: () => myForm.value.submit(),
-        type: 'submit',
     },
     reset: {
         color: 'primary',
         icon: 'restart_alt',
         label: 'globals.reset',
-        click: () => reset(),
     },
     ...$props.defaultButtons,
 }));
@@ -154,22 +148,19 @@ if (!$props.url)
         (val) => updateAndEmit('onFetch', val)
     );
 
-watch(
+watch(formUrl, async () => {
-    () => [$props.url, $props.filter],
+    originalData.value = null;
-    async () => {
+    reset();
-        originalData.value = null;
+    await fetch();
-        reset();
+});
-        await fetch();
-    }
-);
 
 onBeforeRouteLeave((to, from, next) => {
     if (hasChanges.value && $props.observeFormChanges)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('globals.unsavedPopup.title'),
+                title: t('Unsaved changes will be lost'),
-                message: t('globals.unsavedPopup.subtitle'),
+                message: t('Are you sure exit without saving?'),
                 promise: () => next(),
             },
         });
@@ -202,7 +193,6 @@ async function save() {
 
     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 =
@@ -216,8 +206,11 @@ async function save() {
 
         updateAndEmit('onDataSaved', formData.value, response?.data);
         if ($props.reload) await arrayData.fetch({});
-        hasChanges.value = false;
+    } catch (err) {
+        console.error(err);
+        notify('errors.writeRequest', 'negative');
     } finally {
+        hasChanges.value = false;
         isLoading.value = false;
     }
 }
@@ -258,14 +251,6 @@ function updateAndEmit(evt, val, res) {
     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,
@@ -277,8 +262,7 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
-            ref="myForm"
+            
-            v-if="formData"
             @submit="save"
             @reset="reset"
             class="q-pa-md"
@@ -292,72 +276,70 @@ defineExpose({
                     :validate="validate"
                     :filter="filter"
                 />
-                <SkeletonForm v-else />
+                <SkeletonForm v-else/>
             </QCard>
         </QForm>
     </div>
     <Teleport
         to="#st-actions"
-        v-if="
+        v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
-            $props.defaultActions &&
-            stateStore?.isSubToolbarShown() &&
-            componentIsRendered
-        "
     >
-        <QBtnGroup push class="q-gutter-x-sm">
+        <div v-if="$props.defaultActions">
-            <slot name="moreActions" />
+            <QBtnGroup push class="q-gutter-x-sm">
-            <QBtn
+                <slot name="moreActions" />
-                :label="tMobile(defaultButtons.reset.label)"
+                <QBtn
-                :color="defaultButtons.reset.color"
+                    :label="tMobile(defaultButtons.reset.label)"
-                :icon="defaultButtons.reset.icon"
+                    :color="defaultButtons.reset.color"
-                flat
+                    :icon="defaultButtons.reset.icon"
-                @click="defaultButtons.reset.click"
+                    flat
-                :disable="!hasChanges"
+                    @click="reset"
-                :title="t(defaultButtons.reset.label)"
+                    :disable="!hasChanges"
-            />
+                    :title="t(defaultButtons.reset.label)"
-            <QBtnDropdown
+                />
-                v-if="$props.goTo"
+                <QBtnDropdown
-                @click="saveAndGo"
+                    v-if="$props.goTo"
-                :label="tMobile('globals.saveAndContinue')"
+                    @click="saveAndGo"
-                :title="t('globals.saveAndContinue')"
+                    :label="tMobile('globals.saveAndContinue')"
-                :disable="!hasChanges"
+                    :title="t('globals.saveAndContinue')"
-                color="primary"
+                    :disable="!hasChanges"
-                icon="save"
+                    color="primary"
-                split
+                    icon="save"
-            >
+                    split
-                <QList>
+                >
-                    <QItem
+                    <QList>
-                        clickable
+                        <QItem
-                        v-close-popup
+                            clickable
-                        @click="save"
+                            v-close-popup
-                        :title="t('globals.save')"
+                            @click="save"
-                    >
+                            :title="t('globals.save')"
-                        <QItemSection>
+                        >
-                            <QItemLabel>
+                            <QItemSection>
-                                <QIcon
+                                <QItemLabel>
-                                    name="save"
+                                    <QIcon
-                                    color="white"
+                                        name="save"
-                                    class="q-mr-sm"
+                                        color="white"
-                                    size="sm"
+                                        class="q-mr-sm"
-                                />
+                                        size="sm"
-                                {{ t('globals.save').toUpperCase() }}
+                                    />
-                            </QItemLabel>
+                                    {{ t('globals.save').toUpperCase() }}
-                        </QItemSection>
+                                </QItemLabel>
-                    </QItem>
+                            </QItemSection>
-                </QList>
+                        </QItem>
-            </QBtnDropdown>
+                    </QList>
-            <QBtn
+                </QBtnDropdown>
-                v-else
+                <QBtn
-                :label="tMobile('globals.save')"
+                    v-else
-                color="primary"
+                    :label="tMobile('globals.save')"
-                icon="save"
+                    color="primary"
-                @click="defaultButtons.save.click"
+                    icon="save"
-                :disable="!hasChanges"
+                    @click="save"
-                :title="t(defaultButtons.save.label)"
+                    :disable="!hasChanges"
-            />
+                    :title="t(defaultButtons.save.label)"
-        </QBtnGroup>
+                />
+            </QBtnGroup>
+        </div>
     </Teleport>
-
+    
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"
@@ -378,3 +360,8 @@ defineExpose({
     padding: 32px;
 }
 </style>
+<i18n>
+es:
+    Unsaved changes will be lost: Los cambios que no haya guardado se perderán
+    Are you sure exit without saving?: ¿Seguro que quiere salir sin guardar?
+</i18n>

src/components/FormModelPopup.vue

@@ -23,15 +23,18 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    if (closeButton.value) closeButton.value.click();
+    closeForm();
     emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
 
+const closeForm = async () => {
+    if (closeButton.value) closeButton.value.click();
+};
+
 defineExpose({
     isLoading,
-    onDataSaved,
 });
 </script>
 
@@ -61,7 +64,6 @@ defineExpose({
                     :loading="isLoading"
                     @click="emit('onDataCanceled')"
                     v-close-popup
-                    data-cy="FormModelPopup_cancel"
                 />
                 <QBtn
                     :label="t('globals.save')"
@@ -71,7 +73,6 @@ defineExpose({
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
-                    data-cy="FormModelPopup_save"
                 />
             </div>
         </template>

src/components/ItemsFilterPanel.vue

@@ -112,7 +112,6 @@ const getCategoryClass = (category, params) => {
 
 const getSelectedTagValues = async (tag) => {
     try {
-        if (!tag?.selectedTag?.id) return;
         tag.value = null;
         const filter = {
             fields: ['value'],
@@ -159,8 +158,8 @@ const removeTag = (index, params, search) => {
     />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :expr-builder="props.exprBuilder"
+        :expr-builder="exprBuilder"
-        :custom-tags="props.customTags"
+        :custom-tags="customTags"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
@@ -297,12 +296,11 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QBtn
+                <QIcon
-                    icon="add_circle"
+                    name="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, watch, ref, reactive } from 'vue';
+import { onMounted, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -29,15 +29,6 @@ onMounted(async () => {
     getRoutes();
 });
 
-watch(
-    () => route.matched,
-    () => {
-        items.value = [];
-        getRoutes();
-    },
-    { deep: true }
-);
-
 function findMatches(search, item) {
     const matches = [];
     function findRoute(search, item) {
@@ -67,7 +58,6 @@ function addChildren(module, route, parent) {
 }
 
 const items = ref([]);
-
 function getRoutes() {
     if (props.source === 'main') {
         const modules = Object.assign([], navigation.getModules().value);
@@ -76,9 +66,10 @@ function getRoutes() {
             const moduleDef = routes.find(
                 (route) => toLowerCamel(route.name) === item.module
             );
-            if (!moduleDef) continue;
             item.children = [];
 
+            if (!moduleDef) continue;
+
             addChildren(item.module, moduleDef, item.children);
         }
 

src/components/LeftMenuItem.vue

@@ -33,17 +33,13 @@ const itemComputed = computed(() => {
         <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>
+        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
-            {{ t(itemComputed.title) }}
-            <QTooltip v-if="item.keyBinding">
-                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
-            </QTooltip>
-        </QItemSection>
         <QItemSection side>
             <slot name="side" :item="itemComputed" />
         </QItemSection>
     </QItem>
 </template>
+
 <style lang="scss" scoped>
 .q-item {
     min-height: 5vh;

src/components/NavBar.vue

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

src/components/RefundInvoiceForm.vue

@@ -1,174 +0,0 @@
-<script setup>
-import { ref, reactive } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useDialogPluginComponent } from 'quasar';
-import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import FormPopup from './FormPopup.vue';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    invoiceOutData: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const { dialogRef } = useDialogPluginComponent();
-const { t } = useI18n();
-const router = useRouter();
-const { notify } = useNotify();
-
-const rectificativeTypeOptions = ref([]);
-const siiTypeInvoiceOutsOptions = ref([]);
-const invoiceParams = reactive({
-    id: $props.invoiceOutData?.id,
-    inheritWarehouse: true,
-});
-const invoiceCorrectionTypesOptions = ref([]);
-
-const refund = async () => {
-    const params = {
-        id: invoiceParams.id,
-        withWarehouse: invoiceParams.inheritWarehouse,
-        cplusRectificationTypeFk: invoiceParams.cplusRectificationTypeFk,
-        siiTypeInvoiceOutFk: invoiceParams.siiTypeInvoiceOutFk,
-        invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
-    };
-
-    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

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

src/components/TransferInvoiceForm.vue

@@ -2,12 +2,13 @@
 import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useQuasar, useDialogPluginComponent } from 'quasar';
+import { useQuasar } from 'quasar';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
+
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -18,18 +19,18 @@ const $props = defineProps({
     },
 });
 
-const { dialogRef } = useDialogPluginComponent();
 const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
-
-const rectificativeTypeOptions = ref([]);
-const siiTypeInvoiceOutsOptions = ref([]);
 const checked = ref(true);
 const transferInvoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    refFk: $props.invoiceOutData?.ref,
 });
+
+const rectificativeTypeOptions = ref([]);
+const siiTypeInvoiceOutsOptions = ref([]);
 const invoiceCorrectionTypesOptions = ref([]);
 
 const selectedClient = (client) => {
@@ -43,9 +44,10 @@ const makeInvoice = async () => {
     const params = {
         id: transferInvoiceParams.id,
         cplusRectificationTypeFk: transferInvoiceParams.cplusRectificationTypeFk,
-        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
         invoiceCorrectionTypeFk: transferInvoiceParams.invoiceCorrectionTypeFk,
         newClientFk: transferInvoiceParams.newClientFk,
+        refFk: transferInvoiceParams.refFk,
+        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
         makeInvoice: checked.value,
     };
 
@@ -72,7 +74,7 @@ const makeInvoice = async () => {
             }
         }
 
-        const { data } = await axios.post('InvoiceOuts/transfer', params);
+        const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
         notify(t('Transferred invoice'), 'positive');
         const id = data?.[0];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
@@ -114,95 +116,90 @@ const makeInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
-    <QDialog ref="dialogRef">
+    <FormPopup
-        <FormPopup
+        @on-submit="makeInvoice()"
-            @on-submit="makeInvoice()"
+        :title="t('Transfer invoice')"
-            :title="t('Transfer invoice')"
+        :custom-submit-button-label="t('Transfer client')"
-            :custom-submit-button-label="t('Transfer client')"
+        :default-cancel-button="false"
-            :default-cancel-button="false"
+    >
-        >
+        <template #form-inputs>
-            <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
-                <VnRow>
+                <VnSelect
-                    <VnSelect
+                    :label="t('Client')"
-                        :label="t('Client')"
+                    :options="clientsOptions"
-                        :options="clientsOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="name"
-                        option-label="name"
+                    option-value="id"
-                        option-value="id"
+                    v-model="transferInvoiceParams.newClientFk"
-                        v-model="transferInvoiceParams.newClientFk"
+                    :required="true"
-                        :required="true"
+                    url="Clients"
-                        url="Clients"
+                    :fields="['id', 'name', 'hasToInvoiceByAddress']"
-                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
+                    auto-load
-                        auto-load
+                >
-                    >
+                    <template #option="scope">
-                        <template #option="scope">
+                        <QItem
-                            <QItem
+                            v-bind="scope.itemProps"
-                                v-bind="scope.itemProps"
+                            @click="selectedClient(scope.opt)"
-                                @click="selectedClient(scope.opt)"
+                        >
-                            >
+                            <QItemSection>
-                                <QItemSection>
+                                <QItemLabel>
-                                    <QItemLabel>
+                                    #{{ scope.opt?.id }} - {{ scope.opt?.name }}
-                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
+                                </QItemLabel>
-                                    </QItemLabel>
+                            </QItemSection>
-                                </QItemSection>
+                        </QItem>
-                            </QItem>
+                    </template>
-                        </template>
+                </VnSelect>
-                    </VnSelect>
+                <VnSelect
-                    <VnSelect
+                    :label="t('Rectificative type')"
-                        :label="t('Rectificative type')"
+                    :options="rectificativeTypeOptions"
-                        :options="rectificativeTypeOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="description"
-                        option-label="description"
+                    option-value="id"
-                        option-value="id"
+                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                    :required="true"
-                        :required="true"
+                />
-                    />
+            </VnRow>
-                </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                <VnRow>
+                <VnSelect
-                    <VnSelect
+                    :label="t('Class')"
-                        :label="t('Class')"
+                    :options="siiTypeInvoiceOutsOptions"
-                        :options="siiTypeInvoiceOutsOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="description"
-                        option-label="description"
+                    option-value="id"
-                        option-value="id"
+                    v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                    :required="true"
-                        :required="true"
+                >
-                    >
+                    <template #option="scope">
-                        <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
-                            <QItem v-bind="scope.itemProps">
+                            <QItemSection>
-                                <QItemSection>
+                                <QItemLabel>
-                                    <QItemLabel>
+                                    {{ scope.opt?.code }} -
-                                        {{ scope.opt?.code }} -
+                                    {{ scope.opt?.description }}
-                                        {{ scope.opt?.description }}
+                                </QItemLabel>
-                                    </QItemLabel>
+                            </QItemSection>
-                                </QItemSection>
+                        </QItem>
-                            </QItem>
+                    </template>
-                        </template>
+                </VnSelect>
-                    </VnSelect>
+                <VnSelect
-                    <VnSelect
+                    :label="t('Type')"
-                        :label="t('Type')"
+                    :options="invoiceCorrectionTypesOptions"
-                        :options="invoiceCorrectionTypesOptions"
+                    hide-selected
-                        hide-selected
+                    option-label="description"
-                        option-label="description"
+                    option-value="id"
-                        option-value="id"
+                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+                    :required="true"
-                        :required="true"
+                />
-                    />
+            </VnRow>
-                </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                <VnRow>
+                <div>
-                    <div>
+                    <QCheckbox :label="t('Bill destination client')" v-model="checked" />
-                        <QCheckbox
+                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                            :label="t('Bill destination client')"
+                        <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
-                            v-model="checked"
+                    </QIcon>
-                        />
+                </div>
-                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+            </VnRow>
-                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
+        </template>
-                        </QIcon>
+    </FormPopup>
-                    </div>
-                </VnRow>
-            </template>
-        </FormPopup>
-    </QDialog>
 </template>
 
 <i18n>

src/components/UserPanel.vue

@@ -11,17 +11,13 @@ 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 VnImg from 'src/components/ui/VnImg.vue';
-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();
 const { copyText } = useClipboard();
-const { notify } = useNotify();
-
 const userLocale = computed({
     get() {
         return locale.value;
@@ -55,7 +51,6 @@ const user = state.getUser();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
-const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -73,28 +68,18 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    try {
+    await axios.patch(query, {
-        await axios.patch(query, {
+        darkMode: value,
-            darkMode: value,
+    });
-        });
+    user.value.darkMode = value;
-        user.value.darkMode = value;
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    try {
+    await axios.patch(query, {
-        await axios.patch(query, {
+        lang: value,
-            lang: value,
+    });
-        });
+    user.value.lang = value;
-        user.value.lang = value;
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
 }
 
 function logout() {
@@ -110,23 +95,10 @@ function localUserData() {
     state.setUser(user.value);
 }
 
-async function saveUserData(param, value) {
+function saveUserData(param, value) {
-    try {
+    axios.post('UserConfigs/setUserConfig', { [param]: value });
-        await axios.post('UserConfigs/setUserConfig', { [param]: value });
+    localUserData();
-        localUserData();
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
 }
-
-const onDataSaved = () => {
-    notify('globals.dataSaved', 'positive');
-};
-
-const onDataError = () => {
-    notify('errors.updateUserConfig', 'negative');
-};
 </script>
 
 <template>
@@ -137,14 +109,12 @@ const onDataError = () => {
         auto-load
     />
     <FetchData
-        v-if="isEmployee"
         url="Companies"
         order="name"
         @on-fetch="(data) => (companiesData = data)"
         auto-load
     />
     <FetchData
-        v-if="isEmployee"
         url="Accountings"
         order="name"
         @on-fetch="(data) => (accountBankData = data)"
@@ -161,7 +131,7 @@ const onDataError = () => {
                     @update:model-value="saveLanguage"
                     :label="t(`globals.lang['${userLocale}']`)"
                     icon="public"
-                    color="primary"
+                    color="orange"
                     false-value="es"
                     true-value="en"
                 />
@@ -170,7 +140,7 @@ const onDataError = () => {
                     @update:model-value="saveDarkMode"
                     :label="t(`globals.darkMode`)"
                     checked-icon="dark_mode"
-                    color="primary"
+                    color="orange"
                     unchecked-icon="light_mode"
                 />
             </div>
@@ -178,20 +148,10 @@ const onDataError = () => {
             <QSeparator vertical inset class="q-mx-lg" />
 
             <div class="col column items-center q-mb-sm">
-                <VnAvatar
+                <QAvatar size="80px">
-                    :worker-id="user.id"
+                    <VnImg :id="user.id" collection="user" size="160x160" />
-                    :title="user.name"
+                </QAvatar>
-                    size="xxl"
+
-                    color="transparent"
-                />
-                <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>
@@ -203,7 +163,7 @@ const onDataError = () => {
                 </div>
                 <QBtn
                     id="logout"
-                    color="primary"
+                    color="orange"
                     flat
                     :label="t('globals.logOut')"
                     size="sm"

src/components/VnSelectProvince.vue

@@ -1,85 +0,0 @@
-<script setup>
-import { ref } 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

@@ -35,9 +35,7 @@ function stopEventPropagation(event) {
             dense
             square
         >
-            <span v-if="!col.chip.icon">
+            <span v-if="!col.chip.icon">{{ row[col.name] }}</span>
-                {{ col.format ? col.format(row) : row[col.name] }}
-            </span>
             <QIcon v-else :name="col.chip.icon" color="primary-light" />
         </QChip>
     </span>

src/components/VnTable/VnColumn.vue

@@ -5,13 +5,9 @@ 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({
@@ -45,33 +41,20 @@ const $props = defineProps({
     },
 });
 
-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),
+        component: markRaw(VnInput),
         attrs: {
             disable: !$props.isEditable,
-            class: 'fit',
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
@@ -80,19 +63,9 @@ const defaultComponents = {
     date: {
         component: markRaw(VnInputDate),
         attrs: {
-            readonly: !$props.isEditable,
+            readonly: true,
             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,
@@ -100,14 +73,14 @@ const defaultComponents = {
     },
     checkbox: {
         component: markRaw(QCheckbox),
-        attrs: ({ model }) => {
+        attrs: (prop) => {
             const defaultAttrs = {
                 disable: !$props.isEditable,
-                'model-value': Boolean(model),
+                'model-value': Boolean(prop),
-                class: 'no-padding fit',
+                class: 'no-padding',
             };
 
-            if (typeof model == 'number') {
+            if (typeof prop == 'number') {
                 defaultAttrs['true-value'] = 1;
                 defaultAttrs['false-value'] = 0;
             }
@@ -118,19 +91,17 @@ const defaultComponents = {
         },
     },
     select: {
-        component: markRaw(VnSelectCache),
-        ...defaultSelect,
-    },
-    rawSelect: {
         component: markRaw(VnSelect),
-        ...defaultSelect,
+        attrs: {
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
     },
     icon: {
         component: markRaw(QIcon),
     },
-    userLink: {
-        component: markRaw(VnUserLink),
-    },
 };
 
 const value = computed(() => {
@@ -151,8 +122,8 @@ const col = computed(() => {
         };
     }
     if (
-        (/^is[A-Z]/.test(newColumn.name) || /^has[A-Z]/.test(newColumn.name)) &&
+        (newColumn.name.startsWith('is') || newColumn.name.startsWith('has')) &&
-        newColumn.component == null
+        !newColumn.component
     )
         newColumn.component = 'checkbox';
     if ($props.default && !newColumn.component) newColumn.component = $props.default;
@@ -163,19 +134,19 @@ const col = computed(() => {
 const components = computed(() => $props.components ?? defaultComponents);
 </script>
 <template>
-    <div class="row no-wrap">
+    <div class="row no-wrap fit">
         <VnComponent
             v-if="col.before"
             :prop="col.before"
             :components="components"
-            :value="{ row, model }"
+            :value="model"
             v-model="model"
         />
         <VnComponent
             v-if="col.component"
             :prop="col"
             :components="components"
-            :value="{ row, model }"
+            :value="model"
             v-model="model"
         />
         <span :title="value" v-else>{{ value }}</span>
@@ -183,7 +154,7 @@ const components = computed(() => $props.components ?? defaultComponents);
             v-if="col.after"
             :prop="col.after"
             :components="components"
-            :value="{ row, model }"
+            :value="model"
             v-model="model"
         />
     </div>

src/components/VnTable/VnFilter.vue

@@ -7,7 +7,6 @@ import { useArrayData } from 'composables/useArrayData';
 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({
@@ -28,9 +27,6 @@ const $props = defineProps({
         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);
@@ -43,23 +39,12 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
-    class: 'q-px-xs q-pb-xs q-pt-none fit',
+    class: 'q-px-sm q-pb-xs q-pt-none',
     dense: true,
 };
 
 const forceAttrs = {
-    label: $props.showTitle ? '' : columnFilter.value?.label ?? $props.column.label,
+    label: $props.showTitle ? '' : $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 = {
@@ -78,7 +63,6 @@ const components = {
         attrs: {
             ...defaultAttrs,
             clearable: true,
-            type: 'number',
         },
         forceAttrs,
     },
@@ -91,36 +75,33 @@ const components = {
         },
         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',
+            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs',
             'toggle-indeterminate': true,
         },
         forceAttrs,
     },
-    select: selectComponent,
+    select: {
-    rawSelect: selectComponent,
+        component: markRaw(VnSelect),
+        event: updateEvent,
+        attrs: {
+            class: 'q-px-md q-pb-xs q-pt-none',
+            dense: true,
+            filled: !$props.showTitle,
+        },
+        forceAttrs,
+    },
 };
 
-async function addFilter(value, name) {
+async function addFilter(value) {
     value ??= undefined;
     if (value && typeof value === 'object') value = model.value;
     value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name ?? name;
+    let field = columnFilter.value?.name ?? $props.column.name;
 
     if (columnFilter.value?.inWhere) {
         if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
@@ -146,11 +127,14 @@ const showFilter = computed(
 </script>
 <template>
     <div
-        v-if="showFilter"
+        v-if="showTitle"
-        class="full-width"
+        class="q-pt-sm q-px-sm ellipsis"
-        :class="alignRow()"
+        :class="`text-${column?.align ?? 'left'}`"
-        style="max-height: 45px; overflow: hidden"
+        :style="!showFilter ? { 'min-height': 72 + 'px' } : ''"
     >
+        {{ column?.label }}
+    </div>
+    <div v-if="showFilter" class="full-width" :class="alignRow()">
         <VnTableColumn
             :column="$props.column"
             default="input"

src/components/VnTable/VnOrder.vue

@@ -1,95 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useArrayData } from 'composables/useArrayData';
-const model = defineModel({ type: Object });
-const $props = defineProps({
-    name: {
-        type: [String, Boolean],
-        default: '',
-    },
-    label: {
-        type: String,
-        default: undefined,
-    },
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    searchUrl: {
-        type: String,
-        default: '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/VnVisibleColumn.vue

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

src/components/common/RightMenu.vue

@@ -37,7 +37,7 @@ const stateStore = useStateStore();
                 @click="stateStore.toggleRightDrawer()"
                 round
                 dense
-                icon="dock_to_left"
+                icon="menu"
             >
                 <QTooltip bottom anchor="bottom right">
                     {{ t('globals.collapseMenu') }}
@@ -46,7 +46,7 @@ const stateStore = useStateStore();
         </div>
     </Teleport>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit">
+        <QScrollArea class="fit text-grey-8">
             <div id="right-panel"></div>
             <slot v-if="!hasContent" name="right-panel" />
         </QScrollArea>

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: JSON.stringify(filter) },
+        params: { filter: 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.value.id },
+            where: { tableCode: $props.tableCode, userFk: user.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
@@ -74,17 +74,11 @@ 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.error('Error fetching config view data', err);
+        console.err('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/VnBtnSelect.vue

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

src/components/common/VnCard.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@@ -8,6 +8,7 @@ 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 },
@@ -16,47 +17,30 @@ const props = defineProps({
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
-    searchbarProps: { type: Object, default: undefined },
+    searchUrl: { type: String, default: undefined },
-    redirectOnError: { type: Boolean, default: false },
+    searchbarLabel: { type: String, default: '' },
+    searchbarInfo: { type: String, default: '' },
+    searchCustomRouteRedirect: { type: String, default: undefined },
+    searchRedirect: { type: Boolean, default: true },
+    searchMakeFetch: { type: Boolean, default: true },
 });
 
 const stateStore = useStateStore();
 const route = useRoute();
-const router = useRouter();
 const url = computed(() => {
-    if (props.baseUrl) {
+    if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
-        return `${props.baseUrl}/${route.params.id}`;
-    }
     return props.customUrl;
 });
-const searchRightDataKey = computed(() => {
+
-    if (!props.searchDataKey) return route.name;
-    return props.searchDataKey;
-});
 const arrayData = useArrayData(props.dataKey, {
     url: url.value,
     filter: props.filter,
 });
 
 onBeforeMount(async () => {
-    try {
+    if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+    await arrayData.fetch({ append: false });
-        await arrayData.fetch({ append: false, updateRouter: false });
-    } catch {
-        const { matched: matches } = router.currentRoute.value;
-        const { path } = matches.at(-1);
-        router.push({ path: path.replace(/:id.*/, '') });
-    }
 });
-
-if (props.baseUrl) {
-    onBeforeRouteUpdate(async (to, from) => {
-        if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-            await arrayData.fetch({ append: false, updateRouter: false });
-        }
-    });
-}
 </script>
 <template>
     <QDrawer
@@ -72,18 +56,26 @@ if (props.baseUrl) {
         </QScrollArea>
     </QDrawer>
     <slot name="searchbar" v-if="props.searchDataKey">
-        <VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
+        <VnSearchbar
+            :data-key="props.searchDataKey"
+            :url="props.searchUrl"
+            :label="props.searchbarLabel"
+            :info="props.searchbarInfo"
+            :custom-route-redirect-name="searchCustomRouteRedirect"
+            :redirect="searchRedirect"
+        />
     </slot>
+    <slot v-else name="searchbar" />
     <RightMenu>
         <template #right-panel v-if="props.filterPanel">
-            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
+            <component :is="props.filterPanel" :data-key="props.searchDataKey" />
         </template>
     </RightMenu>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.path" />
+                <RouterView />
             </div>
         </QPage>
     </QPageContainer>

src/components/common/VnChangePassword.vue

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

src/components/common/VnComponent.vue

@@ -12,7 +12,7 @@ const $props = defineProps({
         default: () => {},
     },
     value: {
-        type: [Object, Number, String, Boolean],
+        type: [Object, Number, String],
         default: () => {},
     },
 });
@@ -33,7 +33,7 @@ function mix(toComponent) {
             ...toComponent,
             ...toValueAttrs(customComponent?.forceAttrs),
         },
-        event: { ...customComponent?.event, ...event },
+        event: event ?? customComponent?.event,
     };
 }
 
@@ -54,6 +54,7 @@ function toValueAttrs(attrs) {
             v-bind="mix(toComponent).attrs"
             v-on="mix(toComponent).event ?? {}"
             v-model="model"
+            class="fit"
         />
     </span>
 </template>

src/components/common/VnCurrency.vue

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

src/components/common/VnDate.vue

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

src/components/common/VnDmsList.vue

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

src/components/common/VnInput.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useValidator } from 'src/composables/useValidator';
 
 const emit = defineEmits([
     'update:modelValue',
@@ -28,11 +27,9 @@ const $props = defineProps({
         default: true,
     },
 });
-const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
-
 const vnInputRef = ref(null);
 const value = computed({
     get() {
@@ -60,26 +57,21 @@ const focus = () => {
 defineExpose({
     focus,
 });
-import { useAttrs } from 'vue';
-const $attrs = useAttrs();
 
-const mixinRules = [
+const inputRules = [
-    requiredFieldRule,
-    ...($attrs.rules ?? []),
     (val) => {
-        const { min, max } = vnInputRef.value.$attrs;
+        const { min } = 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 @mouseover="hover = true" @mouseleave="hover = false">
+    <div
+        @mouseover="hover = true"
+        @mouseleave="hover = false"
+        :rules="$attrs.required ? [requiredFieldRule] : null"
+    >
         <QInput
             ref="vnInputRef"
             v-model="value"
@@ -88,7 +80,7 @@ const mixinRules = [
             :class="{ required: $attrs.required }"
             @keyup.enter="emit('keyup.enter')"
             :clearable="false"
-            :rules="mixinRules"
+            :rules="inputRules"
             :lazy-rules="true"
             hide-bottom-space
         >
@@ -96,19 +88,13 @@ const mixinRules = [
                 <slot name="prepend" />
             </template>
             <template #append>
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
                     v-if="hover && value && !$attrs.disabled && $props.clearable"
-                    @click="
+                    @click="value = null"
-                        () => {
-                            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 }}
@@ -121,13 +107,6 @@ const mixinRules = [
 <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;
-}
-</style>

src/components/common/VnInputDate.vue

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

src/components/common/VnInputNumber.vue

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

src/components/common/VnLocation.vue

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

src/components/common/VnLog.vue

@@ -1,7 +1,7 @@
 <script setup>
-import { ref, onUnmounted, watch } from 'vue';
+import { ref, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -14,13 +14,11 @@ import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.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: {
@@ -51,7 +49,6 @@ const filter = {
         'changedModelId',
         'changedModelValue',
         'description',
-        'summaryId',
     ],
     include: [
         {
@@ -67,10 +64,9 @@ const filter = {
             },
         },
     ],
-    where: { and: [{ originFk: route.params.id }] },
 };
 
-const paginate = ref();
+const workers = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -216,7 +212,7 @@ function getLogTree(data) {
         }
         nLogs++;
         modelLog.logs.push(log);
-        modelLog.summaryId = modelLog.logs[0].summaryId;
+
         // Changes
         const notDelete = log.action != 'delete';
         const olds = (notDelete ? log.oldInstance : null) || {};
@@ -237,7 +233,9 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree(data) {
+async function setLogTree() {
+    filter.where = { and: [{ originFk: route.params.id }] };
+    const { data } = await getLogs(filter);
     logTree.value = getLogTree(data);
 }
 
@@ -266,7 +264,15 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    paginate.value.fetch(filter);
+    const { data } = await getLogs(filter);
+
+    logTree.value = getLogTree(data);
+}
+
+async function getLogs(filter) {
+    return axios.get(props.url ?? `${props.model}Logs`, {
+        params: { filter: JSON.stringify(filter) },
+    });
 }
 
 function setDate(type) {
@@ -369,313 +375,257 @@ 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(
+                        locale: useCapitalize(validations[item.changedModel].locale.name),
-                            validations[changedModel]?.locale?.name ?? changedModel
+                        value: item.changedModel,
-                        ),
-                        value: changedModel,
                     };
                 }))
         "
         auto-load
     />
-    <VnPaginate
+    <div
-        ref="paginate"
+        class="column items-center logs origin-log q-mt-md"
-        :data-key="`${model}Log`"
+        v-for="(originLog, originLogIndex) in logTree"
-        :url="`${model}Logs`"
+        :key="originLogIndex"
-        :filter="filter"
-        :skeleton="false"
-        auto-load
-        @on-fetch="setLogTree"
-        search-url="logs"
     >
-        <template #body>
+        <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
-            <div
+            <h6 class="origin-id text-grey">
-                class="column items-center logs origin-log q-mt-md"
+                {{ useCapitalize(validations[props.model].locale.name) }}
-                v-for="(originLog, originLogIndex) in logTree"
+                #{{ originLog.originFk }}
-                :key="originLogIndex"
+            </h6>
-            >
+            <div class="line bg-grey"></div>
-                <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
+        </QItem>
-                    <h6 class="origin-id text-grey">
+        <div
-                        {{ useCapitalize(validations[props.model].locale.name) }}
+            class="user-log q-mb-sm"
-                        #{{ originLog.originFk }}
+            v-for="(userLog, userIndex) in originLog.logs"
-                    </h6>
+            :key="userIndex"
-                    <div class="line bg-grey"></div>
+        >
-                </QItem>
+            <div class="timeline">
-                <div
+                <div class="user-avatar">
-                    class="user-log q-mb-sm"
+                    <VnUserLink :worker-id="userLog?.user?.id">
-                    v-for="(userLog, userIndex) in originLog.logs"
+                        <template #link>
-                    :key="userIndex"
+                            <VnAvatar
+                                :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                :worker-id="userLog?.user?.id"
+                                :title="userLog?.user?.nickname"
+                                :show-letter="!userLog?.user"
+                                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"
                 >
-                    <div class="timeline">
+                    <QItemSection>
-                        <div class="user-avatar">
+                        <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
-                            <VnUserLink :worker-id="userLog?.user?.id">
+                            <QChip
-                                <template #link>
+                                dense
-                                    <VnAvatar
+                                size="md"
-                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                class="model-name q-mr-xs text-white"
-                                        :worker-id="userLog?.user?.id"
+                                v-if="
-                                        :title="userLog?.user?.nickname"
+                                    !(modelLog.changedModel && modelLog.changedModelId) &&
-                                        :show-letter="!userLog?.user"
+                                    modelLog.model
-                                        size="lg"
+                                "
-                                    />
+                                :style="{
-                                </template>
+                                    backgroundColor: useColor(modelLog.model),
-                            </VnUserLink>
+                                }"
-                        </div>
+                                :title="modelLog.model"
-                        <div class="arrow bg-panel" v-if="byRecord"></div>
+                            >
-                        <div class="line"></div>
+                                {{ t(modelLog.modelI18n) }}
-                    </div>
+                            </QChip>
-                    <QList class="user-changes" v-if="userLog">
+                            <span class="model-id" v-if="modelLog.id"
-                        <QItem
+                                >#{{ modelLog.id }}</span
-                            class="model-log column q-px-none q-py-xs"
+                            >
-                            v-for="(modelLog, modelLogIndex) in userLog.logs"
+                            <span class="model-value" :title="modelLog.showValue">
-                            :key="modelLogIndex"
+                                {{ modelLog.showValue }}
+                            </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"
                         >
-                            <QItemSection>
+                            <QCardSection class="change-info q-pa-none">
-                                <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
+                                <QItem
-                                    <QChip
+                                    class="q-px-sm q-py-xs justify-between items-center"
-                                        dense
-                                        size="md"
-                                        class="model-name q-mr-xs text-white"
-                                        v-if="
-                                            !(
-                                                modelLog.changedModel &&
-                                                modelLog.changedModelId
-                                            ) && modelLog.model
-                                        "
-                                        :style="{
-                                            backgroundColor: useColor(modelLog.model),
-                                        }"
-                                        :title="`${modelLog.model} #${modelLog.id}`"
-                                    >
-                                        {{ t(modelLog.modelI18n) }}
-                                    </QChip>
-
-                                    <span
-                                        class="model-id q-mr-xs"
-                                        v-if="modelLog.summaryId"
-                                        v-text="`#${modelLog.summaryId}`"
-                                    />
-                                    <span
-                                        class="model-value"
-                                        :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">
+                                    <div
-                                        <QItem
+                                        class="date text-grey text-caption q-mr-sm"
-                                            class="q-px-sm q-py-xs justify-between items-center"
+                                        :title="
-                                        >
+                                            date.formatDate(
-                                            <div
+                                                log.creationDate,
-                                                class="date text-grey text-caption q-mr-sm"
+                                                'DD/MM/YYYY hh:mm:ss'
-                                                :title="
+                                            ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
-                                                    date.formatDate(
+                                        "
-                                                        log.creationDate,
-                                                        'DD/MM/YYYY hh:mm:ss'
-                                                    ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
-                                                "
-                                            >
-                                                {{ toRelativeDate(log.creationDate) }}
-                                            </div>
-                                            <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
+                                        {{ toRelativeDate(log.creationDate) }}
-                                            class="cursor-pointer q-mr-md"
+                                    </div>
+                                    <div>
+                                        <QBtn
                                             color="grey"
-                                            name="expand_more"
+                                            class="pit"
-                                            :title="t('globals.details')"
+                                            icon="preview"
-                                            size="sm"
+                                            flat
-                                            @click="log.expand = !log.expand"
+                                            round
-                                        />
+                                            :title="t('pointRecord')"
-                                        <span v-if="log.props.length" class="attributes">
+                                            padding="none"
-                                            <span
+                                            v-if="log.action != 'insert'"
-                                                v-if="!log.expand"
+                                            @click.stop="
-                                                class="q-pa-none text-grey"
+                                                openPointRecord(log.id, modelLog)
-                                            >
+                                            "
-                                                <span
+                                        >
-                                                    v-for="(prop, propIndex) in log.props"
+                                            <QPopupProxy>
-                                                    :key="propIndex"
+                                                <QCard v-if="pointRecord">
-                                                    class="basic-json"
+                                                    <div
-                                                >
+                                                        class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                                                    <span
-                                                        class="json-field"
-                                                        :title="prop.name"
                                                     >
-                                                        {{ prop.nameI18n }}:
+                                                        {{ modelLog.modelI18n }}
-                                                    </span>
+                                                        <span v-if="modelLog.id"
-                                                    <VnJsonValue :value="prop.val.val" />
+                                                            >#{{ modelLog.id }}</span
-                                                    <span
+                                                        >
-                                                        v-if="
+                                                    </div>
-                                                            propIndex <
+                                                    <QCardSection
-                                                            log.props.length - 1
+                                                        class="change-detail q-pa-sm"
-                                                        "
+                                                    >
-                                                        >,&nbsp;
+                                                        <QItem
-                                                    </span>
+                                                            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="expanded-json column q-pa-none"
+                                    >
+                                        <div
+                                            v-for="(prop, prop2Index) in log.props"
+                                            :key="prop2Index"
+                                            class="q-pa-none text-grey"
+                                        >
+                                            <span class="json-field" :title="prop.name">
+                                                {{ prop.nameI18n }}:
+                                            </span>
+                                            <VnJsonValue :value="prop.val.val" />
+                                            <span v-if="prop.val.id" class="id-value">
+                                                #{{ prop.val.id }}
+                                            </span>
+                                            <span v-if="log.action == 'update'">
+                                                ←
+                                                <VnJsonValue :value="prop.old.val" />
+                                                <span v-if="prop.old.id" class="id-value">
+                                                    #{{ prop.old.id }}
                                                 </span>
                                             </span>
-                                            <span
+                                        </div>
-                                                v-if="log.expand"
+                                    </span>
-                                                class="expanded-json column q-pa-none"
+                                </span>
-                                            >
+                                <span v-if="!log.props.length" class="description">
-                                                <div
+                                    {{ log.description }}
-                                                    v-for="(
+                                </span>
-                                                        prop, prop2Index
+                            </QCardSection>
-                                                    ) in log.props"
+                        </QCard>
-                                                    :key="prop2Index"
+                    </QItemSection>
-                                                    class="q-pa-none text-grey"
+                </QItem>
-                                                >
+            </QList>
-                                                    <span
+        </div>
-                                                        class="json-field"
+    </div>
-                                                        :title="prop.name"
-                                                    >
-                                                        {{ prop.nameI18n }}:
-                                                    </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
-                                                        #{{ prop.val.id }}
-                                                    </span>
-                                                    <span v-if="log.action == 'update'">
-                                                        ←
-                                                        <VnJsonValue
-                                                            :value="prop.old.val"
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                        >
-                                                            #{{ prop.old.id }}
-                                                        </span>
-                                                    </span>
-                                                </div>
-                                            </span>
-                                        </span>
-                                        <span
-                                            v-if="!log.props.length"
-                                            class="description"
-                                        >
-                                            {{ log.description }}
-                                        </span>
-                                    </QCardSection>
-                                </QCard>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-            </div>
-        </template>
-    </VnPaginate>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QList dense>
             <QSeparator />
@@ -724,16 +674,17 @@ watch(
                 </QOptionGroup>
             </QItem>
             <QItem class="q-mt-sm">
-                <QItemSection v-if="userRadio !== null">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers && userRadio !== null">
                     <VnSelect
                         class="full-width"
                         :label="t('globals.user')"
                         v-model="userSelect"
                         option-label="name"
                         option-value="id"
-                        :url="`${model}Logs/${$route.params.id}/editors`"
+                        :options="workers"
-                        :fields="['id', 'nickname', 'name', 'image']"
-                        sort-by="nickname"
                         @update:model-value="selectFilter('userSelect')"
                         hide-selected
                     >

src/components/common/VnProgressModal.vue

@@ -9,6 +9,10 @@ const $props = defineProps({
         type: Number, //Progress value (1.0 > x > 0.0)
         required: true,
     },
+    showDialog: {
+        type: Boolean,
+        required: true,
+    },
     cancelled: {
         type: Boolean,
         required: false,
@@ -20,22 +24,30 @@ const emit = defineEmits(['cancel', 'close']);
 
 const dialogRef = ref(null);
 
-const showDialog = defineModel('showDialog', {
+const _showDialog = computed({
-    type: Boolean,
+    get: () => $props.showDialog,
-    default: false,
+    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="emit('close')">
+    <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 v-close-popup />
+                <QBtn icon="close" flat round dense @click="emit('close')" />
             </QCardSection>
             <QCardSection>
                 <div class="column">
@@ -68,7 +80,7 @@ const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
                     type="button"
                     flat
                     class="text-primary"
-                    v-close-popup
+                    @click="cancel()"
                 >
                     {{ t('globals.cancel') }}
                 </QBtn>

src/components/common/VnSelect.vue

@@ -1,9 +1,8 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
+import { ref, toRefs, computed, watch, onMounted } 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']);
-const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 
 const $props = defineProps({
     modelValue: {
@@ -26,22 +25,14 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    optionFilterValue: {
-        type: String,
-        default: null,
-    },
     url: {
         type: String,
-        default: null,
+        default: '',
     },
     filterOptions: {
         type: [Array],
         default: () => [],
     },
-    exprBuilder: {
-        type: Function,
-        default: null,
-    },
     isClearable: {
         type: Boolean,
         default: true,
@@ -54,10 +45,6 @@ const $props = defineProps({
         type: Array,
         default: null,
     },
-    include: {
-        type: [Object, Array],
-        default: null,
-    },
     where: {
         type: Object,
         default: null,
@@ -74,78 +61,37 @@ const $props = defineProps({
         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 requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
-const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
+
-    toRefs($props);
+const { optionLabel, optionValue, optionFilter, 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));
-    emit('update:options', data);
 }
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
+});
 
 function filter(val, options) {
-    const search = val?.toString()?.toLowerCase();
+    const search = val.toString().toLowerCase();
 
     if (!search) return options;
 
@@ -157,8 +103,7 @@ function filter(val, options) {
             });
         }
 
-        if (!row) return;
+        const id = row.id;
-        const id = row[$props.optionValue];
         const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
         return id == search || optionLabel.includes(search);
@@ -168,50 +113,25 @@ function filter(val, options) {
 async function fetchFilter(val) {
     if (!$props.url || !dataRef.value) return;
 
-    const { fields, include, sortBy, limit } = $props;
+    const { fields, sortBy, limit } = $props;
-    const key =
+    let key = optionLabel.value;
-        optionFilterValue.value ??
-        (new RegExp(/\d/g).test(val)
-            ? optionValue.value
-            : optionFilter.value ?? optionLabel.value);
 
-    let defaultWhere = {};
+    if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
-    if ($props.filterOptions.length) {
+
-        defaultWhere = $props.filterOptions.reduce((obj, prop) => {
+    const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
-            if (!obj.or) obj.or = [];
+    const fetchOptions = { where, order: sortBy, limit };
-            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 (
+    let newOptions;
-        $props.url &&
+    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) => {
@@ -223,13 +143,18 @@ async function filterHandler(val, update) {
     );
 }
 
-function nullishToTrue(value) {
+watch(options, (newValue) => {
-    return value ?? true;
+    setOptions(newValue);
-}
+});
 
-const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+watch(modelValue, (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
 
-defineExpose({ opts: myOptions });
+onMounted(async () => {
+    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
 </script>
 
 <template>
@@ -241,7 +166,6 @@ defineExpose({ opts: myOptions });
         :limit="limit"
         :sort-by="sortBy"
         :fields="fields"
-        :params="params"
     />
     <QSelect
         v-model="value"
@@ -249,29 +173,23 @@ defineExpose({ opts: myOptions });
         :option-label="optionLabel"
         :option-value="optionValue"
         v-bind="$attrs"
+        emit-value
+        map-options
+        use-input
         @filter="filterHandler"
-        :emit-value="nullishToTrue($attrs['emit-value'])"
+        hide-selected
-        :map-options="nullishToTrue($attrs['map-options'])"
+        fill-input
-        :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"
+        :rules="$attrs.required ? [requiredFieldRule] : null"
         virtual-scroll-slice-size="options.length"
-        hide-bottom-space
     >
         <template v-if="isClearable" #append>
             <QIcon
                 v-show="value"
                 name="close"
-                @click.stop="
+                @click.stop="value = null"
-                    () => {
-                        value = null;
-                        emit('remove');
-                    }
-                "
                 class="cursor-pointer"
                 size="xs"
             />

src/components/common/VnSelectCache.vue

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

src/components/common/VnSelectDialog.vue

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

src/components/common/VnSelectEnum.vue

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

src/components/common/VnTime.vue

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

src/components/common/VnTitle.vue

@@ -7,7 +7,7 @@ defineProps({
 </script>
 <template>
     <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
-        <div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
+        <div class="header-link">
             <a :href="url" :class="url ? 'link' : 'color-vn-text'">
                 {{ text }}
                 <QIcon v-if="url" :name="icon" />

src/components/ui/CardDescriptor.vue

@@ -46,8 +46,7 @@ let arrayData;
 let store;
 let entity;
 const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+
-const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -57,19 +56,12 @@ onBeforeMount(async () => {
         skip: 0,
     });
     store = arrayData.store;
-    entity = computed(() => {
+    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
-        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();
+    if ($props.dataKey !== route.meta.moduleName || !route.params.id) await getData();
     watch(
         () => [$props.url, $props.filter],
-        async () => {
+        async () => await getData()
-            if (!isSameDataKey.value) await getData();
-        }
     );
 });
 
@@ -85,50 +77,14 @@ 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
@@ -171,9 +127,9 @@ const toModule = computed(() =>
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu :ref="menuRef">
+                    <QMenu>
                         <QList>
-                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                            <slot name="menu" :entity="entity" />
                         </QList>
                     </QMenu>
                 </QBtn>
@@ -183,8 +139,8 @@ const toModule = computed(() =>
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
                         <div class="title">
-                            <span v-if="$props.title" :title="getValueFromPath(title)">
+                            <span v-if="$props.title" :title="$props.title">
-                                {{ getValueFromPath(title) ?? $props.title }}
+                                {{ entity[title] ?? $props.title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span :title="entity.name">
@@ -195,7 +151,7 @@ const toModule = computed(() =>
                     </QItemLabel>
                     <QItem dense>
                         <QItemLabel class="subtitle" caption>
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                            #{{ $props.subtitle ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>

src/components/ui/CardSummary.vue

@@ -187,10 +187,15 @@ function existSummary(routes) {
                 color: lighten($primary, 20%);
             }
             .q-checkbox {
+                display: flex;
+                margin-bottom: 9px;
                 & .q-checkbox__label {
+                    margin-left: 31px;
                     color: var(--vn-text-color);
                 }
                 & .q-checkbox__inner {
+                    position: absolute;
+                    left: 0;
                     color: var(--vn-label-color);
                 }
             }

src/components/ui/FetchedTags.vue

@@ -2,6 +2,10 @@
 import { computed } from 'vue';
 
 const $props = defineProps({
+    maxLength: {
+        type: Number,
+        required: true,
+    },
     item: {
         type: Object,
         required: true,

src/components/ui/QCalendarMonthWrapper.vue

@@ -52,8 +52,8 @@ 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: var(--vn-section-color);
+    --calendar-outside-background-dark: #222;
-    --calendar-background-dark: var(--vn-section-color);
+    --calendar-background-dark: #222;
 }
 
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
@@ -70,26 +70,8 @@ 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;
 }
@@ -128,6 +110,11 @@ const containerClasses = computed(() => {
             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;
@@ -137,7 +124,6 @@ const containerClasses = computed(() => {
         height: 32px;
         display: flex;
         justify-content: center;
-        color: var(--vn-label-color);
     }
 
     .q-calendar__button--bordered {
@@ -161,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: var(--vn-label-color);
+        color: $color-font-secondary;
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/VnAvatar.vue

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

src/components/ui/VnConfirm.vue

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

src/components/ui/VnFilterPanel.vue

@@ -10,7 +10,7 @@ const { t } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,
-        default: () => {},
+        default: () => {}
     },
     dataKey: {
         type: String,
@@ -18,6 +18,7 @@ const $props = defineProps({
     },
     searchButton: {
         type: Boolean,
+        required: false,
         default: false,
     },
     showAll: {
@@ -28,8 +29,8 @@ const $props = defineProps({
         type: Array,
         required: false,
         default: () => [],
-        description: `Some filters come with default search parameters and require a value.
+        description:
-            This prop helps us determine which filters can be removed and which cannot.`,
+            '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',
     },
     exprBuilder: {
         type: Function,
@@ -37,7 +38,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'search', 'or', 'and'],
+        default: () => ['filter'],
     },
     customTags: {
         type: Array,
@@ -57,16 +58,7 @@ const $props = defineProps({
     },
 });
 
-defineExpose({ search, sanitizer });
+const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
-const emit = defineEmits([
-    'update:modelValue',
-    'refresh',
-    'clear',
-    'search',
-    'init',
-    'remove',
-    'setUserParams',
-]);
 
 const arrayData = useArrayData($props.dataKey, {
     exprBuilder: $props.exprBuilder,
@@ -75,89 +67,84 @@ const arrayData = useArrayData($props.dataKey, {
 });
 const route = useRoute();
 const store = arrayData.store;
-const userParams = ref({});
+const userParams = ref({})
 onMounted(() => {
-    userParams.value = $props.modelValue ?? {};
+    userParams.value = $props.modelValue ?? {}
     emit('init', { params: userParams.value });
 });
 
 function setUserParams(watchedParams) {
-    if (!watchedParams || Object.keys(watchedParams).length == 0) return;
+    if (!watchedParams) 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);
+    userParams.value = { ...userParams.value, ...watchedParams };
-    emit('setUserParams', userParams.value, order);
 }
 
 watch(
     () => route.query[$props.searchUrl],
-    (val, oldValue) => (val || oldValue) && setUserParams(val)
+    (val) => setUserParams(val)
 );
 
 watch(
     () => arrayData.store.userParams,
-    (val, oldValue) => (val || oldValue) && setUserParams(val)
+    (val) => setUserParams(val)
-);
-
-watch(
-    () => $props.modelValue,
-    (val) => (userParams.value = val ?? {})
 );
 
 const isLoading = ref(false);
 async function search(evt) {
-    try {
+    if (evt && $props.disableSubmitEvent) return;
-        if (evt && $props.disableSubmitEvent) return;
 
-        store.filter.where = {};
+    store.filter.where = {};
-        isLoading.value = true;
+    isLoading.value = true;
-        const filter = { ...userParams.value, ...$props.modelValue };
+    const filter = { ...userParams.value };
-        store.userParamsChanged = true;
+    store.userParamsChanged = true;
-        const { params: newParams } = await arrayData.addFilter({
+    store.filter.skip = 0;
-            params: filter,
+    store.skip = 0;
-        });
+    const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
-        userParams.value = newParams;
+    userParams.value = newParams;
 
-        if (!$props.showAll && !Object.values(filter).length) store.data = [];
+    if (!$props.showAll && !Object.values(filter).length) store.data = [];
-        emit('search');
+
-    } finally {
+    isLoading.value = false;
-        isLoading.value = false;
+    emit('search');
-    }
+}
+
+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() {
-    try {
+    isLoading.value = true;
-        isLoading.value = true;
+    store.userParamsChanged = true;
-        store.userParamsChanged = true;
+    store.filter.skip = 0;
-        arrayData.reset(['skip', 'filter.skip', 'page']);
+    store.skip = 0;
-        // 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 = {};
-        userParams.value = { ...newParams }; // Actualizar los params con los removibles
-        await arrayData.applyFilter({ params: userParams.value });
-
-        if (!$props.showAll) {
-            store.data = [];
-        }
-        emit('clear');
-        emit('update:modelValue', userParams.value);
-    } finally {
-        isLoading.value = false;
     }
+    userParams.value = {};
+    userParams.value = { ...newParams }; // Actualizar los params con los removibles
+    await arrayData.applyFilter({ params: userParams.value });
+
+    if (!$props.showAll) {
+        store.data = [];
+    }
+
+    isLoading.value = false;
+    emit('clear');
 }
 
 const tagsList = computed(() => {
@@ -171,17 +158,16 @@ const tagsList = computed(() => {
 });
 
 const tags = computed(() => {
-    return tagsList.value.filter((tag) => !($props.customTags || []).includes(tag.label));
+    return tagsList.value.filter((tag) => !($props.customTags || []).includes(tag.key));
 });
 const customTags = computed(() =>
-    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
+    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.key))
 );
 
 async function remove(key) {
     userParams.value[key] = undefined;
     search();
     emit('remove', key);
-    emit('update:modelValue', userParams.value);
 }
 
 function formatValue(value) {
@@ -190,28 +176,10 @@ function formatValue(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>
-    <QBtn
+    <QForm @submit="search" id="filterPanelForm">
-        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>
@@ -220,18 +188,32 @@ function sanitizer(params) {
                     </QItemLabel>
                 </QItemSection>
                 <QItemSection top side>
-                    <QBtn
+                    <div class="q-gutter-xs">
-                        @click="clearFilters"
+                        <QBtn
-                        color="primary"
+                            @click="clearFilters"
-                        dense
+                            color="primary"
-                        flat
+                            dense
-                        icon="filter_list_off"
+                            flat
-                        padding="none"
+                            icon="filter_list_off"
-                        round
+                            padding="none"
-                        size="sm"
+                            round
-                    >
+                            size="sm"
-                        <QTooltip>{{ t('Remove filters') }}</QTooltip>
+                        >
-                    </QBtn>
+                            <QTooltip>{{ t('Remove filters') }}</QTooltip>
+                        </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">
@@ -245,7 +227,7 @@ function sanitizer(params) {
                     <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">
@@ -268,8 +250,25 @@ function sanitizer(params) {
             <QSeparator />
         </QList>
         <QList dense class="list q-gutter-y-sm q-mt-sm">
-            <slot name="body" :params="sanitizer(userParams)" :search-fn="search"></slot>
+            <slot name="body" :params="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="disableSubmitEvent ? 'button' : 'submit'"
+                        unelevated
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+        </template>
     </QForm>
     <QInnerLoading
         :label="t('globals.pleaseWait')"

src/components/ui/VnImg.vue

@@ -1,8 +1,6 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useSession } from 'src/composables/useSession';
-import noImage from '/no-user.png';
-import { useRole } from 'src/composables/useRole';
 
 const $props = defineProps({
     storage: {
@@ -13,17 +11,14 @@ const $props = defineProps({
         type: String,
         default: 'catalog',
     },
-    resolution: {
+    size: {
         type: String,
         default: '200x200',
     },
-    zoomResolution: {
+    zoomSize: {
         type: String,
-        default: null,
+        required: false,
-    },
+        default: 'lg',
-    zoom: {
-        type: Boolean,
-        default: true,
     },
     id: {
         type: Number,
@@ -33,50 +28,35 @@ const $props = defineProps({
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
-const isEmployee = useRole().isEmployee();
+const url = computed(
-
+    () =>
-const getUrl = (zoom = false) => {
+        `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
-    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,
 });
+
+onMounted(() => {});
 </script>
 <template>
-    <QImg
+    <QImg :src="url" v-bind="$attrs" @click="show = !show" spinner-color="primary" />
-        :draggable="true"
+    <QDialog v-model="show" v-if="$props.zoomSize">
-        :class="{ zoomIn: zoom }"
-        :src="getUrl()"
-        v-bind="$attrs"
-        @click.stop="show = $props.zoom"
-        spinner-color="primary"
-    />
-    <QDialog v-if="$props.zoom" v-model="show">
         <QImg
-            :draggable="true"
+            :src="url"
-            :src="getUrl(true)"
+            size="full"
+            class="img_zoom"
             v-bind="$attrs"
             spinner-color="primary"
-            class="img_zoom"
-            :ratio="0"
         />
     </QDialog>
 </template>
+
 <style lang="scss" scoped>
 .q-img {
-    &.zoomIn {
+    cursor: zoom-in;
-        cursor: zoom-in;
-    }
     min-width: 50px;
 }
 .rounded {

src/components/ui/VnLv.vue

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

src/components/ui/VnNotes.vue

@@ -1,70 +1,40 @@
 <script setup>
-import axios from 'axios';
+import VnAvatar from 'src/components/ui/VnAvatar.vue';
-import { ref, reactive } from 'vue';
-import { onBeforeRouteLeave } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-
 import { toDateHourMin } from 'src/filters';
+import { ref } from 'vue';
+import axios from 'axios';
+import { useI18n } from 'vue-i18n';
+import VnPaginate from './VnPaginate.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 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';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import VnInput from 'components/common/VnInput.vue';
-
 const $props = defineProps({
     url: { type: String, default: null },
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
-    selectType: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
 const state = useState();
-const quasar = useQuasar();
 const currentUser = ref(state.getUser());
-const newNote = reactive({ text: null, observationTypeFk: null });
+const newNote = ref('');
-const observationTypes = ref([]);
 const vnPaginateRef = ref();
-
+function handleKeyUp(event) {
-async function insert() {
+    if (event.key === 'Enter') {
-    if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
+        event.preventDefault();
-
+        if (!event.shiftKey) insert();
-    const body = $props.body;
+    }
-    const newBody = {
+}
-        ...body,
+async function insert() {
-        ...{ text: newNote.text, observationTypeFk: newNote.observationTypeFk },
+    const body = $props.body;
-    };
+    Object.assign(body, { text: newNote.value });
-    await axios.post($props.url, newBody);
+    await axios.post($props.url, body);
-    await vnPaginateRef.value.fetch();
+    await vnPaginateRef.value.fetch();
+    newNote.value = '';
 }
-onBeforeRouteLeave((to, from, next) => {
-    if (newNote.text)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('globals.unsavedPopup.title'),
-                message: t('globals.unsavedPopup.subtitle'),
-                promise: () => next(),
-            },
-        });
-    else next();
-});
 </script>
 <template>
-    <FetchData
-        v-if="selectType"
-        url="ObservationTypes"
-        :filter="{ fields: ['id', 'description'] }"
-        auto-load
-        @on-fetch="(data) => (observationTypes = data)"
-    />
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
             <VnAvatar :worker-id="currentUser.id" size="md" />
@@ -73,42 +43,29 @@ onBeforeRouteLeave((to, from, next) => {
                 {{ t('globals.now') }}
             </div>
         </QCardSection>
-        <QCardSection class="q-px-xs q-my-none q-py-none">
+        <QCardSection class="q-pa-xs q-my-none q-py-none" horizontal>
-            <VnRow class="full-width">
+            <QInput
-                <VnSelect
+                v-model="newNote"
-                    :label="t('Observation type')"
+                class="full-width"
-                    v-if="selectType"
+                type="textarea"
-                    url="ObservationTypes"
+                :label="t('Add note here...')"
-                    v-model="newNote.observationTypeFk"
+                filled
-                    option-label="description"
+                size="lg"
-                    style="flex: 0.15"
+                autogrow
-                    :required="true"
+                autofocus
-                    @keyup.enter.stop="insert"
+                @keyup="handleKeyUp"
-                />
+                clearable
-                <VnInput
+            >
-                    v-model.trim="newNote.text"
+                <template #append>
-                    type="textarea"
+                    <QBtn
-                    :label="t('Add note here...')"
+                        :title="t('Save (Enter)')"
-                    filled
+                        icon="save"
-                    size="lg"
+                        color="primary"
-                    autogrow
+                        flat
-                    @keyup.enter.stop="insert"
+                        @click="insert"
-                    clearable
+                    />
-                    :required="true"
+                </template>
-                >
+            </QInput>
-                    <template #append>
-                        <QBtn
-                            :title="t('Save (Enter)')"
-                            icon="save"
-                            color="primary"
-                            flat
-                            @click="insert"
-                            class="q-mb-xs"
-                            dense
-                        />
-                    </template>
-                </VnInput>
-            </VnRow>
         </QCardSection>
     </QCard>
     <VnPaginate
@@ -122,10 +79,6 @@ onBeforeRouteLeave((to, from, next) => {
         class="show"
         v-bind="$attrs"
         search-url="notes"
-        @on-fetch="
-            newNote.text = '';
-            newNote.observationTypeFk = null;
-        "
     >
         <template #body="{ rows }">
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
@@ -139,28 +92,13 @@ onBeforeRouteLeave((to, from, next) => {
                             :descriptor="false"
                             :worker-id="note.workerFk"
                             size="md"
-                            :title="note.worker?.user.nickname"
                         />
                         <div class="full-width row justify-between q-pa-xs">
-                            <div>
+                            <VnUserLink
-                                <VnUserLink
+                                :name="`${note.worker.user.nickname}`"
-                                    :name="`${note.worker.user.nickname}`"
+                                :worker-id="note.worker.id"
-                                    :worker-id="note.worker.id"
+                            />
-                                />
+                            {{ toDateHourMin(note.created) }}
-                                <QBadge
-                                    class="q-ml-xs"
-                                    outline
-                                    color="grey"
-                                    v-if="selectType && note.observationTypeFk"
-                                >
-                                    {{
-                                        observationTypes.find(
-                                            (ot) => ot.id === note.observationTypeFk
-                                        )?.description
-                                    }}
-                                </QBadge>
-                            </div>
-                            <span v-text="toDateHourMin(note.created)" />
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
@@ -174,6 +112,12 @@ onBeforeRouteLeave((to, from, next) => {
 <style lang="scss" scoped>
 .q-card {
     width: 90%;
+    @media (max-width: $breakpoint-sm) {
+        width: 100%;
+    }
+    &__section {
+        word-wrap: break-word;
+    }
 }
 .q-dialog .q-card {
     width: 400px;
@@ -187,28 +131,11 @@ onBeforeRouteLeave((to, from, next) => {
     opacity: 0;
     background-color: $primary;
 }
-
-.vn-row > :nth-child(2) {
-    margin-left: 0;
-}
-
-@media (max-width: $breakpoint-xs) {
-    .vn-row > :deep(*) {
-        margin-left: 0;
-    }
-    .q-card {
-        width: 100%;
-
-        &__section {
-            padding: 0;
-        }
-    }
-}
 </style>
 <i18n>
     es:
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
         Save (Enter): Guardar (Intro)
-        Observation type: Tipo de observación
+
 </i18n>

src/components/ui/VnOutForm.vue

@@ -1,32 +0,0 @@
-<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 { onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -10,10 +10,6 @@ const props = defineProps({
         type: String,
         required: true,
     },
-    class: {
-        type: String,
-        default: '',
-    },
     autoLoad: {
         type: Boolean,
         default: false,
@@ -30,10 +26,6 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    userFilter: {
-        type: Object,
-        default: null,
-    },
     where: {
         type: Object,
         default: null,
@@ -56,7 +48,7 @@ const props = defineProps({
     },
     offset: {
         type: Number,
-        default: undefined,
+        default: 0,
     },
     skeleton: {
         type: Boolean,
@@ -88,7 +80,6 @@ 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,
@@ -104,8 +95,6 @@ onMounted(async () => {
     mounted.value = true;
 });
 
-onBeforeUnmount(() => arrayData.reset());
-
 watch(
     () => props.data,
     () => {
@@ -119,19 +108,22 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter],
+    () => props.url,
-    ([url, filter]) => mounted.value && fetch({ url, filter })
+    (url) => fetch({ url })
 );
+
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
 };
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    arrayData.reset(['filter.skip', 'skip']);
+    store.filter.skip = 0;
+    store.skip = 0;
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) isLoading.value = false;
+    if (!store.hasMoreData) {
-
+        isLoading.value = false;
+    }
     emit('onFetch', store.data);
     return store.data;
 }
@@ -217,25 +209,18 @@ defineExpose({ fetch, addFilter, paginate });
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :class="['full-width', props.class]"
+        class="full-width"
         :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
-        <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
+        <div v-if="isLoading" class="info-row q-pa-md text-center">
-            <QSpinner color="primary" size="md" />
+            <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
 </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,26 +1,18 @@
-<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" scoped>
+<style lang="scss" scopped>
 .vn-row {
     display: flex;
-    > :deep(*) {
+    > * {
         flex: 1;
     }
-    &[wrap] {
-        flex-wrap: wrap;
-    }
 }
 @media screen and (max-width: 800px) {
     .vn-row {
-        &:not(.wrap) {
+        flex-direction: column;
-            flex-direction: column;
-        }
     }
 }
 </style>

src/components/ui/VnSearchbar.vue

@@ -63,13 +63,13 @@ const props = defineProps({
         type: String,
         default: '',
     },
-    whereFilter: {
+    makeFetch: {
-        type: Function,
+        type: Boolean,
-        default: undefined,
+        default: true,
     },
 });
 
-const searchText = ref();
+const searchText = ref('');
 let arrayDataProps = { ...props };
 if (props.redirect)
     arrayDataProps = {
@@ -100,24 +100,18 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.entries(store.userParams);
+    const staticParams = Object.entries(store.userParams).filter(
-    arrayData.reset(['skip', 'page']);
+        ([key, value]) => value && (props.staticParams || []).includes(key)
+    );
+    store.skip = 0;
 
-    const filter = {
+    if (props.makeFetch)
-        params: {
+        await arrayData.applyFilter({
-            ...Object.fromEntries(staticParams),
+            params: {
-            search: searchText.value,
+                ...Object.fromEntries(staticParams),
-        },
+                search: searchText.value,
-        ...{ filter: props.filter },
+            },
-    };
+        });
-
-    if (props.whereFilter) {
-        filter.filter = {
-            where: props.whereFilter(searchText.value),
-        };
-        delete filter.params.search;
-    }
-    await arrayData.applyFilter(filter);
 }
 </script>
 <template>
@@ -125,7 +119,7 @@ async function search() {
         <QForm @submit="search" id="searchbarForm">
             <VnInput
                 id="searchbar"
-                v-model.trim="searchText"
+                v-model="searchText"
                 :placeholder="t(props.label)"
                 dense
                 standout

src/components/ui/VnSms.vue

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

src/components/ui/VnSubToolbar.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { onMounted, onBeforeUnmount, ref } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
-
 const stateStore = useStateStore();
 const actions = ref(null);
 const data = ref(null);
@@ -25,12 +24,13 @@ onMounted(() => {
     if (data.value) observer.observe(data.value, opts);
 });
 
-onBeforeUnmount(() => stateStore.toggleSubToolbar());
+onUnmounted(() => {
+    stateStore.toggleSubToolbar();
+});
 </script>
 
 <template>
     <QToolbar
-        id="subToolbar"
         class="justify-end sticky"
         v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
     >
@@ -43,9 +43,20 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar());
         </slot>
     </QToolbar>
 </template>
+<style lang="scss">
+.q-toolbar {
+    background: var(--vn-section-color);
+}
+</style>
 <style lang="scss" scoped>
 .sticky {
     position: sticky;
+    top: 61px;
     z-index: 1;
 }
+@media (max-width: $breakpoint-sm) {
+    .sticky {
+        top: 90px;
+    }
+}
 </style>

src/components/ui/VnToSummary.vue

@@ -1,33 +0,0 @@
-<script setup>
-import { useRoute } from 'vue-router';
-import { defineProps } from 'vue';
-
-const props = defineProps({
-    routeName: {
-        type: String,
-        required: true,
-    },
-    entityId: {
-        type: [String, Number],
-        required: true,
-    },
-    url: {
-        type: String,
-        default: null,
-    },
-});
-
-const route = useRoute();
-const id = props.entityId;
-</script>
-
-<template>
-    <router-link
-        v-if="route?.name !== routeName"
-        :to="{ name: routeName, params: { id: id } }"
-        class="header link"
-        :href="url"
-    >
-        <QIcon name="open_in_new" color="white" size="sm" />
-    </router-link>
-</template>

src/components/ui/VnUserLink.vue

@@ -1,18 +1,21 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import { useI18n } from 'vue-i18n';
 
-defineProps({
+const $props = defineProps({
     name: { type: String, default: null },
-    tag: { type: String, default: null },
     workerId: { type: Number, default: null },
     defaultName: { type: Boolean, default: false },
 });
+
+const { t } = useI18n();
 </script>
 <template>
     <slot name="link">
-        <span :class="{ link: workerId }">
+        <span :class="{ link: $props.workerId }">
-            {{ defaultName ? name ?? $t('globals.system') : name }}
+            {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
         </span>
     </slot>
-    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
+    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
 </template>
+<style scoped></style>

src/components/ui/VnUsesMana.vue

@@ -1,55 +0,0 @@
-<script setup>
-import { defineProps, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-const props = defineProps({
-    usesMana: {
-        type: Boolean,
-        required: true,
-    },
-    manaCode: {
-        type: String,
-        required: true,
-    },
-    manaVal: {
-        type: String,
-        default: 'mana',
-    },
-    manaLabel: {
-        type: String,
-        default: 'Promotion mana',
-    },
-    manaClaimVal: {
-        type: String,
-        default: 'manaClaim',
-    },
-    claimLabel: {
-        type: String,
-        default: 'Claim mana',
-    },
-});
-
-const manaCode = ref(props.manaCode);
-</script>
-
-<template>
-    <div class="column q-gutter-y-sm q-mt-sm">
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaVal"
-            :label="t(manaLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaClaimVal"
-            :label="t(claimLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-    </div>
-</template>

src/composables/getDateQBadgeColor.js

@@ -7,5 +7,5 @@ export function getDateQBadgeColor(date) {
     let comparation = today - timeTicket;
 
     if (comparation == 0) return 'warning';
-    if (comparation < 0) return 'success';
+    if (comparation < 0) return 'negative';
 }

src/composables/getTotal.js

@@ -1,10 +0,0 @@
-import { toCurrency } from 'src/filters';
-
-export function getTotal(rows, key, opts = {}) {
-    const { currency, cb } = opts;
-    const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
-
-    return currency
-        ? toCurrency(total, currency == 'default' ? undefined : currency)
-        : total;
-}

src/composables/useAcl.js

@@ -16,18 +16,13 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(acls) {
+    function hasAny(model, prop, accessType) {
-        for (const acl of acls) {
+        const acls = state.getAcls().value[model];
-            let { model, props, accessType } = acl;
+        if (acls) 
-            const modelAcls = state.getAcls().value[model];
+            return ['*', prop].some((key) => {
-            Array.isArray(props) || (props = [props]);
+                const acl = acls[key];
-            if (modelAcls)
+                return acl && (acl['*'] || acl[accessType]);
-                return ['*', ...props].some((key) => {
+            });
-                    const acl = modelAcls[key];
-                    return acl && (acl['*'] || acl[accessType]);
-                });
-        }
-        return false;
     }
 
     return {

src/composables/useArrayData.js

@@ -1,4 +1,4 @@
-import { onMounted, computed } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -16,20 +16,20 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     const router = useRouter();
     let canceller = null;
 
+    const page = ref(1);
+
     onMounted(() => {
         setOptions();
-        reset(['skip']);
+        store.skip = 0;
 
         const query = route.query;
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
             const params = JSON.parse(query[searchUrl]);
-            const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
+            const filter = params?.filter;
             delete params.filter;
-
+            store.userParams = { ...params, ...store.userParams };
-            store.userParams = { ...store.userParams, ...params };
+            store.userFilter = { ...JSON.parse(filter ?? '{}'), ...store.userFilter };
-            store.userFilter = { ...filter, ...store.userFilter };
-            if (filter?.order) store.order = filter.order;
         }
     });
 
@@ -71,6 +71,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         canceller = new AbortController();
 
         const filter = {
+            order: store.order,
             limit: store.limit,
         };
 
@@ -86,19 +87,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         Object.assign(filter, store.userFilter, exprFilter);
-        let where;
+        Object.assign(store.filter, { ...filter, skip: store.skip });
-        if (filter?.where || store.filter?.where)
+        const params = {
-            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+            filter: JSON.stringify(store.filter),
-        Object.assign(filter, store.filter);
+        };
-        filter.where = where;
-        const params = { filter };
 
         Object.assign(params, userParams);
-        params.filter.skip = store.skip;
-        if (store.order && store.order.length) params.filter.order = store.order;
-        else delete params.filter.order;
 
-        params.filter = JSON.stringify(params.filter);
         store.currentFilter = params;
         store.isLoading = true;
         const response = await axios.get(store.url, {
@@ -114,7 +109,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
+            if (!document.querySelectorAll('[role="dialog"]').length)
                 updateRouter && updateStateParams();
         }
 
@@ -134,10 +129,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         delete store[option];
     }
 
-    function reset(opts = []) {
-        if (arrayDataStore.get(key)) arrayDataStore.reset(key, opts);
-    }
-
     function cancelRequest() {
         if (canceller) {
             canceller.abort();
@@ -150,82 +141,42 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch({});
+        const response = await fetch({ append: false });
         return response;
     }
 
     async function addFilter({ filter, params }) {
-        if (filter) store.filter = filter;
+        if (filter) store.userFilter = Object.assign(store.userFilter, filter);
 
         let userParams = { ...store.userParams, ...params };
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
-        reset(['skip', 'filter.skip', 'page']);
+        store.skip = 0;
+        store.filter.skip = 0;
+        page.value = 1;
 
-        await fetch({});
+        await fetch({ append: false });
         return { filter, params };
     }
 
     async function addFilterWhere(where) {
-        const storedFilter = { ...store.filter };
+        const storedFilter = { ...store.userFilter };
         if (!storedFilter?.where) storedFilter.where = {};
         where = { ...storedFilter.where, ...where };
         await addFilter({ filter: { where } });
     }
 
-    async function addOrder(field, direction = 'ASC') {
-        const newOrder = field + ' ' + direction;
-        let order = store.order || [];
-        if (typeof order == 'string') order = [order];
-
-        let index = order.findIndex((o) => o.split(' ')[0] === field);
-        if (index > -1) {
-            order[index] = newOrder;
-        } else {
-            index = order.length;
-            order.push(newOrder);
-        }
-
-        store.order = order;
-        reset(['skip', 'filter.skip', 'page']);
-        fetch({});
-        index++;
-
-        return { index, order };
-    }
-
-    async function deleteOrder(field) {
-        let order = store.order ?? [];
-        if (typeof order == 'string') order = [order];
-
-        const index = order.findIndex((o) => o.split(' ')[0] === field);
-        if (index > -1) order.splice(index, 1);
-
-        store.order = order;
-        fetch({});
-    }
-
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    let key;
+                    const key = Object.keys(exprBuilder ? exprBuilder(param) : param);
-                    if (exprBuilder) {
+                    if (key[0]) delete store.filter.where[key[0]];
-                        const result = exprBuilder(param);
+                    if (Object.keys(store.filter.where).length === 0) {
-                        if (result !== undefined && result !== null)
+                        delete store.filter.where;
-                            key = Object.keys(result);
-                    } else {
-                        if (typeof param === 'object' && param !== null)
-                            key = Object.keys(param);
-                    }
-                    if (key && key[0]) {
-                        delete store.filter.where[key[0]];
-                        if (Object.keys(store.filter.where).length === 0) {
-                            delete store.filter.where;
-                        }
                     }
                 }
             }
@@ -236,14 +187,14 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     async function loadMore() {
         if (!store.hasMoreData) return;
 
-        store.skip = store.limit * store.page;
+        store.skip = store.limit * page.value;
-        store.page += 1;
+        page.value += 1;
 
         await fetch({ append: true });
     }
 
     async function refresh() {
-        if (Object.values(store.userParams).length) await fetch({});
+        if (Object.values(store.userParams).length) await fetch({ append: false });
     }
 
     function updateStateParams() {
@@ -285,8 +236,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         applyFilter,
         addFilter,
         addFilterWhere,
-        addOrder,
-        deleteOrder,
         refresh,
         destroy,
         loadMore,
@@ -295,6 +244,5 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         updateStateParams,
         isLoading,
         deleteOption,
-        reset,
     };
 }

src/composables/usePrintService.js

@@ -1,26 +1,22 @@
 import { useSession } from './useSession';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import { useI18n } from 'vue-i18n';
 
 export function usePrintService() {
     const quasar = useQuasar();
-    const { t } = useI18n();
-
     const { getTokenMultimedia } = useSession();
 
     function sendEmail(path, params) {
         return axios.post(path, params).then(() =>
             quasar.notify({
-                message: t('globals.notificationSent'),
+                message: 'Notification sent',
                 type: 'positive',
                 icon: 'check',
             })
         );
     }
 
-    function openReport(path, params, isNewTab = '_self') {
+    function openReport(path, params) {
-        if (typeof params === 'string') params = JSON.parse(params);
         params = Object.assign(
             {
                 access_token: getTokenMultimedia(),
@@ -29,7 +25,8 @@ export function usePrintService() {
         );
 
         const query = new URLSearchParams(params).toString();
-        window.open(`api/${path}?${query}`, isNewTab);
+
+        window.open(`api/${path}?${query}`);
     }
 
     return {

src/composables/useRole.js

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

src/composables/useSession.js

@@ -3,14 +3,12 @@ import { useRole } from './useRole';
 import { useAcl } from './useAcl';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
-import { useRouter } from 'vue-router';
 import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
 export function useSession() {
-    const router = useRouter();
     const { notify } = useNotify();
     let isCheckingToken = false;
     let intervalId = null;
@@ -60,37 +58,31 @@ export function useSession() {
             }
         }
     }
-    async function destroy(destroyTokens = true) {
+    async function destroy() {
         const tokens = {
             tokenMultimedia: 'Accounts/logout',
             token: 'VnUsers/logout',
         };
         const storage = keepLogin() ? localStorage : sessionStorage;
-        let destroyTokenPromises = [];
-        try {
-            if (destroyTokens) {
-                const { data: isValidToken } = await axios.get('VnUsers/validateToken');
-                if (isValidToken)
-                    destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
-                        destroyToken(url, storage, key)
-                    );
-            }
-        } finally {
-            localStorage.clear();
-            sessionStorage.clear();
-            await Promise.allSettled(destroyTokenPromises);
-            const { setUser } = useState();
 
-            setUser({
+        for (const [key, url] of Object.entries(tokens)) {
-                id: 0,
+            await destroyToken(url, storage, key);
-                name: '',
-                nickname: '',
-                lang: '',
-                darkMode: null,
-            });
-
-            stopRenewer();
         }
+
+        localStorage.clear();
+        sessionStorage.clear();
+
+        const { setUser } = useState();
+
+        setUser({
+            id: 0,
+            name: '',
+            nickname: '',
+            lang: '',
+            darkMode: null,
+        });
+
+        stopRenewer();
     }
 
     async function login(data) {
@@ -104,31 +96,6 @@ export function useSession() {
         startInterval();
     }
 
-    async function setLogin(data) {
-        const {
-            data: { multimediaToken },
-        } = await axios.get('VnUsers/ShareToken', {
-            headers: { Authorization: data.token },
-        });
-
-        if (!multimediaToken) return;
-
-        await login({
-            ...data,
-            created: Date.now(),
-            tokenMultimedia: multimediaToken.id,
-        });
-
-        notify('login.loginSuccess', 'positive');
-
-        const currentRoute = router.currentRoute.value;
-        if (currentRoute.query?.redirect) {
-            router.push(currentRoute.query.redirect);
-        } else {
-            router.push({ name: 'Dashboard' });
-        }
-    }
-
     function isLoggedIn() {
         const localToken = localStorage.getItem(TOKEN);
         const sessionToken = sessionStorage.getItem(TOKEN);
@@ -190,7 +157,6 @@ export function useSession() {
         setToken,
         destroy,
         login,
-        setLogin,
         isLoggedIn,
         checkValidity,
         setSession,

src/composables/useValidator.js

@@ -28,7 +28,7 @@ export function useValidator() {
     }
 
     const { t } = useI18n();
-    const validations = function (validation = {}) {
+    const validations = function (validation) {
         return {
             format: (value) => {
                 const { allowNull, with: format, allowBlank } = validation;
@@ -40,15 +40,12 @@ export function useValidator() {
                 if (!isValid) return message;
             },
             presence: (value) => {
-                let message = t(`globals.valueCantBeEmpty`);
+                let message = `Value can't be empty`;
                 if (validation.message)
                     message = t(validation.message) || validation.message;
 
                 return !validator.isEmpty(value ? String(value) : '') || message;
             },
-            required: (required, value) => {
-                return required ? !!value || t('globals.fieldRequired') : null;
-            },
             length: (value) => {
                 const options = {
                     min: validation.min || validation.is,
@@ -74,17 +71,12 @@ export function useValidator() {
                     return validator.isInt(value) || 'Value should be integer';
                 return validator.isNumeric(value) || 'Value should be a number';
             },
-            min: (value, min) => {
-                if (min >= 0)
-                    if (Math.floor(value) < min) return t('inputMin', { value: min });
-            },
             custom: (value) => validation.bindedFunction(value) || 'Invalid value',
         };
     };
 
     return {
         validate,
-        validations,
         models,
     };
 }

src/css/app.scss

@@ -4,10 +4,9 @@
 
 body.body--light {
     --font-color: black;
-    --vn-header-color: #cecece;
+    --vn-section-color: #f5f5f5;
-    --vn-page-color: #ffffff;
-    --vn-section-color: #e0e0e0;
     --vn-section-hover-color: #b9b9b9;
+    --vn-page-color: #ffffff;
     --vn-text-color: var(--font-color);
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
@@ -19,7 +18,6 @@ body.body--light {
     }
 }
 body.body--dark {
-    --vn-header-color: #5d5d5d;
     --vn-page-color: #222;
     --vn-section-color: #3d3d3d;
     --vn-section-hover-color: #747474;
@@ -37,10 +35,6 @@ a {
 .link {
     color: $color-link;
     cursor: pointer;
-
-    &--white {
-        color: white;
-    }
 }
 
 .tx-color-link {
@@ -107,6 +101,10 @@ select:-webkit-autofill {
     border-radius: 8px;
 }
 
+.card-width {
+    width: 770px;
+}
+
 .vn-card-list {
     width: 100%;
     max-width: 60em;
@@ -153,12 +151,6 @@ select:-webkit-autofill {
     background-color: var(--vn-section-color);
 }
 
-.q-table td[shrink] {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    max-width: 80px;
-}
-
 .tr-header {
     color: var(--vn-label-color);
 }
@@ -190,14 +182,17 @@ select:-webkit-autofill {
     font-size: medium;
 }
 
-.q-toolbar {
-    background: var(--vn-section-color);
-}
-
 .q-card__actions {
     justify-content: center;
 }
 
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
 input[type='number'] {
     -moz-appearance: textfield;
 }
@@ -212,83 +207,25 @@ input::-webkit-inner-spin-button {
     max-width: 100%;
 }
 
-.q-table__container {
+/* ===== Scrollbar CSS ===== /
-    /* ===== Scrollbar CSS ===== /
+/ Firefox */
-    / Firefox */
 
-    * {
+* {
-        scrollbar-width: auto;
+    scrollbar-width: auto;
-        scrollbar-color: var(--vn-label-color) transparent;
+    scrollbar-color: var(--vn-label-color) transparent;
-    }
-
-    /* Chrome, Edge, and Safari */
-    *::-webkit-scrollbar {
-        width: 10px;
-        height: 10px;
-    }
-
-    *::-webkit-scrollbar-thumb {
-        background-color: var(--vn-label-color);
-        border-radius: 10px;
-    }
-
-    *::-webkit-scrollbar-track {
-        background: transparent;
-    }
 }
 
-.q-table {
+/* Chrome, Edge, and Safari */
-    th,
+*::-webkit-scrollbar {
-    td {
+    width: 10px;
-        padding: 1px 10px 1px 10px;
+    height: 10px;
-        max-width: 100px;
-        div span {
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-        }
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
-    tr {
-        th {
-            font-size: 11pt;
-        }
-        td {
-            font-size: 11pt;
-            border-top: 1px solid var(--vn-page-color);
-            border-collapse: collapse;
-        }
-    }
-    .shrink {
-        max-width: 75px;
-    }
-    .expand {
-        max-width: 400px;
-    }
 }
 
-.edit-photo-btn {
+*::-webkit-scrollbar-thumb {
-    position: absolute;
+    background-color: var(--vn-label-color);
-    right: 12px;
+    border-radius: 10px;
-    bottom: 12px;
-    z-index: 1;
-    cursor: pointer;
 }
 
-.subName {
+*::-webkit-scrollbar-track {
-    color: var(--vn-label-color);
+    background: transparent;
-    text-transform: uppercase;
-}
-
-.q-date {
-    &__today {
-        border: 2px solid $info;
-        color: $info;
-    }
-}
-
-.no-visible {
-    visibility: hidden;
 }

src/css/quasar.variables.scss

@@ -36,6 +36,7 @@ $color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }
+
 .bg-notice {
     background-color: $info;
 }