diff --git a/backend/src/services/TicketServices/ListTicketsService.ts b/backend/src/services/TicketServices/ListTicketsService.ts index 2959826..29e165c 100644 --- a/backend/src/services/TicketServices/ListTicketsService.ts +++ b/backend/src/services/TicketServices/ListTicketsService.ts @@ -109,7 +109,6 @@ const ListTicketsService = async ({ if (date) { whereCondition = { - ...whereCondition, createdAt: { [Op.between]: [+startOfDay(parseISO(date)), +endOfDay(parseISO(date))] } @@ -127,7 +126,7 @@ const ListTicketsService = async ({ }; } - const limit = 20; + const limit = 40; const offset = limit * (+pageNumber - 1); const { count, rows: tickets } = await Ticket.findAndCountAll({ diff --git a/frontend/src/pages/Dashboard/Chart.js b/frontend/src/pages/Dashboard/Chart.js index 3f9d8be..a1480f8 100644 --- a/frontend/src/pages/Dashboard/Chart.js +++ b/frontend/src/pages/Dashboard/Chart.js @@ -41,17 +41,11 @@ const Chart = () => { setChartData(prevState => { let aux = [...prevState]; - aux.map(a => { + aux.forEach(a => { tickets.forEach(ticket => { - if ( - format(startOfHour(parseISO(ticket.createdAt)), "HH:mm") === a.time - ) { - return a.amount++; - } else { - return a; - } + format(startOfHour(parseISO(ticket.createdAt)), "HH:mm") === a.time && + a.amount++; }); - return a; }); return aux;