Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
This commit is contained in:
commit
bcab493f37
|
|
@ -1,4 +1,4 @@
|
||||||
extends: [eslint:recommended, google, plugin:jasmine/recommended, 'prettier',]
|
extends: [eslint:recommended, google, plugin:jasmine/recommended]
|
||||||
parserOptions:
|
parserOptions:
|
||||||
ecmaVersion: 2018
|
ecmaVersion: 2018
|
||||||
sourceType: "module"
|
sourceType: "module"
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,11 @@ coverage
|
||||||
node_modules
|
node_modules
|
||||||
dist
|
dist
|
||||||
storage
|
storage
|
||||||
|
.idea
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
.eslintcache
|
.eslintcache
|
||||||
datasources.*.json
|
datasources.*.json
|
||||||
print.*.json
|
print.*.json
|
||||||
db.json
|
db.json
|
||||||
junit.xml
|
junit.xml
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
module.exports = {
|
|
||||||
singleQuote: true,
|
|
||||||
printWidth: 120,
|
|
||||||
tabWidth: 4,
|
|
||||||
semi: true,
|
|
||||||
endOfLine: 'auto',
|
|
||||||
};
|
|
||||||
|
|
@ -10,8 +10,5 @@
|
||||||
"eslint.validate": [
|
"eslint.validate": [
|
||||||
"javascript",
|
"javascript",
|
||||||
"json"
|
"json"
|
||||||
],
|
]
|
||||||
"[html]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
39
Dockerfile
39
Dockerfile
|
|
@ -1,32 +1,43 @@
|
||||||
FROM debian:stretch-slim
|
FROM debian:bullseye-slim
|
||||||
ENV TZ Europe/Madrid
|
ENV TZ Europe/Madrid
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
# NodeJs
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
gnupg2 \
|
gnupg2 \
|
||||||
libfontconfig lftp \
|
&& curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
|
||||||
&& apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
|
&& apt-get install -y --no-install-recommends nodejs \
|
||||||
libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
|
&& npm install -g npm@8.19.2
|
||||||
libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
|
|
||||||
libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
|
# Puppeteer
|
||||||
libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
|
|
||||||
&& curl -sL https://deb.nodesource.com/setup_14.x | bash - \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
nodejs \
|
libfontconfig lftp xvfb gconf-service libasound2 libatk1.0-0 libc6 \
|
||||||
&& apt-get purge -y --auto-remove \
|
libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 \
|
||||||
gnupg2 \
|
libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 \
|
||||||
|
libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \
|
||||||
|
libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
|
||||||
|
libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
|
||||||
|
fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& npm -g install pm2
|
&& npm -g install pm2
|
||||||
|
|
||||||
|
# Salix
|
||||||
|
|
||||||
WORKDIR /salix
|
WORKDIR /salix
|
||||||
|
|
||||||
|
COPY print/package.json print/package-lock.json print/
|
||||||
|
RUN npm --prefix ./print install --omit=dev ./print
|
||||||
|
|
||||||
COPY package.json package-lock.json ./
|
COPY package.json package-lock.json ./
|
||||||
COPY loopback/package.json loopback/
|
COPY loopback/package.json loopback/
|
||||||
COPY print/package.json print/
|
RUN npm install --omit=dev
|
||||||
RUN npm install --only=prod
|
|
||||||
RUN npm --prefix ./print install --only=prod ./print
|
|
||||||
|
|
||||||
COPY loopback loopback
|
COPY loopback loopback
|
||||||
COPY back back
|
COPY back back
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env groovy
|
#!/usr/bin/env groovy
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
options {
|
options {
|
||||||
|
|
@ -62,13 +61,13 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// stage('Backend') {
|
stage('Backend') {
|
||||||
// steps {
|
steps {
|
||||||
// nodejs('node-v14') {
|
nodejs('node-v14') {
|
||||||
// sh 'npm run test:back:ci'
|
sh 'npm run test:back:ci'
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('Build') {
|
stage('Build') {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
|
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
|
||||||
VALUES
|
VALUES
|
||||||
('InvoiceIn', 'invoiceInPdf', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
('InvoiceIn', 'invoiceInPdf', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
||||||
('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
|
('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE `vn`.`workerTimeControlMail` CHANGE emailResponse reason text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
|
||||||
|
|
@ -918,7 +918,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
|
||||||
(3, 'Perdida', 'LOST');
|
(3, 'Perdida', 'LOST');
|
||||||
|
|
||||||
|
|
||||||
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`)
|
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'),
|
(1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'),
|
||||||
(2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL),
|
(2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL),
|
||||||
|
|
@ -2269,12 +2269,16 @@ INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`)
|
||||||
VALUES
|
VALUES
|
||||||
(9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR));
|
(9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR));
|
||||||
|
|
||||||
INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`)
|
INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `isSendMail`)
|
||||||
VALUES
|
VALUES
|
||||||
(1106, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in'),
|
(1106, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in', 0),
|
||||||
(1106, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle'),
|
(1106, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 0),
|
||||||
(1106, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle'),
|
(1106, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 0),
|
||||||
(1106, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out');
|
(1106, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out', 0),
|
||||||
|
(1107, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in', 1),
|
||||||
|
(1107, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 1),
|
||||||
|
(1107, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 1),
|
||||||
|
(1107, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out', 1);
|
||||||
|
|
||||||
INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`, `code`)
|
INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`, `code`)
|
||||||
VALUES
|
VALUES
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,11 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@uirouter/angularjs": {
|
"node_modules/@uirouter/angularjs": {
|
||||||
"version": "1.0.29",
|
"version": "1.0.30",
|
||||||
"license": "MIT",
|
"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.30.tgz",
|
||||||
|
"integrity": "sha512-qkc3RFZc91S5K0gc/QVAXc9LGDPXjR04vDgG/11j8+yyZEuQojXxKxdLhKIepiPzqLmGRVqzBmBc27gtqaEeZg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@uirouter/core": "6.0.7"
|
"@uirouter/core": "6.0.8"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=4.0.0"
|
"node": ">=4.0.0"
|
||||||
|
|
@ -37,15 +38,18 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@uirouter/core": {
|
"node_modules/@uirouter/core": {
|
||||||
"version": "6.0.7",
|
"version": "6.0.8",
|
||||||
"license": "MIT",
|
"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz",
|
||||||
|
"integrity": "sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw==",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=4.0.0"
|
"node": ">=4.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/angular": {
|
"node_modules/angular": {
|
||||||
"version": "1.8.2",
|
"version": "1.8.3",
|
||||||
"license": "MIT"
|
"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
|
||||||
|
"integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw==",
|
||||||
|
"deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
|
||||||
},
|
},
|
||||||
"node_modules/angular-animate": {
|
"node_modules/angular-animate": {
|
||||||
"version": "1.8.2",
|
"version": "1.8.2",
|
||||||
|
|
@ -62,8 +66,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/angular-translate": {
|
"node_modules/angular-translate": {
|
||||||
"version": "2.18.4",
|
"version": "2.19.0",
|
||||||
"license": "MIT",
|
"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
|
||||||
|
"integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"angular": "^1.8.0"
|
"angular": "^1.8.0"
|
||||||
},
|
},
|
||||||
|
|
@ -72,10 +77,11 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/angular-translate-loader-partial": {
|
"node_modules/angular-translate-loader-partial": {
|
||||||
"version": "2.18.4",
|
"version": "2.19.0",
|
||||||
"license": "MIT",
|
"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.19.0.tgz",
|
||||||
|
"integrity": "sha512-NnMw13LMV4bPQmJK7/pZOZAnPxe0M5OtUHchADs5Gye7V7feonuEnrZ8e1CKhBlv9a7IQyWoqcBa4Lnhg8gk5w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"angular-translate": "~2.18.4"
|
"angular-translate": "~2.19.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/argparse": {
|
"node_modules/argparse": {
|
||||||
|
|
@ -119,8 +125,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/moment": {
|
"node_modules/moment": {
|
||||||
"version": "2.29.1",
|
"version": "2.29.4",
|
||||||
"license": "MIT",
|
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
|
||||||
|
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "*"
|
"node": "*"
|
||||||
}
|
}
|
||||||
|
|
@ -164,16 +171,22 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@uirouter/angularjs": {
|
"@uirouter/angularjs": {
|
||||||
"version": "1.0.29",
|
"version": "1.0.30",
|
||||||
|
"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.30.tgz",
|
||||||
|
"integrity": "sha512-qkc3RFZc91S5K0gc/QVAXc9LGDPXjR04vDgG/11j8+yyZEuQojXxKxdLhKIepiPzqLmGRVqzBmBc27gtqaEeZg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@uirouter/core": "6.0.7"
|
"@uirouter/core": "6.0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@uirouter/core": {
|
"@uirouter/core": {
|
||||||
"version": "6.0.7"
|
"version": "6.0.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz",
|
||||||
|
"integrity": "sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw=="
|
||||||
},
|
},
|
||||||
"angular": {
|
"angular": {
|
||||||
"version": "1.8.2"
|
"version": "1.8.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
|
||||||
|
"integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw=="
|
||||||
},
|
},
|
||||||
"angular-animate": {
|
"angular-animate": {
|
||||||
"version": "1.8.2"
|
"version": "1.8.2"
|
||||||
|
|
@ -185,15 +198,19 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"angular-translate": {
|
"angular-translate": {
|
||||||
"version": "2.18.4",
|
"version": "2.19.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
|
||||||
|
"integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"angular": "^1.8.0"
|
"angular": "^1.8.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"angular-translate-loader-partial": {
|
"angular-translate-loader-partial": {
|
||||||
"version": "2.18.4",
|
"version": "2.19.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.19.0.tgz",
|
||||||
|
"integrity": "sha512-NnMw13LMV4bPQmJK7/pZOZAnPxe0M5OtUHchADs5Gye7V7feonuEnrZ8e1CKhBlv9a7IQyWoqcBa4Lnhg8gk5w==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"angular-translate": "~2.18.4"
|
"angular-translate": "~2.19.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"argparse": {
|
"argparse": {
|
||||||
|
|
@ -222,7 +239,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"moment": {
|
"moment": {
|
||||||
"version": "2.29.1"
|
"version": "2.29.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
|
||||||
|
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
|
||||||
},
|
},
|
||||||
"oclazyload": {
|
"oclazyload": {
|
||||||
"version": "0.6.3"
|
"version": "0.6.3"
|
||||||
|
|
|
||||||
|
|
@ -153,6 +153,7 @@
|
||||||
"Email already exists": "Email already exists",
|
"Email already exists": "Email already exists",
|
||||||
"User already exists": "User already exists",
|
"User already exists": "User already exists",
|
||||||
"Absence change notification on the labour calendar": "Notificacion de cambio de ausencia en el calendario laboral",
|
"Absence change notification on the labour calendar": "Notificacion de cambio de ausencia en el calendario laboral",
|
||||||
|
"Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
|
||||||
"Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
|
"Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
|
||||||
"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
|
"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
|
||||||
"I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
|
"I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
|
||||||
|
|
@ -237,8 +238,10 @@
|
||||||
"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
|
"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
|
||||||
"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
|
"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
|
||||||
"This route does not exists": "Esta ruta no existe",
|
"This route does not exists": "Esta ruta no existe",
|
||||||
"Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
|
"Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
|
||||||
"You don't have grant privilege": "No tienes privilegios para dar privilegios",
|
"You don't have grant privilege": "No tienes privilegios para dar privilegios",
|
||||||
"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
|
"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
|
||||||
|
"Already has this status": "Ya tiene este estado",
|
||||||
|
"There aren't records for this week": "No existen registros para esta semana",
|
||||||
"Empty data source": "Origen de datos vacio"
|
"Empty data source": "Origen de datos vacio"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,181 +0,0 @@
|
||||||
const Imap = require('imap');
|
|
||||||
module.exports = Self => {
|
|
||||||
Self.remoteMethod('checkInbox', {
|
|
||||||
description: 'Check an email inbox and process it',
|
|
||||||
accessType: 'READ',
|
|
||||||
returns:
|
|
||||||
{
|
|
||||||
arg: 'body',
|
|
||||||
type: 'file',
|
|
||||||
root: true
|
|
||||||
},
|
|
||||||
http: {
|
|
||||||
path: `/checkInbox`,
|
|
||||||
verb: 'POST'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Self.checkInbox = async() => {
|
|
||||||
let imapConfig = await Self.app.models.WorkerTimeControlParams.findOne();
|
|
||||||
let imap = new Imap({
|
|
||||||
user: imapConfig.mailUser,
|
|
||||||
password: imapConfig.mailPass,
|
|
||||||
host: imapConfig.mailHost,
|
|
||||||
port: 993,
|
|
||||||
tls: true
|
|
||||||
});
|
|
||||||
let isEmailOk;
|
|
||||||
let uid;
|
|
||||||
let emailBody;
|
|
||||||
|
|
||||||
function openInbox(cb) {
|
|
||||||
imap.openBox('INBOX', true, cb);
|
|
||||||
}
|
|
||||||
|
|
||||||
imap.once('ready', function() {
|
|
||||||
openInbox(function(err, box) {
|
|
||||||
if (err) throw err;
|
|
||||||
const totalMessages = box.messages.total;
|
|
||||||
if (totalMessages == 0)
|
|
||||||
imap.end();
|
|
||||||
|
|
||||||
let f = imap.seq.fetch('1:*', {
|
|
||||||
bodies: ['HEADER.FIELDS (FROM SUBJECT)', '1'],
|
|
||||||
struct: true
|
|
||||||
});
|
|
||||||
f.on('message', function(msg, seqno) {
|
|
||||||
isEmailOk = false;
|
|
||||||
msg.on('body', function(stream, info) {
|
|
||||||
let buffer = '';
|
|
||||||
let bufferCopy = '';
|
|
||||||
stream.on('data', function(chunk) {
|
|
||||||
buffer = chunk.toString('utf8');
|
|
||||||
if (info.which === '1' && bufferCopy.length == 0)
|
|
||||||
bufferCopy = buffer.replace(/\s/g, ' ');
|
|
||||||
});
|
|
||||||
stream.on('end', function() {
|
|
||||||
if (bufferCopy.length > 0) {
|
|
||||||
emailBody = bufferCopy.toUpperCase().trim();
|
|
||||||
|
|
||||||
const bodyPositionOK = emailBody.match(/\bOK\b/i);
|
|
||||||
if (bodyPositionOK != null && (bodyPositionOK.index == 0 || bodyPositionOK.index == 122))
|
|
||||||
isEmailOk = true;
|
|
||||||
else
|
|
||||||
isEmailOk = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
msg.once('attributes', function(attrs) {
|
|
||||||
uid = attrs.uid;
|
|
||||||
});
|
|
||||||
msg.once('end', function() {
|
|
||||||
if (info.which === 'HEADER.FIELDS (FROM SUBJECT)') {
|
|
||||||
if (isEmailOk) {
|
|
||||||
imap.move(uid, 'exito', function(err) {
|
|
||||||
});
|
|
||||||
emailConfirm(buffer);
|
|
||||||
} else {
|
|
||||||
imap.move(uid, 'error', function(err) {
|
|
||||||
});
|
|
||||||
emailReply(buffer, emailBody);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
f.once('end', function() {
|
|
||||||
imap.end();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
imap.connect();
|
|
||||||
return 'Leer emails de gestion horaria';
|
|
||||||
};
|
|
||||||
|
|
||||||
async function emailConfirm(buffer) {
|
|
||||||
const now = new Date();
|
|
||||||
const from = JSON.stringify(Imap.parseHeader(buffer).from);
|
|
||||||
const subject = JSON.stringify(Imap.parseHeader(buffer).subject);
|
|
||||||
|
|
||||||
const timeControlDate = await getEmailDate(subject);
|
|
||||||
const week = timeControlDate[0];
|
|
||||||
const year = timeControlDate[1];
|
|
||||||
const user = await getUser(from);
|
|
||||||
let workerMail;
|
|
||||||
|
|
||||||
if (user.id != null) {
|
|
||||||
workerMail = await Self.app.models.WorkerTimeControlMail.findOne({
|
|
||||||
where: {
|
|
||||||
week: week,
|
|
||||||
year: year,
|
|
||||||
workerFk: user.id
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (workerMail != null) {
|
|
||||||
await workerMail.updateAttributes({
|
|
||||||
updated: now,
|
|
||||||
state: 'CONFIRMED'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function emailReply(buffer, emailBody) {
|
|
||||||
const now = new Date();
|
|
||||||
const from = JSON.stringify(Imap.parseHeader(buffer).from);
|
|
||||||
const subject = JSON.stringify(Imap.parseHeader(buffer).subject);
|
|
||||||
|
|
||||||
const timeControlDate = await getEmailDate(subject);
|
|
||||||
const week = timeControlDate[0];
|
|
||||||
const year = timeControlDate[1];
|
|
||||||
const user = await getUser(from);
|
|
||||||
let workerMail;
|
|
||||||
|
|
||||||
if (user.id != null) {
|
|
||||||
workerMail = await Self.app.models.WorkerTimeControlMail.findOne({
|
|
||||||
where: {
|
|
||||||
week: week,
|
|
||||||
year: year,
|
|
||||||
workerFk: user.id
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (workerMail != null) {
|
|
||||||
await workerMail.updateAttributes({
|
|
||||||
updated: now,
|
|
||||||
state: 'REVISE',
|
|
||||||
emailResponse: emailBody
|
|
||||||
});
|
|
||||||
} else
|
|
||||||
await sendMail(user, subject, emailBody);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getUser(workerEmail) {
|
|
||||||
const userEmail = workerEmail.match(/(?<=<)(.*?)(?=>)/);
|
|
||||||
|
|
||||||
let [user] = await Self.rawSql(`SELECT u.id,u.name FROM account.user u
|
|
||||||
LEFT JOIN account.mailForward m on m.account = u.id
|
|
||||||
WHERE forwardTo =? OR
|
|
||||||
CONCAT(u.name,'@verdnatura.es') = ?`,
|
|
||||||
[userEmail[0], userEmail[0]]);
|
|
||||||
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getEmailDate(subject) {
|
|
||||||
const date = subject.match(/\d+/g);
|
|
||||||
return date;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function sendMail(user, subject, emailBody) {
|
|
||||||
const sendTo = 'rrhh@verdnatura.es';
|
|
||||||
const emailSubject = subject + ' ' + user.name;
|
|
||||||
|
|
||||||
await Self.app.models.Mail.create({
|
|
||||||
receiver: sendTo,
|
|
||||||
subject: emailSubject,
|
|
||||||
body: emailBody
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
@ -0,0 +1,377 @@
|
||||||
|
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
|
|
||||||
|
module.exports = Self => {
|
||||||
|
Self.remoteMethodCtx('sendMail', {
|
||||||
|
description: `Send an email with the hours booked to the employees who telecommuting.
|
||||||
|
It also inserts booked hours in cases where the employee is telecommuting`,
|
||||||
|
accessType: 'WRITE',
|
||||||
|
accepts: [{
|
||||||
|
arg: 'workerId',
|
||||||
|
type: 'number',
|
||||||
|
description: 'The worker id'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'week',
|
||||||
|
type: 'number'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'year',
|
||||||
|
type: 'number'
|
||||||
|
}],
|
||||||
|
returns: [{
|
||||||
|
type: 'Object',
|
||||||
|
root: true
|
||||||
|
}],
|
||||||
|
http: {
|
||||||
|
path: `/sendMail`,
|
||||||
|
verb: 'POST'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Self.sendMail = async(ctx, options) => {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const conn = Self.dataSource.connector;
|
||||||
|
const args = ctx.args;
|
||||||
|
const $t = ctx.req.__; // $translate
|
||||||
|
let tx;
|
||||||
|
const myOptions = {};
|
||||||
|
|
||||||
|
if (typeof options == 'object')
|
||||||
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
|
if (!myOptions.transaction) {
|
||||||
|
tx = await Self.beginTransaction({});
|
||||||
|
myOptions.transaction = tx;
|
||||||
|
}
|
||||||
|
|
||||||
|
const stmts = [];
|
||||||
|
let stmt;
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (!args.week || !args.year) {
|
||||||
|
const from = new Date();
|
||||||
|
const to = new Date();
|
||||||
|
|
||||||
|
const time = await models.Time.findOne({
|
||||||
|
where: {
|
||||||
|
dated: {between: [from.setDate(from.getDate() - 10), to.setDate(to.getDate() - 4)]}
|
||||||
|
},
|
||||||
|
order: 'week ASC'
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
args.week = time.week;
|
||||||
|
args.year = time.year;
|
||||||
|
}
|
||||||
|
|
||||||
|
const started = getStartDateOfWeekNumber(args.week, args.year);
|
||||||
|
started.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
const ended = new Date(started);
|
||||||
|
ended.setDate(started.getDate() + 6);
|
||||||
|
ended.setHours(23, 59, 59, 999);
|
||||||
|
|
||||||
|
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate');
|
||||||
|
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate');
|
||||||
|
|
||||||
|
if (args.workerId) {
|
||||||
|
await models.WorkerTimeControl.destroyAll({
|
||||||
|
userFk: args.workerId,
|
||||||
|
timed: {between: [started, ended]},
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
const where = {
|
||||||
|
workerFk: args.workerId,
|
||||||
|
year: args.year,
|
||||||
|
week: args.week
|
||||||
|
};
|
||||||
|
await models.WorkerTimeControlMail.updateAll(where, {
|
||||||
|
updated: new Date(), state: 'SENDED'
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
stmt = new ParameterizedSQL(
|
||||||
|
`CALL vn.timeControl_calculateByUser(?, ?, ?)
|
||||||
|
`, [args.workerId, started, ended]);
|
||||||
|
stmts.push(stmt);
|
||||||
|
|
||||||
|
stmt = new ParameterizedSQL(
|
||||||
|
`CALL vn.timeBusiness_calculateByUser(?, ?, ?)
|
||||||
|
`, [args.workerId, started, ended]);
|
||||||
|
stmts.push(stmt);
|
||||||
|
} else {
|
||||||
|
await models.WorkerTimeControl.destroyAll({
|
||||||
|
timed: {between: [started, ended]},
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
const where = {
|
||||||
|
year: args.year,
|
||||||
|
week: args.week
|
||||||
|
};
|
||||||
|
await models.WorkerTimeControlMail.updateAll(where, {
|
||||||
|
updated: new Date(), state: 'SENDED'
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
stmt = new ParameterizedSQL(`CALL vn.timeControl_calculateAll(?, ?)`, [started, ended]);
|
||||||
|
stmts.push(stmt);
|
||||||
|
|
||||||
|
stmt = new ParameterizedSQL(`CALL vn.timeBusiness_calculateAll(?, ?)`, [started, ended]);
|
||||||
|
stmts.push(stmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
stmt = new ParameterizedSQL(`
|
||||||
|
SELECT CONCAT(u.name, '@verdnatura.es') receiver,
|
||||||
|
u.id workerFk,
|
||||||
|
tb.dated,
|
||||||
|
tb.timeWorkDecimal,
|
||||||
|
tb.timeWorkSexagesimal timeWorkSexagesimal,
|
||||||
|
tb.timeTable,
|
||||||
|
tc.timeWorkDecimal timeWorkedDecimal,
|
||||||
|
tc.timeWorkSexagesimal timeWorkedSexagesimal,
|
||||||
|
tb.type,
|
||||||
|
tb.businessFk,
|
||||||
|
tb.permissionRate,
|
||||||
|
d.isTeleworking
|
||||||
|
FROM tmp.timeBusinessCalculate tb
|
||||||
|
JOIN user u ON u.id = tb.userFk
|
||||||
|
JOIN department d ON d.id = tb.departmentFk
|
||||||
|
JOIN business b ON b.id = tb.businessFk
|
||||||
|
LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated
|
||||||
|
LEFT JOIN worker w ON w.id = u.id
|
||||||
|
JOIN (SELECT tb.userFk,
|
||||||
|
SUM(IF(tb.type IS NULL,
|
||||||
|
IF(tc.timeWorkDecimal > 0, FALSE, IF(tb.timeWorkDecimal > 0, TRUE, FALSE)),
|
||||||
|
TRUE))isTeleworkingWeek
|
||||||
|
FROM tmp.timeBusinessCalculate tb
|
||||||
|
LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk
|
||||||
|
AND tc.dated = tb.dated
|
||||||
|
GROUP BY tb.userFk
|
||||||
|
HAVING isTeleworkingWeek > 0
|
||||||
|
)sub ON sub.userFk = u.id
|
||||||
|
WHERE d.hasToRefill
|
||||||
|
AND IFNULL(?, u.id) = u.id
|
||||||
|
AND b.companyCodeFk = 'VNL'
|
||||||
|
AND w.businessFk
|
||||||
|
ORDER BY u.id, tb.dated
|
||||||
|
`, [args.workerId]);
|
||||||
|
const index = stmts.push(stmt) - 1;
|
||||||
|
|
||||||
|
const sql = ParameterizedSQL.join(stmts, ';');
|
||||||
|
const days = await conn.executeStmt(sql, myOptions);
|
||||||
|
|
||||||
|
let previousWorkerFk = days[index][0].workerFk;
|
||||||
|
let previousReceiver = days[index][0].receiver;
|
||||||
|
|
||||||
|
const workerTimeControlConfig = await models.WorkerTimeControlConfig.findOne(null, myOptions);
|
||||||
|
|
||||||
|
for (let day of days[index]) {
|
||||||
|
workerFk = day.workerFk;
|
||||||
|
if (day.timeWorkDecimal > 0 && day.timeWorkedDecimal == null
|
||||||
|
&& (day.permissionRate ? day.permissionRate : true)) {
|
||||||
|
if (day.timeTable == null) {
|
||||||
|
const timed = new Date(day.dated);
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(8),
|
||||||
|
manual: true,
|
||||||
|
direction: 'in',
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
if (day.timeWorkDecimal >= workerTimeControlConfig.timeToBreakTime / 3600) {
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(9),
|
||||||
|
manual: true,
|
||||||
|
direction: 'middle',
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(9, 20),
|
||||||
|
manual: true,
|
||||||
|
direction: 'middle',
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
const [hoursWork, minutesWork, secondsWork] = getTime(day.timeWorkSexagesimal);
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(8 + hoursWork, minutesWork, secondsWork),
|
||||||
|
manual: true,
|
||||||
|
direction: 'out',
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
} else {
|
||||||
|
const weekDay = day.dated.getDay();
|
||||||
|
const journeys = await models.Journey.find({
|
||||||
|
where: {
|
||||||
|
business_id: day.businessFk,
|
||||||
|
day_id: weekDay
|
||||||
|
}
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
let timeTableDecimalInSeconds = 0;
|
||||||
|
for (let journey of journeys) {
|
||||||
|
const start = new Date();
|
||||||
|
const [startHours, startMinutes, startSeconds] = getTime(journey.start);
|
||||||
|
start.setHours(startHours, startMinutes, startSeconds, 0);
|
||||||
|
|
||||||
|
const end = new Date();
|
||||||
|
const [endHours, endMinutes, endSeconds] = getTime(journey.end);
|
||||||
|
end.setHours(endHours, endMinutes, endSeconds, 0);
|
||||||
|
|
||||||
|
const result = (end - start) / 1000;
|
||||||
|
timeTableDecimalInSeconds += result;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let journey of journeys) {
|
||||||
|
const timeTableDecimal = timeTableDecimalInSeconds / 3600;
|
||||||
|
if (day.timeWorkDecimal == timeTableDecimal) {
|
||||||
|
const timed = new Date(day.dated);
|
||||||
|
const [startHours, startMinutes, startSeconds] = getTime(journey.start);
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(startHours, startMinutes, startSeconds),
|
||||||
|
manual: true,
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
const [endHours, endMinutes, endSeconds] = getTime(journey.end);
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(endHours, endMinutes, endSeconds),
|
||||||
|
manual: true,
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
} else {
|
||||||
|
const minStart = journeys.reduce(function(prev, curr) {
|
||||||
|
return curr.start < prev.start ? curr : prev;
|
||||||
|
});
|
||||||
|
if (journey == minStart) {
|
||||||
|
const timed = new Date(day.dated);
|
||||||
|
const [startHours, startMinutes, startSeconds] = getTime(journey.start);
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(startHours, startMinutes, startSeconds),
|
||||||
|
manual: true,
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
const [hoursWork, minutesWork, secondsWork] = getTime(day.timeWorkSexagesimal);
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(
|
||||||
|
startHours + hoursWork,
|
||||||
|
startMinutes + minutesWork,
|
||||||
|
startSeconds + secondsWork
|
||||||
|
),
|
||||||
|
manual: true,
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (day.timeWorkDecimal >= workerTimeControlConfig.timeToBreakTime / 3600) {
|
||||||
|
const minStart = journeys.reduce(function(prev, curr) {
|
||||||
|
return curr.start < prev.start ? curr : prev;
|
||||||
|
});
|
||||||
|
if (journey == minStart) {
|
||||||
|
const timed = new Date(day.dated);
|
||||||
|
const [startHours, startMinutes, startSeconds] = getTime(journey.start);
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(startHours + 1, startMinutes, startSeconds),
|
||||||
|
manual: true,
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
await models.WorkerTimeControl.create({
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: timed.setHours(startHours + 1, startMinutes + 20, startSeconds),
|
||||||
|
manual: true,
|
||||||
|
isSendMail: true
|
||||||
|
}, myOptions);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const timed = new Date(day.dated);
|
||||||
|
const firstWorkerTimeControl = await models.WorkerTimeControl.findOne({
|
||||||
|
where: {
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: {between: [timed.setHours(0, 0, 0, 0), timed.setHours(23, 59, 59, 999)]}
|
||||||
|
},
|
||||||
|
order: 'timed ASC'
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
if (firstWorkerTimeControl)
|
||||||
|
firstWorkerTimeControl.updateAttribute('direction', 'in', myOptions);
|
||||||
|
|
||||||
|
const lastWorkerTimeControl = await models.WorkerTimeControl.findOne({
|
||||||
|
where: {
|
||||||
|
userFk: day.workerFk,
|
||||||
|
timed: {between: [timed.setHours(0, 0, 0, 0), timed.setHours(23, 59, 59, 999)]}
|
||||||
|
},
|
||||||
|
order: 'timed DESC'
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
if (lastWorkerTimeControl)
|
||||||
|
lastWorkerTimeControl.updateAttribute('direction', 'out', myOptions);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const lastDay = days[index][days[index].length - 1];
|
||||||
|
if (day.workerFk != previousWorkerFk || day == lastDay) {
|
||||||
|
const salix = await models.Url.findOne({
|
||||||
|
where: {
|
||||||
|
appName: 'salix',
|
||||||
|
environment: process.env.NODE_ENV || 'dev'
|
||||||
|
}
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
const timestamp = started.getTime() / 1000;
|
||||||
|
await models.Mail.create({
|
||||||
|
receiver: previousReceiver,
|
||||||
|
subject: $t('Record of hours week', {
|
||||||
|
week: args.week,
|
||||||
|
year: args.year
|
||||||
|
}),
|
||||||
|
body: `${salix.url}worker/${previousWorkerFk}/time-control?timestamp=${timestamp}`
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
query = `INSERT IGNORE INTO workerTimeControlMail (workerFk, year, week)
|
||||||
|
VALUES (?, ?, ?);`;
|
||||||
|
await Self.rawSql(query, [previousWorkerFk, args.year, args.week], myOptions);
|
||||||
|
|
||||||
|
previousWorkerFk = day.workerFk;
|
||||||
|
previousReceiver = day.receiver;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tx) await tx.commit();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch (e) {
|
||||||
|
if (tx) await tx.rollback();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
function getStartDateOfWeekNumber(week, year) {
|
||||||
|
const simple = new Date(year, 0, 1 + (week - 1) * 7);
|
||||||
|
const dow = simple.getDay();
|
||||||
|
const weekStart = simple;
|
||||||
|
if (dow <= 4)
|
||||||
|
weekStart.setDate(simple.getDate() - simple.getDay() + 1);
|
||||||
|
else
|
||||||
|
weekStart.setDate(simple.getDate() + 8 - simple.getDay());
|
||||||
|
return weekStart;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getTime(timeString) {
|
||||||
|
const [hours, minutes, seconds] = timeString.split(':');
|
||||||
|
return [parseInt(hours), parseInt(minutes), parseInt(seconds)];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,132 @@
|
||||||
|
const models = require('vn-loopback/server/server').models;
|
||||||
|
|
||||||
|
describe('workerTimeControl sendMail()', () => {
|
||||||
|
const workerId = 18;
|
||||||
|
const ctx = {
|
||||||
|
req: {
|
||||||
|
__: value => {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
args: {}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeAll(function() {
|
||||||
|
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
|
||||||
|
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fill time control of a worker without records in Journey and with rest', async() => {
|
||||||
|
const tx = await models.WorkerTimeControl.beginTransaction({});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
|
||||||
|
await models.WorkerTimeControl.sendMail(ctx, options);
|
||||||
|
|
||||||
|
const workerTimeControl = await models.WorkerTimeControl.find({
|
||||||
|
where: {userFk: workerId}
|
||||||
|
}, options);
|
||||||
|
|
||||||
|
expect(workerTimeControl[0].timed.getHours()).toEqual(8);
|
||||||
|
expect(workerTimeControl[1].timed.getHours()).toEqual(9);
|
||||||
|
expect(`${workerTimeControl[2].timed.getHours()}:${workerTimeControl[2].timed.getMinutes()}`).toEqual('9:20');
|
||||||
|
expect(workerTimeControl[3].timed.getHours()).toEqual(16);
|
||||||
|
|
||||||
|
await tx.rollback();
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fill time control of a worker without records in Journey and without rest', async() => {
|
||||||
|
const workdayOf20Hours = 3;
|
||||||
|
const tx = await models.WorkerTimeControl.beginTransaction({});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
query = `UPDATE business b
|
||||||
|
SET b.calendarTypeFk = ?
|
||||||
|
WHERE b.workerFk = ?; `;
|
||||||
|
await models.WorkerTimeControl.rawSql(query, [workdayOf20Hours, workerId], options);
|
||||||
|
|
||||||
|
await models.WorkerTimeControl.sendMail(ctx, options);
|
||||||
|
|
||||||
|
const workerTimeControl = await models.WorkerTimeControl.find({
|
||||||
|
where: {userFk: workerId}
|
||||||
|
}, options);
|
||||||
|
|
||||||
|
expect(workerTimeControl[0].timed.getHours()).toEqual(8);
|
||||||
|
expect(workerTimeControl[1].timed.getHours()).toEqual(12);
|
||||||
|
|
||||||
|
await tx.rollback();
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fill time control of a worker with records in Journey and with rest', async() => {
|
||||||
|
const tx = await models.WorkerTimeControl.beginTransaction({});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
query = `INSERT INTO postgresql.journey(journey_id, day_id, start, end, business_id)
|
||||||
|
VALUES
|
||||||
|
(1, 1, '09:00:00', '13:00:00', ?),
|
||||||
|
(2, 1, '14:00:00', '19:00:00', ?);`;
|
||||||
|
await models.WorkerTimeControl.rawSql(query, [workerId, workerId, workerId], options);
|
||||||
|
|
||||||
|
await models.WorkerTimeControl.sendMail(ctx, options);
|
||||||
|
|
||||||
|
const workerTimeControl = await models.WorkerTimeControl.find({
|
||||||
|
where: {userFk: workerId}
|
||||||
|
}, options);
|
||||||
|
|
||||||
|
expect(workerTimeControl[0].timed.getHours()).toEqual(9);
|
||||||
|
expect(workerTimeControl[2].timed.getHours()).toEqual(10);
|
||||||
|
expect(`${workerTimeControl[3].timed.getHours()}:${workerTimeControl[3].timed.getMinutes()}`).toEqual('10:20');
|
||||||
|
expect(workerTimeControl[1].timed.getHours()).toEqual(13);
|
||||||
|
expect(workerTimeControl[4].timed.getHours()).toEqual(14);
|
||||||
|
expect(workerTimeControl[5].timed.getHours()).toEqual(19);
|
||||||
|
|
||||||
|
await tx.rollback();
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fill time control of a worker with records in Journey and without rest', async() => {
|
||||||
|
const tx = await models.WorkerTimeControl.beginTransaction({});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
query = `INSERT INTO postgresql.journey(journey_id, day_id, start, end, business_id)
|
||||||
|
VALUES
|
||||||
|
(1, 1, '12:30:00', '14:00:00', ?);`;
|
||||||
|
await models.WorkerTimeControl.rawSql(query, [workerId, workerId, workerId], options);
|
||||||
|
|
||||||
|
await models.WorkerTimeControl.sendMail(ctx, options);
|
||||||
|
|
||||||
|
const workerTimeControl = await models.WorkerTimeControl.find({
|
||||||
|
where: {userFk: workerId}
|
||||||
|
}, options);
|
||||||
|
|
||||||
|
expect(`${workerTimeControl[0].timed.getHours()}:${workerTimeControl[0].timed.getMinutes()}`).toEqual('12:30');
|
||||||
|
expect(workerTimeControl[1].timed.getHours()).toEqual(14);
|
||||||
|
|
||||||
|
await tx.rollback();
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(function() {
|
||||||
|
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
module.exports = Self => {
|
||||||
|
Self.remoteMethodCtx('updateWorkerTimeControlMail', {
|
||||||
|
description: 'Updates the state of WorkerTimeControlMail',
|
||||||
|
accessType: 'WRITE',
|
||||||
|
accepts: [{
|
||||||
|
arg: 'workerId',
|
||||||
|
type: 'number',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'year',
|
||||||
|
type: 'number',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'week',
|
||||||
|
type: 'number',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'state',
|
||||||
|
type: 'string',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'reason',
|
||||||
|
type: 'string'
|
||||||
|
}],
|
||||||
|
returns: {
|
||||||
|
type: 'boolean',
|
||||||
|
root: true
|
||||||
|
},
|
||||||
|
http: {
|
||||||
|
path: `/updateWorkerTimeControlMail`,
|
||||||
|
verb: 'POST'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Self.updateWorkerTimeControlMail = async(ctx, options) => {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const args = ctx.args;
|
||||||
|
const userId = ctx.req.accessToken.userId;
|
||||||
|
|
||||||
|
const myOptions = {};
|
||||||
|
|
||||||
|
if (typeof options == 'object')
|
||||||
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
|
const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
|
||||||
|
where: {
|
||||||
|
workerFk: args.workerId,
|
||||||
|
year: args.year,
|
||||||
|
week: args.week
|
||||||
|
}
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
if (!workerTimeControlMail) throw new UserError(`There aren't records for this week`);
|
||||||
|
|
||||||
|
const oldState = workerTimeControlMail.state;
|
||||||
|
const oldReason = workerTimeControlMail.reason;
|
||||||
|
|
||||||
|
if (oldState == args.state) throw new UserError('Already has this status');
|
||||||
|
|
||||||
|
await workerTimeControlMail.updateAttributes({
|
||||||
|
state: args.state,
|
||||||
|
reason: args.reason || null
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
|
const logRecord = {
|
||||||
|
originFk: args.workerId,
|
||||||
|
userFk: userId,
|
||||||
|
action: 'update',
|
||||||
|
changedModel: 'WorkerTimeControlMail',
|
||||||
|
oldInstance: {
|
||||||
|
state: oldState,
|
||||||
|
reason: oldReason
|
||||||
|
},
|
||||||
|
newInstance: {
|
||||||
|
state: args.state,
|
||||||
|
reason: args.reason
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return models.WorkerLog.create(logRecord, myOptions);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
@ -20,6 +20,12 @@
|
||||||
"EducationLevel": {
|
"EducationLevel": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
"Journey": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"Time": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"WorkCenter": {
|
"WorkCenter": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
|
@ -59,6 +65,9 @@
|
||||||
"WorkerLog": {
|
"WorkerLog": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
"WorkerTimeControlConfig": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"WorkerTimeControlParams": {
|
"WorkerTimeControlParams": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
"name": "Journey",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "postgresql.journey"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"journey_id": {
|
||||||
|
"id": true,
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"day_id": {
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"start": {
|
||||||
|
"type": "date"
|
||||||
|
},
|
||||||
|
"end": {
|
||||||
|
"type": "date"
|
||||||
|
},
|
||||||
|
"business_id": {
|
||||||
|
"type": "number"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
{
|
||||||
|
"name": "Time",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "time"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"dated": {
|
||||||
|
"id": true,
|
||||||
|
"type": "date"
|
||||||
|
},
|
||||||
|
"year": {
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"week": {
|
||||||
|
"type": "number"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"name": "WorkerTimeControlConfig",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "workerTimeControlConfig"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"id": true,
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"timeToBreakTime": {
|
||||||
|
"type": "number"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
module.exports = Self => {
|
|
||||||
require('../methods/worker-time-control-mail/checkInbox')(Self);
|
|
||||||
};
|
|
||||||
|
|
@ -9,8 +9,7 @@
|
||||||
"properties": {
|
"properties": {
|
||||||
"id": {
|
"id": {
|
||||||
"id": true,
|
"id": true,
|
||||||
"type": "number",
|
"type": "number"
|
||||||
"required": true
|
|
||||||
},
|
},
|
||||||
"workerFk": {
|
"workerFk": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
|
|
@ -27,7 +26,7 @@
|
||||||
"updated": {
|
"updated": {
|
||||||
"type": "date"
|
"type": "date"
|
||||||
},
|
},
|
||||||
"emailResponse": {
|
"reason": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@ module.exports = Self => {
|
||||||
require('../methods/worker-time-control/addTimeEntry')(Self);
|
require('../methods/worker-time-control/addTimeEntry')(Self);
|
||||||
require('../methods/worker-time-control/deleteTimeEntry')(Self);
|
require('../methods/worker-time-control/deleteTimeEntry')(Self);
|
||||||
require('../methods/worker-time-control/updateTimeEntry')(Self);
|
require('../methods/worker-time-control/updateTimeEntry')(Self);
|
||||||
|
require('../methods/worker-time-control/sendMail')(Self);
|
||||||
|
require('../methods/worker-time-control/updateWorkerTimeControlMail')(Self);
|
||||||
|
|
||||||
Self.rewriteDbError(function(err) {
|
Self.rewriteDbError(function(err) {
|
||||||
if (err.code === 'ER_DUP_ENTRY')
|
if (err.code === 'ER_DUP_ENTRY')
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,9 @@
|
||||||
},
|
},
|
||||||
"direction": {
|
"direction": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
},
|
||||||
|
"isSendMail": {
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"relations": {
|
"relations": {
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,18 @@
|
||||||
</vn-tfoot>
|
</vn-tfoot>
|
||||||
</vn-table>
|
</vn-table>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
||||||
|
<vn-button-bar class="vn-pa-xs vn-w-lg">
|
||||||
|
<vn-button
|
||||||
|
label="Satisfied"
|
||||||
|
ng-click="$ctrl.isSatisfied()">
|
||||||
|
</vn-button>
|
||||||
|
<vn-button
|
||||||
|
label="Not satisfied"
|
||||||
|
ng-click="reason.show()">
|
||||||
|
</vn-button>
|
||||||
|
</vn-button-bar>
|
||||||
|
|
||||||
<vn-side-menu side="right">
|
<vn-side-menu side="right">
|
||||||
<div class="vn-pa-md">
|
<div class="vn-pa-md">
|
||||||
<div class="totalBox" style="text-align: center;">
|
<div class="totalBox" style="text-align: center;">
|
||||||
|
|
@ -148,4 +160,21 @@
|
||||||
ng-click="$ctrl.save()">
|
ng-click="$ctrl.save()">
|
||||||
</vn-icon-button>
|
</vn-icon-button>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
</vn-popover>
|
</vn-popover>
|
||||||
|
|
||||||
|
<vn-dialog
|
||||||
|
vn-id="reason"
|
||||||
|
on-accept="$ctrl.isUnsatisfied()">
|
||||||
|
<tpl-body>
|
||||||
|
<vn-textarea
|
||||||
|
label="Reason"
|
||||||
|
ng-model="$ctrl.reason"
|
||||||
|
required="true"
|
||||||
|
rows="3">
|
||||||
|
</vn-textarea>
|
||||||
|
</tpl-body>
|
||||||
|
<tpl-buttons>
|
||||||
|
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
|
||||||
|
<button response="accept" translate>Save</button>
|
||||||
|
</tpl-buttons>
|
||||||
|
</vn-dialog>
|
||||||
|
|
@ -294,6 +294,42 @@ class Controller extends Section {
|
||||||
this.$.editEntry.show($event);
|
this.$.editEntry.show($event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getWeekNumber(currentDate) {
|
||||||
|
const startDate = new Date(currentDate.getFullYear(), 0, 1);
|
||||||
|
let days = Math.floor((currentDate - startDate) /
|
||||||
|
(24 * 60 * 60 * 1000));
|
||||||
|
return Math.ceil(days / 7);
|
||||||
|
}
|
||||||
|
|
||||||
|
isSatisfied() {
|
||||||
|
const weekNumber = this.getWeekNumber(this.date);
|
||||||
|
const params = {
|
||||||
|
workerId: this.worker.id,
|
||||||
|
year: this.date.getFullYear(),
|
||||||
|
week: weekNumber,
|
||||||
|
state: 'CONFIRMED'
|
||||||
|
};
|
||||||
|
const query = `WorkerTimeControls/updateWorkerTimeControlMail`;
|
||||||
|
this.$http.post(query, params).then(() => {
|
||||||
|
this.vnApp.showSuccess(this.$t('Data saved!'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
isUnsatisfied() {
|
||||||
|
const weekNumber = this.getWeekNumber(this.date);
|
||||||
|
const params = {
|
||||||
|
workerId: this.worker.id,
|
||||||
|
year: this.date.getFullYear(),
|
||||||
|
week: weekNumber,
|
||||||
|
state: 'REVISE',
|
||||||
|
reason: this.reason
|
||||||
|
};
|
||||||
|
const query = `WorkerTimeControls/updateWorkerTimeControlMail`;
|
||||||
|
this.$http.post(query, params).then(() => {
|
||||||
|
this.vnApp.showSuccess(this.$t('Data saved!'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
save() {
|
save() {
|
||||||
try {
|
try {
|
||||||
const entry = this.selectedRow;
|
const entry = this.selectedRow;
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,7 @@ This time entry will be deleted: Se eliminará la hora fichada
|
||||||
Are you sure you want to delete this entry?: ¿Seguro que quieres eliminarla?
|
Are you sure you want to delete this entry?: ¿Seguro que quieres eliminarla?
|
||||||
Finish at: Termina a las
|
Finish at: Termina a las
|
||||||
Entry removed: Fichada borrada
|
Entry removed: Fichada borrada
|
||||||
The entry type can't be empty: El tipo de fichada no puede quedar vacía
|
The entry type can't be empty: El tipo de fichada no puede quedar vacía
|
||||||
|
Satisfied: Conforme
|
||||||
|
Not satisfied: No conforme
|
||||||
|
Reason: Motivo
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -42,7 +42,7 @@
|
||||||
"puppeteer": "^18.0.5",
|
"puppeteer": "^18.0.5",
|
||||||
"read-chunk": "^3.2.0",
|
"read-chunk": "^3.2.0",
|
||||||
"require-yaml": "0.0.1",
|
"require-yaml": "0.0.1",
|
||||||
"sharp": "^0.31.0",
|
"sharp": "^0.31.2",
|
||||||
"smbhash": "0.0.1",
|
"smbhash": "0.0.1",
|
||||||
"strong-error-handler": "^2.3.2",
|
"strong-error-handler": "^2.3.2",
|
||||||
"uuid": "^3.3.3",
|
"uuid": "^3.3.3",
|
||||||
|
|
@ -63,9 +63,7 @@
|
||||||
"del": "^2.2.2",
|
"del": "^2.2.2",
|
||||||
"eslint": "^7.11.0",
|
"eslint": "^7.11.0",
|
||||||
"eslint-config-google": "^0.11.0",
|
"eslint-config-google": "^0.11.0",
|
||||||
"eslint-config-prettier": "^8.5.0",
|
|
||||||
"eslint-plugin-jasmine": "^2.10.1",
|
"eslint-plugin-jasmine": "^2.10.1",
|
||||||
"eslint-plugin-prettier": "^4.2.1",
|
|
||||||
"fancy-log": "^1.3.2",
|
"fancy-log": "^1.3.2",
|
||||||
"file-loader": "^1.1.11",
|
"file-loader": "^1.1.11",
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^4.0.2",
|
||||||
|
|
@ -82,7 +80,7 @@
|
||||||
"html-loader-jest": "^0.2.1",
|
"html-loader-jest": "^0.2.1",
|
||||||
"html-webpack-plugin": "^4.0.0-beta.11",
|
"html-webpack-plugin": "^4.0.0-beta.11",
|
||||||
"identity-obj-proxy": "^3.0.0",
|
"identity-obj-proxy": "^3.0.0",
|
||||||
"jasmine": "^4.1.0",
|
"jasmine": "^4.5.0",
|
||||||
"jasmine-reporters": "^2.4.0",
|
"jasmine-reporters": "^2.4.0",
|
||||||
"jasmine-spec-reporter": "^7.0.0",
|
"jasmine-spec-reporter": "^7.0.0",
|
||||||
"jest": "^26.0.1",
|
"jest": "^26.0.1",
|
||||||
|
|
@ -94,7 +92,6 @@
|
||||||
"node-sass": "^4.14.1",
|
"node-sass": "^4.14.1",
|
||||||
"nodemon": "^2.0.16",
|
"nodemon": "^2.0.16",
|
||||||
"plugin-error": "^1.0.1",
|
"plugin-error": "^1.0.1",
|
||||||
"prettier": "^2.7.1",
|
|
||||||
"raw-loader": "^1.0.0",
|
"raw-loader": "^1.0.0",
|
||||||
"regenerator-runtime": "^0.13.7",
|
"regenerator-runtime": "^0.13.7",
|
||||||
"sass-loader": "^7.3.1",
|
"sass-loader": "^7.3.1",
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<div class="columns">
|
<div class="columns">
|
||||||
<div class="size50">
|
<div class="size50">
|
||||||
<a href="https://www.verdnatura.es" target="_blank">
|
<a href="https://verdnatura.es" target="_blank">
|
||||||
<div class="btn">
|
<div class="btn">
|
||||||
<!-- <span class="icon vn-pa-sm"><img v-bind:src="getEmailSrc('action.png')"/></span> -->
|
<!-- <span class="icon vn-pa-sm"><img v-bind:src="getEmailSrc('action.png')"/></span> -->
|
||||||
<span class="text vn-pa-sm">{{ $t('buttons.webAcccess')}}</span>
|
<span class="text vn-pa-sm">{{ $t('buttons.webAcccess')}}</span>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ buttons:
|
||||||
webAcccess: Visit our website
|
webAcccess: Visit our website
|
||||||
info: Help us to improve
|
info: Help us to improve
|
||||||
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
||||||
· www.verdnatura.es · clientes@verdnatura.es
|
· verdnatura.es · clientes@verdnatura.es
|
||||||
disclaimer: '- NOTICE - This message is private and confidential, and should be used
|
disclaimer: '- NOTICE - This message is private and confidential, and should be used
|
||||||
exclusively by the person receiving it. If you have received this message by mistake,
|
exclusively by the person receiving it. If you have received this message by mistake,
|
||||||
please notify the sender and delete that message and any attached documents that it may contain.
|
please notify the sender and delete that message and any attached documents that it may contain.
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ buttons:
|
||||||
webAcccess: Visita nuestra Web
|
webAcccess: Visita nuestra Web
|
||||||
info: Ayúdanos a mejorar
|
info: Ayúdanos a mejorar
|
||||||
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
||||||
· www.verdnatura.es · clientes@verdnatura.es
|
· verdnatura.es · clientes@verdnatura.es
|
||||||
disclaimer: '- AVISO - Este mensaje es privado y confidencial, y debe ser utilizado
|
disclaimer: '- AVISO - Este mensaje es privado y confidencial, y debe ser utilizado
|
||||||
exclusivamente por la persona destinataria del mismo. Si has recibido este mensaje
|
exclusivamente por la persona destinataria del mismo. Si has recibido este mensaje
|
||||||
por error, te rogamos lo comuniques al remitente y borres dicho mensaje y cualquier
|
por error, te rogamos lo comuniques al remitente y borres dicho mensaje y cualquier
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ buttons:
|
||||||
webAcccess: Visitez notre site web
|
webAcccess: Visitez notre site web
|
||||||
info: Aidez-nous à améliorer
|
info: Aidez-nous à améliorer
|
||||||
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
||||||
· www.verdnatura.es · clientes@verdnatura.es
|
· verdnatura.es · clientes@verdnatura.es
|
||||||
disclaimer: "- AVIS - Ce message est privé et confidentiel et doit être utilisé
|
disclaimer: "- AVIS - Ce message est privé et confidentiel et doit être utilisé
|
||||||
exclusivement par le destinataire. Si vous avez reçu ce message par erreur,
|
exclusivement par le destinataire. Si vous avez reçu ce message par erreur,
|
||||||
veuillez en informer l'expéditeur et supprimer ce message ainsi que tous les
|
veuillez en informer l'expéditeur et supprimer ce message ainsi que tous les
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ buttons:
|
||||||
webAcccess: Visite o nosso site
|
webAcccess: Visite o nosso site
|
||||||
info: Ajude-nos a melhorar
|
info: Ajude-nos a melhorar
|
||||||
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
|
||||||
· www.verdnatura.es · clientes@verdnatura.es
|
· verdnatura.es · clientes@verdnatura.es
|
||||||
disclaimer: '- AVISO - Esta mensagem é privada e confidencial e deve ser usada exclusivamente
|
disclaimer: '- AVISO - Esta mensagem é privada e confidencial e deve ser usada exclusivamente
|
||||||
pela pessoa que a recebe. Se você recebeu esta mensagem por engano, notifique o remetente e
|
pela pessoa que a recebe. Se você recebeu esta mensagem por engano, notifique o remetente e
|
||||||
exclua essa mensagem e todos os documentos anexos que ela possa conter.
|
exclua essa mensagem e todos os documentos anexos que ela possa conter.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<header>
|
<header>
|
||||||
<div class="logo">
|
<div class="logo">
|
||||||
<a href="https://www.verdnatura.es" target="_blank">
|
<a href="https://verdnatura.es" target="_blank">
|
||||||
<img v-bind:src="getEmailSrc('logo-black.png')" alt="VerdNatura" />
|
<img v-bind:src="getEmailSrc('logo-black.png')" alt="VerdNatura" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,20 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html v-bind:lang="$i18n.locale">
|
<html v-bind:lang="$i18n.locale">
|
||||||
|
<body>
|
||||||
<body>
|
<table class="grid">
|
||||||
<table class="grid">
|
<tbody>
|
||||||
<tbody>
|
<tr>
|
||||||
<tr>
|
<td>
|
||||||
<td>
|
<slot name="header">
|
||||||
<slot name="header">
|
<report-header v-bind="$props"></report-header>
|
||||||
<report-header v-bind="$props"></report-header>
|
</slot>
|
||||||
</slot>
|
<slot></slot>
|
||||||
<slot></slot>
|
<slot name="footer">
|
||||||
<slot name="footer">
|
<report-footer id="pageFooter" v-bind="$props"></report-footer>
|
||||||
<report-footer id="pageFooter" v-bind="$props"></report-footer>
|
</slot>
|
||||||
</slot>
|
</td>
|
||||||
</td>
|
</tr>
|
||||||
</tr>
|
</tbody>
|
||||||
</tbody>
|
</table>
|
||||||
</table>
|
</body>
|
||||||
</body>
|
</html>
|
||||||
|
|
||||||
</html>
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
company:
|
company:
|
||||||
contactData: www.verdnatura.es - clientes@verdnatura.es
|
contactData: verdnatura.es - clientes@verdnatura.es
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
company:
|
company:
|
||||||
contactData: www.verdnatura.es - clientes@verdnatura.es
|
contactData: verdnatura.es - clientes@verdnatura.es
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
company:
|
company:
|
||||||
contactData: www.verdnatura.es - clientes@verdnatura.es
|
contactData: verdnatura.es - clientes@verdnatura.es
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
company:
|
company:
|
||||||
contactData: · www.verdnatura.es · clientes@verdnatura.es
|
contactData: · verdnatura.es · clientes@verdnatura.es
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
subject: Bienvenido a Verdnatura
|
subject: Bienvenido a Verdnatura
|
||||||
title: "¡Te damos la bienvenida!"
|
title: "¡Te damos la bienvenida!"
|
||||||
dearClient: Estimado cliente
|
dearClient: Estimado cliente
|
||||||
clientData: 'Tus datos para poder comprar en la web de Verdnatura (<a href="https://www.verdnatura.es"
|
clientData: 'Tus datos para poder comprar en la web de Verdnatura (<a href="https://verdnatura.es"
|
||||||
title="Visitar Verdnatura" target="_blank" style="color: #8dba25">https://www.verdnatura.es</a>)
|
title="Visitar Verdnatura" target="_blank" style="color: #8dba25">https://verdnatura.es</a>)
|
||||||
o en nuestras aplicaciones para <a href="https://goo.gl/3hC2mG" title="App Store"
|
o en nuestras aplicaciones para <a href="https://goo.gl/3hC2mG" title="App Store"
|
||||||
target="_blank" style="color: #8dba25">iOS</a> y <a href="https://goo.gl/8obvLc"
|
target="_blank" style="color: #8dba25">iOS</a> y <a href="https://goo.gl/8obvLc"
|
||||||
title="Google Play" target="_blank" style="color: #8dba25">Android</a>, son'
|
title="Google Play" target="_blank" style="color: #8dba25">Android</a>, son'
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<div class="grid-block vn-px-ml">
|
<div class="grid-block vn-px-ml">
|
||||||
<p>{{$t('copyLink')}}</p>
|
<p>{{$t('copyLink')}}</p>
|
||||||
<div class="external-link vn-pa-sm vn-m-md">
|
<div class="external-link vn-pa-sm vn-m-md">
|
||||||
https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={{id}}
|
https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={{id}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -21,4 +21,4 @@
|
||||||
<p v-html="$t('conclusion')"></p>
|
<p v-html="$t('conclusion')"></p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</email-body>
|
</email-body>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ subject: Your delivery note
|
||||||
title: Your delivery note
|
title: Your delivery note
|
||||||
dear: Dear client
|
dear: Dear client
|
||||||
description: The delivery note from the order <strong>{0}</strong> is now available. <br/>
|
description: The delivery note from the order <strong>{0}</strong> is now available. <br/>
|
||||||
You can download it by clicking <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">this link</a>.
|
You can download it by clicking <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">this link</a>.
|
||||||
copyLink: 'As an alternative, you can copy the following link in your browser:'
|
copyLink: 'As an alternative, you can copy the following link in your browser:'
|
||||||
poll: If you wish, you can answer our satisfaction survey to
|
poll: If you wish, you can answer our satisfaction survey to
|
||||||
help us provide better service. Your opinion is very important for us!
|
help us provide better service. Your opinion is very important for us!
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ subject: Tu albarán
|
||||||
title: Tu albarán
|
title: Tu albarán
|
||||||
dear: Estimado cliente
|
dear: Estimado cliente
|
||||||
description: Ya está disponible el albarán correspondiente al pedido <strong>{0}</strong>. <br/>
|
description: Ya está disponible el albarán correspondiente al pedido <strong>{0}</strong>. <br/>
|
||||||
Puedes verlo haciendo clic <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">en este enlace</a>.
|
Puedes verlo haciendo clic <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">en este enlace</a>.
|
||||||
copyLink: 'Como alternativa, puedes copiar el siguiente enlace en tu navegador:'
|
copyLink: 'Como alternativa, puedes copiar el siguiente enlace en tu navegador:'
|
||||||
poll: Si lo deseas, puedes responder a nuestra encuesta de satisfacción para
|
poll: Si lo deseas, puedes responder a nuestra encuesta de satisfacción para
|
||||||
ayudarnos a prestar un mejor servicio. ¡Tu opinión es muy importante para nosotros!
|
ayudarnos a prestar un mejor servicio. ¡Tu opinión es muy importante para nosotros!
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ subject: Votre bon de livraison
|
||||||
title: Votre bon de livraison
|
title: Votre bon de livraison
|
||||||
dear: Cher client,
|
dear: Cher client,
|
||||||
description: Le bon de livraison correspondant à la commande <strong>{0}</strong> est maintenant disponible.<br/>
|
description: Le bon de livraison correspondant à la commande <strong>{0}</strong> est maintenant disponible.<br/>
|
||||||
Vous pouvez le voir en cliquant <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}" target="_blank">sur ce lien</a>.
|
Vous pouvez le voir en cliquant <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}" target="_blank">sur ce lien</a>.
|
||||||
copyLink: 'Vous pouvez également copier le lien suivant dans votre navigateur:'
|
copyLink: 'Vous pouvez également copier le lien suivant dans votre navigateur:'
|
||||||
poll: Si vous le souhaitez, vous pouvez répondre à notre questionaire de satisfaction
|
poll: Si vous le souhaitez, vous pouvez répondre à notre questionaire de satisfaction
|
||||||
pour nous aider à améliorer notre service. Votre avis est très important pour nous!
|
pour nous aider à améliorer notre service. Votre avis est très important pour nous!
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ subject: Sua nota de entrega
|
||||||
title: Sua nota de entrega
|
title: Sua nota de entrega
|
||||||
dear: Estimado cliente
|
dear: Estimado cliente
|
||||||
description: Já está disponível sua nota de entrega correspondente a encomenda numero <strong>{0}</strong>. <br/>
|
description: Já está disponível sua nota de entrega correspondente a encomenda numero <strong>{0}</strong>. <br/>
|
||||||
Para ver-lo faça um clique <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">neste link</a>.
|
Para ver-lo faça um clique <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">neste link</a>.
|
||||||
copyLink: 'Como alternativa, podes copiar o siguinte link no teu navegador:'
|
copyLink: 'Como alternativa, podes copiar o siguinte link no teu navegador:'
|
||||||
poll: Si o deseja, podes responder nosso questionário de satiscação para ajudar-nos a prestar-vos um melhor serviço. Tua opinião é muito importante para nós!
|
poll: Si o deseja, podes responder nosso questionário de satiscação para ajudar-nos a prestar-vos um melhor serviço. Tua opinião é muito importante para nós!
|
||||||
help: Cualquer dúvida que surja, no hesites em consultar-la, <strong>Estamos aqui para
|
help: Cualquer dúvida que surja, no hesites em consultar-la, <strong>Estamos aqui para
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,35 @@
|
||||||
<!DOCTYPE html>
|
<report-body v-bind="$props">
|
||||||
<html v-bind:lang="$i18n.locale">
|
<template v-slot:header>
|
||||||
<body>
|
<span></span>
|
||||||
<table v-for="labelData in labelsData" style="break-before: page;">
|
</template>
|
||||||
<tbody>
|
<table v-for="labelData in labelsData" style="break-before: page">
|
||||||
<tr>
|
<tbody>
|
||||||
<td rowspan="6"><span id="vertical">{{labelData.levelV}}</span></td>
|
<tr>
|
||||||
<td id="ticketFk" >{{labelData.ticketFk}} ⬸ {{labelData.clientFk}}</td>
|
<td rowspan="6"><span id="vertical">{{labelData.levelV}}</span></td>
|
||||||
<td colspan="2" id="shipped">{{labelData.shipped}}</td>
|
<td id="ticketFk">{{labelData.ticketFk}} ⬸ {{labelData.clientFk}}</td>
|
||||||
</tr>
|
<td colspan="2" id="shipped">{{labelData.shipped}}</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td rowspan="3"><div v-html="getBarcode(labelData.ticketFk)" id="barcode"></div></td>
|
<tr>
|
||||||
<td class="outline">{{labelData.workerCode}}</td>
|
<td rowspan="3"><div v-html="getBarcode(labelData.ticketFk)" id="barcode"></div></td>
|
||||||
</tr>
|
<td class="outline">{{labelData.workerCode}}</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td class="outline">{{labelData.labelCount}}</td>
|
<tr>
|
||||||
</tr>
|
<td class="outline">{{labelData.labelCount}}</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td class="outline">{{labelData.size}}</td>
|
<tr>
|
||||||
</tr>
|
<td class="outline">{{labelData.size}}</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td><div id="agencyDescripton">{{labelData.agencyDescription}}</div></td>
|
<tr>
|
||||||
<td id="bold">{{labelData.lineCount}}</td>
|
<td><div id="agencyDescripton">{{labelData.agencyDescription}}</div></td>
|
||||||
</tr>
|
<td id="bold">{{labelData.lineCount}}</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td id="nickname">{{labelData.nickName}}</td>
|
<tr>
|
||||||
<td id="bold">{{labelData.agencyHour}}</td>
|
<td id="nickname">{{labelData.nickName}}</td>
|
||||||
</tr>
|
<td id="bold">{{labelData.agencyHour}}</td>
|
||||||
</tbody>
|
</tr>
|
||||||
</table>
|
</tbody>
|
||||||
</body>
|
</table>
|
||||||
</html>
|
<template v-slot:footer>
|
||||||
|
<span></span>
|
||||||
|
</template>
|
||||||
|
</report-body>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
const Component = require(`vn-print/core/component`);
|
||||||
|
const reportBody = new Component('report-body');
|
||||||
const jsBarcode = require('jsbarcode');
|
const jsBarcode = require('jsbarcode');
|
||||||
const {DOMImplementation, XMLSerializer} = require('xmldom');
|
const {DOMImplementation, XMLSerializer} = require('xmldom');
|
||||||
const UserError = require('vn-loopback/util/user-error');
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
@ -42,5 +44,8 @@ module.exports = {
|
||||||
});
|
});
|
||||||
return xmlSerializer.serializeToString(svgNode);
|
return xmlSerializer.serializeToString(svgNode);
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
|
components: {
|
||||||
|
'report-body': reportBody.build()
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,7 @@
|
||||||
<report-body v-bind="$props">
|
<report-body v-bind="$props">
|
||||||
|
<template v-slot:header>
|
||||||
|
<span></span>
|
||||||
|
</template>
|
||||||
<div class="label">
|
<div class="label">
|
||||||
<div class="barcode">
|
<div class="barcode">
|
||||||
<h1>{{item.id}}</h1>
|
<h1>{{item.id}}</h1>
|
||||||
|
|
@ -20,4 +23,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<template v-slot:footer>
|
||||||
|
<span></span>
|
||||||
|
</template>
|
||||||
</report-body>
|
</report-body>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue