From 0314ccc2b393f014e2b4f00d5ad9b880af007f57 Mon Sep 17 00:00:00 2001 From: Joshua Coles Date: Wed, 7 Feb 2024 11:52:57 +0000 Subject: [PATCH] Add start and end times to SubjectComparisonCard --- src/app/OverviewPage.tsx | 6 +++++- src/app/a.client.tsx | 12 +++++++++--- src/app/calendarOverviewCard.tsx | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/app/OverviewPage.tsx b/src/app/OverviewPage.tsx index c5cb733..d3afc1f 100644 --- a/src/app/OverviewPage.tsx +++ b/src/app/OverviewPage.tsx @@ -29,7 +29,11 @@ export default function OverviewPage({config}: { projectIds={projectIds} /> - + ) diff --git a/src/app/a.client.tsx b/src/app/a.client.tsx index 27df31a..6b24629 100644 --- a/src/app/a.client.tsx +++ b/src/app/a.client.tsx @@ -61,8 +61,14 @@ export function SubjectOverviewCard({ ) } -export function SubjectComparisonCard({projectIds}: { - projectIds: number[] +export function SubjectComparisonCard({ + projectIds, + startTime, + endTime + }: { + projectIds: number[], + startTime: string, + endTime: string, }) { const { data: rawData, @@ -76,7 +82,7 @@ export function SubjectComparisonCard({projectIds}: { name: string, raw_json: any } - }[]>(`/api/time_entry?select=raw_json,project:project_id(name,raw_json)&project_id=in.(${projectIds.join(',')})`, fetcher, {}); + }[]>(`/api/time_entry?select=raw_json,project:project_id(name,raw_json)&start=gt.${startTime}&start=lt.${endTime}&project_id=in.(${projectIds.join(',')})`, fetcher, {}); const [breakdownData, setBreakdownData] = useState<{ name: string, diff --git a/src/app/calendarOverviewCard.tsx b/src/app/calendarOverviewCard.tsx index 3ac3fba..7eea0bf 100644 --- a/src/app/calendarOverviewCard.tsx +++ b/src/app/calendarOverviewCard.tsx @@ -28,7 +28,7 @@ function useCalendarData(projectIds: number[], initialDate: string, endDate: str start: string, seconds: number, } - }[]>(`/api/time_entry?select=raw_json&start=gt.${(initialDate)}&start=lt.${(endDate)}&project_id=in.(${projectIds.join(',')})`, fetcher, {}); + }[]>(`/api/time_entry?select=raw_json&start=gt.${initialDate}&start=lt.${endDate}&project_id=in.(${projectIds.join(',')})`, fetcher, {}); const [data, setData] = useState<{ date: Date,