Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
This commit is contained in:
commit
7ee32158c7
|
|
@ -1,6 +0,0 @@
|
||||||
/dist
|
|
||||||
/src-capacitor
|
|
||||||
/src-cordova
|
|
||||||
/.quasar
|
|
||||||
/node_modules
|
|
||||||
.eslintrc.js
|
|
||||||
75
.eslintrc.js
75
.eslintrc.js
|
|
@ -1,75 +0,0 @@
|
||||||
export default {
|
|
||||||
// https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
|
|
||||||
// This option interrupts the configuration hierarchy at this file
|
|
||||||
// Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
|
|
||||||
root: true,
|
|
||||||
|
|
||||||
parserOptions: {
|
|
||||||
ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features
|
|
||||||
},
|
|
||||||
|
|
||||||
env: {
|
|
||||||
node: true,
|
|
||||||
browser: true,
|
|
||||||
'vue/setup-compiler-macros': true,
|
|
||||||
},
|
|
||||||
|
|
||||||
// Rules order is important, please avoid shuffling them
|
|
||||||
extends: [
|
|
||||||
// Base ESLint recommended rules
|
|
||||||
'eslint:recommended',
|
|
||||||
|
|
||||||
// Uncomment any of the lines below to choose desired strictness,
|
|
||||||
// but leave only one uncommented!
|
|
||||||
// See https://eslint.vuejs.org/rules/#available-rules
|
|
||||||
// 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
|
|
||||||
'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
|
|
||||||
// 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
|
|
||||||
|
|
||||||
// https://github.com/prettier/eslint-config-prettier#installation
|
|
||||||
// usage with Prettier, provided by 'eslint-config-prettier'.
|
|
||||||
'prettier',
|
|
||||||
],
|
|
||||||
|
|
||||||
plugins: [
|
|
||||||
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
|
|
||||||
// required to lint *.vue files
|
|
||||||
'vue',
|
|
||||||
|
|
||||||
// https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
|
|
||||||
// Prettier has not been included as plugin to avoid performance impact
|
|
||||||
// add it as an extension for your IDE
|
|
||||||
],
|
|
||||||
|
|
||||||
globals: {
|
|
||||||
ga: 'readonly', // Google Analytics
|
|
||||||
cordova: 'readonly',
|
|
||||||
__statics: 'readonly',
|
|
||||||
__QUASAR_SSR__: 'readonly',
|
|
||||||
__QUASAR_SSR_SERVER__: 'readonly',
|
|
||||||
__QUASAR_SSR_CLIENT__: 'readonly',
|
|
||||||
__QUASAR_SSR_PWA__: 'readonly',
|
|
||||||
process: 'readonly',
|
|
||||||
Capacitor: 'readonly',
|
|
||||||
chrome: 'readonly',
|
|
||||||
},
|
|
||||||
|
|
||||||
// add your custom rules here
|
|
||||||
rules: {
|
|
||||||
'prefer-promise-reject-errors': 'off',
|
|
||||||
'no-unused-vars': 'warn',
|
|
||||||
'vue/no-multiple-template-root': 'off',
|
|
||||||
// allow debugger during development only
|
|
||||||
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
|
||||||
},
|
|
||||||
overrides: [
|
|
||||||
{
|
|
||||||
files: ['test/cypress/**/*.*'],
|
|
||||||
extends: [
|
|
||||||
// Add Cypress-specific lint rules, globals and Cypress plugin
|
|
||||||
// See https://github.com/cypress-io/eslint-plugin-cypress#rules
|
|
||||||
'plugin:cypress/recommended',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"extends": ["plugin:cypress/recommended"]
|
||||||
|
}
|
||||||
395
CHANGELOG.md
395
CHANGELOG.md
|
|
@ -1,3 +1,398 @@
|
||||||
|
# Version 25.12 - 2025-03-25
|
||||||
|
|
||||||
|
### Added 🆕
|
||||||
|
|
||||||
|
- chore: add junit-merge dependency to package.json by:alexm
|
||||||
|
- chore: downgrade version from 25.14.0 to 25.12.0 in package.json by:alexm
|
||||||
|
- chore: reduce page load timeout in Cypress configuration by:alexm
|
||||||
|
- chore: refs #6695 update Cypress to version 14.1.0 and simplify test execution in Jenkinsfile by:alexm
|
||||||
|
- chore: refs #8602 add comments for clarity in Cypress commands file by:pablone
|
||||||
|
- chore: refs #8602 enhance Cypress support files with detailed comments and organization by:pablone
|
||||||
|
- ci: refs #6695 feat jenkins parallel e2e by:alexm
|
||||||
|
- feat: integrate vue-router to enhance routing capabilities in ZoneCard component by:alexm
|
||||||
|
- feat: refs #6695 implement parallel Cypress testing and enhance timeout configurations by:alexm
|
||||||
|
- feat: refs #6695 update Cypress parallel test execution to use 3 instances by:alexm
|
||||||
|
- feat: refs #6802 add dash placeholder for empty department names in InvoiceOut list by:jgallego
|
||||||
|
- feat: refs #6802 add DepartmentDescriptorProxy to InvoiceOutList and update translations by:jgallego
|
||||||
|
- feat: refs #6802 add DepartmentDescriptorProxy to various components and update department handling by:jgallego
|
||||||
|
- feat: refs #7587 add 'ticketClaimed' translation and implement claims retrieval in TicketDescriptor by:jtubau
|
||||||
|
- feat: refs #7949 show new field in ticket sales by:Jon
|
||||||
|
- feat: refs #8045 added new logic to show the correct icon and the correct path to redirect by:Jon
|
||||||
|
- feat: refs #8045 modified icon and route to redirect from CardDescriptor by:Jon
|
||||||
|
- feat: refs #8074 modified spinner size by:Jon
|
||||||
|
- feat: refs #8600 added calendar e2e and modified basic data by:Jon
|
||||||
|
- feat: refs #8600 added deliveryDays and modified warehouse E2Es by:Jon
|
||||||
|
- feat: refs #8600 added new tests for zoneSummary & zoneLocations by:provira
|
||||||
|
- feat: refs #8602 add custom Cypress commands for improved element interaction and request handling by:pablone
|
||||||
|
- feat: refs #8602 add new Cypress command for clicking buttons with icons by:pablone
|
||||||
|
- feat: refs #8602 add remove functionality for tag filters in EntryBuys component by:pablone
|
||||||
|
- feat: refs #8602 add sorting options for select fields and update locale files with supplier name by:pablone
|
||||||
|
- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
|
||||||
|
- feat: refs #8602 remove unused state property from useArrayDataStore by:pablone
|
||||||
|
- feat: refs #8602 remove unused URL property from VnTable in ClaimList component by:pablone
|
||||||
|
- feat: refs #8602 skip warehouse creation and removal test in ZoneWarehouse spec by:pablone
|
||||||
|
- feat: refs #8602 streamline beforeSaveFn execution in CrudModel component by:pablone
|
||||||
|
- feat: refs #8602 streamline beforeSaveFn execution in VnTable component by:pablone
|
||||||
|
- feat: refs #8602 streamline filter logic in EntryBuys component by:pablone
|
||||||
|
- feat: refs #8602 update entry components and tests, add data-cy attributes for Cypress integration by:pablone
|
||||||
|
- feat: refs #8602 update localization for purchased spaces and enhance Entry components with new labels by:pablone
|
||||||
|
- feat: refs #8606 adapt module to VnCatdBeta by:Jon
|
||||||
|
- feat: refs #8612 added summary button & changed e2e tests by:provira
|
||||||
|
- feat: refs #8612 changed shelving to VnTable & created e2e tests by:provira
|
||||||
|
- feat: refs #8616 add summary prop to CardDescriptor in RoadmapDescriptor and WorkerDescriptor by:jtubau
|
||||||
|
- feat: refs #8616 add VnCheckbox component to VnFilter and update prop types in VnFilterPanel and VnSearchbar by:jtubau
|
||||||
|
- feat: refs #8630 add Agency and Vehicle descriptor components with summary props by:jtubau
|
||||||
|
- feat: refs #8638 add AWB field to travel and entry forms, update translations and styles by:pablone
|
||||||
|
- feat: refs #8638 add data attributes for transfer buys functionality in EntryBuys.vue and corresponding tests by:pablone
|
||||||
|
- feat: refs #8648 enhance roadmapList tests with improved selectors and additional scenarios by:jtubau
|
||||||
|
- feat: refs #8664 add CmrFilter component and integrate it into CmrList for enhanced filtering options by:jtubau
|
||||||
|
- feat: refs #8721 add ticket navigation and update route columns by:jtubau
|
||||||
|
- feat: run.sh build neccessary images by:alexm
|
||||||
|
- feat: update Jenkinsfile to pull Docker images for back and db services by:alexm
|
||||||
|
- feat: update labels and add department selection in InvoiceOut filter and list by:jgallego
|
||||||
|
- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
|
||||||
|
- style: refs #8041 new variable by:benjaminedc
|
||||||
|
|
||||||
|
### Changed 📦
|
||||||
|
|
||||||
|
- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
|
||||||
|
- refactor(cypress): refs #6695 simplify parallel test execution script by:alexm
|
||||||
|
- refactor: deleted useless (origin/Warmfix-DepartmentIcon) by:Jon
|
||||||
|
- refactor: refs #6695 enable ClaimNotes test suite by:alexm
|
||||||
|
- refactor: refs #6695 fix invoiceOutSummary by:alexm
|
||||||
|
- refactor: refs #6695 improve notification check and extend waitForElement timeout by:alexm
|
||||||
|
- refactor: refs #6695 remove mocha dependency and optimize Cypress command execution by:alexm
|
||||||
|
- refactor: refs #6695 skips by:alexm
|
||||||
|
- refactor: refs #6695 skip zoneWarehouse by:alexm
|
||||||
|
- refactor: refs #6695 streamline Cypress test execution and remove deprecated configurations by:alexm
|
||||||
|
- refactor: refs #6802 replace salesPerson references with department in claims and tickets by:jgallego
|
||||||
|
- refactor: refs #6802 replace 'salesPerson' terminology with 'team' across multiple locales and components by:jgallego
|
||||||
|
- refactor: refs #6802 update import paths for DepartmentDescriptorProxy to use Worker directory by:jgallego
|
||||||
|
- refactor: refs #6802 update InvoiceOutNegativeBases to use Department instead of Worker by:jgallego
|
||||||
|
- refactor: refs #6802 update TicketFilter and TicketSale components to use departmentFk and adjust API endpoints by:jgallego
|
||||||
|
- refactor: refs #8041 unify class link and unify titles to VnTitles by:benjaminedc
|
||||||
|
- refactor: refs #8045 modified icon and module const by:Jon
|
||||||
|
- refactor: refs #8197 rename VnCardBeta to VnCard by:alexm
|
||||||
|
- refactor: refs #8197 simplify menu retrieval logic in LeftMenu component by:alexm
|
||||||
|
- refactor: refs #8322 changed Wagon component to use VnSection/VnCardBeta by:provira
|
||||||
|
- refactor: refs #8322 remove keyBinding from Wagon router module by:alexm
|
||||||
|
- refactor: refs #8322 update WagonCard component and routing structure by:alexm
|
||||||
|
- refactor: refs #8370 modified function to get the correct date by:Jon
|
||||||
|
- refactor: refs #8472 remove added div and add class to VnInput by:jtubau
|
||||||
|
- refactor: refs #8472 unified styling for the more-create-dialog slot to ensure consistency across all scenarios by:jtubau
|
||||||
|
- refactor: refs #8472 update class names from q-span-2 to col-span-2 for consistency in layout by:jtubau
|
||||||
|
- refactor: refs #8600 changed test case description by:provira
|
||||||
|
- refactor: refs #8600 modified make invoice and send dialog e2es by:Jon
|
||||||
|
- refactor: refs #8600 modified upcomingDeliveries e2e and created deliveryDays by:Jon
|
||||||
|
- refactor: refs #8600 modified zoneSummary e2e by:Jon
|
||||||
|
- refactor: refs #8602 remove redundant date input test from entryList.spec.js by:pablone
|
||||||
|
- refactor: refs #8606 clear some warnings by:Jon
|
||||||
|
- refactor: refs #8606 deleted code and fixed translation by:Jon
|
||||||
|
- refactor: refs #8606 merged previous and e2e changes and corrected minor errors by:Jon
|
||||||
|
- refactor: refs #8606 requested changes by:Jon
|
||||||
|
- refactor: refs #8616 integrate summary dialog and update navigation in Agency and Vehicle components by:jtubau
|
||||||
|
- refactor: refs #8616 integrate VnSelectWorker component in RouteList and optimize format functions by:jtubau
|
||||||
|
- refactor: refs #8616 simplify template bindings and improve link generation in VehicleSummary by:jtubau
|
||||||
|
- refactor: refs #8616 update routing components for AgencyList and RouteRoadmap in route.js by:jtubau
|
||||||
|
- refactor: refs #8619 simplify empty data check in RouteDescriptor component by:jtubau
|
||||||
|
- refactor: refs #8626 add cardVisible property to RouteList columns by:jtubau
|
||||||
|
- refactor: refs #8626 add formatting for agency and vehicle columns in RouteList by:jtubau
|
||||||
|
- refactor: refs #8626 enhance Worker and Agency components with data attributes and improved routing by:jtubau
|
||||||
|
- refactor: refs #8626 improve test messages and selectors in route tests by:jtubau
|
||||||
|
- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
|
||||||
|
- refactor: refs #8626 update RouteList columns and enable AgencyWorkCenter tests by:jtubau
|
||||||
|
- refactor: refs #8630 add vehicle translations and enhance route list columns by:jtubau
|
||||||
|
- refactor: refs #8648 update roadmap deletion test to use current element text by:jtubau
|
||||||
|
- refactor: refs #8664 enhance CmrList component with query initialization and user parameters by:jtubau
|
||||||
|
- refactor: refs #8664 localization files by:jtubau
|
||||||
|
- refactor: refs #8664 remove CmrFilter and replace with VnSearchbar in CmrList by:jtubau
|
||||||
|
- refactor: remove unnecessary login and reload calls in ClaimDevelopment tests by:alexm
|
||||||
|
- refactor: simplify client selection in order creation test by:alexm
|
||||||
|
- refactor: update client ID input selector and remove viewport setting by:alexm
|
||||||
|
- test: refs #8197 comment out ticket list tests for refactoring by:alexm
|
||||||
|
- test: refs #8626 refactor notification check in routeList.spec.js by:jtubau
|
||||||
|
- test: refs #8626 refactor routeList.spec.js to use a constant for summary URL by:jtubau
|
||||||
|
- test: refs #8626 refactor routeList.spec.js to use selectors and improve readability by:jtubau
|
||||||
|
|
||||||
|
### Fixed 🛠️
|
||||||
|
|
||||||
|
- fix: add --init flag to Docker container for Cypress tests by:alexm
|
||||||
|
- fix: agency list filters by:jtubau
|
||||||
|
- fix: align Article label to the left in EntryBuys component by:alexm
|
||||||
|
- fix: card descriptor imports by:Jon
|
||||||
|
- fix: card descriptor merge by:Jon
|
||||||
|
- fix(ClaimAction): update shelving options to use URL instead of static data by:jgallego
|
||||||
|
- fix(ClaimSummary): clean url by:alexm
|
||||||
|
- fix(cypress.config.js): refs #6695 update reporter to junit and remove unused dependencies by:alexm
|
||||||
|
- fix(cypressParallel.sh): refs #6695 improve script readability by:alexm
|
||||||
|
- fix(cypressParallel.sh): refs #6695 improve test execution output for clarity by:alexm
|
||||||
|
- fix(cypressParallel.sh): refs #6695 simplify test execution output format by:alexm
|
||||||
|
- fix(cypress scripts): refs #6695 improve cleanup process and adjust output redirection by:alexm
|
||||||
|
- fix: fixed department descriptor icon by:Jon
|
||||||
|
- fix: fixed submodule descriptors icons by:Jon
|
||||||
|
- fix(invoiceOutSummary.spec.js): refs #6695 remove unnecessary visibility check for descriptor by:alexm
|
||||||
|
- fix(Jenkinsfile): reduce parallel Cypress test execution from 3 to 2 by:alexm
|
||||||
|
- fix(Jenkinsfile): refs #6695 add credentials for Docker login in E2E stage by:alexm
|
||||||
|
- fix(Jenkinsfile): refs #6695 change parallel test execution from 4 to 2 by:alexm
|
||||||
|
- fix(Jenkinsfile): refs #6695 increase parallel test execution from 2 to 4 by:alexm
|
||||||
|
- fix(Jenkinsfile): refs #6695 update parallel test execution to 4 by:alexm
|
||||||
|
- fix(LeftMenu): refs #8197 handle missing children in findRoute and update menu structure by:alexm
|
||||||
|
- fix: refs #6695 update Cypress configuration and test result paths by:alexm
|
||||||
|
- fix: refs #6695 update Jenkinsfile to build Docker image correctly and modify logout test visit method by:alexm
|
||||||
|
- fix: refs #6695 update Jenkinsfile to remove specific e2e XML files and adjust Cypress parallel execution by:alexm
|
||||||
|
- fix: refs #6695 update Jenkinsfile to source cypressParallel.sh correctly by:alexm
|
||||||
|
- fix: refs #6695 update visit method in TicketLackDetail.spec.js to prevent page reload by:alexm
|
||||||
|
- fix: refs #6802 update import path for DepartmentDescriptorProxy in OrderList.vue by:jgallego
|
||||||
|
- fix: refs #6802 update OrderFilter to use department relation instead of salesPerson by:jgallego
|
||||||
|
- fix: refs #8041 update redirection from preview to summary in ShelvingList tests by:benjaminedc
|
||||||
|
- fix: refs #8041 update selector for summary header in ParkingList tests by:benjaminedc
|
||||||
|
- fix: refs #8041 update summaryHeader selector in ParkingList test by:benjaminedc
|
||||||
|
- fix: refs #8322 update order property for WagonList component by:alexm
|
||||||
|
- fix: refs #8370 change param rely on month by:Jon
|
||||||
|
- fix: refs #8417 added data-cy to all files and fixed test by:provira
|
||||||
|
- fix: refs #8417 added data-cy to delete button by:provira
|
||||||
|
- fix: refs #8417 fixed claimPhoto e2e by:provira
|
||||||
|
- fix: refs #8417 fixed claimPhoto e2e test by:provira
|
||||||
|
- fix: refs #8417 fixed e2e test by:provira
|
||||||
|
- fix: refs #8417 fixed e2e test case by:provira
|
||||||
|
- fix: refs #8417 fixed failing test case by:provira
|
||||||
|
- fix: refs #8417 fixed invoiceOutSummary e2e test by:provira
|
||||||
|
- fix: refs #8417 removed .only by:provira
|
||||||
|
- fix: refs #8583 basicData, business, summary by:carlossa
|
||||||
|
- fix: refs #8583 basicData e2e by:carlossa
|
||||||
|
- fix: refs #8583 basicData timeControl by:carlossa
|
||||||
|
- fix: refs #8583 cypressconf by:carlossa
|
||||||
|
- fix: refs #8583 dataCy operator by:carlossa
|
||||||
|
- fix: refs #8583 fix AddCard by:carlossa
|
||||||
|
- fix: refs #8583 mutual create by:carlossa
|
||||||
|
- fix: refs #8583 operator by:carlossa
|
||||||
|
- fix: refs #8583 remove workerTimeControl by:carlossa
|
||||||
|
- fix: refs #8583 tMutual, tNotes, TOperator by:carlossa
|
||||||
|
- fix: refs #8583 wBusiness by:carlossa
|
||||||
|
- fix: refs #8583 wBusiness e2e by:carlossa
|
||||||
|
- fix: refs #8583 workerBasicData & workerTimeControl by:carlossa
|
||||||
|
- fix: refs #8583 workerBusiness by:carlossa
|
||||||
|
- fix: refs #8583 workerBusiness e2e by:carlossa
|
||||||
|
- fix: refs #8583 workerBusiness test by:carlossa
|
||||||
|
- fix: refs #8583 workerE2E by:carlossa
|
||||||
|
- fix: refs #8583 worker mutual e2e by:carlossa
|
||||||
|
- fix: refs #8583 workerSummary test by:carlossa
|
||||||
|
- fix: refs #8583 workerTimeControl by:carlossa
|
||||||
|
- fix: refs #8583 workerTimeControl e2e by:carlossa
|
||||||
|
- fix: refs #8600 e2e by:Jon
|
||||||
|
- fix: refs #8600 fixed calendar e2e by:Jon
|
||||||
|
- fix: refs #8600 fixed e2e and skip client ones by:Jon
|
||||||
|
- fix: refs #8600 fixed e2e by:Jon
|
||||||
|
- fix: refs #8600 fixed invoiceOut summary e2e by:Jon
|
||||||
|
- fix: refs #8600 fixed zoneList & added test case to zoneSummary by:provira
|
||||||
|
- fix: refs #8600 zone basic data e2e and skip intermitent invoice out summary it by:Jon
|
||||||
|
- fix: refs #8602 delete unused entryDms and stockBought test files (origin/8581-e2eInvoiceIn) by:pablone
|
||||||
|
- fix: refs #8606 deleted code by:Jon
|
||||||
|
- fix: refs #8612 changed QCheckbox for VnCheckbox by:provira
|
||||||
|
- fix: refs #8612 fixed shelving e2e tests by:provira
|
||||||
|
- fix: refs #8616 add conditional for SupplierDescriptorProxy and bind attributes in CardDescriptor by:jtubau
|
||||||
|
- fix: refs #8616 remove redundant v-on binding from QCheckbox in VnCheckbox.vue by:jtubau
|
||||||
|
- fix: refs #8616 update binding syntax for is-editable prop in AgencyList.vue by:jtubau
|
||||||
|
- fix: refs #8616 update FormModel prop from 'update-url' to 'url-update' in Agency and RoadMap BasicData by:jtubau
|
||||||
|
- fix: refs #8619 handle empty ticket records in RouteDescriptor component by:jtubau
|
||||||
|
- fix: refs #8619 update route descriptor to handle empty ticket records and adjust test cases by:jtubau
|
||||||
|
- fix: refs #8626 remove duplicate ref attribute from RouteList.vue by:jtubau
|
||||||
|
- fix: refs #8630 remove duplicated locations by:jtubau
|
||||||
|
- fix: refs #8638 restore invoiceInBasicData by:pablone
|
||||||
|
- fix: refs #8638 update comment formatting in VnTable.vue by:pablone
|
||||||
|
- fix: refs #8638 update null check for maxlength validation in VnInput.vue by:pablone
|
||||||
|
- fix: simplify menu structure in monitor router module (origin/fix_monitor_leftMenu) by:Javier Segarra
|
||||||
|
- refactor: refs #6695 fix invoiceOutSummary by:alexm
|
||||||
|
- refactor: refs #8606 deleted code and fixed translation by:Jon
|
||||||
|
- test: fix intermitent e2e by:alexm
|
||||||
|
- test: fix orderList e2e, unestables by:alexm
|
||||||
|
- test(OrderList): fix inconsistency by:alexm
|
||||||
|
- test(TicketList): fix inconsistency by:alexm
|
||||||
|
|
||||||
|
# Version 25.10 - 2025-03-11
|
||||||
|
|
||||||
|
### Added 🆕
|
||||||
|
|
||||||
|
- chore: refs #6695 empty commit by:alexm
|
||||||
|
- chore: refs #6695 get docker compose version by:alexm
|
||||||
|
- chore: refs #6695 try use docker compose by:alexm
|
||||||
|
- feat: add --browser chromium by:Javier Segarra
|
||||||
|
- feat: docker pull back image by:alexm
|
||||||
|
- feat(jenkinsE2E): refs #6695 new image by:alexm
|
||||||
|
- feat(jenkinsE2E): refs #6695 try fix db by:alexm
|
||||||
|
- feat(jenkinsE2E): refs #6695 try new sintax by:alexm
|
||||||
|
- feat(Jenkinsfile): refs #8714 add CHANGE_TARGET environment variable logging (origin/8714-devToTest, 8714-devToTest) by:alexm
|
||||||
|
- feat: refs #6695 add additional test directories for Cypress integration tests in Jenkinsfile by:alexm
|
||||||
|
- feat: refs #6695 add cypress-cache volume to docker-compose.e2e.yml by:alexm
|
||||||
|
- feat: refs #6695 add Dockerfile for Cypress setup and update Jenkinsfile for installation steps by:alexm
|
||||||
|
- feat: refs #6695 add setup and e2e testing by:alexm
|
||||||
|
- feat: refs #6695 better stages for e2e by:alexm
|
||||||
|
- feat: refs #6695 better stages for e2e rollback by:alexm
|
||||||
|
- feat: refs #6695 install Cypress during Jenkins pipeline setup by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e front deteach by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e rebuild by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e remove ports by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e try down and rm by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e try fix db by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e whitout rebuild by:alexm
|
||||||
|
- feat: refs #6695 pull salix-back image and use by:alexm
|
||||||
|
- feat: refs #6695 run e2e in docker by:alexm
|
||||||
|
- feat: refs #6695 run front by:alexm
|
||||||
|
- feat: refs #6695 run front quasar build by:alexm
|
||||||
|
- feat: refs #6695 run parallel e2e in local by:alexm
|
||||||
|
- feat: refs #6695 update cypress cache path command in Jenkinsfile by:alexm
|
||||||
|
- feat: refs #6695 update cypress-cache volume path in docker-compose.e2e.yml by:alexm
|
||||||
|
- feat: refs #6695 update cypress command in Jenkinsfile and docker-compose.e2e.yml by:alexm
|
||||||
|
- feat: refs #6695 update Docker configurations and Cypress settings for improved local development (origin/6695-docker_push_2, 6695-docker_push_2) by:alexm
|
||||||
|
- feat: refs #6695 when failure, clean by:alexm
|
||||||
|
- feat: refs #7937 add import claim button to ClaimAction component by:jgallego
|
||||||
|
- feat: refs #7937 add shelving selection to claim actions with data fetching by:jgallego
|
||||||
|
- feat: refs #8348 Added grouping by:guillermo
|
||||||
|
- feat: refs #8402 added lost filters from Salix by:Jon
|
||||||
|
- feat: refs #8484 add addressId to createForm in CustomerDescriptor by:jorgep
|
||||||
|
- feat: refs #8484 overwrite Cypress visit command to ensure main element exists by:jorgep
|
||||||
|
- feat: refs #8555 added new filter field and translations by:Jon
|
||||||
|
- feat: refs #8593 added summary button & modified e2e tests by:provira
|
||||||
|
- feat: refs #8593 changed parking to VnTable and modified e2e tests by:provira
|
||||||
|
- feat: refs #8599 added new test and translations by:Jon
|
||||||
|
- feat: refs #8599 modified tests to be more complete and added new ones by:Jon
|
||||||
|
- feat: refs #8697 enable data-cy attribute for VnTable, update test cases to remove skips and adjust selectors by:pablone
|
||||||
|
- feat: rename test:unit by test:front by:Javier Segarra
|
||||||
|
- feat: try run salix back by:alexm
|
||||||
|
- fix: style w-80 by:Javier Segarra
|
||||||
|
- Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test by:Javier Segarra
|
||||||
|
|
||||||
|
### Changed 📦
|
||||||
|
|
||||||
|
- ci: refs #6695 Docker & Jenkinsfile fixes/refactor by:Juan Ferrer Toribio
|
||||||
|
- ci: refs #6695 refactor Cypress setup in Jenkinsfile and replace local docker-compose with new configuration by:alexm
|
||||||
|
- perf: refs #6695 only necessary by:alexm
|
||||||
|
- refactor: adjust translation to standardize it by:Jon
|
||||||
|
- refactor: refs #6695 comment out vnComponent tests in Jenkinsfile by:alexm
|
||||||
|
- refactor: refs #6695 improve group size calculation for parallel test execution in Jenkinsfile by:alexm
|
||||||
|
- refactor: refs #6695 improve parallel test execution logic in Jenkinsfile by:alexm
|
||||||
|
- refactor: refs #6695 simplify Docker cleanup commands in Jenkinsfile by:alexm
|
||||||
|
- refactor: refs #6695 update Docker setup for Cypress and remove obsolete files by:alexm
|
||||||
|
- refactor: refs #6695 update E2E test execution to support parallel groups and improve by:alexm
|
||||||
|
- refactor: refs #6695 update Jenkinsfile and Dockerfile to use 'developer' by:alexm
|
||||||
|
- refactor: refs #6695 update Jenkinsfile to run E2E tests in parallel and simplify docker-compose command by:alexm
|
||||||
|
- refactor: refs #6897 clean up Cypress configuration and improve entry list filtering (origin/6897-fixEntryE2e) by:pablone
|
||||||
|
- refactor: refs #7414 update VnLog component to change display order value changes on update action by:jtubau
|
||||||
|
- refactor: refs #7937 align columns to the right and add shelvingCode to ClaimSummaryAction by:jgallego
|
||||||
|
- refactor: refs #8484 add data-cy attribute for claim photo image and update test to use it by:jorgep
|
||||||
|
- refactor: refs #8484 clean up test files by removing commented issue references and updating test cases by:jorgep
|
||||||
|
- refactor: refs #8484 enhance login command with session management and clean up unused commands by:jtubau
|
||||||
|
- refactor: refs #8484 improve search input behavior and enhance visit command with DOM content load by:jtubau
|
||||||
|
- refactor: refs #8484 improve selectOption command with retry logic for visibility checks by:jtubau
|
||||||
|
- refactor: refs #8484 remove comment in wagonCreate.spec.js by:jtubau
|
||||||
|
- refactor: refs #8484 remove redundant visit command overwrite by:jorgep
|
||||||
|
- refactor: refs #8484 remove unnecessary domContentLoad calls from client tests by:jorgep
|
||||||
|
- refactor: refs #8484 remove unnecessary intercepts and waits in ticket and zone tests by:jorgep
|
||||||
|
- refactor: refs #8484 simplify image dialog test by using aliases for elements by:jorgep
|
||||||
|
- refactor: refs #8484 streamline assertions in ClaimNotes test by:jorgep
|
||||||
|
- refactor: refs #8484 streamline login command and remove commented code by:jorgep
|
||||||
|
- refactor: refs #8484 update specPattern to include all spec files and remove data-cy attribute by:jorgep
|
||||||
|
- refactor: refs #8594 update vehicle summary tests to use expected variable for consistency by:jtubau
|
||||||
|
- refactor: refs #8599 corrected it name by:Jon
|
||||||
|
- refactor: refs #8599 invoice out list e2e by:Jon
|
||||||
|
- refactor: refs #8599 requested changes by:Jon
|
||||||
|
- refactor: refs #8606 modified table height and deleted void file by:Jon
|
||||||
|
- refactor: refs #8606 modified table width and order by:Jon
|
||||||
|
- refactor: refs #8606 modified upcoming deliveries view by:Jon
|
||||||
|
- refactor: refs #8606 translations by:Jon
|
||||||
|
- refactor: refs #8618 simplify selectors and improve test readability in routeExtendedList.spec.js by:jtubau
|
||||||
|
- refactor: refs #8620 update RouteAutonomous to notify on data save and change invoice reference display by:jtubau
|
||||||
|
- refactor: remove default browser setting from Cypress configuration by:alexm
|
||||||
|
- refactor: remove unused variables by:alexm
|
||||||
|
- refactor: skip claimNotes by:alexm
|
||||||
|
- refactor: update labels and conditions in Claim components by:jgallego
|
||||||
|
- refactor: use constant for account input selector in VnAccountNumber tests by:alexm
|
||||||
|
|
||||||
|
### Fixed 🛠️
|
||||||
|
|
||||||
|
- build: refs #6695 cypress-setup fix volume by:alexm
|
||||||
|
- build: refs #6695 cypress-setup fix volume (origin/6695-docker_push, 6695-docker_push) by:alexm
|
||||||
|
- ci: refs #6695 cypress reporter fix by:Juan Ferrer Toribio
|
||||||
|
- ci: refs #6695 Docker & Jenkinsfile fixes/refactor by:Juan Ferrer Toribio
|
||||||
|
- ci: refs #6695 JUnit report fixes by:Juan Ferrer Toribio
|
||||||
|
- ci: refs #6695 vitest junit file fix by:Juan Ferrer Toribio
|
||||||
|
- feat(jenkinsE2E): refs #6695 try fix db by:alexm
|
||||||
|
- feat: refs #6695 jenkins run e2e try fix db by:alexm
|
||||||
|
- fix: add data-cy attribute to card button for improved testing by:jtubau
|
||||||
|
- fix: added lost code by:Jon
|
||||||
|
- fix: add --init flag to Cypress Docker container for improved stability by:alexm
|
||||||
|
- fix: add mapper before Save by:Javier Segarra
|
||||||
|
- fix: cy.domContentLoad(); not exist by:alexm
|
||||||
|
- fix: elements position by:Javier Segarra
|
||||||
|
- fix: fixed select not filtering when typing by:Jon
|
||||||
|
- fix: fixed wagonTypeCreate test (origin/wagonTypeTestFix) by:PAU ROVIRA ROSALENY
|
||||||
|
- fix: fix sctions by:carlossa
|
||||||
|
- fix(Jenkinsfile): enhance Docker registry credentials handling with dynamic URL (origin/warmFix_use_withDockerRegistry, warmFix_use_withDockerRegistry) by:alexm
|
||||||
|
- fix(Jenkinsfile): update Docker registry credentials handling in E2E stage by:alexm
|
||||||
|
- fix: junit report by:alexm
|
||||||
|
- fix: merge revert by:alexm
|
||||||
|
- fix: merge test to dev by:alexm
|
||||||
|
- fix: prevent 'cypress run' error to show junit by:alexm
|
||||||
|
- fix: refs #6695 add --volumes flag to docker-compose down command by:alexm
|
||||||
|
- fix: refs #6695 checkErrors(folderName) by:alexm
|
||||||
|
- fix: refs #6695 clientBasicData by:alexm
|
||||||
|
- fix: refs #6695 dockerFile by:alexm
|
||||||
|
- fix: refs #6695 e2e.sh by:alexm
|
||||||
|
- fix: refs #6695 e2e stockBought by:alexm
|
||||||
|
- fix: refs #6695 fix e2e's by:alexm
|
||||||
|
- fix: refs #6695 storage by:alexm
|
||||||
|
- fix: refs #6695 try by:alexm
|
||||||
|
- fix: refs #6695 try parallel by:alexm
|
||||||
|
- fix: refs #6695 update Cypress cache handling and increase wait timeout for elements by:alexm
|
||||||
|
- fix: refs #6695 update Cypress configuration and Docker setup for improved testing by:alexm
|
||||||
|
- fix: refs #6695 update E2E stages to run tests in parallel for specific folders by:alexm
|
||||||
|
- fix: refs #6695 update remove Cypress installation by:alexm
|
||||||
|
- fix: refs #6695 zoneWarehouse est by:alexm
|
||||||
|
- fix: refs #6943 e2e clientList, formModel by:carlossa
|
||||||
|
- fix: refs #6943 formModel workerDepartment by:carlossa
|
||||||
|
- fix: refs #7323 e2e (origin/7323-fixe2e) by:carlossa
|
||||||
|
- fix: refs #7323 notification manager by:carlossa
|
||||||
|
- fix: refs #7414 updated default value rendering for non-update scenarios by:jtubau
|
||||||
|
- fix: refs #7414 update VnLog.vue to correctly display log actions and values by:jtubau
|
||||||
|
- fix: refs #7937 update claimId in ClaimAction test to reflect correct value (origin/7937-claimAgile) by:jgallego
|
||||||
|
- fix: refs #8484 ensure document is fully loaded before visiting pages in tests by:jorgep
|
||||||
|
- fix: refs #8484 fixed some tests to enable previously skipped cases and enhance functionality by:jtubau
|
||||||
|
- fix: refs #8484 remove unused addressId from createForm in CustomerDescriptor.vue by:jtubau
|
||||||
|
- fix: refs #8484 rollback by:jorgep
|
||||||
|
- fix: refs #8484 update Boss field type to 'selectWorker' and add selectWorkerOption command by:jtubau
|
||||||
|
- fix: refs #8484 update Boss type from 'selectWorker' to 'select' by:jorgep
|
||||||
|
- fix: refs #8484 update parking list URL to correct shelving path in integration test by:jtubau
|
||||||
|
- fix: refs #8484 update selector for buyLabel button in myEntry test by:jtubau
|
||||||
|
- fix: refs #8484 update selector for removing wagon type in wagonCreate.spec.js by:jtubau
|
||||||
|
- fix: refs #8484 update wagon type deletion selector and clean up unused code in commands.js by:jtubau
|
||||||
|
- fix: refs #8593 fixed parking e2e tests by:provira
|
||||||
|
- fix: refs #8606 fixed list e2e test by:Jon
|
||||||
|
- fix: refs #8620 add module name to InvoiceInSummary by:jtubau
|
||||||
|
- fix: refs #8623 fixed different errors by:Jon
|
||||||
|
- fix: remove info by:carlossa
|
||||||
|
- fix: remove old end-to-end test files before building Docker image by:alexm
|
||||||
|
- fix: revert cypress.config by:alexm
|
||||||
|
- fix: style w-80 by:Javier Segarra
|
||||||
|
- fix: unnecessary function by:alexm
|
||||||
|
- fix: update docker-compose command to remove volumes on teardown by:alexm
|
||||||
|
- fix: update Jenkinsfile to remove specific end-to-end test files by:alexm
|
||||||
|
- fix: update Jenkinsfile to use environment variable for Docker registry credentials by:alexm
|
||||||
|
- fix: warmFix vnInput dataCy by:alexm
|
||||||
|
- Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test by:Javier Segarra
|
||||||
|
- revert: browser chromium package.json by:Javier Segarra
|
||||||
|
- Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" by:alexm
|
||||||
|
- test: refs #6695 e2e fix allowedHosts by:alexm
|
||||||
|
- test: refs #6695 e2e fix back image by:alexm
|
||||||
|
- test: refs #6695 e2e fix base urls by:alexm
|
||||||
|
- test: refs #6695 e2e fix command by:alexm
|
||||||
|
- test: refs #6695 e2e fix connection db by:alexm
|
||||||
|
- test: refs #6695 e2e fix network by:alexm
|
||||||
|
- test: refs #6695 e2e fix sequential by:alexm
|
||||||
|
- test: refs #6695 fix e2e by:alexm
|
||||||
|
- test: refs #6695 fix e2e command by:alexm
|
||||||
|
- test: refs #6695 fix selectOption command by:alexm
|
||||||
|
|
||||||
# Version 25.08 - 2025-03-04
|
# Version 25.08 - 2025-03-04
|
||||||
|
|
||||||
### Added 🆕
|
### Added 🆕
|
||||||
|
|
|
||||||
|
|
@ -115,21 +115,27 @@ pipeline {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
sh 'rm -f junit/e2e-*.xml'
|
sh 'rm -f junit/e2e-*.xml'
|
||||||
|
sh 'rm -rf test/cypress/screenshots'
|
||||||
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
|
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
|
||||||
|
|
||||||
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
||||||
|
|
||||||
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
|
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
|
||||||
|
sh "docker-compose ${env.COMPOSE_PARAMS} pull back"
|
||||||
|
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
||||||
|
|
||||||
|
def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
|
||||||
|
echo "E2E MODULES: ${modules}"
|
||||||
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
||||||
sh 'sh test/cypress/cypressParallel.sh 3'
|
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
|
sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
|
||||||
|
archiveArtifacts artifacts: 'test/cypress/screenshots/**/*', allowEmptyArchive: true
|
||||||
junit(
|
junit(
|
||||||
testResults: 'junit/e2e-*.xml',
|
testResults: 'junit/e2e-*.xml',
|
||||||
allowEmptyResults: true
|
allowEmptyResults: true
|
||||||
|
|
@ -179,3 +185,4 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
18
README.md
18
README.md
|
|
@ -32,8 +32,26 @@ pnpm run test:front
|
||||||
pnpm run test:e2e
|
pnpm run test:e2e
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Run e2e parallel
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pnpm run test:e2e:parallel
|
||||||
|
```
|
||||||
|
|
||||||
|
### View e2e parallel report
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pnpm run test:e2e:summary
|
||||||
|
```
|
||||||
|
|
||||||
### Build the app for production
|
### Build the app for production
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
quasar build
|
quasar build
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Serve the app for production
|
||||||
|
|
||||||
|
```bash
|
||||||
|
quasar build quasar serve dist/spa --host 0.0.0.0 --proxy=./proxy-serve.js
|
||||||
|
```
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,8 @@ RUN apt-get update \
|
||||||
libnss3 \
|
libnss3 \
|
||||||
libxss1 \
|
libxss1 \
|
||||||
libxtst6 \
|
libxtst6 \
|
||||||
|
mesa-vulkan-drivers \
|
||||||
|
vulkan-tools \
|
||||||
xauth \
|
xauth \
|
||||||
xvfb \
|
xvfb \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
import cypress from 'eslint-plugin-cypress';
|
||||||
|
import eslint from 'eslint-plugin-import';
|
||||||
|
import globals from 'globals';
|
||||||
|
import js from '@eslint/js';
|
||||||
|
import vue from 'eslint-plugin-vue';
|
||||||
|
export default {
|
||||||
|
plugins: { vue, eslint, cypress },
|
||||||
|
languageOptions: {
|
||||||
|
globals: {
|
||||||
|
...globals.node,
|
||||||
|
...globals.browser,
|
||||||
|
...vue.configs['vue3-strongly-recommended'].globals,
|
||||||
|
...cypress.environments.globals.globals,
|
||||||
|
ga: 'readonly',
|
||||||
|
cordova: 'readonly',
|
||||||
|
__statics: 'readonly',
|
||||||
|
__QUASAR_SSR__: 'readonly',
|
||||||
|
__QUASAR_SSR_SERVER__: 'readonly',
|
||||||
|
__QUASAR_SSR_CLIENT__: 'readonly',
|
||||||
|
__QUASAR_SSR_PWA__: 'readonly',
|
||||||
|
process: 'readonly',
|
||||||
|
Capacitor: 'readonly',
|
||||||
|
chrome: 'readonly',
|
||||||
|
},
|
||||||
|
|
||||||
|
ecmaVersion: 2020,
|
||||||
|
sourceType: 'module',
|
||||||
|
|
||||||
|
parserOptions: {
|
||||||
|
parser: '@babel/eslint-parser',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
...vue.rules['flat/strongly-recommended'],
|
||||||
|
...js.configs.recommended.rules,
|
||||||
|
semi: 'off',
|
||||||
|
'generator-star-spacing': 'warn',
|
||||||
|
'arrow-parens': 'warn',
|
||||||
|
'no-var': 'error',
|
||||||
|
'prefer-const': 'error',
|
||||||
|
'prefer-template': 'warn',
|
||||||
|
'prefer-destructuring': 'off',
|
||||||
|
'prefer-spread': 'warn',
|
||||||
|
'prefer-rest-params': 'warn',
|
||||||
|
'prefer-object-spread': 'warn',
|
||||||
|
'prefer-arrow-callback': 'warn',
|
||||||
|
'prefer-numeric-literals': 'warn',
|
||||||
|
'prefer-exponentiation-operator': 'warn',
|
||||||
|
'prefer-regex-literals': 'warn',
|
||||||
|
'one-var': [
|
||||||
|
'error',
|
||||||
|
{
|
||||||
|
let: 'never',
|
||||||
|
const: 'never',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
'no-void': 'off',
|
||||||
|
'prefer-promise-reject-errors': 'error',
|
||||||
|
'multiline-ternary': 'warn',
|
||||||
|
'no-restricted-imports': 'warn',
|
||||||
|
'no-import-assign': 'warn',
|
||||||
|
'no-duplicate-imports': 'warn',
|
||||||
|
'no-useless-rename': 'warn',
|
||||||
|
'eslint/no-named-as-default': 'warn',
|
||||||
|
'eslint/no-named-as-default-member': 'warn',
|
||||||
|
'no-unsafe-optional-chaining': 'warn',
|
||||||
|
'no-undef': 'error',
|
||||||
|
'no-unused-vars': 'error',
|
||||||
|
'no-console': 'error',
|
||||||
|
'no-debugger': 'error',
|
||||||
|
'no-useless-escape': 'error',
|
||||||
|
'no-prototype-builtins': 'error',
|
||||||
|
'no-async-promise-executor': 'error',
|
||||||
|
'no-irregular-whitespace': 'error',
|
||||||
|
'no-constant-condition': 'error',
|
||||||
|
'no-unsafe-finally': 'error',
|
||||||
|
'no-extend-native': 'error',
|
||||||
|
},
|
||||||
|
ignores: [
|
||||||
|
'/dist',
|
||||||
|
'/src-capacitor',
|
||||||
|
'/src-cordova',
|
||||||
|
'/.quasar',
|
||||||
|
'/node_modules',
|
||||||
|
'.eslintrc.js',
|
||||||
|
],
|
||||||
|
};
|
||||||
30
package.json
30
package.json
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.12.0",
|
"version": "25.16.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
|
@ -9,14 +9,17 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"resetDatabase": "cd ../salix && gulp docker",
|
"resetDatabase": "cd ../salix && gulp docker",
|
||||||
"lint": "eslint --ext .js,.vue ./",
|
"lint": "eslint \"**/*.{vue,js}\" ",
|
||||||
|
"lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
|
||||||
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
||||||
"test:e2e": "cypress open",
|
"test:e2e": "cypress open",
|
||||||
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
||||||
"test:e2e:parallel": "bash ./test/cypress/cypressParallel.sh",
|
"test:e2e:parallel": "bash ./test/cypress/run.sh",
|
||||||
"test:e2e:summary": "bash ./test/cypress/summary.sh",
|
"test:e2e:summary": "bash ./test/cypress/summary.sh",
|
||||||
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
||||||
"test:front": "vitest",
|
"test:front": "vitest",
|
||||||
|
"test:ui": "vitest --ui",
|
||||||
|
"test:coverage": "vitest run --coverage",
|
||||||
"test:front:ci": "vitest run",
|
"test:front:ci": "vitest run",
|
||||||
"commitlint": "commitlint --edit",
|
"commitlint": "commitlint --edit",
|
||||||
"prepare": "npx husky install",
|
"prepare": "npx husky install",
|
||||||
|
|
@ -26,42 +29,53 @@
|
||||||
"docs:preview": "vitepress preview docs"
|
"docs:preview": "vitepress preview docs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
|
"@eslint/js": "^9.20.0",
|
||||||
"@quasar/cli": "^2.4.1",
|
"@quasar/cli": "^2.4.1",
|
||||||
"@quasar/extras": "^1.16.16",
|
"@quasar/extras": "^1.16.16",
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.4.0",
|
||||||
"chromium": "^3.0.3",
|
"chromium": "^3.0.3",
|
||||||
"croppie": "^2.6.5",
|
"croppie": "^2.6.5",
|
||||||
|
"es-module-lexer": "^1.6.0",
|
||||||
|
"fast-glob": "^3.3.3",
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
"pinia": "^2.1.3",
|
"pinia": "^2.1.3",
|
||||||
"quasar": "^2.17.7",
|
"quasar": "^2.17.7",
|
||||||
"validator": "^13.9.0",
|
"validator": "^13.9.0",
|
||||||
"vue": "^3.5.13",
|
"vue": "^3.5.13",
|
||||||
"vue-i18n": "^9.3.0",
|
"vue-i18n": "^9.4.0",
|
||||||
"vue-router": "^4.2.5"
|
"vue-router": "^4.2.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/cli": "^19.2.1",
|
"@commitlint/cli": "^19.2.1",
|
||||||
"@commitlint/config-conventional": "^19.1.0",
|
"@commitlint/config-conventional": "^19.1.0",
|
||||||
"@intlify/unplugin-vue-i18n": "^0.8.2",
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
|
"@eslint/js": "^9.20.0",
|
||||||
|
"@intlify/unplugin-vue-i18n": "^4.0.0",
|
||||||
"@pinia/testing": "^0.1.2",
|
"@pinia/testing": "^0.1.2",
|
||||||
"@quasar/app-vite": "^2.0.8",
|
"@quasar/app-vite": "^2.0.8",
|
||||||
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
|
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
|
||||||
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
|
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
|
||||||
|
"@vitest/ui": "3.1.1",
|
||||||
|
"@vue/compiler-sfc": "^3.5.13",
|
||||||
"@vue/test-utils": "^2.4.4",
|
"@vue/test-utils": "^2.4.4",
|
||||||
"autoprefixer": "^10.4.14",
|
"autoprefixer": "^10.4.14",
|
||||||
"cypress": "^14.1.0",
|
"cypress": "^14.1.0",
|
||||||
"cypress-mochawesome-reporter": "^3.8.2",
|
"cypress-mochawesome-reporter": "^3.8.2",
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.18.0",
|
||||||
"eslint-config-prettier": "^10.0.1",
|
"eslint-config-prettier": "^10.0.1",
|
||||||
|
"eslint-import-resolver-alias": "^1.1.2",
|
||||||
"eslint-plugin-cypress": "^4.1.0",
|
"eslint-plugin-cypress": "^4.1.0",
|
||||||
|
"eslint-plugin-import": "^2.31.0",
|
||||||
"eslint-plugin-vue": "^9.32.0",
|
"eslint-plugin-vue": "^9.32.0",
|
||||||
|
"globals": "^16.0.0",
|
||||||
"husky": "^8.0.0",
|
"husky": "^8.0.0",
|
||||||
|
"junit-merge": "^2.0.0",
|
||||||
"mocha": "^11.1.0",
|
"mocha": "^11.1.0",
|
||||||
"postcss": "^8.4.23",
|
"postcss": "^8.4.23",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"sass": "^1.83.4",
|
"sass": "^1.83.4",
|
||||||
"vitepress": "^1.6.3",
|
"vitest": "^3.0.3",
|
||||||
"vitest": "^0.34.0",
|
|
||||||
"xunit-viewer": "^10.6.1"
|
"xunit-viewer": "^10.6.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|
@ -75,4 +89,4 @@
|
||||||
"vite": "^6.0.11",
|
"vite": "^6.0.11",
|
||||||
"vitest": "^0.31.1"
|
"vitest": "^0.31.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
4040
pnpm-lock.yaml
4040
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
|
||||||
build: {
|
build: {
|
||||||
target: {
|
target: {
|
||||||
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
||||||
node: 'node18',
|
node: 'node20',
|
||||||
},
|
},
|
||||||
|
|
||||||
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
||||||
|
|
@ -92,6 +92,7 @@ export default configure(function (/* ctx */) {
|
||||||
vitePlugins: [
|
vitePlugins: [
|
||||||
[
|
[
|
||||||
VueI18nPlugin({
|
VueI18nPlugin({
|
||||||
|
strictMessage: false,
|
||||||
runtimeOnly: false,
|
runtimeOnly: false,
|
||||||
include: [
|
include: [
|
||||||
path.resolve(__dirname, './src/i18n/locale/**'),
|
path.resolve(__dirname, './src/i18n/locale/**'),
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,227 @@
|
||||||
|
/* eslint-disable */
|
||||||
|
/**
|
||||||
|
* THIS FILE IS GENERATED AUTOMATICALLY.
|
||||||
|
* 1. DO NOT edit this file directly as it won't do anything.
|
||||||
|
* 2. EDIT the original quasar.config file INSTEAD.
|
||||||
|
* 3. DO NOT git commit this file. It should be ignored.
|
||||||
|
*
|
||||||
|
* This file is still here because there was an error in
|
||||||
|
* the original quasar.config file and this allows you to
|
||||||
|
* investigate the Node.js stack error.
|
||||||
|
*
|
||||||
|
* After you fix the original file, this file will be
|
||||||
|
* deleted automatically.
|
||||||
|
**/
|
||||||
|
|
||||||
|
|
||||||
|
// quasar.config.js
|
||||||
|
import { configure } from "quasar/wrappers";
|
||||||
|
import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
|
||||||
|
import path from "path";
|
||||||
|
var __quasar_inject_dirname__ = "/home/jsegarra/Projects/salix-front";
|
||||||
|
var target = `http://${process.env.CI ? "back" : "localhost"}:3000`;
|
||||||
|
var quasar_config_default = configure(function() {
|
||||||
|
return {
|
||||||
|
eslint: {
|
||||||
|
// fix: true,
|
||||||
|
// include = [],
|
||||||
|
// exclude = [],
|
||||||
|
// rawOptions = {},
|
||||||
|
warnings: true,
|
||||||
|
errors: true
|
||||||
|
},
|
||||||
|
// https://v2.quasar.dev/quasar-cli/prefetch-feature
|
||||||
|
// preFetch: true,
|
||||||
|
// app boot file (/src/boot)
|
||||||
|
// --> boot files are part of "main.js"
|
||||||
|
// https://v2.quasar.dev/quasar-cli/boot-files
|
||||||
|
boot: ["i18n", "axios", "vnDate", "validations", "quasar", "quasar.defaults"],
|
||||||
|
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
|
||||||
|
css: ["app.scss"],
|
||||||
|
// https://github.com/quasarframework/quasar/tree/dev/extras
|
||||||
|
extras: [
|
||||||
|
// 'ionicons-v4',
|
||||||
|
// 'mdi-v5',
|
||||||
|
// 'fontawesome-v6',
|
||||||
|
// 'eva-icons',
|
||||||
|
// 'themify',
|
||||||
|
// 'line-awesome',
|
||||||
|
// 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
|
||||||
|
"roboto-font",
|
||||||
|
"material-icons-outlined",
|
||||||
|
"material-symbols-outlined"
|
||||||
|
],
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
|
||||||
|
build: {
|
||||||
|
target: {
|
||||||
|
browser: ["es2022", "edge88", "firefox78", "chrome87", "safari13.1"],
|
||||||
|
node: "node20"
|
||||||
|
},
|
||||||
|
vueRouterMode: "hash",
|
||||||
|
// available values: 'hash', 'history'
|
||||||
|
// vueRouterBase,
|
||||||
|
// vueDevtools,
|
||||||
|
// vueOptionsAPI: false,
|
||||||
|
// rebuildCache: true, // rebuilds Vite/linter/etc cache on startup
|
||||||
|
// publicPath: '/',
|
||||||
|
// analyze: true,
|
||||||
|
// env: {},
|
||||||
|
rawDefine: {
|
||||||
|
"process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
|
||||||
|
},
|
||||||
|
// ignorePublicFolder: true,
|
||||||
|
// minify: false,
|
||||||
|
// polyfillModulePreload: true,
|
||||||
|
// distDir
|
||||||
|
extendViteConf(viteConf) {
|
||||||
|
delete viteConf.build.polyfillModulePreload;
|
||||||
|
viteConf.build.modulePreload = {
|
||||||
|
polyfill: false
|
||||||
|
};
|
||||||
|
},
|
||||||
|
// viteVuePluginOptions: {},
|
||||||
|
alias: {
|
||||||
|
composables: path.join(__quasar_inject_dirname__, "./src/composables"),
|
||||||
|
filters: path.join(__quasar_inject_dirname__, "./src/filters")
|
||||||
|
},
|
||||||
|
vitePlugins: [
|
||||||
|
[
|
||||||
|
VueI18nPlugin({
|
||||||
|
strictMessage: false,
|
||||||
|
runtimeOnly: false,
|
||||||
|
include: [
|
||||||
|
path.resolve(__quasar_inject_dirname__, "./src/i18n/locale/**"),
|
||||||
|
path.resolve(__quasar_inject_dirname__, "./src/pages/**/locale/**")
|
||||||
|
]
|
||||||
|
})
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
|
||||||
|
devServer: {
|
||||||
|
server: {
|
||||||
|
type: "http"
|
||||||
|
},
|
||||||
|
proxy: {
|
||||||
|
"/api": {
|
||||||
|
target,
|
||||||
|
logLevel: "debug",
|
||||||
|
changeOrigin: true,
|
||||||
|
secure: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
open: false,
|
||||||
|
allowedHosts: [
|
||||||
|
"front",
|
||||||
|
// Agrega este nombre de host
|
||||||
|
"localhost"
|
||||||
|
// Opcional, para pruebas locales
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
|
||||||
|
framework: {
|
||||||
|
config: {
|
||||||
|
config: {
|
||||||
|
dark: "auto"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
lang: "en-GB",
|
||||||
|
// iconSet: 'material-icons', // Quasar icon set
|
||||||
|
// lang: 'en-US', // Quasar language pack
|
||||||
|
// For special cases outside of where the auto-import strategy can have an impact
|
||||||
|
// (like functional components as one of the examples),
|
||||||
|
// you can manually specify Quasar components/directives to be available everywhere:
|
||||||
|
//
|
||||||
|
// components: [],
|
||||||
|
// directives: [],
|
||||||
|
// Quasar plugins
|
||||||
|
plugins: ["Notify", "Dialog"],
|
||||||
|
all: "auto",
|
||||||
|
autoImportComponentCase: "pascal"
|
||||||
|
},
|
||||||
|
// animations: 'all', // --- includes all animations
|
||||||
|
// https://v2.quasar.dev/options/animations
|
||||||
|
animations: [],
|
||||||
|
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#property-sourcefiles
|
||||||
|
// sourceFiles: {
|
||||||
|
// rootComponent: 'src/App.vue',
|
||||||
|
// router: 'src/router/index',
|
||||||
|
// store: 'src/store/index',
|
||||||
|
// registerServiceWorker: 'src-pwa/register-service-worker',
|
||||||
|
// serviceWorker: 'src-pwa/custom-service-worker',
|
||||||
|
// pwaManifestFile: 'src-pwa/manifest.json',
|
||||||
|
// electronMain: 'src-electron/electron-main',
|
||||||
|
// electronPreload: 'src-electron/electron-preload'
|
||||||
|
// },
|
||||||
|
// https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
|
||||||
|
ssr: {
|
||||||
|
// ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
|
||||||
|
// will mess up SSR
|
||||||
|
// extendSSRWebserverConf (esbuildConf) {},
|
||||||
|
// extendPackageJson (json) {},
|
||||||
|
pwa: false,
|
||||||
|
// manualStoreHydration: true,
|
||||||
|
// manualPostHydrationTrigger: true,
|
||||||
|
prodPort: 3e3,
|
||||||
|
// The default port that the production server should use
|
||||||
|
// (gets superseded if process.env.PORT is specified at runtime)
|
||||||
|
middlewares: [
|
||||||
|
"render"
|
||||||
|
// keep this as last one
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
|
||||||
|
pwa: {
|
||||||
|
workboxMode: "generateSW",
|
||||||
|
// or 'injectManifest'
|
||||||
|
injectPwaMetaTags: true,
|
||||||
|
swFilename: "sw.js",
|
||||||
|
manifestFilename: "manifest.json",
|
||||||
|
useCredentialsForManifestTag: false
|
||||||
|
// useFilenameHashes: true,
|
||||||
|
// extendGenerateSWOptions (cfg) {}
|
||||||
|
// extendInjectManifestOptions (cfg) {},
|
||||||
|
// extendManifestJson (json) {}
|
||||||
|
// extendPWACustomSWConf (esbuildConf) {}
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
|
||||||
|
cordova: {
|
||||||
|
// noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
|
||||||
|
capacitor: {
|
||||||
|
hideSplashscreen: true
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
|
||||||
|
electron: {
|
||||||
|
// extendElectronMainConf (esbuildConf)
|
||||||
|
// extendElectronPreloadConf (esbuildConf)
|
||||||
|
inspectPort: 5858,
|
||||||
|
bundler: "packager",
|
||||||
|
// 'packager' or 'builder'
|
||||||
|
packager: {
|
||||||
|
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
|
||||||
|
// OS X / Mac App Store
|
||||||
|
// appBundleId: '',
|
||||||
|
// appCategoryType: '',
|
||||||
|
// osxSign: '',
|
||||||
|
// protocol: 'myapp://path',
|
||||||
|
// Windows only
|
||||||
|
// win32metadata: { ... }
|
||||||
|
},
|
||||||
|
builder: {
|
||||||
|
// https://www.electron.build/configuration/configuration
|
||||||
|
appId: "salix-frontend"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
|
||||||
|
bex: {
|
||||||
|
contentScripts: ["my-content-script"]
|
||||||
|
// extendBexScriptsConf (esbuildConf) {}
|
||||||
|
// extendBexManifestJson (json) {}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
export {
|
||||||
|
quasar_config_default as default
|
||||||
|
};
|
||||||
|
|
@ -9,6 +9,30 @@ vi.mock('src/composables/useSession', () => ({
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// Mock axios
|
||||||
|
vi.mock('axios', () => ({
|
||||||
|
default: {
|
||||||
|
create: vi.fn(() => ({
|
||||||
|
interceptors: {
|
||||||
|
request: { use: vi.fn() },
|
||||||
|
response: { use: vi.fn() },
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
interceptors: {
|
||||||
|
request: { use: vi.fn() },
|
||||||
|
response: { use: vi.fn() },
|
||||||
|
},
|
||||||
|
defaults: {
|
||||||
|
baseURL: '',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('src/router', () => ({
|
||||||
|
Router: {
|
||||||
|
push: vi.fn(),
|
||||||
|
},
|
||||||
|
}));
|
||||||
vi.mock('src/stores/useStateQueryStore', () => ({
|
vi.mock('src/stores/useStateQueryStore', () => ({
|
||||||
useStateQueryStore: () => ({
|
useStateQueryStore: () => ({
|
||||||
add: () => vi.fn(),
|
add: () => vi.fn(),
|
||||||
|
|
@ -29,7 +53,7 @@ describe('Axios boot', () => {
|
||||||
'Accept-Language': 'en-US',
|
'Accept-Language': 'en-US',
|
||||||
Authorization: 'DEFAULT_TOKEN',
|
Authorization: 'DEFAULT_TOKEN',
|
||||||
},
|
},
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* eslint-disable eslint/export */
|
||||||
export * from './defaults/qTable';
|
export * from './defaults/qTable';
|
||||||
export * from './defaults/qInput';
|
export * from './defaults/qInput';
|
||||||
export * from './defaults/qSelect';
|
export * from './defaults/qSelect';
|
||||||
|
|
|
||||||
|
|
@ -181,9 +181,8 @@ async function saveChanges(data) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let changes = data || getChanges();
|
let changes = data || getChanges();
|
||||||
if ($props.beforeSaveFn) {
|
if ($props.beforeSaveFn) changes = await $props.beforeSaveFn(changes, getChanges);
|
||||||
changes = await $props.beforeSaveFn(changes, getChanges);
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
|
if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -194,7 +193,7 @@ async function saveChanges(data) {
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
}
|
}
|
||||||
originalData.value = JSON.parse(JSON.stringify(formData.value));
|
originalData.value = JSON.parse(JSON.stringify(formData.value));
|
||||||
if (changes.creates?.length) await vnPaginateRef.value.fetch();
|
if (changes?.creates?.length) await vnPaginateRef.value.fetch();
|
||||||
|
|
||||||
hasChanges.value = false;
|
hasChanges.value = false;
|
||||||
emit('saveChanges', data);
|
emit('saveChanges', data);
|
||||||
|
|
@ -333,6 +332,7 @@ watch(formUrl, async () => {
|
||||||
:disable="!selected?.length"
|
:disable="!selected?.length"
|
||||||
:title="t('globals.remove')"
|
:title="t('globals.remove')"
|
||||||
v-if="$props.defaultRemove"
|
v-if="$props.defaultRemove"
|
||||||
|
data-cy="crudModelDefaultRemoveBtn"
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
:label="tMobile('globals.reset')"
|
:label="tMobile('globals.reset')"
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ const selectItem = ({ id }) => {
|
||||||
>
|
>
|
||||||
<template #body-cell-id="{ row }">
|
<template #body-cell-id="{ row }">
|
||||||
<QTd auto-width @click.stop>
|
<QTd auto-width @click.stop>
|
||||||
<QBtn flat color="blue">{{ row.id }}</QBtn>
|
<QBtn flat class="link">{{ row.id }}</QBtn>
|
||||||
<ItemDescriptorProxy :id="row.id" />
|
<ItemDescriptorProxy :id="row.id" />
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -196,7 +196,7 @@ const selectTravel = ({ id }) => {
|
||||||
>
|
>
|
||||||
<template #body-cell-id="{ row }">
|
<template #body-cell-id="{ row }">
|
||||||
<QTd auto-width @click.stop data-cy="travelFk-travel-form">
|
<QTd auto-width @click.stop data-cy="travelFk-travel-form">
|
||||||
<QBtn flat color="blue">{{ row.id }}</QBtn>
|
<QBtn flat class="link">{{ row.id }}</QBtn>
|
||||||
<TravelDescriptorProxy :id="row.id" />
|
<TravelDescriptorProxy :id="row.id" />
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,12 @@ import VnConfirm from './ui/VnConfirm.vue';
|
||||||
import { tMobile } from 'src/composables/tMobile';
|
import { tMobile } from 'src/composables/tMobile';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { getDifferences, getUpdatedValues } from 'src/filters';
|
import { getDifferences, getUpdatedValues } from 'src/filters';
|
||||||
|
|
||||||
const { push } = useRouter();
|
const { push } = useRouter();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const state = useState();
|
const state = useState();
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { validate } = useValidator();
|
const { validate, validations } = useValidator();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const myForm = ref(null);
|
const myForm = ref(null);
|
||||||
|
|
@ -119,7 +118,7 @@ const defaultButtons = computed(() => ({
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
icon: 'save',
|
icon: 'save',
|
||||||
label: 'globals.save',
|
label: 'globals.save',
|
||||||
click: async () => await save(),
|
click: async (evt) => submitForm(evt),
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
},
|
},
|
||||||
reset: {
|
reset: {
|
||||||
|
|
@ -132,6 +131,13 @@ const defaultButtons = computed(() => ({
|
||||||
...$props.defaultButtons,
|
...$props.defaultButtons,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const submitForm = async (evt) => {
|
||||||
|
const isFormValid = await myForm.value.validate();
|
||||||
|
if (isFormValid) {
|
||||||
|
await save(evt);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
nextTick(() => (componentIsRendered.value = true));
|
nextTick(() => (componentIsRendered.value = true));
|
||||||
|
|
||||||
|
|
@ -227,10 +233,9 @@ async function save() {
|
||||||
const method = $props.urlCreate ? 'post' : 'patch';
|
const method = $props.urlCreate ? 'post' : 'patch';
|
||||||
const url =
|
const url =
|
||||||
$props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
|
$props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
|
||||||
let response;
|
const response = await Promise.resolve(
|
||||||
|
$props.saveFn ? $props.saveFn(body) : axios[method](url, body),
|
||||||
if ($props.saveFn) response = await $props.saveFn(body);
|
);
|
||||||
else response = await axios[method](url, body);
|
|
||||||
|
|
||||||
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
|
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
|
||||||
|
|
||||||
|
|
@ -307,11 +312,13 @@ async function onKeyup(evt) {
|
||||||
selectionStart = selectionEnd = selectionStart + 1;
|
selectionStart = selectionEnd = selectionStart + 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await save();
|
await myForm.value.submit(evt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
submitForm,
|
||||||
|
myForm,
|
||||||
save,
|
save,
|
||||||
isLoading,
|
isLoading,
|
||||||
hasChanges,
|
hasChanges,
|
||||||
|
|
@ -325,7 +332,7 @@ defineExpose({
|
||||||
<QForm
|
<QForm
|
||||||
ref="myForm"
|
ref="myForm"
|
||||||
v-if="formData"
|
v-if="formData"
|
||||||
@submit.prevent
|
@submit.prevent="save"
|
||||||
@keyup.prevent="onKeyup"
|
@keyup.prevent="onKeyup"
|
||||||
@reset="reset"
|
@reset="reset"
|
||||||
class="q-pa-md"
|
class="q-pa-md"
|
||||||
|
|
@ -339,6 +346,7 @@ defineExpose({
|
||||||
name="form"
|
name="form"
|
||||||
:data="formData"
|
:data="formData"
|
||||||
:validate="validate"
|
:validate="validate"
|
||||||
|
:validations="validations()"
|
||||||
:filter="filter"
|
:filter="filter"
|
||||||
/>
|
/>
|
||||||
<SkeletonForm v-else />
|
<SkeletonForm v-else />
|
||||||
|
|
|
||||||
|
|
@ -41,9 +41,12 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
emit('onDataSaved', formData, requestResponse);
|
emit('onDataSaved', formData, requestResponse);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onClick = async (saveAndContinue) => {
|
const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
|
||||||
|
await formModelRef.value.myForm.validate(true);
|
||||||
isSaveAndContinue.value = saveAndContinue;
|
isSaveAndContinue.value = saveAndContinue;
|
||||||
await formModelRef.value.save();
|
if (formModelRef.value) {
|
||||||
|
await formModelRef.value.submitForm();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
|
@ -59,16 +62,23 @@ defineExpose({
|
||||||
ref="formModelRef"
|
ref="formModelRef"
|
||||||
:observe-form-changes="false"
|
:observe-form-changes="false"
|
||||||
:default-actions="false"
|
:default-actions="false"
|
||||||
|
@submit="onClick"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
@on-data-saved="onDataSaved"
|
@on-data-saved="onDataSaved"
|
||||||
|
:prevent-submit="false"
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate }">
|
<template #form="{ data, validate, validations }">
|
||||||
<span ref="closeButton" class="close-icon" v-close-popup>
|
<span ref="closeButton" class="close-icon" v-close-popup>
|
||||||
<QIcon name="close" size="sm" />
|
<QIcon name="close" size="sm" />
|
||||||
</span>
|
</span>
|
||||||
<h1 class="title">{{ title }}</h1>
|
<h1 class="title">{{ title }}</h1>
|
||||||
<p>{{ subtitle }}</p>
|
<p>{{ subtitle }}</p>
|
||||||
<slot name="form-inputs" :data="data" :validate="validate" />
|
<slot
|
||||||
|
name="form-inputs"
|
||||||
|
:data="data"
|
||||||
|
:validate="validate"
|
||||||
|
:validations="validations"
|
||||||
|
/>
|
||||||
<div class="q-mt-lg row justify-end">
|
<div class="q-mt-lg row justify-end">
|
||||||
<QBtn
|
<QBtn
|
||||||
:label="t('globals.cancel')"
|
:label="t('globals.cancel')"
|
||||||
|
|
@ -87,12 +97,13 @@ defineExpose({
|
||||||
:flat="showSaveAndContinueBtn"
|
:flat="showSaveAndContinueBtn"
|
||||||
:label="t('globals.save')"
|
:label="t('globals.save')"
|
||||||
:title="t('globals.save')"
|
:title="t('globals.save')"
|
||||||
@click="onClick(false)"
|
:type="!showSaveAndContinueBtn ? 'submit' : 'button'"
|
||||||
color="primary"
|
color="primary"
|
||||||
class="q-ml-sm"
|
class="q-ml-sm"
|
||||||
:disabled="isLoading"
|
:disabled="isLoading"
|
||||||
:loading="isLoading"
|
:loading="isLoading"
|
||||||
data-cy="FormModelPopup_save"
|
data-cy="FormModelPopup_save"
|
||||||
|
@click="showSaveAndContinueBtn ? onClick(false) : null"
|
||||||
z-max
|
z-max
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
|
|
@ -100,12 +111,13 @@ defineExpose({
|
||||||
:label="t('globals.isSaveAndContinue')"
|
:label="t('globals.isSaveAndContinue')"
|
||||||
:title="t('globals.isSaveAndContinue')"
|
:title="t('globals.isSaveAndContinue')"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
:type="showSaveAndContinueBtn ? 'submit' : 'button'"
|
||||||
class="q-ml-sm"
|
class="q-ml-sm"
|
||||||
:disabled="isLoading"
|
:disabled="isLoading"
|
||||||
:loading="isLoading"
|
:loading="isLoading"
|
||||||
data-cy="FormModelPopup_isSaveAndContinue"
|
data-cy="FormModelPopup_isSaveAndContinue"
|
||||||
|
@click="showSaveAndContinueBtn ? onClick(true) : null"
|
||||||
z-max
|
z-max
|
||||||
@click="onClick(true)"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -198,8 +198,7 @@ const setCategoryList = (data) => {
|
||||||
v-model="params.typeFk"
|
v-model="params.typeFk"
|
||||||
:options="itemTypesOptions"
|
:options="itemTypesOptions"
|
||||||
dense
|
dense
|
||||||
outlined
|
filled
|
||||||
rounded
|
|
||||||
use-input
|
use-input
|
||||||
:disable="!selectedCategoryFk"
|
:disable="!selectedCategoryFk"
|
||||||
@update:model-value="
|
@update:model-value="
|
||||||
|
|
@ -235,8 +234,7 @@ const setCategoryList = (data) => {
|
||||||
v-model="value.selectedTag"
|
v-model="value.selectedTag"
|
||||||
:options="tagOptions"
|
:options="tagOptions"
|
||||||
dense
|
dense
|
||||||
outlined
|
filled
|
||||||
rounded
|
|
||||||
:emit-value="false"
|
:emit-value="false"
|
||||||
use-input
|
use-input
|
||||||
:is-clearable="false"
|
:is-clearable="false"
|
||||||
|
|
@ -252,8 +250,7 @@ const setCategoryList = (data) => {
|
||||||
option-value="value"
|
option-value="value"
|
||||||
option-label="value"
|
option-label="value"
|
||||||
dense
|
dense
|
||||||
outlined
|
filled
|
||||||
rounded
|
|
||||||
emit-value
|
emit-value
|
||||||
use-input
|
use-input
|
||||||
:disable="!value"
|
:disable="!value"
|
||||||
|
|
@ -265,7 +262,6 @@ const setCategoryList = (data) => {
|
||||||
v-model="value.value"
|
v-model="value.value"
|
||||||
:label="t('components.itemsFilterPanel.value')"
|
:label="t('components.itemsFilterPanel.value')"
|
||||||
:disable="!value"
|
:disable="!value"
|
||||||
is-outlined
|
|
||||||
:is-clearable="false"
|
:is-clearable="false"
|
||||||
@keyup.enter="applyTags(params, searchFn)"
|
@keyup.enter="applyTags(params, searchFn)"
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,7 @@ watch(
|
||||||
function findMatches(search, item) {
|
function findMatches(search, item) {
|
||||||
const matches = [];
|
const matches = [];
|
||||||
function findRoute(search, item) {
|
function findRoute(search, item) {
|
||||||
|
if (!item?.children) return;
|
||||||
for (const child of item.children) {
|
for (const child of item.children) {
|
||||||
if (search?.indexOf(child.name) > -1) {
|
if (search?.indexOf(child.name) > -1) {
|
||||||
matches.push(child);
|
matches.push(child);
|
||||||
|
|
@ -92,7 +93,7 @@ function findMatches(search, item) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function addChildren(module, route, parent) {
|
function addChildren(module, route, parent) {
|
||||||
const menus = route?.meta?.menu ?? route?.menus?.[props.source]; //backwards compatible
|
const menus = route?.meta?.menu;
|
||||||
if (!menus) return;
|
if (!menus) return;
|
||||||
|
|
||||||
const matches = findMatches(menus, route);
|
const matches = findMatches(menus, route);
|
||||||
|
|
@ -107,11 +108,7 @@ function getRoutes() {
|
||||||
main: getMainRoutes,
|
main: getMainRoutes,
|
||||||
card: getCardRoutes,
|
card: getCardRoutes,
|
||||||
};
|
};
|
||||||
try {
|
handleRoutes[props.source]();
|
||||||
handleRoutes[props.source]();
|
|
||||||
} catch (error) {
|
|
||||||
throw new Error(`Method is not defined`);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
function getMainRoutes() {
|
function getMainRoutes() {
|
||||||
const modules = Object.assign([], navigation.getModules().value);
|
const modules = Object.assign([], navigation.getModules().value);
|
||||||
|
|
@ -122,7 +119,6 @@ function getMainRoutes() {
|
||||||
);
|
);
|
||||||
if (!moduleDef) continue;
|
if (!moduleDef) continue;
|
||||||
item.children = [];
|
item.children = [];
|
||||||
|
|
||||||
addChildren(item.module, moduleDef, item.children);
|
addChildren(item.module, moduleDef, item.children);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -132,21 +128,16 @@ function getMainRoutes() {
|
||||||
function getCardRoutes() {
|
function getCardRoutes() {
|
||||||
const currentRoute = route.matched[1];
|
const currentRoute = route.matched[1];
|
||||||
const currentModule = toLowerCamel(currentRoute.name);
|
const currentModule = toLowerCamel(currentRoute.name);
|
||||||
let moduleDef = routes.find((route) => toLowerCamel(route.name) === currentModule);
|
let moduleDef;
|
||||||
|
|
||||||
if (!moduleDef) return;
|
|
||||||
if (!moduleDef?.menus) moduleDef = betaGetRoutes();
|
|
||||||
addChildren(currentModule, moduleDef, items.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
function betaGetRoutes() {
|
|
||||||
let menuRoute;
|
|
||||||
let index = route.matched.length - 1;
|
let index = route.matched.length - 1;
|
||||||
while (!menuRoute && index > 0) {
|
while (!moduleDef && index > 0) {
|
||||||
if (route.matched[index]?.meta?.menu) menuRoute = route.matched[index];
|
if (route.matched[index]?.meta?.menu) moduleDef = route.matched[index];
|
||||||
index--;
|
index--;
|
||||||
}
|
}
|
||||||
return menuRoute;
|
|
||||||
|
if (!moduleDef) return;
|
||||||
|
addChildren(currentModule, moduleDef, items.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function togglePinned(item, event) {
|
async function togglePinned(item, event) {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, ref } from 'vue';
|
import { onMounted, ref, computed } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useState } from 'src/composables/useState';
|
import { useState } from 'src/composables/useState';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
|
@ -18,6 +18,14 @@ const state = useState();
|
||||||
const user = state.getUser();
|
const user = state.getUser();
|
||||||
const appName = 'Lilium';
|
const appName = 'Lilium';
|
||||||
const pinnedModulesRef = ref();
|
const pinnedModulesRef = ref();
|
||||||
|
const hostname = window.location.hostname;
|
||||||
|
const env = ref();
|
||||||
|
|
||||||
|
const getEnvironment = computed(() => {
|
||||||
|
env.value = hostname.split('-');
|
||||||
|
if (env.value.length <= 1) return;
|
||||||
|
return env.value[0];
|
||||||
|
});
|
||||||
|
|
||||||
onMounted(() => stateStore.setMounted());
|
onMounted(() => stateStore.setMounted());
|
||||||
const refresh = () => window.location.reload();
|
const refresh = () => window.location.reload();
|
||||||
|
|
@ -49,6 +57,9 @@ const refresh = () => window.location.reload();
|
||||||
{{ t('globals.backToDashboard') }}
|
{{ t('globals.backToDashboard') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
|
<QBadge v-if="getEnvironment" color="primary" align="top">
|
||||||
|
{{ getEnvironment }}
|
||||||
|
</QBadge>
|
||||||
</RouterLink>
|
</RouterLink>
|
||||||
<VnBreadcrumbs v-if="$q.screen.gt.sm" />
|
<VnBreadcrumbs v-if="$q.screen.gt.sm" />
|
||||||
<QSpinner
|
<QSpinner
|
||||||
|
|
|
||||||
|
|
@ -18,14 +18,14 @@ defineProps({ row: { type: Object, required: true } });
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</router-link>
|
</router-link>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="row?.reserved"
|
v-if="row?.isDeleted"
|
||||||
color="primary"
|
color="primary"
|
||||||
name="vn:reserva"
|
name="vn:deletedTicket"
|
||||||
size="xs"
|
size="xs"
|
||||||
data-cy="ticketSaleReservedIcon"
|
data-cy="ticketDeletedIcon"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ t('ticketSale.reserved') }}
|
{{ t('Ticket deleted') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ const makeInvoice = async () => {
|
||||||
(data) => (
|
(data) => (
|
||||||
(rectificativeTypeOptions = data),
|
(rectificativeTypeOptions = data),
|
||||||
(transferInvoiceParams.cplusRectificationTypeFk = data.filter(
|
(transferInvoiceParams.cplusRectificationTypeFk = data.filter(
|
||||||
(type) => type.description == 'I – Por diferencias'
|
(type) => type.description == 'I – Por diferencias',
|
||||||
)[0].id)
|
)[0].id)
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
|
@ -100,7 +100,7 @@ const makeInvoice = async () => {
|
||||||
(data) => (
|
(data) => (
|
||||||
(siiTypeInvoiceOutsOptions = data),
|
(siiTypeInvoiceOutsOptions = data),
|
||||||
(transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
|
(transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
|
||||||
(type) => type.code == 'R4'
|
(type) => type.code == 'R4',
|
||||||
)[0].id)
|
)[0].id)
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
|
@ -122,7 +122,6 @@ const makeInvoice = async () => {
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Client')"
|
:label="t('Client')"
|
||||||
:options="clientsOptions"
|
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const label = $props.showLabel && $props.column.label ? $props.column.label : '';
|
||||||
|
|
||||||
const defaultSelect = {
|
const defaultSelect = {
|
||||||
attrs: {
|
attrs: {
|
||||||
row: $props.row,
|
row: $props.row,
|
||||||
|
|
@ -62,7 +64,7 @@ const defaultSelect = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -74,7 +76,7 @@ const defaultComponents = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
number: {
|
number: {
|
||||||
|
|
@ -84,7 +86,7 @@ const defaultComponents = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
date: {
|
date: {
|
||||||
|
|
@ -96,7 +98,7 @@ const defaultComponents = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
time: {
|
time: {
|
||||||
|
|
@ -105,7 +107,7 @@ const defaultComponents = {
|
||||||
disable: !$props.isEditable,
|
disable: !$props.isEditable,
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
checkbox: {
|
checkbox: {
|
||||||
|
|
@ -125,7 +127,7 @@ const defaultComponents = {
|
||||||
return defaultAttrs;
|
return defaultAttrs;
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
autofocus: true,
|
autofocus: true,
|
||||||
},
|
},
|
||||||
events: {
|
events: {
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import VnSelect from 'components/common/VnSelect.vue';
|
||||||
import VnInput from 'components/common/VnInput.vue';
|
import VnInput from 'components/common/VnInput.vue';
|
||||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
import VnInputTime from 'components/common/VnInputTime.vue';
|
import VnInputTime from 'components/common/VnInputTime.vue';
|
||||||
|
import VnCheckbox from 'components/common/VnCheckbox.vue';
|
||||||
import VnColumn from 'components/VnTable/VnColumn.vue';
|
import VnColumn from 'components/VnTable/VnColumn.vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
|
@ -106,7 +107,7 @@ const components = {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
checkbox: {
|
checkbox: {
|
||||||
component: markRaw(QCheckbox),
|
component: markRaw(VnCheckbox),
|
||||||
event: updateEvent,
|
event: updateEvent,
|
||||||
attrs: {
|
attrs: {
|
||||||
class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
|
class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
|
||||||
:style="textAlignToFlex(align)"
|
:style="textAlignToFlex(align)"
|
||||||
>
|
>
|
||||||
<span :title="label">{{ label }}</span>
|
<span :title="label">{{ label }}</span>
|
||||||
<div v-if="name && model?.index">
|
<div v-if="name && (model?.index || vertical)">
|
||||||
<QChip
|
<QChip
|
||||||
:label="!vertical ? model?.index : ''"
|
:label="!vertical ? model?.index : ''"
|
||||||
:icon="
|
:icon="
|
||||||
|
|
@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
|
||||||
:size="vertical ? '' : 'sm'"
|
:size="vertical ? '' : 'sm'"
|
||||||
:class="[
|
:class="[
|
||||||
model?.index ? 'color-vn-text' : 'bg-transparent',
|
model?.index ? 'color-vn-text' : 'bg-transparent',
|
||||||
vertical ? 'q-px-none' : '',
|
vertical ? 'q-mx-none q-py-lg' : '',
|
||||||
]"
|
]"
|
||||||
class="no-box-shadow"
|
class="no-box-shadow"
|
||||||
:clickable="true"
|
:clickable="true"
|
||||||
style="min-width: 40px; max-height: 30px"
|
style="min-width: 40px; max-height: 30px"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="column flex-center"
|
class="column justify-center text-center"
|
||||||
v-if="vertical"
|
v-if="vertical"
|
||||||
:style="!model?.index && 'color: #5d5d5d'"
|
:style="!model?.index && 'color: #5d5d5d'"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ import { useQuasar, date } from 'quasar';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import { useFilterParams } from 'src/composables/useFilterParams';
|
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
import { dashIfEmpty, toDate } from 'src/filters';
|
import { dashIfEmpty, toDate } from 'src/filters';
|
||||||
|
import { useTableHeight } from './filters/useTableHeight';
|
||||||
|
|
||||||
import CrudModel from 'src/components/CrudModel.vue';
|
import CrudModel from 'src/components/CrudModel.vue';
|
||||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||||
|
|
@ -117,7 +118,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
tableHeight: {
|
tableHeight: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '90vh',
|
default: undefined,
|
||||||
},
|
},
|
||||||
footer: {
|
footer: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
|
@ -140,7 +141,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
dataCy: {
|
dataCy: {
|
||||||
type: String,
|
type: String,
|
||||||
default: 'vn-table',
|
default: 'vnTable',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -166,6 +167,7 @@ const tableRef = ref();
|
||||||
const params = ref(useFilterParams($attrs['data-key']).params);
|
const params = ref(useFilterParams($attrs['data-key']).params);
|
||||||
const orders = ref(useFilterParams($attrs['data-key']).orders);
|
const orders = ref(useFilterParams($attrs['data-key']).orders);
|
||||||
const app = inject('app');
|
const app = inject('app');
|
||||||
|
const tableHeight = useTableHeight();
|
||||||
|
|
||||||
const editingRow = ref(null);
|
const editingRow = ref(null);
|
||||||
const editingField = ref(null);
|
const editingField = ref(null);
|
||||||
|
|
@ -227,6 +229,7 @@ watch(
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
create: createForm,
|
create: createForm,
|
||||||
|
showForm,
|
||||||
reload,
|
reload,
|
||||||
redirect: redirectFn,
|
redirect: redirectFn,
|
||||||
selected,
|
selected,
|
||||||
|
|
@ -595,18 +598,17 @@ function cardClick(_, row) {
|
||||||
|
|
||||||
function removeTextValue(data, getChanges) {
|
function removeTextValue(data, getChanges) {
|
||||||
let changes = data.updates;
|
let changes = data.updates;
|
||||||
if (!changes) return data;
|
if (changes) {
|
||||||
|
for (const change of changes) {
|
||||||
for (const change of changes) {
|
for (const key in change.data) {
|
||||||
for (const key in change.data) {
|
if (key.endsWith('VnTableTextValue')) {
|
||||||
if (key.endsWith('VnTableTextValue')) {
|
delete change.data[key];
|
||||||
delete change.data[key];
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
|
|
||||||
|
|
||||||
if ($attrs?.beforeSaveFn) data = $attrs.beforeSaveFn(data, getChanges);
|
if ($attrs?.beforeSaveFn) data = $attrs.beforeSaveFn(data, getChanges);
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|
@ -634,6 +636,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:data-key="$attrs['data-key']"
|
:data-key="$attrs['data-key']"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:redirect="redirect"
|
:redirect="redirect"
|
||||||
|
v-bind="$attrs?.['table-filter']"
|
||||||
>
|
>
|
||||||
<template
|
<template
|
||||||
v-for="(_, slotName) in $slots"
|
v-for="(_, slotName) in $slots"
|
||||||
|
|
@ -678,14 +681,14 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
table-header-class="bg-header"
|
table-header-class="bg-header"
|
||||||
card-container-class="grid-three"
|
card-container-class="grid-three"
|
||||||
flat
|
flat
|
||||||
:style="isTableMode && `max-height: ${tableHeight}`"
|
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
|
||||||
:virtual-scroll="isTableMode"
|
:virtual-scroll="isTableMode"
|
||||||
@virtual-scroll="handleScroll"
|
@virtual-scroll="handleScroll"
|
||||||
@row-click="(event, row) => handleRowClick(event, row)"
|
@row-click="(event, row) => handleRowClick(event, row)"
|
||||||
@update:selected="emit('update:selected', $event)"
|
@update:selected="emit('update:selected', $event)"
|
||||||
@selection="(details) => handleSelection(details, rows)"
|
@selection="(details) => handleSelection(details, rows)"
|
||||||
:hide-selected-banner="true"
|
:hide-selected-banner="true"
|
||||||
:data-cy="$props.dataCy ?? 'vnTable'"
|
:data-cy
|
||||||
>
|
>
|
||||||
<template #top-left v-if="!$props.withoutHeader">
|
<template #top-left v-if="!$props.withoutHeader">
|
||||||
<slot name="top-left"> </slot>
|
<slot name="top-left"> </slot>
|
||||||
|
|
@ -776,12 +779,13 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:data-col-field="col?.name"
|
:data-col-field="col?.name"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="no-padding no-margin peter"
|
class="no-padding no-margin"
|
||||||
style="
|
style="
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
"
|
"
|
||||||
|
:data-cy="`vnTableCell_${col.name}`"
|
||||||
>
|
>
|
||||||
<slot
|
<slot
|
||||||
:name="`column-${col.name}`"
|
:name="`column-${col.name}`"
|
||||||
|
|
@ -896,7 +900,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
{{ row[splittedColumns.title.name] }}
|
{{ row[splittedColumns.title.name] }}
|
||||||
</span>
|
</span>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<!-- Fields -->
|
<!-- Fields -->
|
||||||
<QCardSection
|
<QCardSection
|
||||||
class="q-pl-sm q-py-xs"
|
class="q-pl-sm q-py-xs"
|
||||||
:class="$props.cardClass"
|
:class="$props.cardClass"
|
||||||
|
|
@ -920,12 +924,24 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:row-index="index"
|
:row-index="index"
|
||||||
>
|
>
|
||||||
<VnColumn
|
<VnColumn
|
||||||
:column="col"
|
:column="{
|
||||||
|
...col,
|
||||||
|
disable:
|
||||||
|
col?.component ===
|
||||||
|
'checkbox'
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
|
}"
|
||||||
:row="row"
|
:row="row"
|
||||||
:is-editable="false"
|
:is-editable="false"
|
||||||
v-model="row[col.name]"
|
v-model="row[col.name]"
|
||||||
component-prop="columnField"
|
component-prop="columnField"
|
||||||
:show-label="true"
|
:show-label="
|
||||||
|
col?.component ===
|
||||||
|
'checkbox'
|
||||||
|
? false
|
||||||
|
: true
|
||||||
|
"
|
||||||
/>
|
/>
|
||||||
</slot>
|
</slot>
|
||||||
</span>
|
</span>
|
||||||
|
|
@ -966,6 +982,8 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
v-for="col of cols.filter((cols) => cols.visible ?? true)"
|
v-for="col of cols.filter((cols) => cols.visible ?? true)"
|
||||||
:key="col?.id"
|
:key="col?.id"
|
||||||
:class="getColAlign(col)"
|
:class="getColAlign(col)"
|
||||||
|
:style="col?.width ? `max-width: ${col?.width}` : ''"
|
||||||
|
style="font-size: small"
|
||||||
>
|
>
|
||||||
<slot
|
<slot
|
||||||
:name="`column-footer-${col.name}`"
|
:name="`column-footer-${col.name}`"
|
||||||
|
|
@ -1027,39 +1045,45 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:model="$attrs['data-key'] + 'Create'"
|
:model="$attrs['data-key'] + 'Create'"
|
||||||
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
|
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data }">
|
<template #form-inputs="{ data, validations }">
|
||||||
<div :style="createComplement?.containerStyle">
|
<slot name="alter-create" :data="data">
|
||||||
<div
|
<div :style="createComplement?.containerStyle">
|
||||||
:style="createComplement?.previousStyle"
|
<div
|
||||||
v-if="!quasar.screen.xs"
|
:style="createComplement?.previousStyle"
|
||||||
>
|
v-if="!quasar.screen.xs"
|
||||||
<slot name="previous-create-dialog" :data="data" />
|
|
||||||
</div>
|
|
||||||
<div class="grid-create" :style="createComplement?.columnGridStyle">
|
|
||||||
<slot
|
|
||||||
v-for="column of splittedColumns.create"
|
|
||||||
:key="column.name"
|
|
||||||
:name="`column-create-${column.name}`"
|
|
||||||
:data="data"
|
|
||||||
:column-name="column.name"
|
|
||||||
:label="column.label"
|
|
||||||
>
|
>
|
||||||
<VnColumn
|
<slot name="previous-create-dialog" :data="data" />
|
||||||
:column="{
|
</div>
|
||||||
...column,
|
<div
|
||||||
...{ disable: column?.createDisable ?? false },
|
class="grid-create"
|
||||||
}"
|
:style="createComplement?.columnGridStyle"
|
||||||
:row="{}"
|
>
|
||||||
default="input"
|
<slot
|
||||||
v-model="data[column.name]"
|
v-for="column of splittedColumns.create"
|
||||||
:show-label="true"
|
:key="column.name"
|
||||||
component-prop="columnCreate"
|
:name="`column-create-${column.name}`"
|
||||||
:data-cy="`${column.name}-create-popup`"
|
:data="data"
|
||||||
/>
|
:validations="validations"
|
||||||
</slot>
|
:column-name="column.name"
|
||||||
<slot name="more-create-dialog" :data="data" />
|
:label="column.label"
|
||||||
|
>
|
||||||
|
<VnColumn
|
||||||
|
:column="{
|
||||||
|
...column,
|
||||||
|
...column?.createAttrs,
|
||||||
|
}"
|
||||||
|
:row="{}"
|
||||||
|
default="input"
|
||||||
|
v-model="data[column.name]"
|
||||||
|
:show-label="true"
|
||||||
|
component-prop="columnCreate"
|
||||||
|
:data-cy="`${column.name}-create-popup`"
|
||||||
|
/>
|
||||||
|
</slot>
|
||||||
|
<slot name="more-create-dialog" :data="data" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</slot>
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
|
|
@ -1137,8 +1161,12 @@ es:
|
||||||
.grid-create {
|
.grid-create {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
|
grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
|
||||||
|
max-width: 100%;
|
||||||
grid-gap: 20px;
|
grid-gap: 20px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
.col-span-2 {
|
||||||
|
grid-column: span 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.flex-one {
|
.flex-one {
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ function columnName(col) {
|
||||||
:search-button="true"
|
:search-button="true"
|
||||||
:disable-submit-event="true"
|
:disable-submit-event="true"
|
||||||
:data-key="$attrs['data-key']"
|
:data-key="$attrs['data-key']"
|
||||||
|
:search-url
|
||||||
>
|
>
|
||||||
<template #body="{ params, orders, searchFn }">
|
<template #body="{ params, orders, searchFn }">
|
||||||
<div
|
<div
|
||||||
|
|
@ -39,13 +40,20 @@ function columnName(col) {
|
||||||
:key="col.id"
|
:key="col.id"
|
||||||
>
|
>
|
||||||
<div class="filter">
|
<div class="filter">
|
||||||
<VnFilter
|
<slot
|
||||||
ref="tableFilterRef"
|
:name="`filter-${col.name}`"
|
||||||
:column="col"
|
:params="params"
|
||||||
:data-key="$attrs['data-key']"
|
:column-name="columnName(col)"
|
||||||
v-model="params[columnName(col)]"
|
:search-fn
|
||||||
:search-url="searchUrl"
|
>
|
||||||
/>
|
<VnFilter
|
||||||
|
ref="tableFilterRef"
|
||||||
|
:column="col"
|
||||||
|
:data-key="$attrs['data-key']"
|
||||||
|
v-model="params[columnName(col)]"
|
||||||
|
:search-url="searchUrl"
|
||||||
|
/>
|
||||||
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="order">
|
<div class="order">
|
||||||
<VnTableOrder
|
<VnTableOrder
|
||||||
|
|
@ -82,13 +90,13 @@ function columnName(col) {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 45px;
|
min-height: 45px;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter {
|
.filter {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
height: 40px;
|
min-height: 40px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.order {
|
.order {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnVisibleColumn from '../VnVisibleColumn.vue';
|
import VnVisibleColumn from '../VnVisibleColumn.vue';
|
||||||
import { axios } from 'app/test/vitest/helper';
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
describe('VnVisibleColumns', () => {
|
describe('VnVisibleColumns', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let vm;
|
let vm;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
import { onMounted, nextTick, ref } from 'vue';
|
||||||
|
|
||||||
|
export function useTableHeight() {
|
||||||
|
const tableHeight = ref('90vh');
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
await nextTick();
|
||||||
|
let height = 100;
|
||||||
|
Array.from(document.querySelectorAll('[role="toolbar"]'))
|
||||||
|
.filter((element) => window.getComputedStyle(element).display !== 'none')
|
||||||
|
.forEach(() => {
|
||||||
|
height -= 10;
|
||||||
|
});
|
||||||
|
tableHeight.value = `${height}vh`;
|
||||||
|
});
|
||||||
|
|
||||||
|
return tableHeight;
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
import CrudModel from 'components/CrudModel.vue';
|
import CrudModel from 'components/CrudModel.vue';
|
||||||
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,56 +0,0 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
|
||||||
import EditForm from 'components/EditTableCellValueForm.vue';
|
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
|
||||||
|
|
||||||
const fieldA = 'fieldA';
|
|
||||||
const fieldB = 'fieldB';
|
|
||||||
|
|
||||||
describe('EditForm', () => {
|
|
||||||
let vm;
|
|
||||||
const mockRows = [
|
|
||||||
{ id: 1, itemFk: 101 },
|
|
||||||
{ id: 2, itemFk: 102 },
|
|
||||||
];
|
|
||||||
const mockFieldsOptions = [
|
|
||||||
{ label: 'Field A', field: fieldA, component: 'input', attrs: {} },
|
|
||||||
{ label: 'Field B', field: fieldB, component: 'date', attrs: {} },
|
|
||||||
];
|
|
||||||
const editUrl = '/api/edit';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
|
|
||||||
vm = createWrapper(EditForm, {
|
|
||||||
props: {
|
|
||||||
rows: mockRows,
|
|
||||||
fieldsOptions: mockFieldsOptions,
|
|
||||||
editUrl,
|
|
||||||
},
|
|
||||||
}).vm;
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('onSubmit()', () => {
|
|
||||||
it('should call axios.post with the correct parameters in the payload', async () => {
|
|
||||||
const selectedField = { field: fieldA, component: 'input', attrs: {} };
|
|
||||||
const newValue = 'Test Value';
|
|
||||||
|
|
||||||
vm.selectedField = selectedField;
|
|
||||||
vm.newValue = newValue;
|
|
||||||
|
|
||||||
await vm.onSubmit();
|
|
||||||
|
|
||||||
const payload = axios.post.mock.calls[0][1];
|
|
||||||
|
|
||||||
expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
|
|
||||||
expect(payload.field).toEqual(fieldA);
|
|
||||||
expect(payload.newValue).toEqual(newValue);
|
|
||||||
|
|
||||||
expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
|
|
||||||
|
|
||||||
expect(vm.isLoading).toEqual(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
import FilterItemForm from 'src/components/FilterItemForm.vue';
|
import FilterItemForm from 'src/components/FilterItemForm.vue';
|
||||||
import { vi, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
@ -38,9 +40,9 @@ describe('FilterItemForm', () => {
|
||||||
{ relation: 'producer', scope: { fields: ['name'] } },
|
{ relation: 'producer', scope: { fields: ['name'] } },
|
||||||
{ relation: 'ink', scope: { fields: ['name'] } },
|
{ relation: 'ink', scope: { fields: ['name'] } },
|
||||||
],
|
],
|
||||||
where: {"name":{"like":"%bolas de madera%"}},
|
where: { name: { like: '%bolas de madera%' } },
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(axios.get).toHaveBeenCalledWith('Items/withName', {
|
expect(axios.get).toHaveBeenCalledWith('Items/withName', {
|
||||||
params: { filter: JSON.stringify(expectedFilter) },
|
params: { filter: JSON.stringify(expectedFilter) },
|
||||||
});
|
});
|
||||||
|
|
@ -79,4 +81,4 @@ describe('FilterItemForm', () => {
|
||||||
vm.selectItem({ id: 12345 });
|
vm.selectItem({ id: 12345 });
|
||||||
expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
|
expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
import FormModel from 'src/components/FormModel.vue';
|
import FormModel from 'src/components/FormModel.vue';
|
||||||
|
|
||||||
describe('FormModel', () => {
|
describe('FormModel', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { default as axios } from 'axios';
|
||||||
import Leftmenu from 'components/LeftMenu.vue';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import LeftMenu from 'components/LeftMenu.vue';
|
||||||
import * as vueRouter from 'vue-router';
|
import * as vueRouter from 'vue-router';
|
||||||
import { useNavigationStore } from 'src/stores/useNavigationStore';
|
import { useNavigationStore } from 'src/stores/useNavigationStore';
|
||||||
|
|
||||||
|
|
@ -15,10 +16,7 @@ vi.mock('src/router/modules', () => ({
|
||||||
meta: {
|
meta: {
|
||||||
title: 'customers',
|
title: 'customers',
|
||||||
icon: 'vn:client',
|
icon: 'vn:client',
|
||||||
},
|
menu: ['CustomerList', 'CustomerCreate'],
|
||||||
menus: {
|
|
||||||
main: ['CustomerList', 'CustomerCreate'],
|
|
||||||
card: ['CustomerBasicData'],
|
|
||||||
},
|
},
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
|
|
@ -50,14 +48,6 @@ vi.mock('src/router/modules', () => ({
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: 'create',
|
|
||||||
name: 'CustomerCreate',
|
|
||||||
meta: {
|
|
||||||
title: 'createCustomer',
|
|
||||||
icon: 'vn:addperson',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
@ -98,7 +88,7 @@ vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
|
||||||
icon: 'vn:client',
|
icon: 'vn:client',
|
||||||
moduleName: 'Customer',
|
moduleName: 'Customer',
|
||||||
keyBinding: 'c',
|
keyBinding: 'c',
|
||||||
menu: 'customer',
|
menu: ['customer'],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
@ -112,7 +102,7 @@ function mount(source = 'main') {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({
|
vi.spyOn(axios, 'get').mockResolvedValue({
|
||||||
data: [],
|
data: [],
|
||||||
});
|
});
|
||||||
const wrapper = createWrapper(Leftmenu, {
|
const wrapper = createWrapper(LeftMenu, {
|
||||||
propsData: {
|
propsData: {
|
||||||
source,
|
source,
|
||||||
},
|
},
|
||||||
|
|
@ -175,7 +165,7 @@ describe('getRoutes', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Leftmenu as card', () => {
|
describe('LeftMenu as card', () => {
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
vm = mount('card').vm;
|
vm = mount('card').vm;
|
||||||
});
|
});
|
||||||
|
|
@ -184,7 +174,7 @@ describe('Leftmenu as card', () => {
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
describe('Leftmenu as main', () => {
|
describe('LeftMenu as main', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vm = mount().vm;
|
vm = mount().vm;
|
||||||
});
|
});
|
||||||
|
|
@ -260,15 +250,6 @@ describe('Leftmenu as main', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should handle a single matched route with a menu', () => {
|
|
||||||
const route = {
|
|
||||||
matched: [{ meta: { menu: 'customer' } }],
|
|
||||||
};
|
|
||||||
|
|
||||||
const result = vm.betaGetRoutes();
|
|
||||||
|
|
||||||
expect(result.meta.menu).toEqual(route.matched[0].meta.menu);
|
|
||||||
});
|
|
||||||
it('should get routes for main source', () => {
|
it('should get routes for main source', () => {
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
expect(navigation.getModules).toHaveBeenCalled();
|
expect(navigation.getModules).toHaveBeenCalled();
|
||||||
|
|
@ -350,8 +331,9 @@ describe('addChildren', () => {
|
||||||
|
|
||||||
it('should handle routes with no meta menu', () => {
|
it('should handle routes with no meta menu', () => {
|
||||||
const route = {
|
const route = {
|
||||||
meta: {},
|
meta: {
|
||||||
menus: {},
|
menu: [],
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const parent = [];
|
const parent = [];
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ async function confirm() {
|
||||||
v-model="address"
|
v-model="address"
|
||||||
is-outlined
|
is-outlined
|
||||||
autofocus
|
autofocus
|
||||||
data-cy="SendEmailNotifiactionDialogInput"
|
data-cy="SendEmailNotificationDialogInput"
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import {useDialogPluginComponent} from 'quasar';
|
import { useDialogPluginComponent } from 'quasar';
|
||||||
import {useI18n} from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import {computed, ref} from 'vue';
|
import { computed, ref } from 'vue';
|
||||||
import VnInput from 'components/common/VnInput.vue';
|
import VnInput from 'components/common/VnInput.vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import useNotify from "composables/useNotify";
|
import useNotify from 'composables/useNotify';
|
||||||
|
|
||||||
const MESSAGE_MAX_LENGTH = 160;
|
const MESSAGE_MAX_LENGTH = 160;
|
||||||
|
|
||||||
const {t} = useI18n();
|
const { t } = useI18n();
|
||||||
const {notify} = useNotify();
|
const { notify } = useNotify();
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
title: {
|
title: {
|
||||||
type: String,
|
type: String,
|
||||||
|
|
@ -34,7 +34,7 @@ const props = defineProps({
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
|
const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
|
||||||
const {dialogRef, onDialogHide} = useDialogPluginComponent();
|
const { dialogRef, onDialogHide } = useDialogPluginComponent();
|
||||||
|
|
||||||
const smsRules = [
|
const smsRules = [
|
||||||
(val) => (val && val.length > 0) || t("The message can't be empty"),
|
(val) => (val && val.length > 0) || t("The message can't be empty"),
|
||||||
|
|
@ -43,10 +43,10 @@ const smsRules = [
|
||||||
t("The message it's too long"),
|
t("The message it's too long"),
|
||||||
];
|
];
|
||||||
|
|
||||||
const message = ref('');
|
const message = ref(t('routeDelay'));
|
||||||
|
|
||||||
const charactersRemaining = computed(
|
const charactersRemaining = computed(
|
||||||
() => MESSAGE_MAX_LENGTH - new Blob([message.value]).size
|
() => MESSAGE_MAX_LENGTH - new Blob([message.value]).size,
|
||||||
);
|
);
|
||||||
|
|
||||||
const charactersChipColor = computed(() => {
|
const charactersChipColor = computed(() => {
|
||||||
|
|
@ -114,7 +114,7 @@ const onSubmit = async () => {
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{
|
{{
|
||||||
t(
|
t(
|
||||||
'Special characters like accents counts as a multiple'
|
'Special characters like accents counts as a multiple',
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
|
|
@ -144,7 +144,10 @@ const onSubmit = async () => {
|
||||||
max-width: 450px;
|
max-width: 450px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
|
en:
|
||||||
|
routeDelay: "Your order has been delayed in transit.\nDelivery will take place throughout the day.\nWe apologize for the inconvenience and appreciate your patience."
|
||||||
es:
|
es:
|
||||||
Message: Mensaje
|
Message: Mensaje
|
||||||
Send: Enviar
|
Send: Enviar
|
||||||
|
|
@ -153,4 +156,5 @@ es:
|
||||||
The destination can't be empty: El destinatario no puede estar vacio
|
The destination can't be empty: El destinatario no puede estar vacio
|
||||||
The message can't be empty: El mensaje no puede estar vacio
|
The message can't be empty: El mensaje no puede estar vacio
|
||||||
The message it's too long: El mensaje es demasiado largo
|
The message it's too long: El mensaje es demasiado largo
|
||||||
</i18n>
|
routeDelay: "Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias."
|
||||||
|
</i18n>
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,14 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { nextTick, ref } from 'vue';
|
|
||||||
import VnInput from './VnInput.vue';
|
import VnInput from './VnInput.vue';
|
||||||
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
|
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
|
||||||
|
|
||||||
const $props = defineProps({
|
|
||||||
insertable: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
|
|
||||||
const model = defineModel({ prop: 'modelValue' });
|
const model = defineModel({ prop: 'modelValue' });
|
||||||
const inputRef = ref(false);
|
|
||||||
|
|
||||||
function setCursorPosition(pos) {
|
|
||||||
const input = inputRef.value.vnInputRef.$el.querySelector('input');
|
|
||||||
input.focus();
|
|
||||||
input.setSelectionRange(pos, pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleUpdateModel(val) {
|
|
||||||
model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
|
|
||||||
await nextTick(() => setCursorPosition(0));
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="model"
|
v-model="model"
|
||||||
ref="inputRef"
|
ref="inputRef"
|
||||||
:insertable
|
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
|
||||||
@update:model-value="handleUpdateModel"
|
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -1,89 +1,93 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onBeforeMount, computed } from 'vue';
|
import { onBeforeMount, computed, markRaw } from 'vue';
|
||||||
import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
|
import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import useCardSize from 'src/composables/useCardSize';
|
import useCardSize from 'src/composables/useCardSize';
|
||||||
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
||||||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
|
||||||
import LeftMenu from 'components/LeftMenu.vue';
|
const emit = defineEmits(['onFetch']);
|
||||||
import RightMenu from 'components/common/RightMenu.vue';
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
id: { type: Number, required: false, default: null },
|
||||||
dataKey: { type: String, required: true },
|
dataKey: { type: String, required: true },
|
||||||
url: { type: String, default: undefined },
|
url: { type: String, default: undefined },
|
||||||
|
idInWhere: { type: Boolean, default: false },
|
||||||
filter: { type: Object, default: () => {} },
|
filter: { type: Object, default: () => {} },
|
||||||
descriptor: { type: Object, required: true },
|
descriptor: { type: Object, required: true },
|
||||||
filterPanel: { type: Object, default: undefined },
|
filterPanel: { type: Object, default: undefined },
|
||||||
idInWhere: { type: Boolean, default: false },
|
|
||||||
searchDataKey: { type: String, default: undefined },
|
searchDataKey: { type: String, default: undefined },
|
||||||
searchbarProps: { type: Object, default: undefined },
|
searchbarProps: { type: Object, default: undefined },
|
||||||
redirectOnError: { type: Boolean, default: false },
|
redirectOnError: { type: Boolean, default: false },
|
||||||
|
visual: { type: Boolean, default: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
const stateStore = useStateStore();
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
const stateStore = useStateStore();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const searchRightDataKey = computed(() => {
|
const entityId = computed(() => props.id || route?.params?.id);
|
||||||
if (!props.searchDataKey) return route.name;
|
let arrayData = getArrayData(entityId.value, props.url);
|
||||||
return props.searchDataKey;
|
|
||||||
});
|
|
||||||
|
|
||||||
const arrayData = useArrayData(props.dataKey, {
|
onBeforeRouteLeave(() => {
|
||||||
url: props.url,
|
stateStore.cardDescriptorChangeValue(null);
|
||||||
userFilter: props.filter,
|
|
||||||
oneRecord: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
|
stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
|
||||||
|
|
||||||
|
const route = router.currentRoute.value;
|
||||||
try {
|
try {
|
||||||
await fetch(route.params.id);
|
await fetch(entityId.value);
|
||||||
} catch {
|
} catch {
|
||||||
const { matched: matches } = router.currentRoute.value;
|
const { matched: matches } = route;
|
||||||
const { path } = matches.at(-1);
|
const { path } = matches.at(-1);
|
||||||
router.push({ path: path.replace(/:id.*/, '') });
|
router.push({ path: path.replace(/:id.*/, '') });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeRouteUpdate(async (to, from) => {
|
onBeforeRouteUpdate(async (to, from) => {
|
||||||
const id = to.params.id;
|
if (hasRouteParam(to.params)) {
|
||||||
if (id !== from.params.id) await fetch(id, true);
|
const { matched } = router.currentRoute.value;
|
||||||
|
const { name } = matched.at(-3);
|
||||||
|
if (name) {
|
||||||
|
router.push({ name, params: to.params });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (entityId.value !== to.params.id) await fetch(to.params.id, true);
|
||||||
});
|
});
|
||||||
|
|
||||||
async function fetch(id, append = false) {
|
async function fetch(id, append = false) {
|
||||||
const regex = /\/(\d+)/;
|
|
||||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
if (props.idInWhere) arrayData.store.filter.where = { id };
|
||||||
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
else {
|
||||||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
arrayData = getArrayData(id);
|
||||||
|
}
|
||||||
await arrayData.fetch({ append, updateRouter: false });
|
await arrayData.fetch({ append, updateRouter: false });
|
||||||
|
emit('onFetch', arrayData.store.data);
|
||||||
|
}
|
||||||
|
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||||
|
return Object.values(params).includes(valueToCheck);
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatUrl(id) {
|
||||||
|
const newId = id || entityId.value;
|
||||||
|
const regex = /\/(\d+)/;
|
||||||
|
if (!regex.test(props.url)) return `${props.url}/${newId}`;
|
||||||
|
return props.url.replace(regex, `/${newId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getArrayData(id, url) {
|
||||||
|
return useArrayData(props.dataKey, {
|
||||||
|
url: url ?? formatUrl(id),
|
||||||
|
userFilter: props.filter,
|
||||||
|
oneRecord: true,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QDrawer
|
<template v-if="visual">
|
||||||
v-model="stateStore.leftDrawer"
|
<VnSubToolbar />
|
||||||
show-if-above
|
<div :class="[useCardSize(), $attrs.class]">
|
||||||
:width="256"
|
<RouterView :key="$route.path" />
|
||||||
v-if="stateStore.isHeaderMounted()"
|
</div>
|
||||||
>
|
</template>
|
||||||
<QScrollArea class="fit">
|
|
||||||
<component :is="descriptor" />
|
|
||||||
<QSeparator />
|
|
||||||
<LeftMenu source="card" />
|
|
||||||
</QScrollArea>
|
|
||||||
</QDrawer>
|
|
||||||
<slot name="searchbar" v-if="props.searchDataKey">
|
|
||||||
<VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
|
|
||||||
</slot>
|
|
||||||
<RightMenu>
|
|
||||||
<template #right-panel v-if="props.filterPanel">
|
|
||||||
<component :is="props.filterPanel" :data-key="searchRightDataKey" />
|
|
||||||
</template>
|
|
||||||
</RightMenu>
|
|
||||||
<QPageContainer>
|
|
||||||
<QPage>
|
|
||||||
<VnSubToolbar />
|
|
||||||
<div :class="[useCardSize(), $attrs.class]">
|
|
||||||
<RouterView :key="$route.path" />
|
|
||||||
</div>
|
|
||||||
</QPage>
|
|
||||||
</QPageContainer>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -1,74 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { onBeforeMount } from 'vue';
|
|
||||||
import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
|
||||||
import useCardSize from 'src/composables/useCardSize';
|
|
||||||
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
dataKey: { type: String, required: true },
|
|
||||||
url: { type: String, default: undefined },
|
|
||||||
idInWhere: { type: Boolean, default: false },
|
|
||||||
filter: { type: Object, default: () => {} },
|
|
||||||
descriptor: { type: Object, required: true },
|
|
||||||
filterPanel: { type: Object, default: undefined },
|
|
||||||
searchDataKey: { type: String, default: undefined },
|
|
||||||
searchbarProps: { type: Object, default: undefined },
|
|
||||||
redirectOnError: { type: Boolean, default: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const stateStore = useStateStore();
|
|
||||||
const router = useRouter();
|
|
||||||
const arrayData = useArrayData(props.dataKey, {
|
|
||||||
url: props.url,
|
|
||||||
userFilter: props.filter,
|
|
||||||
oneRecord: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
onBeforeRouteLeave(() => {
|
|
||||||
stateStore.cardDescriptorChangeValue(null);
|
|
||||||
});
|
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
|
||||||
stateStore.cardDescriptorChangeValue(props.descriptor);
|
|
||||||
|
|
||||||
const route = router.currentRoute.value;
|
|
||||||
try {
|
|
||||||
await fetch(route.params.id);
|
|
||||||
} catch {
|
|
||||||
const { matched: matches } = route;
|
|
||||||
const { path } = matches.at(-1);
|
|
||||||
router.push({ path: path.replace(/:id.*/, '') });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
onBeforeRouteUpdate(async (to, from) => {
|
|
||||||
if (hasRouteParam(to.params)) {
|
|
||||||
const { matched } = router.currentRoute.value;
|
|
||||||
const { name } = matched.at(-3);
|
|
||||||
if (name) {
|
|
||||||
router.push({ name, params: to.params });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const id = to.params.id;
|
|
||||||
if (id !== from.params.id) await fetch(id, true);
|
|
||||||
});
|
|
||||||
|
|
||||||
async function fetch(id, append = false) {
|
|
||||||
const regex = /\/(\d+)/;
|
|
||||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
|
||||||
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
|
||||||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
|
||||||
await arrayData.fetch({ append, updateRouter: false });
|
|
||||||
}
|
|
||||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
|
||||||
return Object.values(params).includes(valueToCheck);
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
<template>
|
|
||||||
<VnSubToolbar />
|
|
||||||
<div :class="[useCardSize(), $attrs.class]">
|
|
||||||
<RouterView :key="$route.path" />
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
@ -27,7 +27,11 @@ const checkboxModel = computed({
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<QCheckbox v-bind="$attrs" v-model="checkboxModel" />
|
<QCheckbox
|
||||||
|
v-bind="$attrs"
|
||||||
|
v-model="checkboxModel"
|
||||||
|
:data-cy="$attrs['data-cy'] ?? `vnCheckbox${$attrs['label'] ?? ''}`"
|
||||||
|
/>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="info"
|
v-if="info"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import { computed } from 'vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
colors: {
|
colors: {
|
||||||
type: String,
|
type: String,
|
||||||
|
|
@ -6,9 +8,9 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const colorArray = JSON.parse($props.colors)?.value;
|
const colorArray = computed(() => JSON.parse($props.colors)?.value);
|
||||||
const maxHeight = 30;
|
const maxHeight = 30;
|
||||||
const colorHeight = maxHeight / colorArray?.length;
|
const colorHeight = maxHeight / colorArray.value?.length;
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
|
<div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,10 @@ const $props = defineProps({
|
||||||
type: String,
|
type: String,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
|
hasFile: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const warehouses = ref();
|
const warehouses = ref();
|
||||||
|
|
@ -90,6 +94,7 @@ function defaultData() {
|
||||||
if ($props.formInitialData) return (dms.value = $props.formInitialData);
|
if ($props.formInitialData) return (dms.value = $props.formInitialData);
|
||||||
return addDefaultData({
|
return addDefaultData({
|
||||||
reference: route.params.id,
|
reference: route.params.id,
|
||||||
|
hasFile: $props.hasFile,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -177,6 +182,7 @@ function addDefaultData(data) {
|
||||||
name="vn:attach"
|
name="vn:attach"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="inputFileRef.pickFiles()"
|
@click="inputFileRef.pickFiles()"
|
||||||
|
data-cy="attachFile"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('globals.selectFile') }}</QTooltip>
|
<QTooltip>{{ t('globals.selectFile') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,166 @@
|
||||||
|
<script setup>
|
||||||
|
import VnConfirm from '../ui/VnConfirm.vue';
|
||||||
|
import VnInput from './VnInput.vue';
|
||||||
|
import VnDms from './VnDms.vue';
|
||||||
|
import axios from 'axios';
|
||||||
|
import { useQuasar } from 'quasar';
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { downloadFile } from 'src/composables/downloadFile';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const quasar = useQuasar();
|
||||||
|
const documentDialogRef = ref({});
|
||||||
|
const editDownloadDisabled = ref(false);
|
||||||
|
const $props = defineProps({
|
||||||
|
defaultDmsCode: {
|
||||||
|
type: String,
|
||||||
|
default: 'invoiceIn',
|
||||||
|
},
|
||||||
|
disable: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
formRef: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
function deleteFile(dmsFk) {
|
||||||
|
quasar
|
||||||
|
.dialog({
|
||||||
|
component: VnConfirm,
|
||||||
|
componentProps: {
|
||||||
|
title: t('globals.confirmDeletion'),
|
||||||
|
message: t('globals.confirmDeletionMessage'),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.onOk(async () => {
|
||||||
|
await axios.post(`dms/${dmsFk}/removeFile`);
|
||||||
|
$props.formRef.formData.dmsFk = null;
|
||||||
|
$props.formRef.formData.dms = undefined;
|
||||||
|
$props.formRef.hasChanges = true;
|
||||||
|
$props.formRef.save();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<div class="row no-wrap">
|
||||||
|
<VnInput
|
||||||
|
:label="t('Document')"
|
||||||
|
v-model="data.dmsFk"
|
||||||
|
clearable
|
||||||
|
clear-icon="close"
|
||||||
|
class="full-width"
|
||||||
|
:disable="disable"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
v-if="data.dmsFk"
|
||||||
|
class="row no-wrap q-pa-xs q-gutter-x-xs"
|
||||||
|
data-cy="dms-buttons"
|
||||||
|
>
|
||||||
|
<QBtn
|
||||||
|
:disable="editDownloadDisabled"
|
||||||
|
@click="downloadFile(data.dmsFk)"
|
||||||
|
icon="cloud_download"
|
||||||
|
color="primary"
|
||||||
|
flat
|
||||||
|
:class="{
|
||||||
|
'no-pointer-events': editDownloadDisabled,
|
||||||
|
}"
|
||||||
|
padding="xs"
|
||||||
|
round
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('Download file') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
<QBtn
|
||||||
|
:disable="editDownloadDisabled"
|
||||||
|
@click="
|
||||||
|
() => {
|
||||||
|
documentDialogRef.show = true;
|
||||||
|
documentDialogRef.dms = data.dms;
|
||||||
|
}
|
||||||
|
"
|
||||||
|
icon="edit"
|
||||||
|
color="primary"
|
||||||
|
flat
|
||||||
|
:class="{
|
||||||
|
'no-pointer-events': editDownloadDisabled,
|
||||||
|
}"
|
||||||
|
padding="xs"
|
||||||
|
round
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('Edit document') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
<QBtn
|
||||||
|
:disable="editDownloadDisabled"
|
||||||
|
@click="deleteFile(data.dmsFk)"
|
||||||
|
icon="delete"
|
||||||
|
color="primary"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
:class="{
|
||||||
|
'no-pointer-events': editDownloadDisabled,
|
||||||
|
}"
|
||||||
|
padding="xs"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('Delete file') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
|
<QBtn
|
||||||
|
v-else
|
||||||
|
icon="add_circle"
|
||||||
|
color="primary"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
v-shortcut="'+'"
|
||||||
|
padding="xs"
|
||||||
|
@click="
|
||||||
|
() => {
|
||||||
|
documentDialogRef.show = true;
|
||||||
|
delete documentDialogRef.dms;
|
||||||
|
}
|
||||||
|
"
|
||||||
|
data-cy="dms-create"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('Create document') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
|
<QDialog v-model="documentDialogRef.show">
|
||||||
|
<VnDms
|
||||||
|
model="dms"
|
||||||
|
:default-dms-code="defaultDmsCode"
|
||||||
|
:form-initial-data="documentDialogRef.dms"
|
||||||
|
:url="
|
||||||
|
documentDialogRef.dms
|
||||||
|
? `Dms/${documentDialogRef.dms.id}/updateFile`
|
||||||
|
: 'Dms/uploadFile'
|
||||||
|
"
|
||||||
|
:description="documentDialogRef.supplierName"
|
||||||
|
@on-data-saved="
|
||||||
|
(_, { data }) => {
|
||||||
|
let dmsData = data;
|
||||||
|
if (Array.isArray(data)) dmsData = data[0];
|
||||||
|
formRef.formData.dmsFk = dmsData.id;
|
||||||
|
formRef.formData.dms = dmsData;
|
||||||
|
formRef.hasChanges = true;
|
||||||
|
formRef.save();
|
||||||
|
}
|
||||||
|
"
|
||||||
|
/>
|
||||||
|
</QDialog>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Document: Documento
|
||||||
|
Download file: Descargar archivo
|
||||||
|
Edit document: Editar documento
|
||||||
|
Delete file: Eliminar archivo
|
||||||
|
Create document: Crear documento
|
||||||
|
|
||||||
|
</i18n>
|
||||||
|
|
@ -389,10 +389,7 @@ defineExpose({
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</QTable>
|
</QTable>
|
||||||
<div
|
<div v-else class="info-row q-pa-md text-center">
|
||||||
v-else
|
|
||||||
class="info-row q-pa-md text-center"
|
|
||||||
>
|
|
||||||
<h5>
|
<h5>
|
||||||
{{ t('No data to display') }}
|
{{ t('No data to display') }}
|
||||||
</h5>
|
</h5>
|
||||||
|
|
@ -416,6 +413,7 @@ defineExpose({
|
||||||
v-shortcut
|
v-shortcut
|
||||||
@click="showFormDialog()"
|
@click="showFormDialog()"
|
||||||
class="fill-icon"
|
class="fill-icon"
|
||||||
|
data-cy="addButton"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ t('Upload file') }}
|
{{ t('Upload file') }}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import VnSelect from './VnSelect.vue';
|
||||||
|
|
||||||
|
const stateBtnDropdownRef = ref();
|
||||||
|
|
||||||
|
const emit = defineEmits(['changeState']);
|
||||||
|
|
||||||
|
const $props = defineProps({
|
||||||
|
disable: {
|
||||||
|
type: Boolean,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
options: {
|
||||||
|
type: Array,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
optionLabel: {
|
||||||
|
type: String,
|
||||||
|
default: 'name',
|
||||||
|
},
|
||||||
|
optionValue: {
|
||||||
|
type: String,
|
||||||
|
default: 'id',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
async function changeState(value) {
|
||||||
|
stateBtnDropdownRef.value?.hide();
|
||||||
|
emit('changeState', value);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QBtnDropdown
|
||||||
|
ref="stateBtnDropdownRef"
|
||||||
|
color="black"
|
||||||
|
text-color="white"
|
||||||
|
:label="$t('globals.changeState')"
|
||||||
|
:disable="$props.disable"
|
||||||
|
>
|
||||||
|
<VnSelect
|
||||||
|
:options="$props.options"
|
||||||
|
:option-label="$props.optionLabel"
|
||||||
|
:option-value="$props.optionValue"
|
||||||
|
hide-selected
|
||||||
|
hide-dropdown-icon
|
||||||
|
focus-on-mount
|
||||||
|
@update:model-value="changeState"
|
||||||
|
>
|
||||||
|
</VnSelect>
|
||||||
|
</QBtnDropdown>
|
||||||
|
</template>
|
||||||
|
|
@ -84,7 +84,7 @@ const mixinRules = [
|
||||||
...($attrs.rules ?? []),
|
...($attrs.rules ?? []),
|
||||||
(val) => {
|
(val) => {
|
||||||
const maxlength = $props.maxlength;
|
const maxlength = $props.maxlength;
|
||||||
if (maxlength && +val.length > maxlength)
|
if (maxlength && +val?.length > maxlength)
|
||||||
return t(`maxLength`, { value: maxlength });
|
return t(`maxLength`, { value: maxlength });
|
||||||
const { min, max } = vnInputRef.value.$attrs;
|
const { min, max } = vnInputRef.value.$attrs;
|
||||||
if (!min) return null;
|
if (!min) return null;
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ const manageDate = (date) => {
|
||||||
@click="isPopupOpen = !isPopupOpen"
|
@click="isPopupOpen = !isPopupOpen"
|
||||||
@keydown="isPopupOpen = false"
|
@keydown="isPopupOpen = false"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDate'"
|
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { watch } from 'vue';
|
import { watch } from 'vue';
|
||||||
import { toDateString } from 'src/filters';
|
import { toDateHourMinSec } from 'src/filters';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
value: { type: [String, Number, Boolean, Object], default: undefined },
|
value: { type: [String, Number, Boolean, Object], default: undefined },
|
||||||
|
|
@ -40,7 +40,7 @@ const updateValue = () => {
|
||||||
break;
|
break;
|
||||||
case 'object':
|
case 'object':
|
||||||
if (props.value instanceof Date) {
|
if (props.value instanceof Date) {
|
||||||
t = toDateString(props.value);
|
t = toDateHourMinSec(props.value);
|
||||||
} else {
|
} else {
|
||||||
t = props.value.toString();
|
t = props.value.toString();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onUnmounted, watch } from 'vue';
|
import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
@ -10,12 +10,12 @@ import { useColor } from 'src/composables/useColor';
|
||||||
import { useCapitalize } from 'src/composables/useCapitalize';
|
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||||
import { useValidator } from 'src/composables/useValidator';
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import VnAvatar from '../ui/VnAvatar.vue';
|
import VnAvatar from '../ui/VnAvatar.vue';
|
||||||
import VnJsonValue from '../common/VnJsonValue.vue';
|
import VnLogValue from './VnLogValue.vue';
|
||||||
import FetchData from '../FetchData.vue';
|
|
||||||
import VnSelect from './VnSelect.vue';
|
|
||||||
import VnUserLink from '../ui/VnUserLink.vue';
|
import VnUserLink from '../ui/VnUserLink.vue';
|
||||||
import VnPaginate from '../ui/VnPaginate.vue';
|
import VnPaginate from '../ui/VnPaginate.vue';
|
||||||
|
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
|
||||||
import RightMenu from './RightMenu.vue';
|
import RightMenu from './RightMenu.vue';
|
||||||
|
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
|
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const validationsStore = useValidator();
|
const validationsStore = useValidator();
|
||||||
|
|
@ -72,39 +72,8 @@ const filter = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const paginate = ref();
|
const paginate = ref();
|
||||||
const actions = ref();
|
const dataKey = computed(() => `${props.model}Log`);
|
||||||
const changeInput = ref();
|
const userParams = ref(useFilterParams(dataKey.value).params);
|
||||||
const searchInput = ref();
|
|
||||||
const userRadio = ref();
|
|
||||||
const userSelect = ref();
|
|
||||||
const dateFrom = ref();
|
|
||||||
const dateFromDialog = ref(false);
|
|
||||||
const dateTo = ref();
|
|
||||||
const dateToDialog = ref(false);
|
|
||||||
const selectedFilters = ref({});
|
|
||||||
const userTypes = [
|
|
||||||
{ label: 'All', value: undefined },
|
|
||||||
{ label: 'User', value: { neq: null } },
|
|
||||||
{ label: 'System', value: null },
|
|
||||||
];
|
|
||||||
const checkboxOptions = ref({
|
|
||||||
insert: {
|
|
||||||
label: 'Creates',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
update: {
|
|
||||||
label: 'Edits',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
delete: {
|
|
||||||
label: 'Deletes',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
select: {
|
|
||||||
label: 'Accesses',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
let validations = models;
|
let validations = models;
|
||||||
let pointRecord = ref(null);
|
let pointRecord = ref(null);
|
||||||
|
|
@ -246,131 +215,55 @@ async function setLogTree(data) {
|
||||||
function filterByRecord(modelLog) {
|
function filterByRecord(modelLog) {
|
||||||
byRecord.value = true;
|
byRecord.value = true;
|
||||||
const { id, model } = modelLog;
|
const { id, model } = modelLog;
|
||||||
|
applyFilter({ changedModelId: id, changedModel: model });
|
||||||
searchInput.value = id;
|
|
||||||
selectedFilters.value.changedModelId = id;
|
|
||||||
selectedFilters.value.changedModel = model;
|
|
||||||
applyFilter();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyFilter() {
|
async function applyFilter(params = {}) {
|
||||||
filter.where = { and: [] };
|
paginate.value.arrayData.resetPagination();
|
||||||
if (
|
paginate.value.arrayData.applyFilter({
|
||||||
!selectedFilters.value.changedModel ||
|
filter: {},
|
||||||
(!selectedFilters.value.changedModelValue &&
|
params: { originFk: route.params.id, ...params },
|
||||||
!selectedFilters.value.changedModelId)
|
});
|
||||||
)
|
|
||||||
byRecord.value = false;
|
|
||||||
|
|
||||||
if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
|
|
||||||
|
|
||||||
if (Object.keys(selectedFilters.value).length) {
|
|
||||||
filter.where.and.push(selectedFilters.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
paginate.value.fetch({ filter });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function setDate(type) {
|
function exprBuilder(param, value) {
|
||||||
let from = dateFrom.value
|
switch (param) {
|
||||||
? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
case 'changedModelValue':
|
||||||
: undefined;
|
return { [param]: { like: `%${value}%` } };
|
||||||
from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
|
case 'change':
|
||||||
|
if (value)
|
||||||
let to = dateTo.value
|
|
||||||
? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
|
||||||
: date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
|
|
||||||
to = date.adjustDate(
|
|
||||||
to,
|
|
||||||
{ hour: 21, minute: 59, second: 59, millisecond: 999 },
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
|
|
||||||
switch (type) {
|
|
||||||
case 'from':
|
|
||||||
return { between: [from, to] };
|
|
||||||
case 'to': {
|
|
||||||
if (dateFrom.value) {
|
|
||||||
return {
|
return {
|
||||||
between: [from, to],
|
or: [
|
||||||
|
{ oldJson: { like: `%${value}%` } },
|
||||||
|
{ newJson: { like: `%${value}%` } },
|
||||||
|
{ description: { like: `%${value}%` } },
|
||||||
|
],
|
||||||
};
|
};
|
||||||
}
|
break;
|
||||||
return { lte: to };
|
case 'action':
|
||||||
}
|
if (value?.length) return { [param]: { inq: value } };
|
||||||
|
break;
|
||||||
|
case 'from':
|
||||||
|
return { creationDate: { gte: value } };
|
||||||
|
case 'to':
|
||||||
|
return { creationDate: { lte: value } };
|
||||||
|
case 'userType':
|
||||||
|
if (value === 'User') return { userFk: { neq: null } };
|
||||||
|
if (value === 'System') return { userFk: null };
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return { [param]: value };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectFilter(type, dateType) {
|
|
||||||
const filter = {};
|
|
||||||
const actions = { inq: [] };
|
|
||||||
let reload = true;
|
|
||||||
|
|
||||||
if (type === 'search') {
|
|
||||||
if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
|
|
||||||
selectedFilters.value.changedModelId = searchInput.value.trim();
|
|
||||||
} else if (!searchInput.value) {
|
|
||||||
selectedFilters.value.changedModelId = undefined;
|
|
||||||
selectedFilters.value.changedModelValue = undefined;
|
|
||||||
} else {
|
|
||||||
selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (type === 'action' && selectedFilters.value.changedModel === null) {
|
|
||||||
selectedFilters.value.changedModel = undefined;
|
|
||||||
}
|
|
||||||
if (type === 'userRadio') {
|
|
||||||
selectedFilters.value.userFk = userRadio.value;
|
|
||||||
}
|
|
||||||
if (type === 'change') {
|
|
||||||
if (changeInput.value)
|
|
||||||
selectedFilters.value.or = [
|
|
||||||
{ oldJson: { like: `%${changeInput.value}%` } },
|
|
||||||
{ newJson: { like: `%${changeInput.value}%` } },
|
|
||||||
{ description: { like: `%${changeInput.value}%` } },
|
|
||||||
];
|
|
||||||
else selectedFilters.value.or = undefined;
|
|
||||||
}
|
|
||||||
if (type === 'userSelect') {
|
|
||||||
selectedFilters.value.userFk =
|
|
||||||
userSelect.value !== null ? userSelect.value : undefined;
|
|
||||||
}
|
|
||||||
if (type === 'date') {
|
|
||||||
if (!dateFrom.value && !dateTo.value) {
|
|
||||||
selectedFilters.value.creationDate = undefined;
|
|
||||||
} else if (dateType === 'to') {
|
|
||||||
selectedFilters.value.creationDate = setDate('to');
|
|
||||||
} else if (dateType === 'from') {
|
|
||||||
selectedFilters.value.creationDate = setDate('from');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Object.keys(checkboxOptions.value).forEach((key) => {
|
|
||||||
if (checkboxOptions.value[key].selected) actions.inq.push(key);
|
|
||||||
});
|
|
||||||
selectedFilters.value.action = actions.inq.length ? actions : undefined;
|
|
||||||
|
|
||||||
Object.keys(selectedFilters.value).forEach((key) => {
|
|
||||||
if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
|
|
||||||
});
|
|
||||||
|
|
||||||
if (reload) applyFilter(filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function clearFilter() {
|
async function clearFilter() {
|
||||||
selectedFilters.value = {};
|
|
||||||
byRecord.value = false;
|
byRecord.value = false;
|
||||||
userSelect.value = undefined;
|
|
||||||
searchInput.value = undefined;
|
|
||||||
changeInput.value = undefined;
|
|
||||||
dateFrom.value = undefined;
|
|
||||||
dateTo.value = undefined;
|
|
||||||
userRadio.value = undefined;
|
|
||||||
Object.keys(checkboxOptions.value).forEach(
|
|
||||||
(opt) => (checkboxOptions.value[opt].selected = false),
|
|
||||||
);
|
|
||||||
await applyFilter();
|
await applyFilter();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
stateStore.rightDrawerChangeValue(true);
|
||||||
|
});
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
stateStore.rightDrawer = false;
|
stateStore.rightDrawer = false;
|
||||||
});
|
});
|
||||||
|
|
@ -383,32 +276,18 @@ watch(
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
|
||||||
:url="`${props.model}Logs/${route.params.id}/models`"
|
|
||||||
:filter="{ order: ['changedModel'] }"
|
|
||||||
@on-fetch="
|
|
||||||
(data) =>
|
|
||||||
(actions = data.map((item) => {
|
|
||||||
const changedModel = item.changedModel;
|
|
||||||
return {
|
|
||||||
locale: useCapitalize(
|
|
||||||
validations[changedModel]?.locale?.name ?? changedModel,
|
|
||||||
),
|
|
||||||
value: changedModel,
|
|
||||||
};
|
|
||||||
}))
|
|
||||||
"
|
|
||||||
auto-load
|
|
||||||
/>
|
|
||||||
<VnPaginate
|
<VnPaginate
|
||||||
ref="paginate"
|
ref="paginate"
|
||||||
:data-key="`${model}Log`"
|
:data-key
|
||||||
:url="`${model}Logs`"
|
:url="dataKey + 's'"
|
||||||
:user-filter="filter"
|
:user-filter="filter"
|
||||||
:skeleton="false"
|
:skeleton="false"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="setLogTree"
|
@on-fetch="setLogTree"
|
||||||
|
@on-change="setLogTree"
|
||||||
search-url="logs"
|
search-url="logs"
|
||||||
|
:exprBuilder
|
||||||
|
:order="['creationDate DESC', 'id DESC']"
|
||||||
>
|
>
|
||||||
<template #body>
|
<template #body>
|
||||||
<div
|
<div
|
||||||
|
|
@ -467,6 +346,7 @@ watch(
|
||||||
backgroundColor: useColor(modelLog.model),
|
backgroundColor: useColor(modelLog.model),
|
||||||
}"
|
}"
|
||||||
:title="`${modelLog.model} #${modelLog.id}`"
|
:title="`${modelLog.model} #${modelLog.id}`"
|
||||||
|
data-cy="vnLog-model-chip"
|
||||||
>
|
>
|
||||||
{{ t(modelLog.modelI18n) }}
|
{{ t(modelLog.modelI18n) }}
|
||||||
</QChip>
|
</QChip>
|
||||||
|
|
@ -560,10 +440,9 @@ watch(
|
||||||
value.nameI18n
|
value.nameI18n
|
||||||
}}:
|
}}:
|
||||||
</span>
|
</span>
|
||||||
<VnJsonValue
|
<VnLogValue
|
||||||
:value="
|
:value="value.val"
|
||||||
value.val.val
|
:name="value.name"
|
||||||
"
|
|
||||||
/>
|
/>
|
||||||
</QItem>
|
</QItem>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
|
|
@ -581,6 +460,7 @@ watch(
|
||||||
}`,
|
}`,
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
data-cy="vnLog-action-icon"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
|
@ -614,7 +494,10 @@ watch(
|
||||||
>
|
>
|
||||||
{{ prop.nameI18n }}:
|
{{ prop.nameI18n }}:
|
||||||
</span>
|
</span>
|
||||||
<VnJsonValue :value="prop.val.val" />
|
<VnLogValue
|
||||||
|
:value="prop.val"
|
||||||
|
:name="prop.name"
|
||||||
|
/>
|
||||||
<span
|
<span
|
||||||
v-if="
|
v-if="
|
||||||
propIndex <
|
propIndex <
|
||||||
|
|
@ -642,8 +525,9 @@ watch(
|
||||||
{{ prop.nameI18n }}:
|
{{ prop.nameI18n }}:
|
||||||
</span>
|
</span>
|
||||||
<span v-if="log.action == 'update'">
|
<span v-if="log.action == 'update'">
|
||||||
<VnJsonValue
|
<VnLogValue
|
||||||
:value="prop.old.val"
|
:value="prop.old"
|
||||||
|
:name="prop.name"
|
||||||
/>
|
/>
|
||||||
<span
|
<span
|
||||||
v-if="prop.old.id"
|
v-if="prop.old.id"
|
||||||
|
|
@ -652,8 +536,9 @@ watch(
|
||||||
#{{ prop.old.id }}
|
#{{ prop.old.id }}
|
||||||
</span>
|
</span>
|
||||||
→
|
→
|
||||||
<VnJsonValue
|
<VnLogValue
|
||||||
:value="prop.val.val"
|
:value="prop.val"
|
||||||
|
:name="prop.name"
|
||||||
/>
|
/>
|
||||||
<span
|
<span
|
||||||
v-if="prop.val.id"
|
v-if="prop.val.id"
|
||||||
|
|
@ -663,8 +548,9 @@ watch(
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
<span v-else="prop.old.val">
|
<span v-else="prop.old.val">
|
||||||
<VnJsonValue
|
<VnLogValue
|
||||||
:value="prop.val.val"
|
:value="prop.val"
|
||||||
|
:name="prop.name"
|
||||||
/>
|
/>
|
||||||
<span
|
<span
|
||||||
v-if="prop.old.id"
|
v-if="prop.old.id"
|
||||||
|
|
@ -692,176 +578,12 @@ watch(
|
||||||
</VnPaginate>
|
</VnPaginate>
|
||||||
<RightMenu>
|
<RightMenu>
|
||||||
<template #right-panel>
|
<template #right-panel>
|
||||||
<QList dense>
|
<VnLogFilter :data-key />
|
||||||
<QSeparator />
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
:label="t('globals.search')"
|
|
||||||
v-model="searchInput"
|
|
||||||
class="full-width"
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
@keyup.enter="() => selectFilter('search')"
|
|
||||||
@focusout="() => selectFilter('search')"
|
|
||||||
@clear="() => selectFilter('search')"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="info" class="cursor-pointer">
|
|
||||||
<QTooltip>{{ t('tooltips.search') }}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</QInput>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<VnSelect
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.entity')"
|
|
||||||
v-model="selectedFilters.changedModel"
|
|
||||||
option-label="locale"
|
|
||||||
option-value="value"
|
|
||||||
:options="actions"
|
|
||||||
@update:model-value="selectFilter('action')"
|
|
||||||
hide-selected
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QOptionGroup
|
|
||||||
size="sm"
|
|
||||||
v-model="userRadio"
|
|
||||||
:options="userTypes"
|
|
||||||
color="primary"
|
|
||||||
@update:model-value="selectFilter('userRadio')"
|
|
||||||
right-label
|
|
||||||
>
|
|
||||||
<template #label="{ label }">
|
|
||||||
{{ t(`Users.${label}`) }}
|
|
||||||
</template>
|
|
||||||
</QOptionGroup>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QItemSection v-if="userRadio !== null">
|
|
||||||
<VnSelect
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.user')"
|
|
||||||
v-model="userSelect"
|
|
||||||
option-label="name"
|
|
||||||
option-value="id"
|
|
||||||
:url="`${model}Logs/${route.params.id}/editors`"
|
|
||||||
:fields="['id', 'nickname', 'name', 'image']"
|
|
||||||
sort-by="nickname"
|
|
||||||
@update:model-value="selectFilter('userSelect')"
|
|
||||||
hide-selected
|
|
||||||
>
|
|
||||||
<template #option="{ opt, itemProps }">
|
|
||||||
<QItem
|
|
||||||
v-bind="itemProps"
|
|
||||||
class="q-pa-xs row items-center"
|
|
||||||
>
|
|
||||||
<QItemSection class="col-3 items-center">
|
|
||||||
<VnAvatar :worker-id="opt.id" />
|
|
||||||
</QItemSection>
|
|
||||||
<QItemSection class="col-9 justify-center">
|
|
||||||
<span>{{ opt.name }}</span>
|
|
||||||
<span class="text-grey">{{ opt.nickname }}</span>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
</template>
|
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
:label="t('globals.changes')"
|
|
||||||
v-model="changeInput"
|
|
||||||
class="full-width"
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
@keyup.enter="selectFilter('change')"
|
|
||||||
@focusout="selectFilter('change')"
|
|
||||||
@clear="selectFilter('change')"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="info" class="cursor-pointer">
|
|
||||||
<QTooltip max-width="250px">{{
|
|
||||||
t('tooltips.changes')
|
|
||||||
}}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</QInput>
|
|
||||||
</QItem>
|
|
||||||
<QItem
|
|
||||||
:class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
|
|
||||||
v-for="(checkboxOption, index) in checkboxOptions"
|
|
||||||
:key="index"
|
|
||||||
>
|
|
||||||
<QCheckbox
|
|
||||||
size="sm"
|
|
||||||
v-model="checkboxOption.selected"
|
|
||||||
:label="t(`actions.${checkboxOption.label}`)"
|
|
||||||
@update:model-value="selectFilter"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.date')"
|
|
||||||
@click="dateFromDialog = true"
|
|
||||||
@focus="(evt) => evt.target.blur()"
|
|
||||||
@clear="selectFilter('date', 'to')"
|
|
||||||
v-model="dateFrom"
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.to')"
|
|
||||||
@click="dateToDialog = true"
|
|
||||||
@focus="(evt) => evt.target.blur()"
|
|
||||||
@clear="selectFilter('date', 'from')"
|
|
||||||
v-model="dateTo"
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
</QList>
|
|
||||||
</template>
|
</template>
|
||||||
</RightMenu>
|
</RightMenu>
|
||||||
<QDialog v-model="dateFromDialog">
|
|
||||||
<QDate
|
|
||||||
:years-in-month-view="false"
|
|
||||||
v-model="dateFrom"
|
|
||||||
dense
|
|
||||||
flat
|
|
||||||
minimal
|
|
||||||
@update:model-value="
|
|
||||||
(value) => {
|
|
||||||
dateFromDialog = false;
|
|
||||||
dateFrom = date.formatDate(value, 'DD-MM-YYYY');
|
|
||||||
selectFilter('date', 'from');
|
|
||||||
}
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</QDialog>
|
|
||||||
<QDialog v-model="dateToDialog">
|
|
||||||
<QDate
|
|
||||||
v-model="dateTo"
|
|
||||||
dense
|
|
||||||
flat
|
|
||||||
minimal
|
|
||||||
@update:model-value="
|
|
||||||
(value) => {
|
|
||||||
dateToDialog = false;
|
|
||||||
dateTo = date.formatDate(value, 'DD-MM-YYYY');
|
|
||||||
selectFilter('date', 'to');
|
|
||||||
}
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</QDialog>
|
|
||||||
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
|
v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="filter_alt_off"
|
icon="filter_alt_off"
|
||||||
size="md"
|
size="md"
|
||||||
|
|
|
||||||
|
|
@ -1,77 +1,249 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import VnTableFilter from '../VnTable/VnTableFilter.vue';
|
||||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
import VnSelect from './VnSelect.vue';
|
||||||
|
import { useRoute } from 'vue-router';
|
||||||
|
import VnInput from './VnInput.vue';
|
||||||
|
import { ref, computed, watch } from 'vue';
|
||||||
|
import VnInputDate from './VnInputDate.vue';
|
||||||
|
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
|
import FetchData from '../FetchData.vue';
|
||||||
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
|
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||||
|
import VnAvatar from '../ui/VnAvatar.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const $props = defineProps({
|
||||||
const props = defineProps({
|
|
||||||
dataKey: {
|
dataKey: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true,
|
default: null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const workers = ref();
|
const { t } = useI18n();
|
||||||
|
const route = useRoute();
|
||||||
|
const validationsStore = useValidator();
|
||||||
|
const { models } = validationsStore;
|
||||||
|
const entities = ref([]);
|
||||||
|
const editors = ref([]);
|
||||||
|
const userParams = ref(useFilterParams($props.dataKey).params);
|
||||||
|
let validations = models;
|
||||||
|
const userTypes = [
|
||||||
|
{ value: 'All', label: t(`Users.All`) },
|
||||||
|
{ value: 'User', label: t(`Users.User`) },
|
||||||
|
{ value: 'System', label: t(`Users.System`) },
|
||||||
|
];
|
||||||
|
const checkboxOptions = ref([
|
||||||
|
{ name: 'insert', label: 'Creates', selected: false },
|
||||||
|
{ name: 'update', label: 'Edits', selected: false },
|
||||||
|
{ name: 'delete', label: 'Deletes', selected: false },
|
||||||
|
{ name: 'select', label: 'Accesses', selected: false },
|
||||||
|
]);
|
||||||
|
const columns = computed(() => [
|
||||||
|
{ name: 'changedModelValue' },
|
||||||
|
{ name: 'changedModel' },
|
||||||
|
{ name: 'userType', orderBy: false },
|
||||||
|
{ name: 'userFk' },
|
||||||
|
{ name: 'change', orderBy: false },
|
||||||
|
{ name: 'action' },
|
||||||
|
{ name: 'from', orderBy: 'creationDate' },
|
||||||
|
{ name: 'to', orderBy: 'creationDate' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
const userParamsWatcher = watch(
|
||||||
|
() => userParams.value,
|
||||||
|
(params) => {
|
||||||
|
if (params.action) {
|
||||||
|
params.action.forEach((option) => {
|
||||||
|
checkboxOptions.value.find((o) => o.name === option).selected = true;
|
||||||
|
});
|
||||||
|
userParamsWatcher();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
function getActions() {
|
||||||
|
const actions = checkboxOptions.value
|
||||||
|
.filter((option) => option.selected)
|
||||||
|
?.map((o) => o.name);
|
||||||
|
return actions.length ? actions : null;
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<FetchData
|
||||||
url="Workers/activeWithInheritedRole"
|
:url="`${dataKey}s/${route.params.id}/models`"
|
||||||
:filter="{ where: { role: 'salesPerson' } }"
|
:filter="{ order: ['changedModel'] }"
|
||||||
@on-fetch="(data) => (workers = data)"
|
@on-fetch="
|
||||||
|
(data) =>
|
||||||
|
(entities = data.map((item) => {
|
||||||
|
const changedModel = item.changedModel;
|
||||||
|
return {
|
||||||
|
locale: useCapitalize(
|
||||||
|
validations[changedModel]?.locale?.name ?? changedModel,
|
||||||
|
),
|
||||||
|
value: changedModel,
|
||||||
|
};
|
||||||
|
}))
|
||||||
|
"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
<FetchData
|
||||||
<template #tags="{ tag, formatFn }">
|
:url="`${dataKey}s/${route.params.id}/editors`"
|
||||||
<div class="q-gutter-x-xs">
|
:filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
|
||||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
sort-by="nickname"
|
||||||
<span>{{ formatFn(tag.value) }}</span>
|
@on-fetch="(data) => (editors = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<VnTableFilter
|
||||||
|
v-if="dataKey"
|
||||||
|
:data-key
|
||||||
|
:columns="columns"
|
||||||
|
:redirect="false"
|
||||||
|
:hiddenTags="['originFk', 'creationDate']"
|
||||||
|
search-url="logs"
|
||||||
|
:showTagChips="false"
|
||||||
|
>
|
||||||
|
<template #filter-changedModelValue="{ params, columnName, searchFn }">
|
||||||
|
<VnInput
|
||||||
|
:label="t('globals.search')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
@keyup.enter="searchFn"
|
||||||
|
@blur="searchFn"
|
||||||
|
@remove="searchFn"
|
||||||
|
:info="t('tooltips.search')"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
data-cy="vnLog-search"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-changedModel="{ params, columnName, searchFn }">
|
||||||
|
<VnSelect
|
||||||
|
:label="t('globals.entity')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
option-label="locale"
|
||||||
|
option-value="value"
|
||||||
|
:options="entities"
|
||||||
|
@update:model-value="() => searchFn()"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
data-cy="vnLog-entity"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-userType="{ params, columnName, searchFn }">
|
||||||
|
<QOptionGroup
|
||||||
|
class="text-left"
|
||||||
|
size="sm"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
:options="userTypes"
|
||||||
|
color="primary"
|
||||||
|
@update:model-value="
|
||||||
|
() => {
|
||||||
|
params.userFk = null;
|
||||||
|
searchFn();
|
||||||
|
}
|
||||||
|
"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-userFk="{ params, columnName, searchFn }">
|
||||||
|
<VnSelect
|
||||||
|
:label="t('globals.user')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
:options="editors"
|
||||||
|
@update:modelValue="() => searchFn()"
|
||||||
|
:disable="params.userType === 'System'"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
>
|
||||||
|
<template #option="{ opt, itemProps }">
|
||||||
|
<QItem v-bind="itemProps" class="q-pa-xs row items-center">
|
||||||
|
<QItemSection class="col-3 items-center">
|
||||||
|
<VnAvatar :worker-id="opt.id" />
|
||||||
|
</QItemSection>
|
||||||
|
<QItemSection class="col-9 justify-center">
|
||||||
|
<span>{{ opt.name }}</span>
|
||||||
|
<span class="text-grey">{{ opt.nickname }}</span>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
|
</template>
|
||||||
|
</VnSelect>
|
||||||
|
</template>
|
||||||
|
<template #filter-change="{ params, columnName, searchFn }">
|
||||||
|
<VnInput
|
||||||
|
:label="t('globals.changes')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
@keyup.enter="searchFn"
|
||||||
|
@blur="searchFn"
|
||||||
|
@remove="searchFn"
|
||||||
|
:info="t('tooltips.changes')"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-action="{ searchFn }">
|
||||||
|
<div class="column">
|
||||||
|
<QCheckbox
|
||||||
|
v-for="checkboxOption in checkboxOptions"
|
||||||
|
:key="checkboxOption"
|
||||||
|
size="sm"
|
||||||
|
v-model="checkboxOption.selected"
|
||||||
|
:label="t(`actions.${checkboxOption.label}`)"
|
||||||
|
@update:model-value="
|
||||||
|
() => searchFn(undefined, 'action', getActions())
|
||||||
|
"
|
||||||
|
data-cy="vnLog-checkbox"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #body="{ params, searchFn }">
|
<template #filter-from="{ params, columnName, searchFn }">
|
||||||
<QDate
|
<VnInputDate
|
||||||
v-model="params.created"
|
:label="t('globals.from')"
|
||||||
@update:model-value="searchFn()"
|
v-model="params[columnName]"
|
||||||
dense
|
dense
|
||||||
flat
|
filled
|
||||||
minimal
|
@update:modelValue="() => searchFn()"
|
||||||
>
|
/>
|
||||||
</QDate>
|
|
||||||
<QSeparator />
|
|
||||||
<QItem>
|
|
||||||
<QItemSection v-if="!workers">
|
|
||||||
<QSkeleton type="QInput" class="full-width" />
|
|
||||||
</QItemSection>
|
|
||||||
<QItemSection v-if="workers">
|
|
||||||
<QSelect
|
|
||||||
:label="t('User')"
|
|
||||||
v-model="params.userFk"
|
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="workers"
|
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
use-input
|
|
||||||
:input-debounce="0"
|
|
||||||
/>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
</template>
|
</template>
|
||||||
</VnFilterPanel>
|
<template #filter-to="{ params, columnName, searchFn }">
|
||||||
|
<VnInputDate
|
||||||
|
:label="t('globals.to')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
@update:modelValue="() => searchFn()"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</VnTableFilter>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
|
||||||
params:
|
|
||||||
search: Contains
|
|
||||||
userFk: User
|
|
||||||
created: Created
|
|
||||||
es:
|
es:
|
||||||
|
tooltips:
|
||||||
|
search: Buscar por identificador o concepto
|
||||||
|
changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
|
||||||
|
actions:
|
||||||
|
Creates: Crea
|
||||||
|
Edits: Modifica
|
||||||
|
Deletes: Elimina
|
||||||
|
Accesses: Accede
|
||||||
|
Users:
|
||||||
|
User: Usuario
|
||||||
|
All: Todo
|
||||||
|
System: Sistema
|
||||||
params:
|
params:
|
||||||
search: Contiene
|
changedModel: Entity
|
||||||
userFk: Usuario
|
|
||||||
created: Creada
|
en:
|
||||||
User: Usuario
|
tooltips:
|
||||||
|
search: Search by identifier or concept
|
||||||
|
changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
|
||||||
|
actions:
|
||||||
|
Creates: Creates
|
||||||
|
Edits: Edits
|
||||||
|
Deletes: Deletes
|
||||||
|
Accesses: Accesses
|
||||||
|
Users:
|
||||||
|
User: User
|
||||||
|
All: All
|
||||||
|
System: System
|
||||||
|
params:
|
||||||
|
changedModel: Entidad
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
<script setup>
|
||||||
|
import { useDescriptorStore } from 'src/stores/useDescriptorStore';
|
||||||
|
import VnJsonValue from './VnJsonValue.vue';
|
||||||
|
import { computed } from 'vue';
|
||||||
|
const descriptorStore = useDescriptorStore();
|
||||||
|
|
||||||
|
const $props = defineProps({
|
||||||
|
value: { type: Object, default: () => {} },
|
||||||
|
name: { type: String, default: undefined },
|
||||||
|
});
|
||||||
|
|
||||||
|
const descriptor = computed(() => descriptorStore.has($props.name));
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<VnJsonValue :value="value.val" />
|
||||||
|
<span
|
||||||
|
v-if="(value.id || typeof value.val == 'number') && descriptor"
|
||||||
|
style="margin-left: 2px"
|
||||||
|
>
|
||||||
|
<QIcon
|
||||||
|
name="launch"
|
||||||
|
class="link"
|
||||||
|
:data-cy="'iconLaunch-' + $props.name"
|
||||||
|
style="padding-bottom: 2px"
|
||||||
|
/>
|
||||||
|
<component :is="descriptor" :id="value.id ?? value.val" />
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
|
@ -40,10 +40,6 @@ const $props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
keepData: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
@ -61,7 +57,6 @@ onBeforeMount(() => {
|
||||||
if ($props.dataKey)
|
if ($props.dataKey)
|
||||||
arrayData = useArrayData($props.dataKey, {
|
arrayData = useArrayData($props.dataKey, {
|
||||||
searchUrl: 'table',
|
searchUrl: 'table',
|
||||||
keepData: $props.keepData,
|
|
||||||
...$props.arrayDataProps,
|
...$props.arrayDataProps,
|
||||||
navigate: $props.redirect,
|
navigate: $props.redirect,
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
|
import { ref, toRefs, computed, watch, onMounted, useAttrs, nextTick } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { useRequired } from 'src/composables/useRequired';
|
import { useRequired } from 'src/composables/useRequired';
|
||||||
|
|
@ -152,6 +152,10 @@ const value = computed({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const computedSortBy = computed(() => {
|
||||||
|
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||||
|
});
|
||||||
|
|
||||||
watch(options, (newValue) => {
|
watch(options, (newValue) => {
|
||||||
setOptions(newValue);
|
setOptions(newValue);
|
||||||
});
|
});
|
||||||
|
|
@ -186,7 +190,7 @@ function findKeyInOptions() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function setOptions(data) {
|
function setOptions(data) {
|
||||||
data = dataByOrder(data, $props.sortBy);
|
data = dataByOrder(data, computedSortBy.value);
|
||||||
myOptions.value = JSON.parse(JSON.stringify(data));
|
myOptions.value = JSON.parse(JSON.stringify(data));
|
||||||
myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
|
myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
|
||||||
emit('update:options', data);
|
emit('update:options', data);
|
||||||
|
|
@ -216,7 +220,8 @@ function filter(val, options) {
|
||||||
async function fetchFilter(val) {
|
async function fetchFilter(val) {
|
||||||
if (!$props.url) return;
|
if (!$props.url) return;
|
||||||
|
|
||||||
const { fields, include, sortBy, limit } = $props;
|
const { fields, include, limit } = $props;
|
||||||
|
const sortBy = computedSortBy.value;
|
||||||
const key =
|
const key =
|
||||||
optionFilterValue.value ??
|
optionFilterValue.value ??
|
||||||
(new RegExp(/\d/g).test(val)
|
(new RegExp(/\d/g).test(val)
|
||||||
|
|
@ -295,6 +300,7 @@ async function onScroll({ to, direction, from, index }) {
|
||||||
await arrayData.loadMore();
|
await arrayData.loadMore();
|
||||||
setOptions(arrayData.store.data);
|
setOptions(arrayData.store.data);
|
||||||
vnSelectRef.value.scrollTo(lastIndex);
|
vnSelectRef.value.scrollTo(lastIndex);
|
||||||
|
await nextTick();
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
|
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
|
||||||
import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
import { Notify } from 'quasar';
|
import { Notify } from 'quasar';
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
import VnDms from 'src/components/common/VnDms.vue';
|
import VnDms from 'src/components/common/VnDms.vue';
|
||||||
|
|
||||||
|
|
@ -40,12 +41,10 @@ describe('VnDms', () => {
|
||||||
companyFk: 2,
|
companyFk: 2,
|
||||||
dmsTypeFk: 3,
|
dmsTypeFk: 3,
|
||||||
description: 'This is a test description',
|
description: 'This is a test description',
|
||||||
files: [
|
files: {
|
||||||
{
|
name: 'example.txt',
|
||||||
name: 'example.txt',
|
content: new Blob(['file content'], { type: 'text/plain' }),
|
||||||
content: new Blob(['file content'], { type: 'text/plain' }),
|
},
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const expectedBody = {
|
const expectedBody = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
import VnDmsList from 'src/components/common/VnDmsList.vue';
|
import VnDmsList from 'src/components/common/VnDmsList.vue';
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
@ -10,6 +12,9 @@ describe('VnDmsList', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
|
vi.mock('src/composables/getUrl', () => ({
|
||||||
|
getUrl: vi.fn().mockResolvedValue(''),
|
||||||
|
}));
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
||||||
vm = createWrapper(VnDmsList, {
|
vm = createWrapper(VnDmsList, {
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
|
||||||
const date = new Date('2023-01-01');
|
const date = new Date('2023-01-01');
|
||||||
const wrapper = buildComponent({ value: date });
|
const wrapper = buildComponent({ value: date });
|
||||||
const span = wrapper.find('span');
|
const span = wrapper.find('span');
|
||||||
expect(span.text()).toBe('2023-01-01');
|
expect(span.text()).toBe('01/01/2023, 01:00:00');
|
||||||
expect(span.classes()).toContain('json-object');
|
expect(span.classes()).toContain('json-object');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnLog from 'src/components/common/VnLog.vue';
|
import VnLog from 'src/components/common/VnLog.vue';
|
||||||
|
|
||||||
describe('VnLog', () => {
|
describe('VnLog', () => {
|
||||||
|
|
@ -108,27 +109,4 @@ describe('VnLog', () => {
|
||||||
expect(vm.logTree[0].originFk).toEqual(1);
|
expect(vm.logTree[0].originFk).toEqual(1);
|
||||||
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
|
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should correctly set the selectedFilters when filtering', () => {
|
|
||||||
vm.searchInput = '1';
|
|
||||||
vm.userSelect = '21';
|
|
||||||
vm.checkboxOptions.insert.selected = true;
|
|
||||||
vm.checkboxOptions.update.selected = true;
|
|
||||||
|
|
||||||
vm.selectFilter('search');
|
|
||||||
vm.selectFilter('userSelect');
|
|
||||||
|
|
||||||
expect(vm.selectedFilters.changedModelId).toEqual('1');
|
|
||||||
expect(vm.selectedFilters.userFk).toEqual('21');
|
|
||||||
expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should correctly set the date from', () => {
|
|
||||||
vm.dateFrom = '18-09-2023';
|
|
||||||
vm.selectFilter('date', 'from');
|
|
||||||
expect(vm.selectedFilters.creationDate.between).toEqual([
|
|
||||||
new Date('2023-09-18T00:00:00.000Z'),
|
|
||||||
new Date('2023-09-18T21:59:59.999Z'),
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
|
||||||
|
|
||||||
|
describe('VnLogFilter', () => {
|
||||||
|
let vm;
|
||||||
|
beforeAll(async () => {
|
||||||
|
vm = createWrapper(VnLogFilter, {
|
||||||
|
props: {
|
||||||
|
dataKey: 'ClaimLog',
|
||||||
|
},
|
||||||
|
}).vm;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should getActions selected', async () => {
|
||||||
|
vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
|
||||||
|
vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
|
||||||
|
|
||||||
|
const actions = vm.getActions();
|
||||||
|
|
||||||
|
expect(actions.length).toEqual(2);
|
||||||
|
expect(actions).toEqual(['insert', 'update']);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import VnLogValue from 'src/components/common/VnLogValue.vue';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
|
||||||
|
const buildComponent = (props) => {
|
||||||
|
return createWrapper(VnLogValue, {
|
||||||
|
props,
|
||||||
|
global: {},
|
||||||
|
}).wrapper;
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('VnLogValue', () => {
|
||||||
|
const id = 1;
|
||||||
|
it('renders without descriptor', async () => {
|
||||||
|
expect(getIcon('inventFk').exists()).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders with descriptor', async () => {
|
||||||
|
expect(getIcon('claimFk').text()).toBe('launch');
|
||||||
|
});
|
||||||
|
|
||||||
|
function getIcon(name) {
|
||||||
|
const wrapper = buildComponent({ value: { val: id }, name });
|
||||||
|
return wrapper.find('.q-icon');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
import VnNotes from 'src/components/ui/VnNotes.vue';
|
import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||||
|
|
||||||
describe('VnNotes', () => {
|
describe('VnNotes', () => {
|
||||||
|
|
@ -8,6 +9,7 @@ describe('VnNotes', () => {
|
||||||
let spyFetch;
|
let spyFetch;
|
||||||
let postMock;
|
let postMock;
|
||||||
let patchMock;
|
let patchMock;
|
||||||
|
let deleteMock;
|
||||||
let expectedInsertBody;
|
let expectedInsertBody;
|
||||||
let expectedUpdateBody;
|
let expectedUpdateBody;
|
||||||
const defaultOptions = {
|
const defaultOptions = {
|
||||||
|
|
@ -47,6 +49,7 @@ describe('VnNotes', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
postMock = vi.spyOn(axios, 'post');
|
postMock = vi.spyOn(axios, 'post');
|
||||||
patchMock = vi.spyOn(axios, 'patch');
|
patchMock = vi.spyOn(axios, 'patch');
|
||||||
|
deleteMock = vi.spyOn(axios, 'delete');
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
|
@ -143,4 +146,16 @@ describe('VnNotes', () => {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('delete', () => {
|
||||||
|
it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
|
||||||
|
generateWrapper();
|
||||||
|
createSpyFetch();
|
||||||
|
|
||||||
|
await vm.deleteNote({ id: 1 });
|
||||||
|
|
||||||
|
expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
|
||||||
|
expect(spyFetch).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,332 +1,38 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onBeforeMount, watch, computed, ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import VnDescriptor from './VnDescriptor.vue';
|
||||||
import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
|
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
|
||||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
|
||||||
import { useState } from 'src/composables/useState';
|
|
||||||
import { useRoute } from 'vue-router';
|
|
||||||
import { useClipboard } from 'src/composables/useClipboard';
|
|
||||||
import VnMoreOptions from './VnMoreOptions.vue';
|
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
url: {
|
id: {
|
||||||
type: String,
|
|
||||||
default: '',
|
|
||||||
},
|
|
||||||
filter: {
|
|
||||||
type: Object,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
title: {
|
|
||||||
type: String,
|
|
||||||
default: '',
|
|
||||||
},
|
|
||||||
subtitle: {
|
|
||||||
type: Number,
|
type: Number,
|
||||||
default: null,
|
default: false,
|
||||||
},
|
},
|
||||||
dataKey: {
|
card: {
|
||||||
type: String,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
summary: {
|
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
width: {
|
|
||||||
type: String,
|
|
||||||
default: 'md-width',
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const state = useState();
|
|
||||||
const route = useRoute();
|
|
||||||
const { t } = useI18n();
|
|
||||||
const { copyText } = useClipboard();
|
|
||||||
const { viewSummary } = useSummaryDialog();
|
|
||||||
let arrayData;
|
|
||||||
let store;
|
|
||||||
let entity;
|
|
||||||
const isLoading = ref(false);
|
|
||||||
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
|
|
||||||
defineExpose({ getData });
|
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
|
||||||
arrayData = useArrayData($props.dataKey, {
|
|
||||||
url: $props.url,
|
|
||||||
userFilter: $props.filter,
|
|
||||||
skip: 0,
|
|
||||||
oneRecord: true,
|
|
||||||
});
|
|
||||||
store = arrayData.store;
|
|
||||||
entity = computed(() => {
|
|
||||||
const data = store.data ?? {};
|
|
||||||
if (data) emit('onFetch', data);
|
|
||||||
return data;
|
|
||||||
});
|
|
||||||
|
|
||||||
// It enables to load data only once if the module is the same as the dataKey
|
|
||||||
if (!isSameDataKey.value || !route.params.id) await getData();
|
|
||||||
watch(
|
|
||||||
() => [$props.url, $props.filter],
|
|
||||||
async () => {
|
|
||||||
if (!isSameDataKey.value) await getData();
|
|
||||||
},
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
const routeName = computed(() => {
|
|
||||||
const DESCRIPTOR_PROXY = 'DescriptorProxy';
|
|
||||||
|
|
||||||
let name = $props.dataKey;
|
|
||||||
if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
|
|
||||||
name = name.split(DESCRIPTOR_PROXY)[0];
|
|
||||||
}
|
|
||||||
return `${name}Summary`;
|
|
||||||
});
|
|
||||||
async function getData() {
|
|
||||||
store.url = $props.url;
|
|
||||||
store.filter = $props.filter ?? {};
|
|
||||||
isLoading.value = true;
|
|
||||||
try {
|
|
||||||
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
|
||||||
state.set($props.dataKey, data);
|
|
||||||
emit('onFetch', data);
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getValueFromPath(path) {
|
|
||||||
if (!path) return;
|
|
||||||
const keys = path.toString().split('.');
|
|
||||||
let current = entity.value;
|
|
||||||
|
|
||||||
for (const key of keys) {
|
|
||||||
if (current[key] === undefined) return undefined;
|
|
||||||
else current = current[key];
|
|
||||||
}
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
||||||
function copyIdText(id) {
|
|
||||||
copyText(id, {
|
|
||||||
component: {
|
|
||||||
copyValue: id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const emit = defineEmits(['onFetch']);
|
const emit = defineEmits(['onFetch']);
|
||||||
|
const entity = ref();
|
||||||
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>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="descriptor">
|
<component
|
||||||
<template v-if="entity && !isLoading">
|
:is="card"
|
||||||
<div class="header bg-primary q-pa-sm justify-between">
|
:id
|
||||||
<slot name="header-extra-action"
|
:visual="false"
|
||||||
><QBtn
|
v-bind="$attrs"
|
||||||
round
|
@on-fetch="
|
||||||
flat
|
(data) => {
|
||||||
dense
|
entity = data;
|
||||||
size="md"
|
emit('onFetch', data);
|
||||||
: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, $props.width)"
|
|
||||||
round
|
|
||||||
flat
|
|
||||||
dense
|
|
||||||
size="md"
|
|
||||||
icon="preview"
|
|
||||||
color="white"
|
|
||||||
class="link"
|
|
||||||
v-if="summary"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('components.smartCard.openSummary') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
<RouterLink :to="{ name: routeName, params: { id: entity.id } }">
|
|
||||||
<QBtn
|
|
||||||
class="link"
|
|
||||||
color="white"
|
|
||||||
dense
|
|
||||||
flat
|
|
||||||
icon="launch"
|
|
||||||
round
|
|
||||||
size="md"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('components.cardDescriptor.summary') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</RouterLink>
|
|
||||||
<VnMoreOptions v-if="$slots.menu">
|
|
||||||
<template #menu="{ menuRef }">
|
|
||||||
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
|
|
||||||
</template>
|
|
||||||
</VnMoreOptions>
|
|
||||||
</div>
|
|
||||||
<slot name="before" />
|
|
||||||
<div class="body q-py-sm">
|
|
||||||
<QList dense>
|
|
||||||
<QItemLabel header class="ellipsis text-h5" :lines="1">
|
|
||||||
<div class="title">
|
|
||||||
<span v-if="$props.title" :title="getValueFromPath(title)">
|
|
||||||
{{ getValueFromPath(title) ?? $props.title }}
|
|
||||||
</span>
|
|
||||||
<slot v-else name="description" :entity="entity">
|
|
||||||
<span :title="entity.name">
|
|
||||||
{{ entity.name }}
|
|
||||||
</span>
|
|
||||||
</slot>
|
|
||||||
</div>
|
|
||||||
</QItemLabel>
|
|
||||||
<QItem>
|
|
||||||
<QItemLabel class="subtitle">
|
|
||||||
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
|
||||||
</QItemLabel>
|
|
||||||
<QBtn
|
|
||||||
round
|
|
||||||
flat
|
|
||||||
dense
|
|
||||||
size="sm"
|
|
||||||
icon="content_copy"
|
|
||||||
color="primary"
|
|
||||||
@click.stop="copyIdText(entity.id)"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('globals.copyId') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</QItem>
|
|
||||||
</QList>
|
|
||||||
<div class="list-box q-mt-xs">
|
|
||||||
<slot name="body" :entity="entity" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="icons">
|
|
||||||
<slot name="icons" :entity="entity" />
|
|
||||||
</div>
|
|
||||||
<div class="actions justify-center" data-cy="descriptor_actions">
|
|
||||||
<slot name="actions" :entity="entity" />
|
|
||||||
</div>
|
|
||||||
<slot name="after" />
|
|
||||||
</template>
|
|
||||||
<!-- Skeleton -->
|
|
||||||
<SkeletonDescriptor v-if="!entity || isLoading" />
|
|
||||||
</div>
|
|
||||||
<QInnerLoading
|
|
||||||
:label="t('globals.pleaseWait')"
|
|
||||||
:showing="isLoading"
|
|
||||||
color="primary"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
.body {
|
|
||||||
background-color: var(--vn-section-color);
|
|
||||||
.text-h5 {
|
|
||||||
font-size: 20px;
|
|
||||||
padding-top: 5px;
|
|
||||||
padding-bottom: 0px;
|
|
||||||
}
|
|
||||||
.q-item {
|
|
||||||
min-height: 20px;
|
|
||||||
|
|
||||||
.link {
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.vn-label-value {
|
|
||||||
display: flex;
|
|
||||||
padding: 0px 16px;
|
|
||||||
.label {
|
|
||||||
color: var(--vn-label-color);
|
|
||||||
font-size: 14px;
|
|
||||||
|
|
||||||
&:not(:has(a))::after {
|
|
||||||
content: ':';
|
|
||||||
}
|
}
|
||||||
}
|
"
|
||||||
.value {
|
/>
|
||||||
color: var(--vn-text-color);
|
<VnDescriptor v-model="entity" v-bind="$attrs">
|
||||||
font-size: 14px;
|
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
||||||
margin-left: 4px;
|
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
|
||||||
overflow: hidden;
|
</template>
|
||||||
text-overflow: ellipsis;
|
</VnDescriptor>
|
||||||
white-space: nowrap;
|
</template>
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
.info {
|
|
||||||
margin-left: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.title {
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
span {
|
|
||||||
color: var(--vn-text-color);
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.subtitle {
|
|
||||||
color: var(--vn-text-color);
|
|
||||||
font-size: 16px;
|
|
||||||
margin-bottom: 2px;
|
|
||||||
}
|
|
||||||
.list-box {
|
|
||||||
.q-item__label {
|
|
||||||
color: var(--vn-label-color);
|
|
||||||
padding-bottom: 0%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.descriptor {
|
|
||||||
width: 256px;
|
|
||||||
.header {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
.icons {
|
|
||||||
margin: 0 10px;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
.q-icon {
|
|
||||||
margin-right: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.actions {
|
|
||||||
margin: 0 5px;
|
|
||||||
justify-content: center !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<i18n>
|
|
||||||
en:
|
|
||||||
globals:
|
|
||||||
copyId: Copy ID
|
|
||||||
es:
|
|
||||||
globals:
|
|
||||||
copyId: Copiar ID
|
|
||||||
</i18n>
|
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,7 @@ async function fetch() {
|
||||||
name: `${moduleName ?? route.meta.moduleName}Summary`,
|
name: `${moduleName ?? route.meta.moduleName}Summary`,
|
||||||
params: { id: entityId || entity.id },
|
params: { id: entityId || entity.id },
|
||||||
}"
|
}"
|
||||||
|
data-cy="goToSummaryBtn"
|
||||||
>
|
>
|
||||||
<QIcon name="open_in_new" color="white" size="sm" />
|
<QIcon name="open_in_new" color="white" size="sm" />
|
||||||
</router-link>
|
</router-link>
|
||||||
|
|
@ -158,6 +159,7 @@ async function fetch() {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
|
align-items: start;
|
||||||
.label {
|
.label {
|
||||||
color: var(--vn-label-color);
|
color: var(--vn-label-color);
|
||||||
width: 9em;
|
width: 9em;
|
||||||
|
|
@ -168,9 +170,15 @@ async function fetch() {
|
||||||
flex-grow: 0;
|
flex-grow: 0;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
&.ellipsis > .value {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.header {
|
.header {
|
||||||
|
|
@ -200,6 +208,23 @@ async function fetch() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.vn-card-group {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vn-card-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
> div {
|
||||||
|
max-height: 70px;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.summaryHeader .vn-label-value {
|
.summaryHeader .vn-label-value {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
<script setup>
|
||||||
|
import { onBeforeMount, watch, computed, ref } from 'vue';
|
||||||
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
|
import { useState } from 'src/composables/useState';
|
||||||
|
import { useRoute } from 'vue-router';
|
||||||
|
import VnDescriptor from './VnDescriptor.vue';
|
||||||
|
|
||||||
|
const $props = defineProps({
|
||||||
|
url: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
filter: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
dataKey: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const state = useState();
|
||||||
|
const route = useRoute();
|
||||||
|
let arrayData;
|
||||||
|
let store;
|
||||||
|
let entity;
|
||||||
|
const isLoading = ref(false);
|
||||||
|
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
|
||||||
|
defineExpose({ getData });
|
||||||
|
|
||||||
|
onBeforeMount(async () => {
|
||||||
|
arrayData = useArrayData($props.dataKey, {
|
||||||
|
url: $props.url,
|
||||||
|
userFilter: $props.filter,
|
||||||
|
skip: 0,
|
||||||
|
oneRecord: true,
|
||||||
|
});
|
||||||
|
store = arrayData.store;
|
||||||
|
entity = computed(() => {
|
||||||
|
const data = store.data ?? {};
|
||||||
|
if (data) emit('onFetch', data);
|
||||||
|
return data;
|
||||||
|
});
|
||||||
|
|
||||||
|
// It enables to load data only once if the module is the same as the dataKey
|
||||||
|
if (!isSameDataKey.value || !route.params.id) await getData();
|
||||||
|
watch(
|
||||||
|
() => [$props.url, $props.filter],
|
||||||
|
async () => {
|
||||||
|
if (!isSameDataKey.value) await getData();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
async function getData() {
|
||||||
|
store.url = $props.url;
|
||||||
|
store.filter = $props.filter ?? {};
|
||||||
|
isLoading.value = true;
|
||||||
|
try {
|
||||||
|
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
||||||
|
state.set($props.dataKey, data);
|
||||||
|
emit('onFetch', data);
|
||||||
|
} finally {
|
||||||
|
isLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const emit = defineEmits(['onFetch']);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
|
||||||
|
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
||||||
|
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
|
||||||
|
</template>
|
||||||
|
</VnDescriptor>
|
||||||
|
</template>
|
||||||
|
|
@ -0,0 +1,322 @@
|
||||||
|
<script setup>
|
||||||
|
import { computed, ref } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
|
||||||
|
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
|
import { useClipboard } from 'src/composables/useClipboard';
|
||||||
|
import VnMoreOptions from './VnMoreOptions.vue';
|
||||||
|
|
||||||
|
const entity = defineModel({ type: Object, default: null });
|
||||||
|
const $props = defineProps({
|
||||||
|
title: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
subtitle: {
|
||||||
|
type: Number,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
summary: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
width: {
|
||||||
|
type: String,
|
||||||
|
default: 'md-width',
|
||||||
|
},
|
||||||
|
module: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
toModule: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const route = useRoute();
|
||||||
|
const router = useRouter();
|
||||||
|
const { t } = useI18n();
|
||||||
|
const { copyText } = useClipboard();
|
||||||
|
const { viewSummary } = useSummaryDialog();
|
||||||
|
const DESCRIPTOR_PROXY = 'DescriptorProxy';
|
||||||
|
const moduleName = ref();
|
||||||
|
const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
|
||||||
|
|
||||||
|
function getName() {
|
||||||
|
let name = $props.module;
|
||||||
|
if ($props.module.includes(DESCRIPTOR_PROXY)) {
|
||||||
|
name = name.split(DESCRIPTOR_PROXY)[0];
|
||||||
|
}
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
const routeName = computed(() => {
|
||||||
|
let routeName = getName();
|
||||||
|
return `${routeName}Summary`;
|
||||||
|
});
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
function copyIdText(id) {
|
||||||
|
copyText(id, {
|
||||||
|
component: {
|
||||||
|
copyValue: id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const emit = defineEmits(['onFetch']);
|
||||||
|
|
||||||
|
const iconModule = computed(() => {
|
||||||
|
moduleName.value = getName();
|
||||||
|
if ($props.toModule) {
|
||||||
|
return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
|
||||||
|
}
|
||||||
|
if (isSameModuleName) {
|
||||||
|
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
|
||||||
|
?.meta?.icon;
|
||||||
|
} else {
|
||||||
|
return route.matched[1].meta.icon;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const toModule = computed(() => {
|
||||||
|
moduleName.value = getName();
|
||||||
|
if ($props.toModule) return $props.toModule;
|
||||||
|
if (isSameModuleName) {
|
||||||
|
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
|
||||||
|
?.redirect;
|
||||||
|
} else {
|
||||||
|
return route.matched[1].path.split('/').length > 2
|
||||||
|
? route.matched[1].redirect
|
||||||
|
: route.matched[1].children[0].redirect;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="descriptor" data-cy="vnDescriptor">
|
||||||
|
<template v-if="entity && entity?.id">
|
||||||
|
<div class="header bg-primary q-pa-sm justify-between">
|
||||||
|
<slot name="header-extra-action">
|
||||||
|
<QBtn
|
||||||
|
round
|
||||||
|
flat
|
||||||
|
dense
|
||||||
|
size="md"
|
||||||
|
:icon="iconModule"
|
||||||
|
color="white"
|
||||||
|
class="link"
|
||||||
|
:to="toModule"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('globals.goToModuleIndex') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</slot>
|
||||||
|
<QBtn
|
||||||
|
@click.stop="viewSummary(entity.id, summary, width)"
|
||||||
|
round
|
||||||
|
flat
|
||||||
|
dense
|
||||||
|
size="md"
|
||||||
|
icon="preview"
|
||||||
|
color="white"
|
||||||
|
class="link"
|
||||||
|
v-if="summary"
|
||||||
|
data-cy="openSummaryBtn"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('components.smartCard.openSummary') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
<RouterLink :to="{ name: routeName, params: { id: entity.id } }">
|
||||||
|
<QBtn
|
||||||
|
class="link"
|
||||||
|
color="white"
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
icon="launch"
|
||||||
|
round
|
||||||
|
size="md"
|
||||||
|
data-cy="goToSummaryBtn"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('components.vnDescriptor.summary') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</RouterLink>
|
||||||
|
<VnMoreOptions v-if="$slots.menu">
|
||||||
|
<template #menu="{ menuRef }">
|
||||||
|
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
|
||||||
|
</template>
|
||||||
|
</VnMoreOptions>
|
||||||
|
</div>
|
||||||
|
<slot name="before" />
|
||||||
|
<div class="body q-py-sm">
|
||||||
|
<QList dense>
|
||||||
|
<QItemLabel header class="ellipsis text-h5" :lines="1">
|
||||||
|
<div class="title">
|
||||||
|
<span
|
||||||
|
v-if="title"
|
||||||
|
:title="getValueFromPath(title)"
|
||||||
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
|
||||||
|
>
|
||||||
|
{{ getValueFromPath(title) ?? title }}
|
||||||
|
</span>
|
||||||
|
<slot v-else name="description" :entity="entity">
|
||||||
|
<span
|
||||||
|
:title="entity.name"
|
||||||
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_description`"
|
||||||
|
v-text="entity.name"
|
||||||
|
/>
|
||||||
|
</slot>
|
||||||
|
</div>
|
||||||
|
</QItemLabel>
|
||||||
|
<QItem>
|
||||||
|
<QItemLabel
|
||||||
|
class="subtitle"
|
||||||
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
|
||||||
|
>
|
||||||
|
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
||||||
|
</QItemLabel>
|
||||||
|
<QBtn
|
||||||
|
round
|
||||||
|
flat
|
||||||
|
dense
|
||||||
|
size="sm"
|
||||||
|
icon="content_copy"
|
||||||
|
color="primary"
|
||||||
|
@click.stop="copyIdText(entity.id)"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('globals.copyId') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</QItem>
|
||||||
|
</QList>
|
||||||
|
<div
|
||||||
|
class="list-box q-mt-xs"
|
||||||
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_listbox`"
|
||||||
|
>
|
||||||
|
<slot name="body" :entity="entity" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="icons">
|
||||||
|
<slot name="icons" :entity="entity" />
|
||||||
|
</div>
|
||||||
|
<div class="actions justify-center" data-cy="descriptor_actions">
|
||||||
|
<slot name="actions" :entity="entity" />
|
||||||
|
</div>
|
||||||
|
<slot name="after" />
|
||||||
|
</template>
|
||||||
|
<SkeletonDescriptor v-if="!entity" />
|
||||||
|
</div>
|
||||||
|
<QInnerLoading :label="t('globals.pleaseWait')" :showing="!entity" color="primary" />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
.body {
|
||||||
|
background-color: var(--vn-section-color);
|
||||||
|
.text-h5 {
|
||||||
|
font-size: 20px;
|
||||||
|
padding-top: 5px;
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
.q-item {
|
||||||
|
min-height: 20px;
|
||||||
|
|
||||||
|
.link {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.vn-label-value {
|
||||||
|
display: flex;
|
||||||
|
padding: 0px 16px;
|
||||||
|
.label {
|
||||||
|
color: var(--vn-label-color);
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
&:not(:has(a))::after {
|
||||||
|
content: ':';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.ellipsis > .value {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
.value {
|
||||||
|
color: var(--vn-text-color);
|
||||||
|
font-size: 14px;
|
||||||
|
margin-left: 4px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
.info {
|
||||||
|
margin-left: 5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.title {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
span {
|
||||||
|
color: var(--vn-text-color);
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.subtitle {
|
||||||
|
color: var(--vn-text-color);
|
||||||
|
font-size: 16px;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
}
|
||||||
|
.list-box {
|
||||||
|
.q-item__label {
|
||||||
|
color: var(--vn-label-color);
|
||||||
|
padding-bottom: 0%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.descriptor {
|
||||||
|
width: 256px;
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.icons {
|
||||||
|
margin: 0 10px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
.q-icon {
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.actions {
|
||||||
|
margin: 0 5px;
|
||||||
|
justify-content: center !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<i18n>
|
||||||
|
en:
|
||||||
|
globals:
|
||||||
|
copyId: Copy ID
|
||||||
|
es:
|
||||||
|
globals:
|
||||||
|
copyId: Copiar ID
|
||||||
|
</i18n>
|
||||||
|
|
@ -54,13 +54,17 @@ const $props = defineProps({
|
||||||
default: 'table',
|
default: 'table',
|
||||||
},
|
},
|
||||||
redirect: {
|
redirect: {
|
||||||
type: Boolean,
|
type: [String, Boolean],
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
arrayData: {
|
arrayData: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
|
showTagChips: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits([
|
const emit = defineEmits([
|
||||||
|
|
@ -88,13 +92,14 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
|
||||||
defineExpose({ search, params: userParams, remove });
|
defineExpose({ search, params: userParams, remove });
|
||||||
|
|
||||||
const isLoading = ref(false);
|
const isLoading = ref(false);
|
||||||
async function search(evt) {
|
async function search(evt, name, value) {
|
||||||
try {
|
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, ...$props.modelValue };
|
||||||
|
if (name) filter[name] = value;
|
||||||
store.userParamsChanged = true;
|
store.userParamsChanged = true;
|
||||||
await arrayData.addFilter({
|
await arrayData.addFilter({
|
||||||
params: filter,
|
params: filter,
|
||||||
|
|
@ -214,7 +219,7 @@ const getLocale = (label) => {
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
|
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
|
||||||
<QList dense>
|
<QList dense v-if="showTagChips">
|
||||||
<QItem class="q-mt-xs">
|
<QItem class="q-mt-xs">
|
||||||
<QItemSection top>
|
<QItemSection top>
|
||||||
<QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
|
<QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
|
||||||
|
|
@ -249,7 +254,7 @@ const getLocale = (label) => {
|
||||||
:key="chip.label"
|
:key="chip.label"
|
||||||
:removable="!unremovableParams?.includes(chip.label)"
|
:removable="!unremovableParams?.includes(chip.label)"
|
||||||
@remove="remove(chip.label)"
|
@remove="remove(chip.label)"
|
||||||
data-cy="vnFilterPanelChip"
|
:data-cy="`vnFilterPanelChip_${chip.label}`"
|
||||||
>
|
>
|
||||||
<slot
|
<slot
|
||||||
name="tags"
|
name="tags"
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,11 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import { dashIfEmpty } from 'src/filters';
|
||||||
|
|
||||||
defineProps({ email: { type: [String], default: null } });
|
defineProps({ email: { type: [String], default: null } });
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QBtn
|
<QBtn
|
||||||
|
class="q-pr-xs"
|
||||||
v-if="email"
|
v-if="email"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
|
@ -13,4 +16,5 @@ defineProps({ email: { type: [String], default: null } });
|
||||||
:href="`mailto:${email}`"
|
:href="`mailto:${email}`"
|
||||||
@click.stop
|
@click.stop
|
||||||
/>
|
/>
|
||||||
|
<span>{{ dashIfEmpty(email) }}</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { parsePhone } from 'src/filters';
|
import { dashIfEmpty, parsePhone } from 'src/filters';
|
||||||
import useOpenURL from 'src/composables/useOpenURL';
|
import useOpenURL from 'src/composables/useOpenURL';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
|
@ -12,49 +12,65 @@ const props = defineProps({
|
||||||
|
|
||||||
const phone = ref(props.phoneNumber);
|
const phone = ref(props.phoneNumber);
|
||||||
const config = reactive({
|
const config = reactive({
|
||||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
|
||||||
'say-simple': {
|
'say-simple': {
|
||||||
icon: 'vn:saysimple',
|
icon: 'vn:saysimple',
|
||||||
url: null,
|
url: null,
|
||||||
channel: props.channel,
|
channel: props.channel,
|
||||||
},
|
},
|
||||||
|
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||||
});
|
});
|
||||||
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
|
|
||||||
|
const attrs = useAttrs();
|
||||||
|
const types = Object.keys(config)
|
||||||
|
.filter((key) => key in attrs)
|
||||||
|
.sort();
|
||||||
|
const activeTypes = types.length ? types : ['sip'];
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
if (!phone.value) return;
|
if (!phone.value) return;
|
||||||
let { channel } = config[type];
|
|
||||||
|
|
||||||
if (type === 'say-simple') {
|
for (const type of activeTypes) {
|
||||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
if (type === 'say-simple') {
|
||||||
.data;
|
let { channel } = config[type];
|
||||||
if (!channel) channel = defaultChannel;
|
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||||
|
.data;
|
||||||
|
if (!channel) channel = defaultChannel;
|
||||||
|
|
||||||
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
phone.value = await parsePhone(
|
||||||
config[
|
props.phoneNumber,
|
||||||
type
|
props.country?.toLowerCase(),
|
||||||
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
);
|
||||||
|
config[type].url =
|
||||||
|
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleClick() {
|
function handleClick(type) {
|
||||||
if (config[type].url) useOpenURL(config[type].url);
|
if (config[type].url) useOpenURL(config[type].url);
|
||||||
else if (config[type].href) window.location.href = config[type].href;
|
else if (config[type].href) window.location.href = config[type].href;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QBtn
|
<div class="flex items-center gap-2">
|
||||||
v-if="phone"
|
<template v-for="type in activeTypes">
|
||||||
flat
|
<QBtn
|
||||||
round
|
:key="type"
|
||||||
:icon="config[type].icon"
|
v-if="phone"
|
||||||
size="sm"
|
flat
|
||||||
color="primary"
|
round
|
||||||
padding="none"
|
:icon="config[type].icon"
|
||||||
@click.stop="handleClick"
|
size="sm"
|
||||||
>
|
color="primary"
|
||||||
<QTooltip>
|
padding="none"
|
||||||
{{ capitalize(type).replace('-', '') }}
|
@click.stop="() => handleClick(type)"
|
||||||
</QTooltip>
|
>
|
||||||
</QBtn>
|
<QTooltip>
|
||||||
|
{{ capitalize(type).replace('-', '') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn></template
|
||||||
|
>
|
||||||
|
<span>{{ dashIfEmpty(phone) }}</span>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -28,13 +28,14 @@ function copyValueText() {
|
||||||
const val = computed(() => $props.value);
|
const val = computed(() => $props.value);
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="vn-label-value">
|
<div class="vn-label-value" :data-cy="`${$attrs['data-cy'] ?? 'vnLv'}${label ?? ''}`">
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-if="typeof value === 'boolean'"
|
v-if="typeof value === 'boolean'"
|
||||||
v-model="val"
|
v-model="val"
|
||||||
:label="label"
|
:label="label"
|
||||||
disable
|
disable
|
||||||
dense
|
dense
|
||||||
|
size="sm"
|
||||||
/>
|
/>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="label || $slots.label" class="label">
|
<div v-if="label || $slots.label" class="label">
|
||||||
|
|
@ -42,9 +43,9 @@ const val = computed(() => $props.value);
|
||||||
<span style="color: var(--vn-label-color)">{{ label }}</span>
|
<span style="color: var(--vn-label-color)">{{ label }}</span>
|
||||||
</slot>
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="value">
|
<div class="value" v-if="value || $slots.value">
|
||||||
<slot name="value">
|
<slot name="value">
|
||||||
<span :title="value">
|
<span :title="value" style="text-overflow: ellipsis">
|
||||||
{{ dash ? dashIfEmpty(value) : value }}
|
{{ dash ? dashIfEmpty(value) : value }}
|
||||||
</span>
|
</span>
|
||||||
</slot>
|
</slot>
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,10 @@
|
||||||
data-cy="descriptor-more-opts"
|
data-cy="descriptor-more-opts"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ $t('components.cardDescriptor.moreOptions') }}
|
{{ $t('components.vnDescriptor.moreOptions') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
<QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
|
<QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
|
||||||
<QList>
|
<QList data-cy="descriptor-more-opts_list">
|
||||||
<slot name="menu" :menu-ref="$refs.menuRef" />
|
<slot name="menu" :menu-ref="$refs.menuRef" />
|
||||||
</QList>
|
</QList>
|
||||||
</QMenu>
|
</QMenu>
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
|
||||||
|
|
||||||
const emit = defineEmits(['onFetch']);
|
const emit = defineEmits(['onFetch']);
|
||||||
|
|
||||||
const $attrs = useAttrs();
|
const originalAttrs = useAttrs();
|
||||||
|
const $attrs = computed(() => {
|
||||||
const isRequired = computed(() => {
|
const { required, deletable, ...rest } = originalAttrs;
|
||||||
return Object.keys($attrs).includes('required');
|
return rest;
|
||||||
});
|
});
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
|
@ -40,6 +40,11 @@ const quasar = useQuasar();
|
||||||
const newNote = reactive({ text: null, observationTypeFk: null });
|
const newNote = reactive({ text: null, observationTypeFk: null });
|
||||||
const observationTypes = ref([]);
|
const observationTypes = ref([]);
|
||||||
const vnPaginateRef = ref();
|
const vnPaginateRef = ref();
|
||||||
|
|
||||||
|
const defaultObservationType = computed(() =>
|
||||||
|
observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
|
||||||
|
);
|
||||||
|
|
||||||
let originalText;
|
let originalText;
|
||||||
|
|
||||||
function handleClick(e) {
|
function handleClick(e) {
|
||||||
|
|
@ -48,6 +53,11 @@ function handleClick(e) {
|
||||||
else insert();
|
else insert();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function deleteNote(e) {
|
||||||
|
await axios.delete(`${$props.url}/${e.id}`);
|
||||||
|
await vnPaginateRef.value.fetch();
|
||||||
|
}
|
||||||
|
|
||||||
async function insert() {
|
async function insert() {
|
||||||
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
|
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
|
||||||
|
|
||||||
|
|
@ -111,14 +121,22 @@ function fetchData([data]) {
|
||||||
originalText = data?.notes;
|
originalText = data?.notes;
|
||||||
emit('onFetch', data);
|
emit('onFetch', data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleObservationTypes = (data) => {
|
||||||
|
observationTypes.value = data;
|
||||||
|
if(defaultObservationType.value) {
|
||||||
|
newNote.observationTypeFk = defaultObservationType.value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<FetchData
|
||||||
v-if="selectType"
|
v-if="selectType"
|
||||||
url="ObservationTypes"
|
url="ObservationTypes"
|
||||||
:filter="{ fields: ['id', 'description'] }"
|
:filter="{ fields: ['id', 'description', 'code'] }"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="(data) => (observationTypes = data)"
|
@on-fetch="handleObservationTypes"
|
||||||
/>
|
/>
|
||||||
<FetchData
|
<FetchData
|
||||||
v-if="justInput"
|
v-if="justInput"
|
||||||
|
|
@ -144,7 +162,7 @@ function fetchData([data]) {
|
||||||
v-model="newNote.observationTypeFk"
|
v-model="newNote.observationTypeFk"
|
||||||
option-label="description"
|
option-label="description"
|
||||||
style="flex: 0.15"
|
style="flex: 0.15"
|
||||||
:required="isRequired"
|
:required="'required' in originalAttrs"
|
||||||
@keyup.enter.stop="insert"
|
@keyup.enter.stop="insert"
|
||||||
/>
|
/>
|
||||||
<VnInput
|
<VnInput
|
||||||
|
|
@ -152,10 +170,10 @@ function fetchData([data]) {
|
||||||
type="textarea"
|
type="textarea"
|
||||||
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
|
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
|
||||||
filled
|
filled
|
||||||
size="lg"
|
|
||||||
autogrow
|
autogrow
|
||||||
|
autofocus
|
||||||
@keyup.enter.stop="handleClick"
|
@keyup.enter.stop="handleClick"
|
||||||
:required="isRequired"
|
:required="'required' in originalAttrs"
|
||||||
clearable
|
clearable
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
|
|
@ -186,10 +204,9 @@ function fetchData([data]) {
|
||||||
ref="vnPaginateRef"
|
ref="vnPaginateRef"
|
||||||
class="show"
|
class="show"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
search-url="notes"
|
:search-url="false"
|
||||||
@on-fetch="
|
@on-fetch="
|
||||||
newNote.text = '';
|
newNote.text = '';
|
||||||
newNote.observationTypeFk = null;
|
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<template #body="{ rows }">
|
<template #body="{ rows }">
|
||||||
|
|
@ -226,6 +243,21 @@ function fetchData([data]) {
|
||||||
</QBadge>
|
</QBadge>
|
||||||
</div>
|
</div>
|
||||||
<span v-text="toDateHourMin(note.created)" />
|
<span v-text="toDateHourMin(note.created)" />
|
||||||
|
<div>
|
||||||
|
<QIcon
|
||||||
|
v-if="'deletable' in originalAttrs"
|
||||||
|
name="delete"
|
||||||
|
size="sm"
|
||||||
|
class="cursor-pointer"
|
||||||
|
color="primary"
|
||||||
|
@click="deleteNote(note)"
|
||||||
|
data-cy="notesRemoveNoteBtn"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('ticketNotes.removeNote') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardSection class="q-pa-xs q-my-none q-py-none">
|
<QCardSection class="q-pa-xs q-my-none q-py-none">
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ onMounted(async () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
if (!store.keepData) arrayData.reset(['data']);
|
arrayData.reset(['data']);
|
||||||
arrayData.resetPagination();
|
arrayData.resetPagination();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -217,6 +217,7 @@ defineExpose({
|
||||||
paginate,
|
paginate,
|
||||||
userParams: arrayData.store.userParams,
|
userParams: arrayData.store.userParams,
|
||||||
currentFilter: arrayData.store.currentFilter,
|
currentFilter: arrayData.store.currentFilter,
|
||||||
|
arrayData,
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,10 @@ const props = defineProps({
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
|
userFilter: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
filter: {
|
filter: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ const id = props.entityId;
|
||||||
:to="{ name: routeName, params: { id: id } }"
|
:to="{ name: routeName, params: { id: id } }"
|
||||||
class="header link"
|
class="header link"
|
||||||
:href="url"
|
:href="url"
|
||||||
|
data-cy="goToSummaryBtn"
|
||||||
>
|
>
|
||||||
<QIcon name="open_in_new" color="white" size="sm" />
|
<QIcon name="open_in_new" color="white" size="sm" />
|
||||||
</router-link>
|
</router-link>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
import CardSummary from 'src/components/ui/CardSummary.vue';
|
import CardSummary from 'src/components/ui/CardSummary.vue';
|
||||||
import * as vueRouter from 'vue-router';
|
import * as vueRouter from 'vue-router';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||||
|
|
||||||
describe('VnPaginate', () => {
|
describe('VnPaginate', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { describe, it, expect, beforeAll, vi } from 'vitest';
|
import { describe, it, expect, beforeAll, vi } from 'vitest';
|
||||||
import { axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
import parsePhone from 'src/filters/parsePhone';
|
import parsePhone from 'src/filters/parsePhone';
|
||||||
|
|
||||||
describe('parsePhone filter', () => {
|
describe('parsePhone filter', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,17 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
||||||
import { axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
import { downloadFile } from 'src/composables/downloadFile';
|
import { downloadFile } from 'src/composables/downloadFile';
|
||||||
import { useSession } from 'src/composables/useSession';
|
import { useSession } from 'src/composables/useSession';
|
||||||
const session = useSession();
|
const session = useSession();
|
||||||
const token = session.getToken();
|
const token = session.getToken();
|
||||||
|
|
||||||
describe('downloadFile', () => {
|
describe('downloadFile', () => {
|
||||||
const baseUrl = 'http://localhost:9000';
|
|
||||||
let defaulCreateObjectURL;
|
let defaulCreateObjectURL;
|
||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
|
vi.mock('src/composables/getUrl', () => ({
|
||||||
|
getUrl: vi.fn().mockResolvedValue(''),
|
||||||
|
}));
|
||||||
defaulCreateObjectURL = window.URL.createObjectURL;
|
defaulCreateObjectURL = window.URL.createObjectURL;
|
||||||
window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
|
window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
|
||||||
});
|
});
|
||||||
|
|
@ -22,15 +24,14 @@ describe('downloadFile', () => {
|
||||||
headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
|
headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
|
||||||
};
|
};
|
||||||
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
||||||
if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
|
if (url.includes('downloadFile')) return Promise.resolve(res);
|
||||||
else if (url.includes('downloadFile')) return Promise.resolve(res);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
await downloadFile(1);
|
await downloadFile(1);
|
||||||
|
|
||||||
expect(axios.get).toHaveBeenCalledWith(
|
expect(axios.get).toHaveBeenCalledWith(
|
||||||
`${baseUrl}/api/dms/1/downloadFile?access_token=${token}`,
|
`/api/dms/1/downloadFile?access_token=${token}`,
|
||||||
{ responseType: 'blob' }
|
{ responseType: 'blob' },
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
|
||||||
|
import { flushPromises } from '@vue/test-utils';
|
||||||
import { useAcl } from 'src/composables/useAcl';
|
import { useAcl } from 'src/composables/useAcl';
|
||||||
|
|
||||||
describe('useAcl', () => {
|
describe('useAcl', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,39 @@
|
||||||
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import { default as axios } from 'axios';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import * as vueRouter from 'vue-router';
|
import * as vueRouter from 'vue-router';
|
||||||
|
import { setActivePinia, createPinia } from 'pinia';
|
||||||
|
|
||||||
describe('useArrayData', () => {
|
describe('useArrayData', () => {
|
||||||
const filter = '{"limit":20,"skip":0}';
|
const filter = '{"limit":20,"skip":0}';
|
||||||
const params = { supplierFk: 2 };
|
const params = { supplierFk: 2 };
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.spyOn(useRouter(), 'replace');
|
setActivePinia(createPinia());
|
||||||
vi.spyOn(useRouter(), 'push');
|
|
||||||
|
// Mock route
|
||||||
|
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
|
||||||
|
path: 'mockSection/list',
|
||||||
|
matched: [],
|
||||||
|
query: {},
|
||||||
|
params: {},
|
||||||
|
meta: { moduleName: 'mockName' },
|
||||||
|
});
|
||||||
|
|
||||||
|
// Mock router
|
||||||
|
vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
|
||||||
|
push: vi.fn(),
|
||||||
|
replace: vi.fn(),
|
||||||
|
currentRoute: {
|
||||||
|
value: {
|
||||||
|
path: 'mockSection/list',
|
||||||
|
params: { id: 1 },
|
||||||
|
meta: { moduleName: 'mockName' },
|
||||||
|
matched: [{ path: 'mockName/:id' }],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
|
@ -17,103 +41,69 @@ describe('useArrayData', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fetch and replace url with new params', async () => {
|
it('should fetch and replace url with new params', async () => {
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
|
const arrayData = useArrayData('ArrayData', {
|
||||||
|
url: 'mockUrl',
|
||||||
|
searchUrl: 'params',
|
||||||
|
});
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
arrayData.fetch({});
|
await arrayData.fetch({});
|
||||||
|
|
||||||
await flushPromises();
|
|
||||||
const routerReplace = useRouter().replace.mock.calls[0][0];
|
const routerReplace = useRouter().replace.mock.calls[0][0];
|
||||||
|
|
||||||
expect(axios.get.mock.calls[0][1].params).toEqual({
|
expect(axios.get).toHaveBeenCalledWith('mockUrl', {
|
||||||
filter,
|
signal: expect.any(Object),
|
||||||
supplierFk: 2,
|
params: {
|
||||||
|
filter,
|
||||||
|
supplierFk: 2,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
expect(routerReplace.path).toEqual('mockSection/list');
|
|
||||||
|
expect(routerReplace.path).toBe('mockSection/list');
|
||||||
expect(JSON.parse(routerReplace.query.params)).toEqual(
|
expect(JSON.parse(routerReplace.query.params)).toEqual(
|
||||||
expect.objectContaining(params),
|
expect.objectContaining(params),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
|
it('should redirect to detail when single record is returned with navigation', async () => {
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||||
|
data: [{ id: 1 }],
|
||||||
|
});
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
|
const arrayData = useArrayData('ArrayData', {
|
||||||
|
url: 'mockUrl',
|
||||||
|
navigate: {},
|
||||||
|
});
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
arrayData.fetch({});
|
await arrayData.fetch({});
|
||||||
|
|
||||||
await flushPromises();
|
|
||||||
const routerPush = useRouter().push.mock.calls[0][0];
|
const routerPush = useRouter().push.mock.calls[0][0];
|
||||||
|
|
||||||
expect(axios.get.mock.calls[0][1].params).toEqual({
|
expect(routerPush.path).toBe('mockName/1');
|
||||||
filter,
|
|
||||||
supplierFk: 2,
|
|
||||||
});
|
|
||||||
expect(routerPush.path).toEqual('mockName/1');
|
|
||||||
expect(routerPush.query).toBeUndefined();
|
expect(routerPush.query).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
|
it('should return one record when oneRecord is true', async () => {
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||||
|
|
||||||
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
|
|
||||||
matched: [],
|
|
||||||
query: {},
|
|
||||||
params: {},
|
|
||||||
meta: { moduleName: 'mockName' },
|
|
||||||
path: 'mockName/1',
|
|
||||||
});
|
|
||||||
vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
|
|
||||||
push: vi.fn(),
|
|
||||||
replace: vi.fn(),
|
|
||||||
currentRoute: {
|
|
||||||
value: {
|
|
||||||
params: {
|
|
||||||
id: 1,
|
|
||||||
},
|
|
||||||
meta: { moduleName: 'mockName' },
|
|
||||||
matched: [{ path: 'mockName/:id' }],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
|
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
|
||||||
arrayData.fetch({});
|
|
||||||
|
|
||||||
await flushPromises();
|
|
||||||
const routerPush = useRouter().push.mock.calls[0][0];
|
|
||||||
|
|
||||||
expect(axios.get.mock.calls[0][1].params).toEqual({
|
|
||||||
filter,
|
|
||||||
supplierFk: 2,
|
|
||||||
});
|
|
||||||
expect(routerPush.path).toEqual('mockName/');
|
|
||||||
expect(routerPush.query.params).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return one record', async () => {
|
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({
|
|
||||||
data: [
|
data: [
|
||||||
{ id: 1, name: 'Entity 1' },
|
{ id: 1, name: 'Entity 1' },
|
||||||
{ id: 2, name: 'Entity 2' },
|
{ id: 2, name: 'Entity 2' },
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
|
|
||||||
|
const arrayData = useArrayData('ArrayData', {
|
||||||
|
url: 'mockUrl',
|
||||||
|
oneRecord: true,
|
||||||
|
});
|
||||||
|
|
||||||
await arrayData.fetch({});
|
await arrayData.fetch({});
|
||||||
|
|
||||||
expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
|
expect(arrayData.store.data).toEqual({
|
||||||
});
|
id: 1,
|
||||||
|
name: 'Entity 1',
|
||||||
it('should handle empty data gracefully if has to return one record', async () => {
|
});
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
|
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
|
|
||||||
await arrayData.fetch({});
|
|
||||||
|
|
||||||
expect(arrayData.store.data).toBeUndefined();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { flushPromises } from '@vue/test-utils';
|
||||||
import { useRole } from 'composables/useRole';
|
import { useRole } from 'composables/useRole';
|
||||||
const role = useRole();
|
const role = useRole();
|
||||||
|
|
||||||
|
|
@ -23,18 +24,19 @@ describe('useRole', () => {
|
||||||
name: `T'Challa`,
|
name: `T'Challa`,
|
||||||
nickname: 'Black Panther',
|
nickname: 'Black Panther',
|
||||||
lang: 'en',
|
lang: 'en',
|
||||||
|
worker: { department: { departmentFk: 155 } },
|
||||||
};
|
};
|
||||||
const expectedUser = {
|
const expectedUser = {
|
||||||
id: 999,
|
id: 999,
|
||||||
name: `T'Challa`,
|
name: `T'Challa`,
|
||||||
nickname: 'Black Panther',
|
nickname: 'Black Panther',
|
||||||
lang: 'en',
|
lang: 'en',
|
||||||
|
departmentFk: 155,
|
||||||
};
|
};
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
vi.spyOn(axios, 'get')
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||||
.mockResolvedValueOnce({
|
|
||||||
data: { roles: rolesData, user: fetchedUser },
|
data: { roles: rolesData, user: fetchedUser },
|
||||||
})
|
});
|
||||||
|
|
||||||
vi.spyOn(role.state, 'setUser');
|
vi.spyOn(role.state, 'setUser');
|
||||||
vi.spyOn(role.state, 'setRoles');
|
vi.spyOn(role.state, 'setRoles');
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
|
||||||
import { axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
import { useSession } from 'composables/useSession';
|
import { useSession } from 'composables/useSession';
|
||||||
import { useState } from 'composables/useState';
|
import { useState } from 'composables/useState';
|
||||||
|
|
||||||
|
|
@ -75,6 +75,7 @@ describe('session', () => {
|
||||||
userConfig: {
|
userConfig: {
|
||||||
darkMode: false,
|
darkMode: false,
|
||||||
},
|
},
|
||||||
|
worker: { department: { departmentFk: 155 } },
|
||||||
};
|
};
|
||||||
const rolesData = [
|
const rolesData = [
|
||||||
{
|
{
|
||||||
|
|
@ -143,7 +144,7 @@ describe('session', () => {
|
||||||
await session.destroy(); // this clears token and user for any other test
|
await session.destroy(); // this clears token and user for any other test
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
{}
|
{},
|
||||||
);
|
);
|
||||||
|
|
||||||
describe('RenewToken', () => {
|
describe('RenewToken', () => {
|
||||||
|
|
@ -175,7 +176,7 @@ describe('session', () => {
|
||||||
await session.checkValidity();
|
await session.checkValidity();
|
||||||
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
|
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
|
||||||
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
|
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
|
||||||
expectedTokenMultimedia
|
expectedTokenMultimedia,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
it('Should renewToken', async () => {
|
it('Should renewToken', async () => {
|
||||||
|
|
@ -204,7 +205,7 @@ describe('session', () => {
|
||||||
await session.checkValidity();
|
await session.checkValidity();
|
||||||
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
|
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
|
||||||
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
|
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
|
||||||
expectedTokenMultimedia
|
expectedTokenMultimedia,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { flushPromises } from '@vue/test-utils';
|
||||||
import { useTokenConfig } from 'composables/useTokenConfig';
|
import { useTokenConfig } from 'composables/useTokenConfig';
|
||||||
const tokenConfig = useTokenConfig();
|
const tokenConfig = useTokenConfig();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,18 +7,33 @@ const { getTokenMultimedia } = useSession();
|
||||||
const token = getTokenMultimedia();
|
const token = getTokenMultimedia();
|
||||||
|
|
||||||
export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
|
export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
|
||||||
const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
|
const appUrl = await getAppUrl();
|
||||||
const response = await axios.get(
|
const response = await axios.get(
|
||||||
url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
|
url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
|
||||||
{ responseType: 'blob' }
|
{ responseType: 'blob' },
|
||||||
);
|
);
|
||||||
|
|
||||||
|
download(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function downloadDocuware(url, params) {
|
||||||
|
const appUrl = await getAppUrl();
|
||||||
|
const response = await axios.get(`${appUrl}/api/` + url, {
|
||||||
|
responseType: 'blob',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
|
||||||
|
download(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
function download(response) {
|
||||||
const contentDisposition = response.headers['content-disposition'];
|
const contentDisposition = response.headers['content-disposition'];
|
||||||
const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
|
const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
|
||||||
const filename =
|
const filename = matches?.[1] ? matches[1].replace(/['"]/g, '') : 'downloaded-file';
|
||||||
matches != null && matches[1]
|
|
||||||
? matches[1].replace(/['"]/g, '')
|
|
||||||
: 'downloaded-file';
|
|
||||||
|
|
||||||
exportFile(filename, response.data);
|
exportFile(filename, response.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getAppUrl() {
|
||||||
|
return (await getUrl('', 'lilium')).replace('/#/', '');
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,8 @@ export function getColAlign(col) {
|
||||||
case 'number':
|
case 'number':
|
||||||
align = 'right';
|
align = 'right';
|
||||||
break;
|
break;
|
||||||
|
case 'time':
|
||||||
|
case 'date':
|
||||||
case 'checkbox':
|
case 'checkbox':
|
||||||
align = 'center';
|
align = 'center';
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
export async function beforeSave(data, getChanges, modelOrigin) {
|
||||||
|
try {
|
||||||
|
const changes = data.updates;
|
||||||
|
if (!changes) return data;
|
||||||
|
const patchPromises = [];
|
||||||
|
|
||||||
|
for (const change of changes) {
|
||||||
|
let patchData = {};
|
||||||
|
|
||||||
|
if ('hasMinPrice' in change.data) {
|
||||||
|
patchData.hasMinPrice = change.data?.hasMinPrice;
|
||||||
|
delete change.data.hasMinPrice;
|
||||||
|
}
|
||||||
|
if ('minPrice' in change.data) {
|
||||||
|
patchData.minPrice = change.data?.minPrice;
|
||||||
|
delete change.data.minPrice;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Object.keys(patchData).length > 0) {
|
||||||
|
const promise = axios
|
||||||
|
.get(`${modelOrigin}/findOne`, {
|
||||||
|
params: {
|
||||||
|
filter: {
|
||||||
|
fields: ['itemFk'],
|
||||||
|
where: { id: change.where.id },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then((row) => {
|
||||||
|
return axios.patch(`Items/${row.data.itemFk}`, patchData);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error('Error processing change: ', change, error);
|
||||||
|
});
|
||||||
|
|
||||||
|
patchPromises.push(promise);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await Promise.all(patchPromises);
|
||||||
|
|
||||||
|
data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error in beforeSave:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -30,9 +30,16 @@ export function useAcl() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasAcl(model, prop, accessType) {
|
||||||
|
const modelAcl = state.getAcls().value[model];
|
||||||
|
const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
|
||||||
|
return !!(propAcl?.[accessType] || propAcl?.['*']);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fetch,
|
fetch,
|
||||||
hasAny,
|
hasAny,
|
||||||
state,
|
state,
|
||||||
|
hasAcl,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,11 @@ import { useArrayDataStore } from 'stores/useArrayDataStore';
|
||||||
import { buildFilter } from 'filters/filterPanel';
|
import { buildFilter } from 'filters/filterPanel';
|
||||||
import { isDialogOpened } from 'src/filters';
|
import { isDialogOpened } from 'src/filters';
|
||||||
|
|
||||||
const arrayDataStore = useArrayDataStore();
|
|
||||||
|
|
||||||
export function useArrayData(key, userOptions) {
|
export function useArrayData(key, userOptions) {
|
||||||
key ??= useRoute().meta.moduleName;
|
key ??= useRoute().meta.moduleName;
|
||||||
|
|
||||||
if (!key) throw new Error('ArrayData: A key is required to use this composable');
|
if (!key) throw new Error('ArrayData: A key is required to use this composable');
|
||||||
|
const arrayDataStore = useArrayDataStore(); // Move inside function
|
||||||
|
|
||||||
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
|
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
|
||||||
|
|
||||||
|
|
@ -56,7 +55,6 @@ export function useArrayData(key, userOptions) {
|
||||||
'searchUrl',
|
'searchUrl',
|
||||||
'navigate',
|
'navigate',
|
||||||
'mapKey',
|
'mapKey',
|
||||||
'keepData',
|
|
||||||
'oneRecord',
|
'oneRecord',
|
||||||
];
|
];
|
||||||
if (typeof userOptions === 'object') {
|
if (typeof userOptions === 'object') {
|
||||||
|
|
@ -108,7 +106,7 @@ export function useArrayData(key, userOptions) {
|
||||||
store.hasMoreData = limit && response.data.length >= limit;
|
store.hasMoreData = limit && response.data.length >= limit;
|
||||||
|
|
||||||
if (!append && !isDialogOpened() && updateRouter) {
|
if (!append && !isDialogOpened() && updateRouter) {
|
||||||
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
|
if (updateStateParams(response.data)?.redirect) return;
|
||||||
}
|
}
|
||||||
store.isLoading = false;
|
store.isLoading = false;
|
||||||
canceller = null;
|
canceller = null;
|
||||||
|
|
@ -148,8 +146,7 @@ export function useArrayData(key, userOptions) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyFilter({ filter, params }, fetchOptions = {}) {
|
async function applyFilter({ filter, params }, fetchOptions = {}) {
|
||||||
if (filter) store.userFilter = filter;
|
if (filter) store.filter = filter;
|
||||||
store.filter = {};
|
|
||||||
if (params) store.userParams = { ...params };
|
if (params) store.userParams = { ...params };
|
||||||
|
|
||||||
const response = await fetch(fetchOptions);
|
const response = await fetch(fetchOptions);
|
||||||
|
|
@ -190,7 +187,7 @@ export function useArrayData(key, userOptions) {
|
||||||
|
|
||||||
store.order = order;
|
store.order = order;
|
||||||
resetPagination();
|
resetPagination();
|
||||||
fetch({});
|
await fetch({});
|
||||||
index++;
|
index++;
|
||||||
|
|
||||||
return { index, order };
|
return { index, order };
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ export function useFilterParams(key) {
|
||||||
watch(
|
watch(
|
||||||
() => arrayData.value.store?.currentFilter,
|
() => arrayData.value.store?.currentFilter,
|
||||||
(val, oldValue) => (val || oldValue) && setUserParams(val),
|
(val, oldValue) => (val || oldValue) && setUserParams(val),
|
||||||
{ immediate: true, deep: true }
|
{ immediate: true, deep: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
function parseOrder(urlOrders) {
|
function parseOrder(urlOrders) {
|
||||||
|
|
@ -54,7 +54,7 @@ export function useFilterParams(key) {
|
||||||
Object.assign(params, item);
|
Object.assign(params, item);
|
||||||
});
|
});
|
||||||
delete params[key];
|
delete params[key];
|
||||||
} else if (value && typeof value === 'object') {
|
} else if (value && typeof value === 'object' && !Array.isArray(value)) {
|
||||||
const param = Object.values(value)[0];
|
const param = Object.values(value)[0];
|
||||||
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
|
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ export function useRole() {
|
||||||
name: data.user.name,
|
name: data.user.name,
|
||||||
nickname: data.user.nickname,
|
nickname: data.user.nickname,
|
||||||
lang: data.user.lang || 'es',
|
lang: data.user.lang || 'es',
|
||||||
|
departmentFk: data.user?.worker?.department?.departmentFk,
|
||||||
};
|
};
|
||||||
state.setUser(userData);
|
state.setUser(userData);
|
||||||
state.setRoles(roles);
|
state.setRoles(roles);
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ export function useSession() {
|
||||||
const { data: isValidToken } = await axios.get('VnUsers/validateToken');
|
const { data: isValidToken } = await axios.get('VnUsers/validateToken');
|
||||||
if (isValidToken)
|
if (isValidToken)
|
||||||
destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
|
destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
|
||||||
destroyToken(url, storage, key)
|
destroyToken(url, storage, key),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,8 @@ export function useValidator() {
|
||||||
if (min >= 0)
|
if (min >= 0)
|
||||||
if (Math.floor(value) < min) return t('inputMin', { value: min });
|
if (Math.floor(value) < min) return t('inputMin', { value: min });
|
||||||
},
|
},
|
||||||
custom: (value) => validation.bindedFunction(value) || 'Invalid value',
|
custom: (value) =>
|
||||||
|
eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ body.body--light {
|
||||||
--vn-empty-tag: #acacac;
|
--vn-empty-tag: #acacac;
|
||||||
--vn-black-text-color: black;
|
--vn-black-text-color: black;
|
||||||
--vn-text-color-contrast: white;
|
--vn-text-color-contrast: white;
|
||||||
|
--vn-link-color: #1e90ff;
|
||||||
|
|
||||||
background-color: var(--vn-page-color);
|
background-color: var(--vn-page-color);
|
||||||
|
|
||||||
|
|
@ -38,6 +39,7 @@ body.body--dark {
|
||||||
--vn-empty-tag: #2d2d2d;
|
--vn-empty-tag: #2d2d2d;
|
||||||
--vn-black-text-color: black;
|
--vn-black-text-color: black;
|
||||||
--vn-text-color-contrast: black;
|
--vn-text-color-contrast: black;
|
||||||
|
--vn-link-color: #66bfff;
|
||||||
|
|
||||||
background-color: var(--vn-page-color);
|
background-color: var(--vn-page-color);
|
||||||
|
|
||||||
|
|
@ -49,7 +51,7 @@ a {
|
||||||
}
|
}
|
||||||
|
|
||||||
.link {
|
.link {
|
||||||
color: $color-link;
|
color: var(--vn-link-color);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
||||||
&--white {
|
&--white {
|
||||||
|
|
@ -58,14 +60,14 @@ a {
|
||||||
}
|
}
|
||||||
|
|
||||||
.tx-color-link {
|
.tx-color-link {
|
||||||
color: $color-link !important;
|
color: var(--vn-link-color) !important;
|
||||||
}
|
}
|
||||||
.tx-color-font {
|
.tx-color-font {
|
||||||
color: $color-link !important;
|
color: var(--vn-link-color) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-link {
|
.header-link {
|
||||||
color: $color-link !important;
|
color: var(--vn-link-color) !important;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
border-bottom: solid $primary;
|
border-bottom: solid $primary;
|
||||||
border-width: 2px;
|
border-width: 2px;
|
||||||
|
|
@ -323,7 +325,6 @@ input::-webkit-inner-spin-button {
|
||||||
min-height: auto !important;
|
min-height: auto !important;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-end;
|
align-items: flex-end;
|
||||||
padding-bottom: 2px;
|
|
||||||
.q-field__native.row {
|
.q-field__native.row {
|
||||||
min-height: auto !important;
|
min-height: auto !important;
|
||||||
}
|
}
|
||||||
|
|
@ -337,5 +338,8 @@ input::-webkit-inner-spin-button {
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerShrinked {
|
.containerShrinked {
|
||||||
width: 80%;
|
width: 70%;
|
||||||
|
}
|
||||||
|
.q-item__section--main ~ .q-item__section--side {
|
||||||
|
padding-inline: 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ $alert: $negative;
|
||||||
$white: #fff;
|
$white: #fff;
|
||||||
$dark: #3d3d3d;
|
$dark: #3d3d3d;
|
||||||
// custom
|
// custom
|
||||||
$color-link: #66bfff;
|
|
||||||
$color-spacer-light: #a3a3a31f;
|
$color-spacer-light: #a3a3a31f;
|
||||||
$color-spacer: #7979794d;
|
$color-spacer: #7979794d;
|
||||||
$border-thin-light: 1px solid $color-spacer-light;
|
$border-thin-light: 1px solid $color-spacer-light;
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,6 @@ globals:
|
||||||
file: File
|
file: File
|
||||||
selectFile: Select a file
|
selectFile: Select a file
|
||||||
copyClipboard: Copy on clipboard
|
copyClipboard: Copy on clipboard
|
||||||
salesPerson: SalesPerson
|
|
||||||
send: Send
|
send: Send
|
||||||
code: Code
|
code: Code
|
||||||
since: Since
|
since: Since
|
||||||
|
|
@ -158,7 +157,9 @@ globals:
|
||||||
changeState: Change state
|
changeState: Change state
|
||||||
raid: 'Raid {daysInForward} days'
|
raid: 'Raid {daysInForward} days'
|
||||||
isVies: Vies
|
isVies: Vies
|
||||||
|
department: Department
|
||||||
noData: No data available
|
noData: No data available
|
||||||
|
vehicle: Vehicle
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Login
|
logIn: Login
|
||||||
addressEdit: Update address
|
addressEdit: Update address
|
||||||
|
|
@ -346,7 +347,6 @@ globals:
|
||||||
params:
|
params:
|
||||||
description: Description
|
description: Description
|
||||||
clientFk: Client id
|
clientFk: Client id
|
||||||
salesPersonFk: Sales person
|
|
||||||
warehouseFk: Warehouse
|
warehouseFk: Warehouse
|
||||||
provinceFk: Province
|
provinceFk: Province
|
||||||
stateFk: State
|
stateFk: State
|
||||||
|
|
@ -370,6 +370,11 @@ globals:
|
||||||
countryCodeFk: Country
|
countryCodeFk: Country
|
||||||
companyFk: Company
|
companyFk: Company
|
||||||
nickname: Alias
|
nickname: Alias
|
||||||
|
changedModel: Entity
|
||||||
|
changedModelValue: Search
|
||||||
|
changedModelId: Entity id
|
||||||
|
userFk: User
|
||||||
|
action: Action
|
||||||
model: Model
|
model: Model
|
||||||
fuel: Fuel
|
fuel: Fuel
|
||||||
active: Active
|
active: Active
|
||||||
|
|
@ -531,6 +536,7 @@ ticket:
|
||||||
customerCard: Customer card
|
customerCard: Customer card
|
||||||
ticketList: Ticket List
|
ticketList: Ticket List
|
||||||
newOrder: New Order
|
newOrder: New Order
|
||||||
|
ticketClaimed: Claimed ticket
|
||||||
boxing:
|
boxing:
|
||||||
expedition: Expedition
|
expedition: Expedition
|
||||||
created: Created
|
created: Created
|
||||||
|
|
@ -603,7 +609,6 @@ worker:
|
||||||
balance: Balance
|
balance: Balance
|
||||||
medical: Medical
|
medical: Medical
|
||||||
list:
|
list:
|
||||||
department: Department
|
|
||||||
schedule: Schedule
|
schedule: Schedule
|
||||||
newWorker: New worker
|
newWorker: New worker
|
||||||
summary:
|
summary:
|
||||||
|
|
@ -646,6 +651,7 @@ worker:
|
||||||
model: Model
|
model: Model
|
||||||
serialNumber: Serial number
|
serialNumber: Serial number
|
||||||
removePDA: Deallocate PDA
|
removePDA: Deallocate PDA
|
||||||
|
sendToTablet: Send to tablet
|
||||||
create:
|
create:
|
||||||
lastName: Last name
|
lastName: Last name
|
||||||
birth: Birth
|
birth: Birth
|
||||||
|
|
@ -816,6 +822,7 @@ travel:
|
||||||
search: Search travel
|
search: Search travel
|
||||||
searchInfo: You can search by travel id or name
|
searchInfo: You can search by travel id or name
|
||||||
id: Id
|
id: Id
|
||||||
|
awbFk: AWB
|
||||||
travelList:
|
travelList:
|
||||||
tableVisibleColumns:
|
tableVisibleColumns:
|
||||||
ref: Reference
|
ref: Reference
|
||||||
|
|
@ -840,6 +847,7 @@ travel:
|
||||||
availabledHour: Availabled hour
|
availabledHour: Availabled hour
|
||||||
thermographs: Thermographs
|
thermographs: Thermographs
|
||||||
hb: HB
|
hb: HB
|
||||||
|
roundedCc: Rounded CC
|
||||||
basicData:
|
basicData:
|
||||||
daysInForward: Automatic movement (Raid)
|
daysInForward: Automatic movement (Raid)
|
||||||
isRaid: Raid
|
isRaid: Raid
|
||||||
|
|
@ -862,7 +870,6 @@ components:
|
||||||
mine: For me
|
mine: For me
|
||||||
hasMinPrice: Minimum price
|
hasMinPrice: Minimum price
|
||||||
# LatestBuysFilter
|
# LatestBuysFilter
|
||||||
salesPersonFk: Buyer
|
|
||||||
supplierFk: Supplier
|
supplierFk: Supplier
|
||||||
from: From
|
from: From
|
||||||
to: To
|
to: To
|
||||||
|
|
@ -870,6 +877,11 @@ components:
|
||||||
active: Is active
|
active: Is active
|
||||||
floramondo: Is floramondo
|
floramondo: Is floramondo
|
||||||
showBadDates: Show future items
|
showBadDates: Show future items
|
||||||
|
name: Nombre
|
||||||
|
rate2: Grouping price
|
||||||
|
rate3: Packing price
|
||||||
|
minPrice: Min. Price
|
||||||
|
itemFk: Item id
|
||||||
userPanel:
|
userPanel:
|
||||||
copyToken: Token copied to clipboard
|
copyToken: Token copied to clipboard
|
||||||
settings: Settings
|
settings: Settings
|
||||||
|
|
@ -883,7 +895,7 @@ components:
|
||||||
openCard: View
|
openCard: View
|
||||||
openSummary: Summary
|
openSummary: Summary
|
||||||
viewSummary: Summary
|
viewSummary: Summary
|
||||||
cardDescriptor:
|
vnDescriptor:
|
||||||
mainList: Main list
|
mainList: Main list
|
||||||
summary: Summary
|
summary: Summary
|
||||||
moreOptions: More options
|
moreOptions: More options
|
||||||
|
|
@ -893,6 +905,8 @@ components:
|
||||||
VnLv:
|
VnLv:
|
||||||
copyText: '{copyValue} has been copied to the clipboard'
|
copyText: '{copyValue} has been copied to the clipboard'
|
||||||
iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
|
iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
|
||||||
|
VnNotes:
|
||||||
|
clientWithoutPhone: 'The following clients do not have a phone number and the message will not be sent to them: {clientWithoutPhone}'
|
||||||
weekdays:
|
weekdays:
|
||||||
sun: Sunday
|
sun: Sunday
|
||||||
mon: Monday
|
mon: Monday
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,6 @@ globals:
|
||||||
file: Fichero
|
file: Fichero
|
||||||
selectFile: Seleccione un fichero
|
selectFile: Seleccione un fichero
|
||||||
copyClipboard: Copiar en portapapeles
|
copyClipboard: Copiar en portapapeles
|
||||||
salesPerson: Comercial
|
|
||||||
send: Enviar
|
send: Enviar
|
||||||
code: Código
|
code: Código
|
||||||
since: Desde
|
since: Desde
|
||||||
|
|
@ -163,6 +162,8 @@ globals:
|
||||||
raid: 'Redada {daysInForward} días'
|
raid: 'Redada {daysInForward} días'
|
||||||
isVies: Vies
|
isVies: Vies
|
||||||
noData: Datos no disponibles
|
noData: Datos no disponibles
|
||||||
|
department: Departamento
|
||||||
|
vehicle: Vehículo
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Inicio de sesión
|
logIn: Inicio de sesión
|
||||||
addressEdit: Modificar consignatario
|
addressEdit: Modificar consignatario
|
||||||
|
|
@ -349,7 +350,6 @@ globals:
|
||||||
params:
|
params:
|
||||||
description: Descripción
|
description: Descripción
|
||||||
clientFk: Id cliente
|
clientFk: Id cliente
|
||||||
salesPersonFk: Comercial
|
|
||||||
warehouseFk: Almacén
|
warehouseFk: Almacén
|
||||||
provinceFk: Provincia
|
provinceFk: Provincia
|
||||||
stateFk: Estado
|
stateFk: Estado
|
||||||
|
|
@ -371,6 +371,11 @@ globals:
|
||||||
countryCodeFk: País
|
countryCodeFk: País
|
||||||
companyFk: Empresa
|
companyFk: Empresa
|
||||||
nickname: Alias
|
nickname: Alias
|
||||||
|
changedModel: Entidad
|
||||||
|
changedModelValue: Buscar
|
||||||
|
changedModelId: Id de entidad
|
||||||
|
userFk: Usuario
|
||||||
|
action: Acción
|
||||||
errors:
|
errors:
|
||||||
statusUnauthorized: Acceso denegado
|
statusUnauthorized: Acceso denegado
|
||||||
statusInternalServerError: Ha ocurrido un error interno del servidor
|
statusInternalServerError: Ha ocurrido un error interno del servidor
|
||||||
|
|
@ -531,13 +536,13 @@ ticket:
|
||||||
state: Estado
|
state: Estado
|
||||||
shipped: Enviado
|
shipped: Enviado
|
||||||
landed: Entregado
|
landed: Entregado
|
||||||
salesPerson: Comercial
|
|
||||||
total: Total
|
total: Total
|
||||||
card:
|
card:
|
||||||
customerId: ID cliente
|
customerId: ID cliente
|
||||||
customerCard: Ficha del cliente
|
customerCard: Ficha del cliente
|
||||||
ticketList: Listado de tickets
|
ticketList: Listado de tickets
|
||||||
newOrder: Nuevo pedido
|
newOrder: Nuevo pedido
|
||||||
|
ticketClaimed: Ticket reclamado
|
||||||
boxing:
|
boxing:
|
||||||
expedition: Expedición
|
expedition: Expedición
|
||||||
created: Creado
|
created: Creado
|
||||||
|
|
@ -622,8 +627,6 @@ invoiceOut:
|
||||||
errors:
|
errors:
|
||||||
downloadCsvFailed: Error al descargar CSV
|
downloadCsvFailed: Error al descargar CSV
|
||||||
order:
|
order:
|
||||||
field:
|
|
||||||
salesPersonFk: Comercial
|
|
||||||
form:
|
form:
|
||||||
clientFk: Cliente
|
clientFk: Cliente
|
||||||
addressFk: Dirección
|
addressFk: Dirección
|
||||||
|
|
@ -691,7 +694,6 @@ worker:
|
||||||
formation: Formación
|
formation: Formación
|
||||||
medical: Mutua
|
medical: Mutua
|
||||||
list:
|
list:
|
||||||
department: Departamento
|
|
||||||
schedule: Horario
|
schedule: Horario
|
||||||
newWorker: Nuevo trabajador
|
newWorker: Nuevo trabajador
|
||||||
summary:
|
summary:
|
||||||
|
|
@ -734,6 +736,7 @@ worker:
|
||||||
model: Modelo
|
model: Modelo
|
||||||
serialNumber: Número de serie
|
serialNumber: Número de serie
|
||||||
removePDA: Desasignar PDA
|
removePDA: Desasignar PDA
|
||||||
|
sendToTablet: Enviar a la tablet
|
||||||
create:
|
create:
|
||||||
lastName: Apellido
|
lastName: Apellido
|
||||||
birth: Fecha de nacimiento
|
birth: Fecha de nacimiento
|
||||||
|
|
@ -902,6 +905,7 @@ travel:
|
||||||
search: Buscar envío
|
search: Buscar envío
|
||||||
searchInfo: Buscar envío por id o nombre
|
searchInfo: Buscar envío por id o nombre
|
||||||
id: Id
|
id: Id
|
||||||
|
awbFk: Guía aérea
|
||||||
travelList:
|
travelList:
|
||||||
tableVisibleColumns:
|
tableVisibleColumns:
|
||||||
ref: Referencia
|
ref: Referencia
|
||||||
|
|
@ -926,6 +930,7 @@ travel:
|
||||||
availabled: F. Disponible
|
availabled: F. Disponible
|
||||||
availabledHour: Hora Disponible
|
availabledHour: Hora Disponible
|
||||||
hb: HB
|
hb: HB
|
||||||
|
roundedCc: CC redondeado
|
||||||
basicData:
|
basicData:
|
||||||
daysInForward: Desplazamiento automatico (redada)
|
daysInForward: Desplazamiento automatico (redada)
|
||||||
isRaid: Redada
|
isRaid: Redada
|
||||||
|
|
@ -949,7 +954,6 @@ components:
|
||||||
hasMinPrice: Precio mínimo
|
hasMinPrice: Precio mínimo
|
||||||
wareHouseFk: Almacén
|
wareHouseFk: Almacén
|
||||||
# LatestBuysFilter
|
# LatestBuysFilter
|
||||||
salesPersonFk: Comprador
|
|
||||||
supplierFk: Proveedor
|
supplierFk: Proveedor
|
||||||
visible: Visible
|
visible: Visible
|
||||||
active: Activo
|
active: Activo
|
||||||
|
|
@ -957,6 +961,11 @@ components:
|
||||||
to: Hasta
|
to: Hasta
|
||||||
floramondo: Floramondo
|
floramondo: Floramondo
|
||||||
showBadDates: Ver items a futuro
|
showBadDates: Ver items a futuro
|
||||||
|
name: Nombre
|
||||||
|
rate2: Precio grouping
|
||||||
|
rate3: Precio packing
|
||||||
|
minPrice: Precio mínimo
|
||||||
|
itemFk: Id item
|
||||||
userPanel:
|
userPanel:
|
||||||
copyToken: Token copiado al portapapeles
|
copyToken: Token copiado al portapapeles
|
||||||
settings: Configuración
|
settings: Configuración
|
||||||
|
|
@ -970,7 +979,7 @@ components:
|
||||||
openCard: Ficha
|
openCard: Ficha
|
||||||
openSummary: Detalles
|
openSummary: Detalles
|
||||||
viewSummary: Vista previa
|
viewSummary: Vista previa
|
||||||
cardDescriptor:
|
vnDescriptor:
|
||||||
mainList: Listado principal
|
mainList: Listado principal
|
||||||
summary: Resumen
|
summary: Resumen
|
||||||
moreOptions: Más opciones
|
moreOptions: Más opciones
|
||||||
|
|
@ -980,6 +989,8 @@ components:
|
||||||
VnLv:
|
VnLv:
|
||||||
copyText: '{copyValue} se ha copiado al portapepeles'
|
copyText: '{copyValue} se ha copiado al portapepeles'
|
||||||
iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
|
iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
|
||||||
|
VnNotes:
|
||||||
|
clientWithoutPhone: 'Estos clientes no tienen asociado número de télefono y el sms no les será enviado: {clientWithoutPhone}'
|
||||||
weekdays:
|
weekdays:
|
||||||
sun: Domingo
|
sun: Domingo
|
||||||
mon: Lunes
|
mon: Lunes
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ const rolesOptions = ref([]);
|
||||||
:label="t('globals.name')"
|
:label="t('globals.name')"
|
||||||
v-model="params.name"
|
v-model="params.name"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
is-outlined
|
filled
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
|
@ -57,7 +57,7 @@ const rolesOptions = ref([]);
|
||||||
:label="t('account.card.alias')"
|
:label="t('account.card.alias')"
|
||||||
v-model="params.nickname"
|
v-model="params.nickname"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
is-outlined
|
filled
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
|
@ -75,8 +75,7 @@ const rolesOptions = ref([]);
|
||||||
use-input
|
use-input
|
||||||
hide-selected
|
hide-selected
|
||||||
dense
|
dense
|
||||||
outlined
|
filled
|
||||||
rounded
|
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
|
|
||||||
|
|
@ -149,14 +149,12 @@ const columns = computed(() => [
|
||||||
:right-search="false"
|
:right-search="false"
|
||||||
>
|
>
|
||||||
<template #more-create-dialog="{ data }">
|
<template #more-create-dialog="{ data }">
|
||||||
<QCardSection>
|
|
||||||
<VnInputPassword
|
<VnInputPassword
|
||||||
:label="t('Password')"
|
:label="t('Password')"
|
||||||
v-model="data.password"
|
v-model="data.password"
|
||||||
:required="true"
|
:required="true"
|
||||||
autocomplete="new-password"
|
autocomplete="new-password"
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
|
||||||
</template>
|
</template>
|
||||||
</VnTable>
|
</VnTable>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue