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 ba7cf60fc..84e2ae4ab 100644 --- a/client/src/graphql/timetickets.queries.js +++ b/client/src/graphql/timetickets.queries.js @@ -2,7 +2,7 @@ import { gql } from "@apollo/client"; export const QUERY_TICKETS_BY_JOBID = gql` query QUERY_TICKETS_BY_JOBID($jobid: uuid!) { - timetickets(where: { jobid: { _eq: $jobid } }, order_by: { date: desc_nulls_first }) { + timetickets(where: { jobid: { _eq: $jobid } }) { actualhrs cost_center ciecacode @@ -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 @@ -333,7 +331,6 @@ export const UPDATE_TIME_TICKETS = gql` export const QUERY_ACTIVE_TIME_TICKETS = gql` query QUERY_ACTIVE_TIME_TICKETS($employeeId: uuid) { timetickets( - order_by: { date: desc_nulls_first } where: { _and: { clockoff: { _is_null: true }