IO-875 Time Tickets Sorting
This commit is contained in:
@@ -42,7 +42,7 @@ export default function TimeTicketList({
|
||||
title: t("timetickets.fields.date"),
|
||||
dataIndex: "date",
|
||||
key: "date",
|
||||
sorter: (a, b) => (a.date = b.date),
|
||||
sorter: (a, b) => a.date - b.date,
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
|
||||
render: (text, record) => <DateFormatter>{record.date}</DateFormatter>,
|
||||
@@ -52,7 +52,8 @@ export default function TimeTicketList({
|
||||
dataIndex: "employee",
|
||||
key: "employee",
|
||||
sorter: (a, b) => alphaSort(a.employee.last_name, b.employee.last_name),
|
||||
sortOrder: state.sortedInfo.columnKey === "vin" && state.sortedInfo.order,
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "employee" && state.sortedInfo.order,
|
||||
render: (text, record) =>
|
||||
`${record.employee.first_name} ${record.employee.last_name}`,
|
||||
},
|
||||
@@ -66,7 +67,7 @@ export default function TimeTicketList({
|
||||
? t(record.cost_center)
|
||||
: record.cost_center,
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
|
||||
state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order,
|
||||
filters:
|
||||
timetickets
|
||||
.map((l) => l.cost_center)
|
||||
@@ -100,7 +101,7 @@ export default function TimeTicketList({
|
||||
title: t("timetickets.fields.memo"),
|
||||
dataIndex: "memo",
|
||||
key: "memo",
|
||||
sorter: (a, b) => a.memo - b.memo,
|
||||
sorter: (a, b) => alphaSort(a.memo, b.memo),
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
|
||||
render: (text, record) =>
|
||||
@@ -110,9 +111,7 @@ export default function TimeTicketList({
|
||||
title: t("timetickets.fields.clockon"),
|
||||
dataIndex: "clockon",
|
||||
key: "clockon",
|
||||
sorter: (a, b) => a.clockon - b.clockon,
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "clockon" && state.sortedInfo.order,
|
||||
|
||||
render: (text, record) => (
|
||||
<DateTimeFormatter>{record.clockon}</DateTimeFormatter>
|
||||
),
|
||||
@@ -121,20 +120,15 @@ export default function TimeTicketList({
|
||||
title: t("timetickets.fields.clockoff"),
|
||||
dataIndex: "clockoff",
|
||||
key: "clockoff",
|
||||
sorter: (a, b) => a.clockoff - b.clockoff,
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "clockoff" && state.sortedInfo.order,
|
||||
|
||||
render: (text, record) => (
|
||||
<DateTimeFormatter>{record.clockoff}</DateTimeFormatter>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: t("timetickets.fields.clockhours"),
|
||||
dataIndex: "clockoff",
|
||||
key: "clockoff",
|
||||
sorter: (a, b) => a.clockoff - b.clockoff,
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "clockoff" && state.sortedInfo.order,
|
||||
dataIndex: "clockhours",
|
||||
key: "clockhours",
|
||||
render: (text, record) => {
|
||||
if (record.clockoff && record.clockon)
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user