From 830f6c0eea49a2d5615e0b437168a974b0794345 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 31 Oct 2024 10:48:40 -0700 Subject: [PATCH] IO-3014 TimeTicket UI Sort Signed-off-by: Allan Carr --- .../time-ticket-list/time-ticket-list.component.jsx | 2 +- client/src/graphql/timetickets.queries.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index f8da959c9..668cdb106 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -39,7 +39,7 @@ export function TimeTicketList({ extra }) { const [state, setState] = useState({ - sortedInfo: {}, + sortedInfo: { columnKey: 'date', order: 'descend' }, filteredInfo: { text: "" } }); diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js index f56976e2b..b21e47f56 100644 --- a/client/src/graphql/timetickets.queries.js +++ b/client/src/graphql/timetickets.queries.js @@ -26,7 +26,7 @@ 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 }) { + timetickets(where: { date: { _gte: $start, _lte: $end } }) { actualhrs ciecacode clockoff @@ -69,7 +69,6 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql` ) { timetickets( where: { date: { _gte: $start, _lte: $end }, employeeid: { _eq: $employeeid } } - order_by: { date: desc_nulls_first } ) { actualhrs ciecacode @@ -101,7 +100,6 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql` } fixedperiod: timetickets( where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, employeeid: { _eq: $employeeid } } - order_by: { date: desc_nulls_first } ) { actualhrs ciecacode