From ecd54ddffef01523f75cf070e8f8029381b8d65b Mon Sep 17 00:00:00 2001
From: Alana Gabriele Amorim Silva <alanagabriele43@gmail.com>
Date: Sun, 14 Jul 2024 22:34:17 -0300
Subject: [PATCH] fix: graficos

---
 src/modules/dados/dados.service.ts   | 10 ++++++--
 src/modules/trilha/trilha.service.ts | 35 ++++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/modules/dados/dados.service.ts b/src/modules/dados/dados.service.ts
index acc8646..500825b 100644
--- a/src/modules/dados/dados.service.ts
+++ b/src/modules/dados/dados.service.ts
@@ -59,6 +59,14 @@ export class DadosService {
           take: limit,
           skip: (page - 1) * limit,
           orderBy: { createdAt: 'asc' },
+          select: {
+            id: true,
+            rpmMotorDir: true,
+            rpmMotorEsq: true,
+            aceleracaoInstantanea: true,
+            velocidadeInstantanea: true,
+            tensao: true,
+          },
         }),
         await this.prismaService.dados.count(),
       ]);
@@ -70,8 +78,6 @@ export class DadosService {
 
         item.velocidadeInstantaneaFormatted =
           item.velocidadeInstantanea?.toFixed(2) || 0;
-
-        item.createdAtFormatted = new Date(item.createdAt).toLocaleString();
       });
 
       return new ResponseMessageDto({
diff --git a/src/modules/trilha/trilha.service.ts b/src/modules/trilha/trilha.service.ts
index 793d817..fb25efe 100644
--- a/src/modules/trilha/trilha.service.ts
+++ b/src/modules/trilha/trilha.service.ts
@@ -80,6 +80,13 @@ export class TrilhaService {
           where: { id: trilhaId },
           take: limit,
           skip: (page - 1) * limit,
+          select: {
+            id: true,
+            isMoving: true,
+            startMovingDatetime: true,
+            endMovingDatetime: true,
+            failed: true,
+          },
         }),
         await this.prismaService.trilha.count({
           where: { id: trilhaId },
@@ -94,12 +101,13 @@ export class TrilhaService {
           (item.failed ? 'Falhado' : 'Bem-sucedido');
 
         item.isMovingFormatted = item.isMoving ? 'Sim' : 'Não';
-        item.startMovingDatetimeFormatted = new Date(
+        item.startMovingDatetimeFormatted = this.formatarDataHora(
           item.startMovingDatetime,
-        ).toLocaleString();
+        );
 
-        item.endMovingDatetimeFormatted =
-          item?.endMovingDatetime?.toLocaleString();
+        item.endMovingDatetimeFormatted = this.formatarDataHora(
+          item.endMovingDatetime,
+        );
       });
 
       return new ResponseMessageDto({
@@ -163,4 +171,23 @@ export class TrilhaService {
       );
     }
   }
+
+  formatarDataHora(isoString: string): string {
+    const data = new Date(isoString);
+
+    const dia = data.getDate().toString().padStart(2, '0');
+    const mes = (data.getMonth() + 1).toString().padStart(2, '0');
+    const ano = data.getFullYear();
+
+    let horas = data.getHours();
+    const minutos = data.getMinutes().toString().padStart(2, '0');
+    const segundos = data.getSeconds().toString().padStart(2, '0');
+
+    const periodo = horas >= 12 ? 'PM' : 'AM';
+    horas = horas % 12 || 12; // Converte 0 para 12 para formato 12h
+
+    const horaFormatada = horas.toString().padStart(2, '0');
+
+    return `${dia}/${mes}/${ano}, ${horaFormatada}:${minutos}:${segundos} ${periodo}`;
+  }
 }