1781-zoneHoliday #994

Merged
joan merged 49 commits from 1781-zoneHoliday into dev 2022-08-03 06:41:31 +00:00
Contributor
No description provided.
vicent added the
CR / Tests passed
label 2022-06-07 08:27:34 +00:00
vicent added 20 commits 2022-06-07 08:27:36 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
05b0a5342f
feat(zone.events): new dialog when choose 'exclude'
gitea/salix/pipeline/head There was a failure building this commit Details
b96d9ea4c2
feat(zone.events): add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
06e9a22f40
added search
gitea/salix/pipeline/head There was a failure building this commit Details
ab13c16948
feat: add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
456f167513
feat: fix editExclusion mode
gitea/salix/pipeline/head There was a failure building this commit Details
6359c9e5bf
feat: add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
da1e188983
fix: put requests
gitea/salix/pipeline/head There was a failure building this commit Details
c7471fdac4
refator: variable names changed
gitea/salix/pipeline/head There was a failure building this commit Details
1235affe2d
fix: show correct css
gitea/salix/pipeline/head There was a failure building this commit Details
b5fa360960
feat: edit excluded selecetion with specificLocations
gitea/salix/pipeline/head There was a failure building this commit Details
f7be419bbe
refator: updated fixtures
gitea/salix/pipeline/head This commit is unstable Details
8dcd430178
fix: events frontTest
gitea/salix/pipeline/head This commit is unstable Details
3da9a775bd
feat: add frontTest
gitea/salix/pipeline/head This commit looks good Details
5e01ea58e3
fix: backTest
vicent added 1 commit 2022-06-07 08:29:01 +00:00
gitea/salix/pipeline/head This commit looks good Details
aab484ad41
refactor code
Author
Contributor

Antes de subir este PR se debé eliminar db/changes/10470-family/00-zoneHoliday.sql. Ya que esos cambios los he subido desde vn-database.

Antes de subir este PR se debé eliminar db/changes/10470-family/00-zoneHoliday.sql. Ya que esos cambios los he subido desde vn-database.
carlosjr requested changes 2022-06-09 08:39:27 +00:00
@ -0,0 +1,2 @@
INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES('ZoneExclusionGeo', '*', '*', 'ALLOW', 'ROLE', 'employee');
Contributor

check ACL for this model

check ACL for this model
vicent marked this conversation as resolved
@ -0,0 +1,402 @@
CREATE TABLE `vn`.`zoneExclusionGeo` (
Contributor

remove this

remove this
vicent marked this conversation as resolved
@ -0,0 +1,48 @@
module.exports = Self => {
Self.remoteMethod('exclusionGeo', {
description: 'Exclude a zoneGeo for a zone',
Contributor

from

from
vicent marked this conversation as resolved
@ -0,0 +29,4 @@
verb: 'POST'
}
});
Contributor

where are my tests and my transaction?

where are my tests and my transaction?
vicent marked this conversation as resolved
@ -78,0 +78,4 @@
this.geoExclusions = {};
let geoExclusions = value.geoExclusions;
if (geoExclusions) {
Contributor

is this testes?

is this testes?
vicent marked this conversation as resolved
@ -7,2 +8,3 @@
this.vnWeekDays = vnWeekDays;
this.editMode = 'include';
this.editMode = 'exclude';
this.exclusions;
Contributor

this is undefined anyways

this is undefined anyways
vicent marked this conversation as resolved
@ -21,2 +24,4 @@
}
get exclusionsGeoPath() {
return `Zones/exclusionGeo`;
Contributor

no need for a getter if you don't use a setter in this case.

no need for a getter if you don't use a setter in this case.
vicent marked this conversation as resolved
carlosjr removed the
CR / Tests passed
label 2022-06-09 08:39:43 +00:00
vicent added 1 commit 2022-06-09 12:59:27 +00:00
gitea/salix/pipeline/head This commit is unstable Details
a9badfc1ba
feat: add backTest
vicent added 1 commit 2022-06-10 06:16:02 +00:00
gitea/salix/pipeline/head This commit looks good Details
f6ab9d8a31
feat: updated backTest
vicent added 1 commit 2022-06-10 06:29:18 +00:00
gitea/salix/pipeline/head This commit is unstable Details
06f181e913
feat: add frontTest for calendar
vicent added 1 commit 2022-06-13 10:26:48 +00:00
gitea/salix/pipeline/head This commit looks good Details
8d4c735744
refactor: delete duplicated code
vicent added 1 commit 2022-06-13 11:18:03 +00:00
gitea/salix/pipeline/head This commit looks good Details
dd65f4a468
refator: rewrite conditionals
vicent added 1 commit 2022-06-13 12:33:31 +00:00
gitea/salix/pipeline/head This commit looks good Details
c26b09ead3
refactor: create endpoint
vicent added 1 commit 2022-06-17 06:18:30 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
1bd4b02a62
refactor: code
vicent added 1 commit 2022-06-17 06:54:54 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
44e95a00c3
refactor: delete duplicated code
vicent added 1 commit 2022-07-07 11:37:45 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
94872f8493
fix: show geos checked onSearch
vicent added 1 commit 2022-07-08 07:47:26 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
eb586643ca
refactor: change name of endpoint
vicent added 1 commit 2022-07-08 08:09:13 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
4b65b531fd
feat: add backTest
vicent added 1 commit 2022-07-12 05:57:38 +00:00
gitea/salix/pipeline/head This commit looks good Details
2b5550bc6e
feat: add testFront
vicent added 1 commit 2022-07-12 06:00:33 +00:00
gitea/salix/pipeline/head Build queued... Details
e4b04fadbc
fix: set editMode = 'include' by default
vicent added 1 commit 2022-07-12 06:09:17 +00:00
vicent added the
CR / Tests passed
label 2022-07-12 06:09:44 +00:00
vicent requested review from carlosjr 2022-07-12 06:09:53 +00:00
vicent added 1 commit 2022-07-12 09:57:17 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
dd46a974cc
fix: backTest
vicent added 1 commit 2022-07-12 11:43:24 +00:00
gitea/salix/pipeline/head This commit is unstable Details
f73012486c
try jenckins backTest
vicent added 1 commit 2022-07-12 12:26:37 +00:00
gitea/salix/pipeline/head This commit looks good Details
48d4d4e964
try jenkins backTest
carlosjr removed the
CR / Tests passed
label 2022-07-15 12:53:40 +00:00
vicent added 1 commit 2022-07-19 12:47:14 +00:00
gitea/salix/pipeline/head This commit looks good Details
a0ea3b4c03
delete unnecessary sql
vicent added the
CR / Tests passed
label 2022-07-19 12:50:41 +00:00
carlosjr requested changes 2022-07-22 10:56:45 +00:00
@ -0,0 +1,4 @@
INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
Contributor

Puedes mover este sql a la carpeta del sprint "junio" el de la familia aparece ya en tests y no se si va a dar problemas.

Puedes mover este sql a la carpeta del sprint "junio" el de la familia aparece ya en tests y no se si va a dar problemas.
vicent marked this conversation as resolved
@ -22,3 +2,1 @@
"Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
"can't be blank": "El campo no puede estar vacío",
"Observation type must be unique": "El tipo de observación no puede repetirse",
"Name cannot be blank": "Name cannot be blank",
Contributor

Estas seguro de querer destruir tantas traducciones?

Estas seguro de querer destruir tantas traducciones?
vicent marked this conversation as resolved
@ -0,0 +17,4 @@
},
{
arg: 'geoIds',
type: 'any',
Contributor

geoIds a mi entender son Identificadores de geo por ejemplo: [1, 2, 3, 4]

pero poner un nombre que reprensentaria una coleccion de ids y darle de tipo "any" no es buena practica resultando en un manejo de datos confuso.

refactoriza los argumentos para que reciba lo que necesita que aparentemente son ids a secas en una array.

geoIds a mi entender son Identificadores de geo por ejemplo: [1, 2, 3, 4] pero poner un nombre que reprensentaria una coleccion de ids y darle de tipo "any" no es buena practica resultando en un manejo de datos confuso. refactoriza los argumentos para que reciba lo que necesita que aparentemente son ids a secas en una array.
vicent marked this conversation as resolved
@ -0,0 +27,4 @@
try {
const options = {transaction: tx};
const geoIds = [{id: 1}, {id: 2}];
Contributor

const geoIds = [1, 2]

const geoIds = [1, 2]
vicent marked this conversation as resolved
@ -0,0 +26,4 @@
try {
const options = {transaction: tx};
const zoneId = 2;
const geoIds = [{id: 1}, {id: 2}];
Contributor

mas de lo mismo

mas de lo mismo
vicent marked this conversation as resolved
@ -0,0 +11,4 @@
},
{
arg: 'geoIds',
type: 'any',
Contributor

mala practica

mala practica
vicent marked this conversation as resolved
carlosjr removed the
CR / Tests passed
label 2022-07-22 10:57:00 +00:00
vicent added 2 commits 2022-07-22 11:13:21 +00:00
vicent added 1 commit 2022-07-22 11:14:30 +00:00
gitea/salix/pipeline/head This commit looks good Details
cde4da01c5
delete translations
vicent added 2 commits 2022-07-22 11:35:28 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
4076f2908e
refactor: change type of params in endpoints
vicent added 2 commits 2022-07-22 11:37:33 +00:00
vicent added 1 commit 2022-07-22 11:37:56 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
a90bea2328
fix: typo
vicent added the
CR / Tests passed
label 2022-07-22 11:39:15 +00:00
vicent requested review from carlosjr 2022-07-22 11:40:16 +00:00
carlosjr approved these changes 2022-07-22 13:56:11 +00:00
carlosjr left a comment
Contributor

LGTM

LGTM
carlosjr added 1 commit 2022-07-22 13:56:25 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f3766edbb7
Merge branch 'dev' into 1781-zoneHoliday
carlosjr added 1 commit 2022-07-22 13:58:57 +00:00
gitea/salix/pipeline/head This commit looks good Details
b8183748ce
Merge branch 'dev' into 1781-zoneHoliday
joan merged commit 185ce60bef into dev 2022-08-03 06:41:31 +00:00
joan deleted branch 1781-zoneHoliday 2022-08-03 06:41:32 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#994
No description provided.