admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-875 Time Tickets Sorting

Browse Source
This commit is contained in:
Patrick Fic
2021-04-12 14:19:27 -07:00
parent 29cd5a28e0
commit d9c5b0186e
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/src/components/time-ticket-list/time-ticket-list.component.jsx
View File

@@ -42,7 +42,7 @@ export default function TimeTicketList({
title: t("timetickets.fields.date"), title: t("timetickets.fields.date"),
dataIndex: "date", dataIndex: "date",
key: "date", key: "date",
sorter: (a, b) => (a.date = b.date), sorter: (a, b) => a.date - b.date,
sortOrder: sortOrder:
state.sortedInfo.columnKey === "date" && state.sortedInfo.order, state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
render: (text, record) => <DateFormatter>{record.date}</DateFormatter>, render: (text, record) => <DateFormatter>{record.date}</DateFormatter>,
@@ -52,7 +52,8 @@ export default function TimeTicketList({
dataIndex: "employee", dataIndex: "employee",
key: "employee", key: "employee",
sorter: (a, b) => alphaSort(a.employee.last_name, b.employee.last_name), 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) => render: (text, record) =>
`${record.employee.first_name} ${record.employee.last_name}`, `${record.employee.first_name} ${record.employee.last_name}`,
}, },
@@ -66,7 +67,7 @@ export default function TimeTicketList({
? t(record.cost_center) ? t(record.cost_center)
: record.cost_center, : record.cost_center,
sortOrder: sortOrder:
state.sortedInfo.columnKey === "status" && state.sortedInfo.order, state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order,
filters: filters:
timetickets timetickets
.map((l) => l.cost_center) .map((l) => l.cost_center)
@@ -100,7 +101,7 @@ export default function TimeTicketList({
title: t("timetickets.fields.memo"), title: t("timetickets.fields.memo"),
dataIndex: "memo", dataIndex: "memo",
key: "memo", key: "memo",
sorter: (a, b) => a.memo - b.memo, sorter: (a, b) => alphaSort(a.memo, b.memo),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "memo" && state.sortedInfo.order, state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
render: (text, record) => render: (text, record) =>
@@ -110,9 +111,7 @@ export default function TimeTicketList({
title: t("timetickets.fields.clockon"), title: t("timetickets.fields.clockon"),
dataIndex: "clockon", dataIndex: "clockon",
key: "clockon", key: "clockon",
sorter: (a, b) => a.clockon - b.clockon,
sortOrder:
state.sortedInfo.columnKey === "clockon" && state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
<DateTimeFormatter>{record.clockon}</DateTimeFormatter> <DateTimeFormatter>{record.clockon}</DateTimeFormatter>
), ),
@@ -121,20 +120,15 @@ export default function TimeTicketList({
title: t("timetickets.fields.clockoff"), title: t("timetickets.fields.clockoff"),
dataIndex: "clockoff", dataIndex: "clockoff",
key: "clockoff", key: "clockoff",
sorter: (a, b) => a.clockoff - b.clockoff,
sortOrder:
state.sortedInfo.columnKey === "clockoff" && state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
<DateTimeFormatter>{record.clockoff}</DateTimeFormatter> <DateTimeFormatter>{record.clockoff}</DateTimeFormatter>
), ),
}, },
{ {
title: t("timetickets.fields.clockhours"), title: t("timetickets.fields.clockhours"),
dataIndex: "clockoff", dataIndex: "clockhours",
key: "clockoff", key: "clockhours",
sorter: (a, b) => a.clockoff - b.clockoff,
sortOrder:
state.sortedInfo.columnKey === "clockoff" && state.sortedInfo.order,
render: (text, record) => { render: (text, record) => {
if (record.clockoff && record.clockon) if (record.clockoff && record.clockon)
return ( return (