From 2e0f41769bf003d0a994ffe7cf4540f755e42353 Mon Sep 17 00:00:00 2001
From: adriano <adriano08andra@hotmail.com>
Date: Tue, 25 Jan 2022 23:05:48 -0300
Subject: [PATCH] =?UTF-8?q?Relat=C3=B3rio=20funcinal=20com=20datas=20forma?=
 =?UTF-8?q?tadas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/services/TicketServices/ShowTicketReport.ts  | 12 ++++++++++--
 frontend/src/pages/Report/index.js                   |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend/src/services/TicketServices/ShowTicketReport.ts b/backend/src/services/TicketServices/ShowTicketReport.ts
index 77c508e..51978bf 100644
--- a/backend/src/services/TicketServices/ShowTicketReport.ts
+++ b/backend/src/services/TicketServices/ShowTicketReport.ts
@@ -44,13 +44,21 @@ const ShowTicketReport = async (id: string | number, startDate: string, endDate:
   const ticket = await Ticket.findAll({  
 
     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: [
       {
         model: Message,
         required: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: [
           ['createdAt', 'ASC']
         ]  
diff --git a/frontend/src/pages/Report/index.js b/frontend/src/pages/Report/index.js
index 0893d98..aecfd5f 100644
--- a/frontend/src/pages/Report/index.js
+++ b/frontend/src/pages/Report/index.js
@@ -218,9 +218,9 @@ const Report = () => {
       const fetchQueries = async () => {
         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: "LOAD_QUERY", payload: dataQuery.data }); */
+          dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data }); 
 
           setLoading(false);