From a1ee22d1531082fda7e8e612091455a8c14d61c3 Mon Sep 17 00:00:00 2001 From: Juan Date: Wed, 28 Feb 2018 12:07:56 +0100 Subject: [PATCH] #96 - Email validation errors fixed --- .../src/address-create/address-create.html | 2 +- .../client/src/address-edit/address-edit.html | 8 ++++-- client/route/src/basic-data/basic-data.html | 26 +++++++++---------- e2e/helpers/selectors.js | 4 +-- services/client/server/model-config.json | 3 --- services/db/04-fixtures.sql | 2 +- services/db/changes/1.0.0/03-address.sql | 2 +- .../db/changes/1.0.1/02-updateClientMails.sql | 3 +++ services/loopback/common/models/address.js | 2 +- services/loopback/common/models/address.json | 4 +-- .../common/models/agency-mode.json | 0 services/loopback/common/models/client.js | 2 +- services/loopback/server/model-config.json | 3 +++ 13 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 services/db/changes/1.0.1/02-updateClientMails.sql rename services/{client => loopback}/common/models/agency-mode.json (100%) diff --git a/client/client/src/address-create/address-create.html b/client/client/src/address-create/address-create.html index c1b5d7a3fe..1914348fd6 100644 --- a/client/client/src/address-create/address-create.html +++ b/client/client/src/address-create/address-create.html @@ -30,7 +30,7 @@ + + + form="form">
@@ -13,21 +12,20 @@ + field="$ctrl.route.agency"> - + field="$ctrl.route.driver" + url="/route/api/Vehicles/activeDrivers" + label="Driver"> + + field="$ctrl.route.vehicle" + url="/route/api/Vehicles/comboVehicles" + label="Vehicle" + order="tradeMark ASC" + filter="{where: {isActive: 1, warehouseFk: 1}}"> + diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 21f490eacc..8480a8b74d 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -87,8 +87,8 @@ export default { cityInput: `${components.vnTextfield}[name="city"]`, provinceInput: `${components.vnAutocomplete}[field="$ctrl.address.provinceFk"] > vn-vertical > ${components.vnTextfield}`, provinceSecondOption: `${components.vnAutocomplete}[field="$ctrl.address.provinceFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(2)`, - agencyInput: `${components.vnAutocomplete}[field="$ctrl.address.agencyFk"] > vn-vertical > ${components.vnTextfield}`, - agenctySecondOption: `${components.vnAutocomplete}[field="$ctrl.address.agencyFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(2)`, + agencyInput: `${components.vnAutocomplete}[field="$ctrl.address.agencyModeFk"] > vn-vertical > ${components.vnTextfield}`, + agenctySecondOption: `${components.vnAutocomplete}[field="$ctrl.address.agencyModeFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(2)`, phoneInput: `${components.vnTextfield}[name="phone"]`, mobileInput: `${components.vnTextfield}[name="mobile"]`, defaultAddress: 'vn-client-addresses > vn-vertical > vn-card > div > vn-vertical > vn-horizontal:nth-child(2) > vn-one > vn-horizontal > vn-one > div:nth-child(2)', diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json index 562e7e40f4..69fee066ab 100644 --- a/services/client/server/model-config.json +++ b/services/client/server/model-config.json @@ -2,9 +2,6 @@ "AddressObservation": { "dataSource": "vn" }, - "AgencyMode": { - "dataSource": "vn" - }, "ClientCredit": { "dataSource": "vn" }, diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index 8ea146dad9..a1edf85f5c 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -139,7 +139,7 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city (9, 'Bruce Banner', '16104829E', 'Hulk', 'Black widow', 'Somewhere in New York', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceBanner@verdnatura.es', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1,'0000-00-00', 1, NULL, 1, 1, 1, 1, NULL, 0, 0, 4, 0, 1), (10, 'Jessica Jones', '58282869H', 'Jessica Jones', 'Luke Cage', 'NYCC 2015 Poster', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'JessicaJones@verdnatura.es', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1,'0000-00-00', 1, NULL, 1, 1, 1, 1, NULL, 0, 0, 4, 0, 1); -INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `isDefaultAddress`, `clientFk`, `agencyFk`, `longitude`, `latitude`, `isEqualizated`) +INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `isDefaultAddress`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`) VALUES (101, '01', 'Somewhere in Thailand', 'Silla', 46460, 1, NULL, NULL, 1, 1, 9, 2, NULL, NULL, 0), (102, '02', 'Somewhere in Poland', 'Silla', 46460, 1, NULL, NULL, 1, 1, 9, 2, NULL, NULL, 0), diff --git a/services/db/changes/1.0.0/03-address.sql b/services/db/changes/1.0.0/03-address.sql index bdd27136c9..f5a0694471 100644 --- a/services/db/changes/1.0.0/03-address.sql +++ b/services/db/changes/1.0.0/03-address.sql @@ -17,7 +17,7 @@ VIEW `vn`.`address` AS `t`.`longitude` AS `longitude`, `t`.`latitude` AS `latitude`, `t`.`warehouse_id` AS `warehouseFk`, - `t`.`Id_Agencia` AS `agencyFk`, + `t`.`Id_Agencia` AS `agencyModeFk`, `t`.`isEqualizated` AS `isEqualizated`, `t`.`active` AS `isActive` FROM diff --git a/services/db/changes/1.0.1/02-updateClientMails.sql b/services/db/changes/1.0.1/02-updateClientMails.sql new file mode 100644 index 0000000000..937e32810e --- /dev/null +++ b/services/db/changes/1.0.1/02-updateClientMails.sql @@ -0,0 +1,3 @@ +UPDATE vn.client + SET email = REPLACE(REPLACE(email, ' ', ''), ';', ',') + WHERE email REGEXP '[ |;]'; \ No newline at end of file diff --git a/services/loopback/common/models/address.js b/services/loopback/common/models/address.js index 04a4ef80bd..1511238330 100644 --- a/services/loopback/common/models/address.js +++ b/services/loopback/common/models/address.js @@ -18,7 +18,7 @@ module.exports = function(Self) { fields: ['id', 'name'] } }, { - relation: 'agency', + relation: 'agencyMode', scope: { fields: ['id', 'name'] } diff --git a/services/loopback/common/models/address.json b/services/loopback/common/models/address.json index 14fa15593f..cc72cb3d44 100644 --- a/services/loopback/common/models/address.json +++ b/services/loopback/common/models/address.json @@ -62,10 +62,10 @@ "model": "Client", "foreignKey": "clientFk" }, - "agency": { + "agencyMode": { "type": "belongsTo", "model": "AgencyMode", - "foreignKey": "agencyFk" + "foreignKey": "agencyModeFk" }, "observations": { "type": "hasMany", diff --git a/services/client/common/models/agency-mode.json b/services/loopback/common/models/agency-mode.json similarity index 100% rename from services/client/common/models/agency-mode.json rename to services/loopback/common/models/agency-mode.json diff --git a/services/loopback/common/models/client.js b/services/loopback/common/models/client.js index a6391e91ea..16c1a89490 100644 --- a/services/loopback/common/models/client.js +++ b/services/loopback/common/models/client.js @@ -33,7 +33,7 @@ module.exports = function(Self) { message: 'Correo electrónico inválido', allowNull: true, allowBlank: true, - with: /^[\w|.|-]+@\w[\w|.|-]*\w(,[\w|.|-]+@\w[\w|.|-]*\w)*$/ + with: /^[\w|-|.]+@[\w|-]+(\.[\w|-]+)*(,[\w|-|.]+@[\w|-]+(\.[\w|-]+)*)*$/ }); Self.validatesLengthOf('postcode', { allowNull: true, diff --git a/services/loopback/server/model-config.json b/services/loopback/server/model-config.json index 3a7aa2d229..d0907144af 100644 --- a/services/loopback/server/model-config.json +++ b/services/loopback/server/model-config.json @@ -30,6 +30,9 @@ "Agency": { "dataSource": "vn" }, + "AgencyMode": { + "dataSource": "vn" + }, "Client": { "dataSource": "vn" },