Merge branch 'master' into Hotfix-OpenFilesInsteadOfDownloading
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit
Details
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit
Details
This commit is contained in:
commit
1f716f104b
|
@ -26,7 +26,7 @@ if (branchName) {
|
||||||
const splitedMsg = msg.split(':');
|
const splitedMsg = msg.split(':');
|
||||||
|
|
||||||
if (splitedMsg.length > 1) {
|
if (splitedMsg.length > 1) {
|
||||||
const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
|
const finalMsg = `${splitedMsg[0]}: ${referenceTag}${splitedMsg.slice(1).join(':')}`;
|
||||||
writeFileSync(msgPath, finalMsg);
|
writeFileSync(msgPath, finalMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,7 +108,6 @@ pipeline {
|
||||||
}
|
}
|
||||||
stage('E2E') {
|
stage('E2E') {
|
||||||
environment {
|
environment {
|
||||||
CREDS = credentials('docker-registry')
|
|
||||||
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
|
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
|
||||||
COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
|
COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
|
||||||
}
|
}
|
||||||
|
@ -118,23 +117,24 @@ pipeline {
|
||||||
sh 'rm -rf test/cypress/screenshots'
|
sh 'rm -rf test/cypress/screenshots'
|
||||||
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
|
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
|
||||||
|
|
||||||
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
def modules = sh(
|
||||||
|
script: "node test/cypress/docker/find/find.js ${env.COMPOSE_TAG}",
|
||||||
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
|
returnStdout: true
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} pull back"
|
).trim()
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
|
||||||
|
|
||||||
def modules = sh(script: "node test/cypress/docker/find/find.js ${env.COMPOSE_TAG}", returnStdout: true).trim()
|
|
||||||
echo "E2E MODULES: ${modules}"
|
echo "E2E MODULES: ${modules}"
|
||||||
|
|
||||||
|
script {
|
||||||
|
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
||||||
|
sh "docker compose ${env.COMPOSE_PARAMS} up -d"
|
||||||
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/docker/cypressParallel.sh 1 '${modules}'"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
|
sh "docker compose ${env.COMPOSE_PARAMS} down -v"
|
||||||
archiveArtifacts artifacts: 'test/cypress/screenshots/**/*', allowEmptyArchive: true
|
archiveArtifacts artifacts: 'test/cypress/screenshots/**/*', allowEmptyArchive: true
|
||||||
junit(
|
junit(
|
||||||
testResults: 'junit/e2e-*.xml',
|
testResults: 'junit/e2e-*.xml',
|
||||||
|
@ -153,17 +153,8 @@ pipeline {
|
||||||
VERSION = readFile 'VERSION.txt'
|
VERSION = readFile 'VERSION.txt'
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
script {
|
|
||||||
sh 'quasar build'
|
sh 'quasar build'
|
||||||
|
dockerBuild 'salix-frontend', '.'
|
||||||
def baseImage = "salix-frontend:${env.VERSION}"
|
|
||||||
def image = docker.build(baseImage, ".")
|
|
||||||
docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
|
|
||||||
image.push()
|
|
||||||
image.push(env.BRANCH_NAME)
|
|
||||||
if (IS_LATEST) image.push('latest')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('Deploy') {
|
stage('Deploy') {
|
||||||
|
@ -186,3 +177,53 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def dockerBuild(imageName, context, dockerfile = null) {
|
||||||
|
if (dockerfile == null)
|
||||||
|
dockerfile = "${context}/Dockerfile"
|
||||||
|
|
||||||
|
def certDir = '/home/jenkins/.buildkit/certs'
|
||||||
|
def buildxArgs = [
|
||||||
|
"--name=buildkitd",
|
||||||
|
"--driver=remote",
|
||||||
|
"--driver-opt="
|
||||||
|
+ "cacert=${certDir}/ca.pem,"
|
||||||
|
+ "cert=${certDir}/cert.pem,"
|
||||||
|
+ "key=${certDir}/key.pem,"
|
||||||
|
+ "servername=buildkitd",
|
||||||
|
"tcp://buildkitd:1234"
|
||||||
|
]
|
||||||
|
|
||||||
|
def cacheImage = "${env.REGISTRY_CACHE}/${imageName}"
|
||||||
|
def pushImage = "${env.REGISTRY}/${imageName}"
|
||||||
|
def baseImage = "${pushImage}:${env.VERSION}"
|
||||||
|
|
||||||
|
def buildArgs = [
|
||||||
|
context,
|
||||||
|
"--push",
|
||||||
|
"--builder=buildkitd",
|
||||||
|
"--file=${dockerfile}",
|
||||||
|
"--cache-from=type=registry,ref=${cacheImage}:cache-${env.BRANCH_NAME}",
|
||||||
|
"--cache-from=type=registry,ref=${cacheImage}:cache-dev",
|
||||||
|
"--cache-to=type=registry,ref=${cacheImage}:cache-${env.BRANCH_NAME},mode=max",
|
||||||
|
"--tag=${pushImage}:${env.BRANCH_NAME}"
|
||||||
|
]
|
||||||
|
|
||||||
|
def isLatest = ['master', 'main'].contains(env.BRANCH_NAME)
|
||||||
|
if (isLatest)
|
||||||
|
buildArgs.push("--tag=${pushImage}:latest")
|
||||||
|
|
||||||
|
// FIXME: Nested docker.withRegistry() does not work
|
||||||
|
// https://issues.jenkins.io/browse/JENKINS-59777
|
||||||
|
withCredentials([usernamePassword(
|
||||||
|
credentialsId: 'registry-cache',
|
||||||
|
usernameVariable: 'CACHE_USR',
|
||||||
|
passwordVariable: 'CACHE_PSW')
|
||||||
|
]) {
|
||||||
|
docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
|
||||||
|
sh 'echo "$CACHE_PSW" | docker login --username "$CACHE_USR" --password-stdin "http://$REGISTRY_CACHE"'
|
||||||
|
sh "docker buildx create ${buildxArgs.join(' ')}"
|
||||||
|
docker.build(baseImage, buildArgs.join(' '))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
import { defineConfig } from 'cypress';
|
import { defineConfig } from 'cypress';
|
||||||
|
|
||||||
let urlHost, reporter, reporterOptions, timeouts;
|
let urlHost;
|
||||||
|
let reporter;
|
||||||
|
let reporterOptions;
|
||||||
|
let timeouts;
|
||||||
|
|
||||||
if (process.env.CI) {
|
if (process.env.CI) {
|
||||||
urlHost = 'front';
|
urlHost = 'front';
|
||||||
|
@ -44,6 +47,7 @@ export default defineConfig({
|
||||||
supportFile: 'test/cypress/support/index.js',
|
supportFile: 'test/cypress/support/index.js',
|
||||||
videosFolder: 'test/cypress/videos',
|
videosFolder: 'test/cypress/videos',
|
||||||
downloadsFolder: 'test/cypress/downloads',
|
downloadsFolder: 'test/cypress/downloads',
|
||||||
|
tmpUploadFolder: 'test/cypress/storage/tmp/dms',
|
||||||
video: false,
|
video: false,
|
||||||
specPattern: 'test/cypress/integration/**/*.spec.js',
|
specPattern: 'test/cypress/integration/**/*.spec.js',
|
||||||
experimentalRunAllSpecs: true,
|
experimentalRunAllSpecs: true,
|
||||||
|
@ -60,5 +64,6 @@ export default defineConfig({
|
||||||
...timeouts,
|
...timeouts,
|
||||||
includeShadowDom: true,
|
includeShadowDom: true,
|
||||||
waitForAnimations: true,
|
waitForAnimations: true,
|
||||||
|
testIsolation: false,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title><%= productName %></title>
|
<title><%= productName %></title>
|
||||||
|
@ -12,7 +12,12 @@
|
||||||
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
|
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png" />
|
<link
|
||||||
|
rel="icon"
|
||||||
|
type="image/png"
|
||||||
|
sizes="128x128"
|
||||||
|
href="icons/favicon-128x128.png"
|
||||||
|
/>
|
||||||
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
|
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
|
||||||
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
|
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
|
||||||
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
|
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.16.0",
|
"version": "25.18.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
/* eslint-disable */
|
|
||||||
// https://github.com/michael-ciniawsky/postcss-load-config
|
// https://github.com/michael-ciniawsky/postcss-load-config
|
||||||
|
|
||||||
import autoprefixer from 'autoprefixer';
|
import autoprefixer from 'autoprefixer';
|
||||||
|
|
|
@ -13,7 +13,7 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
|
const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
|
||||||
|
|
||||||
export default configure(function (/* ctx */) {
|
export default configure((/* ctx */) => {
|
||||||
return {
|
return {
|
||||||
eslint: {
|
eslint: {
|
||||||
// fix: true,
|
// fix: true,
|
||||||
|
|
|
@ -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
|
|
||||||
};
|
|
|
@ -1,8 +1,6 @@
|
||||||
{
|
{
|
||||||
"@quasar/testing-unit-vitest": {
|
"@quasar/testing-unit-vitest": {
|
||||||
"options": [
|
"options": ["scripts"]
|
||||||
"scripts"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"@quasar/qcalendar": {}
|
"@quasar/qcalendar": {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
import { onMounted } from 'vue';
|
import { onMounted } from 'vue';
|
||||||
import { useQuasar, Dark } from 'quasar';
|
import { useQuasar, Dark } from 'quasar';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import VnScroll from './components/common/VnScroll.vue';
|
||||||
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const { availableLocales, locale, fallbackLocale } = useI18n();
|
const { availableLocales, locale, fallbackLocale } = useI18n();
|
||||||
|
@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<RouterView />
|
<RouterView />
|
||||||
|
<VnScroll />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
|
@ -67,7 +67,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
expect(result).rejects.toEqual(expect.objectContaining(error));
|
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should call to the Notify plugin with a message from the response property', async () => {
|
it('should call to the Notify plugin with a message from the response property', async () => {
|
||||||
|
@ -83,7 +83,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
expect(result).rejects.toEqual(expect.objectContaining(error));
|
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -11,8 +11,8 @@ export default function (component, key, value) {
|
||||||
};
|
};
|
||||||
break;
|
break;
|
||||||
case 'undefined':
|
case 'undefined':
|
||||||
throw new Error('unknown prop: ' + key);
|
throw new Error(`unknown prop: ${key}`);
|
||||||
default:
|
default:
|
||||||
throw new Error('unhandled type: ' + typeof prop);
|
throw new Error(`unhandled type: ${typeof prop}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ export default {
|
||||||
const keyBindingMap = routes
|
const keyBindingMap = routes
|
||||||
.filter((route) => route.meta.keyBinding)
|
.filter((route) => route.meta.keyBinding)
|
||||||
.reduce((map, route) => {
|
.reduce((map, route) => {
|
||||||
map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
|
map[`Key${route.meta.keyBinding.toUpperCase()}`] = route.path;
|
||||||
return map;
|
return map;
|
||||||
}, {});
|
}, {});
|
||||||
|
|
||||||
|
|
|
@ -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';
|
||||||
|
|
|
@ -7,7 +7,7 @@ import { QLayout } from 'quasar';
|
||||||
import mainShortcutMixin from './mainShortcutMixin';
|
import mainShortcutMixin from './mainShortcutMixin';
|
||||||
import { useCau } from 'src/composables/useCau';
|
import { useCau } from 'src/composables/useCau';
|
||||||
|
|
||||||
export default boot(({ app }) => {
|
export default boot(({ app, router }) => {
|
||||||
QForm.mixins = [qFormMixin];
|
QForm.mixins = [qFormMixin];
|
||||||
QLayout.mixins = [mainShortcutMixin];
|
QLayout.mixins = [mainShortcutMixin];
|
||||||
|
|
||||||
|
@ -22,14 +22,19 @@ export default boot(({ app }) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (response?.status) {
|
switch (response?.status) {
|
||||||
|
case 401:
|
||||||
|
if (!router.currentRoute.value.name.toLowerCase().includes('login')) {
|
||||||
|
message = 'errors.sessionExpired';
|
||||||
|
} else message = 'login.loginError';
|
||||||
|
break;
|
||||||
|
case 403:
|
||||||
|
if (!message || message.toLowerCase() === 'access denied')
|
||||||
|
message = 'errors.accessDenied';
|
||||||
case 422:
|
case 422:
|
||||||
if (error.name == 'ValidationError')
|
if (error.name == 'ValidationError')
|
||||||
message +=
|
message += ` "${responseError.details.context}.${Object.keys(
|
||||||
' "' +
|
responseError.details.codes,
|
||||||
responseError.details.context +
|
).join(',')}"`;
|
||||||
'.' +
|
|
||||||
Object.keys(responseError.details.codes).join(',') +
|
|
||||||
'"';
|
|
||||||
break;
|
break;
|
||||||
case 500:
|
case 500:
|
||||||
message = 'errors.statusInternalServerError';
|
message = 'errors.statusInternalServerError';
|
||||||
|
|
|
@ -20,7 +20,6 @@ const postcodeFormData = reactive({
|
||||||
provinceFk: null,
|
provinceFk: null,
|
||||||
townFk: null,
|
townFk: null,
|
||||||
});
|
});
|
||||||
const townFilter = ref({});
|
|
||||||
|
|
||||||
const countriesRef = ref(false);
|
const countriesRef = ref(false);
|
||||||
const provincesOptions = ref([]);
|
const provincesOptions = ref([]);
|
||||||
|
@ -33,11 +32,11 @@ function onDataSaved(formData) {
|
||||||
newPostcode.town = town.value.name;
|
newPostcode.town = town.value.name;
|
||||||
newPostcode.townFk = town.value.id;
|
newPostcode.townFk = town.value.id;
|
||||||
const provinceObject = provincesOptions.value.find(
|
const provinceObject = provincesOptions.value.find(
|
||||||
({ id }) => id === formData.provinceFk
|
({ id }) => id === formData.provinceFk,
|
||||||
);
|
);
|
||||||
newPostcode.province = provinceObject?.name;
|
newPostcode.province = provinceObject?.name;
|
||||||
const countryObject = countriesRef.value.opts.find(
|
const countryObject = countriesRef.value.opts.find(
|
||||||
({ id }) => id === formData.countryFk
|
({ id }) => id === formData.countryFk,
|
||||||
);
|
);
|
||||||
newPostcode.country = countryObject?.name;
|
newPostcode.country = countryObject?.name;
|
||||||
emit('onDataSaved', newPostcode);
|
emit('onDataSaved', newPostcode);
|
||||||
|
@ -67,21 +66,11 @@ function setTown(newTown, data) {
|
||||||
}
|
}
|
||||||
async function onCityCreated(newTown, formData) {
|
async function onCityCreated(newTown, formData) {
|
||||||
newTown.province = provincesOptions.value.find(
|
newTown.province = provincesOptions.value.find(
|
||||||
(province) => province.id === newTown.provinceFk
|
(province) => province.id === newTown.provinceFk,
|
||||||
);
|
);
|
||||||
formData.townFk = newTown;
|
formData.townFk = newTown;
|
||||||
setTown(newTown, formData);
|
setTown(newTown, formData);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function filterTowns(name) {
|
|
||||||
if (name !== '') {
|
|
||||||
townFilter.value.where = {
|
|
||||||
name: {
|
|
||||||
like: `%${name}%`,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -107,7 +96,6 @@ async function filterTowns(name) {
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
@update:model-value="(value) => setTown(value, data)"
|
@update:model-value="(value) => setTown(value, data)"
|
||||||
@filter="filterTowns"
|
|
||||||
:tooltip="t('Create city')"
|
:tooltip="t('Create city')"
|
||||||
v-model="data.townFk"
|
v-model="data.townFk"
|
||||||
url="Towns/location"
|
url="Towns/location"
|
||||||
|
|
|
@ -25,7 +25,7 @@ const autonomiesRef = ref([]);
|
||||||
|
|
||||||
const onDataSaved = (dataSaved, requestResponse) => {
|
const onDataSaved = (dataSaved, requestResponse) => {
|
||||||
requestResponse.autonomy = autonomiesRef.value.opts.find(
|
requestResponse.autonomy = autonomiesRef.value.opts.find(
|
||||||
(autonomy) => autonomy.id == requestResponse.autonomyFk
|
(autonomy) => autonomy.id == requestResponse.autonomyFk,
|
||||||
);
|
);
|
||||||
emit('onDataSaved', dataSaved, requestResponse);
|
emit('onDataSaved', dataSaved, requestResponse);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { computed, ref, useAttrs, watch } from 'vue';
|
import { computed, ref, useAttrs, watch, nextTick } from 'vue';
|
||||||
import { useRouter, onBeforeRouteLeave } from 'vue-router';
|
import { useRouter, onBeforeRouteLeave } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
@ -42,7 +42,15 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
dataRequired: {
|
dataRequired: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => {},
|
default: () => ({}),
|
||||||
|
},
|
||||||
|
dataDefault: {
|
||||||
|
type: Object,
|
||||||
|
default: () => ({}),
|
||||||
|
},
|
||||||
|
insertOnLoad: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
},
|
},
|
||||||
defaultSave: {
|
defaultSave: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
@ -65,7 +73,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
beforeSaveFn: {
|
beforeSaveFn: {
|
||||||
type: Function,
|
type: [String, Function],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
goTo: {
|
goTo: {
|
||||||
|
@ -87,6 +95,7 @@ const formData = ref();
|
||||||
const saveButtonRef = ref(null);
|
const saveButtonRef = ref(null);
|
||||||
const watchChanges = ref();
|
const watchChanges = ref();
|
||||||
const formUrl = computed(() => $props.url);
|
const formUrl = computed(() => $props.url);
|
||||||
|
const rowsContainer = ref(null);
|
||||||
|
|
||||||
const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
|
const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
|
||||||
|
|
||||||
|
@ -122,9 +131,11 @@ async function fetch(data) {
|
||||||
const rows = keyData ? data[keyData] : data;
|
const rows = keyData ? data[keyData] : data;
|
||||||
resetData(rows);
|
resetData(rows);
|
||||||
emit('onFetch', rows);
|
emit('onFetch', rows);
|
||||||
|
$props.insertOnLoad && await insert();
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function resetData(data) {
|
function resetData(data) {
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
if (data && Array.isArray(data)) {
|
if (data && Array.isArray(data)) {
|
||||||
|
@ -135,9 +146,16 @@ function resetData(data) {
|
||||||
formData.value = JSON.parse(JSON.stringify(data));
|
formData.value = JSON.parse(JSON.stringify(data));
|
||||||
|
|
||||||
if (watchChanges.value) watchChanges.value(); //destroy watcher
|
if (watchChanges.value) watchChanges.value(); //destroy watcher
|
||||||
watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
|
watchChanges.value = watch(formData, (nVal) => {
|
||||||
}
|
hasChanges.value = false;
|
||||||
|
const filteredNewData = nVal.filter(row => !isRowEmpty(row) || row[$props.primaryKey]);
|
||||||
|
const filteredOriginal = originalData.value.filter(row => row[$props.primaryKey]);
|
||||||
|
|
||||||
|
const changes = getDifferences(filteredOriginal, filteredNewData);
|
||||||
|
hasChanges.value = !isEmpty(changes);
|
||||||
|
|
||||||
|
}, { deep: true });
|
||||||
|
}
|
||||||
async function reset() {
|
async function reset() {
|
||||||
await fetch(originalData.value);
|
await fetch(originalData.value);
|
||||||
hasChanges.value = false;
|
hasChanges.value = false;
|
||||||
|
@ -165,7 +183,9 @@ async function onSubmit() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
|
|
||||||
await saveChanges($props.saveFn ? formData.value : null);
|
await saveChanges($props.saveFn ? formData.value : null);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function onSubmitAndGo() {
|
async function onSubmitAndGo() {
|
||||||
|
@ -174,6 +194,10 @@ async function onSubmitAndGo() {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function saveChanges(data) {
|
async function saveChanges(data) {
|
||||||
|
formData.value = formData.value.filter(row =>
|
||||||
|
row[$props.primaryKey] || !isRowEmpty(row)
|
||||||
|
);
|
||||||
|
|
||||||
if ($props.saveFn) {
|
if ($props.saveFn) {
|
||||||
$props.saveFn(data, getChanges);
|
$props.saveFn(data, getChanges);
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
|
@ -203,14 +227,32 @@ async function saveChanges(data) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function insert(pushData = $props.dataRequired) {
|
async function insert(pushData = { ...$props.dataRequired, ...$props.dataDefault }) {
|
||||||
const $index = formData.value.length
|
formData.value = formData.value.filter(row => !isRowEmpty(row));
|
||||||
? formData.value[formData.value.length - 1].$index + 1
|
|
||||||
: 0;
|
const lastRow = formData.value.at(-1);
|
||||||
formData.value.push(Object.assign({ $index }, pushData));
|
const isLastRowEmpty = lastRow ? isRowEmpty(lastRow) : false;
|
||||||
hasChanges.value = true;
|
|
||||||
|
if (formData.value.length && isLastRowEmpty) return;
|
||||||
|
const $index = formData.value.length ? formData.value.at(-1).$index + 1 : 0;
|
||||||
|
|
||||||
|
const nRow = Object.assign({ $index }, pushData);
|
||||||
|
formData.value.push(nRow);
|
||||||
|
|
||||||
|
const hasChange = Object.keys(nRow).some(key => !isChange(nRow, key));
|
||||||
|
if (hasChange) hasChanges.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isRowEmpty(row) {
|
||||||
|
return Object.keys(row).every(key => isChange(row, key));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function isChange(row,key){
|
||||||
|
return !row[key] || key == '$index' || Object.hasOwn($props.dataRequired || {}, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
async function remove(data) {
|
async function remove(data) {
|
||||||
if (!data.length)
|
if (!data.length)
|
||||||
return quasar.notify({
|
return quasar.notify({
|
||||||
|
@ -227,10 +269,8 @@ async function remove(data) {
|
||||||
newData = newData.filter(
|
newData = newData.filter(
|
||||||
(form) => !preRemove.some((index) => index == form.$index),
|
(form) => !preRemove.some((index) => index == form.$index),
|
||||||
);
|
);
|
||||||
const changes = getChanges();
|
formData.value = newData;
|
||||||
if (!changes.creates?.length && !changes.updates?.length)
|
hasChanges.value = JSON.stringify(removeIndexField(formData.value)) !== JSON.stringify(removeIndexField(originalData.value));
|
||||||
hasChanges.value = false;
|
|
||||||
fetch(newData);
|
|
||||||
}
|
}
|
||||||
if (ids.length) {
|
if (ids.length) {
|
||||||
quasar
|
quasar
|
||||||
|
@ -248,9 +288,8 @@ async function remove(data) {
|
||||||
newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
|
newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
|
||||||
fetch(newData);
|
fetch(newData);
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
reset();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
emit('update:selected', []);
|
emit('update:selected', []);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -261,7 +300,7 @@ function getChanges() {
|
||||||
const pk = $props.primaryKey;
|
const pk = $props.primaryKey;
|
||||||
for (const [i, row] of formData.value.entries()) {
|
for (const [i, row] of formData.value.entries()) {
|
||||||
if (!row[pk]) {
|
if (!row[pk]) {
|
||||||
creates.push(row);
|
creates.push(Object.assign(row, { ...$props.dataRequired }));
|
||||||
} else if (originalData.value[i]) {
|
} else if (originalData.value[i]) {
|
||||||
const data = getDifferences(originalData.value[i], row);
|
const data = getDifferences(originalData.value[i], row);
|
||||||
if (!isEmpty(data)) {
|
if (!isEmpty(data)) {
|
||||||
|
@ -287,6 +326,33 @@ function isEmpty(obj) {
|
||||||
return !Object.keys(obj).length;
|
return !Object.keys(obj).length;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function removeIndexField(data) {
|
||||||
|
if (Array.isArray(data)) {
|
||||||
|
return data.map(({ $index, ...rest }) => rest);
|
||||||
|
} else if (typeof data === 'object' && data !== null) {
|
||||||
|
const { $index, ...rest } = data;
|
||||||
|
return rest;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleTab(event) {
|
||||||
|
event.preventDefault();
|
||||||
|
const { shiftKey, target } = event;
|
||||||
|
const focusableSelector = `tbody tr td:not(:first-child) :is(a, button, input, textarea, select, details):not([disabled])`;
|
||||||
|
const focusableElements = rowsContainer.value?.querySelectorAll(focusableSelector);
|
||||||
|
const currentIndex = Array.prototype.indexOf.call(focusableElements, target);
|
||||||
|
const index = shiftKey ? currentIndex - 1 : currentIndex + 1;
|
||||||
|
const isLast = target === focusableElements[focusableElements.length - 1];
|
||||||
|
const isFirst = currentIndex === 0;
|
||||||
|
|
||||||
|
if ((shiftKey && !isFirst) || (!shiftKey && !isLast))
|
||||||
|
focusableElements[index]?.focus();
|
||||||
|
else if (isLast) {
|
||||||
|
await insert();
|
||||||
|
await nextTick();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function reload(params) {
|
async function reload(params) {
|
||||||
const data = await vnPaginateRef.value.fetch(params);
|
const data = await vnPaginateRef.value.fetch(params);
|
||||||
fetch(data);
|
fetch(data);
|
||||||
|
@ -312,12 +378,14 @@ watch(formUrl, async () => {
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
>
|
>
|
||||||
<template #body v-if="formData">
|
<template #body v-if="formData">
|
||||||
|
<div ref="rowsContainer" @keydown.tab="handleTab">
|
||||||
<slot
|
<slot
|
||||||
name="body"
|
name="body"
|
||||||
:rows="formData"
|
:rows="formData"
|
||||||
:validate="validate"
|
:validate="validate"
|
||||||
:filter="filter"
|
:filter="filter"
|
||||||
></slot>
|
></slot>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</VnPaginate>
|
</VnPaginate>
|
||||||
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
|
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
|
||||||
|
@ -347,8 +415,16 @@ watch(formUrl, async () => {
|
||||||
<QBtnDropdown
|
<QBtnDropdown
|
||||||
v-if="$props.goTo && $props.defaultSave"
|
v-if="$props.goTo && $props.defaultSave"
|
||||||
@click="onSubmitAndGo"
|
@click="onSubmitAndGo"
|
||||||
:label="tMobile('globals.saveAndContinue')"
|
:label="
|
||||||
:title="t('globals.saveAndContinue')"
|
tMobile('globals.saveAndContinue') +
|
||||||
|
' ' +
|
||||||
|
t('globals.' + $props.goTo.split('/').pop())
|
||||||
|
"
|
||||||
|
:title="
|
||||||
|
t('globals.saveAndContinue') +
|
||||||
|
' ' +
|
||||||
|
t('globals.' + $props.goTo.split('/').pop())
|
||||||
|
"
|
||||||
:disable="!hasChanges"
|
:disable="!hasChanges"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
|
|
@ -0,0 +1,154 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, computed } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { date } from 'quasar';
|
||||||
|
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
|
||||||
|
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
|
||||||
|
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
|
||||||
|
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||||
|
import useWeekdaysOrder from 'src/composables/getWeekdays';
|
||||||
|
|
||||||
|
const formatDate = (dateToFormat, format = 'YYYY-MM-DD') =>
|
||||||
|
date.formatDate(dateToFormat, format);
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
year: {
|
||||||
|
type: Number,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
month: {
|
||||||
|
type: Number,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
monthDate: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
daysMap: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const emit = defineEmits(['onDateSelected']);
|
||||||
|
|
||||||
|
const { locale } = useI18n();
|
||||||
|
const weekdayStore = useWeekdayStore();
|
||||||
|
const weekDays = useWeekdaysOrder();
|
||||||
|
const calendarRef = ref(null);
|
||||||
|
const today = ref(formatDate(Date.vnNew()));
|
||||||
|
const todayTimestamp = computed(() => {
|
||||||
|
const date = Date.vnNew();
|
||||||
|
date.setHours(0, 0, 0, 0);
|
||||||
|
return date.getTime();
|
||||||
|
});
|
||||||
|
const _monthDate = computed(() => formatDate(props.monthDate));
|
||||||
|
|
||||||
|
const calendarHeaderTitle = computed(() => {
|
||||||
|
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
|
||||||
|
});
|
||||||
|
|
||||||
|
const isToday = (timestamp) => {
|
||||||
|
const { year, month, day } = timestamp;
|
||||||
|
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
|
||||||
|
};
|
||||||
|
|
||||||
|
const getEventByTimestamp = ({ year, month, day }) => {
|
||||||
|
const stamp = new Date(year, month - 1, day).getTime();
|
||||||
|
return props.daysMap?.[stamp] || null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDateClick = (timestamp) => {
|
||||||
|
const event = getEventByTimestamp(timestamp);
|
||||||
|
const { year, month, day } = timestamp;
|
||||||
|
const date = new Date(year, month - 1, day);
|
||||||
|
emit('onDateSelected', {
|
||||||
|
date,
|
||||||
|
isNewMode: !event,
|
||||||
|
event: event?.[0] || null,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const getEventAttrs = (timestamp) => {
|
||||||
|
return {
|
||||||
|
class: '--event',
|
||||||
|
label: timestamp.day,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
defineExpose({ getEventByTimestamp, handleDateClick });
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QCalendarMonthWrapper
|
||||||
|
style="height: 290px; width: 290px"
|
||||||
|
transparent-background
|
||||||
|
view-customization="workerCalendar"
|
||||||
|
>
|
||||||
|
<template #header>
|
||||||
|
<span class="full-width text-center text-body1 q-py-sm">{{
|
||||||
|
calendarHeaderTitle
|
||||||
|
}}</span>
|
||||||
|
</template>
|
||||||
|
<template #calendar>
|
||||||
|
<QCalendarMonth
|
||||||
|
ref="calendarRef"
|
||||||
|
:model-value="_monthDate"
|
||||||
|
show-work-weeks
|
||||||
|
no-outside-days
|
||||||
|
no-active-date
|
||||||
|
:weekdays="weekDays"
|
||||||
|
short-weekday-label
|
||||||
|
:locale="locale"
|
||||||
|
:now="today"
|
||||||
|
@click-date="handleDateClick($event.scope.timestamp)"
|
||||||
|
mini-mode
|
||||||
|
>
|
||||||
|
<template #day="{ scope: { timestamp } }">
|
||||||
|
<slot
|
||||||
|
name="day"
|
||||||
|
:timestamp="timestamp"
|
||||||
|
:getEventAttrs="getEventAttrs"
|
||||||
|
>
|
||||||
|
<QBtn
|
||||||
|
v-if="getEventByTimestamp(timestamp)"
|
||||||
|
v-bind="{ ...getEventAttrs(timestamp) }"
|
||||||
|
@click="handleDateClick(timestamp)"
|
||||||
|
rounded
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
class="calendar-event"
|
||||||
|
:class="{ '--today': isToday(timestamp) }"
|
||||||
|
/>
|
||||||
|
</slot>
|
||||||
|
</template>
|
||||||
|
</QCalendarMonth>
|
||||||
|
</template>
|
||||||
|
</QCalendarMonthWrapper>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
.calendar-event {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.715em;
|
||||||
|
cursor: pointer;
|
||||||
|
color: white;
|
||||||
|
|
||||||
|
&.--today {
|
||||||
|
border: 2px solid $info;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.--event {
|
||||||
|
background-color: $positive;
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -0,0 +1,126 @@
|
||||||
|
<script setup>
|
||||||
|
import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
|
||||||
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
||||||
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
dataKey: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
calendarComponent: {
|
||||||
|
type: Object,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
additionalProps: {
|
||||||
|
type: Object,
|
||||||
|
default: () => ({}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const stateStore = useStateStore();
|
||||||
|
const weekdayStore = useWeekdayStore();
|
||||||
|
const nMonths = ref(4);
|
||||||
|
const _date = ref(Date.vnNew());
|
||||||
|
const firstDay = ref(Date.vnNew());
|
||||||
|
const lastDay = ref(Date.vnNew());
|
||||||
|
const months = ref([]);
|
||||||
|
const arrayData = useArrayData(props.dataKey);
|
||||||
|
onMounted(async () => {
|
||||||
|
const initialDate = Date.vnNew();
|
||||||
|
initialDate.setDate(1);
|
||||||
|
initialDate.setHours(0, 0, 0, 0);
|
||||||
|
date.value = initialDate;
|
||||||
|
await nextTick();
|
||||||
|
stateStore.rightDrawer = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => arrayData.destroy());
|
||||||
|
|
||||||
|
const emit = defineEmits([
|
||||||
|
'update:firstDay',
|
||||||
|
'update:lastDay',
|
||||||
|
'update:events',
|
||||||
|
'onDateSelected',
|
||||||
|
]);
|
||||||
|
|
||||||
|
const date = computed({
|
||||||
|
get: () => _date.value,
|
||||||
|
set: (value) => {
|
||||||
|
if (!(value instanceof Date)) return;
|
||||||
|
_date.value = value;
|
||||||
|
const stamp = value.getTime();
|
||||||
|
|
||||||
|
firstDay.value = new Date(stamp);
|
||||||
|
firstDay.value.setDate(1);
|
||||||
|
|
||||||
|
lastDay.value = new Date(stamp);
|
||||||
|
lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
|
||||||
|
lastDay.value.setDate(0);
|
||||||
|
|
||||||
|
months.value = [];
|
||||||
|
for (let i = 0; i < nMonths.value; i++) {
|
||||||
|
const monthDate = new Date(stamp);
|
||||||
|
monthDate.setMonth(value.getMonth() + i);
|
||||||
|
months.value.push(monthDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
emit('update:firstDay', firstDay.value);
|
||||||
|
emit('update:lastDay', lastDay.value);
|
||||||
|
emit('refresh-events');
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const headerTitle = computed(() => {
|
||||||
|
if (!months.value?.length) return '';
|
||||||
|
const getMonthName = (date) =>
|
||||||
|
`${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
|
||||||
|
return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
|
||||||
|
});
|
||||||
|
|
||||||
|
const step = (direction) => {
|
||||||
|
const newDate = new Date(date.value);
|
||||||
|
newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
|
||||||
|
date.value = newDate;
|
||||||
|
};
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
firstDay,
|
||||||
|
lastDay,
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QCard style="height: max-content">
|
||||||
|
<div class="calendars-header">
|
||||||
|
<QBtn
|
||||||
|
icon="arrow_left"
|
||||||
|
size="sm"
|
||||||
|
flat
|
||||||
|
class="full-height"
|
||||||
|
@click="step(-1)"
|
||||||
|
/>
|
||||||
|
<span>{{ headerTitle }}</span>
|
||||||
|
<QBtn
|
||||||
|
icon="arrow_right"
|
||||||
|
size="sm"
|
||||||
|
flat
|
||||||
|
class="full-height"
|
||||||
|
@click="step(1)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="calendars-container">
|
||||||
|
<component
|
||||||
|
:is="calendarComponent"
|
||||||
|
v-for="(month, index) in months"
|
||||||
|
:key="index"
|
||||||
|
:month="month.getMonth() + 1"
|
||||||
|
:year="month.getFullYear()"
|
||||||
|
:month-date="month"
|
||||||
|
v-bind="additionalProps"
|
||||||
|
@on-date-selected="(data) => emit('onDateSelected', data)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</QCard>
|
||||||
|
</template>
|
|
@ -156,6 +156,9 @@ const selectTravel = ({ id }) => {
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="travelFilterParams.warehouseOutFk"
|
v-model="travelFilterParams.warehouseOutFk"
|
||||||
|
:where="{
|
||||||
|
isOrigin: true,
|
||||||
|
}"
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('globals.warehouseIn')"
|
:label="t('globals.warehouseIn')"
|
||||||
|
@ -164,6 +167,9 @@ const selectTravel = ({ id }) => {
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="travelFilterParams.warehouseInFk"
|
v-model="travelFilterParams.warehouseInFk"
|
||||||
|
:where="{
|
||||||
|
isDestiny: true,
|
||||||
|
}"
|
||||||
/>
|
/>
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
:label="t('globals.shipped')"
|
:label="t('globals.shipped')"
|
||||||
|
|
|
@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const myForm = ref(null);
|
const myForm = ref(null);
|
||||||
const attrs = useAttrs();
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
url: {
|
url: {
|
||||||
type: String,
|
type: String,
|
||||||
|
@ -99,8 +98,16 @@ const $props = defineProps({
|
||||||
type: Function,
|
type: Function,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
preventSubmit: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
customMethod: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const emit = defineEmits(['onFetch', 'onDataSaved']);
|
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
|
||||||
const modelValue = computed(
|
const modelValue = computed(
|
||||||
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
||||||
).value;
|
).value;
|
||||||
|
@ -234,7 +241,9 @@ async function save() {
|
||||||
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(
|
const response = await Promise.resolve(
|
||||||
$props.saveFn ? $props.saveFn(body) : axios[method](url, body),
|
$props.saveFn
|
||||||
|
? $props.saveFn(body)
|
||||||
|
: axios[$props.customMethod ?? method](url, body),
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
|
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
|
||||||
|
@ -301,7 +310,7 @@ function onBeforeSave(formData, originalData) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
async function onKeyup(evt) {
|
async function onKeyup(evt) {
|
||||||
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
|
if (evt.key === 'Enter' && !$props.preventSubmit) {
|
||||||
const input = evt.target;
|
const input = evt.target;
|
||||||
if (input.type == 'textarea' && evt.shiftKey) {
|
if (input.type == 'textarea' && evt.shiftKey) {
|
||||||
let { selectionStart, selectionEnd } = input;
|
let { selectionStart, selectionEnd } = input;
|
||||||
|
@ -330,6 +339,7 @@ defineExpose({
|
||||||
<template>
|
<template>
|
||||||
<div class="column items-center full-width">
|
<div class="column items-center full-width">
|
||||||
<QForm
|
<QForm
|
||||||
|
v-on="$attrs"
|
||||||
ref="myForm"
|
ref="myForm"
|
||||||
v-if="formData"
|
v-if="formData"
|
||||||
@submit.prevent="save"
|
@submit.prevent="save"
|
||||||
|
@ -376,8 +386,16 @@ defineExpose({
|
||||||
data-cy="saveAndContinueDefaultBtn"
|
data-cy="saveAndContinueDefaultBtn"
|
||||||
v-if="$props.goTo"
|
v-if="$props.goTo"
|
||||||
@click="saveAndGo"
|
@click="saveAndGo"
|
||||||
:label="tMobile('globals.saveAndContinue')"
|
:label="
|
||||||
:title="t('globals.saveAndContinue')"
|
tMobile('globals.saveAndContinue') +
|
||||||
|
' ' +
|
||||||
|
t('globals.' + $props.goTo.split('/').pop())
|
||||||
|
"
|
||||||
|
:title="
|
||||||
|
t('globals.saveAndContinue') +
|
||||||
|
' ' +
|
||||||
|
t('globals.' + $props.goTo.split('/').pop())
|
||||||
|
"
|
||||||
:disable="!hasChanges"
|
:disable="!hasChanges"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
@ -406,6 +424,7 @@ defineExpose({
|
||||||
</QBtnDropdown>
|
</QBtnDropdown>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-else
|
v-else
|
||||||
|
data-cy="saveDefaultBtn"
|
||||||
:label="tMobile('globals.save')"
|
:label="tMobile('globals.save')"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
|
|
@ -181,7 +181,7 @@ const searchModule = () => {
|
||||||
<template>
|
<template>
|
||||||
<QList padding class="column-max-width">
|
<QList padding class="column-max-width">
|
||||||
<template v-if="$props.source === 'main'">
|
<template v-if="$props.source === 'main'">
|
||||||
<template v-if="$route?.matched[1]?.name === 'Dashboard'">
|
<template v-if="route?.matched[1]?.name === 'Dashboard'">
|
||||||
<QItem class="q-pb-md">
|
<QItem class="q-pb-md">
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="search"
|
v-model="search"
|
||||||
|
@ -262,7 +262,7 @@ const searchModule = () => {
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-for="item in items" :key="item.name">
|
<template v-for="item in items" :key="item.name">
|
||||||
<template v-if="item.name === $route?.matched[1]?.name">
|
<template v-if="item.name === route?.matched[1]?.name">
|
||||||
<QItem class="header">
|
<QItem class="header">
|
||||||
<QItemSection avatar v-if="item.icon">
|
<QItemSection avatar v-if="item.icon">
|
||||||
<QIcon :name="item.icon" />
|
<QIcon :name="item.icon" />
|
||||||
|
|
|
@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
|
||||||
'no-visible': !stateQuery.isLoading().value,
|
'no-visible': !stateQuery.isLoading().value,
|
||||||
}"
|
}"
|
||||||
size="sm"
|
size="sm"
|
||||||
data-cy="loading-spinner"
|
data-cy="navBar-spinner"
|
||||||
/>
|
/>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<div id="searchbar" class="searchbar"></div>
|
<div id="searchbar" class="searchbar"></div>
|
||||||
|
|
|
@ -26,7 +26,7 @@ async function redirect() {
|
||||||
|
|
||||||
if (route?.params?.id)
|
if (route?.params?.id)
|
||||||
return (window.location.href = await getUrl(
|
return (window.location.href = await getUrl(
|
||||||
`${section}/${route.params.id}/summary`
|
`${section}/${route.params.id}/summary`,
|
||||||
));
|
));
|
||||||
return (window.location.href = await getUrl(section + '/index'));
|
return (window.location.href = await getUrl(section + '/index'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ const refund = async () => {
|
||||||
(data) => (
|
(data) => (
|
||||||
(rectificativeTypeOptions = data),
|
(rectificativeTypeOptions = data),
|
||||||
(invoiceParams.cplusRectificationTypeFk = data.filter(
|
(invoiceParams.cplusRectificationTypeFk = data.filter(
|
||||||
(type) => type.description == 'I – Por diferencias'
|
(type) => type.description == 'I – Por diferencias',
|
||||||
)[0].id)
|
)[0].id)
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
@ -68,7 +68,7 @@ const refund = async () => {
|
||||||
(data) => (
|
(data) => (
|
||||||
(siiTypeInvoiceOutsOptions = data),
|
(siiTypeInvoiceOutsOptions = data),
|
||||||
(invoiceParams.siiTypeInvoiceOutFk = data.filter(
|
(invoiceParams.siiTypeInvoiceOutFk = data.filter(
|
||||||
(type) => type.code == 'R4'
|
(type) => type.code == 'R4',
|
||||||
)[0].id)
|
)[0].id)
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
|
|
@ -40,6 +40,9 @@ const onDataSaved = (data) => {
|
||||||
url="Warehouses"
|
url="Warehouses"
|
||||||
@on-fetch="(data) => (warehousesOptions = data)"
|
@on-fetch="(data) => (warehousesOptions = data)"
|
||||||
auto-load
|
auto-load
|
||||||
|
:where="{
|
||||||
|
isInventory: true,
|
||||||
|
}"
|
||||||
/>
|
/>
|
||||||
<FormModelPopup
|
<FormModelPopup
|
||||||
url-create="Items/regularize"
|
url-create="Items/regularize"
|
||||||
|
|
|
@ -52,7 +52,7 @@ watch(
|
||||||
} else filter.value.where = {};
|
} else filter.value.where = {};
|
||||||
await provincesFetchDataRef.value.fetch({});
|
await provincesFetchDataRef.value.fetch({});
|
||||||
emit('onProvinceFetched', provincesOptions.value);
|
emit('onProvinceFetched', provincesOptions.value);
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -181,6 +181,10 @@ const col = computed(() => {
|
||||||
newColumn.component = 'checkbox';
|
newColumn.component = 'checkbox';
|
||||||
if ($props.default && !newColumn.component) newColumn.component = $props.default;
|
if ($props.default && !newColumn.component) newColumn.component = $props.default;
|
||||||
|
|
||||||
|
if (typeof newColumn.component !== 'string') {
|
||||||
|
newColumn.attrs = { ...newColumn.component?.attrs, autofocus: $props.autofocus };
|
||||||
|
newColumn.event = { ...newColumn.component?.event, ...$props?.eventHandlers };
|
||||||
|
}
|
||||||
return newColumn;
|
return newColumn;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { markRaw, computed } from 'vue';
|
import { markRaw, computed, onBeforeMount } from 'vue';
|
||||||
import { QCheckbox, QToggle } from 'quasar';
|
import { QToggle } from 'quasar';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import VnSelect from 'components/common/VnSelect.vue';
|
import VnSelect from 'components/common/VnSelect.vue';
|
||||||
import VnInput from 'components/common/VnInput.vue';
|
import VnInput from 'components/common/VnInput.vue';
|
||||||
|
@ -150,6 +150,16 @@ const showFilter = computed(
|
||||||
const onTabPressed = async () => {
|
const onTabPressed = async () => {
|
||||||
if (model.value) enterEvent['keyup.enter']();
|
if (model.value) enterEvent['keyup.enter']();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
onBeforeMount(() => {
|
||||||
|
const columnFilter = $props.column?.columnFilter;
|
||||||
|
const component = columnFilter?.component;
|
||||||
|
const defaultComponent = components[component];
|
||||||
|
const events = { update: updateEvent, enter: enterEvent };
|
||||||
|
|
||||||
|
if (!columnFilter || defaultComponent) return;
|
||||||
|
$props.column.columnFilter.event = events[columnFilter.event];
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div v-if="showFilter" class="full-width" style="overflow: hidden">
|
<div v-if="showFilter" class="full-width" style="overflow: hidden">
|
||||||
|
|
|
@ -16,7 +16,7 @@ const $props = defineProps({
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: 'table',
|
default: 'table',
|
||||||
},
|
},
|
||||||
vertical: {
|
vertical: {
|
||||||
|
|
|
@ -33,6 +33,9 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
|
||||||
import VnTableFilter from './VnTableFilter.vue';
|
import VnTableFilter from './VnTableFilter.vue';
|
||||||
import { getColAlign } from 'src/composables/getColAlign';
|
import { getColAlign } from 'src/composables/getColAlign';
|
||||||
import RightMenu from '../common/RightMenu.vue';
|
import RightMenu from '../common/RightMenu.vue';
|
||||||
|
import VnScroll from '../common/VnScroll.vue';
|
||||||
|
import VnCheckboxMenu from '../common/VnCheckboxMenu.vue';
|
||||||
|
import VnCheckbox from '../common/VnCheckbox.vue';
|
||||||
|
|
||||||
const arrayData = useArrayData(useAttrs()['data-key']);
|
const arrayData = useArrayData(useAttrs()['data-key']);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -65,7 +68,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
create: {
|
create: {
|
||||||
type: Object,
|
type: [Boolean, Object],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
createAsDialog: {
|
createAsDialog: {
|
||||||
|
@ -112,6 +115,10 @@ const $props = defineProps({
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({}),
|
default: () => ({}),
|
||||||
},
|
},
|
||||||
|
multiCheck: {
|
||||||
|
type: Object,
|
||||||
|
default: () => ({}),
|
||||||
|
},
|
||||||
crudModel: {
|
crudModel: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({}),
|
default: () => ({}),
|
||||||
|
@ -156,6 +163,7 @@ const CARD_MODE = 'card';
|
||||||
const TABLE_MODE = 'table';
|
const TABLE_MODE = 'table';
|
||||||
const mode = ref(CARD_MODE);
|
const mode = ref(CARD_MODE);
|
||||||
const selected = ref([]);
|
const selected = ref([]);
|
||||||
|
const selectAll = ref(false);
|
||||||
const hasParams = ref(false);
|
const hasParams = ref(false);
|
||||||
const CrudModelRef = ref({});
|
const CrudModelRef = ref({});
|
||||||
const showForm = ref(false);
|
const showForm = ref(false);
|
||||||
|
@ -168,6 +176,7 @@ 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 tableHeight = useTableHeight();
|
||||||
|
const vnScrollRef = ref(null);
|
||||||
|
|
||||||
const editingRow = ref(null);
|
const editingRow = ref(null);
|
||||||
const editingField = ref(null);
|
const editingField = ref(null);
|
||||||
|
@ -189,6 +198,17 @@ const tableModes = [
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const onVirtualScroll = ({ to }) => {
|
||||||
|
handleScroll();
|
||||||
|
const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
|
||||||
|
if (virtualScrollContainer) {
|
||||||
|
virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
|
||||||
|
if (vnScrollRef.value) {
|
||||||
|
vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
onBeforeMount(() => {
|
onBeforeMount(() => {
|
||||||
const urlParams = route.query[$props.searchUrl];
|
const urlParams = route.query[$props.searchUrl];
|
||||||
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
|
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
|
||||||
|
@ -313,6 +333,7 @@ function stopEventPropagation(event) {
|
||||||
|
|
||||||
function reload(params) {
|
function reload(params) {
|
||||||
selected.value = [];
|
selected.value = [];
|
||||||
|
selectAll.value = false;
|
||||||
CrudModelRef.value.reload(params);
|
CrudModelRef.value.reload(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -327,16 +348,13 @@ function handleOnDataSaved(_) {
|
||||||
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
|
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
|
||||||
else $props.create.onDataSaved(_);
|
else $props.create.onDataSaved(_);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleScroll() {
|
function handleScroll() {
|
||||||
if ($props.crudModel.disableInfiniteScroll) return;
|
if ($props.crudModel.disableInfiniteScroll) return;
|
||||||
|
|
||||||
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
|
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
|
||||||
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
||||||
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
||||||
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
||||||
if (evt?.shiftKey && added) {
|
if (evt?.shiftKey && added) {
|
||||||
const rowIndex = selectedRows[0].$index;
|
const rowIndex = selectedRows[0].$index;
|
||||||
|
@ -628,6 +646,17 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
};
|
};
|
||||||
return () => {};
|
return () => {};
|
||||||
});
|
});
|
||||||
|
const handleHeaderSelection = (evt, data) => {
|
||||||
|
if (evt === 'updateSelected' && selectAll.value) {
|
||||||
|
selected.value = tableRef.value.rows;
|
||||||
|
} else if (evt === 'selectAll') {
|
||||||
|
selected.value = data;
|
||||||
|
} else {
|
||||||
|
selected.value = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
emit('update:selected', selected.value);
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<RightMenu v-if="$props.rightSearch" :overlay="overlay">
|
<RightMenu v-if="$props.rightSearch" :overlay="overlay">
|
||||||
|
@ -653,7 +682,15 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:class="$attrs['class'] ?? 'q-px-md'"
|
:class="$attrs['class'] ?? 'q-px-md'"
|
||||||
:limit="$attrs['limit'] ?? 100"
|
:limit="$attrs['limit'] ?? 100"
|
||||||
ref="CrudModelRef"
|
ref="CrudModelRef"
|
||||||
@on-fetch="(...args) => emit('onFetch', ...args)"
|
@on-fetch="
|
||||||
|
(...args) => {
|
||||||
|
if ($props.multiCheck.expand) {
|
||||||
|
selectAll = false;
|
||||||
|
selected = [];
|
||||||
|
}
|
||||||
|
emit('onFetch', ...args);
|
||||||
|
}
|
||||||
|
"
|
||||||
:search-url="searchUrl"
|
:search-url="searchUrl"
|
||||||
:disable-infinite-scroll="isTableMode"
|
:disable-infinite-scroll="isTableMode"
|
||||||
:before-save-fn="removeTextValue"
|
:before-save-fn="removeTextValue"
|
||||||
|
@ -683,13 +720,33 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
flat
|
flat
|
||||||
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
|
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
|
||||||
:virtual-scroll="isTableMode"
|
:virtual-scroll="isTableMode"
|
||||||
@virtual-scroll="handleScroll"
|
@virtual-scroll="onVirtualScroll"
|
||||||
@row-click="(event, row) => handleRowClick(event, row)"
|
@row-click="(event, row) => handleRowClick(event, row)"
|
||||||
@update:selected="emit('update:selected', $event)"
|
@update:selected="emit('update:selected', $event)"
|
||||||
@selection="(details) => handleSelection(details, rows)"
|
@selection="(details) => handleSelection(details, rows)"
|
||||||
:hide-selected-banner="true"
|
:hide-selected-banner="true"
|
||||||
:data-cy
|
:data-cy
|
||||||
>
|
>
|
||||||
|
<template #header-selection>
|
||||||
|
<div class="flex items-center no-wrap" style="display: flex">
|
||||||
|
<VnCheckbox
|
||||||
|
v-model="selectAll"
|
||||||
|
@click="handleHeaderSelection('updateSelected', $event)"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<VnCheckboxMenu
|
||||||
|
v-if="selectAll && $props.multiCheck.expand"
|
||||||
|
:searchUrl="searchUrl"
|
||||||
|
v-model="selectAll"
|
||||||
|
:url="$attrs['url']"
|
||||||
|
@update:selected="
|
||||||
|
handleHeaderSelection('updateSelected', $event)
|
||||||
|
"
|
||||||
|
@select:all="handleHeaderSelection('selectAll', $event)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
<template #top-left v-if="!$props.withoutHeader">
|
<template #top-left v-if="!$props.withoutHeader">
|
||||||
<slot name="top-left"> </slot>
|
<slot name="top-left"> </slot>
|
||||||
</template>
|
</template>
|
||||||
|
@ -741,6 +798,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
withFilters
|
withFilters
|
||||||
"
|
"
|
||||||
:column="col"
|
:column="col"
|
||||||
|
:data-cy="`column-filter-${col.name}`"
|
||||||
:show-title="true"
|
:show-title="true"
|
||||||
:data-key="$attrs['data-key']"
|
:data-key="$attrs['data-key']"
|
||||||
v-model="params[columnName(col)]"
|
v-model="params[columnName(col)]"
|
||||||
|
@ -1087,6 +1145,11 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
|
<VnScroll
|
||||||
|
ref="vnScrollRef"
|
||||||
|
v-if="isTableMode"
|
||||||
|
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
|
|
|
@ -30,6 +30,7 @@ function columnName(col) {
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
:search-button="true"
|
:search-button="true"
|
||||||
:disable-submit-event="true"
|
:disable-submit-event="true"
|
||||||
|
:data-key="$attrs['data-key']"
|
||||||
:search-url
|
:search-url
|
||||||
>
|
>
|
||||||
<template #body="{ params, orders, searchFn }">
|
<template #body="{ params, orders, searchFn }">
|
||||||
|
|
|
@ -58,7 +58,7 @@ async function getConfig(url, filter) {
|
||||||
const response = await axios.get(url, {
|
const response = await axios.get(url, {
|
||||||
params: { filter: filter },
|
params: { filter: filter },
|
||||||
});
|
});
|
||||||
return response.data && response.data.length > 0 ? response.data[0] : null;
|
return response?.data && response?.data?.length > 0 ? response.data[0] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchViewConfigData() {
|
async function fetchViewConfigData() {
|
||||||
|
|
|
@ -11,6 +11,9 @@ describe('VnTable', () => {
|
||||||
propsData: {
|
propsData: {
|
||||||
columns: [],
|
columns: [],
|
||||||
},
|
},
|
||||||
|
attrs: {
|
||||||
|
'data-key': 'test',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ export default function (initialFooter, data) {
|
||||||
});
|
});
|
||||||
return acc;
|
return acc;
|
||||||
},
|
},
|
||||||
{ ...initialFooter }
|
{ ...initialFooter },
|
||||||
);
|
);
|
||||||
return footer;
|
return footer;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,13 +11,7 @@ describe('CrudModel', () => {
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
wrapper = createWrapper(CrudModel, {
|
wrapper = createWrapper(CrudModel, {
|
||||||
global: {
|
global: {
|
||||||
stubs: [
|
stubs: ['vnPaginate', 'vue-i18n'],
|
||||||
'vnPaginate',
|
|
||||||
'useState',
|
|
||||||
'arrayData',
|
|
||||||
'useStateStore',
|
|
||||||
'vue-i18n',
|
|
||||||
],
|
|
||||||
mocks: {
|
mocks: {
|
||||||
validate: vi.fn(),
|
validate: vi.fn(),
|
||||||
},
|
},
|
||||||
|
@ -29,7 +23,7 @@ describe('CrudModel', () => {
|
||||||
dataKey: 'crudModelKey',
|
dataKey: 'crudModelKey',
|
||||||
model: 'crudModel',
|
model: 'crudModel',
|
||||||
url: 'crudModelUrl',
|
url: 'crudModelUrl',
|
||||||
saveFn: '',
|
saveFn: vi.fn(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
|
@ -199,11 +193,11 @@ describe('CrudModel', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should set originalData and formatData with data and generate watchChanges', async () => {
|
it('should set originalData and formatData with data and generate watchChanges', async () => {
|
||||||
data = {
|
data = [{
|
||||||
name: 'Tony',
|
name: 'Tony',
|
||||||
lastName: 'Stark',
|
lastName: 'Stark',
|
||||||
age: 42,
|
age: 42,
|
||||||
};
|
}];
|
||||||
|
|
||||||
vm.resetData(data);
|
vm.resetData(data);
|
||||||
|
|
||||||
|
@ -231,7 +225,7 @@ describe('CrudModel', () => {
|
||||||
expect(vm.isLoading).toBe(false);
|
expect(vm.isLoading).toBe(false);
|
||||||
expect(vm.hasChanges).toBe(false);
|
expect(vm.hasChanges).toBe(false);
|
||||||
|
|
||||||
await wrapper.setProps({ saveFn: '' });
|
await wrapper.setProps({ saveFn: null });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should use default url if there's not saveFn", async () => {
|
it("should use default url if there's not saveFn", async () => {
|
||||||
|
@ -247,7 +241,7 @@ describe('CrudModel', () => {
|
||||||
|
|
||||||
await vm.saveChanges(data);
|
await vm.saveChanges(data);
|
||||||
|
|
||||||
expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
|
expect(postMock).toHaveBeenCalledWith(`${vm.url}/crud`, data);
|
||||||
expect(vm.isLoading).toBe(false);
|
expect(vm.isLoading).toBe(false);
|
||||||
expect(vm.hasChanges).toBe(false);
|
expect(vm.hasChanges).toBe(false);
|
||||||
expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
|
expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
|
||||||
|
|
|
@ -142,14 +142,14 @@ describe('getRoutes', () => {
|
||||||
const fn = (props) => getRoutes(props, getMethodA, getMethodB);
|
const fn = (props) => getRoutes(props, getMethodA, getMethodB);
|
||||||
|
|
||||||
it('should call getMethodB when source is card', () => {
|
it('should call getMethodB when source is card', () => {
|
||||||
let props = { source: 'methodB' };
|
const props = { source: 'methodB' };
|
||||||
fn(props);
|
fn(props);
|
||||||
|
|
||||||
expect(getMethodB).toHaveBeenCalled();
|
expect(getMethodB).toHaveBeenCalled();
|
||||||
expect(getMethodA).not.toHaveBeenCalled();
|
expect(getMethodA).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
it('should call getMethodA when source is main', () => {
|
it('should call getMethodA when source is main', () => {
|
||||||
let props = { source: 'methodA' };
|
const props = { source: 'methodA' };
|
||||||
fn(props);
|
fn(props);
|
||||||
|
|
||||||
expect(getMethodA).toHaveBeenCalled();
|
expect(getMethodA).toHaveBeenCalled();
|
||||||
|
@ -157,7 +157,7 @@ describe('getRoutes', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should call getMethodA when source is not exists or undefined', () => {
|
it('should call getMethodA when source is not exists or undefined', () => {
|
||||||
let props = { source: 'methodC' };
|
const props = { source: 'methodC' };
|
||||||
expect(() => fn(props)).toThrowError('Method not defined');
|
expect(() => fn(props)).toThrowError('Method not defined');
|
||||||
|
|
||||||
expect(getMethodA).not.toHaveBeenCalled();
|
expect(getMethodA).not.toHaveBeenCalled();
|
||||||
|
@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
|
||||||
vm = mount('card').vm;
|
vm = mount('card').vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get routes for card source', async () => {
|
it('should get routes for card source', () => {
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get routes for main source', () => {
|
it('should get routes for main source', () => {
|
||||||
vm.props.source = 'main';
|
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
expect(navigation.getModules).toHaveBeenCalled();
|
expect(navigation.getModules).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
|
@ -0,0 +1,93 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
import FetchData from '../FetchData.vue';
|
||||||
|
import VnSelectDialog from './VnSelectDialog.vue';
|
||||||
|
|
||||||
|
import CreateBankEntityForm from '../CreateBankEntityForm.vue';
|
||||||
|
|
||||||
|
const $props = defineProps({
|
||||||
|
iban: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
bankEntityFk: {
|
||||||
|
type: Number,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
disableElement: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const filter = {
|
||||||
|
fields: ['id', 'bic', 'name'],
|
||||||
|
order: 'bic ASC',
|
||||||
|
};
|
||||||
|
const { t } = useI18n();
|
||||||
|
const emit = defineEmits(['updateBic']);
|
||||||
|
const iban = ref($props.iban);
|
||||||
|
const bankEntityFk = ref($props.bankEntityFk);
|
||||||
|
const bankEntities = ref([]);
|
||||||
|
|
||||||
|
const autofillBic = async (bic) => {
|
||||||
|
if (!bic) return;
|
||||||
|
const bankEntityId = parseInt(bic.substr(4, 4));
|
||||||
|
const ibanCountry = bic.substr(0, 2);
|
||||||
|
if (ibanCountry != 'ES') return;
|
||||||
|
|
||||||
|
const existBank = bankEntities.value.find((b) => b.id === bankEntityId);
|
||||||
|
bankEntityFk.value = existBank ? bankEntityId : null;
|
||||||
|
emit('updateBic', { iban: iban.value, bankEntityFk: bankEntityFk.value });
|
||||||
|
};
|
||||||
|
|
||||||
|
const getBankEntities = (data) => {
|
||||||
|
bankEntityFk.value = data.id;
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="BankEntities"
|
||||||
|
:filter="filter"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (bankEntities = data)"
|
||||||
|
/>
|
||||||
|
<VnInput
|
||||||
|
:label="t('IBAN')"
|
||||||
|
clearable
|
||||||
|
v-model="iban"
|
||||||
|
@update:model-value="autofillBic($event)"
|
||||||
|
:disable="disableElement"
|
||||||
|
>
|
||||||
|
<template #append>
|
||||||
|
<QIcon name="info" class="cursor-info">
|
||||||
|
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
</VnInput>
|
||||||
|
<VnSelectDialog
|
||||||
|
:label="t('Swift / BIC')"
|
||||||
|
:acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
|
||||||
|
:options="bankEntities"
|
||||||
|
hide-selected
|
||||||
|
option-label="bic"
|
||||||
|
option-value="id"
|
||||||
|
v-model="bankEntityFk"
|
||||||
|
@update:model-value="$emit('updateBic', { iban, bankEntityFk })"
|
||||||
|
:disable="disableElement"
|
||||||
|
>
|
||||||
|
<template #form>
|
||||||
|
<CreateBankEntityForm @on-data-saved="getBankEntities($event)" />
|
||||||
|
</template>
|
||||||
|
<template #option="scope">
|
||||||
|
<QItem v-bind="scope.itemProps">
|
||||||
|
<QItemSection v-if="scope.opt">
|
||||||
|
<QItemLabel>{{ scope.opt.bic }} </QItemLabel>
|
||||||
|
<QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
|
</template>
|
||||||
|
</VnSelectDialog>
|
||||||
|
</template>
|
|
@ -15,7 +15,7 @@ let root = ref(null);
|
||||||
|
|
||||||
watchEffect(() => {
|
watchEffect(() => {
|
||||||
matched.value = currentRoute.value.matched.filter(
|
matched.value = currentRoute.value.matched.filter(
|
||||||
(matched) => !!matched?.meta?.title || !!matched?.meta?.icon
|
(matched) => !!matched?.meta?.title || !!matched?.meta?.icon,
|
||||||
);
|
);
|
||||||
breadcrumbs.value.length = 0;
|
breadcrumbs.value.length = 0;
|
||||||
if (!matched.value[0]) return;
|
if (!matched.value[0]) return;
|
||||||
|
|
|
@ -0,0 +1,104 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import VnCheckbox from './VnCheckbox.vue';
|
||||||
|
import axios from 'axios';
|
||||||
|
import { toRaw } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { useRoute } from 'vue-router';
|
||||||
|
const route = useRoute();
|
||||||
|
const { t } = useI18n();
|
||||||
|
const model = defineModel({ type: [Boolean] });
|
||||||
|
const props = defineProps({
|
||||||
|
url: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
searchUrl: {
|
||||||
|
type: [String, Boolean],
|
||||||
|
default: 'table',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const menuRef = ref(null);
|
||||||
|
const errorMessage = ref(null);
|
||||||
|
const rows = ref(0);
|
||||||
|
const onClick = async () => {
|
||||||
|
errorMessage.value = null;
|
||||||
|
|
||||||
|
const { filter } = JSON.parse(route.query[props.searchUrl]);
|
||||||
|
filter.limit = 0;
|
||||||
|
const params = {
|
||||||
|
params: { filter: JSON.stringify(filter) },
|
||||||
|
};
|
||||||
|
try {
|
||||||
|
const { data } = await axios.get(props.url, params);
|
||||||
|
rows.value = data;
|
||||||
|
} catch (error) {
|
||||||
|
const response = error.response;
|
||||||
|
if (response.data.error.name === 'UserError') {
|
||||||
|
errorMessage.value = t('tooManyResults');
|
||||||
|
} else {
|
||||||
|
errorMessage.value = response.data.error.message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
defineEmits(['update:selected', 'select:all']);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QIcon
|
||||||
|
style="margin-left: -10px"
|
||||||
|
data-cy="btnMultiCheck"
|
||||||
|
name="expand_more"
|
||||||
|
@click="onClick"
|
||||||
|
class="cursor-pointer"
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QMenu
|
||||||
|
fit
|
||||||
|
anchor="bottom start"
|
||||||
|
self="top left"
|
||||||
|
ref="menuRef"
|
||||||
|
data-cy="menuMultiCheck"
|
||||||
|
>
|
||||||
|
<QList separator>
|
||||||
|
<QItem
|
||||||
|
data-cy="selectAll"
|
||||||
|
v-ripple
|
||||||
|
clickable
|
||||||
|
@click="
|
||||||
|
$refs.menuRef.hide();
|
||||||
|
$emit('select:all', toRaw(rows));
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<QItemSection>
|
||||||
|
<QItemLabel>
|
||||||
|
<span v-text="t('Select all')" />
|
||||||
|
</QItemLabel>
|
||||||
|
<QItemLabel overline caption>
|
||||||
|
<span
|
||||||
|
v-if="errorMessage"
|
||||||
|
class="text-negative"
|
||||||
|
v-text="errorMessage"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
v-else
|
||||||
|
v-text="t('records', { rows: rows?.length ?? 0 })"
|
||||||
|
/>
|
||||||
|
</QItemLabel>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
|
<slot name="more-options"></slot>
|
||||||
|
</QList>
|
||||||
|
</QMenu>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
<i18n lang="yml">
|
||||||
|
en:
|
||||||
|
tooManyResults: Too many results. Please narrow down your search.
|
||||||
|
records: '{rows} records'
|
||||||
|
es:
|
||||||
|
Select all: Seleccionar todo
|
||||||
|
tooManyResults: Demasiados registros. Restringe la búsqueda.
|
||||||
|
records: '{rows} registros'
|
||||||
|
</i18n>
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
const model = defineModel({ type: [String, Number], required: true });
|
const model = defineModel({ type: [String, Number], default: '' });
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />
|
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />
|
||||||
|
|
|
@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const { notify } = useNotify();
|
||||||
const emit = defineEmits(['onDataSaved']);
|
const emit = defineEmits(['onDataSaved']);
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -61,8 +63,11 @@ function onFileChange(files) {
|
||||||
|
|
||||||
function mapperDms(data) {
|
function mapperDms(data) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
const { files } = data;
|
let files = data.files;
|
||||||
if (files) formData.append(files?.name, files);
|
if (files) {
|
||||||
|
files = Array.isArray(files) ? files : [files];
|
||||||
|
files.forEach((file) => formData.append(file?.name, file));
|
||||||
|
}
|
||||||
|
|
||||||
const dms = {
|
const dms = {
|
||||||
hasFile: !!data.hasFile,
|
hasFile: !!data.hasFile,
|
||||||
|
@ -83,11 +88,16 @@ function getUrl() {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
|
try {
|
||||||
const body = mapperDms(dms.value);
|
const body = mapperDms(dms.value);
|
||||||
const response = await axios.post(getUrl(), body[0], body[1]);
|
const response = await axios.post(getUrl(), body[0], body[1]);
|
||||||
emit('onDataSaved', body[1].params, response);
|
emit('onDataSaved', body[1].params, response);
|
||||||
|
notify(t('globals.dataSaved'), 'positive');
|
||||||
delete dms.value.files;
|
delete dms.value.files;
|
||||||
return response;
|
return response;
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultData() {
|
function defaultData() {
|
||||||
|
|
|
@ -13,10 +13,12 @@ import VnDms from 'src/components/common/VnDms.vue';
|
||||||
import VnConfirm from 'components/ui/VnConfirm.vue';
|
import VnConfirm from 'components/ui/VnConfirm.vue';
|
||||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
import { useSession } from 'src/composables/useSession';
|
import { useSession } from 'src/composables/useSession';
|
||||||
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const { notify } = useNotify();
|
||||||
const rows = ref([]);
|
const rows = ref([]);
|
||||||
const dmsRef = ref();
|
const dmsRef = ref();
|
||||||
const formDialog = ref({});
|
const formDialog = ref({});
|
||||||
|
@ -89,7 +91,6 @@ const dmsFilter = {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
where: { [$props.filter]: route.params.id },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
@ -254,9 +255,16 @@ function deleteDms(dmsFk) {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.onOk(async () => {
|
.onOk(async () => {
|
||||||
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
|
try {
|
||||||
|
await axios.post(
|
||||||
|
`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
|
||||||
|
);
|
||||||
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
||||||
rows.value.splice(index, 1);
|
rows.value.splice(index, 1);
|
||||||
|
notify(t('globals.dataDeleted'), 'positive');
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -294,7 +302,9 @@ defineExpose({
|
||||||
:data-key="$props.model"
|
:data-key="$props.model"
|
||||||
:url="$props.model"
|
:url="$props.model"
|
||||||
:user-filter="dmsFilter"
|
:user-filter="dmsFilter"
|
||||||
|
search-url="dmsFilter"
|
||||||
:order="['dmsFk DESC']"
|
:order="['dmsFk DESC']"
|
||||||
|
:filter="{ where: { [$props.filter]: route.params.id } }"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="setData"
|
@on-fetch="setData"
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,44 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
import axios from 'axios';
|
|
||||||
|
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
|
||||||
|
|
||||||
const { t } = useI18n();
|
|
||||||
const model = defineModel({ type: [Number, String] });
|
|
||||||
const emit = defineEmits(['updateBic']);
|
|
||||||
|
|
||||||
const getIbanCountry = (bank) => {
|
|
||||||
return bank.substr(0, 2);
|
|
||||||
};
|
|
||||||
|
|
||||||
const autofillBic = async (iban) => {
|
|
||||||
if (!iban) return;
|
|
||||||
|
|
||||||
const bankEntityId = parseInt(iban.substr(4, 4));
|
|
||||||
const ibanCountry = getIbanCountry(iban);
|
|
||||||
|
|
||||||
if (ibanCountry != 'ES') return;
|
|
||||||
|
|
||||||
const filter = { where: { id: bankEntityId } };
|
|
||||||
const params = { filter: JSON.stringify(filter) };
|
|
||||||
|
|
||||||
const { data } = await axios.get(`BankEntities`, { params });
|
|
||||||
|
|
||||||
emit('updateBic', data[0]?.id);
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<template>
|
|
||||||
<VnInput
|
|
||||||
:label="t('IBAN')"
|
|
||||||
clearable
|
|
||||||
v-model="model"
|
|
||||||
@update:model-value="autofillBic($event)"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="info" class="cursor-info">
|
|
||||||
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</VnInput>
|
|
||||||
</template>
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
|
import { nextTick, watch, computed, ref, useAttrs } from 'vue';
|
||||||
import { date } from 'quasar';
|
import { date, getCssVar } from 'quasar';
|
||||||
import VnDate from './VnDate.vue';
|
import VnDate from './VnDate.vue';
|
||||||
import { useRequired } from 'src/composables/useRequired';
|
import { useRequired } from 'src/composables/useRequired';
|
||||||
|
|
||||||
|
@ -20,61 +20,18 @@ const $props = defineProps({
|
||||||
});
|
});
|
||||||
|
|
||||||
const vnInputDateRef = ref(null);
|
const vnInputDateRef = ref(null);
|
||||||
|
const errColor = getCssVar('negative');
|
||||||
|
const textColor = ref('');
|
||||||
|
|
||||||
const dateFormat = 'DD/MM/YYYY';
|
const dateFormat = 'DD/MM/YYYY';
|
||||||
const isPopupOpen = ref();
|
const isPopupOpen = ref();
|
||||||
const hover = ref();
|
const hover = ref();
|
||||||
const mask = ref();
|
|
||||||
|
|
||||||
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
|
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
|
||||||
|
|
||||||
const formattedDate = computed({
|
|
||||||
get() {
|
|
||||||
if (!model.value) return model.value;
|
|
||||||
return date.formatDate(new Date(model.value), dateFormat);
|
|
||||||
},
|
|
||||||
set(value) {
|
|
||||||
if (value == model.value) return;
|
|
||||||
let newDate;
|
|
||||||
if (value) {
|
|
||||||
// parse input
|
|
||||||
if (value.includes('/') && value.length >= 10) {
|
|
||||||
if (value.at(2) == '/') value = value.split('/').reverse().join('/');
|
|
||||||
value = date.formatDate(
|
|
||||||
new Date(value).toISOString(),
|
|
||||||
'YYYY-MM-DDTHH:mm:ss.SSSZ',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const [year, month, day] = value.split('-').map((e) => parseInt(e));
|
|
||||||
newDate = new Date(year, month - 1, day);
|
|
||||||
if (model.value) {
|
|
||||||
const orgDate =
|
|
||||||
model.value instanceof Date ? model.value : new Date(model.value);
|
|
||||||
|
|
||||||
newDate.setHours(
|
|
||||||
orgDate.getHours(),
|
|
||||||
orgDate.getMinutes(),
|
|
||||||
orgDate.getSeconds(),
|
|
||||||
orgDate.getMilliseconds(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isNaN(newDate)) model.value = newDate.toISOString();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const popupDate = computed(() =>
|
const popupDate = computed(() =>
|
||||||
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
|
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
|
||||||
);
|
);
|
||||||
onMounted(() => {
|
|
||||||
// fix quasar bug
|
|
||||||
mask.value = '##/##/####';
|
|
||||||
});
|
|
||||||
watch(
|
|
||||||
() => model.value,
|
|
||||||
(val) => (formattedDate.value = val),
|
|
||||||
{ immediate: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
const styleAttrs = computed(() => {
|
const styleAttrs = computed(() => {
|
||||||
return $props.isOutlined
|
return $props.isOutlined
|
||||||
|
@ -86,28 +43,139 @@ const styleAttrs = computed(() => {
|
||||||
: {};
|
: {};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const inputValue = ref('');
|
||||||
|
|
||||||
|
const validateAndCleanInput = (value) => {
|
||||||
|
inputValue.value = value.replace(/[^0-9./-]/g, '');
|
||||||
|
};
|
||||||
|
|
||||||
const manageDate = (date) => {
|
const manageDate = (date) => {
|
||||||
formattedDate.value = date;
|
inputValue.value = date.split('/').reverse().join('/');
|
||||||
|
formatDate();
|
||||||
isPopupOpen.value = false;
|
isPopupOpen.value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => model.value,
|
||||||
|
(nVal) => {
|
||||||
|
if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
|
||||||
|
else inputValue.value = '';
|
||||||
|
},
|
||||||
|
{ immediate: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
const formatDate = () => {
|
||||||
|
let value = inputValue.value;
|
||||||
|
if (!value || value === model.value) {
|
||||||
|
textColor.value = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const regex =
|
||||||
|
/^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
|
||||||
|
if (!regex.test(value)) {
|
||||||
|
textColor.value = errColor;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
value = value.replace(/[.-]/g, '/');
|
||||||
|
const parts = value.split('/');
|
||||||
|
if (parts.length < 2) {
|
||||||
|
textColor.value = errColor;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let [day, month, year] = parts;
|
||||||
|
if (day.length === 1) day = '0' + day;
|
||||||
|
if (month.length === 1) month = '0' + month;
|
||||||
|
|
||||||
|
const currentYear = Date.vnNew().getFullYear();
|
||||||
|
if (!year) year = currentYear;
|
||||||
|
const millennium = currentYear.toString().slice(0, 1);
|
||||||
|
|
||||||
|
switch (year.length) {
|
||||||
|
case 1:
|
||||||
|
year = `${millennium}00${year}`;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
year = `${millennium}0${year}`;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
year = `${millennium}${year}`;
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
let isoCandidate = `${year}/${month}/${day}`;
|
||||||
|
isoCandidate = date.formatDate(
|
||||||
|
new Date(isoCandidate).toISOString(),
|
||||||
|
'YYYY-MM-DDTHH:mm:ss.SSSZ',
|
||||||
|
);
|
||||||
|
const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
|
||||||
|
const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
|
||||||
|
|
||||||
|
const isValidDate =
|
||||||
|
parsedDate instanceof Date &&
|
||||||
|
!isNaN(parsedDate) &&
|
||||||
|
parsedDate.getFullYear() === parseInt(year) &&
|
||||||
|
parsedDate.getMonth() === parseInt(month) - 1 &&
|
||||||
|
parsedDate.getDate() === parseInt(day);
|
||||||
|
|
||||||
|
if (!isValidDate) {
|
||||||
|
textColor.value = errColor;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (model.value) {
|
||||||
|
const original =
|
||||||
|
model.value instanceof Date ? model.value : new Date(model.value);
|
||||||
|
parsedDate.setHours(
|
||||||
|
original.getHours(),
|
||||||
|
original.getMinutes(),
|
||||||
|
original.getSeconds(),
|
||||||
|
original.getMilliseconds(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
model.value = parsedDate.toISOString();
|
||||||
|
|
||||||
|
textColor.value = '';
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleEnter = (event) => {
|
||||||
|
formatDate();
|
||||||
|
|
||||||
|
nextTick(() => {
|
||||||
|
const newEvent = new KeyboardEvent('keydown', {
|
||||||
|
key: 'Enter',
|
||||||
|
code: 'Enter',
|
||||||
|
bubbles: true,
|
||||||
|
cancelable: true,
|
||||||
|
});
|
||||||
|
vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
|
||||||
|
});
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div @mouseover="hover = true" @mouseleave="hover = false">
|
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||||
<QInput
|
<QInput
|
||||||
ref="vnInputDateRef"
|
ref="vnInputDateRef"
|
||||||
v-model="formattedDate"
|
v-model="inputValue"
|
||||||
class="vn-input-date"
|
class="vn-input-date"
|
||||||
:mask="mask"
|
|
||||||
placeholder="dd/mm/aaaa"
|
placeholder="dd/mm/aaaa"
|
||||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
:class="{ required: isRequired }"
|
:class="{ required: isRequired }"
|
||||||
:rules="mixinRules"
|
:rules="mixinRules"
|
||||||
:clearable="false"
|
:clearable="false"
|
||||||
|
:input-style="{ color: textColor }"
|
||||||
@click="isPopupOpen = !isPopupOpen"
|
@click="isPopupOpen = !isPopupOpen"
|
||||||
@keydown="isPopupOpen = false"
|
@keydown="isPopupOpen = false"
|
||||||
|
@focusout="formatDate"
|
||||||
|
@keydown.enter.prevent="handleEnter"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
||||||
|
@update:model-value="validateAndCleanInput"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
|
@ -116,11 +184,12 @@ const manageDate = (date) => {
|
||||||
v-if="
|
v-if="
|
||||||
($attrs.clearable == undefined || $attrs.clearable) &&
|
($attrs.clearable == undefined || $attrs.clearable) &&
|
||||||
hover &&
|
hover &&
|
||||||
model &&
|
inputValue &&
|
||||||
!$attrs.disable
|
!$attrs.disable
|
||||||
"
|
"
|
||||||
@click="
|
@click="
|
||||||
vnInputDateRef.focus();
|
vnInputDateRef.focus();
|
||||||
|
inputValue = null;
|
||||||
model = null;
|
model = null;
|
||||||
isPopupOpen = false;
|
isPopupOpen = false;
|
||||||
"
|
"
|
||||||
|
|
|
@ -5,7 +5,7 @@ import VnDate from './VnDate.vue';
|
||||||
import VnTime from './VnTime.vue';
|
import VnTime from './VnTime.vue';
|
||||||
|
|
||||||
const $attrs = useAttrs();
|
const $attrs = useAttrs();
|
||||||
const model = defineModel({ type: [Date] });
|
const model = defineModel({ type: [Date, String] });
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
isOutlined: {
|
isOutlined: {
|
||||||
|
@ -29,7 +29,7 @@ const styleAttrs = computed(() => {
|
||||||
const mask = 'DD-MM-YYYY HH:mm';
|
const mask = 'DD-MM-YYYY HH:mm';
|
||||||
const selectedDate = computed({
|
const selectedDate = computed({
|
||||||
get() {
|
get() {
|
||||||
if (!model.value) return new Date(model.value);
|
if (!model.value) return JSON.stringify(new Date(model.value));
|
||||||
return date.formatDate(new Date(model.value), mask);
|
return date.formatDate(new Date(model.value), mask);
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
|
|
|
@ -0,0 +1,184 @@
|
||||||
|
<script setup>
|
||||||
|
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
|
||||||
|
import { date } from 'quasar';
|
||||||
|
import VnDate from './VnDate.vue';
|
||||||
|
import { useRequired } from 'src/composables/useRequired';
|
||||||
|
|
||||||
|
const $attrs = useAttrs();
|
||||||
|
const { isRequired, requiredFieldRule } = useRequired($attrs);
|
||||||
|
|
||||||
|
const $props = defineProps({
|
||||||
|
isOutlined: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
isPopupOpen: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
multiple: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const model = defineModel({
|
||||||
|
type: [String, Date, Array],
|
||||||
|
default: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
const vnInputDateRef = ref(null);
|
||||||
|
|
||||||
|
const dateFormat = 'DD/MM/YYYY';
|
||||||
|
const isPopupOpen = ref();
|
||||||
|
const hover = ref();
|
||||||
|
const mask = ref();
|
||||||
|
|
||||||
|
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
|
||||||
|
|
||||||
|
const formattedDate = computed({
|
||||||
|
get() {
|
||||||
|
if (!model.value) return model.value;
|
||||||
|
if ($props.multiple) {
|
||||||
|
return model.value
|
||||||
|
.map((d) => date.formatDate(new Date(d), dateFormat))
|
||||||
|
.join(', ');
|
||||||
|
}
|
||||||
|
return date.formatDate(new Date(model.value), dateFormat);
|
||||||
|
},
|
||||||
|
set(value) {
|
||||||
|
if (value == model.value) return;
|
||||||
|
if ($props.multiple) return; // No permitir edición manual en modo múltiple
|
||||||
|
|
||||||
|
let newDate;
|
||||||
|
if (value) {
|
||||||
|
// parse input
|
||||||
|
if (value.includes('/') && value.length >= 10) {
|
||||||
|
if (value.at(2) == '/') value = value.split('/').reverse().join('/');
|
||||||
|
value = date.formatDate(
|
||||||
|
new Date(value).toISOString(),
|
||||||
|
'YYYY-MM-DDTHH:mm:ss.SSSZ',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const [year, month, day] = value.split('-').map((e) => parseInt(e));
|
||||||
|
newDate = new Date(year, month - 1, day);
|
||||||
|
if (model.value && !$props.multiple) {
|
||||||
|
const orgDate =
|
||||||
|
model.value instanceof Date ? model.value : new Date(model.value);
|
||||||
|
|
||||||
|
newDate.setHours(
|
||||||
|
orgDate.getHours(),
|
||||||
|
orgDate.getMinutes(),
|
||||||
|
orgDate.getSeconds(),
|
||||||
|
orgDate.getMilliseconds(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!isNaN(newDate)) model.value = newDate.toISOString();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const popupDate = computed(() => {
|
||||||
|
if (!model.value) return model.value;
|
||||||
|
if ($props.multiple) {
|
||||||
|
return model.value.map((d) => date.formatDate(new Date(d), 'YYYY/MM/DD'));
|
||||||
|
}
|
||||||
|
return date.formatDate(new Date(model.value), 'YYYY/MM/DD');
|
||||||
|
});
|
||||||
|
onMounted(() => {
|
||||||
|
// fix quasar bug
|
||||||
|
mask.value = '##/##/####';
|
||||||
|
if ($props.multiple && !model.value) {
|
||||||
|
model.value = [];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
watch(
|
||||||
|
() => model.value,
|
||||||
|
(val) => (formattedDate.value = val),
|
||||||
|
{ immediate: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
const styleAttrs = computed(() => {
|
||||||
|
return $props.isOutlined
|
||||||
|
? {
|
||||||
|
dense: true,
|
||||||
|
outlined: true,
|
||||||
|
rounded: true,
|
||||||
|
}
|
||||||
|
: {};
|
||||||
|
});
|
||||||
|
|
||||||
|
const manageDate = (dates) => {
|
||||||
|
if ($props.multiple) {
|
||||||
|
model.value = dates.map((d) => new Date(d).toISOString());
|
||||||
|
} else {
|
||||||
|
formattedDate.value = dates;
|
||||||
|
}
|
||||||
|
if ($props.isPopupOpen) isPopupOpen.value = false;
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||||
|
<QInput
|
||||||
|
ref="vnInputDateRef"
|
||||||
|
v-model="formattedDate"
|
||||||
|
class="vn-input-date"
|
||||||
|
:mask="$props.multiple ? undefined : mask"
|
||||||
|
placeholder="dd/mm/aaaa"
|
||||||
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
|
:class="{ required: isRequired }"
|
||||||
|
:rules="mixinRules"
|
||||||
|
:clearable="false"
|
||||||
|
@click="isPopupOpen = !isPopupOpen"
|
||||||
|
@keydown="isPopupOpen = false"
|
||||||
|
hide-bottom-space
|
||||||
|
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
||||||
|
>
|
||||||
|
<template #append>
|
||||||
|
<QIcon
|
||||||
|
name="close"
|
||||||
|
size="xs"
|
||||||
|
v-if="
|
||||||
|
($attrs.clearable == undefined || $attrs.clearable) &&
|
||||||
|
hover &&
|
||||||
|
model &&
|
||||||
|
!$attrs.disable
|
||||||
|
"
|
||||||
|
@click="
|
||||||
|
vnInputDateRef.focus();
|
||||||
|
model = null;
|
||||||
|
isPopupOpen = false;
|
||||||
|
"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<QMenu
|
||||||
|
v-if="$q.screen.gt.xs"
|
||||||
|
transition-show="scale"
|
||||||
|
transition-hide="scale"
|
||||||
|
v-model="isPopupOpen"
|
||||||
|
anchor="bottom left"
|
||||||
|
self="top start"
|
||||||
|
:no-focus="true"
|
||||||
|
:no-parent-event="true"
|
||||||
|
>
|
||||||
|
<VnDate
|
||||||
|
v-model="popupDate"
|
||||||
|
@update:model-value="manageDate"
|
||||||
|
:multiple="multiple"
|
||||||
|
/>
|
||||||
|
</QMenu>
|
||||||
|
<QDialog v-else v-model="isPopupOpen">
|
||||||
|
<VnDate
|
||||||
|
v-model="popupDate"
|
||||||
|
@update:model-value="manageDate"
|
||||||
|
:multiple="multiple"
|
||||||
|
/>
|
||||||
|
</QDialog>
|
||||||
|
</QInput>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Open date: Abrir fecha
|
||||||
|
</i18n>
|
|
@ -21,7 +21,7 @@ watch(
|
||||||
(newValue) => {
|
(newValue) => {
|
||||||
if (!modelValue.value) return;
|
if (!modelValue.value) return;
|
||||||
modelValue.value = formatLocation(newValue) ?? null;
|
modelValue.value = formatLocation(newValue) ?? null;
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
const mixinRules = [requiredFieldRule];
|
const mixinRules = [requiredFieldRule];
|
||||||
|
@ -45,7 +45,7 @@ const formatLocation = (obj, properties = locationProperties) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const filteredParts = parts.filter(
|
const filteredParts = parts.filter(
|
||||||
(part) => part !== null && part !== undefined && part !== ''
|
(part) => part !== null && part !== undefined && part !== '',
|
||||||
);
|
);
|
||||||
|
|
||||||
return filteredParts.join(', ');
|
return filteredParts.join(', ');
|
||||||
|
|
|
@ -0,0 +1,98 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
scrollTarget: { type: [String, Object], default: 'window' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const scrollPosition = ref(0);
|
||||||
|
const showButton = ref(false);
|
||||||
|
let scrollContainer = null;
|
||||||
|
|
||||||
|
const onScroll = () => {
|
||||||
|
if (!scrollContainer) return;
|
||||||
|
scrollPosition.value =
|
||||||
|
typeof props.scrollTarget === 'object'
|
||||||
|
? scrollContainer.scrollTop
|
||||||
|
: window.scrollY;
|
||||||
|
};
|
||||||
|
|
||||||
|
watch(scrollPosition, (newValue) => {
|
||||||
|
showButton.value = newValue > 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
const scrollToTop = () => {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateScrollContainer = (container) => {
|
||||||
|
if (container) {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.removeEventListener('scroll', onScroll);
|
||||||
|
}
|
||||||
|
scrollContainer = container;
|
||||||
|
scrollContainer.addEventListener('scroll', onScroll);
|
||||||
|
onScroll();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
updateScrollContainer,
|
||||||
|
});
|
||||||
|
|
||||||
|
const initScrollContainer = async () => {
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
if (typeof props.scrollTarget === 'object') {
|
||||||
|
scrollContainer = props.scrollTarget;
|
||||||
|
} else {
|
||||||
|
scrollContainer = window;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!scrollContainer) return;
|
||||||
|
scrollContainer.addEventListener('scroll', onScroll);
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
initScrollContainer();
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.removeEventListener('scroll', onScroll);
|
||||||
|
scrollContainer = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QIcon
|
||||||
|
v-if="showButton"
|
||||||
|
color="primary"
|
||||||
|
name="keyboard_arrow_up"
|
||||||
|
class="scroll-to-top"
|
||||||
|
@click="scrollToTop"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.scroll-to-top {
|
||||||
|
position: fixed;
|
||||||
|
top: 70px;
|
||||||
|
font-size: 65px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
z-index: 1000;
|
||||||
|
transition: transform 0.2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.scroll-to-top:hover {
|
||||||
|
transform: translateX(-50%) scale(1.2);
|
||||||
|
cursor: pointer;
|
||||||
|
filter: brightness(0.8);
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -54,6 +54,10 @@ const $props = defineProps({
|
||||||
type: [Array],
|
type: [Array],
|
||||||
default: () => [],
|
default: () => [],
|
||||||
},
|
},
|
||||||
|
filterFn: {
|
||||||
|
type: Function,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
exprBuilder: {
|
exprBuilder: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: null,
|
default: null,
|
||||||
|
@ -62,16 +66,12 @@ const $props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
defaultFilter: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
fields: {
|
fields: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
type: [Object, Array],
|
type: [Object, Array, String],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
where: {
|
where: {
|
||||||
|
@ -79,7 +79,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
sortBy: {
|
sortBy: {
|
||||||
type: String,
|
type: [String, Array],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
@ -166,6 +166,8 @@ const computedSortBy = computed(() => {
|
||||||
return $props.sortBy || $props.optionLabel + ' ASC';
|
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
||||||
|
|
||||||
watch(options, (newValue) => {
|
watch(options, (newValue) => {
|
||||||
setOptions(newValue);
|
setOptions(newValue);
|
||||||
});
|
});
|
||||||
|
@ -255,21 +257,18 @@ async function fetchFilter(val) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function filterHandler(val, update) {
|
async function filterHandler(val, update) {
|
||||||
if (isLoading.value) return update();
|
|
||||||
if (!val && lastVal.value === val) {
|
|
||||||
lastVal.value = val;
|
|
||||||
return update();
|
|
||||||
}
|
|
||||||
lastVal.value = val;
|
|
||||||
let newOptions;
|
let newOptions;
|
||||||
|
|
||||||
if (!$props.defaultFilter) return update();
|
if ($props.filterFn) update($props.filterFn(val));
|
||||||
if (
|
else if (!val && lastVal.value === val) update();
|
||||||
$props.url &&
|
else {
|
||||||
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
|
const makeRequest =
|
||||||
) {
|
($props.url && $props.limit) ||
|
||||||
newOptions = await fetchFilter(val);
|
(!$props.limit && Object.keys(myOptions.value).length === 0);
|
||||||
} else newOptions = filter(val, myOptionsOriginal.value);
|
newOptions = makeRequest
|
||||||
|
? await fetchFilter(val)
|
||||||
|
: filter(val, myOptionsOriginal.value);
|
||||||
|
|
||||||
update(
|
update(
|
||||||
() => {
|
() => {
|
||||||
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
||||||
|
@ -286,12 +285,13 @@ async function filterHandler(val, update) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lastVal.value = val;
|
||||||
|
}
|
||||||
|
|
||||||
function nullishToTrue(value) {
|
function nullishToTrue(value) {
|
||||||
return value ?? true;
|
return value ?? true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
|
||||||
|
|
||||||
async function onScroll({ to, direction, from, index }) {
|
async function onScroll({ to, direction, from, index }) {
|
||||||
const lastIndex = myOptions.value.length - 1;
|
const lastIndex = myOptions.value.length - 1;
|
||||||
|
|
||||||
|
@ -379,7 +379,7 @@ function getCaption(opt) {
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-show="isClearable && value"
|
v-show="isClearable && value != null && value !== ''"
|
||||||
name="close"
|
name="close"
|
||||||
@click="
|
@click="
|
||||||
() => {
|
() => {
|
||||||
|
@ -394,7 +394,7 @@ function getCaption(opt) {
|
||||||
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
||||||
<div v-if="slotName == 'append'">
|
<div v-if="slotName == 'append'">
|
||||||
<QIcon
|
<QIcon
|
||||||
v-show="isClearable && value"
|
v-show="isClearable && value != null && value !== ''"
|
||||||
name="close"
|
name="close"
|
||||||
@click.stop="
|
@click.stop="
|
||||||
() => {
|
() => {
|
||||||
|
@ -419,7 +419,7 @@ function getCaption(opt) {
|
||||||
<QItemLabel>
|
<QItemLabel>
|
||||||
{{ opt[optionLabel] }}
|
{{ opt[optionLabel] }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
<QItemLabel caption v-if="getCaption(opt)">
|
<QItemLabel caption v-if="getCaption(opt) !== false">
|
||||||
{{ `#${getCaption(opt)}` }}
|
{{ `#${getCaption(opt)}` }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, useTemplateRef } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
|
||||||
|
import VnSelectDialog from './VnSelectDialog.vue';
|
||||||
|
import CreateNewExpenseForm from '../CreateNewExpenseForm.vue';
|
||||||
|
import FetchData from '../FetchData.vue';
|
||||||
|
|
||||||
|
const model = defineModel({ type: [String, Number, Object] });
|
||||||
|
const { t } = useI18n();
|
||||||
|
const expenses = ref([]);
|
||||||
|
const selectDialogRef = useTemplateRef('selectDialogRef');
|
||||||
|
|
||||||
|
async function autocompleteExpense(evt) {
|
||||||
|
const val = evt.target.value;
|
||||||
|
if (!val || isNaN(val)) return;
|
||||||
|
const lookup = expenses.value.find(({ id }) => id == useAccountShortToStandard(val));
|
||||||
|
if (selectDialogRef.value)
|
||||||
|
selectDialogRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<VnSelectDialog
|
||||||
|
v-bind="$attrs"
|
||||||
|
ref="selectDialogRef"
|
||||||
|
v-model="model"
|
||||||
|
:options="expenses"
|
||||||
|
option-value="id"
|
||||||
|
:option-label="(x) => `${x.id}: ${x.name}`"
|
||||||
|
:filter-options="['id', 'name']"
|
||||||
|
:tooltip="t('Create a new expense')"
|
||||||
|
:acls="[{ model: 'Expense', props: '*', accessType: 'WRITE' }]"
|
||||||
|
@keydown.tab.prevent="autocompleteExpense"
|
||||||
|
>
|
||||||
|
<template #form>
|
||||||
|
<CreateNewExpenseForm @on-data-saved="$refs.expensesRef.fetch()" />
|
||||||
|
</template>
|
||||||
|
</VnSelectDialog>
|
||||||
|
<FetchData
|
||||||
|
ref="expensesRef"
|
||||||
|
url="Expenses"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (expenses = data)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Create a new expense: Crear nuevo gasto
|
||||||
|
</i18n>
|
|
@ -0,0 +1,50 @@
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import VnBankDetailsForm from 'components/common/VnBankDetailsForm.vue';
|
||||||
|
import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
|
||||||
|
|
||||||
|
describe('VnBankDetail Component', () => {
|
||||||
|
let vm;
|
||||||
|
let wrapper;
|
||||||
|
const bankEntities = [
|
||||||
|
{ id: 2100, bic: 'CAIXESBBXXX', name: 'CaixaBank' },
|
||||||
|
{ id: 1234, bic: 'TESTBIC', name: 'Test Bank' },
|
||||||
|
];
|
||||||
|
const correctIban = 'ES6621000418401234567891';
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
wrapper = createWrapper(VnBankDetailsForm, {
|
||||||
|
$props: {
|
||||||
|
iban: null,
|
||||||
|
bankEntityFk: null,
|
||||||
|
disableElement: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
vm = wrapper.vm;
|
||||||
|
wrapper = wrapper.wrapper;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update bankEntityFk when IBAN exists in bankEntities', async () => {
|
||||||
|
vm.bankEntities = bankEntities;
|
||||||
|
|
||||||
|
await vm.autofillBic(correctIban);
|
||||||
|
expect(vm.bankEntityFk).toBe(2100);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set bankEntityFk to null when IBAN bank code is not found', async () => {
|
||||||
|
vm.bankEntities = bankEntities;
|
||||||
|
|
||||||
|
await vm.autofillBic('ES1234567891324567891234');
|
||||||
|
expect(vm.bankEntityFk).toBe(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not update bankEntityFk if IBAN country is not ES', async () => {
|
||||||
|
vm.bankEntities = bankEntities;
|
||||||
|
|
||||||
|
await vm.autofillBic('FR1420041010050500013M02606');
|
||||||
|
expect(vm.bankEntityFk).toBe(null);
|
||||||
|
});
|
||||||
|
});
|
|
@ -35,7 +35,7 @@ describe('VnSmsDialog', () => {
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
message: 'You must enter a new password',
|
message: 'You must enter a new password',
|
||||||
type: 'negative',
|
type: 'negative',
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ describe('VnSmsDialog', () => {
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
message: `Passwords don't match`,
|
message: `Passwords don't match`,
|
||||||
type: 'negative',
|
type: 'negative',
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,9 @@ describe('VnDiscount', () => {
|
||||||
price: 100,
|
price: 100,
|
||||||
quantity: 2,
|
quantity: 2,
|
||||||
discount: 10,
|
discount: 10,
|
||||||
}
|
mana: 10,
|
||||||
|
promise: vi.fn(),
|
||||||
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -41,10 +41,12 @@ describe('VnDms', () => {
|
||||||
companyFk: 2,
|
companyFk: 2,
|
||||||
dmsTypeFk: 3,
|
dmsTypeFk: 3,
|
||||||
description: 'This is a test description',
|
description: 'This is a test description',
|
||||||
files: {
|
files: [
|
||||||
|
{
|
||||||
name: 'example.txt',
|
name: 'example.txt',
|
||||||
content: new Blob(['file content'], { type: 'text/plain' }),
|
content: new Blob(['file content'], { type: 'text/plain' }),
|
||||||
},
|
},
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const expectedBody = {
|
const expectedBody = {
|
||||||
|
@ -83,7 +85,7 @@ describe('VnDms', () => {
|
||||||
it('should map DMS data correctly and add file to FormData', () => {
|
it('should map DMS data correctly and add file to FormData', () => {
|
||||||
const [formData, params] = vm.mapperDms(data);
|
const [formData, params] = vm.mapperDms(data);
|
||||||
|
|
||||||
expect(formData.get('example.txt')).toBe(data.files);
|
expect([formData.get('example.txt')]).toStrictEqual(data.files);
|
||||||
expect(expectedBody).toEqual(params.params);
|
expect(expectedBody).toEqual(params.params);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
|
||||||
|
|
||||||
describe('VnInput', () => {
|
describe('VnInput', () => {
|
||||||
let vm;
|
let vm;
|
||||||
let wrapper;
|
let wrapper;
|
||||||
|
@ -12,25 +11,27 @@ describe('VnInput', () => {
|
||||||
wrapper = createWrapper(VnInput, {
|
wrapper = createWrapper(VnInput, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: value,
|
modelValue: value,
|
||||||
isOutlined, emptyToNull, insertable,
|
isOutlined,
|
||||||
maxlength: 101
|
emptyToNull,
|
||||||
|
insertable,
|
||||||
|
maxlength: 101,
|
||||||
},
|
},
|
||||||
attrs: {
|
attrs: {
|
||||||
label: 'test',
|
label: 'test',
|
||||||
required: true,
|
required: true,
|
||||||
maxlength: 101,
|
maxlength: 101,
|
||||||
maxLength: 10,
|
maxLength: 10,
|
||||||
'max-length':20
|
'max-length': 20,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
input = wrapper.find('[data-cy="test_input"]');
|
input = wrapper.find('[data-cy="test_input"]');
|
||||||
};
|
}
|
||||||
|
|
||||||
describe('value', () => {
|
describe('value', () => {
|
||||||
it('should emit update:modelValue when value changes', async () => {
|
it('should emit update:modelValue when value changes', async () => {
|
||||||
generateWrapper('12345', false, false, true)
|
generateWrapper('12345', false, false, true);
|
||||||
await input.setValue('123');
|
await input.setValue('123');
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
|
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
|
||||||
|
@ -62,7 +63,6 @@ describe('VnInput', () => {
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
|
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
|
||||||
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
|
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
|
||||||
expect(spyhandler).not.toHaveBeenCalled();
|
expect(spyhandler).not.toHaveBeenCalled();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -71,7 +71,7 @@ describe('VnInput', () => {
|
||||||
it.skip('handleKeydown respects insertable behavior', async () => {
|
it.skip('handleKeydown respects insertable behavior', async () => {
|
||||||
const expectedValue = '12345';
|
const expectedValue = '12345';
|
||||||
generateWrapper('1234', false, false, true);
|
generateWrapper('1234', false, false, true);
|
||||||
vm.focus()
|
vm.focus();
|
||||||
await input.trigger('keydown', { key: '5' });
|
await input.trigger('keydown', { key: '5' });
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||||
|
|
|
@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
let vm;
|
let vm;
|
||||||
let wrapper;
|
let wrapper;
|
||||||
|
|
||||||
function generateWrapper(date, outlined, required) {
|
function generateWrapper(outlined = false, required = false) {
|
||||||
wrapper = createWrapper(VnInputDate, {
|
wrapper = createWrapper(VnInputDate, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: date,
|
modelValue: '2000-12-31T23:00:00.000Z',
|
||||||
|
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
|
||||||
},
|
},
|
||||||
attrs: {
|
attrs: {
|
||||||
isOutlined: outlined,
|
isOutlined: outlined,
|
||||||
required: required
|
required: required,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
};
|
}
|
||||||
|
|
||||||
describe('VnInputDate', () => {
|
describe('VnInputDate', () => {
|
||||||
|
|
||||||
describe('formattedDate', () => {
|
describe('formattedDate', () => {
|
||||||
it('formats a valid date correctly', async () => {
|
it('validateAndCleanInput should remove non-numeric characters', async () => {
|
||||||
generateWrapper('2023-12-25', false, false);
|
generateWrapper();
|
||||||
|
vm.validateAndCleanInput('10a/1s2/2dd0a23');
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.formattedDate).toBe('25/12/2023');
|
expect(vm.inputValue).toBe('10/12/2023');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('updates the model value when a new date is set', async () => {
|
it('manageDate should reverse the date', async () => {
|
||||||
const input = wrapper.find('input');
|
generateWrapper();
|
||||||
await input.setValue('31/12/2023');
|
vm.manageDate('10/12/2023');
|
||||||
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
await vm.$nextTick();
|
||||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
expect(vm.inputValue).toBe('2023/12/10');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not update the model value when an invalid date is set', async () => {
|
it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
|
||||||
const input = wrapper.find('input');
|
const input = wrapper.find('input');
|
||||||
await input.setValue('invalid-date');
|
await input.setValue('25.12/2002');
|
||||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
await vm.$nextTick();
|
||||||
|
await vm.formatDate();
|
||||||
|
expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should format the date correctly when a valid date is entered with short year', async () => {
|
||||||
|
const input = wrapper.find('input');
|
||||||
|
await input.setValue('31.12-23');
|
||||||
|
await vm.$nextTick();
|
||||||
|
await vm.formatDate();
|
||||||
|
expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should format the date correctly when a valid date is entered without year', async () => {
|
||||||
|
const input = wrapper.find('input');
|
||||||
|
await input.setValue('12.03');
|
||||||
|
await vm.$nextTick();
|
||||||
|
await vm.formatDate();
|
||||||
|
expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('styleAttrs', () => {
|
describe('styleAttrs', () => {
|
||||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||||
generateWrapper('2023-12-25', false, false);
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.styleAttrs).toEqual({});
|
expect(vm.styleAttrs).toEqual({});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should set styleAttrs when isOutlined is true', async () => {
|
it('should set styleAttrs when isOutlined is true', async () => {
|
||||||
generateWrapper('2023-12-25', true, false);
|
generateWrapper(true, false);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.styleAttrs.outlined).toBe(true);
|
expect(vm.styleAttrs.outlined).toBe(true);
|
||||||
});
|
});
|
||||||
|
@ -58,13 +77,13 @@ describe('VnInputDate', () => {
|
||||||
|
|
||||||
describe('required', () => {
|
describe('required', () => {
|
||||||
it('should not applies required class when isRequired is false', async () => {
|
it('should not applies required class when isRequired is false', async () => {
|
||||||
generateWrapper('2023-12-25', false, false);
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
|
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should applies required class when isRequired is true', async () => {
|
it('should applies required class when isRequired is true', async () => {
|
||||||
generateWrapper('2023-12-25', false, true);
|
generateWrapper(false, true);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
|
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
|
||||||
});
|
});
|
||||||
|
|
|
@ -33,7 +33,7 @@ describe('VnInputDateTime', () => {
|
||||||
it('handles null date value', async () => {
|
it('handles null date value', async () => {
|
||||||
generateWrapper(null, false, true);
|
generateWrapper(null, false, true);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.selectedDate).toBeInstanceOf(Date);
|
expect(vm.selectedDate).not.toBe(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('updates the model value when a new datetime is set', async () => {
|
it('updates the model value when a new datetime is set', async () => {
|
||||||
|
|
|
@ -6,8 +6,8 @@ function buildComponent(data) {
|
||||||
return createWrapper(VnLocation, {
|
return createWrapper(VnLocation, {
|
||||||
global: {
|
global: {
|
||||||
props: {
|
props: {
|
||||||
location: data
|
location: data,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ describe('formatLocation', () => {
|
||||||
postcode: '46680',
|
postcode: '46680',
|
||||||
city: 'Algemesi',
|
city: 'Algemesi',
|
||||||
province: { name: 'Valencia' },
|
province: { name: 'Valencia' },
|
||||||
country: { name: 'Spain' }
|
country: { name: 'Spain' },
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -47,7 +47,12 @@ describe('formatLocation', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return the country', () => {
|
it('should return the country', () => {
|
||||||
const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined };
|
const location = {
|
||||||
|
...locationBase,
|
||||||
|
postcode: undefined,
|
||||||
|
city: undefined,
|
||||||
|
province: undefined,
|
||||||
|
};
|
||||||
const vm = buildComponent(location);
|
const vm = buildComponent(location);
|
||||||
expect(vm.formatLocation(location)).toEqual('Spain');
|
expect(vm.formatLocation(location)).toEqual('Spain');
|
||||||
});
|
});
|
||||||
|
@ -61,7 +66,7 @@ describe('showLabel', () => {
|
||||||
code: '46680',
|
code: '46680',
|
||||||
town: 'Algemesi',
|
town: 'Algemesi',
|
||||||
province: 'Valencia',
|
province: 'Valencia',
|
||||||
country: 'Spain'
|
country: 'Spain',
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -84,7 +89,12 @@ describe('showLabel', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should show the label with country', () => {
|
it('should show the label with country', () => {
|
||||||
const location = { ...locationBase, code: undefined, town: undefined, province: undefined };
|
const location = {
|
||||||
|
...locationBase,
|
||||||
|
code: undefined,
|
||||||
|
town: undefined,
|
||||||
|
province: undefined,
|
||||||
|
};
|
||||||
const vm = buildComponent(location);
|
const vm = buildComponent(location);
|
||||||
expect(vm.showLabel(location)).toEqual('Spain');
|
expect(vm.showLabel(location)).toEqual('Spain');
|
||||||
});
|
});
|
||||||
|
|
|
@ -90,8 +90,10 @@ describe('VnLog', () => {
|
||||||
|
|
||||||
vm = createWrapper(VnLog, {
|
vm = createWrapper(VnLog, {
|
||||||
global: {
|
global: {
|
||||||
stubs: ['VnUserLink'],
|
stubs: ['FetchData', 'vue-i18n', 'VnUserLink'],
|
||||||
mocks: {},
|
mocks: {
|
||||||
|
fetch: vi.fn(),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
propsData: {
|
propsData: {
|
||||||
model: 'Claim',
|
model: 'Claim',
|
||||||
|
|
|
@ -26,7 +26,7 @@ describe('VnNotes', () => {
|
||||||
) {
|
) {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
||||||
wrapper = createWrapper(VnNotes, {
|
wrapper = createWrapper(VnNotes, {
|
||||||
propsData: options,
|
propsData: { ...defaultOptions, ...options },
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
|
@ -2,13 +2,14 @@ import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnSmsDialog from 'components/common/VnSmsDialog.vue';
|
import VnSmsDialog from 'components/common/VnSmsDialog.vue';
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
||||||
describe('VnSmsDialog', () => {
|
describe('VnSmsDialog', () => {
|
||||||
let vm;
|
let vm;
|
||||||
const orderId = 1;
|
const orderId = 1;
|
||||||
const shipped = new Date();
|
const shipped = new Date();
|
||||||
const phone = '012345678';
|
const phone = '012345678';
|
||||||
const promise = (response) => {return response;};
|
const promise = (response) => {
|
||||||
|
return response;
|
||||||
|
};
|
||||||
const template = 'minAmount';
|
const template = 'minAmount';
|
||||||
const locale = 'en';
|
const locale = 'en';
|
||||||
|
|
||||||
|
@ -17,13 +18,13 @@ describe('VnSmsDialog', () => {
|
||||||
propsData: {
|
propsData: {
|
||||||
data: {
|
data: {
|
||||||
orderId,
|
orderId,
|
||||||
shipped
|
shipped,
|
||||||
},
|
},
|
||||||
template,
|
template,
|
||||||
locale,
|
locale,
|
||||||
phone,
|
phone,
|
||||||
promise
|
promise,
|
||||||
}
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -35,7 +36,9 @@ describe('VnSmsDialog', () => {
|
||||||
it('should update the message value with the correct template and parameters', () => {
|
it('should update the message value with the correct template and parameters', () => {
|
||||||
vm.updateMessage();
|
vm.updateMessage();
|
||||||
|
|
||||||
expect(vm.message).toEqual(`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`);
|
expect(vm.message).toEqual(
|
||||||
|
`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`,
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -47,7 +50,7 @@ describe('VnSmsDialog', () => {
|
||||||
orderId,
|
orderId,
|
||||||
shipped,
|
shipped,
|
||||||
destination: phone,
|
destination: phone,
|
||||||
message: vm.message
|
message: vm.message,
|
||||||
};
|
};
|
||||||
await vm.send();
|
await vm.send();
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ const token = getTokenMultimedia();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const src = computed(
|
const src = computed(
|
||||||
() => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`
|
() => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`,
|
||||||
);
|
);
|
||||||
const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
|
const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
|
||||||
const showLetter = ref(false);
|
const showLetter = ref(false);
|
||||||
|
|
|
@ -89,6 +89,7 @@ function cancel() {
|
||||||
<slot name="customHTML"></slot>
|
<slot name="customHTML"></slot>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
<slot name="actions" :actions="{ confirm, cancel }">
|
||||||
<QBtn
|
<QBtn
|
||||||
:label="t('globals.cancel')"
|
:label="t('globals.cancel')"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
@ -107,6 +108,7 @@ function cancel() {
|
||||||
autofocus
|
autofocus
|
||||||
data-cy="VnConfirm_confirm"
|
data-cy="VnConfirm_confirm"
|
||||||
/>
|
/>
|
||||||
|
</slot>
|
||||||
</QCardActions>
|
</QCardActions>
|
||||||
</QCard>
|
</QCard>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
|
|
|
@ -212,6 +212,7 @@ const getLocale = (label) => {
|
||||||
color="primary"
|
color="primary"
|
||||||
style="position: fixed; z-index: 1; right: 0; bottom: 0"
|
style="position: fixed; z-index: 1; right: 0; bottom: 0"
|
||||||
icon="search"
|
icon="search"
|
||||||
|
data-cy="vnFilterPanel_search"
|
||||||
@click="search()"
|
@click="search()"
|
||||||
>
|
>
|
||||||
<QTooltip bottom anchor="bottom right">
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
@ -229,6 +230,7 @@ const getLocale = (label) => {
|
||||||
<QItemSection top side>
|
<QItemSection top side>
|
||||||
<QBtn
|
<QBtn
|
||||||
@click="clearFilters"
|
@click="clearFilters"
|
||||||
|
data-cy="clearFilters"
|
||||||
color="primary"
|
color="primary"
|
||||||
dense
|
dense
|
||||||
flat
|
flat
|
||||||
|
@ -292,6 +294,7 @@ const getLocale = (label) => {
|
||||||
</QList>
|
</QList>
|
||||||
</QForm>
|
</QForm>
|
||||||
<QInnerLoading
|
<QInnerLoading
|
||||||
|
data-cy="filterPanel-spinner"
|
||||||
:label="t('globals.pleaseWait')"
|
:label="t('globals.pleaseWait')"
|
||||||
:showing="isLoading"
|
:showing="isLoading"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
|
|
@ -13,7 +13,7 @@ const src = computed({
|
||||||
get() {
|
get() {
|
||||||
return new URL(
|
return new URL(
|
||||||
`../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`,
|
`../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`,
|
||||||
import.meta.url
|
import.meta.url,
|
||||||
).href;
|
).href;
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { ref, reactive, useAttrs, computed } from 'vue';
|
import { ref, reactive, useAttrs, computed, onMounted, nextTick } from 'vue';
|
||||||
import { onBeforeRouteLeave } from 'vue-router';
|
import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
import { tMobile } from 'src/composables/tMobile';
|
||||||
import { toDateHourMin } from 'src/filters';
|
import { toDateHourMin } from 'src/filters';
|
||||||
|
|
||||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
|
@ -33,20 +34,47 @@ const $props = defineProps({
|
||||||
addNote: { type: Boolean, default: false },
|
addNote: { type: Boolean, default: false },
|
||||||
selectType: { type: Boolean, default: false },
|
selectType: { type: Boolean, default: false },
|
||||||
justInput: { type: Boolean, default: false },
|
justInput: { type: Boolean, default: false },
|
||||||
|
goTo: { type: String, default: '' },
|
||||||
|
useUserRelation: { type: Boolean, default: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
|
const stateStore = useStateStore();
|
||||||
|
const router = useRouter();
|
||||||
|
const route = useRoute();
|
||||||
|
const componentIsRendered = ref(false);
|
||||||
const newNote = reactive({ text: null, observationTypeFk: null });
|
const newNote = reactive({ text: null, observationTypeFk: null });
|
||||||
const observationTypes = ref([]);
|
const observationTypes = ref([]);
|
||||||
const vnPaginateRef = ref();
|
const vnPaginateRef = ref();
|
||||||
|
|
||||||
const defaultObservationType = computed(() =>
|
const defaultObservationType = computed(
|
||||||
observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
|
() => observationTypes.value.find((ot) => ot.code === 'salesPerson')?.id,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let savedNote = false;
|
||||||
let originalText;
|
let originalText;
|
||||||
|
|
||||||
|
onBeforeRouteLeave((to, from, next) => {
|
||||||
|
if (
|
||||||
|
(newNote.text && !$props.justInput) ||
|
||||||
|
(newNote.text !== originalText && $props.justInput)
|
||||||
|
)
|
||||||
|
quasar.dialog({
|
||||||
|
component: VnConfirm,
|
||||||
|
componentProps: {
|
||||||
|
title: t('globals.unsavedPopup.title'),
|
||||||
|
message: t('globals.unsavedPopup.subtitle'),
|
||||||
|
promise: () => next(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
else next();
|
||||||
|
});
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
nextTick(() => (componentIsRendered.value = true));
|
||||||
|
});
|
||||||
|
|
||||||
function handleClick(e) {
|
function handleClick(e) {
|
||||||
if (e.shiftKey && e.key === 'Enter') return;
|
if (e.shiftKey && e.key === 'Enter') return;
|
||||||
if ($props.justInput) confirmAndUpdate();
|
if ($props.justInput) confirmAndUpdate();
|
||||||
|
@ -68,6 +96,7 @@ async function insert() {
|
||||||
};
|
};
|
||||||
await axios.post($props.url, newBody);
|
await axios.post($props.url, newBody);
|
||||||
await vnPaginateRef.value.fetch();
|
await vnPaginateRef.value.fetch();
|
||||||
|
savedNote = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmAndUpdate() {
|
function confirmAndUpdate() {
|
||||||
|
@ -100,22 +129,6 @@ async function update() {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
onBeforeRouteLeave((to, from, next) => {
|
|
||||||
if (
|
|
||||||
(newNote.text && !$props.justInput) ||
|
|
||||||
(newNote.text !== originalText && $props.justInput)
|
|
||||||
)
|
|
||||||
quasar.dialog({
|
|
||||||
component: VnConfirm,
|
|
||||||
componentProps: {
|
|
||||||
title: t('globals.unsavedPopup.title'),
|
|
||||||
message: t('globals.unsavedPopup.subtitle'),
|
|
||||||
promise: () => next(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
else next();
|
|
||||||
});
|
|
||||||
|
|
||||||
function fetchData([data]) {
|
function fetchData([data]) {
|
||||||
newNote.text = data?.notes;
|
newNote.text = data?.notes;
|
||||||
originalText = data?.notes;
|
originalText = data?.notes;
|
||||||
|
@ -129,8 +142,66 @@ const handleObservationTypes = (data) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
async function saveAndGo() {
|
||||||
|
savedNote = false;
|
||||||
|
await insert();
|
||||||
|
router.push({ path: $props.goTo });
|
||||||
|
}
|
||||||
|
|
||||||
|
function getUserFilter() {
|
||||||
|
const newUserFilter = $props.userFilter ?? {};
|
||||||
|
const userInclude = {
|
||||||
|
relation: 'user',
|
||||||
|
scope: {
|
||||||
|
fields: ['id', 'nickname', 'name'],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
if (newUserFilter.include) {
|
||||||
|
if (Array.isArray(newUserFilter.include)) {
|
||||||
|
newUserFilter.include.push(userInclude);
|
||||||
|
} else {
|
||||||
|
newUserFilter.include = [userInclude, newUserFilter.include];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newUserFilter.include = userInclude;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($props.useUserRelation) {
|
||||||
|
return {
|
||||||
|
...newUserFilter,
|
||||||
|
...$props.userFilter,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return $props.filter;
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
<Teleport
|
||||||
|
to="#st-actions"
|
||||||
|
v-if="
|
||||||
|
stateStore?.isSubToolbarShown() &&
|
||||||
|
componentIsRendered &&
|
||||||
|
$props.goTo &&
|
||||||
|
!route.path.includes('summary')
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<QBtn
|
||||||
|
:label="
|
||||||
|
tMobile('globals.saveAndContinue') +
|
||||||
|
' ' +
|
||||||
|
t('globals.' + $props.goTo.split('/').pop())
|
||||||
|
"
|
||||||
|
:title="
|
||||||
|
t('globals.saveAndContinue') +
|
||||||
|
' ' +
|
||||||
|
t('globals.' + $props.goTo.split('/').pop())
|
||||||
|
"
|
||||||
|
color="primary"
|
||||||
|
icon="save"
|
||||||
|
@click="saveAndGo"
|
||||||
|
data-cy="saveContinueNoteButton"
|
||||||
|
/>
|
||||||
|
</Teleport>
|
||||||
<FetchData
|
<FetchData
|
||||||
v-if="selectType"
|
v-if="selectType"
|
||||||
url="ObservationTypes"
|
url="ObservationTypes"
|
||||||
|
@ -176,7 +247,7 @@ const handleObservationTypes = (data) => {
|
||||||
:required="'required' in originalAttrs"
|
:required="'required' in originalAttrs"
|
||||||
clearable
|
clearable
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append v-if="!$props.goTo">
|
||||||
<QBtn
|
<QBtn
|
||||||
:title="t('Save (Enter)')"
|
:title="t('Save (Enter)')"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
@ -198,16 +269,14 @@ const handleObservationTypes = (data) => {
|
||||||
:url="$props.url"
|
:url="$props.url"
|
||||||
order="created DESC"
|
order="created DESC"
|
||||||
:limit="0"
|
:limit="0"
|
||||||
:user-filter="userFilter"
|
:user-filter="getUserFilter()"
|
||||||
:filter="filter"
|
:filter="filter"
|
||||||
auto-load
|
auto-load
|
||||||
ref="vnPaginateRef"
|
ref="vnPaginateRef"
|
||||||
class="show"
|
class="show"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
:search-url="false"
|
:search-url="false"
|
||||||
@on-fetch="
|
@on-fetch="newNote.text = ''"
|
||||||
newNote.text = '';
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
<template #body="{ rows }">
|
<template #body="{ rows }">
|
||||||
<TransitionGroup name="list" tag="div" class="column items-center full-width">
|
<TransitionGroup name="list" tag="div" class="column items-center full-width">
|
||||||
|
@ -219,15 +288,15 @@ const handleObservationTypes = (data) => {
|
||||||
<QCardSection horizontal>
|
<QCardSection horizontal>
|
||||||
<VnAvatar
|
<VnAvatar
|
||||||
:descriptor="false"
|
:descriptor="false"
|
||||||
:worker-id="note.workerFk"
|
:worker-id="note.user?.id"
|
||||||
size="md"
|
size="md"
|
||||||
:title="note.worker?.user.nickname"
|
:title="note.user?.nickname"
|
||||||
/>
|
/>
|
||||||
<div class="full-width row justify-between q-pa-xs">
|
<div class="full-width row justify-between q-pa-xs">
|
||||||
<div>
|
<div>
|
||||||
<VnUserLink
|
<VnUserLink
|
||||||
:name="`${note.worker.user.name}`"
|
:name="`${note.user?.name}`"
|
||||||
:worker-id="note.worker.id"
|
:worker-id="note.user?.id"
|
||||||
/>
|
/>
|
||||||
<QBadge
|
<QBadge
|
||||||
class="q-ml-xs"
|
class="q-ml-xs"
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
|
import { useAttrs } from 'vue';
|
||||||
|
|
||||||
|
const attrs = useAttrs();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -67,7 +69,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
disableInfiniteScroll: {
|
disableInfiniteScroll: {
|
||||||
|
@ -75,7 +77,7 @@ const props = defineProps({
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
mapKey: {
|
mapKey: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
keyData: {
|
keyData: {
|
||||||
|
@ -144,14 +146,14 @@ const addFilter = async (filter, params) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
async function fetch(params) {
|
async function fetch(params) {
|
||||||
useArrayData(props.dataKey, params);
|
arrayData.setOptions(params);
|
||||||
arrayData.resetPagination();
|
arrayData.resetPagination();
|
||||||
await arrayData.fetch({ append: false });
|
await arrayData.fetch({ append: false });
|
||||||
return emitStoreData();
|
return emitStoreData();
|
||||||
}
|
}
|
||||||
|
|
||||||
async function update(params) {
|
async function update(params) {
|
||||||
useArrayData(props.dataKey, params);
|
arrayData.setOptions(params);
|
||||||
const { limit, skip } = store;
|
const { limit, skip } = store;
|
||||||
store.limit = limit + skip;
|
store.limit = limit + skip;
|
||||||
store.skip = 0;
|
store.skip = 0;
|
||||||
|
|
|
@ -46,7 +46,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
order: {
|
order: {
|
||||||
type: String,
|
type: [String, Array],
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
|
|
@ -87,7 +87,7 @@ function formatNumber(number) {
|
||||||
<QItemLabel caption>{{
|
<QItemLabel caption>{{
|
||||||
date.formatDate(
|
date.formatDate(
|
||||||
row.sms.created,
|
row.sms.created,
|
||||||
'YYYY-MM-DD HH:mm:ss'
|
'YYYY-MM-DD HH:mm:ss',
|
||||||
)
|
)
|
||||||
}}</QItemLabel>
|
}}</QItemLabel>
|
||||||
<QItemLabel class="row center">
|
<QItemLabel class="row center">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { toPercentage } from 'filters/index';
|
import { toCurrency, toPercentage } from 'filters/index';
|
||||||
|
|
||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
|
|
||||||
|
@ -8,6 +8,10 @@ const props = defineProps({
|
||||||
type: Number,
|
type: Number,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
format: {
|
||||||
|
type: String,
|
||||||
|
default: 'percentage', // 'currency'
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const valueClass = computed(() =>
|
const valueClass = computed(() =>
|
||||||
|
@ -21,7 +25,10 @@ const formattedValue = computed(() => props.value);
|
||||||
<template>
|
<template>
|
||||||
<span :class="valueClass">
|
<span :class="valueClass">
|
||||||
<QIcon :name="iconName" size="sm" class="value-icon" />
|
<QIcon :name="iconName" size="sm" class="value-icon" />
|
||||||
{{ toPercentage(formattedValue) }}
|
<span v-if="$props.format === 'percentage'">{{
|
||||||
|
toPercentage(formattedValue)
|
||||||
|
}}</span>
|
||||||
|
<span v-if="$props.format === 'currency'">{{ toCurrency(formattedValue) }}</span>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -37,8 +37,7 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
|
||||||
class="justify-end sticky"
|
class="justify-end sticky"
|
||||||
>
|
>
|
||||||
<slot name="st-data">
|
<slot name="st-data">
|
||||||
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
|
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }"></div>
|
||||||
</div>
|
|
||||||
</slot>
|
</slot>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<slot name="st-actions">
|
<slot name="st-actions">
|
||||||
|
|
|
@ -23,10 +23,15 @@ describe('CardSummary', () => {
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
wrapper = createWrapper(CardSummary, {
|
wrapper = createWrapper(CardSummary, {
|
||||||
|
global: {
|
||||||
|
mocks: {
|
||||||
|
validate: vi.fn(),
|
||||||
|
},
|
||||||
|
},
|
||||||
propsData: {
|
propsData: {
|
||||||
dataKey: 'cardSummaryKey',
|
dataKey: 'cardSummaryKey',
|
||||||
url: 'cardSummaryUrl',
|
url: 'cardSummaryUrl',
|
||||||
filter: 'cardFilter',
|
filter: { key: 'cardFilter' },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
@ -50,7 +55,7 @@ describe('CardSummary', () => {
|
||||||
|
|
||||||
it('should set correct props to the store', () => {
|
it('should set correct props to the store', () => {
|
||||||
expect(vm.store.url).toEqual('cardSummaryUrl');
|
expect(vm.store.url).toEqual('cardSummaryUrl');
|
||||||
expect(vm.store.filter).toEqual('cardFilter');
|
expect(vm.store.filter).toEqual({ key: 'cardFilter' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should respond to prop changes and refetch data', async () => {
|
it('should respond to prop changes and refetch data', async () => {
|
||||||
|
|
|
@ -12,12 +12,12 @@ function generateWrapper(storage = 'images') {
|
||||||
id: 123,
|
id: 123,
|
||||||
zoomResolution: '400x400',
|
zoomResolution: '400x400',
|
||||||
storage,
|
storage,
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
vm.timeStamp = 'timestamp';
|
vm.timeStamp = 'timestamp';
|
||||||
};
|
}
|
||||||
|
|
||||||
vi.mock('src/composables/useSession', () => ({
|
vi.mock('src/composables/useSession', () => ({
|
||||||
useSession: () => ({
|
useSession: () => ({
|
||||||
|
@ -31,7 +31,6 @@ vi.mock('src/composables/useRole', () => ({
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
||||||
describe('VnImg', () => {
|
describe('VnImg', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
isEmployeeMock.mockReset();
|
isEmployeeMock.mockReset();
|
||||||
|
@ -63,7 +62,9 @@ describe('VnImg', () => {
|
||||||
generateWrapper();
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
const url = vm.getUrl();
|
const url = vm.getUrl();
|
||||||
expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token×tamp');
|
expect(url).toBe(
|
||||||
|
'/api/images/catalog/200x200/123/download?access_token=token×tamp',
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
|
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
|
||||||
|
@ -71,7 +72,9 @@ describe('VnImg', () => {
|
||||||
generateWrapper();
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
const url = vm.getUrl(true);
|
const url = vm.getUrl(true);
|
||||||
expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token×tamp');
|
expect(url).toBe(
|
||||||
|
'/api/images/catalog/400x400/123/download?access_token=token×tamp',
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
|
||||||
|
|
||||||
vm.searchText = searchText;
|
vm.searchText = searchText;
|
||||||
vm.arrayData.store.userParams = userParams;
|
vm.arrayData.store.userParams = userParams;
|
||||||
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
|
applyFilterSpy = vi
|
||||||
|
.spyOn(vm.arrayData, 'applyFilter')
|
||||||
|
.mockImplementation(() => {});
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('search resets pagination and applies filter', async () => {
|
it('search resets pagination and applies filter', async () => {
|
||||||
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
|
const resetPaginationSpy = vi
|
||||||
|
.spyOn(vm.arrayData, 'resetPagination')
|
||||||
|
.mockImplementation(() => {});
|
||||||
await vm.search();
|
await vm.search();
|
||||||
|
|
||||||
expect(resetPaginationSpy).toHaveBeenCalled();
|
expect(resetPaginationSpy).toHaveBeenCalled();
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
|
||||||
import { createWrapper } 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';
|
||||||
|
|
||||||
|
@ -12,6 +11,9 @@ describe('VnSms', () => {
|
||||||
stubs: ['VnPaginate'],
|
stubs: ['VnPaginate'],
|
||||||
mocks: {},
|
mocks: {},
|
||||||
},
|
},
|
||||||
|
propsData: {
|
||||||
|
url: 'SmsUrl',
|
||||||
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -53,26 +53,26 @@ describe('useAcl', () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([
|
acl.hasAny([
|
||||||
{ model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
|
{ model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
|
||||||
])
|
]),
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return false if no roles matched', async () => {
|
it('should return false if no roles matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }])
|
acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }]),
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('*', () => {
|
describe('*', () => {
|
||||||
it('should return true if an acl matched', async () => {
|
it('should return true if an acl matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }])
|
acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }]),
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return false if no acls matched', async () => {
|
it('should return false if no acls matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }])
|
acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }]),
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -80,13 +80,15 @@ describe('useAcl', () => {
|
||||||
describe('$authenticated', () => {
|
describe('$authenticated', () => {
|
||||||
it('should return false if no acls matched', async () => {
|
it('should return false if no acls matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }])
|
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }]),
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return true if an acl matched', async () => {
|
it('should return true if an acl matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }])
|
acl.hasAny([
|
||||||
|
{ model: 'Url', props: 'getByUser', accessType: 'READ' },
|
||||||
|
]),
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -96,7 +98,7 @@ describe('useAcl', () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([
|
acl.hasAny([
|
||||||
{ model: 'TpvTransaction', props: 'start', accessType: 'READ' },
|
{ model: 'TpvTransaction', props: 'start', accessType: 'READ' },
|
||||||
])
|
]),
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -104,7 +106,7 @@ describe('useAcl', () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([
|
acl.hasAny([
|
||||||
{ model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
|
{ model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
|
||||||
])
|
]),
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -4,6 +4,8 @@ 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';
|
import { setActivePinia, createPinia } from 'pinia';
|
||||||
|
import { defineComponent, h } from 'vue';
|
||||||
|
import { mount } from '@vue/test-utils';
|
||||||
|
|
||||||
describe('useArrayData', () => {
|
describe('useArrayData', () => {
|
||||||
const filter = '{"limit":20,"skip":0}';
|
const filter = '{"limit":20,"skip":0}';
|
||||||
|
@ -43,7 +45,7 @@ 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').mockResolvedValueOnce({ data: [] });
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
url: 'mockUrl',
|
url: 'mockUrl',
|
||||||
searchUrl: 'params',
|
searchUrl: 'params',
|
||||||
});
|
});
|
||||||
|
@ -72,7 +74,7 @@ describe('useArrayData', () => {
|
||||||
data: [{ id: 1 }],
|
data: [{ id: 1 }],
|
||||||
});
|
});
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
url: 'mockUrl',
|
url: 'mockUrl',
|
||||||
navigate: {},
|
navigate: {},
|
||||||
});
|
});
|
||||||
|
@ -94,7 +96,7 @@ describe('useArrayData', () => {
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', {
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
url: 'mockUrl',
|
url: 'mockUrl',
|
||||||
oneRecord: true,
|
oneRecord: true,
|
||||||
});
|
});
|
||||||
|
@ -107,3 +109,17 @@ describe('useArrayData', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function mountArrayData(...args) {
|
||||||
|
let arrayData;
|
||||||
|
|
||||||
|
const TestComponent = defineComponent({
|
||||||
|
setup() {
|
||||||
|
arrayData = useArrayData(...args);
|
||||||
|
return () => h('div');
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const asd = mount(TestComponent);
|
||||||
|
return arrayData;
|
||||||
|
}
|
||||||
|
|
|
@ -64,9 +64,7 @@ describe('session', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe(
|
describe('login', () => {
|
||||||
'login',
|
|
||||||
() => {
|
|
||||||
const expectedUser = {
|
const expectedUser = {
|
||||||
id: 999,
|
id: 999,
|
||||||
name: `T'Challa`,
|
name: `T'Challa`,
|
||||||
|
@ -143,9 +141,7 @@ describe('session', () => {
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
await session.destroy(); // this clears token and user for any other test
|
||||||
});
|
});
|
||||||
},
|
});
|
||||||
{},
|
|
||||||
);
|
|
||||||
|
|
||||||
describe('RenewToken', () => {
|
describe('RenewToken', () => {
|
||||||
const expectedToken = 'myToken';
|
const expectedToken = 'myToken';
|
||||||
|
|
|
@ -18,7 +18,7 @@ export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile',
|
||||||
|
|
||||||
export async function downloadDocuware(url, params) {
|
export async function downloadDocuware(url, params) {
|
||||||
const appUrl = await getAppUrl();
|
const appUrl = await getAppUrl();
|
||||||
const response = await axios.get(`${appUrl}/api/` + url, {
|
const response = await axios.get(`${appUrl}/api/${url}`, {
|
||||||
responseType: 'blob',
|
responseType: 'blob',
|
||||||
params,
|
params,
|
||||||
});
|
});
|
||||||
|
|
|
@ -20,5 +20,5 @@ export function getColAlign(col) {
|
||||||
|
|
||||||
if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center';
|
if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center';
|
||||||
|
|
||||||
return 'text-' + (align ?? 'center');
|
return `text-${align ?? 'center'}`;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
export function getDateQBadgeColor(date) {
|
export function getDateQBadgeColor(date) {
|
||||||
let today = Date.vnNew();
|
const today = Date.vnNew();
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
let timeTicket = new Date(date);
|
const timeTicket = new Date(date);
|
||||||
timeTicket.setHours(0, 0, 0, 0);
|
timeTicket.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
let comparation = today - timeTicket;
|
const comparation = today - timeTicket;
|
||||||
|
|
||||||
if (comparation == 0) return 'warning';
|
if (comparation == 0) return 'warning';
|
||||||
if (comparation < 0) return 'success';
|
if (comparation < 0) return 'success';
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import moment from 'moment';
|
||||||
|
|
||||||
|
export default function useWeekdaysOrder() {
|
||||||
|
const firstDay = moment().weekday(1).day();
|
||||||
|
const weekdays = [...Array(7).keys()].map((i) => (i + firstDay) % 7);
|
||||||
|
|
||||||
|
return ref(weekdays);
|
||||||
|
}
|
|
@ -7,7 +7,7 @@ export async function beforeSave(data, getChanges, modelOrigin) {
|
||||||
const patchPromises = [];
|
const patchPromises = [];
|
||||||
|
|
||||||
for (const change of changes) {
|
for (const change of changes) {
|
||||||
let patchData = {};
|
const patchData = {};
|
||||||
|
|
||||||
if ('hasMinPrice' in change.data) {
|
if ('hasMinPrice' in change.data) {
|
||||||
patchData.hasMinPrice = change.data?.hasMinPrice;
|
patchData.hasMinPrice = change.data?.hasMinPrice;
|
||||||
|
|
|
@ -19,7 +19,7 @@ export function useArrayData(key, userOptions) {
|
||||||
let canceller = null;
|
let canceller = null;
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
setOptions();
|
setOptions(userOptions ?? {});
|
||||||
reset(['skip']);
|
reset(['skip']);
|
||||||
|
|
||||||
const query = route.query;
|
const query = route.query;
|
||||||
|
@ -39,9 +39,10 @@ export function useArrayData(key, userOptions) {
|
||||||
setCurrentFilter();
|
setCurrentFilter();
|
||||||
});
|
});
|
||||||
|
|
||||||
if (key && userOptions) setOptions();
|
if (userOptions) setOptions(userOptions);
|
||||||
|
|
||||||
function setOptions() {
|
function setOptions(params) {
|
||||||
|
if (!params) return;
|
||||||
const allowedOptions = [
|
const allowedOptions = [
|
||||||
'url',
|
'url',
|
||||||
'filter',
|
'filter',
|
||||||
|
@ -57,14 +58,14 @@ export function useArrayData(key, userOptions) {
|
||||||
'mapKey',
|
'mapKey',
|
||||||
'oneRecord',
|
'oneRecord',
|
||||||
];
|
];
|
||||||
if (typeof userOptions === 'object') {
|
if (typeof params === 'object') {
|
||||||
for (const option in userOptions) {
|
for (const option in params) {
|
||||||
const isEmpty = userOptions[option] == null || userOptions[option] === '';
|
const isEmpty = params[option] == null || params[option] === '';
|
||||||
if (isEmpty || !allowedOptions.includes(option)) continue;
|
if (isEmpty || !allowedOptions.includes(option)) continue;
|
||||||
|
|
||||||
if (Object.hasOwn(store, option)) {
|
if (Object.hasOwn(store, option)) {
|
||||||
const defaultOpts = userOptions[option];
|
const defaultOpts = params[option];
|
||||||
store[option] = userOptions.keepOpts?.includes(option)
|
store[option] = params.keepOpts?.includes(option)
|
||||||
? Object.assign(defaultOpts, store[option])
|
? Object.assign(defaultOpts, store[option])
|
||||||
: defaultOpts;
|
: defaultOpts;
|
||||||
if (option === 'userParams') store.defaultParams = store[option];
|
if (option === 'userParams') store.defaultParams = store[option];
|
||||||
|
@ -368,5 +369,6 @@ export function useArrayData(key, userOptions) {
|
||||||
deleteOption,
|
deleteOption,
|
||||||
reset,
|
reset,
|
||||||
resetPagination,
|
resetPagination,
|
||||||
|
setOptions,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,5 +3,4 @@ import { useQuasar } from 'quasar';
|
||||||
export default function () {
|
export default function () {
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
return quasar.screen.gt.xs ? 'q-pa-md' : 'q-pa-xs';
|
return quasar.screen.gt.xs ? 'q-pa-md' : 'q-pa-xs';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ export function djb2a(string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useColor(value) {
|
export function useColor(value) {
|
||||||
return '#' + colors[djb2a(value || '') % colors.length];
|
return `#${colors[djb2a(value || '') % colors.length]}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const colors = [
|
const colors = [
|
||||||
|
|
|
@ -15,18 +15,16 @@ export function usePrintService() {
|
||||||
message: t('globals.notificationSent'),
|
message: t('globals.notificationSent'),
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
icon: 'check',
|
icon: 'check',
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function openReport(path, params, isNewTab = '_self') {
|
function openReport(path, params, isNewTab = '_self') {
|
||||||
if (typeof params === 'string') params = JSON.parse(params);
|
if (typeof params === 'string') params = JSON.parse(params);
|
||||||
params = Object.assign(
|
params = {
|
||||||
{
|
|
||||||
access_token: getTokenMultimedia(),
|
access_token: getTokenMultimedia(),
|
||||||
},
|
...params,
|
||||||
params
|
};
|
||||||
);
|
|
||||||
|
|
||||||
const query = new URLSearchParams(params).toString();
|
const query = new URLSearchParams(params).toString();
|
||||||
window.open(`api/${path}?${query}`, isNewTab);
|
window.open(`api/${path}?${query}`, isNewTab);
|
||||||
|
|
|
@ -17,7 +17,7 @@ export function useSession() {
|
||||||
let intervalId = null;
|
let intervalId = null;
|
||||||
|
|
||||||
function setSession(data) {
|
function setSession(data) {
|
||||||
let keepLogin = data.keepLogin;
|
const keepLogin = data.keepLogin;
|
||||||
const storage = keepLogin ? localStorage : sessionStorage;
|
const storage = keepLogin ? localStorage : sessionStorage;
|
||||||
storage.setItem(TOKEN, data.token);
|
storage.setItem(TOKEN, data.token);
|
||||||
storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
|
storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
|
||||||
|
|
|
@ -8,7 +8,7 @@ export function useVnConfirm() {
|
||||||
message,
|
message,
|
||||||
promise,
|
promise,
|
||||||
successFn,
|
successFn,
|
||||||
customHTML = {}
|
customHTML = {},
|
||||||
) => {
|
) => {
|
||||||
const { component, props } = customHTML;
|
const { component, props } = customHTML;
|
||||||
Dialog.create({
|
Dialog.create({
|
||||||
|
@ -19,7 +19,7 @@ export function useVnConfirm() {
|
||||||
message: message,
|
message: message,
|
||||||
promise: promise,
|
promise: promise,
|
||||||
},
|
},
|
||||||
{ customHTML: () => h(component, props) }
|
{ customHTML: () => h(component, props) },
|
||||||
),
|
),
|
||||||
}).onOk(async () => {
|
}).onOk(async () => {
|
||||||
if (successFn) successFn();
|
if (successFn) successFn();
|
||||||
|
|
|
@ -343,3 +343,20 @@ input::-webkit-inner-spin-button {
|
||||||
.q-item__section--main ~ .q-item__section--side {
|
.q-item__section--main ~ .q-item__section--side {
|
||||||
padding-inline: 0;
|
padding-inline: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.calendars-header {
|
||||||
|
height: 45px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
background-color: $primary;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.calendars-container {
|
||||||
|
max-width: 800px;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: space-evenly;
|
||||||
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,7 +1,8 @@
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'icon';
|
font-family: 'icon';
|
||||||
src: url('fonts/icon.eot?uocffs');
|
src: url('fonts/icon.eot?uocffs');
|
||||||
src: url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
|
src:
|
||||||
|
url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
|
||||||
url('fonts/icon.ttf?uocffs') format('truetype'),
|
url('fonts/icon.ttf?uocffs') format('truetype'),
|
||||||
url('fonts/icon.woff?uocffs') format('woff'),
|
url('fonts/icon.woff?uocffs') format('woff'),
|
||||||
url('fonts/icon.svg?uocffs#icon') format('svg');
|
url('fonts/icon.svg?uocffs#icon') format('svg');
|
||||||
|
@ -10,7 +11,8 @@
|
||||||
font-display: block;
|
font-display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
[class^="icon-"], [class*=" icon-"] {
|
[class^='icon-'],
|
||||||
|
[class*=' icon-'] {
|
||||||
/* use !important to prevent issues with browser extensions that change fonts */
|
/* use !important to prevent issues with browser extensions that change fonts */
|
||||||
font-family: 'icon' !important;
|
font-family: 'icon' !important;
|
||||||
speak: never;
|
speak: never;
|
||||||
|
@ -26,428 +28,428 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon-inactive-car:before {
|
.icon-inactive-car:before {
|
||||||
content: "\e978";
|
content: '\e978';
|
||||||
}
|
}
|
||||||
.icon-hasItemLost:before {
|
.icon-hasItemLost:before {
|
||||||
content: "\e957";
|
content: '\e957';
|
||||||
}
|
}
|
||||||
.icon-hasItemDelay:before {
|
.icon-hasItemDelay:before {
|
||||||
content: "\e96d";
|
content: '\e96d';
|
||||||
}
|
}
|
||||||
.icon-add_entries:before {
|
.icon-add_entries:before {
|
||||||
content: "\e953";
|
content: '\e953';
|
||||||
}
|
}
|
||||||
.icon-100:before {
|
.icon-100:before {
|
||||||
content: "\e901";
|
content: '\e901';
|
||||||
}
|
}
|
||||||
.icon-Client_unpaid:before {
|
.icon-Client_unpaid:before {
|
||||||
content: "\e98c";
|
content: '\e98c';
|
||||||
}
|
}
|
||||||
.icon-History:before {
|
.icon-History:before {
|
||||||
content: "\e902";
|
content: '\e902';
|
||||||
}
|
}
|
||||||
.icon-Person:before {
|
.icon-Person:before {
|
||||||
content: "\e903";
|
content: '\e903';
|
||||||
}
|
}
|
||||||
.icon-accessory:before {
|
.icon-accessory:before {
|
||||||
content: "\e904";
|
content: '\e904';
|
||||||
}
|
}
|
||||||
.icon-account:before {
|
.icon-account:before {
|
||||||
content: "\e905";
|
content: '\e905';
|
||||||
}
|
}
|
||||||
.icon-actions:before {
|
.icon-actions:before {
|
||||||
content: "\e907";
|
content: '\e907';
|
||||||
}
|
}
|
||||||
.icon-addperson:before {
|
.icon-addperson:before {
|
||||||
content: "\e908";
|
content: '\e908';
|
||||||
}
|
}
|
||||||
.icon-agencia_tributaria:before {
|
.icon-agencia_tributaria:before {
|
||||||
content: "\e948";
|
content: '\e948';
|
||||||
}
|
}
|
||||||
.icon-agency:before {
|
.icon-agency:before {
|
||||||
content: "\e92a";
|
content: '\e92a';
|
||||||
}
|
}
|
||||||
.icon-agency-term:before {
|
.icon-agency-term:before {
|
||||||
content: "\e909";
|
content: '\e909';
|
||||||
}
|
}
|
||||||
.icon-albaran:before {
|
.icon-albaran:before {
|
||||||
content: "\e92c";
|
content: '\e92c';
|
||||||
}
|
}
|
||||||
.icon-anonymous:before {
|
.icon-anonymous:before {
|
||||||
content: "\e90b";
|
content: '\e90b';
|
||||||
}
|
}
|
||||||
.icon-apps:before {
|
.icon-apps:before {
|
||||||
content: "\e90c";
|
content: '\e90c';
|
||||||
}
|
}
|
||||||
.icon-artificial:before {
|
.icon-artificial:before {
|
||||||
content: "\e90d";
|
content: '\e90d';
|
||||||
}
|
}
|
||||||
.icon-attach:before {
|
.icon-attach:before {
|
||||||
content: "\e90e";
|
content: '\e90e';
|
||||||
}
|
}
|
||||||
.icon-barcode:before {
|
.icon-barcode:before {
|
||||||
content: "\e90f";
|
content: '\e90f';
|
||||||
}
|
}
|
||||||
.icon-basket:before {
|
.icon-basket:before {
|
||||||
content: "\e910";
|
content: '\e910';
|
||||||
}
|
}
|
||||||
.icon-basketadd:before {
|
.icon-basketadd:before {
|
||||||
content: "\e911";
|
content: '\e911';
|
||||||
}
|
}
|
||||||
.icon-bin:before {
|
.icon-bin:before {
|
||||||
content: "\e913";
|
content: '\e913';
|
||||||
}
|
}
|
||||||
.icon-botanical:before {
|
.icon-botanical:before {
|
||||||
content: "\e914";
|
content: '\e914';
|
||||||
}
|
}
|
||||||
.icon-bucket:before {
|
.icon-bucket:before {
|
||||||
content: "\e915";
|
content: '\e915';
|
||||||
}
|
}
|
||||||
.icon-buscaman:before {
|
.icon-buscaman:before {
|
||||||
content: "\e916";
|
content: '\e916';
|
||||||
}
|
}
|
||||||
.icon-buyrequest:before {
|
.icon-buyrequest:before {
|
||||||
content: "\e917";
|
content: '\e917';
|
||||||
}
|
}
|
||||||
.icon-calc_volum .path1:before {
|
.icon-calc_volum .path1:before {
|
||||||
content: "\e918";
|
content: '\e918';
|
||||||
color: rgb(0, 0, 0);
|
color: rgb(0, 0, 0);
|
||||||
}
|
}
|
||||||
.icon-calc_volum .path2:before {
|
.icon-calc_volum .path2:before {
|
||||||
content: "\e919";
|
content: '\e919';
|
||||||
margin-left: -1em;
|
margin-left: -1em;
|
||||||
color: rgb(0, 0, 0);
|
color: rgb(0, 0, 0);
|
||||||
}
|
}
|
||||||
.icon-calc_volum .path3:before {
|
.icon-calc_volum .path3:before {
|
||||||
content: "\e91c";
|
content: '\e91c';
|
||||||
margin-left: -1em;
|
margin-left: -1em;
|
||||||
color: rgb(0, 0, 0);
|
color: rgb(0, 0, 0);
|
||||||
}
|
}
|
||||||
.icon-calc_volum .path4:before {
|
.icon-calc_volum .path4:before {
|
||||||
content: "\e91d";
|
content: '\e91d';
|
||||||
margin-left: -1em;
|
margin-left: -1em;
|
||||||
color: rgb(0, 0, 0);
|
color: rgb(0, 0, 0);
|
||||||
}
|
}
|
||||||
.icon-calc_volum .path5:before {
|
.icon-calc_volum .path5:before {
|
||||||
content: "\e91e";
|
content: '\e91e';
|
||||||
margin-left: -1em;
|
margin-left: -1em;
|
||||||
color: rgb(0, 0, 0);
|
color: rgb(0, 0, 0);
|
||||||
}
|
}
|
||||||
.icon-calc_volum .path6:before {
|
.icon-calc_volum .path6:before {
|
||||||
content: "\e91f";
|
content: '\e91f';
|
||||||
margin-left: -1em;
|
margin-left: -1em;
|
||||||
color: rgb(255, 255, 255);
|
color: rgb(255, 255, 255);
|
||||||
}
|
}
|
||||||
.icon-calendar:before {
|
.icon-calendar:before {
|
||||||
content: "\e920";
|
content: '\e920';
|
||||||
}
|
}
|
||||||
.icon-catalog:before {
|
.icon-catalog:before {
|
||||||
content: "\e921";
|
content: '\e921';
|
||||||
}
|
}
|
||||||
.icon-claims:before {
|
.icon-claims:before {
|
||||||
content: "\e922";
|
content: '\e922';
|
||||||
}
|
}
|
||||||
.icon-client:before {
|
.icon-client:before {
|
||||||
content: "\e923";
|
content: '\e923';
|
||||||
}
|
}
|
||||||
.icon-clone:before {
|
.icon-clone:before {
|
||||||
content: "\e924";
|
content: '\e924';
|
||||||
}
|
}
|
||||||
.icon-columnadd:before {
|
.icon-columnadd:before {
|
||||||
content: "\e925";
|
content: '\e925';
|
||||||
}
|
}
|
||||||
.icon-columndelete:before {
|
.icon-columndelete:before {
|
||||||
content: "\e926";
|
content: '\e926';
|
||||||
}
|
}
|
||||||
.icon-components:before {
|
.icon-components:before {
|
||||||
content: "\e927";
|
content: '\e927';
|
||||||
}
|
}
|
||||||
.icon-consignatarios:before {
|
.icon-consignatarios:before {
|
||||||
content: "\e928";
|
content: '\e928';
|
||||||
}
|
}
|
||||||
.icon-control:before {
|
.icon-control:before {
|
||||||
content: "\e929";
|
content: '\e929';
|
||||||
}
|
}
|
||||||
.icon-credit:before {
|
.icon-credit:before {
|
||||||
content: "\e92b";
|
content: '\e92b';
|
||||||
}
|
}
|
||||||
.icon-defaulter:before {
|
.icon-defaulter:before {
|
||||||
content: "\e92d";
|
content: '\e92d';
|
||||||
}
|
}
|
||||||
.icon-deletedTicket:before {
|
.icon-deletedTicket:before {
|
||||||
content: "\e92e";
|
content: '\e92e';
|
||||||
}
|
}
|
||||||
.icon-deleteline:before {
|
.icon-deleteline:before {
|
||||||
content: "\e92f";
|
content: '\e92f';
|
||||||
}
|
}
|
||||||
.icon-delivery:before {
|
.icon-delivery:before {
|
||||||
content: "\e930";
|
content: '\e930';
|
||||||
}
|
}
|
||||||
.icon-deliveryprices:before {
|
.icon-deliveryprices:before {
|
||||||
content: "\e932";
|
content: '\e932';
|
||||||
}
|
}
|
||||||
.icon-details:before {
|
.icon-details:before {
|
||||||
content: "\e933";
|
content: '\e933';
|
||||||
}
|
}
|
||||||
.icon-dfiscales:before {
|
.icon-dfiscales:before {
|
||||||
content: "\e934";
|
content: '\e934';
|
||||||
}
|
}
|
||||||
.icon-disabled:before {
|
.icon-disabled:before {
|
||||||
content: "\e935";
|
content: '\e935';
|
||||||
}
|
}
|
||||||
.icon-doc:before {
|
.icon-doc:before {
|
||||||
content: "\e936";
|
content: '\e936';
|
||||||
}
|
}
|
||||||
.icon-entry:before {
|
.icon-entry:before {
|
||||||
content: "\e937";
|
content: '\e937';
|
||||||
}
|
}
|
||||||
.icon-entry_lastbuys:before {
|
.icon-entry_lastbuys:before {
|
||||||
content: "\e91a";
|
content: '\e91a';
|
||||||
}
|
}
|
||||||
.icon-exit:before {
|
.icon-exit:before {
|
||||||
content: "\e938";
|
content: '\e938';
|
||||||
}
|
}
|
||||||
.icon-eye:before {
|
.icon-eye:before {
|
||||||
content: "\e939";
|
content: '\e939';
|
||||||
}
|
}
|
||||||
.icon-fixedPrice:before {
|
.icon-fixedPrice:before {
|
||||||
content: "\e93a";
|
content: '\e93a';
|
||||||
}
|
}
|
||||||
.icon-flower:before {
|
.icon-flower:before {
|
||||||
content: "\e93b";
|
content: '\e93b';
|
||||||
}
|
}
|
||||||
.icon-frozen:before {
|
.icon-frozen:before {
|
||||||
content: "\e93c";
|
content: '\e93c';
|
||||||
}
|
}
|
||||||
.icon-fruit:before {
|
.icon-fruit:before {
|
||||||
content: "\e93d";
|
content: '\e93d';
|
||||||
}
|
}
|
||||||
.icon-funeral:before {
|
.icon-funeral:before {
|
||||||
content: "\e93e";
|
content: '\e93e';
|
||||||
}
|
}
|
||||||
.icon-grafana:before {
|
.icon-grafana:before {
|
||||||
content: "\e906";
|
content: '\e906';
|
||||||
}
|
}
|
||||||
.icon-greenery:before {
|
.icon-greenery:before {
|
||||||
content: "\e93f";
|
content: '\e93f';
|
||||||
}
|
}
|
||||||
.icon-greuge:before {
|
.icon-greuge:before {
|
||||||
content: "\e940";
|
content: '\e940';
|
||||||
}
|
}
|
||||||
.icon-grid:before {
|
.icon-grid:before {
|
||||||
content: "\e941";
|
content: '\e941';
|
||||||
}
|
}
|
||||||
.icon-handmade:before {
|
.icon-handmade:before {
|
||||||
content: "\e942";
|
content: '\e942';
|
||||||
}
|
}
|
||||||
.icon-handmadeArtificial:before {
|
.icon-handmadeArtificial:before {
|
||||||
content: "\e943";
|
content: '\e943';
|
||||||
}
|
}
|
||||||
.icon-headercol:before {
|
.icon-headercol:before {
|
||||||
content: "\e945";
|
content: '\e945';
|
||||||
}
|
}
|
||||||
.icon-info:before {
|
.icon-info:before {
|
||||||
content: "\e946";
|
content: '\e946';
|
||||||
}
|
}
|
||||||
.icon-inventory:before {
|
.icon-inventory:before {
|
||||||
content: "\e947";
|
content: '\e947';
|
||||||
}
|
}
|
||||||
.icon-invoice:before {
|
.icon-invoice:before {
|
||||||
content: "\e968";
|
content: '\e968';
|
||||||
color: #5f5f5f;
|
color: #5f5f5f;
|
||||||
}
|
}
|
||||||
.icon-invoice-in:before {
|
.icon-invoice-in:before {
|
||||||
content: "\e949";
|
content: '\e949';
|
||||||
}
|
}
|
||||||
.icon-invoice-in-create:before {
|
.icon-invoice-in-create:before {
|
||||||
content: "\e94a";
|
content: '\e94a';
|
||||||
}
|
}
|
||||||
.icon-invoice-out:before {
|
.icon-invoice-out:before {
|
||||||
content: "\e94b";
|
content: '\e94b';
|
||||||
}
|
}
|
||||||
.icon-isTooLittle:before {
|
.icon-isTooLittle:before {
|
||||||
content: "\e94c";
|
content: '\e94c';
|
||||||
}
|
}
|
||||||
.icon-item:before {
|
.icon-item:before {
|
||||||
content: "\e94d";
|
content: '\e94d';
|
||||||
}
|
}
|
||||||
.icon-languaje:before {
|
.icon-languaje:before {
|
||||||
content: "\e970";
|
content: '\e970';
|
||||||
}
|
}
|
||||||
.icon-lines:before {
|
.icon-lines:before {
|
||||||
content: "\e94e";
|
content: '\e94e';
|
||||||
}
|
}
|
||||||
.icon-linesprepaired:before {
|
.icon-linesprepaired:before {
|
||||||
content: "\e94f";
|
content: '\e94f';
|
||||||
}
|
}
|
||||||
.icon-link-to-corrected:before {
|
.icon-link-to-corrected:before {
|
||||||
content: "\e931";
|
content: '\e931';
|
||||||
}
|
}
|
||||||
.icon-link-to-correcting:before {
|
.icon-link-to-correcting:before {
|
||||||
content: "\e944";
|
content: '\e944';
|
||||||
}
|
}
|
||||||
.icon-logout:before {
|
.icon-logout:before {
|
||||||
content: "\e973";
|
content: '\e973';
|
||||||
}
|
}
|
||||||
.icon-mana:before {
|
.icon-mana:before {
|
||||||
content: "\e950";
|
content: '\e950';
|
||||||
}
|
}
|
||||||
.icon-mandatory:before {
|
.icon-mandatory:before {
|
||||||
content: "\e951";
|
content: '\e951';
|
||||||
}
|
}
|
||||||
.icon-net:before {
|
.icon-net:before {
|
||||||
content: "\e952";
|
content: '\e952';
|
||||||
}
|
}
|
||||||
.icon-newalbaran:before {
|
.icon-newalbaran:before {
|
||||||
content: "\e954";
|
content: '\e954';
|
||||||
}
|
}
|
||||||
.icon-niche:before {
|
.icon-niche:before {
|
||||||
content: "\e955";
|
content: '\e955';
|
||||||
}
|
}
|
||||||
.icon-no036:before {
|
.icon-no036:before {
|
||||||
content: "\e956";
|
content: '\e956';
|
||||||
}
|
}
|
||||||
.icon-noPayMethod:before {
|
.icon-noPayMethod:before {
|
||||||
content: "\e958";
|
content: '\e958';
|
||||||
}
|
}
|
||||||
.icon-notes:before {
|
.icon-notes:before {
|
||||||
content: "\e959";
|
content: '\e959';
|
||||||
}
|
}
|
||||||
.icon-noweb:before {
|
.icon-noweb:before {
|
||||||
content: "\e95a";
|
content: '\e95a';
|
||||||
}
|
}
|
||||||
.icon-onlinepayment:before {
|
.icon-onlinepayment:before {
|
||||||
content: "\e95b";
|
content: '\e95b';
|
||||||
}
|
}
|
||||||
.icon-package:before {
|
.icon-package:before {
|
||||||
content: "\e95c";
|
content: '\e95c';
|
||||||
}
|
}
|
||||||
.icon-payment:before {
|
.icon-payment:before {
|
||||||
content: "\e95d";
|
content: '\e95d';
|
||||||
}
|
}
|
||||||
.icon-pbx:before {
|
.icon-pbx:before {
|
||||||
content: "\e95e";
|
content: '\e95e';
|
||||||
}
|
}
|
||||||
.icon-pets:before {
|
.icon-pets:before {
|
||||||
content: "\e95f";
|
content: '\e95f';
|
||||||
}
|
}
|
||||||
.icon-photo:before {
|
.icon-photo:before {
|
||||||
content: "\e960";
|
content: '\e960';
|
||||||
}
|
}
|
||||||
.icon-plant:before {
|
.icon-plant:before {
|
||||||
content: "\e961";
|
content: '\e961';
|
||||||
}
|
}
|
||||||
.icon-polizon:before {
|
.icon-polizon:before {
|
||||||
content: "\e962";
|
content: '\e962';
|
||||||
}
|
}
|
||||||
.icon-preserved:before {
|
.icon-preserved:before {
|
||||||
content: "\e963";
|
content: '\e963';
|
||||||
}
|
}
|
||||||
.icon-recovery:before {
|
.icon-recovery:before {
|
||||||
content: "\e964";
|
content: '\e964';
|
||||||
}
|
}
|
||||||
.icon-regentry:before {
|
.icon-regentry:before {
|
||||||
content: "\e965";
|
content: '\e965';
|
||||||
}
|
}
|
||||||
.icon-reserva:before {
|
.icon-reserva:before {
|
||||||
content: "\e966";
|
content: '\e966';
|
||||||
}
|
}
|
||||||
.icon-revision:before {
|
.icon-revision:before {
|
||||||
content: "\e967";
|
content: '\e967';
|
||||||
}
|
}
|
||||||
.icon-risk:before {
|
.icon-risk:before {
|
||||||
content: "\e969";
|
content: '\e969';
|
||||||
}
|
}
|
||||||
.icon-saysimple:before {
|
.icon-saysimple:before {
|
||||||
content: "\e912";
|
content: '\e912';
|
||||||
}
|
}
|
||||||
.icon-services:before {
|
.icon-services:before {
|
||||||
content: "\e96a";
|
content: '\e96a';
|
||||||
}
|
}
|
||||||
.icon-settings:before {
|
.icon-settings:before {
|
||||||
content: "\e96b";
|
content: '\e96b';
|
||||||
}
|
}
|
||||||
.icon-shipment:before {
|
.icon-shipment:before {
|
||||||
content: "\e96c";
|
content: '\e96c';
|
||||||
}
|
}
|
||||||
.icon-sign:before {
|
.icon-sign:before {
|
||||||
content: "\e90a";
|
content: '\e90a';
|
||||||
}
|
}
|
||||||
.icon-sms:before {
|
.icon-sms:before {
|
||||||
content: "\e96e";
|
content: '\e96e';
|
||||||
}
|
}
|
||||||
.icon-solclaim:before {
|
.icon-solclaim:before {
|
||||||
content: "\e96f";
|
content: '\e96f';
|
||||||
}
|
}
|
||||||
.icon-solunion:before {
|
.icon-solunion:before {
|
||||||
content: "\e971";
|
content: '\e971';
|
||||||
}
|
}
|
||||||
.icon-splitline:before {
|
.icon-splitline:before {
|
||||||
content: "\e972";
|
content: '\e972';
|
||||||
}
|
}
|
||||||
.icon-splur:before {
|
.icon-splur:before {
|
||||||
content: "\e974";
|
content: '\e974';
|
||||||
}
|
}
|
||||||
.icon-stowaway:before {
|
.icon-stowaway:before {
|
||||||
content: "\e975";
|
content: '\e975';
|
||||||
}
|
}
|
||||||
.icon-supplier:before {
|
.icon-supplier:before {
|
||||||
content: "\e976";
|
content: '\e976';
|
||||||
}
|
}
|
||||||
.icon-supplierfalse:before {
|
.icon-supplierfalse:before {
|
||||||
content: "\e977";
|
content: '\e977';
|
||||||
}
|
}
|
||||||
.icon-tags:before {
|
.icon-tags:before {
|
||||||
content: "\e979";
|
content: '\e979';
|
||||||
}
|
}
|
||||||
.icon-tax:before {
|
.icon-tax:before {
|
||||||
content: "\e97a";
|
content: '\e97a';
|
||||||
}
|
}
|
||||||
.icon-thermometer:before {
|
.icon-thermometer:before {
|
||||||
content: "\e97b";
|
content: '\e97b';
|
||||||
}
|
}
|
||||||
.icon-ticket:before {
|
.icon-ticket:before {
|
||||||
content: "\e97c";
|
content: '\e97c';
|
||||||
}
|
}
|
||||||
.icon-ticketAdd:before {
|
.icon-ticketAdd:before {
|
||||||
content: "\e97e";
|
content: '\e97e';
|
||||||
}
|
}
|
||||||
.icon-traceability:before {
|
.icon-traceability:before {
|
||||||
content: "\e97f";
|
content: '\e97f';
|
||||||
}
|
}
|
||||||
.icon-transaction:before {
|
.icon-transaction:before {
|
||||||
content: "\e91b";
|
content: '\e91b';
|
||||||
}
|
}
|
||||||
.icon-treatments:before {
|
.icon-treatments:before {
|
||||||
content: "\e980";
|
content: '\e980';
|
||||||
}
|
}
|
||||||
.icon-trolley:before {
|
.icon-trolley:before {
|
||||||
content: "\e900";
|
content: '\e900';
|
||||||
}
|
}
|
||||||
.icon-troncales:before {
|
.icon-troncales:before {
|
||||||
content: "\e982";
|
content: '\e982';
|
||||||
}
|
}
|
||||||
.icon-unavailable:before {
|
.icon-unavailable:before {
|
||||||
content: "\e983";
|
content: '\e983';
|
||||||
}
|
}
|
||||||
.icon-visible_columns:before {
|
.icon-visible_columns:before {
|
||||||
content: "\e984";
|
content: '\e984';
|
||||||
}
|
}
|
||||||
.icon-volume:before {
|
.icon-volume:before {
|
||||||
content: "\e985";
|
content: '\e985';
|
||||||
}
|
}
|
||||||
.icon-wand:before {
|
.icon-wand:before {
|
||||||
content: "\e986";
|
content: '\e986';
|
||||||
}
|
}
|
||||||
.icon-web:before {
|
.icon-web:before {
|
||||||
content: "\e987";
|
content: '\e987';
|
||||||
}
|
}
|
||||||
.icon-wiki:before {
|
.icon-wiki:before {
|
||||||
content: "\e989";
|
content: '\e989';
|
||||||
}
|
}
|
||||||
.icon-worker:before {
|
.icon-worker:before {
|
||||||
content: "\e98a";
|
content: '\e98a';
|
||||||
}
|
}
|
||||||
.icon-zone:before {
|
.icon-zone:before {
|
||||||
content: "\e98b";
|
content: '\e98b';
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,10 +30,12 @@ export function isValidDate(date) {
|
||||||
export function toDateFormat(date, locale = 'es-ES', opts = {}) {
|
export function toDateFormat(date, locale = 'es-ES', opts = {}) {
|
||||||
if (!isValidDate(date)) return '';
|
if (!isValidDate(date)) return '';
|
||||||
|
|
||||||
const format = Object.assign(
|
const format = {
|
||||||
{ year: 'numeric', month: '2-digit', day: '2-digit' },
|
year: 'numeric',
|
||||||
opts
|
month: '2-digit',
|
||||||
);
|
day: '2-digit',
|
||||||
|
...opts,
|
||||||
|
};
|
||||||
return new Date(date).toLocaleDateString(locale, format);
|
return new Date(date).toLocaleDateString(locale, format);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,17 +106,17 @@ export function secondsToHoursMinutes(seconds, includeHSuffix = true) {
|
||||||
const hours = Math.floor(seconds / 3600);
|
const hours = Math.floor(seconds / 3600);
|
||||||
const remainingMinutes = seconds % 3600;
|
const remainingMinutes = seconds % 3600;
|
||||||
const minutes = Math.floor(remainingMinutes / 60);
|
const minutes = Math.floor(remainingMinutes / 60);
|
||||||
const formattedHours = hours < 10 ? '0' + hours : hours;
|
const formattedHours = hours < 10 ? `0${hours}` : hours;
|
||||||
const formattedMinutes = minutes < 10 ? '0' + minutes : minutes;
|
const formattedMinutes = minutes < 10 ? `0${minutes}` : minutes;
|
||||||
|
|
||||||
// Append "h." if includeHSuffix is true
|
// Append "h." if includeHSuffix is true
|
||||||
const suffix = includeHSuffix ? ' h.' : '';
|
const suffix = includeHSuffix ? ' h.' : '';
|
||||||
// Return formatted string
|
// Return formatted string
|
||||||
return formattedHours + ':' + formattedMinutes + suffix;
|
return `${formattedHours}:${formattedMinutes}${suffix}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getTimeDifferenceWithToday(date) {
|
export function getTimeDifferenceWithToday(date) {
|
||||||
let today = Date.vnNew();
|
const today = Date.vnNew();
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
date = new Date(date);
|
date = new Date(date);
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
* @return {Object} The fields as object
|
* @return {Object} The fields as object
|
||||||
*/
|
*/
|
||||||
function fieldsToObject(fields) {
|
function fieldsToObject(fields) {
|
||||||
let fieldsObj = {};
|
const fieldsObj = {};
|
||||||
|
|
||||||
if (Array.isArray(fields)) {
|
if (Array.isArray(fields)) {
|
||||||
for (let field of fields) fieldsObj[field] = true;
|
for (const field of fields) fieldsObj[field] = true;
|
||||||
} else if (typeof fields == 'object') {
|
} else if (typeof fields == 'object') {
|
||||||
for (let field in fields) {
|
for (const field in fields) {
|
||||||
if (fields[field]) fieldsObj[field] = true;
|
if (fields[field]) fieldsObj[field] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ function fieldsToObject(fields) {
|
||||||
* @return {Array} The merged fields as an array
|
* @return {Array} The merged fields as an array
|
||||||
*/
|
*/
|
||||||
function mergeFields(src, dst) {
|
function mergeFields(src, dst) {
|
||||||
let fields = {};
|
const fields = {};
|
||||||
Object.assign(fields, fieldsToObject(src), fieldsToObject(dst));
|
Object.assign(fields, fieldsToObject(src), fieldsToObject(dst));
|
||||||
return Object.keys(fields);
|
return Object.keys(fields);
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ function mergeFields(src, dst) {
|
||||||
* @return {Array} The merged wheres
|
* @return {Array} The merged wheres
|
||||||
*/
|
*/
|
||||||
function mergeWhere(src, dst) {
|
function mergeWhere(src, dst) {
|
||||||
let and = [];
|
const and = [];
|
||||||
if (src) and.push(src);
|
if (src) and.push(src);
|
||||||
if (dst) and.push(dst);
|
if (dst) and.push(dst);
|
||||||
return simplifyOperation(and, 'and');
|
return simplifyOperation(and, 'and');
|
||||||
|
@ -53,7 +53,7 @@ function mergeWhere(src, dst) {
|
||||||
* @return {Object} The result filter
|
* @return {Object} The result filter
|
||||||
*/
|
*/
|
||||||
function mergeFilters(src, dst) {
|
function mergeFilters(src, dst) {
|
||||||
let res = Object.assign({}, dst);
|
const res = { ...dst };
|
||||||
|
|
||||||
if (!src) return res;
|
if (!src) return res;
|
||||||
|
|
||||||
|
@ -80,12 +80,12 @@ function simplifyOperation(operation, operator) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildFilter(params, builderFunc) {
|
function buildFilter(params, builderFunc) {
|
||||||
let and = [];
|
const and = [];
|
||||||
|
|
||||||
for (let param in params) {
|
for (const param in params) {
|
||||||
let value = params[param];
|
const value = params[param];
|
||||||
if (value == null) continue;
|
if (value == null) continue;
|
||||||
let expr = builderFunc(param, value);
|
const expr = builderFunc(param, value);
|
||||||
if (expr) and.push(expr);
|
if (expr) and.push(expr);
|
||||||
}
|
}
|
||||||
return simplifyOperation(and, 'and');
|
return simplifyOperation(and, 'and');
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
export default function getDifferences(obj1, obj2) {
|
export default function getDifferences(obj1, obj2) {
|
||||||
let diff = {};
|
const diff = {};
|
||||||
delete obj1.$index;
|
delete obj1.$index;
|
||||||
delete obj2.$index;
|
delete obj2.$index;
|
||||||
|
|
||||||
for (let key in obj1) {
|
for (const key in obj1) {
|
||||||
if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
|
if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
|
||||||
diff[key] = obj2[key];
|
diff[key] = obj2[key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (let key in obj2) {
|
for (const key in obj2) {
|
||||||
if (
|
if (
|
||||||
obj1[key] === undefined ||
|
obj1[key] === undefined ||
|
||||||
JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
|
JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
|
||||||
|
|
|
@ -6,6 +6,7 @@ import toDateHourMinSec from './toDateHourMinSec';
|
||||||
import toRelativeDate from './toRelativeDate';
|
import toRelativeDate from './toRelativeDate';
|
||||||
import toCurrency from './toCurrency';
|
import toCurrency from './toCurrency';
|
||||||
import toPercentage from './toPercentage';
|
import toPercentage from './toPercentage';
|
||||||
|
import toNumber from './toNumber';
|
||||||
import toLowerCamel from './toLowerCamel';
|
import toLowerCamel from './toLowerCamel';
|
||||||
import dashIfEmpty from './dashIfEmpty';
|
import dashIfEmpty from './dashIfEmpty';
|
||||||
import dateRange from './dateRange';
|
import dateRange from './dateRange';
|
||||||
|
@ -34,6 +35,7 @@ export {
|
||||||
toRelativeDate,
|
toRelativeDate,
|
||||||
toCurrency,
|
toCurrency,
|
||||||
toPercentage,
|
toPercentage,
|
||||||
|
toNumber,
|
||||||
dashIfEmpty,
|
dashIfEmpty,
|
||||||
dateRange,
|
dateRange,
|
||||||
getParamWhere,
|
getParamWhere,
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
export default function toDateString(date) {
|
export default function toDateString(date) {
|
||||||
let day = date.getDate();
|
let day = date.getDate();
|
||||||
let month = date.getMonth() + 1;
|
let month = date.getMonth() + 1;
|
||||||
let year = date.getFullYear();
|
const year = date.getFullYear();
|
||||||
|
|
||||||
if (day < 10) day = `0${day}`;
|
if (day < 10) day = `0${day}`;
|
||||||
if (month < 10) month = `0${month}`;
|
if (month < 10) month = `0${month}`;
|
||||||
|
|
||||||
return `${year}-${month}-${day}`
|
return `${year}-${month}-${day}`;
|
||||||
}
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
export default function toLowerCamel(value) {
|
export default function toLowerCamel(value) {
|
||||||
if (!value) return;
|
if (!value) return;
|
||||||
if (typeof (value) !== 'string') return value;
|
if (typeof value !== 'string') return value;
|
||||||
return value.charAt(0).toLowerCase() + value.slice(1);
|
return value.charAt(0).toLowerCase() + value.slice(1);
|
||||||
}
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue