diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx index f85982359..35c8e2b8c 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx @@ -5,7 +5,7 @@ import moment from "moment"; import queryString from "query-string"; import React, { useMemo } from "react"; import { useLocation } from "react-router-dom"; -import { QUERY_TIME_TICKETS_IN_RANGE } from "../../graphql/timetickets.queries"; +import { QUERY_TIME_TICKETS_IN_RANGE_SB } from "../../graphql/timetickets.queries"; import AlertComponent from "../alert/alert.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component"; import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util"; @@ -59,7 +59,7 @@ export default function ScoreboardTimeTickets() { }; }, []); - const { loading, error, data } = useQuery(QUERY_TIME_TICKETS_IN_RANGE, { + const { loading, error, data } = useQuery(QUERY_TIME_TICKETS_IN_RANGE_SB, { variables: { start: startDate.format("YYYY-MM-DD"), end: endDate.format("YYYY-MM-DD"), diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js index 12d370560..0a8108571 100644 --- a/client/src/graphql/timetickets.queries.js +++ b/client/src/graphql/timetickets.queries.js @@ -26,6 +26,40 @@ export const QUERY_TICKETS_BY_JOBID = gql` `; export const QUERY_TIME_TICKETS_IN_RANGE = gql` + query QUERY_TIME_TICKETS_IN_RANGE($start: date!, $end: date!) { + timetickets( + where: { date: { _gte: $start, _lte: $end } } + order_by: { date: desc_nulls_first } + ) { + actualhrs + ciecacode + clockoff + clockon + cost_center + created_at + date + id + rate + productivehrs + memo + jobid + flat_rate + job { + id + ro_number + } + employeeid + employee { + id + employee_number + first_name + last_name + } + } + } +`; + +export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql` query QUERY_TIME_TICKETS_IN_RANGE( $start: date! $end: date!