Tags
-- {{tag.tag.name}}: {{tag.value}} +
Tax
++ {{tax.country.country}}: {{tax.taxClass.description}}
Tags
++ {{tag.tag.name}}: {{tag.value}} +
+Nicho
diff --git a/client/item/src/summary/item-summary.js b/client/item/src/summary/item-summary.js index 054a5d0f3..401d70f0a 100644 --- a/client/item/src/summary/item-summary.js +++ b/client/item/src/summary/item-summary.js @@ -17,6 +17,25 @@ class ItemSummary { }); } + _getTaxes() { + let filter = { + fields: ['id', 'countryFk', 'taxClassFk'], + include: [{ + relation: 'country', + scope: {fields: ['country']} + }, { + relation: 'taxClass', + scope: {fields: ['id', 'description']} + }] + }; + + let urlFilter = encodeURIComponent(JSON.stringify(filter)); + let url = `/item/api/Items/${this.item.id}/taxes?filter=${urlFilter}`; + this.$http.get(url).then(json => { + this.taxes = json.data; + }); + } + _getBotanical() { let filter = { where: {itemFk: this.item.id}, @@ -58,6 +77,7 @@ class ItemSummary { this._getTags(); this._getBarcodes(); this._getNiches(); + this._getTaxes(); if (!this.item.botanical) this._getBotanical(); } From 8ef0814fccee350813270e6479d76c465d164c4e Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Thu, 8 Mar 2018 12:23:51 +0100 Subject: [PATCH 06/10] back end unit test fixes plus small refactors --- .../client-module/05_add_address.spec.js | 2 +- .../auth/server/boot/specs/routes.spec.js | 44 +++++++------- services/db/04-fixtures.sql | 39 +++++++------ services/db/testing_fixtures.js | 29 +++++----- .../client/specs/addressesPropagateRe.spec.js | 55 +++--------------- .../common/methods/client/specs/card.spec.js | 4 +- .../client/specs/createWithUser.spec.js | 58 +++---------------- .../client/specs/hasCustomerRole.spec.js | 2 +- .../methods/client/specs/listWorkers.spec.js | 2 +- 9 files changed, 76 insertions(+), 159 deletions(-) diff --git a/e2e/paths/client-module/05_add_address.spec.js b/e2e/paths/client-module/05_add_address.spec.js index 97117bf8c..e765aea72 100644 --- a/e2e/paths/client-module/05_add_address.spec.js +++ b/e2e/paths/client-module/05_add_address.spec.js @@ -122,7 +122,7 @@ describe('Add address path', () => { .waitToClick(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Some fields are invalid'); + expect(result).toContain('Error:'); }); }); }); diff --git a/services/auth/server/boot/specs/routes.spec.js b/services/auth/server/boot/specs/routes.spec.js index 6f5deb1d3..20b41b489 100644 --- a/services/auth/server/boot/specs/routes.spec.js +++ b/services/auth/server/boot/specs/routes.spec.js @@ -3,18 +3,16 @@ const routes = require('../routes'); const restoreFixtures = require('../../../../../services/db/testing_fixtures'); describe('Auth routes', () => { - let fixturesToApply = {tables: ['`salix`.`user`'], inserts: [ - `INSERT INTO salix.user(id,username,password,email) - VALUES - (10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 'JessicaJones@verdnatura.es');` - ]}; + let sqlStatements = {deletes: ` + DELETE FROM salix.user WHERE id = 102; + `, inserts: ``, updates: ``}; - beforeEach(done => { - restoreFixtures(fixturesToApply, done); + beforeEach(() => { + restoreFixtures(sqlStatements); }); - afterAll(done => { - restoreFixtures(fixturesToApply, done); + afterAll(() => { + restoreFixtures(sqlStatements); }); let User = app.models.User; @@ -33,6 +31,20 @@ describe('Auth routes', () => { req = {body: {}}; }); + describe('when the user doesnt exist but the client does and the password is correct', () => { + it('should create the user login and return the token', done => { + spyOn(User, 'upsertWithWhere').and.callThrough(); + req.body.user = 'PetterParker'; + req.body.password = 'nightmare'; + res.json = response => { + expect(User.upsertWithWhere).toHaveBeenCalledWith(jasmine.any(Object), jasmine.any(Object), jasmine.any(Function)); + expect(response.token).toBeDefined(); + done(); + }; + loginFunction(req, res); + }); + }); + describe('when the user exists and the password is correct', () => { it('should login and return the token', done => { req.body.user = 'developer'; @@ -44,20 +56,6 @@ describe('Auth routes', () => { loginFunction(req, res); }); - describe('when the user doesnt exist but the client does and the password is correct', () => { - it('should create the user login and return the token', done => { - spyOn(User, 'upsertWithWhere').and.callThrough(); - req.body.user = 'PetterParker'; - req.body.password = 'nightmare'; - res.json = response => { - expect(User.upsertWithWhere).toHaveBeenCalledWith(jasmine.any(Object), jasmine.any(Object), jasmine.any(Function)); - expect(response.token).toBeDefined(); - done(); - }; - loginFunction(req, res); - }); - }); - it('should define the url to continue upon login', done => { req.body.user = 'developer'; req.body.password = 'nightmare'; diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index c63c9f616..bcb82cef5 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -152,25 +152,26 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr (107, '07', 'Somewhere in Valencia', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), (108, '08', 'Somewhere in Silla', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), (109, '09', 'Somewhere in London', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (110, '10', 'Somewhere in Algemesi', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (111, '11', 'Somewhere in Carlet', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (112, '12', 'Somewhere in Campanar', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (113, '13', 'Somewhere in Malilla', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (114, '14', 'Somewhere in France', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (115, '15', 'Somewhere in Birmingham', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (116, '16', 'Somewhere in Scotland', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (117, '17', 'Somewhere in nowhere', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (118, '18', 'Somewhere over the rainbow', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (119, '19', 'Somewhere in Alberic', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (120, '20', 'Somewhere in Montortal', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), - (121, 'my other address', 'NY roofs', 'Silla', 46460, 1, NULL, NULL, 1, 0, 102, 2, NULL, NULL, 0), - (122, 'my other address', 'The phone box', 'Silla', 46460, 1, NULL, NULL, 1, 0, 103, 2, NULL, NULL, 0), - (123, 'my other address', 'Stark tower', 'Silla', 46460, 1, NULL, NULL, 1, 0, 104, 2, NULL, NULL, 0), - (124, 'my other address', 'The plastic cell', 'Silla', 46460, 1, NULL, NULL, 1, 0, 105, 2, NULL, NULL, 0), - (125, 'my other address', 'Many places', 'Silla', 46460, 1, NULL, NULL, 1, 0, 106, 2, NULL, NULL, 0), - (126, 'my other address', 'Your pocket', 'Silla', 46460, 1, NULL, NULL, 1, 0, 107, 2, NULL, NULL, 0), - (127, 'my other address', 'Cerebro', 'Silla', 46460, 1, NULL, NULL, 1, 0, 108, 2, NULL, NULL, 0), - (128, 'my other address', 'Luke Cages Bar', 'Silla', 46460, 1, NULL, NULL, 1, 0, 110, 2, NULL, NULL, 0); + (110, '10', 'Somewhere in Algemesi', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (111, '11', 'Somewhere in Carlet', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (112, '12', 'Somewhere in Campanar', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (113, '13', 'Somewhere in Malilla', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (114, '14', 'Somewhere in France', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (115, '15', 'Somewhere in Birmingham', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (116, '16', 'Somewhere in Scotland', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (117, '17', 'Somewhere in nowhere', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (118, '18', 'Somewhere over the rainbow', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (119, '19', 'Somewhere in Alberic', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (120, '20', 'Somewhere in Montortal', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), + (121, 'my other address', 'the bat cave', 'Silla', 46460, 1, NULL, NULL, 1, 0, 101, 2, NULL, NULL, 0), + (122, 'my other address', 'NY roofs', 'Silla', 46460, 1, NULL, NULL, 1, 0, 102, 2, NULL, NULL, 0), + (123, 'my other address', 'The phone box', 'Silla', 46460, 1, NULL, NULL, 1, 0, 103, 2, NULL, NULL, 0), + (124, 'my other address', 'Stark tower', 'Silla', 46460, 1, NULL, NULL, 1, 0, 104, 2, NULL, NULL, 0), + (125, 'my other address', 'The plastic cell', 'Silla', 46460, 1, NULL, NULL, 1, 0, 105, 2, NULL, NULL, 0), + (126, 'my other address', 'Many places', 'Silla', 46460, 1, NULL, NULL, 1, 0, 106, 2, NULL, NULL, 0), + (127, 'my other address', 'Your pocket', 'Silla', 46460, 1, NULL, NULL, 1, 0, 107, 2, NULL, NULL, 0), + (128, 'my other address', 'Cerebro', 'Silla', 46460, 1, NULL, NULL, 1, 0, 108, 2, NULL, NULL, 0), + (129, 'my other address', 'Luke Cages Bar', 'Silla', 46460, 1, NULL, NULL, 1, 0, 110, 2, NULL, NULL, 0); INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created`) VALUES diff --git a/services/db/testing_fixtures.js b/services/db/testing_fixtures.js index 7563e0103..ca525ccb1 100644 --- a/services/db/testing_fixtures.js +++ b/services/db/testing_fixtures.js @@ -16,26 +16,23 @@ let errorHandler = callback => { }; }; -let insertFixtures = (inserts, callback) => { - connection.query(inserts[0], errorHandler(callback)); - // connection.query('SET FOREIGN_KEY_CHECKS = 1'); -}; - -let truncate = (tables, callback) => { - let truncatesSQL = tables.reduce((accumulator, currentValue, i) => { - let sql = 'TRUNCATE TABLE ' + currentValue + '; '; - return (`${accumulator}${sql}`); - }, ''); - - connection.query(truncatesSQL.slice(0, -2), errorHandler(callback)); +let insertFixtures = async function(sqlStatements) { + try { + if (sqlStatements.deletes.length) + await connection.query(sqlStatements.deletes); + if (sqlStatements.inserts.length) + await connection.query(sqlStatements.inserts); + if (sqlStatements.updates.length) + await connection.query(sqlStatements.updates); + } catch (error) { + errorHandler(error); + } }; connection.connect(); -module.exports = function restoreFixtures(fixturesToApply, callback) { +module.exports = function restoreFixtures(sqlStatements) { connection.query('SET FOREIGN_KEY_CHECKS = 0', () => { - truncate(fixturesToApply.tables, () => { - insertFixtures(fixturesToApply.inserts, callback); - }); + insertFixtures(sqlStatements); }); }; diff --git a/services/loopback/common/methods/client/specs/addressesPropagateRe.spec.js b/services/loopback/common/methods/client/specs/addressesPropagateRe.spec.js index 5034e3f57..47cef837e 100644 --- a/services/loopback/common/methods/client/specs/addressesPropagateRe.spec.js +++ b/services/loopback/common/methods/client/specs/addressesPropagateRe.spec.js @@ -3,58 +3,19 @@ const catchErrors = require('../../../../../../services/utils/jasmineHelpers').c const restoreFixtures = require('../../../../../../services/db/testing_fixtures'); describe('Client addressesPropagateRe', () => { - let fixturesToApply = {tables: ['`account`.`user`', '`vn2008`.`Clientes`', '`vn2008`.`Consignatarios`'], inserts: [ - `INSERT INTO account.user(id,name,password,role,active,email) - VALUES - (1, 'BruceWayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@verdnatura.es'), - (2, 'PetterParker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@verdnatura.es'), - (3, 'ClarkKent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@verdnatura.es'), - (4, 'TonyStark', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@verdnatura.es'), - (5, 'MaxEisenhardt', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@verdnatura.es'), - (6, 'DavidCharlesHaller', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'DavidCharlesHaller@verdnatura.es'), - (7, 'HankPym', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@verdnatura.es'), - (8, 'CharlesXavier', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'CharlesXavier@verdnatura.es'), - (9, 'BruceBanner', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'BruceBanner@verdnatura.es'), - (10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 9, 1, 'JessicaJones@verdnatura.es'), - (11, 'Cyborg', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'cyborg@verdnatura.es'); - - INSERT INTO salix.Address(id, consignee, street, city, postcode, provinceFk, phone, mobile, isEnabled, isDefaultAddress, clientFk, defaultAgencyFk, longitude, latitude, isEqualizated) - VALUES - (1, 'Bruce Wayne', 'The Bat cave', 'Silla', 46460, 1, NULL, NULL, 1, 1, 1, 2, NULL, NULL, 0), - (2, 'Petter Parker', 'NY roofs', 'Silla', 46460, 1, NULL, NULL, 1, 1, 2, 2, NULL, NULL, 0), - (3, 'Clark Kenn', 'The phone box', 'Silla', 46460, 1, NULL, NULL, 1, 1, 3, 2, NULL, NULL, 0), - (4, 'Tony Stark', 'Stark tower', 'Silla', 46460, 1, NULL, NULL, 1, 1, 4, 2, NULL, NULL, 0), - (5, 'Max Eisenhardt', 'The plastic cell', 'Silla', 46460, 1, NULL, NULL, 1, 1, 5, 2, NULL, NULL, 0), - (6, 'David Charles Haller', 'Many places', 'Silla', 46460, 1, NULL, NULL, 1, 1, 6, 2, NULL, NULL, 0), - (7, 'Hank Pym', 'Your pocket', 'Silla', 46460, 1, NULL, NULL, 1, 1, 7, 2, NULL, NULL, 0), - (8, 'Charles Xavier', 'Cerebro', 'Silla', 46460, 1, NULL, NULL, 1, 1, 8, 2, NULL, NULL, 0), - (9, 'Bruce Banner', 'Somewhere in Thailand', 'Silla', 46460, 1, NULL, NULL, 1, 1, 9, 2, NULL, NULL, 0), - (10,'Jessica Jones', 'Luke Cages Bar', 'Silla', 46460, 1, NULL, NULL, 1, 1, 10, 2, NULL, NULL, 0); - - INSERT INTO vn.client(id,name,fi,socialName,contact,street,city,postcode,phone,mobile,fax,isRelevant,email,iban,dueDay,accountingAccount,isEqualizated,provinceFk,hasToInvoice,credit,countryFk,isActive,gestdocFk,quality,payMethodFk,created,isToBeMailed,contactChannelFk,hasSepaVnl,hasCoreVnl,hasCoreVnh,riskCalculated,clientTypeFk,mailAddress,cplusTerIdNifFk,hasToInvoiceByAddress,isTaxDataChecked,isFreezed,creditInsurance,isCreatedAsServed,hasInvoiceSimplified,salesPersonFk,isVies,eypbc) - VALUES - (1, 'Bruce Wayne', '74451390E', 'Batman', 'Alfred', '1007 Mountain Drive, Gotham', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceWayne@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, 1, 0, 1), - (2, 'Petter Parker', '87945234L', 'Spider-Man', 'Aunt May', '20 Ingram Street', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'PetterParker@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, 1, 0, 1), - (3, 'Clark Kent', '06815934E', 'Super-Man', 'lois lane', '344 Clinton Street', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'ClarkKent@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, 1, 0, 1), - (4, 'Tony Stark', '06089160W', 'Iron-Man', 'Pepper Potts', '10880 Malibu Point', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'TonyStark@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, 1, 0, 1), - (5, 'Max Eisenhardt', '39182496H', 'Magneto', 'Rogue', 'Unknown Whereabouts', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'MaxEisenhardt@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, 3, 0, 1), - (6, 'DavidCharlesHaller', '53136686Q', 'Legion', 'Charles Xavier', 'Evil hideout', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'DavidCharlesHaller@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, 3, 0, 1), - (7, 'Hank Pym', '09854837G', 'Ant-Man', 'Hawk', 'Anthill', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'HankPym@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, 3, 0, 1), - (8, 'Charles Xavier', '22641921P', 'Professor X', 'Beast', '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'CharlesXavier@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), - (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);` - ]}; - - beforeEach(done => { - restoreFixtures(fixturesToApply, done); + let sqlStatements = {deletes: ``, inserts: ``, updates: + `UPDATE vn.address SET isEqualizated = 0 WHERE clientFk = 101;` + }; + beforeEach(() => { + restoreFixtures(sqlStatements); }); - afterAll(done => { - restoreFixtures(fixturesToApply, done); + afterAll(() => { + restoreFixtures(sqlStatements); }); it('should propagate the isEqualizated on both addresses of Mr Wayne', done => { - let id = 1; + let id = 101; let data = { isEqualizated: true }; diff --git a/services/loopback/common/methods/client/specs/card.spec.js b/services/loopback/common/methods/client/specs/card.spec.js index 1d0697f88..1737dd957 100644 --- a/services/loopback/common/methods/client/specs/card.spec.js +++ b/services/loopback/common/methods/client/specs/card.spec.js @@ -3,13 +3,13 @@ const catchErrors = require('../../../../../../services/utils/jasmineHelpers').c describe('Client card', () => { it('should call the card() method to receive a formated card of Bruce Wayne', done => { - let id = 1; + let id = 101; let callback = (error, result) => { if (error) return catchErrors(done)(error); expect(result).toEqual(jasmine.objectContaining({ - id: 1, + id: 101, name: 'Bruce Wayne' })); done(); diff --git a/services/loopback/common/methods/client/specs/createWithUser.spec.js b/services/loopback/common/methods/client/specs/createWithUser.spec.js index 34b8c0db8..eb41d0873 100644 --- a/services/loopback/common/methods/client/specs/createWithUser.spec.js +++ b/services/loopback/common/methods/client/specs/createWithUser.spec.js @@ -3,58 +3,18 @@ const catchErrors = require('../../../../../../services/utils/jasmineHelpers').c const restoreFixtures = require('../../../../../../services/db/testing_fixtures'); describe('Client Create', () => { - let fixturesToApply = {tables: ['`account`.`user`', '`vn2008`.`Clientes`', '`vn2008`.`Consignatarios`'], inserts: [ - `INSERT INTO account.user(id,name,password,role,active,email) - VALUES - (1, 'BruceWayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@verdnatura.es'), - (2, 'PetterParker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@verdnatura.es'), - (3, 'ClarkKent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@verdnatura.es'), - (4, 'TonyStark', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@verdnatura.es'), - (5, 'MaxEisenhardt', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@verdnatura.es'), - (6, 'DavidCharlesHaller', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'DavidCharlesHaller@verdnatura.es'), - (7, 'HankPym', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@verdnatura.es'), - (8, 'CharlesXavier', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'CharlesXavier@verdnatura.es'), - (9, 'BruceBanner', 'ac754a330530832ba1bf7687f577da91', 18, 1, 'BruceBanner@verdnatura.es'), - (10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 9, 1, 'JessicaJones@verdnatura.es'), - (11, 'Cyborg', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'cyborg@verdnatura.es'); - - INSERT INTO account.user(name, password, role, active, email) - SELECT name, MD5('nightmare'), id, 1, CONCAT(name, '@verdnatura.es') - FROM account.role; + let sqlStatements = {deletes: ` + DELETE FROM vn.address WHERE nickname = "Wade"; + DELETE FROM vn.client WHERE name = "Wade"; + DELETE FROM account.user WHERE name = "Deadpool"; + `, inserts: ``, updates: ``}; - INSERT INTO salix.Address(id, consignee, street, city, postcode, provinceFk, phone, mobile, isEnabled, isDefaultAddress, clientFk, defaultAgencyFk, longitude, latitude, isEqualizated) - VALUES - (1, 'Bruce Wayne', 'The Bat cave', 'Silla', 46460, 1, NULL, NULL, 1, 1, 1, 2, NULL, NULL, 0), - (2, 'Petter Parker', 'NY roofs', 'Silla', 46460, 1, NULL, NULL, 1, 1, 2, 2, NULL, NULL, 0), - (3, 'Clark Kenn', 'The phone box', 'Silla', 46460, 1, NULL, NULL, 1, 1, 3, 2, NULL, NULL, 0), - (4, 'Tony Stark', 'Stark tower', 'Silla', 46460, 1, NULL, NULL, 1, 1, 4, 2, NULL, NULL, 0), - (5, 'Max Eisenhardt', 'The plastic cell', 'Silla', 46460, 1, NULL, NULL, 1, 1, 5, 2, NULL, NULL, 0), - (6, 'David Charles Haller', 'Many places', 'Silla', 46460, 1, NULL, NULL, 1, 1, 6, 2, NULL, NULL, 0), - (7, 'Hank Pym', 'Your pocket', 'Silla', 46460, 1, NULL, NULL, 1, 1, 7, 2, NULL, NULL, 0), - (8, 'Charles Xavier', 'Cerebro', 'Silla', 46460, 1, NULL, NULL, 1, 1, 8, 2, NULL, NULL, 0), - (9, 'Bruce Banner', 'Somewhere in Thailand', 'Silla', 46460, 1, NULL, NULL, 1, 1, 9, 2, NULL, NULL, 0), - (10,'Jessica Jones', 'Luke Cages Bar', 'Silla', 46460, 1, NULL, NULL, 1, 1, 10, 2, NULL, NULL, 0); - - INSERT INTO vn.client(id,name,fi,socialName,contact,street,city,postcode,phone,mobile,fax,isRelevant,email,iban,dueDay,accountingAccount,isEqualizated,provinceFk,hasToInvoice,credit,countryFk,isActive,gestdocFk,quality,payMethodFk,created,isToBeMailed,contactChannelFk,hasSepaVnl,hasCoreVnl,hasCoreVnh,riskCalculated,clientTypeFk,mailAddress,cplusTerIdNifFk,hasToInvoiceByAddress,isTaxDataChecked,isFreezed,creditInsurance,isCreatedAsServed,hasInvoiceSimplified,salesPersonFk,isVies,eypbc) - VALUES - (1, 'Bruce Wayne', '74451390E', 'Batman', 'Alfred', '1007 Mountain Drive, Gotham', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceWayne@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, 1, 0, 1), - (2, 'Petter Parker', '87945234L', 'Spider-Man', 'Aunt May', '20 Ingram Street', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'PetterParker@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, 1, 0, 1), - (3, 'Clark Kent', '06815934E', 'Super-Man', 'lois lane', '344 Clinton Street', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'ClarkKent@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, 1, 0, 1), - (4, 'Tony Stark', '06089160W', 'Iron-Man', 'Pepper Potts', '10880 Malibu Point', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'TonyStark@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, 1, 0, 1), - (5, 'Max Eisenhardt', '39182496H', 'Magneto', 'Rogue', 'Unknown Whereabouts', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'MaxEisenhardt@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, 3, 0, 1), - (6, 'DavidCharlesHaller', '53136686Q', 'Legion', 'Charles Xavier', 'Evil hideout', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'DavidCharlesHaller@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, 3, 0, 1), - (7, 'Hank Pym', '09854837G', 'Ant-Man', 'Hawk', 'Anthill', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'HankPym@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, 3, 0, 1), - (8, 'Charles Xavier', '22641921P', 'Professor X', 'Beast', '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'CharlesXavier@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), - (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);` - ]}; - - beforeEach(done => { - restoreFixtures(fixturesToApply, done); + beforeAll(() => { + restoreFixtures(sqlStatements); }); - afterAll(done => { - restoreFixtures(fixturesToApply, done); + afterAll(() => { + restoreFixtures(sqlStatements); }); let newAccountData = { diff --git a/services/loopback/common/methods/client/specs/hasCustomerRole.spec.js b/services/loopback/common/methods/client/specs/hasCustomerRole.spec.js index 32773e25e..c1b25f8a9 100644 --- a/services/loopback/common/methods/client/specs/hasCustomerRole.spec.js +++ b/services/loopback/common/methods/client/specs/hasCustomerRole.spec.js @@ -3,7 +3,7 @@ const catchErrors = require('../../../../../../services/utils/jasmineHelpers').c describe('Client hasCustomerRole', () => { it('should call the hasCustomerRole() method with a customer id', done => { - let id = 1; + let id = 101; let params = {}; let callback = (error, result) => { diff --git a/services/loopback/common/methods/client/specs/listWorkers.spec.js b/services/loopback/common/methods/client/specs/listWorkers.spec.js index 170975d6f..52bd5f3b7 100644 --- a/services/loopback/common/methods/client/specs/listWorkers.spec.js +++ b/services/loopback/common/methods/client/specs/listWorkers.spec.js @@ -7,7 +7,7 @@ describe('Client listWorkers', () => { .then(result => { let amountOfEmployees = Object.keys(result).length; - expect(amountOfEmployees).toEqual(32); + expect(amountOfEmployees).toEqual(37); done(); }) .catch(catchErrors(done)); From 4497b00bab04779521fe34739e39a8f9959368bb Mon Sep 17 00:00:00 2001 From: Daniel Herrero
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/client/core/src/components/autocomplete/autocomplete.js b/client/core/src/components/autocomplete/autocomplete.js
old mode 100644
new mode 100755
index 2dc37b659..5c216d21d
--- a/client/core/src/components/autocomplete/autocomplete.js
+++ b/client/core/src/components/autocomplete/autocomplete.js
@@ -1,381 +1,255 @@
import ngModule from '../../module';
import Component from '../../lib/component';
-import copyObject from '../../lib/copy';
import './style.scss';
-class Autocomplete extends Component {
- constructor($element, $scope, $http, $timeout, $filter) {
- super($element);
- this.$element = $element;
- this.$scope = $scope;
+/**
+ * Input with option selector.
+ *
+ * @property {String} valueField The data field name that should be shown
+ * @property {String} showFiled The data field name that should be used as value
+ * @property {Array} data Static data for the autocomplete
+ * @property {Object} intialData A initial data to avoid the server request used to get the selection
+ * @property {Boolean} multiple Wether to allow multiple selection
+ */
+export default class Autocomplete extends Component {
+ constructor($element, $scope, $http, $transclude) {
+ super($element, $scope);
this.$http = $http;
- this.$timeout = $timeout;
- this.$filter = $filter;
+ this.$transclude = $transclude;
- this._showDropDown = false;
- this.finding = false;
- this.findMore = false;
- this._value = null;
- this._field = null;
- this._preLoad = false;
- this.maxRow = 10;
- this.showField = 'name';
+ this._field = undefined;
+ this._selection = null;
this.valueField = 'id';
- this.items = copyObject(this.data) || [];
- this.displayValueMultiCheck = [];
+ this.showField = 'name';
this._multiField = [];
this.readonly = true;
- this.removeLoadMore = false;
this.form = null;
- this.findForm = false;
- }
-
- get showDropDown() {
- return this._showDropDown;
- }
-
- set showDropDown(value) {
- if (value && this.url && !this._preLoad) {
- this._preLoad = true;
- this.getItems();
- }
- if (value && !this.width) {
- let rectangle = this.$element[0].getBoundingClientRect();
- this.width = Math.round(rectangle.width) - 10;
- }
- this._showDropDown = value;
- }
-
- get displayValue() {
- return this._value;
- }
-
- set displayValue(value) {
- let val = (value === undefined || value === '') ? null : value;
- if (this.multiple && val) {
- let index = this.displayValueMultiCheck.indexOf(val);
- if (index === -1)
- this.displayValueMultiCheck.push(val);
- else
- this.displayValueMultiCheck.splice(index, 1);
-
- this._value = this.displayValueMultiCheck.join(', ');
- } else {
- this._value = val;
- }
-
- if (value === null) {
- this.field = null;
- if (this.multiple && this.items.length) {
- this.displayValueMultiCheck = [];
- this.items.map(item => {
- item.checked = false;
- return item;
- });
- }
- }
+ this.input = this.element.querySelector('.mdl-textfield__input');
+
+ componentHandler.upgradeElement(
+ this.element.querySelector('.mdl-textfield'));
}
+ /**
+ * @type {any} The autocomplete value.
+ */
get field() {
- return this.multiple ? this._multiField : this._field;
+ return this._field;
}
set field(value) {
- if (!angular.equals(value, this.field)) {
- this.finding = true;
- if (value && value.hasOwnProperty(this.valueField)) {
- this._field = value[this.valueField];
- if (this.multiple) {
- this.setMultiField(value[this.valueField]);
- }
- this.setDirtyForm();
- } else {
- this.setValue(value);
- }
+ if (angular.equals(value, this._field))
+ return;
- if (value && value.hasOwnProperty(this.showField))
- this.displayValue = value[this.showField];
+ this._field = value;
+ this.refreshSelection();
- this.finding = false;
-
- if (this.onChange)
- this.onChange({item: this._field});
- }
+ if (this.onChange)
+ this.onChange(value);
}
- set initialData(value) {
- if (value && value.hasOwnProperty(this.valueField)) {
- this._field = value[this.valueField];
- if (this.multiple) {
- this._multiField = [value[this.valueField]];
- }
- if (value.hasOwnProperty(this.showField)) {
- this.displayValue = value[this.showField];
- }
- }
+ /**
+ * @type {Object} The selected data object, you can use this property
+ * to prevent requests to display the initial value.
+ */
+ get selection() {
+ return this._selection;
}
- setMultiField(val) {
- if (val && typeof val === 'object' && val[this.valueField]) {
- val = val[this.valueField];
- }
- if (val === null) {
- this._multiField = [];
- } else {
- let index = this._multiField.indexOf(val);
- if (index === -1) {
- this._multiField.push(val);
- } else {
- this._multiField.splice(index, 1);
- }
- }
+ set selection(value) {
+ this._selection = value;
+ this.refreshDisplayed();
}
- setValue(value) {
- if (value) {
- let data = this.items;
+ selectionIsValid(selection) {
+ return selection
+ && selection[this.valueField] == this._field
+ && selection[this.showField] != null;
+ }
- if (data && data.length)
+ refreshSelection() {
+ if (this.selectionIsValid(this._selection))
+ return;
+
+ let value = this._field;
+
+ if (value && this.valueField && this.showField) {
+ if (this.selectionIsValid(this.initialData)) {
+ this.selection = this.initialData;
+ return;
+ }
+
+ let data = this.data;
+
+ if (!data && this.$.dropDown)
+ data = this.$.dropDown.$.model.data;
+
+ if (data)
for (let i = 0; i < data.length; i++)
if (data[i][this.valueField] === value) {
- this.showItem(data[i]);
+ this.selection = data[i];
return;
}
- this.requestItem(value);
- } else {
- this._field = null;
- this.setMultiField(null);
- this.displayValue = '';
- }
+ if (this.url) {
+ this.requestSelection(value);
+ return;
+ }
+ } else
+ this.selection = null;
}
- requestItem(value) {
- if (!value) return;
-
+ requestSelection(value) {
let where = {};
- where[this.valueField] = value;
+
+ if (this.multiple)
+ where[this.valueField] = {inq: this.field};
+ else
+ where[this.valueField] = value;
let filter = {
- fields: this.getRequestFields(),
+ fields: this.getFields(),
where: where
};
- let json = JSON.stringify(filter);
-
+ let json = encodeURIComponent(JSON.stringify(filter));
this.$http.get(`${this.url}?filter=${json}`).then(
- json => this.onItemRequest(json.data),
- json => this.onItemRequest(null)
+ json => this.onSelectionRequest(json.data),
+ () => this.onSelectionRequest(null)
);
}
- onItemRequest(data) {
- if (data && data.length > 0)
- this.showItem(data[0]);
- else
- this.showItem(null);
+ onSelectionRequest(data) {
+ if (data && data.length > 0) {
+ if (this.multiple)
+ this.selection = data;
+ else
+ this.selection = data[0];
+ } else
+ this.selection = null;
}
- showItem(item) {
- this.displayValue = item ? item[this.showField] : '';
- this.field = item;
+ refreshDisplayed() {
+ let display = '';
+
+ if (this._selection && this.showField) {
+ if (this.multiple && Array.isArray(this._selection)) {
+ for (var item of this._selection) {
+ if (display.length > 0) display += ', ';
+ display += item[this.showField];
+ }
+ } else {
+ display = this._selection[this.showField];
+ }
+ }
+
+ this.input.value = display;
+ this.mdlUpdate();
}
- getRequestFields() {
- let fields = {};
- fields[this.valueField] = true;
- fields[this.showField] = true;
+ getFields() {
+ let fields = [];
+ fields.push(this.valueField);
+ fields.push(this.showField);
- if (this._selectFields)
- for (let field of this._selectFields)
- fields[field] = true;
+ if (this.selectFields)
+ for (let field of this.selectFields)
+ fields.push(field);
return fields;
}
- getOrder() {
- return this.order ? this.order : `${this.showField} ASC`;
+ mdlUpdate() {
+ let field = this.element.querySelector('.mdl-textfield');
+ let mdlField = field.MaterialTextfield;
+ if (mdlField) mdlField.updateClasses_();
}
- findItems(search) {
- if (this.url && search && !this.finding) {
- this.maxRow = false;
- let filter = {};
- if (this.filterSearch) {
- let toSearch = this.filterSearch.replace(/search/g, search);
- filter = this.$scope.$eval(toSearch);
- } else {
- filter = {where: {name: {regexp: search}}};
- if (this.filter && this.filter.where) {
- Object.assign(filter.where, this.filter.where);
- }
- }
- filter.order = this.getOrder();
- let json = JSON.stringify(filter);
- this.finding = true;
- this.$http.get(`${this.url}?filter=${json}`).then(
- json => {
- this.items = [];
- json.data.forEach(
- el => {
- if (this.multiple) {
- el.checked = this.field.indexOf(el[this.valueField]) !== -1;
- }
- this.items.push(el);
- }
- );
- this.finding = false;
- },
- () => {
- this.finding = false;
- }
- );
- } else if (search && !this.url && this.data) {
- this.items = this.$filter('filter')(this.data, search);
- } else if (!search && !this.finding) {
- this.maxRow = 10;
- this.items = [];
- this.getItems();
- }
+ setValue(value) {
+ this.field = value;
+ if (this.form) this.form.$setDirty();
}
- getItems() {
- if (this.url === undefined) {
- this.items = copyObject(this.data);
- this.maxRow = false;
- this.removeLoadMore = true;
- } else {
- let filter = {};
- if (!this.finding) {
- this.finding = true;
-
- if (this.maxRow) {
- if (this.items) {
- filter.skip = this.items.length;
- }
- filter.limit = this.maxRow;
- filter.order = this.getOrder();
- }
- if (this.filter) {
- Object.assign(filter, this.filter);
- }
-
- let json = JSON.stringify(filter);
-
- this.removeLoadMore = false;
-
- this.$http.get(`${this.url}?filter=${json}`).then(
- json => {
- if (json.data.length) {
- json.data.forEach(
- el => {
- if (this.multiple) {
- el.checked = this.field.indexOf(el[this.valueField]) !== -1;
- }
- this.items.push(el);
- }
- );
- if (filter.skip === 0 && this.maxRow && json.data.length < this.maxRow) {
- this.removeLoadMore = true;
- }
- } else {
- this.maxRow = false;
- }
- this.finding = false;
- },
- () => {
- this.finding = false;
- }
- );
- }
- }
- }
- _parentForm() {
- this.findForm = true;
- let formScope = this.$scope;
- while (formScope && !formScope.form && formScope.$id > 1) {
- formScope = formScope.$parent;
- }
- this.form = formScope ? formScope.form || null : null;
- }
- setDirtyForm() {
- if (!this.form && !this.findForm) {
- this._parentForm();
- }
- if (this.form) {
- this.form.$setDirty();
- }
+ onDropDownSelect(value) {
+ this.setValue(value);
+ this.field = value;
}
- $onInit() {
- this.findMore = this.url && this.maxRow;
- this.mouseFocus = false;
- this.focused = false;
+ onClearClick(event) {
+ event.preventDefault();
+ this.setValue(null);
+ }
- this.$element.bind('mouseover', e => {
- this.$timeout(() => {
- this.mouseFocus = true;
- this.showDropDown = this.focused;
- });
+ onKeyDown(event) {
+ if (event.defaultPrevented) return;
+
+ switch (event.keyCode) {
+ case 38: // Up
+ case 40: // Down
+ case 13: // Enter
+ this.showDropDown();
+ break;
+ default:
+ if (event.key.length == 1)
+ this.showDropDown(event.key);
+ else
+ return;
+ }
+
+ event.preventDefault();
+ }
+
+ onMouseDown(event) {
+ event.preventDefault();
+ this.showDropDown();
+ }
+
+ showDropDown(search) {
+ Object.assign(this.$.dropDown.$.model, {
+ url: this.url,
+ staticData: this.data
});
- this.$element.bind('mouseout', () => {
- this.$timeout(() => {
- this.mouseFocus = false;
- this.showDropDown = this.focused;
- });
- });
- this.$element.bind('focusin', e => {
- this.$timeout(() => {
- this.focused = true;
- this.showDropDown = true;
- });
- });
- this.$element.bind('focusout', e => {
- this.$timeout(() => {
- this.focused = false;
- this.showDropDown = this.mouseFocus;
- });
+ Object.assign(this.$.dropDown, {
+ valueField: this.valueField,
+ showField: this.showField,
+ selectFields: this.getFields(),
+ where: this.where,
+ order: this.order,
+ parent: this.input,
+ multiple: this.multiple,
+ limit: this.limit,
+ $transclude: this.$transclude
});
+ this.$.dropDown.show(search);
}
-
- $onDestroy() {
- this.$element.unbind('mouseover');
- this.$element.unbind('mouseout');
- this.$element.unbind('focusin');
- this.$element.unbind('focusout');
- }
-
- $onChanges(objectChange) {
- if (objectChange.data && objectChange.data.currentValue && objectChange.data.currentValue.length) {
- this.items = copyObject(objectChange.data.currentValue);
- this.maxRow = false;
- this.removeLoadMore = true;
- }
- }
-
}
-Autocomplete.$inject = ['$element', '$scope', '$http', '$timeout', '$filter'];
+Autocomplete.$inject = ['$element', '$scope', '$http', '$transclude'];
ngModule.component('vnAutocomplete', {
template: require('./autocomplete.html'),
controller: Autocomplete,
bindings: {
url: '@?',
+ data: ' {
- let $componentController;
+ let $element;
let $scope;
let $httpBackend;
- let $timeout;
- let $element;
let controller;
+ let data = {id: 1, name: 'Bruce Wayne'};
+
beforeEach(() => {
angular.mock.module('client');
});
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$timeout_) => {
- $componentController = _$componentController_;
$scope = $rootScope.$new();
+ $element = angular.element(`
+
+
+
+
+
+
+
+
+ ${template}
`);
$httpBackend = _$httpBackend_;
$httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
- $timeout = _$timeout_;
- $element = angular.element('');
- controller = $componentController('vnAutocomplete', {$scope, $element, $httpBackend, $timeout});
+ controller = _$componentController_('vnAutocomplete', {$element, $scope, $httpBackend, $transclude: null});
}));
- describe('showDropDown() setter', () => {
- it(`should set _showDropDown value`, () => {
- controller._showDropDown = '';
- controller.showDropDown = 'some value';
+ describe('field() setter/getter', () => {
+ it(`should set field controllers property`, () => {
+ controller.field = data.id;
- expect(controller._showDropDown).toEqual('some value');
+ expect(controller.field).toEqual(data.id);
});
- it(`should set _showDropDown value`, () => {
- controller._showDropDown = '';
- controller.showDropDown = 'some value';
+ it(`should set selection finding an existing item in the initialData property`, () => {
+ controller.valueField = 'id';
+ controller.showField = 'name';
+ controller.initialData = data;
+ controller.field = data.id;
- expect(controller._showDropDown).toEqual('some value');
- });
- });
-
- describe('displayValue() setter', () => {
- it(`should display value in a formated way`, () => {
- let value = 'some value';
- controller.displayValue = value;
-
- expect(controller._value).toEqual(value);
+ expect(controller.selection).toEqual(data);
});
- describe('when the autocomeplete is multiple', () => {
- it(`should display values separated with commas`, () => {
- controller.multiple = true;
- controller.displayValue = 'some value';
- controller.displayValue = 'another value';
+ it(`should set selection finding an existing item in the data property`, () => {
+ controller.valueField = 'id';
+ controller.showField = 'name';
+ controller.data = [data];
+ controller.field = data.id;
- expect(controller._value).toEqual('some value, another value');
- });
- });
- });
-
- describe('field() setter', () => {
- describe('when value is an object', () => {
- it(`should set _field controllers property`, () => {
- controller.field = {id: 1, name: 'Bruce Wayne'};
-
- expect(controller._field).toEqual(1);
- });
-
- it(`should set _multifield controllers property `, () => {
- controller.multiple = true;
- controller.field = {id: 1, name: 'Bruce Wayne'};
-
- expect(controller._field).toEqual(1);
- expect(controller._multiField[0]).toEqual(1);
-
- controller.field = {id: 1, name: 'Bruce Wayne'};
-
- expect(controller._multiField).toEqual([]);
- expect(controller._field).toEqual(1);
- });
-
- it(`should set _multifield value and remove it if called a second type with same value`, () => {
- controller.multiple = true;
- controller.field = {id: 1, name: 'Bruce Wayne'};
-
- expect(controller._field).toEqual(1);
- expect(controller._multiField[0]).toEqual(1);
-
- controller.field = {id: 1, name: 'Bruce Wayne'};
-
- expect(controller._multiField).toEqual([]);
- expect(controller._field).toEqual(1);
- });
-
- it(`should set displayValue finding an existing item in the controller.items property`, () => {
- controller.items = [{id: 1, name: 'test1'}, {id: 2, name: 'Bruce Wayne'}];
- controller.field = {id: 2, name: 'Bruce Wayne'};
-
- expect(controller.displayValue).toEqual('Bruce Wayne');
- });
+ expect(controller.selection).toEqual(data);
});
- describe('when value is a number', () => {
- it(`should set _field controller property finding an existing item in the controller.items property`, () => {
- controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce Wayne'}];
- controller.field = 2;
+ it(`should set selection to null when can't find an existing item in the data property`, () => {
+ controller.valueField = 'id';
+ controller.showField = 'name';
+ controller.field = data.id;
- expect(controller._field).toEqual(2);
- });
-
- it(`should set _multifield value and remove it if called a second type with same value finding an existing item in the controller.items property`, () => {
- controller.items = [{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce Wayne'}];
- controller.multiple = true;
- controller.field = 2;
-
- expect(controller._multiField[0]).toEqual(2);
-
- controller.field = 2;
-
- expect(controller._multiField).toEqual([]);
- });
-
- it(`should perform a query if the item id isn't present in the controller.items property`, () => {
- controller.url = 'test.com';
- $httpBackend.expectGET(`${controller.url}?filter={"fields":{"id":true,"name":true},"where":{"id":3}}`);
- controller.items = [{id: 1, name: 'test1'}, {id: 2, name: 'Bruce Wayne'}];
- controller.field = 3;
- $httpBackend.flush();
- });
-
- it(`should set displayValue finding an existing item in the controller.items property`, () => {
- controller.items = [{id: 1, name: 'test1'}, {id: 2, name: 'Bruce Wayne'}];
- controller.field = 2;
-
- expect(controller.displayValue).toEqual('Bruce Wayne');
- });
-
- it(`should set field performing a query as the item id isn't present in the controller.items property`, () => {
- controller.url = 'test.com';
- $httpBackend.expectGET(`${controller.url}?filter={"fields":{"id":true,"name":true},"where":{"id":3}}`);
- controller.items = [{id: 1, name: 'test1'}, {id: 2, name: 'Bruce Wayne'}];
- controller.field = 3;
- $httpBackend.flush();
- });
+ expect(controller.selection).toEqual(null);
});
- });
- describe('findItems()', () => {
- it(`should perform a search and store the result in controller items`, () => {
- let controller = $componentController('vnAutocomplete', {$scope, $element, $httpBackend, $timeout});
- controller.url = 'test.com';
- let search = 'The Joker';
- let json = JSON.stringify({where: {name: {regexp: search}}, order: controller.getOrder()});
- $httpBackend.whenGET(`${controller.url}?filter=${json}`).respond([{id: 3, name: 'The Joker'}]);
- $httpBackend.expectGET(`${controller.url}?filter=${json}`);
- controller.findItems(search);
+ it(`should perform a query if the item id isn't present in the data property`, () => {
+ controller.valueField = 'id';
+ controller.showField = 'name';
+ controller.url = 'localhost';
+ controller.field = data.id;
+
+ let filter = {
+ fields: ['id', 'name'],
+ where: {id: data.id}
+ };
+ let json = encodeURIComponent(JSON.stringify(filter));
+
+ $httpBackend.expectGET(`localhost?filter=${json}`);
+ controller.field = data.id;
$httpBackend.flush();
-
- expect(controller.items[0]).toEqual({id: 3, name: 'The Joker'});
- });
-
- it(`should perform a search and store the result in controller items with filterSearch`, () => {
- let controller = $componentController('vnAutocomplete', {$scope, $element, $httpBackend, $timeout});
- controller.url = 'test.com';
- let search = 'The Joker';
- controller.filterSearch = "{where: {name: {regexp: 'search'}}}";
- let json = JSON.stringify({where: {name: {regexp: search}}, order: controller.getOrder()});
- $httpBackend.whenGET(`${controller.url}?filter=${json}`).respond([{id: 3, name: 'The Joker'}]);
- $httpBackend.expectGET(`${controller.url}?filter=${json}`);
- controller.findItems(search);
- $httpBackend.flush();
-
- expect(controller.items[0]).toEqual({id: 3, name: 'The Joker'});
- });
-
- it(`should perform a search with multiple true and store the result in controller items with the checked property defined`, () => {
- controller.url = 'test.com';
- let search = 'Joker';
- controller.multiple = true;
- let json = JSON.stringify({where: {name: {regexp: search}}, order: controller.getOrder()});
- $httpBackend.whenGET(`${controller.url}?filter=${json}`).respond([{id: 3, name: 'The Joker'}, {id: 4, name: 'Joker'}]);
- $httpBackend.expectGET(`${controller.url}?filter=${json}`);
- controller.findItems(search);
- $httpBackend.flush();
-
- expect(controller.items).toEqual([{id: 3, name: 'The Joker', checked: false}, {id: 4, name: 'Joker', checked: false}]);
- });
-
- it(`should call getItems function if there's no search value`, () => {
- controller.url = 'test.com';
- spyOn(controller, 'getItems');
- controller.findItems();
-
- expect(controller.getItems).toHaveBeenCalledWith();
- });
- });
-
- describe('getItems()', () => {
- it(`should perfom a query to fill the items without filter`, () => {
- controller.url = 'test.com';
- $httpBackend.whenGET(`${controller.url}?filter={"skip":0,"limit":10,"order":"name ASC"}`).respond([{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce Wayne'}]);
- $httpBackend.expectGET(`${controller.url}?filter={"skip":0,"limit":10,"order":"name ASC"}`);
- controller.getItems();
- $httpBackend.flush();
-
- expect(controller.items).toEqual([{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce Wayne'}]);
});
});
});
diff --git a/client/core/src/components/autocomplete/style.scss b/client/core/src/components/autocomplete/style.scss
old mode 100644
new mode 100755
index 15e59d4d3..26143c035
--- a/client/core/src/components/autocomplete/style.scss
+++ b/client/core/src/components/autocomplete/style.scss
@@ -1,3 +1,47 @@
+
+vn-autocomplete > div > .mdl-textfield {
+ position: relative;
+ width: 100%;
+
+ & > input {
+ cursor: pointer;
+ height: 26px;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+
+ &:focus {
+ outline: none;
+ }
+ &::-moz-focus-inner {
+ border: 0;
+ }
+ }
+ & > .icons {
+ display: none;
+ position: absolute;
+ right: 0;
+ top: 1.3em;
+ height: 1em;
+ color: #888;
+ border-radius: .2em;
+ background-color: rgba(255, 255, 255, .8);
+
+ & > vn-icon {
+ cursor: pointer;
+ font-size: 18px;
+
+ &:hover {
+ color: #333;
+ }
+ }
+ }
+ &:hover > .icons,
+ & > input:focus + .icons {
+ display: block;
+ }
+}
+
ul.vn-autocomplete {
list-style-type: none;
padding: 1em;
@@ -14,7 +58,7 @@ ul.vn-autocomplete {
&.active,
&:hover {
- background-color: rgba(1,1,1,.1);
+ background-color: rgba(1, 1, 1, .1);
}
&.load-more {
color: #ffa410;
@@ -22,27 +66,4 @@ ul.vn-autocomplete {
padding: .4em .8em;
}
}
-}
-vn-autocomplete {
- position: relative;
- vn-vertical {
- outline:none;
- }
-
- .mdl-chip__action {
- position: absolute;
- top: 0px;
- right: -6px;
- margin: 22px 0px;
- background: transparent;
- }
- .material-icons {
- font-size: 18px;
- }
- vn-drop-down{
- margin-top: 47px;
- }
- vn-drop-down .dropdown-body .filter vn-icon {
- margin-left: -26px;
- }
}
\ No newline at end of file
diff --git a/client/core/src/components/drop-down/drop-down.html b/client/core/src/components/drop-down/drop-down.html
old mode 100644
new mode 100755
index e155c67af..2855da84c
--- a/client/core/src/components/drop-down/drop-down.html
+++ b/client/core/src/components/drop-down/drop-down.html
@@ -1,28 +1,36 @@
--
-
-
-
- {{item.name}}-
-
+
+
+
+
\ No newline at end of file
diff --git a/client/core/src/components/drop-down/drop-down.js b/client/core/src/components/drop-down/drop-down.js
old mode 100644
new mode 100755
index 93de8cf15..c1b34a319
--- a/client/core/src/components/drop-down/drop-down.js
+++ b/client/core/src/components/drop-down/drop-down.js
@@ -1,44 +1,48 @@
import ngModule from '../../module';
-import validKey from '../../lib/key-codes';
+import Component from '../../lib/component';
import './style.scss';
+import './model';
-export default class DropDown {
- constructor($element, $filter, $timeout) {
- this.$element = $element;
- this.$filter = $filter;
+export default class DropDown extends Component {
+ constructor($element, $scope, $transclude, $timeout, $http, $translate) {
+ super($element, $scope);
+ this.$transclude = $transclude;
this.$timeout = $timeout;
+ this.$translate = $translate;
- this._search = null;
- this.itemsFiltered = [];
+ this.valueField = 'id';
+ this.showField = 'name';
+ this._search = undefined;
+ this._shown = false;
this._activeOption = -1;
- this._focusingFilter = false;
- this._tryToShow = 0;
+ this.showLoadMore = true;
+ this.showFilter = true;
+
+ this.input = this.element.querySelector('.search');
+ this.body = this.element.querySelector('.body');
+ this.container = this.element.querySelector('ul');
+ this.list = this.element.querySelector('.list');
+
+ this.docKeyDownHandler = e => this.onDocKeyDown(e);
+ this.docFocusInHandler = e => this.onDocFocusIn(e);
+
+ this.element.addEventListener('mousedown',
+ e => this.onBackgroundMouseDown(e));
+ this.element.addEventListener('focusin',
+ e => this.onFocusIn(e));
+ this.list.addEventListener('scroll',
+ e => this.onScroll(e));
}
- get container() {
- return this.$element[0].querySelector('ul.dropdown');
+ get shown() {
+ return this._shown;
}
- get show() {
- return this._show;
- }
-
- set show(value) {
- let oldValue = this.show;
- // It wait up to 1 second if the dropdown opens but there is no data to show
- if (value && !oldValue && !this.itemsFiltered.length && this._tryToShow < 4) {
- this.$timeout(() => {
- this._tryToShow++;
- this.show = true;
- if (this.activeOption === -1) {
- this.activeOption = 0;
- }
- }, 250);
- } else {
- this._tryToShow = 0;
- this._show = value;
- this._toggleDropDown(value, oldValue);
- }
+ set shown(value) {
+ if (value)
+ this.show();
+ else
+ this.hide();
}
get search() {
@@ -46,242 +50,390 @@ export default class DropDown {
}
set search(value) {
- let val = (value === undefined || value === '') ? null : value;
- this._search = val;
+ value = value == '' || value == null ? null : value;
+ if (value === this._search) return;
- if (this.filterAction)
- this.onFilterRest();
- else
- this.filterItems();
+ this._search = value;
+ this.$.model.clear();
+
+ this.$timeout.cancel(this.searchTimeout);
+ this.searchTimeout = this.$timeout(() => {
+ this.refreshModel();
+ this.searchTimeout = null;
+ }, 350);
+
+ this.buildList();
+ }
+
+ get statusText() {
+ let model = this.$.model;
+ let data = model.data;
+ let statusText = null;
+
+ if (model.isLoading || this.searchTimeout)
+ statusText = 'Loading...';
+ else if (data == null)
+ statusText = 'No data';
+ else if (model.moreRows)
+ statusText = 'Load More';
+ else if (data.length === 0)
+ statusText = 'No results found';
+
+ return statusText;
+ }
+
+ get model() {
+ return this.$.model;
}
get activeOption() {
return this._activeOption;
}
- set activeOption(value) {
- if (value < 0) {
- value = 0;
- } else if (value >= this.itemsFiltered.length) {
- value = this.showLoadMore ? this.itemsFiltered.length : this.itemsFiltered.length - 1;
- }
- this.$timeout(() => {
- this._activeOption = value;
- if (value && value >= this.itemsFiltered.length - 3 && !this.removeLoadMore) {
- this.loadItems();
- }
- });
+ /**
+ * Shows the drop-down. If a parent is specified it is shown in a visible
+ * relative position to it.
+ *
+ * @param {String} search The initial search term or %null
+ */
+ show(search) {
+ if (this._shown) return;
+ this._shown = true;
+ this._activeOption = -1;
+ this.search = search;
+ this.buildList();
+ this.element.style.display = 'block';
+ this.list.scrollTop = 0;
+ this.$timeout(() => this.$element.addClass('shown'), 40);
+ this.document.addEventListener('keydown', this.docKeyDownHandler);
+ this.document.addEventListener('focusin', this.docFocusInHandler);
+ this.relocate();
+ this.input.focus();
}
- _toggleDropDown(value, oldValue) {
- this.$timeout(() => {
- this._eventScroll(value);
- this._calculatePosition(value, oldValue);
- });
+ /**
+ * Hides the drop-down.
+ */
+ hide() {
+ if (!this._shown) return;
+ this._shown = false;
+ this.element.style.display = '';
+ this.$element.removeClass('shown');
+ this.document.removeEventListener('keydown', this.docKeyDownHandler);
+ this.document.removeEventListener('focusin', this.docFocusInHandler);
+ if (this.parent)
+ this.parent.focus();
}
- _eventScroll(add, num) {
- let count = num || 0;
- if (add) {
- if (this.container) {
- this.container.addEventListener('scroll', e => this.loadFromScroll(e));
- // this.$timeout(() => { // falla al entrar por primera vez xq pierde el foco y cierra el dropdown
- // this._setFocusInFilterInput();
- // });
- } else if (count < 4) {
- count++;
- this.$timeout(() => { // wait angular ngIf
- this._eventScroll(add, count);
- }, 250);
- }
- } else if (this.container) {
- this.container.removeEventListener('scroll', e => this.loadFromScroll(e));
+ /**
+ * Repositions the drop-down to a correct location relative to the parent.
+ */
+ relocate() {
+ if (!this.parent) return;
+
+ let style = this.body.style;
+ style.width = '';
+ style.height = '';
+
+ let parentRect = this.parent.getBoundingClientRect();
+ let bodyRect = this.body.getBoundingClientRect();
+
+ let top = parentRect.top + parentRect.height;
+ let height = bodyRect.height;
+ let width = Math.max(bodyRect.width, parentRect.width);
+
+ let margin = 10;
+
+ if (top + height + margin > window.innerHeight)
+ top = Math.max(parentRect.top - height, margin);
+
+ style.top = `${top}px`;
+ style.left = `${parentRect.left}px`;
+ style.width = `${width}px`;
+
+ if (height + margin * 2 > window.innerHeight)
+ style.height = `${window.innerHeight - margin * 2}px`;
+ }
+
+ /**
+ * Activates a option and scrolls the drop-down to that option.
+ *
+ * @param {Number} option The option index
+ */
+ moveToOption(option) {
+ this.activateOption(option);
+
+ let list = this.list;
+ let li = this.activeLi;
+ if (!li) return;
+
+ let liRect = li.getBoundingClientRect();
+ let listRect = list.getBoundingClientRect();
+
+ if (liRect.bottom > listRect.bottom)
+ list.scrollTop += liRect.bottom - listRect.bottom;
+ else if (liRect.top < listRect.top)
+ list.scrollTop -= listRect.top - liRect.top;
+ }
+
+ /**
+ * Activates a option.
+ *
+ * @param {Number} option The option index
+ */
+ activateOption(option) {
+ this._activeOption = option;
+
+ if (this.activeLi)
+ this.activeLi.className = '';
+
+ let data = this.$.model.data;
+
+ if (option >= 0 && data && option < data.length) {
+ this.activeLi = this.container.children[option];
+ this.activeLi.className = 'active';
}
}
- _setFocusInFilterInput() {
- let inputFilterSearch = this.$element[0].querySelector('input');
- this._focusingFilter = true;
- if (inputFilterSearch)
- this.$timeout(() => {
- inputFilterSearch.focus();
- this._focusingFilter = false;
- }, 250);
- }
+ /**
+ * Selects an option.
+ *
+ * @param {Number} option The option index
+ */
+ selectOption(option) {
+ if (option != -1) {
+ let data = this.$.model.data;
+ let item = data ? data[option] : null;
+ let value = item ? item[this.valueField] : null;
- _background(create) {
- let el = document.getElementById('ddBack');
- if (el) {
- el.parentNode.removeChild(el);
- }
+ if (this.multiple) {
+ if (!Array.isArray(this.selection)) {
+ this.selection = [];
+ this.field = [];
+ }
- if (create) {
- el = document.createElement('div');
- el.id = 'ddBack';
- document.body.appendChild(el);
- }
- }
- _calculatePosition(value, oldValue) {
- if (value && !oldValue) {
- if (this.parent === undefined) {
- this.parent = this.$element.parent().parent();
+ this.selection.push(item);
+ this.field.push(value);
+ } else {
+ this.selection = item;
+ this.field = value;
}
- let parentRect = this.parent.getBoundingClientRect();
- let elemetRect = this.$element[0].getBoundingClientRect();
- let instOffset = parentRect.bottom + elemetRect.height;
-
- if (instOffset >= window.innerHeight) {
- this._background(true);
- this.$element.addClass('fixed-dropDown');
- this.$element.css('top', `${(parentRect.top - elemetRect.height)}px`);
- this.$element.css('left', `${(parentRect.x)}px`);
- this.$element.css('height', `${elemetRect.height}px`);
- }
- } else if (!value && oldValue) {
- this.$element.removeAttr('style');
- if (this.itemWidth) {
- this.$element.css('width', this.itemWidth + 'px');
- }
- this.$element.removeClass('fixed-dropDown');
- this._background();
+ if (this.onSelect)
+ this.onSelect({value: value});
}
+
+ if (!this.multiple)
+ this.hide();
}
- filterItems() {
- this.itemsFiltered = this.search ? this.$filter('filter')(this.items, this.search) : this.items;
+ refreshModel() {
+ this.$.model.filter = {
+ fields: this.selectFields,
+ where: this.getWhere(this._search),
+ order: this.getOrder(),
+ limit: this.limit || 8
+ };
+ this.$.model.refresh(this._search);
}
- onFilterRest() {
- if (this.filterAction) {
- this.filterAction({search: this.search});
+ getWhere(search) {
+ if (search == '' || search == null)
+ return undefined;
+
+ if (this.where) {
+ let jsonFilter = this.where.replace(/search/g, search);
+ return this.$.$eval(jsonFilter);
}
+
+ let where = {};
+ where[this.showField] = {regexp: search};
+ return where;
}
- clearSearch() {
+ getOrder() {
+ if (this.order)
+ return this.order;
+ else if (this.showField)
+ return `${this.showField} ASC`;
+
+ return undefined;
+ }
+
+ onMouseDown(event) {
+ this.lastMouseEvent = event;
+ }
+
+ onBackgroundMouseDown(event) {
+ if (event != this.lastMouseEvent)
+ this.hide();
+ }
+
+ onFocusIn(event) {
+ this.lastFocusEvent = event;
+ }
+
+ onDocFocusIn(event) {
+ if (event !== this.lastFocusEvent && event.originalTarget !== this.parent)
+ this.hide();
+ }
+
+ onClearClick() {
this.search = null;
}
- selectOption() {
- if (this.activeOption >= 0 && this.activeOption < this.items.length && this.items[this.activeOption]) {
- this.selected = this.items[this.activeOption];
- this.show = false;
- this.clearSearch();
- } else if (this.showLoadMore && this.activeOption === this.items.length) {
- this.loadMore();
- }
+ onScroll() {
+ let list = this.list;
+ let shouldLoad =
+ list.scrollTop + list.clientHeight >= (list.scrollHeight - 40)
+ && !this.$.model.isLoading;
+
+ if (shouldLoad)
+ this.$.model.loadMore();
}
- onKeydown(event) {
- if (this.show) {
- if (event.keyCode === 13) { // Enter
- this.$timeout(() => {
- this.selectOption();
- });
- event.preventDefault();
- } else if (event.keyCode === 27) { // Escape
- this.clearSearch();
- } else if (event.keyCode === 38) { // Arrow up
- this.activeOption--;
- this.$timeout(() => {
- this.setScrollPosition();
- }, 100);
- } else if (event.keyCode === 40) { // Arrow down
- this.activeOption++;
- this.$timeout(() => {
- this.setScrollPosition();
- }, 100);
- } else if (event.keyCode === 35) { // End
- this.activeOption = this.itemsFiltered.length - 1;
- this.$timeout(() => {
- this.setScrollPosition();
- }, 100);
- } else if (event.keyCode === 36) { // Start
- this.activeOption = 0;
- this.$timeout(() => {
- this.setScrollPosition();
- }, 100);
- } else if (this.filter) {
- let oldValue = this.search || '';
- if (validKey(event)) {
- this.search = oldValue + String.fromCharCode(event.keyCode);
- } else if (event.keyCode === 8) { // backSpace
- this.search = oldValue.slice(0, -1);
- }
- } /* else {
- console.error(`Error: keyCode ${event.keyCode} not supported`);
- } */
- }
+ onLoadMoreClick(event) {
+ event.preventDefault();
+ this.$.model.loadMore();
}
- setScrollPosition() {
- let child = this.$element[0].querySelector('ul.dropdown li.active');
- if (child) {
- let childRect = child.getBoundingClientRect();
- let containerRect = this.container.getBoundingClientRect();
- if (typeof child.scrollIntoView === 'function' && (childRect.top > containerRect.top + containerRect.height || childRect.top < containerRect.top)) {
- child.scrollIntoView();
+
+ onContainerClick(event) {
+ if (event.defaultPrevented) return;
+ let index = getPosition(this.container, event);
+ if (index != -1) this.selectOption(index);
+ }
+
+ onModelDataChange() {
+ this.buildList();
+ }
+
+ onDocKeyDown(event) {
+ if (event.defaultPrevented) return;
+
+ let data = this.$.model.data;
+ let option = this.activeOption;
+ let nOpts = data ? data.length - 1 : 0;
+
+ switch (event.keyCode) {
+ case 13: // Enter
+ this.selectOption(option);
+ break;
+ case 27: // Escape
+ this.hide();
+ break;
+ case 38: // Up
+ this.moveToOption(option <= 0 ? nOpts : option - 1);
+ break;
+ case 40: // Down
+ this.moveToOption(option >= nOpts ? 0 : option + 1);
+ break;
+ case 35: // End
+ this.moveToOption(nOpts);
+ break;
+ case 36: // Start
+ this.moveToOption(0);
+ break;
+ default:
+ return;
+ }
+
+ event.preventDefault();
+ this.$.$applyAsync();
+ }
+
+ buildList() {
+ this.destroyScopes();
+ this.scopes = [];
+
+ let hasTemplate = this.$transclude &&
+ this.$transclude.isSlotFilled('tplItem');
+ let fragment = this.document.createDocumentFragment();
+ let data = this.$.model.data;
+
+ if (data) {
+ for (let i = 0; i < data.length; i++) {
+ let li = this.document.createElement('li');
+ fragment.appendChild(li);
+
+ if (this.multiple) {
+ let check = this.document.createElement('input');
+ check.type = 'checkbox';
+ li.appendChild(check);
+
+ if (this.field && this.field.indexOf(data[i][this.valueField]) != -1)
+ check.checked = true;
+ }
+
+ if (hasTemplate) {
+ this.$transclude((clone, scope) => {
+ Object.assign(scope, data[i]);
+ li.appendChild(clone[0]);
+ this.scopes[i] = scope;
+ }, null, 'tplItem');
+ } else {
+ let text = this.document.createTextNode(data[i][this.showField]);
+ li.appendChild(text);
+ }
}
}
+
+ this.container.innerHTML = '';
+ this.container.appendChild(fragment);
+ this.activateOption(this._activeOption);
+ this.relocate();
}
- selectItem(item) {
- this.selected = item;
- if (this.multiple) {
- item.checked = !item.checked;
- this.show = true;
- } else {
- this.show = false;
- }
- }
- loadItems() {
- if (this.showLoadMore && this.loadMore) {
- this.loadMore();
- }
- this.show = true;
- }
- loadFromScroll(e) {
- let containerRect = e.target.getBoundingClientRect();
- if (e.target.scrollHeight - e.target.scrollTop - containerRect.height <= 50) {
- this.loadItems();
- }
- }
- $onChanges(changesObj) {
- if (changesObj.show && changesObj.itemWidth && changesObj.itemWidth.currentValue) {
- this.$element.css('width', changesObj.itemWidth.currentValue + 'px');
- }
- if (changesObj.items) {
- this.filterItems();
- }
- }
- $onInit() {
- if (this.parent)
- this.parent.addEventListener('keydown', e => this.onKeydown(e));
+
+ destroyScopes() {
+ if (this.scopes)
+ for (let scope of this.scopes)
+ scope.$destroy();
}
+
$onDestroy() {
- if (this.parent)
- this.parent.removeEventListener('keydown', e => this.onKeydown(e));
+ this.destroyScopes();
}
}
+DropDown.$inject = ['$element', '$scope', '$transclude', '$timeout', '$http', '$translate'];
-DropDown.$inject = ['$element', '$filter', '$timeout'];
+/**
+ * Gets the position of an event element relative to a parent.
+ *
+ * @param {HTMLElement} parent The parent element
+ * @param {Event} event The event object
+ * @return {Number} The element index
+ */
+function getPosition(parent, event) {
+ let target = event.target;
+ let children = parent.children;
+
+ if (target === parent)
+ return -1;
+
+ while (target.parentNode !== parent)
+ target = target.parentNode;
+
+ for (let i = 0; i < children.length; i++)
+ if (children[i] === target)
+ return i;
+
+ return -1;
+}
ngModule.component('vnDropDown', {
template: require('./drop-down.html'),
controller: DropDown,
bindings: {
- items: '<',
- show: '<',
- filter: '@?',
- selected: '=',
- search: '=?',
- loadMore: '&?',
- removeLoadMore: ' {
let $componentController;
let $timeout;
let $element;
+ let $scope;
+ let $httpBackend;
+ let $q;
let $filter;
let controller;
@@ -11,337 +15,34 @@ describe('Component vnDropDown', () => {
angular.mock.module('client');
});
- beforeEach(angular.mock.inject((_$componentController_, _$timeout_, _$filter_, _$httpBackend_) => {
- _$httpBackend_.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
+ beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$timeout_, _$httpBackend_, _$q_, _$filter_) => {
$componentController = _$componentController_;
- $element = angular.element('
+
+
+
+
+
+
+
+ {{$ctrl.statusText}}
+
+ ${template}
`);
$timeout = _$timeout_;
+ $q = _$q_;
$filter = _$filter_;
- controller = $componentController('vnDropDown', {$element, $timeout, $filter});
+ $scope = $rootScope.$new();
+ $httpBackend = _$httpBackend_;
+ $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
+
+ $scope.model = $componentController('vnModel', {$httpBackend, $q, $filter});
+ controller = $componentController('vnDropDown', {$element, $scope, $transclude: null, $timeout, $httpBackend, $translate: null});
controller.parent = angular.element('{{$ctrl.item.name}}
- {{$ctrl.tags[itemTag.tagFk].name}} : {{itemTag.value}}
+ {{$ctrl.tags[itemTag.tagFk].name}} {{itemTag.value}}
-
+