diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js index cec8026ffd..b598d79b12 100644 --- a/modules/monitor/back/methods/sales-monitor/salesFilter.js +++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js @@ -219,7 +219,7 @@ module.exports = Self => { z.hour AS zoneLanding, z.name AS zoneName, z.id AS zoneFk, - th.preparationHour, + TIME_FORMAT(t.shipped, '%H:%i') AS preparationHour, TIME_FORMAT(z.hour, '%H:%i') AS theoreticalhour, TIME_FORMAT(zed.etc, '%H:%i') AS practicalHour FROM ticket t @@ -234,11 +234,7 @@ module.exports = Self => { LEFT JOIN client c ON c.id = t.clientFk LEFT JOIN worker wk ON wk.id = c.salesPersonFk LEFT JOIN account.user u ON u.id = wk.userFk - LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk - JOIN ( - SELECT t.id, TIME_FORMAT(t.shipped, '%H:%i') AS preparationHour - FROM ticket AS t - ) AS th ON th.id = t.id`); + LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`); if (args.orderFk) { stmt.merge({ diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index 76127d4f26..45db04ca0e 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -37,7 +37,7 @@ Client Salesperson Date - Prep. + Prep. Theoretical Practical Province diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js index a224ecac63..9d8a911e8a 100644 --- a/modules/monitor/front/index/tickets/index.js +++ b/modules/monitor/front/index/tickets/index.js @@ -72,8 +72,6 @@ export default class Controller extends Section { return {'z.hour': value}; case 'practicalHour': return {'zed.etc': value}; - case 'preparationHour': - return {'th.preparationHour': value}; case 'shipped': return {'t.shipped': { between: this.dateRange(value)}