From dc33a46eee3c3124adab35f9685993fe5d4fbdf9 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 14 Dec 2022 12:17:12 +0100 Subject: [PATCH 1/6] refs #4926 ticket tour future refactor --- db/changes/225001/.gitkeep | 0 .../225001/00-ticket_canbePostponed.sql | 73 +++++++ e2e/helpers/selectors.js | 10 +- .../{20_future.spec.js => 21_future.spec.js} | 56 ------ modules/ticket/back/locale/ticket/en.yml | 1 + modules/ticket/back/locale/ticket/es.yml | 1 + .../methods/ticket-future/getTicketsFuture.js | 107 +++++----- .../spec/getTicketsFuture.spec.js | 185 ++++-------------- modules/ticket/back/methods/ticket/merge.js | 17 +- .../front/future-search-panel/index.html | 35 +--- .../ticket/front/future-search-panel/index.js | 3 +- .../front/future-search-panel/locale/en.yml | 8 - .../front/future-search-panel/locale/es.yml | 9 - modules/ticket/front/future/index.html | 24 +-- modules/ticket/front/future/index.js | 38 ++-- modules/ticket/front/future/index.spec.js | 8 +- modules/ticket/front/future/locale/en.yml | 4 - modules/ticket/front/future/locale/es.yml | 10 +- 18 files changed, 226 insertions(+), 363 deletions(-) delete mode 100644 db/changes/225001/.gitkeep create mode 100644 db/changes/225001/00-ticket_canbePostponed.sql rename e2e/paths/05-ticket/{20_future.spec.js => 21_future.spec.js} (77%) diff --git a/db/changes/225001/.gitkeep b/db/changes/225001/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/db/changes/225001/00-ticket_canbePostponed.sql b/db/changes/225001/00-ticket_canbePostponed.sql new file mode 100644 index 000000000..b1206799d --- /dev/null +++ b/db/changes/225001/00-ticket_canbePostponed.sql @@ -0,0 +1,73 @@ +DROP PROCEDURE IF EXISTS `vn`.`ticket_canbePostponed`; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, vWarehouseFk INT) +BEGIN +/** + * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro + * + * @param vOriginDated Fecha en cuestión + * @param vFutureDated Fecha en el futuro a sondear + * @param vWarehouseFk Identificador de vn.warehouse + */ + DROP TEMPORARY TABLE IF EXISTS tmp.filter; + CREATE TEMPORARY TABLE tmp.filter + (INDEX (id)) + SELECT sv.ticketFk id, + GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt, + CAST(sum(litros) AS DECIMAL(10,0)) liters, + CAST(count(*) AS DECIMAL(10,0)) `lines`, + st.name state, + sub2.id ticketFuture, + sub2.iptd tfIpt, + sub2.state tfState, + t.clientFk, + t.warehouseFk, + ts.alertLevel, + t.shipped, + sub2.shipped tfShipped, + t.workerFk, + st.code stateCode, + sub2.code tfStateCode + FROM vn.saleVolume sv + JOIN vn.sale s ON s.id = sv.saleFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.ticket t ON t.id = sv.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.country c ON c.id = p.countryFk + JOIN vn.ticketState ts ON ts.ticketFk = t.id + JOIN vn.state st ON st.id = ts.stateFk + JOIN vn.alertLevel al ON al.id = ts.alertLevel + LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id + LEFT JOIN ( + SELECT * + FROM ( + SELECT + t.addressFk , + t.id, + t.shipped, + st.name state, + st.code code, + GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd + FROM vn.ticket t + JOIN vn.ticketState ts ON ts.ticketFk = t.id + JOIN vn.state st ON st.id = ts.stateFk + JOIN vn.sale s ON s.ticketFk = t.id + JOIN vn.item i ON i.id = s.itemFk + WHERE t.shipped BETWEEN vFutureDated + AND util.dayend(vFutureDated) + AND t.warehouseFk = vWarehouseFk + GROUP BY t.id + ) sub + GROUP BY sub.addressFk + ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id + WHERE t.shipped BETWEEN vOriginDated AND util.dayend(vOriginDated) + AND t.warehouseFk = vWarehouseFk + AND al.code = 'FREE' + AND tp.ticketFk IS NULL + GROUP BY sv.ticketFk + HAVING ticketFuture; +END$$ +DELIMITER ; diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index f550e3a9d..e485259d8 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -735,10 +735,8 @@ export default { }, ticketFuture: { openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]', - originDated: 'vn-date-picker[label="Origin ETD"]', - futureDated: 'vn-date-picker[label="Destination ETD"]', - shipped: 'vn-date-picker[label="Origin date"]', - tfShipped: 'vn-date-picker[label="Destination date"]', + originDated: 'vn-date-picker[label="Origin date"]', + futureDated: 'vn-date-picker[label="Destination date"]', linesMax: 'vn-textfield[label="Max Lines"]', litersMax: 'vn-textfield[label="Max Liters"]', ipt: 'vn-autocomplete[label="Origin IPT"]', @@ -756,8 +754,8 @@ export default { multiCheck: 'vn-multi-check', tableId: 'vn-textfield[name="id"]', tableTfId: 'vn-textfield[name="ticketFuture"]', - tableLiters: 'vn-textfield[name="litersMax"]', - tableLines: 'vn-textfield[name="linesMax"]', + tableLiters: 'vn-textfield[name="liters"]', + tableLines: 'vn-textfield[name="lines"]', submit: 'vn-submit[label="Search"]', table: 'tbody > tr:not(.empty-rows)' }, diff --git a/e2e/paths/05-ticket/20_future.spec.js b/e2e/paths/05-ticket/21_future.spec.js similarity index 77% rename from e2e/paths/05-ticket/20_future.spec.js rename to e2e/paths/05-ticket/21_future.spec.js index 6db2bf4f0..d4dbffc94 100644 --- a/e2e/paths/05-ticket/20_future.spec.js +++ b/e2e/paths/05-ticket/21_future.spec.js @@ -16,9 +16,6 @@ describe('Ticket Future path', () => { await browser.close(); }); - const now = new Date(); - const tomorrow = new Date(now.getDate() + 1); - it('should show errors snackbar because of the required data', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.warehouseFk); @@ -27,20 +24,6 @@ describe('Ticket Future path', () => { expect(message.text).toContain('warehouseFk is a required argument'); - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.litersMax); - await page.waitToClick(selectors.ticketFuture.submit); - message = await page.waitForSnackbar(); - - expect(message.text).toContain('litersMax is a required argument'); - - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.linesMax); - await page.waitToClick(selectors.ticketFuture.submit); - message = await page.waitForSnackbar(); - - expect(message.text).toContain('linesMax is a required argument'); - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.futureDated); await page.waitToClick(selectors.ticketFuture.submit); @@ -62,40 +45,9 @@ describe('Ticket Future path', () => { await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); }); - it('should search with the origin shipped today', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.pickDate(selectors.ticketFuture.shipped, now); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); - }); - - it('should search with the origin shipped tomorrow', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.pickDate(selectors.ticketFuture.shipped, tomorrow); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); - }); - - it('should search with the destination shipped today', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.pickDate(selectors.ticketFuture.tfShipped, now); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); - }); - - it('should search with the destination shipped tomorrow', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.pickDate(selectors.ticketFuture.tfShipped, tomorrow); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); - }); - it('should search with the origin IPT', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -109,8 +61,6 @@ describe('Ticket Future path', () => { it('should search with the destination IPT', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -124,8 +74,6 @@ describe('Ticket Future path', () => { it('should search with the origin grouped state', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -139,8 +87,6 @@ describe('Ticket Future path', () => { it('should search with the destination grouped state', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -151,8 +97,6 @@ describe('Ticket Future path', () => { await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); diff --git a/modules/ticket/back/locale/ticket/en.yml b/modules/ticket/back/locale/ticket/en.yml index 4e97f5d8c..c4ad84232 100644 --- a/modules/ticket/back/locale/ticket/en.yml +++ b/modules/ticket/back/locale/ticket/en.yml @@ -20,3 +20,4 @@ routeFk: route companyFk: company agencyModeFk: agency ticketFk: ticket +mergedTicket: merged ticket diff --git a/modules/ticket/back/locale/ticket/es.yml b/modules/ticket/back/locale/ticket/es.yml index a570f1f11..2c524a74f 100644 --- a/modules/ticket/back/locale/ticket/es.yml +++ b/modules/ticket/back/locale/ticket/es.yml @@ -20,3 +20,4 @@ routeFk: ruta companyFk: empresa agencyModeFk: agencia ticketFk: ticket +mergedTicket: ticket fusionado diff --git a/modules/ticket/back/methods/ticket-future/getTicketsFuture.js b/modules/ticket/back/methods/ticket-future/getTicketsFuture.js index 0fcc21182..aa726deea 100644 --- a/modules/ticket/back/methods/ticket-future/getTicketsFuture.js +++ b/modules/ticket/back/methods/ticket-future/getTicketsFuture.js @@ -20,18 +20,6 @@ module.exports = Self => { description: 'The date to probe', required: true }, - { - arg: 'litersMax', - type: 'number', - description: 'Maximum volume of tickets to catapult', - required: true - }, - { - arg: 'linesMax', - type: 'number', - description: 'Maximum number of lines of tickets to catapult', - required: true - }, { arg: 'warehouseFk', type: 'number', @@ -39,15 +27,15 @@ module.exports = Self => { required: true }, { - arg: 'shipped', - type: 'date', - description: 'Origin shipped', + arg: 'liters', + type: 'number', + description: 'Maximum volume of tickets to catapult', required: false }, { - arg: 'tfShipped', - type: 'date', - description: 'Destination shipped', + arg: 'lines', + type: 'number', + description: 'Maximum number of lines of tickets to catapult', required: false }, { @@ -108,7 +96,7 @@ module.exports = Self => { } }); - Self.getTicketsFuture = async (ctx, options) => { + Self.getTicketsFuture = async(ctx, options) => { const args = ctx.args; const conn = Self.dataSource.connector; const myOptions = {}; @@ -118,32 +106,32 @@ module.exports = Self => { const where = buildFilter(ctx.args, (param, value) => { switch (param) { - case 'id': - return { 'f.id': value }; - case 'tfId': - return { 'f.ticketFuture': value }; - case 'shipped': - return { 'f.shipped': value }; - case 'tfShipped': - return { 'f.tfShipped': value }; - case 'ipt': - return { 'f.ipt': value }; - case 'tfIpt': - return { 'f.tfIpt': value }; - case 'state': - return { 'f.code': { like: `%${value}%` } }; - case 'tfState': - return { 'f.tfCode': { like: `%${value}%` } }; + case 'id': + return {'f.id': value}; + case 'lines': + return {'f.lines': {lte: value}}; + case 'liters': + return {'f.liters': {lte: value}}; + case 'tfId': + return {'f.ticketFuture': value}; + case 'ipt': + return {'f.ipt': value}; + case 'tfIpt': + return {'f.tfIpt': value}; + case 'state': + return {'f.stateCode': {like: `%${value}%`}}; + case 'tfState': + return {'f.tfStateCode': {like: `%${value}%`}}; } }); - let filter = mergeFilters(ctx.args.filter, { where }); + let filter = mergeFilters(ctx.args.filter, {where}); const stmts = []; let stmt; stmt = new ParameterizedSQL( - `CALL vn.ticket_canbePostponed(?,?,?,?,?)`, - [args.originDated, args.futureDated, args.litersMax, args.linesMax, args.warehouseFk]); + `CALL vn.ticket_canbePostponed(?,?,?)`, + [args.originDated, args.futureDated, args.warehouseFk]); stmts.push(stmt); @@ -153,7 +141,7 @@ module.exports = Self => { CREATE TEMPORARY TABLE tmp.sale_getProblems (INDEX (ticketFk)) ENGINE = MEMORY - SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped + SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped, f.lines, f.liters FROM tmp.filter f LEFT JOIN alertLevel al ON al.id = f.alertLevel WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)`); @@ -174,35 +162,34 @@ module.exports = Self => { let range; let hasWhere; switch (args.problems) { - case true: - condition = `or`; - hasProblem = true; - range = { neq: null }; - hasWhere = true; - break; + case true: + condition = `or`; + hasProblem = true; + range = {neq: null}; + hasWhere = true; + break; - case false: - condition = `and`; - hasProblem = null; - range = null; - hasWhere = true; - break; + case false: + condition = `and`; + hasProblem = null; + range = null; + hasWhere = true; + break; } const problems = { [condition]: [ - { 'tp.isFreezed': hasProblem }, - { 'tp.risk': hasProblem }, - { 'tp.hasTicketRequest': hasProblem }, - { 'tp.itemShortage': range }, - { 'tp.hasComponentLack': hasProblem }, - { 'tp.isTooLittle': hasProblem } + {'tp.isFreezed': hasProblem}, + {'tp.risk': hasProblem}, + {'tp.hasTicketRequest': hasProblem}, + {'tp.itemShortage': range}, + {'tp.hasComponentLack': hasProblem}, + {'tp.isTooLittle': hasProblem} ] }; - if (hasWhere) { - filter = mergeFilters(filter, { where: problems }); - } + if (hasWhere) + filter = mergeFilters(filter, {where: problems}); stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeOrderBy(filter.order)); diff --git a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js index 502ea3074..459c2eb1e 100644 --- a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js +++ b/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js @@ -5,11 +5,11 @@ describe('TicketFuture getTicketsFuture()', () => { today.setHours(0, 0, 0, 0); const tomorrow = new Date(today.getDate() + 1); - it('should return the tickets passing the required data', async () => { + it('should return the tickets passing the required data', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -19,7 +19,7 @@ describe('TicketFuture getTicketsFuture()', () => { warehouseFk: 1, }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -30,11 +30,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the problems on true', async () => { + it('should return the tickets matching the problems on true', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -45,7 +45,7 @@ describe('TicketFuture getTicketsFuture()', () => { problems: true }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -57,11 +57,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the problems on false', async () => { + it('should return the tickets matching the problems on false', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -72,7 +72,7 @@ describe('TicketFuture getTicketsFuture()', () => { problems: false }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(0); @@ -84,11 +84,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the problems on null', async () => { + it('should return the tickets matching the problems on null', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -99,7 +99,7 @@ describe('TicketFuture getTicketsFuture()', () => { problems: null }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -111,11 +111,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the correct origin shipped', async () => { + it('should return the tickets matching the OK State in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -123,118 +123,10 @@ describe('TicketFuture getTicketsFuture()', () => { litersMax: 9999, linesMax: 9999, warehouseFk: 1, - shipped: today + state: 'OK' }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(4); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the an incorrect origin shipped', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - shipped: tomorrow - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(0); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the correct destination shipped', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - tfShipped: today - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(4); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the an incorrect destination shipped', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - tfShipped: tomorrow - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(0); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the OK State in origin date', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - state: "OK" - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(1); @@ -246,11 +138,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the OK State in destination date', async () => { + it('should return the tickets matching the OK State in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -258,10 +150,10 @@ describe('TicketFuture getTicketsFuture()', () => { litersMax: 9999, linesMax: 9999, warehouseFk: 1, - tfState: "OK" + tfState: 'OK' }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -273,11 +165,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the correct IPT in origin date', async () => { + it('should return the tickets matching the correct IPT in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -288,7 +180,7 @@ describe('TicketFuture getTicketsFuture()', () => { ipt: null }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -300,11 +192,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the incorrect IPT in origin date', async () => { + it('should return the tickets matching the incorrect IPT in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -315,7 +207,7 @@ describe('TicketFuture getTicketsFuture()', () => { ipt: 0 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(0); @@ -327,11 +219,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the correct IPT in destination date', async () => { + it('should return the tickets matching the correct IPT in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -342,7 +234,7 @@ describe('TicketFuture getTicketsFuture()', () => { tfIpt: null }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -354,11 +246,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the incorrect IPT in destination date', async () => { + it('should return the tickets matching the incorrect IPT in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -369,7 +261,7 @@ describe('TicketFuture getTicketsFuture()', () => { tfIpt: 0 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(0); @@ -381,11 +273,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the ID in origin date', async () => { + it('should return the tickets matching the ID in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -396,7 +288,7 @@ describe('TicketFuture getTicketsFuture()', () => { id: 13 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(1); @@ -408,11 +300,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the ID in destination date', async () => { + it('should return the tickets matching the ID in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -423,7 +315,7 @@ describe('TicketFuture getTicketsFuture()', () => { tfId: 12 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -434,5 +326,4 @@ describe('TicketFuture getTicketsFuture()', () => { throw e; } }); - }); diff --git a/modules/ticket/back/methods/ticket/merge.js b/modules/ticket/back/methods/ticket/merge.js index 04f8d83af..8a86eff6f 100644 --- a/modules/ticket/back/methods/ticket/merge.js +++ b/modules/ticket/back/methods/ticket/merge.js @@ -43,14 +43,27 @@ module.exports = Self => { const fullPath = `${origin}/#!/ticket/${ticket.id}/summary`; const fullPathFuture = `${origin}/#!/ticket/${ticket.ticketFuture}/summary`; const message = $t('Ticket merged', { - originDated: dateUtil.toString(new Date(ticket.originETD)), - futureDated: dateUtil.toString(new Date(ticket.destETD)), + originDated: dateUtil.toString(new Date(ticket.shipped)), + futureDated: dateUtil.toString(new Date(ticket.tfShipped)), id: ticket.id, tfId: ticket.ticketFuture, fullPath, fullPathFuture }); if (!ticket.id || !ticket.ticketFuture) continue; + + const ticketFutureLogRecord = { + originFk: ticket.ticketFuture, + userFk: ctx.req.accessToken.userId, + action: 'update', + changedModel: 'Ticket', + changedModelId: ticket.ticketFuture, + changedModelValue: ticket.ticketFuture, + oldInstance: {}, + newInstance: {mergedTicket: ticket.id} + }; + + await models.TicketLog.create(ticketFutureLogRecord, myOptions); await models.Sale.updateAll({ticketFk: ticket.id}, {ticketFk: ticket.ticketFuture}, myOptions); await models.Ticket.setDeleted(ctx, ticket.id, myOptions); await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message); diff --git a/modules/ticket/front/future-search-panel/index.html b/modules/ticket/front/future-search-panel/index.html index 1b3ae453e..93e046236 100644 --- a/modules/ticket/front/future-search-panel/index.html +++ b/modules/ticket/front/future-search-panel/index.html @@ -4,43 +4,26 @@ + ng-model="filter.originDated" + required="true"> - - - - - - + required="true"> + ng-model="filter.lines"> + ng-model="filter.liters"> @@ -48,22 +31,22 @@ data="$ctrl.itemPackingTypes" label="Origin IPT" value-field="code" - show-field="name" + show-field="description" ng-model="filter.ipt" info="IPT"> - {{name}} + {{description}} - {{name}} + {{description}} diff --git a/modules/ticket/front/future-search-panel/index.js b/modules/ticket/front/future-search-panel/index.js index 1a1f0e4c5..d7e7b3a5e 100644 --- a/modules/ticket/front/future-search-panel/index.js +++ b/modules/ticket/front/future-search-panel/index.js @@ -28,9 +28,8 @@ class Controller extends SearchPanel { this.$http.get('ItemPackingTypes').then(res => { for (let ipt of res.data) { itemPackingTypes.push({ - id: ipt.id, + description: this.$t(ipt.description), code: ipt.code, - name: this.$t(ipt.code) }); } this.itemPackingTypes = itemPackingTypes; diff --git a/modules/ticket/front/future-search-panel/locale/en.yml b/modules/ticket/front/future-search-panel/locale/en.yml index fe71865cb..767c20152 100644 --- a/modules/ticket/front/future-search-panel/locale/en.yml +++ b/modules/ticket/front/future-search-panel/locale/en.yml @@ -1,9 +1 @@ Future tickets: Tickets a futuro -FREE: Free -DELIVERED: Delivered -ON_PREPARATION: On preparation -PACKED: Packed -F: Fruits and vegetables -V: Vertical -H: Horizontal -P: Feed diff --git a/modules/ticket/front/future-search-panel/locale/es.yml b/modules/ticket/front/future-search-panel/locale/es.yml index 82deba538..9d72c5b06 100644 --- a/modules/ticket/front/future-search-panel/locale/es.yml +++ b/modules/ticket/front/future-search-panel/locale/es.yml @@ -11,13 +11,4 @@ With problems: Con problemas Warehouse: Almacén Origin Grouped State: Estado agrupado origen Destination Grouped State: Estado agrupado destino -FREE: Libre -DELIVERED: Servido -ON_PREPARATION: En preparacion -PACKED: Encajado -F: Frutas y verduras -V: Vertical -H: Horizontal -P: Pienso -ETD: Tiempo estimado de entrega IPT: Encajado diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html index d30cbaf19..0b1912084 100644 --- a/modules/ticket/front/future/index.html +++ b/modules/ticket/front/future/index.html @@ -44,31 +44,31 @@ Origin ID - - Origin ETD + + Origin Date Origin State - + IPT - + Liters - + Available Lines Destination ID - - Destination ETD + + Destination Date Destination State - + IPT @@ -125,8 +125,8 @@ {{::ticket.id}} - - {{::ticket.originETD | date: 'dd/MM/yyyy'}} + + {{::ticket.shipped | date: 'dd/MM/yyyy'}} @@ -146,8 +146,8 @@ - - {{::ticket.destETD | date: 'dd/MM/yyyy'}} + + {{::ticket.tfShipped | date: 'dd/MM/yyyy'}} diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js index 311b9c307..918ed79b5 100644 --- a/modules/ticket/front/future/index.js +++ b/modules/ticket/front/future/index.js @@ -15,11 +15,11 @@ export default class Controller extends Section { searchable: false }, { - field: 'originETD', + field: 'shipped', searchable: false }, { - field: 'destETD', + field: 'tfShipped', searchable: false }, { @@ -35,7 +35,7 @@ export default class Controller extends Section { autocomplete: { url: 'ItemPackingTypes', showField: 'description', - valueField: 'code' + valueField: 'description' } }, { @@ -43,7 +43,7 @@ export default class Controller extends Section { autocomplete: { url: 'ItemPackingTypes', showField: 'description', - valueField: 'code' + valueField: 'description' } }, ] @@ -57,9 +57,7 @@ export default class Controller extends Section { this.filterParams = { originDated: today, futureDated: today, - linesMax: '9999', - litersMax: '9999', - warehouseFk: 1 + warehouseFk: this.vnConfig.warehouseFk }; } @@ -113,7 +111,7 @@ export default class Controller extends Section { } moveTicketsFuture() { - let params = { tickets: this.checked }; + let params = {tickets: this.checked}; return this.$http.post('Tickets/merge', params) .then(() => { this.$.model.refresh(); @@ -123,18 +121,18 @@ export default class Controller extends Section { exprBuilder(param, value) { switch (param) { - case 'id': - return { 'id': value }; - case 'ticketFuture': - return { 'ticketFuture': value }; - case 'litersMax': - return { 'liters': value }; - case 'linesMax': - return { 'lines': value }; - case 'ipt': - return { 'ipt': value }; - case 'tfIpt': - return { 'tfIpt': value }; + case 'id': + return {'id': value}; + case 'ticketFuture': + return {'ticketFuture': value}; + case 'liters': + return {'liters': value}; + case 'lines': + return {'lines': value}; + case 'ipt': + return {'ipt': value}; + case 'tfIpt': + return {'tfIpt': value}; } } } diff --git a/modules/ticket/front/future/index.spec.js b/modules/ticket/front/future/index.spec.js index 63deebc4f..9c6b97c8b 100644 --- a/modules/ticket/front/future/index.spec.js +++ b/modules/ticket/front/future/index.spec.js @@ -13,16 +13,16 @@ describe('Component vnTicketFuture', () => { $httpBackend = _$httpBackend_; $window = _$window_; const $element = angular.element(''); - controller = $componentController('vnTicketFuture', { $element }); + controller = $componentController('vnTicketFuture', {$element}); controller.$.model = crudModel; controller.$.model.data = [{ id: 1, checked: true, - state: "OK" + state: 'OK' }, { id: 2, checked: true, - state: "Libre" + state: 'Libre' }]; })); @@ -67,6 +67,7 @@ describe('Component vnTicketFuture', () => { it('should return success to the OK tickets', () => { const ok = controller.stateColor(controller.$.model.data[0].state); const notOk = controller.stateColor(controller.$.model.data[1].state); + expect(ok).toEqual('success'); expect(notOk).not.toEqual('success'); }); @@ -74,6 +75,7 @@ describe('Component vnTicketFuture', () => { it('should return success to the FREE tickets', () => { const notFree = controller.stateColor(controller.$.model.data[0].state); const free = controller.stateColor(controller.$.model.data[1].state); + expect(free).toEqual('notice'); expect(notFree).not.toEqual('notice'); }); diff --git a/modules/ticket/front/future/locale/en.yml b/modules/ticket/front/future/locale/en.yml index 66d3ce269..4400e6992 100644 --- a/modules/ticket/front/future/locale/en.yml +++ b/modules/ticket/front/future/locale/en.yml @@ -1,6 +1,2 @@ Move confirmation: Do you want to move {{checked}} tickets to the future? -FREE: Free -DELIVERED: Delivered -ON_PREPARATION: On preparation -PACKED: Packed Success: Tickets moved successfully! diff --git a/modules/ticket/front/future/locale/es.yml b/modules/ticket/front/future/locale/es.yml index 9be0be6a4..9fceea111 100644 --- a/modules/ticket/front/future/locale/es.yml +++ b/modules/ticket/front/future/locale/es.yml @@ -3,20 +3,14 @@ Search tickets: Buscar tickets Search future tickets by date: Buscar tickets por fecha Problems: Problemas Origin ID: ID origen -Closing: Cierre Origin State: Estado origen Destination State: Estado destino Liters: Litros Available Lines: Líneas disponibles Destination ID: ID destino -Destination ETD: ETD Destino -Origin ETD: ETD Origen Move tickets: Mover tickets Move confirmation: ¿Desea mover {{checked}} tickets hacia el futuro? Success: Tickets movidos correctamente -ETD: Tiempo estimado de entrega IPT: Encajado -FREE: Libre -DELIVERED: Servido -ON_PREPARATION: En preparacion -PACKED: Encajado +Origin Date: Fecha origen +Destination Date: Fecha destino -- 2.40.1 From 2baa4a19544c0c83d5dbcddba5b8dd2c5bf32040 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 14 Dec 2022 12:17:12 +0100 Subject: [PATCH 2/6] refs #4962 ticket tour future refactor --- db/changes/225001/.gitkeep | 0 .../225001/00-ticket_canbePostponed.sql | 73 +++++++ e2e/helpers/selectors.js | 10 +- .../{20_future.spec.js => 21_future.spec.js} | 56 ------ modules/ticket/back/locale/ticket/en.yml | 1 + modules/ticket/back/locale/ticket/es.yml | 1 + .../methods/ticket-future/getTicketsFuture.js | 107 +++++----- .../spec/getTicketsFuture.spec.js | 185 ++++-------------- modules/ticket/back/methods/ticket/merge.js | 17 +- .../front/future-search-panel/index.html | 35 +--- .../ticket/front/future-search-panel/index.js | 3 +- .../front/future-search-panel/locale/en.yml | 8 - .../front/future-search-panel/locale/es.yml | 9 - modules/ticket/front/future/index.html | 24 +-- modules/ticket/front/future/index.js | 38 ++-- modules/ticket/front/future/index.spec.js | 8 +- modules/ticket/front/future/locale/en.yml | 4 - modules/ticket/front/future/locale/es.yml | 10 +- 18 files changed, 226 insertions(+), 363 deletions(-) delete mode 100644 db/changes/225001/.gitkeep create mode 100644 db/changes/225001/00-ticket_canbePostponed.sql rename e2e/paths/05-ticket/{20_future.spec.js => 21_future.spec.js} (77%) diff --git a/db/changes/225001/.gitkeep b/db/changes/225001/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/db/changes/225001/00-ticket_canbePostponed.sql b/db/changes/225001/00-ticket_canbePostponed.sql new file mode 100644 index 000000000..b1206799d --- /dev/null +++ b/db/changes/225001/00-ticket_canbePostponed.sql @@ -0,0 +1,73 @@ +DROP PROCEDURE IF EXISTS `vn`.`ticket_canbePostponed`; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, vWarehouseFk INT) +BEGIN +/** + * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro + * + * @param vOriginDated Fecha en cuestión + * @param vFutureDated Fecha en el futuro a sondear + * @param vWarehouseFk Identificador de vn.warehouse + */ + DROP TEMPORARY TABLE IF EXISTS tmp.filter; + CREATE TEMPORARY TABLE tmp.filter + (INDEX (id)) + SELECT sv.ticketFk id, + GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt, + CAST(sum(litros) AS DECIMAL(10,0)) liters, + CAST(count(*) AS DECIMAL(10,0)) `lines`, + st.name state, + sub2.id ticketFuture, + sub2.iptd tfIpt, + sub2.state tfState, + t.clientFk, + t.warehouseFk, + ts.alertLevel, + t.shipped, + sub2.shipped tfShipped, + t.workerFk, + st.code stateCode, + sub2.code tfStateCode + FROM vn.saleVolume sv + JOIN vn.sale s ON s.id = sv.saleFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.ticket t ON t.id = sv.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.country c ON c.id = p.countryFk + JOIN vn.ticketState ts ON ts.ticketFk = t.id + JOIN vn.state st ON st.id = ts.stateFk + JOIN vn.alertLevel al ON al.id = ts.alertLevel + LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id + LEFT JOIN ( + SELECT * + FROM ( + SELECT + t.addressFk , + t.id, + t.shipped, + st.name state, + st.code code, + GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd + FROM vn.ticket t + JOIN vn.ticketState ts ON ts.ticketFk = t.id + JOIN vn.state st ON st.id = ts.stateFk + JOIN vn.sale s ON s.ticketFk = t.id + JOIN vn.item i ON i.id = s.itemFk + WHERE t.shipped BETWEEN vFutureDated + AND util.dayend(vFutureDated) + AND t.warehouseFk = vWarehouseFk + GROUP BY t.id + ) sub + GROUP BY sub.addressFk + ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id + WHERE t.shipped BETWEEN vOriginDated AND util.dayend(vOriginDated) + AND t.warehouseFk = vWarehouseFk + AND al.code = 'FREE' + AND tp.ticketFk IS NULL + GROUP BY sv.ticketFk + HAVING ticketFuture; +END$$ +DELIMITER ; diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index f550e3a9d..e485259d8 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -735,10 +735,8 @@ export default { }, ticketFuture: { openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]', - originDated: 'vn-date-picker[label="Origin ETD"]', - futureDated: 'vn-date-picker[label="Destination ETD"]', - shipped: 'vn-date-picker[label="Origin date"]', - tfShipped: 'vn-date-picker[label="Destination date"]', + originDated: 'vn-date-picker[label="Origin date"]', + futureDated: 'vn-date-picker[label="Destination date"]', linesMax: 'vn-textfield[label="Max Lines"]', litersMax: 'vn-textfield[label="Max Liters"]', ipt: 'vn-autocomplete[label="Origin IPT"]', @@ -756,8 +754,8 @@ export default { multiCheck: 'vn-multi-check', tableId: 'vn-textfield[name="id"]', tableTfId: 'vn-textfield[name="ticketFuture"]', - tableLiters: 'vn-textfield[name="litersMax"]', - tableLines: 'vn-textfield[name="linesMax"]', + tableLiters: 'vn-textfield[name="liters"]', + tableLines: 'vn-textfield[name="lines"]', submit: 'vn-submit[label="Search"]', table: 'tbody > tr:not(.empty-rows)' }, diff --git a/e2e/paths/05-ticket/20_future.spec.js b/e2e/paths/05-ticket/21_future.spec.js similarity index 77% rename from e2e/paths/05-ticket/20_future.spec.js rename to e2e/paths/05-ticket/21_future.spec.js index 6db2bf4f0..d4dbffc94 100644 --- a/e2e/paths/05-ticket/20_future.spec.js +++ b/e2e/paths/05-ticket/21_future.spec.js @@ -16,9 +16,6 @@ describe('Ticket Future path', () => { await browser.close(); }); - const now = new Date(); - const tomorrow = new Date(now.getDate() + 1); - it('should show errors snackbar because of the required data', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.warehouseFk); @@ -27,20 +24,6 @@ describe('Ticket Future path', () => { expect(message.text).toContain('warehouseFk is a required argument'); - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.litersMax); - await page.waitToClick(selectors.ticketFuture.submit); - message = await page.waitForSnackbar(); - - expect(message.text).toContain('litersMax is a required argument'); - - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.linesMax); - await page.waitToClick(selectors.ticketFuture.submit); - message = await page.waitForSnackbar(); - - expect(message.text).toContain('linesMax is a required argument'); - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.futureDated); await page.waitToClick(selectors.ticketFuture.submit); @@ -62,40 +45,9 @@ describe('Ticket Future path', () => { await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); }); - it('should search with the origin shipped today', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.pickDate(selectors.ticketFuture.shipped, now); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); - }); - - it('should search with the origin shipped tomorrow', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.pickDate(selectors.ticketFuture.shipped, tomorrow); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); - }); - - it('should search with the destination shipped today', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.pickDate(selectors.ticketFuture.tfShipped, now); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); - }); - - it('should search with the destination shipped tomorrow', async() => { - await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.pickDate(selectors.ticketFuture.tfShipped, tomorrow); - await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); - }); - it('should search with the origin IPT', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -109,8 +61,6 @@ describe('Ticket Future path', () => { it('should search with the destination IPT', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -124,8 +74,6 @@ describe('Ticket Future path', () => { it('should search with the origin grouped state', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -139,8 +87,6 @@ describe('Ticket Future path', () => { it('should search with the destination grouped state', async() => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); @@ -151,8 +97,6 @@ describe('Ticket Future path', () => { await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); - await page.clearInput(selectors.ticketFuture.shipped); - await page.clearInput(selectors.ticketFuture.tfShipped); await page.clearInput(selectors.ticketFuture.ipt); await page.clearInput(selectors.ticketFuture.tfIpt); await page.clearInput(selectors.ticketFuture.state); diff --git a/modules/ticket/back/locale/ticket/en.yml b/modules/ticket/back/locale/ticket/en.yml index 4e97f5d8c..c4ad84232 100644 --- a/modules/ticket/back/locale/ticket/en.yml +++ b/modules/ticket/back/locale/ticket/en.yml @@ -20,3 +20,4 @@ routeFk: route companyFk: company agencyModeFk: agency ticketFk: ticket +mergedTicket: merged ticket diff --git a/modules/ticket/back/locale/ticket/es.yml b/modules/ticket/back/locale/ticket/es.yml index a570f1f11..2c524a74f 100644 --- a/modules/ticket/back/locale/ticket/es.yml +++ b/modules/ticket/back/locale/ticket/es.yml @@ -20,3 +20,4 @@ routeFk: ruta companyFk: empresa agencyModeFk: agencia ticketFk: ticket +mergedTicket: ticket fusionado diff --git a/modules/ticket/back/methods/ticket-future/getTicketsFuture.js b/modules/ticket/back/methods/ticket-future/getTicketsFuture.js index 0fcc21182..aa726deea 100644 --- a/modules/ticket/back/methods/ticket-future/getTicketsFuture.js +++ b/modules/ticket/back/methods/ticket-future/getTicketsFuture.js @@ -20,18 +20,6 @@ module.exports = Self => { description: 'The date to probe', required: true }, - { - arg: 'litersMax', - type: 'number', - description: 'Maximum volume of tickets to catapult', - required: true - }, - { - arg: 'linesMax', - type: 'number', - description: 'Maximum number of lines of tickets to catapult', - required: true - }, { arg: 'warehouseFk', type: 'number', @@ -39,15 +27,15 @@ module.exports = Self => { required: true }, { - arg: 'shipped', - type: 'date', - description: 'Origin shipped', + arg: 'liters', + type: 'number', + description: 'Maximum volume of tickets to catapult', required: false }, { - arg: 'tfShipped', - type: 'date', - description: 'Destination shipped', + arg: 'lines', + type: 'number', + description: 'Maximum number of lines of tickets to catapult', required: false }, { @@ -108,7 +96,7 @@ module.exports = Self => { } }); - Self.getTicketsFuture = async (ctx, options) => { + Self.getTicketsFuture = async(ctx, options) => { const args = ctx.args; const conn = Self.dataSource.connector; const myOptions = {}; @@ -118,32 +106,32 @@ module.exports = Self => { const where = buildFilter(ctx.args, (param, value) => { switch (param) { - case 'id': - return { 'f.id': value }; - case 'tfId': - return { 'f.ticketFuture': value }; - case 'shipped': - return { 'f.shipped': value }; - case 'tfShipped': - return { 'f.tfShipped': value }; - case 'ipt': - return { 'f.ipt': value }; - case 'tfIpt': - return { 'f.tfIpt': value }; - case 'state': - return { 'f.code': { like: `%${value}%` } }; - case 'tfState': - return { 'f.tfCode': { like: `%${value}%` } }; + case 'id': + return {'f.id': value}; + case 'lines': + return {'f.lines': {lte: value}}; + case 'liters': + return {'f.liters': {lte: value}}; + case 'tfId': + return {'f.ticketFuture': value}; + case 'ipt': + return {'f.ipt': value}; + case 'tfIpt': + return {'f.tfIpt': value}; + case 'state': + return {'f.stateCode': {like: `%${value}%`}}; + case 'tfState': + return {'f.tfStateCode': {like: `%${value}%`}}; } }); - let filter = mergeFilters(ctx.args.filter, { where }); + let filter = mergeFilters(ctx.args.filter, {where}); const stmts = []; let stmt; stmt = new ParameterizedSQL( - `CALL vn.ticket_canbePostponed(?,?,?,?,?)`, - [args.originDated, args.futureDated, args.litersMax, args.linesMax, args.warehouseFk]); + `CALL vn.ticket_canbePostponed(?,?,?)`, + [args.originDated, args.futureDated, args.warehouseFk]); stmts.push(stmt); @@ -153,7 +141,7 @@ module.exports = Self => { CREATE TEMPORARY TABLE tmp.sale_getProblems (INDEX (ticketFk)) ENGINE = MEMORY - SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped + SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped, f.lines, f.liters FROM tmp.filter f LEFT JOIN alertLevel al ON al.id = f.alertLevel WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)`); @@ -174,35 +162,34 @@ module.exports = Self => { let range; let hasWhere; switch (args.problems) { - case true: - condition = `or`; - hasProblem = true; - range = { neq: null }; - hasWhere = true; - break; + case true: + condition = `or`; + hasProblem = true; + range = {neq: null}; + hasWhere = true; + break; - case false: - condition = `and`; - hasProblem = null; - range = null; - hasWhere = true; - break; + case false: + condition = `and`; + hasProblem = null; + range = null; + hasWhere = true; + break; } const problems = { [condition]: [ - { 'tp.isFreezed': hasProblem }, - { 'tp.risk': hasProblem }, - { 'tp.hasTicketRequest': hasProblem }, - { 'tp.itemShortage': range }, - { 'tp.hasComponentLack': hasProblem }, - { 'tp.isTooLittle': hasProblem } + {'tp.isFreezed': hasProblem}, + {'tp.risk': hasProblem}, + {'tp.hasTicketRequest': hasProblem}, + {'tp.itemShortage': range}, + {'tp.hasComponentLack': hasProblem}, + {'tp.isTooLittle': hasProblem} ] }; - if (hasWhere) { - filter = mergeFilters(filter, { where: problems }); - } + if (hasWhere) + filter = mergeFilters(filter, {where: problems}); stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeOrderBy(filter.order)); diff --git a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js index 502ea3074..459c2eb1e 100644 --- a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js +++ b/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js @@ -5,11 +5,11 @@ describe('TicketFuture getTicketsFuture()', () => { today.setHours(0, 0, 0, 0); const tomorrow = new Date(today.getDate() + 1); - it('should return the tickets passing the required data', async () => { + it('should return the tickets passing the required data', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -19,7 +19,7 @@ describe('TicketFuture getTicketsFuture()', () => { warehouseFk: 1, }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -30,11 +30,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the problems on true', async () => { + it('should return the tickets matching the problems on true', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -45,7 +45,7 @@ describe('TicketFuture getTicketsFuture()', () => { problems: true }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -57,11 +57,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the problems on false', async () => { + it('should return the tickets matching the problems on false', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -72,7 +72,7 @@ describe('TicketFuture getTicketsFuture()', () => { problems: false }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(0); @@ -84,11 +84,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the problems on null', async () => { + it('should return the tickets matching the problems on null', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -99,7 +99,7 @@ describe('TicketFuture getTicketsFuture()', () => { problems: null }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -111,11 +111,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the correct origin shipped', async () => { + it('should return the tickets matching the OK State in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -123,118 +123,10 @@ describe('TicketFuture getTicketsFuture()', () => { litersMax: 9999, linesMax: 9999, warehouseFk: 1, - shipped: today + state: 'OK' }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(4); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the an incorrect origin shipped', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - shipped: tomorrow - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(0); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the correct destination shipped', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - tfShipped: today - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(4); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the an incorrect destination shipped', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - tfShipped: tomorrow - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; - const result = await models.Ticket.getTicketsFuture(ctx, options); - - expect(result.length).toEqual(0); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return the tickets matching the OK State in origin date', async () => { - const tx = await models.Ticket.beginTransaction({}); - - try { - const options = { transaction: tx }; - - const args = { - originDated: today, - futureDated: today, - litersMax: 9999, - linesMax: 9999, - warehouseFk: 1, - state: "OK" - }; - - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(1); @@ -246,11 +138,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the OK State in destination date', async () => { + it('should return the tickets matching the OK State in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -258,10 +150,10 @@ describe('TicketFuture getTicketsFuture()', () => { litersMax: 9999, linesMax: 9999, warehouseFk: 1, - tfState: "OK" + tfState: 'OK' }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -273,11 +165,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the correct IPT in origin date', async () => { + it('should return the tickets matching the correct IPT in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -288,7 +180,7 @@ describe('TicketFuture getTicketsFuture()', () => { ipt: null }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -300,11 +192,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the incorrect IPT in origin date', async () => { + it('should return the tickets matching the incorrect IPT in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -315,7 +207,7 @@ describe('TicketFuture getTicketsFuture()', () => { ipt: 0 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(0); @@ -327,11 +219,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the correct IPT in destination date', async () => { + it('should return the tickets matching the correct IPT in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -342,7 +234,7 @@ describe('TicketFuture getTicketsFuture()', () => { tfIpt: null }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -354,11 +246,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the incorrect IPT in destination date', async () => { + it('should return the tickets matching the incorrect IPT in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -369,7 +261,7 @@ describe('TicketFuture getTicketsFuture()', () => { tfIpt: 0 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(0); @@ -381,11 +273,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the ID in origin date', async () => { + it('should return the tickets matching the ID in origin date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -396,7 +288,7 @@ describe('TicketFuture getTicketsFuture()', () => { id: 13 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(1); @@ -408,11 +300,11 @@ describe('TicketFuture getTicketsFuture()', () => { } }); - it('should return the tickets matching the ID in destination date', async () => { + it('should return the tickets matching the ID in destination date', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const args = { originDated: today, @@ -423,7 +315,7 @@ describe('TicketFuture getTicketsFuture()', () => { tfId: 12 }; - const ctx = { req: { accessToken: { userId: 9 } }, args }; + const ctx = {req: {accessToken: {userId: 9}}, args}; const result = await models.Ticket.getTicketsFuture(ctx, options); expect(result.length).toEqual(4); @@ -434,5 +326,4 @@ describe('TicketFuture getTicketsFuture()', () => { throw e; } }); - }); diff --git a/modules/ticket/back/methods/ticket/merge.js b/modules/ticket/back/methods/ticket/merge.js index 04f8d83af..8a86eff6f 100644 --- a/modules/ticket/back/methods/ticket/merge.js +++ b/modules/ticket/back/methods/ticket/merge.js @@ -43,14 +43,27 @@ module.exports = Self => { const fullPath = `${origin}/#!/ticket/${ticket.id}/summary`; const fullPathFuture = `${origin}/#!/ticket/${ticket.ticketFuture}/summary`; const message = $t('Ticket merged', { - originDated: dateUtil.toString(new Date(ticket.originETD)), - futureDated: dateUtil.toString(new Date(ticket.destETD)), + originDated: dateUtil.toString(new Date(ticket.shipped)), + futureDated: dateUtil.toString(new Date(ticket.tfShipped)), id: ticket.id, tfId: ticket.ticketFuture, fullPath, fullPathFuture }); if (!ticket.id || !ticket.ticketFuture) continue; + + const ticketFutureLogRecord = { + originFk: ticket.ticketFuture, + userFk: ctx.req.accessToken.userId, + action: 'update', + changedModel: 'Ticket', + changedModelId: ticket.ticketFuture, + changedModelValue: ticket.ticketFuture, + oldInstance: {}, + newInstance: {mergedTicket: ticket.id} + }; + + await models.TicketLog.create(ticketFutureLogRecord, myOptions); await models.Sale.updateAll({ticketFk: ticket.id}, {ticketFk: ticket.ticketFuture}, myOptions); await models.Ticket.setDeleted(ctx, ticket.id, myOptions); await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message); diff --git a/modules/ticket/front/future-search-panel/index.html b/modules/ticket/front/future-search-panel/index.html index 1b3ae453e..93e046236 100644 --- a/modules/ticket/front/future-search-panel/index.html +++ b/modules/ticket/front/future-search-panel/index.html @@ -4,43 +4,26 @@ + ng-model="filter.originDated" + required="true"> - - - - - - + required="true"> + ng-model="filter.lines"> + ng-model="filter.liters"> @@ -48,22 +31,22 @@ data="$ctrl.itemPackingTypes" label="Origin IPT" value-field="code" - show-field="name" + show-field="description" ng-model="filter.ipt" info="IPT"> - {{name}} + {{description}} - {{name}} + {{description}} diff --git a/modules/ticket/front/future-search-panel/index.js b/modules/ticket/front/future-search-panel/index.js index 1a1f0e4c5..d7e7b3a5e 100644 --- a/modules/ticket/front/future-search-panel/index.js +++ b/modules/ticket/front/future-search-panel/index.js @@ -28,9 +28,8 @@ class Controller extends SearchPanel { this.$http.get('ItemPackingTypes').then(res => { for (let ipt of res.data) { itemPackingTypes.push({ - id: ipt.id, + description: this.$t(ipt.description), code: ipt.code, - name: this.$t(ipt.code) }); } this.itemPackingTypes = itemPackingTypes; diff --git a/modules/ticket/front/future-search-panel/locale/en.yml b/modules/ticket/front/future-search-panel/locale/en.yml index fe71865cb..767c20152 100644 --- a/modules/ticket/front/future-search-panel/locale/en.yml +++ b/modules/ticket/front/future-search-panel/locale/en.yml @@ -1,9 +1 @@ Future tickets: Tickets a futuro -FREE: Free -DELIVERED: Delivered -ON_PREPARATION: On preparation -PACKED: Packed -F: Fruits and vegetables -V: Vertical -H: Horizontal -P: Feed diff --git a/modules/ticket/front/future-search-panel/locale/es.yml b/modules/ticket/front/future-search-panel/locale/es.yml index 82deba538..9d72c5b06 100644 --- a/modules/ticket/front/future-search-panel/locale/es.yml +++ b/modules/ticket/front/future-search-panel/locale/es.yml @@ -11,13 +11,4 @@ With problems: Con problemas Warehouse: Almacén Origin Grouped State: Estado agrupado origen Destination Grouped State: Estado agrupado destino -FREE: Libre -DELIVERED: Servido -ON_PREPARATION: En preparacion -PACKED: Encajado -F: Frutas y verduras -V: Vertical -H: Horizontal -P: Pienso -ETD: Tiempo estimado de entrega IPT: Encajado diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html index d30cbaf19..0b1912084 100644 --- a/modules/ticket/front/future/index.html +++ b/modules/ticket/front/future/index.html @@ -44,31 +44,31 @@ Origin ID - - Origin ETD + + Origin Date Origin State - + IPT - + Liters - + Available Lines Destination ID - - Destination ETD + + Destination Date Destination State - + IPT @@ -125,8 +125,8 @@ {{::ticket.id}} - - {{::ticket.originETD | date: 'dd/MM/yyyy'}} + + {{::ticket.shipped | date: 'dd/MM/yyyy'}} @@ -146,8 +146,8 @@ - - {{::ticket.destETD | date: 'dd/MM/yyyy'}} + + {{::ticket.tfShipped | date: 'dd/MM/yyyy'}} diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js index 311b9c307..918ed79b5 100644 --- a/modules/ticket/front/future/index.js +++ b/modules/ticket/front/future/index.js @@ -15,11 +15,11 @@ export default class Controller extends Section { searchable: false }, { - field: 'originETD', + field: 'shipped', searchable: false }, { - field: 'destETD', + field: 'tfShipped', searchable: false }, { @@ -35,7 +35,7 @@ export default class Controller extends Section { autocomplete: { url: 'ItemPackingTypes', showField: 'description', - valueField: 'code' + valueField: 'description' } }, { @@ -43,7 +43,7 @@ export default class Controller extends Section { autocomplete: { url: 'ItemPackingTypes', showField: 'description', - valueField: 'code' + valueField: 'description' } }, ] @@ -57,9 +57,7 @@ export default class Controller extends Section { this.filterParams = { originDated: today, futureDated: today, - linesMax: '9999', - litersMax: '9999', - warehouseFk: 1 + warehouseFk: this.vnConfig.warehouseFk }; } @@ -113,7 +111,7 @@ export default class Controller extends Section { } moveTicketsFuture() { - let params = { tickets: this.checked }; + let params = {tickets: this.checked}; return this.$http.post('Tickets/merge', params) .then(() => { this.$.model.refresh(); @@ -123,18 +121,18 @@ export default class Controller extends Section { exprBuilder(param, value) { switch (param) { - case 'id': - return { 'id': value }; - case 'ticketFuture': - return { 'ticketFuture': value }; - case 'litersMax': - return { 'liters': value }; - case 'linesMax': - return { 'lines': value }; - case 'ipt': - return { 'ipt': value }; - case 'tfIpt': - return { 'tfIpt': value }; + case 'id': + return {'id': value}; + case 'ticketFuture': + return {'ticketFuture': value}; + case 'liters': + return {'liters': value}; + case 'lines': + return {'lines': value}; + case 'ipt': + return {'ipt': value}; + case 'tfIpt': + return {'tfIpt': value}; } } } diff --git a/modules/ticket/front/future/index.spec.js b/modules/ticket/front/future/index.spec.js index 63deebc4f..9c6b97c8b 100644 --- a/modules/ticket/front/future/index.spec.js +++ b/modules/ticket/front/future/index.spec.js @@ -13,16 +13,16 @@ describe('Component vnTicketFuture', () => { $httpBackend = _$httpBackend_; $window = _$window_; const $element = angular.element(''); - controller = $componentController('vnTicketFuture', { $element }); + controller = $componentController('vnTicketFuture', {$element}); controller.$.model = crudModel; controller.$.model.data = [{ id: 1, checked: true, - state: "OK" + state: 'OK' }, { id: 2, checked: true, - state: "Libre" + state: 'Libre' }]; })); @@ -67,6 +67,7 @@ describe('Component vnTicketFuture', () => { it('should return success to the OK tickets', () => { const ok = controller.stateColor(controller.$.model.data[0].state); const notOk = controller.stateColor(controller.$.model.data[1].state); + expect(ok).toEqual('success'); expect(notOk).not.toEqual('success'); }); @@ -74,6 +75,7 @@ describe('Component vnTicketFuture', () => { it('should return success to the FREE tickets', () => { const notFree = controller.stateColor(controller.$.model.data[0].state); const free = controller.stateColor(controller.$.model.data[1].state); + expect(free).toEqual('notice'); expect(notFree).not.toEqual('notice'); }); diff --git a/modules/ticket/front/future/locale/en.yml b/modules/ticket/front/future/locale/en.yml index 66d3ce269..4400e6992 100644 --- a/modules/ticket/front/future/locale/en.yml +++ b/modules/ticket/front/future/locale/en.yml @@ -1,6 +1,2 @@ Move confirmation: Do you want to move {{checked}} tickets to the future? -FREE: Free -DELIVERED: Delivered -ON_PREPARATION: On preparation -PACKED: Packed Success: Tickets moved successfully! diff --git a/modules/ticket/front/future/locale/es.yml b/modules/ticket/front/future/locale/es.yml index 9be0be6a4..9fceea111 100644 --- a/modules/ticket/front/future/locale/es.yml +++ b/modules/ticket/front/future/locale/es.yml @@ -3,20 +3,14 @@ Search tickets: Buscar tickets Search future tickets by date: Buscar tickets por fecha Problems: Problemas Origin ID: ID origen -Closing: Cierre Origin State: Estado origen Destination State: Estado destino Liters: Litros Available Lines: Líneas disponibles Destination ID: ID destino -Destination ETD: ETD Destino -Origin ETD: ETD Origen Move tickets: Mover tickets Move confirmation: ¿Desea mover {{checked}} tickets hacia el futuro? Success: Tickets movidos correctamente -ETD: Tiempo estimado de entrega IPT: Encajado -FREE: Libre -DELIVERED: Servido -ON_PREPARATION: En preparacion -PACKED: Encajado +Origin Date: Fecha origen +Destination Date: Fecha destino -- 2.40.1 From f80f851e8d480eedc3502531240c2bbd0991ef12 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 14 Dec 2022 13:10:33 +0100 Subject: [PATCH 3/6] refs #4962 model TicketFuture deleted --- modules/ticket/back/model-config.json | 3 --- modules/ticket/back/models/ticket-future.json | 12 ------------ 2 files changed, 15 deletions(-) delete mode 100644 modules/ticket/back/models/ticket-future.json diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json index baaca595e..17bd72949 100644 --- a/modules/ticket/back/model-config.json +++ b/modules/ticket/back/model-config.json @@ -94,8 +94,5 @@ }, "TicketConfig": { "dataSource": "vn" - }, - "TicketFuture": { - "dataSource": "vn" } } diff --git a/modules/ticket/back/models/ticket-future.json b/modules/ticket/back/models/ticket-future.json deleted file mode 100644 index 00277ab8a..000000000 --- a/modules/ticket/back/models/ticket-future.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "TicketFuture", - "base": "PersistedModel", - "acls": [ - { - "accessType": "READ", - "principalType": "ROLE", - "principalId": "employee", - "permission": "ALLOW" - } - ] - } -- 2.40.1 From 98c9e0ac50226fa153537ff93ec77814889bf0bf Mon Sep 17 00:00:00 2001 From: alexandre Date: Fri, 16 Dec 2022 13:42:23 +0100 Subject: [PATCH 4/6] refs #4962 autoload added and second header --- front/core/components/smart-table/index.js | 8 ++-- front/core/components/smart-table/table.scss | 15 +++++++- .../front/future-search-panel/index.html | 8 ++-- modules/ticket/front/future/index.html | 37 +++++++++++-------- modules/ticket/front/future/index.js | 7 +++- 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js index 8d2c3c153..770dcdf32 100644 --- a/front/core/components/smart-table/index.js +++ b/front/core/components/smart-table/index.js @@ -147,7 +147,7 @@ export default class SmartTable extends Component { for (const column of this.columns) { if (viewConfig.configuration[column.field] == false) { const baseSelector = `smart-table[view-config-id="${this.viewConfigId}"] table`; - selectors.push(`${baseSelector} thead > tr > th:nth-child(${column.index + 1})`); + selectors.push(`${baseSelector} thead > tr:not([second-header]) > th:nth-child(${column.index + 1})`); selectors.push(`${baseSelector} tbody > tr > td:nth-child(${column.index + 1})`); } } @@ -235,7 +235,7 @@ export default class SmartTable extends Component { } registerColumns() { - const header = this.element.querySelector('thead > tr'); + const header = this.element.querySelector('thead > tr:not([second-header])'); if (!header) return; const columns = header.querySelectorAll('th'); @@ -254,7 +254,7 @@ export default class SmartTable extends Component { } emptyDataRows() { - const header = this.element.querySelector('thead > tr'); + const header = this.element.querySelector('thead > tr:not([second-header])'); const columns = header.querySelectorAll('th'); const tbody = this.element.querySelector('tbody'); if (tbody) { @@ -333,7 +333,7 @@ export default class SmartTable extends Component { } displaySearch() { - const header = this.element.querySelector('thead > tr'); + const header = this.element.querySelector('thead > tr:not([second-header])'); if (!header) return; const tbody = this.element.querySelector('tbody'); diff --git a/front/core/components/smart-table/table.scss b/front/core/components/smart-table/table.scss index c38c149ca..996c41a74 100644 --- a/front/core/components/smart-table/table.scss +++ b/front/core/components/smart-table/table.scss @@ -8,6 +8,16 @@ smart-table table { & > thead { border-bottom: $border; + & > tr[second-header] { + & > th + { + text-align: center; + border-bottom-style: groove; + font-weight: bold; + text-transform: uppercase; + } + } + & > * > th { font-weight: normal; } @@ -60,6 +70,9 @@ smart-table table { vertical-align: middle; } } + &[separator]{ + border-left-style: groove; + } vn-icon.bright, i.bright { color: #f7931e; } @@ -108,4 +121,4 @@ smart-table table { font-size: 1.375rem; text-align: center; } -} \ No newline at end of file +} diff --git a/modules/ticket/front/future-search-panel/index.html b/modules/ticket/front/future-search-panel/index.html index 93e046236..c4df33ec4 100644 --- a/modules/ticket/front/future-search-panel/index.html +++ b/modules/ticket/front/future-search-panel/index.html @@ -17,13 +17,13 @@ + label="Max Liters" + ng-model="filter.liters"> + label="Max Lines" + ng-model="filter.lines"> diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html index 0b1912084..8633e7a38 100644 --- a/modules/ticket/front/future/index.html +++ b/modules/ticket/front/future/index.html @@ -1,7 +1,9 @@ + limit="20" + auto-load="true" + params="model.data"> + + + + + - + - - - + @@ -129,13 +136,13 @@ {{::ticket.shipped | date: 'dd/MM/yyyy'}} + - + -
OriginDestination
Problems - Origin ID + ID - Origin Date - - Origin State + Date IPT + State + Liters + Available Lines - Destination ID + + ID - Destination Date - - Destination State + Date IPT + State +
{{::ticket.ipt}} {{::ticket.state}} {{::ticket.ipt}} {{::ticket.liters}} {{::ticket.lines}} @@ -150,13 +157,13 @@ {{::ticket.tfShipped | date: 'dd/MM/yyyy'}} {{::ticket.tfIpt}} {{::ticket.tfState}} {{::ticket.tfIpt}}
diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js index 918ed79b5..3489c92ad 100644 --- a/modules/ticket/front/future/index.js +++ b/modules/ticket/front/future/index.js @@ -35,7 +35,7 @@ export default class Controller extends Section { autocomplete: { url: 'ItemPackingTypes', showField: 'description', - valueField: 'description' + valueField: 'code' } }, { @@ -43,7 +43,7 @@ export default class Controller extends Section { autocomplete: { url: 'ItemPackingTypes', showField: 'description', - valueField: 'description' + valueField: 'code' } }, ] @@ -59,6 +59,9 @@ export default class Controller extends Section { futureDated: today, warehouseFk: this.vnConfig.warehouseFk }; + this.$.model = { + data: this.filterParams + }; } compareDate(date) { -- 2.40.1 From 6ef282feda237c62757c6abedd3ab87ffc79c79f Mon Sep 17 00:00:00 2001 From: alexandre Date: Tue, 20 Dec 2022 09:54:28 +0100 Subject: [PATCH 5/6] refs #4962 updated merge, changed autoload, changed tf->Future --- .../225001/00-ticket_canbePostponed.sql | 14 +++---- e2e/helpers/selectors.js | 8 ++-- e2e/paths/05-ticket/21_future.spec.js | 28 +++++++------- loopback/locale/en.json | 2 +- loopback/locale/es.json | 2 +- .../methods/ticket-future/getTicketsFuture.js | 22 +++++------ .../spec/getTicketsFuture.spec.js | 33 ++--------------- modules/ticket/back/methods/ticket/merge.js | 34 ++++++++--------- .../back/methods/ticket/specs/merge.spec.js | 26 ++++++------- .../front/future-search-panel/index.html | 8 ++-- modules/ticket/front/future/index.html | 28 +++++++------- modules/ticket/front/future/index.js | 37 ++++++++++++------- modules/ticket/front/future/index.spec.js | 19 +++------- 13 files changed, 119 insertions(+), 142 deletions(-) diff --git a/db/changes/225001/00-ticket_canbePostponed.sql b/db/changes/225001/00-ticket_canbePostponed.sql index b1206799d..572824b4b 100644 --- a/db/changes/225001/00-ticket_canbePostponed.sql +++ b/db/changes/225001/00-ticket_canbePostponed.sql @@ -15,21 +15,21 @@ BEGIN CREATE TEMPORARY TABLE tmp.filter (INDEX (id)) SELECT sv.ticketFk id, + sub2.id futureId, GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt, CAST(sum(litros) AS DECIMAL(10,0)) liters, CAST(count(*) AS DECIMAL(10,0)) `lines`, st.name state, - sub2.id ticketFuture, - sub2.iptd tfIpt, - sub2.state tfState, + sub2.iptd futureIpt, + sub2.state futureState, t.clientFk, t.warehouseFk, ts.alertLevel, t.shipped, - sub2.shipped tfShipped, + sub2.shipped futureShipped, t.workerFk, st.code stateCode, - sub2.code tfStateCode + sub2.code futureStateCode FROM vn.saleVolume sv JOIN vn.sale s ON s.id = sv.saleFk JOIN vn.item i ON i.id = s.itemFk @@ -45,7 +45,7 @@ BEGIN SELECT * FROM ( SELECT - t.addressFk , + t.addressFk, t.id, t.shipped, st.name state, @@ -68,6 +68,6 @@ BEGIN AND al.code = 'FREE' AND tp.ticketFk IS NULL GROUP BY sv.ticketFk - HAVING ticketFuture; + HAVING futureId; END$$ DELIMITER ; diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index e485259d8..dba94dd22 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -740,11 +740,11 @@ export default { linesMax: 'vn-textfield[label="Max Lines"]', litersMax: 'vn-textfield[label="Max Liters"]', ipt: 'vn-autocomplete[label="Origin IPT"]', - tfIpt: 'vn-autocomplete[label="Destination IPT"]', + futureIpt: 'vn-autocomplete[label="Destination IPT"]', tableIpt: 'vn-autocomplete[name="ipt"]', - tableTfIpt: 'vn-autocomplete[name="tfIpt"]', + tableFutureIpt: 'vn-autocomplete[name="futureIpt"]', state: 'vn-autocomplete[label="Origin Grouped State"]', - tfState: 'vn-autocomplete[label="Destination Grouped State"]', + futureState: 'vn-autocomplete[label="Destination Grouped State"]', warehouseFk: 'vn-autocomplete[label="Warehouse"]', problems: 'vn-check[label="With problems"]', tableButtonSearch: 'vn-button[vn-tooltip="Search"]', @@ -753,7 +753,7 @@ export default { firstCheck: 'tbody > tr:nth-child(1) > td > vn-check', multiCheck: 'vn-multi-check', tableId: 'vn-textfield[name="id"]', - tableTfId: 'vn-textfield[name="ticketFuture"]', + tableFutureId: 'vn-textfield[name="futureId"]', tableLiters: 'vn-textfield[name="liters"]', tableLines: 'vn-textfield[name="lines"]', submit: 'vn-submit[label="Search"]', diff --git a/e2e/paths/05-ticket/21_future.spec.js b/e2e/paths/05-ticket/21_future.spec.js index d4dbffc94..45c39de86 100644 --- a/e2e/paths/05-ticket/21_future.spec.js +++ b/e2e/paths/05-ticket/21_future.spec.js @@ -49,9 +49,9 @@ describe('Ticket Future path', () => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.tfIpt); + await page.clearInput(selectors.ticketFuture.futureIpt); await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.tfState); + await page.clearInput(selectors.ticketFuture.futureState); await page.autocompleteSearch(selectors.ticketFuture.ipt, 'Horizontal'); await page.waitToClick(selectors.ticketFuture.submit); @@ -62,11 +62,11 @@ describe('Ticket Future path', () => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.tfIpt); + await page.clearInput(selectors.ticketFuture.futureIpt); await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.tfState); + await page.clearInput(selectors.ticketFuture.futureState); - await page.autocompleteSearch(selectors.ticketFuture.tfIpt, 'Horizontal'); + await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'Horizontal'); await page.waitToClick(selectors.ticketFuture.submit); await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); }); @@ -75,9 +75,9 @@ describe('Ticket Future path', () => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.tfIpt); + await page.clearInput(selectors.ticketFuture.futureIpt); await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.tfState); + await page.clearInput(selectors.ticketFuture.futureState); await page.autocompleteSearch(selectors.ticketFuture.state, 'Free'); await page.waitToClick(selectors.ticketFuture.submit); @@ -88,19 +88,19 @@ describe('Ticket Future path', () => { await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.tfIpt); + await page.clearInput(selectors.ticketFuture.futureIpt); await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.tfState); + await page.clearInput(selectors.ticketFuture.futureState); - await page.autocompleteSearch(selectors.ticketFuture.tfState, 'Free'); + await page.autocompleteSearch(selectors.ticketFuture.futureState, 'Free'); await page.waitToClick(selectors.ticketFuture.submit); await page.waitForNumberOfElements(selectors.ticketFuture.table, 0); await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton); await page.clearInput(selectors.ticketFuture.ipt); - await page.clearInput(selectors.ticketFuture.tfIpt); + await page.clearInput(selectors.ticketFuture.futureIpt); await page.clearInput(selectors.ticketFuture.state); - await page.clearInput(selectors.ticketFuture.tfState); + await page.clearInput(selectors.ticketFuture.futureState); await page.waitToClick(selectors.ticketFuture.submit); await page.waitForNumberOfElements(selectors.ticketFuture.table, 4); @@ -120,7 +120,7 @@ describe('Ticket Future path', () => { it('should search in smart-table with an ID Destination', async() => { await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.write(selectors.ticketFuture.tableTfId, '12'); + await page.write(selectors.ticketFuture.tableFutureId, '12'); await page.keyboard.press('Enter'); await page.waitForNumberOfElements(selectors.ticketFuture.table, 5); @@ -143,7 +143,7 @@ describe('Ticket Future path', () => { it('should search in smart-table with an IPT Destination', async() => { await page.waitToClick(selectors.ticketFuture.tableButtonSearch); - await page.autocompleteSearch(selectors.ticketFuture.tableTfIpt, 'Vertical'); + await page.autocompleteSearch(selectors.ticketFuture.tableFutureIpt, 'Vertical'); await page.waitForNumberOfElements(selectors.ticketFuture.table, 1); await page.waitToClick(selectors.ticketFuture.tableButtonSearch); diff --git a/loopback/locale/en.json b/loopback/locale/en.json index d4695f72c..f4284888f 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -140,7 +140,7 @@ "You don't have grant privilege": "You don't have grant privilege", "You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user", "Email verify": "Email verify", - "Ticket merged": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) merged with [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})", + "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})", "Sale(s) blocked, please contact production": "Sale(s) blocked, please contact production", "Receipt's bank was not found": "Receipt's bank was not found", "This receipt was not compensated": "This receipt was not compensated", diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 1b0a50433..c12d6bbe5 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -241,7 +241,7 @@ "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 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", - "Ticket merged": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) fusionado con [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})", + "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})", "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", diff --git a/modules/ticket/back/methods/ticket-future/getTicketsFuture.js b/modules/ticket/back/methods/ticket-future/getTicketsFuture.js index aa726deea..6798df513 100644 --- a/modules/ticket/back/methods/ticket-future/getTicketsFuture.js +++ b/modules/ticket/back/methods/ticket-future/getTicketsFuture.js @@ -27,13 +27,13 @@ module.exports = Self => { required: true }, { - arg: 'liters', + arg: 'litersMax', type: 'number', description: 'Maximum volume of tickets to catapult', required: false }, { - arg: 'lines', + arg: 'linesMax', type: 'number', description: 'Maximum number of lines of tickets to catapult', required: false @@ -45,7 +45,7 @@ module.exports = Self => { required: false }, { - arg: 'tfIpt', + arg: 'futureIpt', type: 'string', description: 'Destination Item Packaging Type', required: false @@ -57,7 +57,7 @@ module.exports = Self => { required: false }, { - arg: 'tfId', + arg: 'futureId', type: 'number', description: 'Destination id', required: false @@ -69,7 +69,7 @@ module.exports = Self => { required: false }, { - arg: 'tfState', + arg: 'futureState', type: 'string', description: 'Destination state', required: false @@ -112,16 +112,16 @@ module.exports = Self => { return {'f.lines': {lte: value}}; case 'liters': return {'f.liters': {lte: value}}; - case 'tfId': - return {'f.ticketFuture': value}; + case 'futureId': + return {'f.futureId': value}; case 'ipt': return {'f.ipt': value}; - case 'tfIpt': - return {'f.tfIpt': value}; + case 'futureIpt': + return {'f.futureIpt': value}; case 'state': return {'f.stateCode': {like: `%${value}%`}}; - case 'tfState': - return {'f.tfStateCode': {like: `%${value}%`}}; + case 'futureState': + return {'f.futureStateCode': {like: `%${value}%`}}; } }); diff --git a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js index 459c2eb1e..ec5427c9b 100644 --- a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js +++ b/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js @@ -3,7 +3,6 @@ const models = require('vn-loopback/server/server').models; describe('TicketFuture getTicketsFuture()', () => { const today = new Date(); today.setHours(0, 0, 0, 0); - const tomorrow = new Date(today.getDate() + 1); it('should return the tickets passing the required data', async() => { const tx = await models.Ticket.beginTransaction({}); @@ -14,8 +13,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, }; @@ -39,8 +36,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, problems: true }; @@ -66,8 +61,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, problems: false }; @@ -93,8 +86,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, problems: null }; @@ -120,8 +111,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, state: 'OK' }; @@ -147,10 +136,8 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, - tfState: 'OK' + futureState: 'OK' }; const ctx = {req: {accessToken: {userId: 9}}, args}; @@ -174,8 +161,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, ipt: null }; @@ -201,8 +186,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, ipt: 0 }; @@ -228,10 +211,8 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, - tfIpt: null + futureIpt: null }; const ctx = {req: {accessToken: {userId: 9}}, args}; @@ -255,10 +236,8 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, - tfIpt: 0 + futureIpt: 0 }; const ctx = {req: {accessToken: {userId: 9}}, args}; @@ -282,8 +261,6 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, id: 13 }; @@ -309,10 +286,8 @@ describe('TicketFuture getTicketsFuture()', () => { const args = { originDated: today, futureDated: today, - litersMax: 9999, - linesMax: 9999, warehouseFk: 1, - tfId: 12 + futureId: 12 }; const ctx = {req: {accessToken: {userId: 9}}, args}; diff --git a/modules/ticket/back/methods/ticket/merge.js b/modules/ticket/back/methods/ticket/merge.js index 8a86eff6f..8aaca1085 100644 --- a/modules/ticket/back/methods/ticket/merge.js +++ b/modules/ticket/back/methods/ticket/merge.js @@ -40,32 +40,32 @@ module.exports = Self => { try { for (let ticket of tickets) { - const fullPath = `${origin}/#!/ticket/${ticket.id}/summary`; - const fullPathFuture = `${origin}/#!/ticket/${ticket.ticketFuture}/summary`; + const originFullPath = `${origin}/#!/ticket/${ticket.originId}/summary`; + const destinationFullPath = `${origin}/#!/ticket/${ticket.destinationId}/summary`; const message = $t('Ticket merged', { - originDated: dateUtil.toString(new Date(ticket.shipped)), - futureDated: dateUtil.toString(new Date(ticket.tfShipped)), - id: ticket.id, - tfId: ticket.ticketFuture, - fullPath, - fullPathFuture + originDated: dateUtil.toString(new Date(ticket.originShipped)), + destinationDated: dateUtil.toString(new Date(ticket.destinationShipped)), + originId: ticket.originId, + destinationId: ticket.destinationId, + originFullPath, + destinationFullPath }); - if (!ticket.id || !ticket.ticketFuture) continue; + if (!ticket.originId || !ticket.destinationId) continue; - const ticketFutureLogRecord = { - originFk: ticket.ticketFuture, + const ticketDestinationLogRecord = { + originFk: ticket.destinationId, userFk: ctx.req.accessToken.userId, action: 'update', changedModel: 'Ticket', - changedModelId: ticket.ticketFuture, - changedModelValue: ticket.ticketFuture, + changedModelId: ticket.destinationId, + changedModelValue: ticket.destinationId, oldInstance: {}, - newInstance: {mergedTicket: ticket.id} + newInstance: {mergedTicket: ticket.originId} }; - await models.TicketLog.create(ticketFutureLogRecord, myOptions); - await models.Sale.updateAll({ticketFk: ticket.id}, {ticketFk: ticket.ticketFuture}, myOptions); - await models.Ticket.setDeleted(ctx, ticket.id, myOptions); + await models.TicketLog.create(ticketDestinationLogRecord, myOptions); + await models.Sale.updateAll({ticketFk: ticket.originId}, {ticketFk: ticket.destinationId}, myOptions); + await models.Ticket.setDeleted(ctx, ticket.originId, myOptions); await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message); } if (tx) diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js index 713f86ad6..275484f67 100644 --- a/modules/ticket/back/methods/ticket/specs/merge.spec.js +++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js @@ -3,15 +3,15 @@ const LoopBackContext = require('loopback-context'); describe('ticket merge()', () => { const tickets = [{ - id: 13, - ticketFuture: 12, - workerFk: 1, - originETD: new Date(), - destETD: new Date() + originId: 13, + destinationId: 12, + originShipped: new Date(), + destinationShipped: new Date(), + workerFk: 1 }]; const activeCtx = { - accessToken: { userId: 9 }, + accessToken: {userId: 9}, }; beforeEach(() => { @@ -22,26 +22,26 @@ describe('ticket merge()', () => { const ctx = { req: { - accessToken: { userId: 9 }, - headers: { origin: 'http://localhost:5000' }, + accessToken: {userId: 9}, + headers: {origin: 'http://localhost:5000'}, } }; ctx.req.__ = value => { return value; }; - it('should merge two tickets', async () => { + it('should merge two tickets', async() => { const tx = await models.Ticket.beginTransaction({}); try { - const options = { transaction: tx }; + const options = {transaction: tx}; const chatNotificationBeforeMerge = await models.Chat.find(); await models.Ticket.merge(ctx, tickets, options); - const createdTicketLog = await models.TicketLog.find({ where: { originFk: tickets[0].id } }, options); - const deletedTicket = await models.Ticket.findOne({ where: { id: tickets[0].id } }, options); - const salesTicketFuture = await models.Sale.find({ where: { ticketFk: tickets[0].ticketFuture } }, options); + const createdTicketLog = await models.TicketLog.find({where: {originFk: tickets[0].originId}}, options); + const deletedTicket = await models.Ticket.findOne({where: {id: tickets[0].originId}}, options); + const salesTicketFuture = await models.Sale.find({where: {ticketFk: tickets[0].destinationId}}, options); const chatNotificationAfterMerge = await models.Chat.find(); expect(createdTicketLog.length).toEqual(1); diff --git a/modules/ticket/front/future-search-panel/index.html b/modules/ticket/front/future-search-panel/index.html index c4df33ec4..18b574f2a 100644 --- a/modules/ticket/front/future-search-panel/index.html +++ b/modules/ticket/front/future-search-panel/index.html @@ -18,12 +18,12 @@ + ng-model="filter.litersMax"> + ng-model="filter.linesMax"> @@ -43,7 +43,7 @@ label="Destination IPT" value-field="code" show-field="description" - ng-model="filter.tfIpt" + ng-model="filter.futureIpt" info="IPT"> {{description}} @@ -66,7 +66,7 @@ label="Destination Grouped State" value-field="code" show-field="name" - ng-model="filter.tfState"> + ng-model="filter.futureState"> {{name}} diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html index 8633e7a38..1af1fb9ba 100644 --- a/modules/ticket/front/future/index.html +++ b/modules/ticket/front/future/index.html @@ -1,9 +1,7 @@ + auto-load="false"> - + Problems @@ -66,16 +64,16 @@ Available Lines - + ID - + Date - + IPT - + State @@ -147,21 +145,21 @@ {{::ticket.lines}} - {{::ticket.ticketFuture}} + {{::ticket.futureId}} - - {{::ticket.tfShipped | date: 'dd/MM/yyyy'}} + + {{::ticket.futureShipped | date: 'dd/MM/yyyy'}} - {{::ticket.tfIpt}} + {{::ticket.futureIpt}} - {{::ticket.tfState}} + class="chip {{$ctrl.stateColor(ticket.futureState)}}"> + {{::ticket.futureState}} diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js index 3489c92ad..56ba1608e 100644 --- a/modules/ticket/front/future/index.js +++ b/modules/ticket/front/future/index.js @@ -11,15 +11,15 @@ export default class Controller extends Section { search: true, }, columns: [{ - field: 'problems', - searchable: false + field: 'totalProblems', + searchable: false, }, { field: 'shipped', searchable: false }, { - field: 'tfShipped', + field: 'futureShipped', searchable: false }, { @@ -27,7 +27,7 @@ export default class Controller extends Section { searchable: false }, { - field: 'tfState', + field: 'futureState', searchable: false }, { @@ -39,7 +39,7 @@ export default class Controller extends Section { } }, { - field: 'tfIpt', + field: 'futureIpt', autocomplete: { url: 'ItemPackingTypes', showField: 'description', @@ -48,6 +48,9 @@ export default class Controller extends Section { }, ] }; + } + + $postLink() { this.setDefaultFilter(); } @@ -59,9 +62,7 @@ export default class Controller extends Section { futureDated: today, warehouseFk: this.vnConfig.warehouseFk }; - this.$.model = { - data: this.filterParams - }; + this.$.model.applyFilter(null, this.filterParams); } compareDate(date) { @@ -114,7 +115,17 @@ export default class Controller extends Section { } moveTicketsFuture() { - let params = {tickets: this.checked}; + let ticketsToMove = []; + this.checked.forEach(ticket => { + ticketsToMove.push({ + originId: ticket.id, + destinationId: ticket.futureId, + originShipped: ticket.shipped, + destinationShipped: ticket.futureShipped, + workerFk: ticket.workerFk + }); + }); + let params = {tickets: ticketsToMove}; return this.$http.post('Tickets/merge', params) .then(() => { this.$.model.refresh(); @@ -126,16 +137,16 @@ export default class Controller extends Section { switch (param) { case 'id': return {'id': value}; - case 'ticketFuture': - return {'ticketFuture': value}; + case 'futureId': + return {'futureId': value}; case 'liters': return {'liters': value}; case 'lines': return {'lines': value}; case 'ipt': return {'ipt': value}; - case 'tfIpt': - return {'tfIpt': value}; + case 'futureIpt': + return {'futureIpt': value}; } } } diff --git a/modules/ticket/front/future/index.spec.js b/modules/ticket/front/future/index.spec.js index 9c6b97c8b..c609a4891 100644 --- a/modules/ticket/front/future/index.spec.js +++ b/modules/ticket/front/future/index.spec.js @@ -2,16 +2,14 @@ import './index.js'; import crudModel from 'core/mocks/crud-model'; describe('Component vnTicketFuture', () => { + const today = new Date(); let controller; let $httpBackend; - let $window; - beforeEach(ngModule('ticket') - ); + beforeEach(ngModule('ticket')); - beforeEach(inject(($componentController, _$window_, _$httpBackend_) => { + beforeEach(inject(($componentController, _$httpBackend_) => { $httpBackend = _$httpBackend_; - $window = _$window_; const $element = angular.element(''); controller = $componentController('vnTicketFuture', {$element}); controller.$.model = crudModel; @@ -28,7 +26,6 @@ describe('Component vnTicketFuture', () => { describe('compareDate()', () => { it('should return warning when the date is the present', () => { - let today = new Date(); let result = controller.compareDate(today); expect(result).toEqual('warning'); @@ -83,18 +80,14 @@ describe('Component vnTicketFuture', () => { describe('dateRange()', () => { it('should return two dates with the hours at the start and end of the given date', () => { - const now = new Date(); - - const today = now.getDate(); - - const dateRange = controller.dateRange(now); + const dateRange = controller.dateRange(today); const start = dateRange[0].toString(); const end = dateRange[1].toString(); - expect(start).toContain(today); + expect(start).toContain(today.getDate()); expect(start).toContain('00:00:00'); - expect(end).toContain(today); + expect(end).toContain(today.getDate()); expect(end).toContain('23:59:59'); }); }); -- 2.40.1 From 4c6a73523512bee1e67bf500660159fb26a826b0 Mon Sep 17 00:00:00 2001 From: alexandre Date: Tue, 20 Dec 2022 11:53:54 +0100 Subject: [PATCH 6/6] refs #4962 moved sql and methods to ticket --- db/changes/{225001 => 225201}/00-ticket_canbePostponed.sql | 0 .../back/methods/{ticket-future => ticket}/getTicketsFuture.js | 0 .../spec => ticket/specs}/getTicketsFuture.spec.js | 2 +- modules/ticket/back/models/ticket-methods.js | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename db/changes/{225001 => 225201}/00-ticket_canbePostponed.sql (100%) rename modules/ticket/back/methods/{ticket-future => ticket}/getTicketsFuture.js (100%) rename modules/ticket/back/methods/{ticket-future/spec => ticket/specs}/getTicketsFuture.spec.js (99%) diff --git a/db/changes/225001/00-ticket_canbePostponed.sql b/db/changes/225201/00-ticket_canbePostponed.sql similarity index 100% rename from db/changes/225001/00-ticket_canbePostponed.sql rename to db/changes/225201/00-ticket_canbePostponed.sql diff --git a/modules/ticket/back/methods/ticket-future/getTicketsFuture.js b/modules/ticket/back/methods/ticket/getTicketsFuture.js similarity index 100% rename from modules/ticket/back/methods/ticket-future/getTicketsFuture.js rename to modules/ticket/back/methods/ticket/getTicketsFuture.js diff --git a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js similarity index 99% rename from modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js rename to modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js index ec5427c9b..c05ba764d 100644 --- a/modules/ticket/back/methods/ticket-future/spec/getTicketsFuture.spec.js +++ b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js @@ -1,6 +1,6 @@ const models = require('vn-loopback/server/server').models; -describe('TicketFuture getTicketsFuture()', () => { +describe('ticket getTicketsFuture()', () => { const today = new Date(); today.setHours(0, 0, 0, 0); diff --git a/modules/ticket/back/models/ticket-methods.js b/modules/ticket/back/models/ticket-methods.js index 8fd74d35c..fe60cde8e 100644 --- a/modules/ticket/back/models/ticket-methods.js +++ b/modules/ticket/back/models/ticket-methods.js @@ -33,7 +33,7 @@ module.exports = function(Self) { require('../methods/ticket/closeByTicket')(Self); require('../methods/ticket/closeByAgency')(Self); require('../methods/ticket/closeByRoute')(Self); - require('../methods/ticket-future/getTicketsFuture')(Self); + require('../methods/ticket/getTicketsFuture')(Self); require('../methods/ticket/merge')(Self); require('../methods/ticket/isRoleAdvanced')(Self); require('../methods/ticket/collectionLabel')(Self); -- 2.40.1