Add start and end times to SubjectComparisonCard
Some checks are pending
Build and Publish Docker Container / build (push) Has started running

This commit is contained in:
Joshua Coles 2024-02-07 11:52:57 +00:00
parent 44df8a6fc6
commit 0314ccc2b3
3 changed files with 15 additions and 5 deletions

View File

@ -29,7 +29,11 @@ export default function OverviewPage({config}: {
projectIds={projectIds} projectIds={projectIds}
/> />
<SubjectComparisonCard projectIds={projectIds}/> <SubjectComparisonCard
startTime={config.timePeriod.start}
endTime={config.timePeriod.end}
projectIds={projectIds}
/>
</div> </div>
</main> </main>
) )

View File

@ -61,8 +61,14 @@ export function SubjectOverviewCard({
) )
} }
export function SubjectComparisonCard({projectIds}: { export function SubjectComparisonCard({
projectIds: number[] projectIds,
startTime,
endTime
}: {
projectIds: number[],
startTime: string,
endTime: string,
}) { }) {
const { const {
data: rawData, data: rawData,
@ -76,7 +82,7 @@ export function SubjectComparisonCard({projectIds}: {
name: string, name: string,
raw_json: any 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<{ const [breakdownData, setBreakdownData] = useState<{
name: string, name: string,

View File

@ -28,7 +28,7 @@ function useCalendarData(projectIds: number[], initialDate: string, endDate: str
start: string, start: string,
seconds: number, 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<{ const [data, setData] = useState<{
date: Date, date: Date,