Compare commits
No commits in common. "dev" and "warmFix_remove_keepData" have entirely different histories.
dev
...
warmFix_re
|
|
@ -0,0 +1,6 @@
|
||||||
|
/dist
|
||||||
|
/src-capacitor
|
||||||
|
/src-cordova
|
||||||
|
/.quasar
|
||||||
|
/node_modules
|
||||||
|
.eslintrc.js
|
||||||
|
|
@ -0,0 +1,75 @@
|
||||||
|
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',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"extends": ["plugin:cypress/recommended"]
|
|
||||||
}
|
|
||||||
|
|
@ -125,10 +125,8 @@ pipeline {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
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/docker/cypressParallel.sh 1 '${modules}'"
|
sh 'sh test/cypress/cypressParallel.sh 1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -185,4 +183,3 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
||||||
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',
|
|
||||||
],
|
|
||||||
};
|
|
||||||
25
package.json
25
package.json
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.16.0",
|
"version": "25.14.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
|
@ -9,8 +9,7 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"resetDatabase": "cd ../salix && gulp docker",
|
"resetDatabase": "cd ../salix && gulp docker",
|
||||||
"lint": "eslint \"**/*.{vue,js}\" ",
|
"lint": "eslint --ext .js,.vue ./",
|
||||||
"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",
|
||||||
|
|
@ -18,8 +17,6 @@
|
||||||
"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",
|
||||||
|
|
@ -29,53 +26,43 @@
|
||||||
"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.4.0",
|
"vue-i18n": "^9.3.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",
|
||||||
"@eslint/eslintrc": "^3.2.0",
|
"@intlify/unplugin-vue-i18n": "^0.8.2",
|
||||||
"@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",
|
"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",
|
||||||
"vitest": "^3.0.3",
|
"vitepress": "^1.6.3",
|
||||||
|
"vitest": "^0.34.0",
|
||||||
"xunit-viewer": "^10.6.1"
|
"xunit-viewer": "^10.6.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|
|
||||||
4012
pnpm-lock.yaml
4012
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: 'node20',
|
node: 'node18',
|
||||||
},
|
},
|
||||||
|
|
||||||
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
||||||
|
|
@ -92,7 +92,6 @@ 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/**'),
|
||||||
|
|
|
||||||
|
|
@ -1,227 +0,0 @@
|
||||||
/* 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,30 +9,6 @@ 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(),
|
||||||
|
|
@ -53,7 +29,7 @@ describe('Axios boot', () => {
|
||||||
'Accept-Language': 'en-US',
|
'Accept-Language': 'en-US',
|
||||||
Authorization: 'DEFAULT_TOKEN',
|
Authorization: 'DEFAULT_TOKEN',
|
||||||
},
|
},
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
/* 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';
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,13 @@ 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, validations } = useValidator();
|
const { validate } = useValidator();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const myForm = ref(null);
|
const myForm = ref(null);
|
||||||
|
|
@ -118,7 +119,7 @@ const defaultButtons = computed(() => ({
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
icon: 'save',
|
icon: 'save',
|
||||||
label: 'globals.save',
|
label: 'globals.save',
|
||||||
click: async (evt) => submitForm(evt),
|
click: async () => await save(),
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
},
|
},
|
||||||
reset: {
|
reset: {
|
||||||
|
|
@ -131,13 +132,6 @@ 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));
|
||||||
|
|
||||||
|
|
@ -233,9 +227,10 @@ 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;
|
||||||
const response = await Promise.resolve(
|
let response;
|
||||||
$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');
|
||||||
|
|
||||||
|
|
@ -312,13 +307,11 @@ async function onKeyup(evt) {
|
||||||
selectionStart = selectionEnd = selectionStart + 1;
|
selectionStart = selectionEnd = selectionStart + 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await myForm.value.submit(evt);
|
await save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
submitForm,
|
|
||||||
myForm,
|
|
||||||
save,
|
save,
|
||||||
isLoading,
|
isLoading,
|
||||||
hasChanges,
|
hasChanges,
|
||||||
|
|
@ -332,7 +325,7 @@ defineExpose({
|
||||||
<QForm
|
<QForm
|
||||||
ref="myForm"
|
ref="myForm"
|
||||||
v-if="formData"
|
v-if="formData"
|
||||||
@submit.prevent="save"
|
@submit.prevent
|
||||||
@keyup.prevent="onKeyup"
|
@keyup.prevent="onKeyup"
|
||||||
@reset="reset"
|
@reset="reset"
|
||||||
class="q-pa-md"
|
class="q-pa-md"
|
||||||
|
|
@ -346,7 +339,6 @@ 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,12 +41,9 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
emit('onDataSaved', formData, requestResponse);
|
emit('onDataSaved', formData, requestResponse);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
|
const onClick = async (saveAndContinue) => {
|
||||||
await formModelRef.value.myForm.validate(true);
|
|
||||||
isSaveAndContinue.value = saveAndContinue;
|
isSaveAndContinue.value = saveAndContinue;
|
||||||
if (formModelRef.value) {
|
await formModelRef.value.save();
|
||||||
await formModelRef.value.submitForm();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
|
@ -62,23 +59,16 @@ 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, validations }">
|
<template #form="{ data, validate }">
|
||||||
<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
|
<slot name="form-inputs" :data="data" :validate="validate" />
|
||||||
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')"
|
||||||
|
|
@ -97,13 +87,12 @@ defineExpose({
|
||||||
:flat="showSaveAndContinueBtn"
|
:flat="showSaveAndContinueBtn"
|
||||||
:label="t('globals.save')"
|
:label="t('globals.save')"
|
||||||
:title="t('globals.save')"
|
:title="t('globals.save')"
|
||||||
:type="!showSaveAndContinueBtn ? 'submit' : 'button'"
|
@click="onClick(false)"
|
||||||
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
|
||||||
|
|
@ -111,13 +100,12 @@ 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>
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ 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';
|
||||||
|
|
@ -118,7 +117,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
tableHeight: {
|
tableHeight: {
|
||||||
type: String,
|
type: String,
|
||||||
default: undefined,
|
default: '90vh',
|
||||||
},
|
},
|
||||||
footer: {
|
footer: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
|
@ -167,7 +166,6 @@ 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);
|
||||||
|
|
@ -680,7 +678,7 @@ 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: ${$props.tableHeight || tableHeight}`"
|
:style="isTableMode && `max-height: ${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)"
|
||||||
|
|
@ -1044,7 +1042,7 @@ 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, validations }">
|
<template #form-inputs="{ data }">
|
||||||
<slot name="alter-create" :data="data">
|
<slot name="alter-create" :data="data">
|
||||||
<div :style="createComplement?.containerStyle">
|
<div :style="createComplement?.containerStyle">
|
||||||
<div
|
<div
|
||||||
|
|
@ -1062,7 +1060,6 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:key="column.name"
|
:key="column.name"
|
||||||
:name="`column-create-${column.name}`"
|
:name="`column-create-${column.name}`"
|
||||||
:data="data"
|
:data="data"
|
||||||
:validations="validations"
|
|
||||||
:column-name="column.name"
|
:column-name="column.name"
|
||||||
:label="column.label"
|
:label="column.label"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
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 { default as axios } from 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
|
|
||||||
describe('VnVisibleColumns', () => {
|
describe('VnVisibleColumns', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let vm;
|
let vm;
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
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,6 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } 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,5 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
import EditForm from 'components/EditTableCellValueForm.vue';
|
import EditForm from 'components/EditTableCellValueForm.vue';
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } 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';
|
||||||
|
|
||||||
|
|
@ -40,7 +38,7 @@ 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', {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } 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,7 +1,6 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
||||||
import { default as axios } from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import Leftmenu from 'components/LeftMenu.vue';
|
||||||
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';
|
||||||
|
|
||||||
|
|
@ -102,7 +101,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,
|
||||||
},
|
},
|
||||||
|
|
@ -165,7 +164,7 @@ describe('getRoutes', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('LeftMenu as card', () => {
|
describe('Leftmenu as card', () => {
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
vm = mount('card').vm;
|
vm = mount('card').vm;
|
||||||
});
|
});
|
||||||
|
|
@ -174,7 +173,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;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ async function confirm() {
|
||||||
v-model="address"
|
v-model="address"
|
||||||
is-outlined
|
is-outlined
|
||||||
autofocus
|
autofocus
|
||||||
data-cy="SendEmailNotificationDialogInput"
|
data-cy="SendEmailNotifiactionDialogInput"
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { watch } from 'vue';
|
import { watch } from 'vue';
|
||||||
import { toDateHourMinSec } from 'src/filters';
|
import { toDateString } 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 = toDateHourMinSec(props.value);
|
t = toDateString(props.value);
|
||||||
} else {
|
} else {
|
||||||
t = props.value.toString();
|
t = props.value.toString();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,6 @@ function filterByRecord(modelLog) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyFilter(params = {}) {
|
async function applyFilter(params = {}) {
|
||||||
paginate.value.arrayData.resetPagination();
|
|
||||||
paginate.value.arrayData.applyFilter({
|
paginate.value.arrayData.applyFilter({
|
||||||
filter: {},
|
filter: {},
|
||||||
params: { originFk: route.params.id, ...params },
|
params: { originFk: route.params.id, ...params },
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
import FetchData from '../FetchData.vue';
|
import FetchData from '../FetchData.vue';
|
||||||
import { useValidator } from 'src/composables/useValidator';
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import { useCapitalize } from 'src/composables/useCapitalize';
|
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||||
import VnAvatar from '../ui/VnAvatar.vue';
|
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
dataKey: {
|
dataKey: {
|
||||||
|
|
@ -100,6 +99,7 @@ function getActions() {
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:redirect="false"
|
:redirect="false"
|
||||||
:hiddenTags="['originFk', 'creationDate']"
|
:hiddenTags="['originFk', 'creationDate']"
|
||||||
|
:exprBuilder
|
||||||
search-url="logs"
|
search-url="logs"
|
||||||
:showTagChips="false"
|
:showTagChips="false"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
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,5 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } 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';
|
||||||
|
|
||||||
|
|
@ -41,10 +40,7 @@ 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', content: new Blob(['file content'], { type: 'text/plain' })},
|
||||||
name: 'example.txt',
|
|
||||||
content: new Blob(['file content'], { type: 'text/plain' }),
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const expectedBody = {
|
const expectedBody = {
|
||||||
|
|
@ -63,7 +59,7 @@ describe('VnDms', () => {
|
||||||
url: '/test',
|
url: '/test',
|
||||||
formInitialData: { id: 1, reference: 'test' },
|
formInitialData: { id: 1, reference: 'test' },
|
||||||
model: 'Worker',
|
model: 'Worker',
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
@ -117,9 +113,7 @@ describe('VnDms', () => {
|
||||||
describe('save', () => {
|
describe('save', () => {
|
||||||
it('should save data correctly', async () => {
|
it('should save data correctly', async () => {
|
||||||
await vm.save();
|
await vm.save();
|
||||||
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), {
|
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
|
||||||
params: expectedBody,
|
|
||||||
});
|
|
||||||
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
|
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -133,8 +127,8 @@ describe('VnDms', () => {
|
||||||
warehouseFk: 2,
|
warehouseFk: 2,
|
||||||
companyFk: 3,
|
companyFk: 3,
|
||||||
dmsTypeFk: 2,
|
dmsTypeFk: 2,
|
||||||
description: 'This is a test description',
|
description: 'This is a test description'
|
||||||
};
|
}
|
||||||
await wrapper.setProps({ formInitialData: testData });
|
await wrapper.setProps({ formInitialData: testData });
|
||||||
vm.defaultData();
|
vm.defaultData();
|
||||||
|
|
||||||
|
|
@ -143,7 +137,7 @@ describe('VnDms', () => {
|
||||||
|
|
||||||
it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
|
it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
|
||||||
await wrapper.setProps({ formInitialData: null });
|
await wrapper.setProps({ formInitialData: null });
|
||||||
vm.route.params.id = '111';
|
vm.route.params.id= '111';
|
||||||
vm.defaultData();
|
vm.defaultData();
|
||||||
|
|
||||||
expect(vm.dms.reference).toBe('111');
|
expect(vm.dms.reference).toBe('111');
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } 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';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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('01/01/2023, 01:00:00');
|
expect(span.text()).toBe('2023-01-01');
|
||||||
expect(span.classes()).toContain('json-object');
|
expect(span.classes()).toContain('json-object');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
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', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } 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', () => {
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,6 @@ 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;
|
||||||
|
|
@ -170,15 +169,9 @@ 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 {
|
||||||
|
|
@ -210,21 +203,27 @@ async function fetch() {
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-group {
|
.vn-card-group {
|
||||||
display: grid;
|
display: flex;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
flex-direction: column;
|
||||||
gap: 16px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-content {
|
.vn-card-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
overflow: hidden;
|
|
||||||
white-space: nowrap;
|
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
> div {
|
> div {
|
||||||
max-height: 70px;
|
max-height: 70px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1010px) {
|
||||||
|
.vn-card-group {
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
.vn-card-content {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.summaryHeader .vn-label-value {
|
.summaryHeader .vn-label-value {
|
||||||
|
|
|
||||||
|
|
@ -252,10 +252,6 @@ const toModule = computed(() => {
|
||||||
content: ':';
|
content: ':';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.ellipsis > .value {
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: pre;
|
|
||||||
}
|
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,8 @@
|
||||||
<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
|
||||||
|
|
@ -16,5 +13,4 @@ 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 { dashIfEmpty, parsePhone } from 'src/filters';
|
import { parsePhone } from 'src/filters';
|
||||||
import useOpenURL from 'src/composables/useOpenURL';
|
import useOpenURL from 'src/composables/useOpenURL';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
|
@ -12,51 +12,38 @@ 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;
|
||||||
|
|
||||||
for (const type of activeTypes) {
|
|
||||||
if (type === 'say-simple') {
|
|
||||||
let { channel } = config[type];
|
let { channel } = config[type];
|
||||||
|
|
||||||
|
if (type === 'say-simple') {
|
||||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||||
.data;
|
.data;
|
||||||
if (!channel) channel = defaultChannel;
|
if (!channel) channel = defaultChannel;
|
||||||
|
|
||||||
phone.value = await parsePhone(
|
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
||||||
props.phoneNumber,
|
config[
|
||||||
props.country?.toLowerCase(),
|
type
|
||||||
);
|
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||||
config[type].url =
|
|
||||||
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleClick(type) {
|
function handleClick() {
|
||||||
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>
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<template v-for="type in activeTypes">
|
|
||||||
<QBtn
|
<QBtn
|
||||||
:key="type"
|
|
||||||
v-if="phone"
|
v-if="phone"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
|
@ -64,13 +51,11 @@ function handleClick(type) {
|
||||||
size="sm"
|
size="sm"
|
||||||
color="primary"
|
color="primary"
|
||||||
padding="none"
|
padding="none"
|
||||||
@click.stop="() => handleClick(type)"
|
@click.stop="handleClick"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ capitalize(type).replace('-', '') }}
|
{{ capitalize(type).replace('-', '') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QBtn></template
|
</QBtn>
|
||||||
>
|
{{ phoneNumber }}
|
||||||
<span>{{ dashIfEmpty(phone) }}</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } 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,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
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 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
import parsePhone from 'src/filters/parsePhone';
|
import parsePhone from 'src/filters/parsePhone';
|
||||||
|
|
||||||
describe('parsePhone filter', () => {
|
describe('parsePhone filter', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import VnSms from 'src/components/ui/VnSms.vue';
|
import VnSms from 'src/components/ui/VnSms.vue';
|
||||||
|
|
||||||
describe('VnSms', () => {
|
describe('VnSms', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
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();
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
|
|
||||||
import { flushPromises } from '@vue/test-utils';
|
|
||||||
import { useAcl } from 'src/composables/useAcl';
|
import { useAcl } from 'src/composables/useAcl';
|
||||||
|
|
||||||
describe('useAcl', () => {
|
describe('useAcl', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,39 +1,15 @@
|
||||||
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||||
import { default as axios } from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
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(() => {
|
||||||
setActivePinia(createPinia());
|
vi.spyOn(useRouter(), 'replace');
|
||||||
|
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(() => {
|
||||||
|
|
@ -41,69 +17,103 @@ 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').mockResolvedValueOnce({ data: [] });
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
|
||||||
url: 'mockUrl',
|
|
||||||
searchUrl: 'params',
|
|
||||||
});
|
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
await arrayData.fetch({});
|
arrayData.fetch({});
|
||||||
|
|
||||||
|
await flushPromises();
|
||||||
const routerReplace = useRouter().replace.mock.calls[0][0];
|
const routerReplace = useRouter().replace.mock.calls[0][0];
|
||||||
|
|
||||||
expect(axios.get).toHaveBeenCalledWith('mockUrl', {
|
expect(axios.get.mock.calls[0][1].params).toEqual({
|
||||||
signal: expect.any(Object),
|
|
||||||
params: {
|
|
||||||
filter,
|
filter,
|
||||||
supplierFk: 2,
|
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 redirect to detail when single record is returned with navigation', async () => {
|
it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
|
||||||
data: [{ id: 1 }],
|
|
||||||
});
|
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
|
||||||
url: 'mockUrl',
|
|
||||||
navigate: {},
|
|
||||||
});
|
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
await arrayData.fetch({});
|
arrayData.fetch({});
|
||||||
|
|
||||||
|
await flushPromises();
|
||||||
const routerPush = useRouter().push.mock.calls[0][0];
|
const routerPush = useRouter().push.mock.calls[0][0];
|
||||||
|
|
||||||
expect(routerPush.path).toBe('mockName/1');
|
expect(axios.get.mock.calls[0][1].params).toEqual({
|
||||||
|
filter,
|
||||||
|
supplierFk: 2,
|
||||||
|
});
|
||||||
|
expect(routerPush.path).toEqual('mockName/1');
|
||||||
expect(routerPush.query).toBeUndefined();
|
expect(routerPush.query).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return one record when oneRecord is true', async () => {
|
it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
|
||||||
|
|
||||||
|
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({
|
expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
|
||||||
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,6 +1,5 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
import { flushPromises } from '@vue/test-utils';
|
|
||||||
import { useRole } from 'composables/useRole';
|
import { useRole } from 'composables/useRole';
|
||||||
const role = useRole();
|
const role = useRole();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
import { useSession } from 'composables/useSession';
|
import { useSession } from 'composables/useSession';
|
||||||
import { useState } from 'composables/useState';
|
import { useState } from 'composables/useState';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
import { flushPromises } from '@vue/test-utils';
|
|
||||||
import { useTokenConfig } from 'composables/useTokenConfig';
|
import { useTokenConfig } from 'composables/useTokenConfig';
|
||||||
const tokenConfig = useTokenConfig();
|
const tokenConfig = useTokenConfig();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,16 +30,9 @@ 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,11 +5,12 @@ 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);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +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,
|
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,8 +78,7 @@ 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) =>
|
custom: (value) => validation.bindedFunction(value) || 'Invalid value',
|
||||||
eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -340,6 +340,3 @@ input::-webkit-inner-spin-button {
|
||||||
.containerShrinked {
|
.containerShrinked {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
}
|
}
|
||||||
.q-item__section--main ~ .q-item__section--side {
|
|
||||||
padding-inline: 0;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -100,8 +100,12 @@ const onChangePass = (oldPass) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
|
hasitManagementAccess.value = useAcl().hasAny([
|
||||||
hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
|
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
|
||||||
|
]);
|
||||||
|
hasSysadminAccess.value = useAcl().hasAny([
|
||||||
|
{ model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
|
||||||
|
]);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
|
@ -223,7 +227,7 @@ onMounted(() => {
|
||||||
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem
|
<QItem
|
||||||
v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
|
v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
|
||||||
v-ripple
|
v-ripple
|
||||||
clickable
|
clickable
|
||||||
@click="showSyncDialog = true"
|
@click="showSyncDialog = true"
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
|
||||||
<QPopupProxy style="max-width: 10px">
|
<QPopupProxy style="max-width: 10px">
|
||||||
<AccountDescriptor
|
<AccountDescriptor
|
||||||
v-if="$attrs.id"
|
v-if="$attrs.id"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs.id"
|
||||||
:summary="AccountSummary"
|
:summary="AccountSummary"
|
||||||
:proxy-render="true"
|
:proxy-render="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -88,13 +88,13 @@ const columns = [
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
<template #column-itemFk="{ row }">
|
<template #column-itemFk="{ row }">
|
||||||
<span class="link" @click.stop>
|
<span class="link">
|
||||||
{{ row.itemFk }}
|
{{ row.itemFk }}
|
||||||
<ItemDescriptorProxy :id="row.itemFk" />
|
<ItemDescriptorProxy :id="row.itemFk" />
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
<template #column-ticketFk="{ row }">
|
<template #column-ticketFk="{ row }">
|
||||||
<span class="link" @click.stop>
|
<span class="link">
|
||||||
{{ row.ticketFk }}
|
{{ row.ticketFk }}
|
||||||
<TicketDescriptorProxy :id="row.ticketFk" />
|
<TicketDescriptorProxy :id="row.ticketFk" />
|
||||||
</span>
|
</span>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
|
import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
|
||||||
|
|
||||||
describe('ClaimDescriptorMenu', () => {
|
describe('ClaimDescriptorMenu', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import ClaimLines from '/src/pages/Claim/Card/ClaimLines.vue';
|
import ClaimLines from '/src/pages/Claim/Card/ClaimLines.vue';
|
||||||
|
|
||||||
describe('ClaimLines', () => {
|
describe('ClaimLines', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import ClaimLinesImport from 'pages/Claim/Card/ClaimLinesImport.vue';
|
import ClaimLinesImport from 'pages/Claim/Card/ClaimLinesImport.vue';
|
||||||
|
|
||||||
describe('ClaimLinesImport', () => {
|
describe('ClaimLinesImport', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import ClaimPhoto from 'pages/Claim/Card/ClaimPhoto.vue';
|
import ClaimPhoto from 'pages/Claim/Card/ClaimPhoto.vue';
|
||||||
|
|
||||||
describe('ClaimPhoto', () => {
|
describe('ClaimPhoto', () => {
|
||||||
let vm;
|
let vm;
|
||||||
|
|
||||||
|
|
@ -61,7 +61,7 @@ describe('ClaimPhoto', () => {
|
||||||
title: 'This file will be deleted',
|
title: 'This file will be deleted',
|
||||||
icon: 'delete',
|
icon: 'delete',
|
||||||
data: { index: 1 },
|
data: { index: 1 },
|
||||||
promise: vm.deleteDms,
|
promise: vm.deleteDms
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
|
||||||
const { openConfirmationModal } = useVnConfirm();
|
const { openConfirmationModal } = useVnConfirm();
|
||||||
const { sendEmail, openReport } = usePrintService();
|
const { sendEmail, openReport } = usePrintService();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { hasAcl } = useAcl();
|
const { hasAny } = useAcl();
|
||||||
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
@ -276,7 +276,9 @@ const showBalancePdf = ({ id }) => {
|
||||||
>
|
>
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="scope.value"
|
v-model="scope.value"
|
||||||
:disable="!hasAcl('Receipt', '*', 'WRITE')"
|
:disable="
|
||||||
|
!hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
|
||||||
|
"
|
||||||
@keypress.enter="scope.set"
|
@keypress.enter="scope.set"
|
||||||
autofocus
|
autofocus
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ async function acceptPropagate({ isEqualizated }) {
|
||||||
observe-form-changes
|
observe-form-changes
|
||||||
@on-data-saved="checkEtChanges"
|
@on-data-saved="checkEtChanges"
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate, validations }">
|
<template #form="{ data, validate }">
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Social name')"
|
:label="t('Social name')"
|
||||||
|
|
@ -112,7 +112,6 @@ async function acceptPropagate({ isEqualizated }) {
|
||||||
v-model="data.sageTaxTypeFk"
|
v-model="data.sageTaxTypeFk"
|
||||||
data-cy="sageTaxTypeFk"
|
data-cy="sageTaxTypeFk"
|
||||||
:required="data.isTaxDataChecked"
|
:required="data.isTaxDataChecked"
|
||||||
:rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
|
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Sage transaction type')"
|
:label="t('Sage transaction type')"
|
||||||
|
|
@ -123,9 +122,6 @@ async function acceptPropagate({ isEqualizated }) {
|
||||||
data-cy="sageTransactionTypeFk"
|
data-cy="sageTransactionTypeFk"
|
||||||
v-model="data.sageTransactionTypeFk"
|
v-model="data.sageTransactionTypeFk"
|
||||||
:required="data.isTaxDataChecked"
|
:required="data.isTaxDataChecked"
|
||||||
:rules="[
|
|
||||||
(val) => validations.required(data.sageTransactionTypeFk, val),
|
|
||||||
]"
|
|
||||||
>
|
>
|
||||||
<template #option="scope">
|
<template #option="scope">
|
||||||
<QItem v-bind="scope.itemProps">
|
<QItem v-bind="scope.itemProps">
|
||||||
|
|
|
||||||
|
|
@ -84,31 +84,29 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
<VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
|
<VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
|
||||||
<VnLv :label="t('globals.name')" :value="entity.name" />
|
<VnLv :label="t('globals.name')" :value="entity.name" />
|
||||||
<VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
|
<VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
|
||||||
<VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
|
<VnLv :value="entity.phone">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('customer.extendedList.tableVisibleColumns.phone') }}
|
||||||
<VnLinkPhone :phone-number="entity.phone" />
|
<VnLinkPhone :phone-number="entity.phone" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('customer.summary.mobile')">
|
<VnLv :value="entity.mobile">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('customer.summary.mobile') }}
|
||||||
|
<VnLinkPhone :phone-number="entity.mobile" />
|
||||||
<VnLinkPhone
|
<VnLinkPhone
|
||||||
sip
|
|
||||||
say-simple
|
say-simple
|
||||||
:phone-number="entity.mobile"
|
:phone-number="entity.mobile"
|
||||||
:channel="entity.country?.saySimpleCountry?.channel"
|
:channel="entity.country?.saySimpleCountry?.channel"
|
||||||
|
class="q-ml-xs"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv
|
<VnLv :value="entity.email" copy
|
||||||
:label="t('globals.params.email')"
|
><template #label>
|
||||||
:value="entity.email"
|
{{ t('globals.params.email') }}
|
||||||
class="ellipsis"
|
<VnLinkMail email="entity.email"></VnLinkMail> </template
|
||||||
copy
|
></VnLv>
|
||||||
>
|
|
||||||
<template #value>
|
|
||||||
<VnLinkMail :email="entity.email" />
|
|
||||||
</template>
|
|
||||||
</VnLv>
|
|
||||||
<VnLv :label="t('globals.department')">
|
<VnLv :label="t('globals.department')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<span class="link" v-text="entity.department?.name" />
|
<span class="link" v-text="entity.department?.name" />
|
||||||
|
|
@ -181,7 +179,7 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
<QCard class="vn-one">
|
<QCard class="vn-one">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
:url="`#/customer/${entityId}/billing-data`"
|
:url="`#/customer/${entityId}/billing-data`"
|
||||||
:text="t('customer.summary.payMethodFk')"
|
:text="t('customer.summary.billingData')"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('customer.summary.payMethod')"
|
:label="t('customer.summary.payMethod')"
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,6 @@ const exprBuilder = (param, value) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
url="Departments"
|
url="Departments"
|
||||||
no-one="true"
|
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
|
@ -155,9 +154,9 @@ en:
|
||||||
city: City
|
city: City
|
||||||
phone: Phone
|
phone: Phone
|
||||||
email: Email
|
email: Email
|
||||||
departmentFk: Department
|
|
||||||
isToBeMailed: Mailed
|
isToBeMailed: Mailed
|
||||||
isEqualizated: Equailized
|
isEqualizated: Equailized
|
||||||
|
departmentFk: Department
|
||||||
businessTypeFk: Business type
|
businessTypeFk: Business type
|
||||||
sageTaxTypeFk: Sage Tax Type
|
sageTaxTypeFk: Sage Tax Type
|
||||||
sageTransactionTypeFk: Sage Tax Type
|
sageTransactionTypeFk: Sage Tax Type
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,6 @@ es:
|
||||||
Identifier: Identificador
|
Identifier: Identificador
|
||||||
Social name: Razón social
|
Social name: Razón social
|
||||||
Phone: Teléfono
|
Phone: Teléfono
|
||||||
Postcode: Código postal
|
|
||||||
City: Población
|
City: Población
|
||||||
Email: Email
|
Email: Email
|
||||||
Campaign consumption: Consumo campaña
|
Campaign consumption: Consumo campaña
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import CustomerPayments from 'src/pages/Customer/Payments/CustomerPayments.vue';
|
import CustomerPayments from 'src/pages/Customer/Payments/CustomerPayments.vue';
|
||||||
|
|
||||||
describe('CustomerPayments', () => {
|
describe('CustomerPayments', () => {
|
||||||
|
|
|
||||||
|
|
@ -93,26 +93,10 @@ const updateAddressTicket = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateObservations = async (payload) => {
|
const updateObservations = async (payload) => {
|
||||||
await axios.post('AddressObservations/crud', cleanPayload(payload));
|
await axios.post('AddressObservations/crud', payload);
|
||||||
notes.value = [];
|
notes.value = [];
|
||||||
deletes.value = [];
|
deletes.value = [];
|
||||||
};
|
};
|
||||||
|
|
||||||
function cleanPayload(payload) {
|
|
||||||
['creates', 'deletes', 'updates'].forEach((prop) => {
|
|
||||||
if (prop === 'creates' || prop === 'updates') {
|
|
||||||
payload[prop] = payload[prop].filter(
|
|
||||||
(item) => item.description !== '' && item.observationTypeFk !== '',
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
payload[prop] = payload[prop].filter(
|
|
||||||
(item) => item !== null && item !== undefined,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return payload;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function updateAll({ data, payload }) {
|
async function updateAll({ data, payload }) {
|
||||||
await updateObservations(payload);
|
await updateObservations(payload);
|
||||||
await updateAddress(data);
|
await updateAddress(data);
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
|
||||||
:without-header="true"
|
:without-header="true"
|
||||||
auto-load
|
auto-load
|
||||||
:row-click="rowClick"
|
:row-click="rowClick"
|
||||||
order="shipped DESC, id DESC"
|
order="shipped DESC, id"
|
||||||
:disable-option="{ card: true, table: true }"
|
:disable-option="{ card: true, table: true }"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
:disable-infinite-scroll="true"
|
:disable-infinite-scroll="true"
|
||||||
|
|
|
||||||
|
|
@ -787,7 +787,7 @@ onMounted(() => {
|
||||||
<span data-cy="footer-amount">{{ footer?.amount }} / </span>
|
<span data-cy="footer-amount">{{ footer?.amount }} / </span>
|
||||||
<span style="color: var(--q-positive)">{{ footer?.checkedAmount }}</span>
|
<span style="color: var(--q-positive)">{{ footer?.checkedAmount }}</span>
|
||||||
</template>
|
</template>
|
||||||
<template #column-create-itemFk="{ data, validations }">
|
<template #column-create-itemFk="{ data }">
|
||||||
<VnSelect
|
<VnSelect
|
||||||
url="Items/search"
|
url="Items/search"
|
||||||
v-model="data.itemFk"
|
v-model="data.itemFk"
|
||||||
|
|
@ -801,8 +801,7 @@ onMounted(() => {
|
||||||
await setBuyUltimate(value, data);
|
await setBuyUltimate(value, data);
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
required
|
:required="true"
|
||||||
:rules="[(val) => validations.required(true, val)]"
|
|
||||||
data-cy="itemFk-create-popup"
|
data-cy="itemFk-create-popup"
|
||||||
sort-by="nickname DESC"
|
sort-by="nickname DESC"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -70,8 +70,8 @@ onMounted(async () => {
|
||||||
:url="`#/entry/${entityId}/basic-data`"
|
:url="`#/entry/${entityId}/basic-data`"
|
||||||
:text="t('globals.summary.basicData')"
|
:text="t('globals.summary.basicData')"
|
||||||
/>
|
/>
|
||||||
<div class="vn-card-group">
|
<div class="card-group">
|
||||||
<div class="vn-card-content">
|
<div class="card-content">
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('entry.summary.commission')"
|
:label="t('entry.summary.commission')"
|
||||||
:value="entry?.commission"
|
:value="entry?.commission"
|
||||||
|
|
@ -93,7 +93,7 @@ onMounted(async () => {
|
||||||
:value="entry?.invoiceNumber"
|
:value="entry?.invoiceNumber"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="vn-card-content">
|
<div class="card-content">
|
||||||
<VnCheckbox
|
<VnCheckbox
|
||||||
:label="t('entry.list.tableVisibleColumns.isOrdered')"
|
:label="t('entry.list.tableVisibleColumns.isOrdered')"
|
||||||
v-model="entry.isOrdered"
|
v-model="entry.isOrdered"
|
||||||
|
|
@ -130,8 +130,8 @@ onMounted(async () => {
|
||||||
:url="`#/travel/${entry.travel.id}/summary`"
|
:url="`#/travel/${entry.travel.id}/summary`"
|
||||||
:text="t('Travel')"
|
:text="t('Travel')"
|
||||||
/>
|
/>
|
||||||
<div class="vn-card-group">
|
<div class="card-group">
|
||||||
<div class="vn-card-content">
|
<div class="card-content">
|
||||||
<VnLv :label="t('entry.summary.travelReference')">
|
<VnLv :label="t('entry.summary.travelReference')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<span class="link">
|
<span class="link">
|
||||||
|
|
@ -161,7 +161,7 @@ onMounted(async () => {
|
||||||
:value="entry.travel.warehouseIn?.name"
|
:value="entry.travel.warehouseIn?.name"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="vn-card-content">
|
<div class="card-content">
|
||||||
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
|
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
|
||||||
<VnCheckbox
|
<VnCheckbox
|
||||||
:label="t('entry.summary.travelDelivered')"
|
:label="t('entry.summary.travelDelivered')"
|
||||||
|
|
@ -193,6 +193,31 @@ onMounted(async () => {
|
||||||
</template>
|
</template>
|
||||||
</CardSummary>
|
</CardSummary>
|
||||||
</template>
|
</template>
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.card-group {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
> div {
|
||||||
|
max-height: 24px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1010px) {
|
||||||
|
.card-group {
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
.card-content {
|
||||||
|
flex: 1;
|
||||||
|
margin-right: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
<i18n>
|
<i18n>
|
||||||
es:
|
es:
|
||||||
Travel: Envío
|
Travel: Envío
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ const routes = reactive({
|
||||||
getSupplier: (id) => {
|
getSupplier: (id) => {
|
||||||
return { name: 'SupplierCard', params: { id } };
|
return { name: 'SupplierCard', params: { id } };
|
||||||
},
|
},
|
||||||
getInvoices: (id) => {
|
getTickets: (id) => {
|
||||||
return {
|
return {
|
||||||
name: 'InvoiceInList',
|
name: 'InvoiceInList',
|
||||||
query: {
|
query: {
|
||||||
|
|
@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
size="md"
|
size="md"
|
||||||
icon="vn:invoice-in"
|
icon="vn:ticket"
|
||||||
color="primary"
|
color="primary"
|
||||||
:to="routes.getInvoices(entity.supplierFk)"
|
:to="routes.getTickets(entity.supplierFk)"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
|
<QTooltip>{{ t('globals.ticketList') }}</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="
|
v-if="
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ invoiceIn:
|
||||||
amount: Amount
|
amount: Amount
|
||||||
descriptor:
|
descriptor:
|
||||||
ticketList: Ticket list
|
ticketList: Ticket list
|
||||||
invoices: Supplier invoices
|
|
||||||
descriptorMenu:
|
descriptorMenu:
|
||||||
book: Book
|
book: Book
|
||||||
unbook: Unbook
|
unbook: Unbook
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ invoiceIn:
|
||||||
awb: AWB
|
awb: AWB
|
||||||
amount: Importe
|
amount: Importe
|
||||||
descriptor:
|
descriptor:
|
||||||
invoices: Facturas de proveedor
|
ticketList: Listado de tickets
|
||||||
descriptorMenu:
|
descriptorMenu:
|
||||||
book: Contabilizar
|
book: Contabilizar
|
||||||
unbook: Descontabilizar
|
unbook: Descontabilizar
|
||||||
|
|
|
||||||
|
|
@ -79,30 +79,6 @@ const columns = computed(() => [
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
align: 'left',
|
|
||||||
name: 'issued',
|
|
||||||
label: t('invoiceOut.summary.issued'),
|
|
||||||
component: 'date',
|
|
||||||
format: (row) => toDate(row.issued),
|
|
||||||
columnField: { component: null },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
align: 'left',
|
|
||||||
name: 'created',
|
|
||||||
label: t('globals.created'),
|
|
||||||
component: 'date',
|
|
||||||
columnField: { component: null },
|
|
||||||
format: (row) => toDate(row.created),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
align: 'left',
|
|
||||||
name: 'dued',
|
|
||||||
label: t('invoiceOut.summary.expirationDate'),
|
|
||||||
component: 'date',
|
|
||||||
columnField: { component: null },
|
|
||||||
format: (row) => toDate(row.dued),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
name: 'clientFk',
|
name: 'clientFk',
|
||||||
|
|
@ -156,6 +132,22 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
format: (row) => toCurrency(row.amount),
|
format: (row) => toCurrency(row.amount),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
align: 'left',
|
||||||
|
name: 'created',
|
||||||
|
label: t('globals.created'),
|
||||||
|
component: 'date',
|
||||||
|
columnField: { component: null },
|
||||||
|
format: (row) => toDate(row.created),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
align: 'left',
|
||||||
|
name: 'dued',
|
||||||
|
label: t('invoiceOut.summary.dued'),
|
||||||
|
component: 'date',
|
||||||
|
columnField: { component: null },
|
||||||
|
format: (row) => toDate(row.dued),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
name: 'customsAgentFk',
|
name: 'customsAgentFk',
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ const $props = defineProps({
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QPopupProxy style="max-width: 10px" data-cy="ItemDescriptor">
|
<QPopupProxy style="max-width: 10px">
|
||||||
<ItemDescriptor
|
<ItemDescriptor
|
||||||
v-if="$props.id"
|
v-if="$props.id"
|
||||||
:id="$props.id"
|
:id="$props.id"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
|
||||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
import { QCheckbox } from 'quasar';
|
||||||
|
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import { useValidator } from 'src/composables/useValidator';
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
|
|
@ -250,9 +250,10 @@ onMounted(async () => {
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<!-- Tags filter -->
|
<!-- Tags filter -->
|
||||||
<QItemLabel header>
|
<QItem class="row items-center">
|
||||||
|
<QItemLabel>
|
||||||
{{ t('params.tags') }}
|
{{ t('params.tags') }}
|
||||||
|
</QItemLabel>
|
||||||
<QIcon
|
<QIcon
|
||||||
name="add_circle"
|
name="add_circle"
|
||||||
class="fill-icon-on-hover q-ml-md"
|
class="fill-icon-on-hover q-ml-md"
|
||||||
|
|
@ -260,7 +261,7 @@ onMounted(async () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
@click="tagValues.push({})"
|
@click="tagValues.push({})"
|
||||||
/>
|
/>
|
||||||
</QItemLabel>
|
</QItem>
|
||||||
<QItem
|
<QItem
|
||||||
v-for="(tag, index) in tagValues"
|
v-for="(tag, index) in tagValues"
|
||||||
:key="index"
|
:key="index"
|
||||||
|
|
@ -268,7 +269,6 @@ onMounted(async () => {
|
||||||
>
|
>
|
||||||
<QItemSection class="col">
|
<QItemSection class="col">
|
||||||
<VnSelect
|
<VnSelect
|
||||||
class="full-width"
|
|
||||||
:label="t('params.tag')"
|
:label="t('params.tag')"
|
||||||
v-model="tag.selectedTag"
|
v-model="tag.selectedTag"
|
||||||
:options="tagOptions"
|
:options="tagOptions"
|
||||||
|
|
@ -316,19 +316,25 @@ onMounted(async () => {
|
||||||
/>
|
/>
|
||||||
</QItem>
|
</QItem>
|
||||||
<!-- Filter fields -->
|
<!-- Filter fields -->
|
||||||
<QItemLabel header
|
<QItem class="row items-center">
|
||||||
>{{ t('More fields') }}
|
<QItemLabel>
|
||||||
|
{{ t('More fields') }}
|
||||||
|
</QItemLabel>
|
||||||
<QIcon
|
<QIcon
|
||||||
name="add_circle"
|
name="add_circle"
|
||||||
class="fill-icon-on-hover q-ml-md"
|
class="fill-icon-on-hover q-ml-md"
|
||||||
size="sm"
|
size="sm"
|
||||||
color="primary"
|
color="primary"
|
||||||
@click="fieldFiltersValues.push({})"
|
@click="fieldFiltersValues.push({})"
|
||||||
/></QItemLabel>
|
/>
|
||||||
<QItem v-for="(fieldFilter, index) in fieldFiltersValues" :key="index">
|
</QItem>
|
||||||
|
<QItem
|
||||||
|
v-for="(fieldFilter, index) in fieldFiltersValues"
|
||||||
|
:key="index"
|
||||||
|
class="row items-center"
|
||||||
|
>
|
||||||
<QItemSection class="col">
|
<QItemSection class="col">
|
||||||
<VnSelect
|
<VnSelect
|
||||||
class="full-width"
|
|
||||||
:label="t('params.tag')"
|
:label="t('params.tag')"
|
||||||
:model-value="fieldFilter.selectedField"
|
:model-value="fieldFilter.selectedField"
|
||||||
:options="moreFields"
|
:options="moreFields"
|
||||||
|
|
@ -349,7 +355,7 @@ onMounted(async () => {
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
<QItemSection class="col">
|
<QItemSection class="col">
|
||||||
<VnCheckbox
|
<QCheckbox
|
||||||
v-if="fieldFilter.selectedField?.type === 'boolean'"
|
v-if="fieldFilter.selectedField?.type === 'boolean'"
|
||||||
v-model="fieldFilter.value"
|
v-model="fieldFilter.value"
|
||||||
:label="t('params.value')"
|
:label="t('params.value')"
|
||||||
|
|
@ -364,14 +370,13 @@ onMounted(async () => {
|
||||||
@keydown.enter="applyFieldFilters(params, searchFn)"
|
@keydown.enter="applyFieldFilters(params, searchFn)"
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
<QItemSection side
|
<QIcon
|
||||||
><QIcon
|
|
||||||
name="delete"
|
name="delete"
|
||||||
class="fill-icon-on-hover q-ml-xs"
|
class="fill-icon-on-hover q-ml-xs"
|
||||||
size="sm"
|
size="sm"
|
||||||
color="primary"
|
color="primary"
|
||||||
@click="removeFieldFilter(index, params, searchFn)"
|
@click="removeFieldFilter(index, params, searchFn)"
|
||||||
/></QItemSection>
|
/>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import Login from 'pages/Login/LoginMain.vue';
|
import Login from 'pages/Login/LoginMain.vue';
|
||||||
import axios from 'axios';
|
|
||||||
|
|
||||||
describe('Login', () => {
|
describe('Login', () => {
|
||||||
let vm;
|
let vm;
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,7 @@ const getLocale = (label) => {
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
dense
|
dense
|
||||||
filled
|
rounded
|
||||||
:label="t('globals.params.packing')"
|
:label="t('globals.params.packing')"
|
||||||
v-model="params.packing"
|
v-model="params.packing"
|
||||||
url="ItemPackingTypes"
|
url="ItemPackingTypes"
|
||||||
|
|
|
||||||
|
|
@ -112,9 +112,12 @@ const filter = {
|
||||||
:label="t('Trailer Plate')"
|
:label="t('Trailer Plate')"
|
||||||
:value="dashIfEmpty(entity?.trailerPlate)"
|
:value="dashIfEmpty(entity?.trailerPlate)"
|
||||||
/>
|
/>
|
||||||
<VnLv :label="t('Phone')">
|
<VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
|
||||||
<template #value>
|
<template #value>
|
||||||
|
<span>
|
||||||
|
{{ dashIfEmpty(entity?.phone) }}
|
||||||
<VnLinkPhone :phone-number="entity?.phone" />
|
<VnLinkPhone :phone-number="entity?.phone" />
|
||||||
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv
|
<VnLv
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
isId: true,
|
isId: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
|
width: '25px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'workerFk',
|
name: 'workerFk',
|
||||||
|
|
@ -141,6 +142,7 @@ const columns = computed(() => [
|
||||||
label: 'm3',
|
label: 'm3',
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnClass: 'shrink',
|
columnClass: 'shrink',
|
||||||
|
width: '50px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'started',
|
name: 'started',
|
||||||
|
|
@ -148,6 +150,7 @@ const columns = computed(() => [
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ started }) => toHour(started),
|
format: ({ started }) => toHour(started),
|
||||||
|
width: '50px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'finished',
|
name: 'finished',
|
||||||
|
|
@ -155,6 +158,7 @@ const columns = computed(() => [
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ finished }) => toHour(finished),
|
format: ({ finished }) => toHour(finished),
|
||||||
|
width: '50px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'right',
|
align: 'right',
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ const columns = computed(() => [
|
||||||
condition: () => true,
|
condition: () => true,
|
||||||
},
|
},
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
|
width: '25px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
|
@ -56,6 +57,7 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
|
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
|
width: '100px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('globals.agency'),
|
label: t('globals.agency'),
|
||||||
|
|
@ -98,6 +100,7 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ started }) => toHour(started),
|
format: ({ started }) => toHour(started),
|
||||||
|
width: '50px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
|
@ -106,6 +109,7 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ finished }) => toHour(finished),
|
format: ({ finished }) => toHour(finished),
|
||||||
|
width: '50px',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ const totalPrice = computed(() => {
|
||||||
const totalNewPrice = computed(() => {
|
const totalNewPrice = computed(() => {
|
||||||
return rows.value.reduce(
|
return rows.value.reduce(
|
||||||
(acc, item) => acc + item.component.newPrice * item.quantity,
|
(acc, item) => acc + item.component.newPrice * item.quantity,
|
||||||
0,
|
0
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -210,18 +210,18 @@ onMounted(async () => {
|
||||||
flat
|
flat
|
||||||
>
|
>
|
||||||
<template #body-cell-item="{ row }">
|
<template #body-cell-item="{ row }">
|
||||||
<QTd align="center">
|
<QTd @click.stop class="link">
|
||||||
<span @click.stop class="link">
|
<QBtn flat>
|
||||||
{{ row.itemFk }}
|
{{ row.itemFk }}
|
||||||
<ItemDescriptorProxy :id="row.itemFk" />
|
<ItemDescriptorProxy :id="row.itemFk" />
|
||||||
</span>
|
</QBtn>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-description="{ row }">
|
<template #body-cell-description="{ row }">
|
||||||
<QTd style="min-width: 120px; max-width: 120px">
|
<QTd style="min-width: 120px; max-width: 120px">
|
||||||
<div class="column q-pb-xs" style="min-width: 120px">
|
<div class="column q-pb-xs" style="min-width: 120px">
|
||||||
<span>{{ row.item.name }}</span>
|
<span>{{ row.item.name }}</span>
|
||||||
<FetchedTags :item="row.item" class="full-width" :columns="6" />
|
<FetchedTags :item="row.item" class="full-width" />
|
||||||
</div>
|
</div>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,9 @@ const { validate } = useValidator();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
|
const canEditZone = useAcl().hasAny([
|
||||||
|
{ model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
|
||||||
|
]);
|
||||||
|
|
||||||
const agencyFetchRef = ref();
|
const agencyFetchRef = ref();
|
||||||
const warehousesOptions = ref([]);
|
const warehousesOptions = ref([]);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import { useRoute } from 'vue-router';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||||
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
|
||||||
|
import { useState } from 'src/composables/useState';
|
||||||
|
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
|
||||||
|
|
||||||
|
const emit = defineEmits(['onRequestCreated']);
|
||||||
|
|
||||||
|
const route = useRoute();
|
||||||
|
const { t } = useI18n();
|
||||||
|
const state = useState();
|
||||||
|
const user = state.getUser();
|
||||||
|
const stateFetchDataRef = ref(null);
|
||||||
|
const statesOptions = ref([]);
|
||||||
|
|
||||||
|
const onStateFkChange = (formData) => (formData.userFk = user.value.id);
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
ref="stateFetchDataRef"
|
||||||
|
url="States"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (statesOptions = data)"
|
||||||
|
/>
|
||||||
|
<FormModelPopup
|
||||||
|
:title="t('Create tracking')"
|
||||||
|
url-create="Tickets/state"
|
||||||
|
model="CreateTicketTracking"
|
||||||
|
:form-initial-data="{ ticketFk: route.params.id }"
|
||||||
|
@on-data-saved="() => emit('onRequestCreated')"
|
||||||
|
>
|
||||||
|
<template #form-inputs="{ data }">
|
||||||
|
<VnRow>
|
||||||
|
<VnSelect
|
||||||
|
v-model="data.stateFk"
|
||||||
|
:label="t('ticketList.state')"
|
||||||
|
:options="statesOptions"
|
||||||
|
@update:model-value="onStateFkChange(data)"
|
||||||
|
hide-selected
|
||||||
|
option-label="name"
|
||||||
|
option-value="id"
|
||||||
|
/>
|
||||||
|
<VnSelectWorker v-model="data.userFk" :fields="['id', 'name']" />
|
||||||
|
</VnRow>
|
||||||
|
</template>
|
||||||
|
</FormModelPopup>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Create tracking: Crear estado
|
||||||
|
</i18n>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, ref, computed, watch, inject } from 'vue';
|
import { onMounted, ref, computed, watch } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRouter, useRoute } from 'vue-router';
|
import { useRouter, useRoute } from 'vue-router';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
|
@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||||
import TicketProblems from 'src/components/TicketProblems.vue';
|
import TicketProblems from 'src/components/TicketProblems.vue';
|
||||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
const app = inject('app');
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
@ -99,7 +99,6 @@ const columns = computed(() => [
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('globals.quantity'),
|
label: t('globals.quantity'),
|
||||||
name: 'quantity',
|
name: 'quantity',
|
||||||
class: 'shrink',
|
|
||||||
format: (row) => toCurrency(row.quantity),
|
format: (row) => toCurrency(row.quantity),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -197,17 +196,13 @@ const changeQuantity = async (sale) => {
|
||||||
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
||||||
return;
|
return;
|
||||||
else sale.originalQuantity = sale.quantity;
|
else sale.originalQuantity = sale.quantity;
|
||||||
try {
|
if (!sale.id) return addSale(sale);
|
||||||
if (!sale.id) await addSale(sale);
|
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (await isSalePrepared(sale)) {
|
if (await isSalePrepared(sale)) {
|
||||||
await confirmUpdate(() => updateQuantity(sale));
|
await confirmUpdate(() => updateQuantity(sale));
|
||||||
} else await updateQuantity(sale);
|
} else await updateQuantity(sale);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateQuantity = async (sale) => {
|
const updateQuantity = async (sale) => {
|
||||||
try {
|
try {
|
||||||
let { quantity, id } = sale;
|
let { quantity, id } = sale;
|
||||||
|
|
@ -220,7 +215,7 @@ const updateQuantity = async (sale) => {
|
||||||
(s) => s.id === sale.id,
|
(s) => s.id === sale.id,
|
||||||
);
|
);
|
||||||
sale.quantity = quantity;
|
sale.quantity = quantity;
|
||||||
app.config.errorHandler(e);
|
throw e;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -229,7 +224,7 @@ const addSale = async (sale) => {
|
||||||
barcode: sale.itemFk,
|
barcode: sale.itemFk,
|
||||||
quantity: sale.quantity,
|
quantity: sale.quantity,
|
||||||
};
|
};
|
||||||
try {
|
|
||||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||||
|
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
|
|
@ -247,9 +242,6 @@ const addSale = async (sale) => {
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
sale.isNew = false;
|
sale.isNew = false;
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
const changeConcept = async (sale) => {
|
const changeConcept = async (sale) => {
|
||||||
if (await isSalePrepared(sale)) {
|
if (await isSalePrepared(sale)) {
|
||||||
|
|
@ -258,14 +250,10 @@ const changeConcept = async (sale) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateConcept = async (sale) => {
|
const updateConcept = async (sale) => {
|
||||||
try {
|
|
||||||
const data = { newConcept: sale.concept };
|
const data = { newConcept: sale.concept };
|
||||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const DEFAULT_EDIT = {
|
const DEFAULT_EDIT = {
|
||||||
|
|
@ -276,6 +264,18 @@ const DEFAULT_EDIT = {
|
||||||
oldQuantity: null,
|
oldQuantity: null,
|
||||||
};
|
};
|
||||||
const edit = ref({ ...DEFAULT_EDIT });
|
const edit = ref({ ...DEFAULT_EDIT });
|
||||||
|
const usesMana = ref(null);
|
||||||
|
|
||||||
|
const getUsesMana = async () => {
|
||||||
|
const { data } = await axios.get('Sales/usesMana');
|
||||||
|
usesMana.value = data;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getMana = async () => {
|
||||||
|
const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
|
||||||
|
mana.value = data;
|
||||||
|
await getUsesMana();
|
||||||
|
};
|
||||||
|
|
||||||
const selectedValidSales = computed(() => {
|
const selectedValidSales = computed(() => {
|
||||||
if (!sales.value) return;
|
if (!sales.value) return;
|
||||||
|
|
@ -312,15 +312,11 @@ const changePrice = async (sale) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const updatePrice = async (sale, newPrice) => {
|
const updatePrice = async (sale, newPrice) => {
|
||||||
try {
|
|
||||||
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
||||||
sale.price = newPrice;
|
sale.price = newPrice;
|
||||||
edit.value = { ...DEFAULT_EDIT };
|
edit.value = { ...DEFAULT_EDIT };
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeDiscount = async (sale) => {
|
const changeDiscount = async (sale) => {
|
||||||
|
|
@ -343,7 +339,6 @@ const updateDiscounts = async (sales, newDiscount) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateDiscount = async (sales, newDiscount = 0) => {
|
const updateDiscount = async (sales, newDiscount = 0) => {
|
||||||
try {
|
|
||||||
const salesIds = sales.map(({ id }) => id);
|
const salesIds = sales.map(({ id }) => id);
|
||||||
const params = {
|
const params = {
|
||||||
salesIds,
|
salesIds,
|
||||||
|
|
@ -353,10 +348,6 @@ const updateDiscount = async (sales, newDiscount = 0) => {
|
||||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const getNewPrice = computed(() => {
|
const getNewPrice = computed(() => {
|
||||||
|
|
@ -378,15 +369,11 @@ const getNewPrice = computed(() => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const newOrderFromTicket = async () => {
|
const newOrderFromTicket = async () => {
|
||||||
try {
|
|
||||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||||
ticketFk: Number(route.params.id),
|
ticketFk: Number(route.params.id),
|
||||||
});
|
});
|
||||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||||
window.open(routeData.href, '_blank');
|
window.open(routeData.href, '_blank');
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const goToLog = (saleId) => {
|
const goToLog = (saleId) => {
|
||||||
|
|
@ -403,15 +390,11 @@ const goToLog = (saleId) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeTicketState = async (val) => {
|
const changeTicketState = async (val) => {
|
||||||
try {
|
|
||||||
stateBtnDropdownRef.value.hide();
|
stateBtnDropdownRef.value.hide();
|
||||||
const params = { ticketFk: route.params.id, code: val };
|
const params = { ticketFk: route.params.id, code: val };
|
||||||
await axios.post('Tickets/state', params);
|
await axios.post('Tickets/state', params);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const removeSelectedSales = () => {
|
const removeSelectedSales = () => {
|
||||||
|
|
@ -431,14 +414,10 @@ const removeSales = async () => {
|
||||||
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
||||||
|
|
||||||
if (params.sales.length == 0) return;
|
if (params.sales.length == 0) return;
|
||||||
try {
|
|
||||||
await axios.post('Sales/deleteSales', params);
|
await axios.post('Sales/deleteSales', params);
|
||||||
removeSelectedSales();
|
removeSelectedSales();
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const setTransferParams = async () => {
|
const setTransferParams = async () => {
|
||||||
|
|
@ -792,7 +771,7 @@ watch(
|
||||||
{{ row?.item?.subName.toUpperCase() }}
|
{{ row?.item?.subName.toUpperCase() }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<FetchedTags v-if="row.item" :item="row.item" :columns="6" :max-length="6" />
|
<FetchedTags v-if="row.item" :item="row.item" :max-length="6" />
|
||||||
<QPopupProxy v-if="row.id && isTicketEditable">
|
<QPopupProxy v-if="row.id && isTicketEditable">
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="row.concept"
|
v-model="row.concept"
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,9 @@ const isClaimable = computed(() => {
|
||||||
if (ticket.value) {
|
if (ticket.value) {
|
||||||
const landedPlusWeek = new Date(ticket.value.landed);
|
const landedPlusWeek = new Date(ticket.value.landed);
|
||||||
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
||||||
const createAfterDeadline = acl.hasAcl('Claim', 'createAfterDeadline', 'WRITE');
|
const createAfterDeadline = acl.hasAny([
|
||||||
|
{ model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
|
||||||
|
]);
|
||||||
return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
|
return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,27 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, reactive, computed } from 'vue';
|
import { ref, computed, watch, reactive } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
|
|
||||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import TicketCreateTracking from './TicketCreateTracking.vue';
|
||||||
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
import { useState } from 'src/composables/useState';
|
|
||||||
|
|
||||||
import { toDateTimeFormat } from 'src/filters/date.js';
|
import { toDateTimeFormat } from 'src/filters/date.js';
|
||||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
|
||||||
const state = useState();
|
|
||||||
|
|
||||||
const user = state.getUser();
|
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const tableRef = ref(null);
|
const createTrackingDialogRef = ref(null);
|
||||||
const onStateFkChange = (formData) => (formData.userFk = user.value.id);
|
const paginateRef = ref(null);
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => route.params.id,
|
||||||
|
async (val) => {
|
||||||
|
paginateFilter.where.ticketFk = val;
|
||||||
|
paginateRef.value.fetch();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
const paginateFilter = reactive({
|
const paginateFilter = reactive({
|
||||||
include: [
|
include: [
|
||||||
{
|
{
|
||||||
|
|
@ -52,68 +56,75 @@ const columns = computed(() => [
|
||||||
name: 'state',
|
name: 'state',
|
||||||
field: 'state',
|
field: 'state',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
format: (row) => row.state?.name,
|
format: (val) => val.name,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('expedition.worker'),
|
label: t('expedition.worker'),
|
||||||
name: 'worker',
|
name: 'worker',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
field: 'user',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('expedition.created'),
|
label: t('expedition.created'),
|
||||||
name: 'created',
|
name: 'created',
|
||||||
field: 'created',
|
field: 'created',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
format: ({ created }) => toDateTimeFormat(created),
|
format: (val) => toDateTimeFormat(val),
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
const openCreateModal = () => createTrackingDialogRef.value.show();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<VnTable
|
<QPage class="column items-center q-pa-md">
|
||||||
ref="tableRef"
|
<VnPaginate
|
||||||
:right-search="false"
|
ref="paginateRef"
|
||||||
:column-search="false"
|
|
||||||
:disable-option="{ card: true, table: true }"
|
|
||||||
:search-url="false"
|
|
||||||
:columns="columns"
|
|
||||||
data-key="TicketTracking"
|
data-key="TicketTracking"
|
||||||
:user-filter="paginateFilter"
|
:user-filter="paginateFilter"
|
||||||
|
search-url="table"
|
||||||
url="TicketTrackings"
|
url="TicketTrackings"
|
||||||
auto-load
|
auto-load
|
||||||
order="created DESC"
|
order="created DESC"
|
||||||
:limit="0"
|
:limit="0"
|
||||||
:without-header="true"
|
|
||||||
:create="{
|
|
||||||
urlCreate: 'Tickets/state',
|
|
||||||
title: t('Create tracking'),
|
|
||||||
onDataSaved: () => tableRef.reload(),
|
|
||||||
formInitialData: {
|
|
||||||
ticketFk: route.params.id,
|
|
||||||
},
|
|
||||||
}"
|
|
||||||
>
|
>
|
||||||
<template #more-create-dialog="{ data }">
|
<template #body="{ rows }">
|
||||||
<VnSelect
|
<QTable
|
||||||
url="States"
|
:rows="rows"
|
||||||
v-model="data.stateFk"
|
:columns="columns"
|
||||||
:label="t('ticketList.state')"
|
row-key="id"
|
||||||
auto-load
|
:pagination="{ rowsPerPage: 0 }"
|
||||||
@update:model-value="onStateFkChange(data)"
|
class="full-width q-mt-md"
|
||||||
hide-selected
|
:no-data-label="t('globals.noResults')"
|
||||||
/>
|
>
|
||||||
<VnSelectWorker v-model="data.userFk" :fields="['id', 'name']" />
|
<template #body-cell-worker="{ row }">
|
||||||
</template>
|
<QTd>
|
||||||
<template #column-worker="{ row }">
|
<QBtn flat class="link" @click.stop>
|
||||||
<span class="link" @click.stop>
|
{{ row.user?.name }}
|
||||||
{{ row.user.name }}
|
|
||||||
<WorkerDescriptorProxy :id="row.user?.worker?.id" />
|
<WorkerDescriptorProxy :id="row.user?.worker?.id" />
|
||||||
</span>
|
</QBtn>
|
||||||
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
</VnTable>
|
</QTable>
|
||||||
|
</template>
|
||||||
|
</VnPaginate>
|
||||||
|
<QDialog
|
||||||
|
ref="createTrackingDialogRef"
|
||||||
|
transition-show="scale"
|
||||||
|
transition-hide="scale"
|
||||||
|
>
|
||||||
|
<TicketCreateTracking @on-request-created="paginateRef.fetch()" />
|
||||||
|
</QDialog>
|
||||||
|
<QPageSticky :offset="[20, 20]">
|
||||||
|
<QBtn
|
||||||
|
@click="openCreateModal()"
|
||||||
|
color="primary"
|
||||||
|
fab
|
||||||
|
icon="add"
|
||||||
|
v-shortcut="'+'"
|
||||||
|
/>
|
||||||
|
<QTooltip class="text-no-wrap">
|
||||||
|
{{ t('tracking.addState') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QPageSticky>
|
||||||
|
</QPage>
|
||||||
</template>
|
</template>
|
||||||
<i18n>
|
|
||||||
es:
|
|
||||||
Create tracking: Crear estado
|
|
||||||
</i18n>
|
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ onMounted(() => (stateStore.rightDrawer = true));
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
<template #column-itemFk="{ row }">
|
<template #column-itemFk="{ row }">
|
||||||
<span class="link" @click.stop>
|
<span class="link">
|
||||||
{{ row.itemFk }}
|
{{ row.itemFk }}
|
||||||
<ItemDescriptorProxy :id="row.itemFk" />
|
<ItemDescriptorProxy :id="row.itemFk" />
|
||||||
</span>
|
</span>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import TicketBoxing from 'pages/Ticket/Card/TicketBoxing.vue';
|
import TicketBoxing from 'pages/Ticket/Card/TicketBoxing.vue';
|
||||||
|
|
||||||
// #4836 - Investigate how to test q-drawer outside
|
// #4836 - Investigate how to test q-drawer outside
|
||||||
|
|
@ -22,11 +21,7 @@ describe('TicketBoxing', () => {
|
||||||
min: 1,
|
min: 1,
|
||||||
max: 2,
|
max: 2,
|
||||||
};
|
};
|
||||||
const videoList = [
|
const videoList = ['2022-01-01T01-01-00.mp4', '2022-02-02T02-02-00.mp4', '2022-03-03T03-03-00.mp4'];
|
||||||
'2022-01-01T01-01-00.mp4',
|
|
||||||
'2022-02-02T02-02-00.mp4',
|
|
||||||
'2022-03-03T03-03-00.mp4',
|
|
||||||
];
|
|
||||||
|
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: videoList });
|
vi.spyOn(axios, 'get').mockResolvedValue({ data: videoList });
|
||||||
vi.spyOn(vm.quasar, 'notify');
|
vi.spyOn(vm.quasar, 'notify');
|
||||||
|
|
@ -49,9 +44,7 @@ describe('TicketBoxing', () => {
|
||||||
|
|
||||||
await vm.getVideoList(expeditionId, timed);
|
await vm.getVideoList(expeditionId, timed);
|
||||||
|
|
||||||
expect(vm.quasar.notify).toHaveBeenCalledWith(
|
expect(vm.quasar.notify).toHaveBeenCalledWith(expect.objectContaining({ type: 'negative' }));
|
||||||
expect.objectContaining({ type: 'negative' })
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
name: 'shippedDate',
|
name: 'shipped',
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
label: t('ticketList.shipped'),
|
label: t('ticketList.shipped'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
|
|
@ -123,7 +123,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
name: 'shippedHour',
|
name: 'shipped',
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
label: t('ticketList.hour'),
|
label: t('ticketList.hour'),
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import TicketAdvance from 'pages/Ticket/TicketAdvance.vue';
|
import TicketAdvance from 'pages/Ticket/TicketAdvance.vue';
|
||||||
import { Notify } from 'quasar';
|
import { Notify } from 'quasar';
|
||||||
import { nextTick } from 'vue';
|
import { nextTick } from 'vue';
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,6 @@ ticketList:
|
||||||
toLines: Go to lines
|
toLines: Go to lines
|
||||||
addressNickname: Address nickname
|
addressNickname: Address nickname
|
||||||
ref: Reference
|
ref: Reference
|
||||||
hour: Hour
|
|
||||||
rounding: Rounding
|
rounding: Rounding
|
||||||
noVerifiedData: No verified data
|
noVerifiedData: No verified data
|
||||||
purchaseRequest: Purchase request
|
purchaseRequest: Purchase request
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ const cloneTravelWithEntries = async () => {
|
||||||
router.push({ name: 'TravelBasicData', params: { id: data.id } });
|
router.push({ name: 'TravelBasicData', params: { id: data.id } });
|
||||||
};
|
};
|
||||||
|
|
||||||
const canDelete = computed(() => useAcl().hasAcl('Travel', '*', 'WRITE'));
|
const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
|
||||||
|
|
||||||
const openDeleteEntryDialog = (id) => {
|
const openDeleteEntryDialog = (id) => {
|
||||||
quasar
|
quasar
|
||||||
|
|
|
||||||
|
|
@ -505,6 +505,7 @@ watch(route, () => {
|
||||||
:props="props"
|
:props="props"
|
||||||
@click="stopEventPropagation($event, col)"
|
@click="stopEventPropagation($event, col)"
|
||||||
:style="col.style"
|
:style="col.style"
|
||||||
|
style="padding-left: 5px"
|
||||||
>
|
>
|
||||||
<component
|
<component
|
||||||
:is="tableColumnComponents[col.name].component"
|
:is="tableColumnComponents[col.name].component"
|
||||||
|
|
@ -580,20 +581,19 @@ watch(route, () => {
|
||||||
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
|
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
|
||||||
<EntryDescriptorProxy :id="entry.id" />
|
<EntryDescriptorProxy :id="entry.id" />
|
||||||
</QTd>
|
</QTd>
|
||||||
<QTd :colspan="2">
|
<QTd>
|
||||||
<div style="display: flex">
|
<QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
|
||||||
<span class="link">
|
|
||||||
{{ entry.supplierName }}
|
|
||||||
<SupplierDescriptorProxy :id="entry.supplierFk" />
|
<SupplierDescriptorProxy :id="entry.supplierFk" />
|
||||||
</span>
|
</QTd>
|
||||||
|
<QTd class="text-center">
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="entry.isCustomInspectionRequired"
|
v-if="entry.isCustomInspectionRequired"
|
||||||
name="warning"
|
name="warning"
|
||||||
color="negative"
|
color="negative"
|
||||||
size="md"
|
size="md"
|
||||||
:title="t('extraCommunity.requiresInspection')"
|
:title="t('extraCommunity.requiresInspection')"
|
||||||
/>
|
>
|
||||||
</div>
|
</QIcon>
|
||||||
</QTd>
|
</QTd>
|
||||||
<QTd class="text-right">
|
<QTd class="text-right">
|
||||||
<span>{{ toCurrency(entry.invoiceAmount) }}</span>
|
<span>{{ toCurrency(entry.invoiceAmount) }}</span>
|
||||||
|
|
@ -639,7 +639,9 @@ watch(route, () => {
|
||||||
&:nth-child(1) {
|
&:nth-child(1) {
|
||||||
max-width: 65px;
|
max-width: 65px;
|
||||||
}
|
}
|
||||||
padding: 0 5px 0;
|
&:nth-child(4) {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
thead > tr > th {
|
thead > tr > th {
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import WagonCreate from 'pages/Wagon/WagonCreate.vue';
|
import WagonCreate from 'pages/Wagon/WagonCreate.vue';
|
||||||
|
|
||||||
describe('WagonCreate', () => {
|
describe('WagonCreate', () => {
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,9 @@ const router = useRouter();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const acl = useAcl();
|
const acl = useAcl();
|
||||||
const canSeeNotes = computed(() => acl.hasAcl('Worker', '__get__business', 'READ'));
|
const canSeeNotes = computed(() =>
|
||||||
|
acl.hasAny([{ model: 'Worker', props: '__get__business', accessType: 'READ' }]),
|
||||||
|
);
|
||||||
const workerIsFreelance = ref();
|
const workerIsFreelance = ref();
|
||||||
const WorkerFreelanceRef = ref();
|
const WorkerFreelanceRef = ref();
|
||||||
const workerCalendarFilterRef = ref(null);
|
const workerCalendarFilterRef = ref(null);
|
||||||
|
|
|
||||||
|
|
@ -166,7 +166,9 @@ const yearList = ref(generateYears());
|
||||||
}}
|
}}
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
</div>
|
</div>
|
||||||
<div dense class="column q-gutter-y-sm q-px-md">
|
<QList dense class="list q-gutter-y-sm q-my-lg">
|
||||||
|
<QItem>
|
||||||
|
<QItemSection>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Year')"
|
:label="t('Year')"
|
||||||
v-model="selectedYear"
|
v-model="selectedYear"
|
||||||
|
|
@ -176,6 +178,8 @@ const yearList = ref(generateYears());
|
||||||
use-input
|
use-input
|
||||||
:is-clearable="false"
|
:is-clearable="false"
|
||||||
/>
|
/>
|
||||||
|
</QItemSection>
|
||||||
|
<QItemSection>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Contract')"
|
:label="t('Contract')"
|
||||||
v-model="selectedBusinessFk"
|
v-model="selectedBusinessFk"
|
||||||
|
|
@ -203,7 +207,9 @@ const yearList = ref(generateYears());
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
|
</QList>
|
||||||
<QList dense class="list q-gutter-y-xs q-my-md">
|
<QList dense class="list q-gutter-y-xs q-my-md">
|
||||||
<QItem v-for="type in absenceTypeList" :key="type.id">
|
<QItem v-for="type in absenceTypeList" :key="type.id">
|
||||||
<WorkerEventLabel
|
<WorkerEventLabel
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
|
||||||
<template #body="{ entity }">
|
<template #body="{ entity }">
|
||||||
<VnLv :label="t('globals.user')" :value="entity.user?.name" />
|
<VnLv :label="t('globals.user')" :value="entity.user?.name" />
|
||||||
<VnLv
|
<VnLv
|
||||||
class="ellipsis"
|
class="ellipsis-text"
|
||||||
:label="t('globals.params.email')"
|
:label="t('globals.params.email')"
|
||||||
:value="entity.user?.emailUser?.email"
|
:value="entity.user?.emailUser?.email"
|
||||||
copy
|
copy
|
||||||
|
|
@ -128,13 +128,15 @@ const handlePhotoUpdated = (evt = false) => {
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
|
|
||||||
<VnLv :label="t('globals.phone')">
|
<VnLv :value="entity.phone">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('globals.phone') }}
|
||||||
<VnLinkPhone :phone-number="entity.phone" />
|
<VnLinkPhone :phone-number="entity.phone" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('worker.summary.sipExtension')">
|
<VnLv :value="entity?.sip?.extension">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('worker.summary.sipExtension') }}
|
||||||
<VnLinkPhone :phone-number="entity?.sip?.extension" />
|
<VnLinkPhone :phone-number="entity?.sip?.extension" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ const $props = defineProps({
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QPopupProxy data-cy="WorkerDescriptor">
|
<QPopupProxy>
|
||||||
<WorkerDescriptor
|
<WorkerDescriptor
|
||||||
v-if="$props.id"
|
v-if="$props.id"
|
||||||
:id="$props.id"
|
:id="$props.id"
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
|
||||||
const { hasAcl } = useAcl();
|
const { hasAny } = useAcl();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const fetchData = ref();
|
const fetchData = ref();
|
||||||
const originaLockerId = ref();
|
const originaLockerId = ref();
|
||||||
|
|
@ -58,7 +58,11 @@ const init = async (data) => {
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
hide-selected
|
hide-selected
|
||||||
:readonly="!hasAcl('Worker', '__get__locker', 'READ')"
|
:readonly="
|
||||||
|
!hasAny([
|
||||||
|
{ model: 'Worker', props: '__get__locker', accessType: 'READ' },
|
||||||
|
])
|
||||||
|
"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ const { notify } = useNotify();
|
||||||
const loadingDocuware = ref(true);
|
const loadingDocuware = ref(true);
|
||||||
const tableRef = ref();
|
const tableRef = ref();
|
||||||
const dialog = ref();
|
const dialog = ref();
|
||||||
const getAvailablePdaRef = ref();
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { openConfirmationModal } = useVnConfirm();
|
const { openConfirmationModal } = useVnConfirm();
|
||||||
const routeId = computed(() => route.params.id);
|
const routeId = computed(() => route.params.id);
|
||||||
|
|
@ -85,7 +84,6 @@ function reloadData() {
|
||||||
initialData.value.deviceProductionFk = null;
|
initialData.value.deviceProductionFk = null;
|
||||||
initialData.value.simFk = null;
|
initialData.value.simFk = null;
|
||||||
tableRef.value.reload();
|
tableRef.value.reload();
|
||||||
getAvailablePdaRef.value.fetch();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchDocuware() {
|
async function fetchDocuware() {
|
||||||
|
|
@ -104,8 +102,8 @@ async function fetchDocuware() {
|
||||||
Value: ['PDA'],
|
Value: ['PDA'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
DBName: 'OBSERVACIONES',
|
DBName: 'FILENAME',
|
||||||
Value: [row.deviceProductionFk],
|
Value: [`${row.deviceProductionFk}-pda`],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
@ -137,7 +135,6 @@ async function deallocatePDA(deviceProductionFk) {
|
||||||
);
|
);
|
||||||
delete tableRef.value.CrudModelRef.formData[index];
|
delete tableRef.value.CrudModelRef.formData[index];
|
||||||
notify(t('PDA deallocated'), 'positive');
|
notify(t('PDA deallocated'), 'positive');
|
||||||
await getAvailablePdaRef.value.fetch();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function isSigned(row) {
|
function isSigned(row) {
|
||||||
|
|
@ -147,7 +144,6 @@ function isSigned(row) {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<FetchData
|
||||||
ref="getAvailablePdaRef"
|
|
||||||
url="workers/getAvailablePda"
|
url="workers/getAvailablePda"
|
||||||
@on-fetch="(data) => (deviceProductions = data)"
|
@on-fetch="(data) => (deviceProductions = data)"
|
||||||
auto-load
|
auto-load
|
||||||
|
|
@ -238,7 +234,7 @@ function isSigned(row) {
|
||||||
data-cy="workerPda-download"
|
data-cy="workerPda-download"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ t('globals.downloadPdf') }}
|
{{ t('worker.pda.download') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -311,5 +307,4 @@ es:
|
||||||
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
|
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
|
||||||
Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
|
Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
|
||||||
Sign PDA: Firmar PDA
|
Sign PDA: Firmar PDA
|
||||||
PDF sended to signed: PDF enviado para firmar
|
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
||||||
|
|
@ -73,25 +73,28 @@ onBeforeMount(async () => {
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('worker.summary.phoneExtension')">
|
<VnLv :value="worker.mobileExtension">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('worker.summary.phoneExtension') }}
|
||||||
<VnLinkPhone :phone-number="worker.mobileExtension" />
|
<VnLinkPhone :phone-number="worker.mobileExtension" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('worker.summary.entPhone')">
|
<VnLv :value="worker.phone">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('worker.summary.entPhone') }}
|
||||||
<VnLinkPhone :phone-number="worker.phone" />
|
<VnLinkPhone :phone-number="worker.phone" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('worker.summary.personalPhone')">
|
<VnLv :value="advancedSummary?.client?.phone">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('worker.summary.personalPhone') }}
|
||||||
<VnLinkPhone
|
<VnLinkPhone
|
||||||
:phone-number="advancedSummary?.client?.phone"
|
:phone-number="advancedSummary?.client?.phone"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
</div>
|
</div>
|
||||||
<div class="vn-card-content" v-if="advancedSummary">
|
<div class="vn-card-content">
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('worker.summary.fiDueDate')"
|
:label="t('worker.summary.fiDueDate')"
|
||||||
:value="toDate(advancedSummary.fiDueDate)"
|
:value="toDate(advancedSummary.fiDueDate)"
|
||||||
|
|
@ -132,7 +135,6 @@ onBeforeMount(async () => {
|
||||||
<VnTitle :text="t('worker.summary.userData')" />
|
<VnTitle :text="t('worker.summary.userData')" />
|
||||||
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
|
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
|
||||||
<VnLv
|
<VnLv
|
||||||
class="ellipsis"
|
|
||||||
:label="t('globals.params.email')"
|
:label="t('globals.params.email')"
|
||||||
:value="worker.user?.emailUser?.email"
|
:value="worker.user?.emailUser?.email"
|
||||||
copy
|
copy
|
||||||
|
|
@ -145,8 +147,9 @@ onBeforeMount(async () => {
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('worker.summary.sipExtension')">
|
<VnLv :value="worker?.sip?.extension">
|
||||||
<template #value>
|
<template #label>
|
||||||
|
{{ t('worker.summary.sipExtension') }}
|
||||||
<VnLinkPhone :phone-number="worker?.sip?.extension" />
|
<VnLinkPhone :phone-number="worker?.sip?.extension" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue