adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Relatório funcinal com datas formatadas

pull/1/head
adriano 2022-01-25 23:05:48 -03:00
parent 1b4347d585
commit 2e0f41769b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/services/TicketServices/ShowTicketReport.ts
View File

@ -44,13 +44,21 @@ const ShowTicketReport = async (id: string | number, startDate: string, endDate:
const ticket = await Ticket.findAll({ const ticket = await Ticket.findAll({
where: where_clause , where: where_clause ,
attributes: ['id', 'status', 'createdAt', 'updatedAt'], //attributes: ['id', 'status', 'createdAt', 'updatedAt'],
attributes: ['id', 'status', [Sequelize.fn("DATE_FORMAT",Sequelize.col("Ticket.createdAt"),"%d/%m/%Y %H:%i:%s"),"createdAt"],
[Sequelize.fn("DATE_FORMAT",Sequelize.col("Ticket.updatedAt"),"%d/%m/%Y %H:%i:%s"),"updatedAt"]],
include: [ include: [
{ {
model: Message, model: Message,
required:true, required:true,
separate: true, separate: true,
attributes: ['body', 'read', 'mediaType','fromMe', 'mediaUrl','createdAt'],
// attributes: ['body', 'read', 'mediaType','fromMe', 'mediaUrl','createdAt'],
attributes: ['body', 'read', 'mediaType','fromMe', 'mediaUrl', [Sequelize.fn("DATE_FORMAT",Sequelize.col("createdAt"),"%d/%m/%Y %H:%i:%s"),"createdAt"]],
order: [ order: [
['createdAt', 'ASC'] ['createdAt', 'ASC']
] ]

4
frontend/src/pages/Report/index.js
View File

@ -218,9 +218,9 @@ const Report = () => {
const fetchQueries = async () => { const fetchQueries = async () => {
try { try {
/*const dataQuery = await api.get("/reports/", {params: {userId, startDate, endDate },}); const dataQuery = await api.get("/reports/", {params: {userId, startDate, endDate },});
dispatchQ({ type: "RESET" }) dispatchQ({ type: "RESET" })
dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data }); */ dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data });
setLoading(false); setLoading(false);