esdras/sistema-de-chamados
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix report filters and zod resolver

Browse source
This commit is contained in:
Esdras Renan 2025-11-14 01:25:28 -03:00
parent 5b22065609
commit 06fdb54480
12 changed files with 79 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/reports/hours-report.tsx
View file

@ -79,6 +79,12 @@ export function HoursReport() {
const tenantId = session?.user.tenantId ?? DEFAULT_TENANT_ID
const enabled = Boolean(isStaff && convexUserId)
const dateRangeFilters = useMemo(() => {
const filters: { dateFrom?: string; dateTo?: string } = {}
if (dateFrom) filters.dateFrom = dateFrom
if (dateTo) filters.dateTo = dateTo
return filters
}, [dateFrom, dateTo])
const data = useQuery(
api.reports.hoursByClient,
enabled && groupBy === "company"
@ -86,8 +92,7 @@ export function HoursReport() {
tenantId,
viewerId: convexUserId as Id<"users">,
range: timeRange === "365d" || timeRange === "all" ? "90d" : timeRange,
dateFrom,
dateTo,
...dateRangeFilters,
}
: "skip"
) as { rangeDays: number; items: HoursItem[] } | undefined
@ -100,8 +105,7 @@ export function HoursReport() {
viewerId: convexUserId as Id<"users">,
range: timeRange,
companyId: companyId === "all" ? undefined : (companyId as Id<"companies">),
dateFrom,
dateTo,
...dateRangeFilters,
}
: "skip"
) as HoursByMachineResponse | undefined