From 4e671556cc42076f7bfb9bfe30f285f4165bf008 Mon Sep 17 00:00:00 2001 From: KMKoushik Date: Fri, 3 May 2024 07:40:19 +1000 Subject: [PATCH] Update dashboard --- .../src/app/(dashboard)/dashboard/dashboard-chart.tsx | 2 +- apps/web/src/server/api/routers/email.ts | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/web/src/app/(dashboard)/dashboard/dashboard-chart.tsx b/apps/web/src/app/(dashboard)/dashboard/dashboard-chart.tsx index f2a5892..0d59455 100644 --- a/apps/web/src/app/(dashboard)/dashboard/dashboard-chart.tsx +++ b/apps/web/src/app/(dashboard)/dashboard/dashboard-chart.tsx @@ -34,7 +34,7 @@ export default function DashboardChart() { -
+
{!statusQuery.isLoading && statusQuery.data ? ( <> diff --git a/apps/web/src/server/api/routers/email.ts b/apps/web/src/server/api/routers/email.ts index 8f7b85f..7a33d92 100644 --- a/apps/web/src/server/api/routers/email.ts +++ b/apps/web/src/server/api/routers/email.ts @@ -60,7 +60,8 @@ export const emailRouter = createTRPCRouter({ ) .query(async ({ ctx, input }) => { const { team } = ctx; - const daysInMs = (input.days || 7) * 24 * 60 * 60 * 1000; + const days = input.days !== 7 ? 30 : 7; + const daysInMs = days * 24 * 60 * 60 * 1000; const rawEmailStatusCounts = await db.email.findMany({ where: { @@ -81,8 +82,12 @@ export const emailRouter = createTRPCRouter({ (acc, cur) => { acc[cur.latestStatus] = { count: (acc[cur.latestStatus]?.count || 0) + 1, - percentage: - (((acc[cur.latestStatus]?.count || 0) + 1) / totalCount) * 100, + percentage: Number( + ( + (((acc[cur.latestStatus]?.count || 0) + 1) / totalCount) * + 100 + ).toFixed(0) + ), }; return acc; },