diff --git a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx index 8ba00d309..da4e1bbab 100644 --- a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx +++ b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx @@ -146,7 +146,8 @@ const JobRelatedTicketsTable = ({ title: t("employees.labels.name"), dataIndex: "empname", key: "empname", - sorter: (a, b) => alphaSort(a.empname, b.empname), + sorter: (a, b) => + alphaSort(a.item.employee.last_name, b.item.employee.last_name), sortOrder: state.sortedInfo.columnKey === "empname" && state.sortedInfo.order, render: (text, record) => @@ -172,7 +173,9 @@ const JobRelatedTicketsTable = ({ title: t("timetickets.fields.efficiency"), dataIndex: "total", key: "total", - sorter: (a, b) => a.total - b.total, + sorter: (a, b) => + (a.actHrs === 0 || !a.actHrs ? 0 : (a.prodHrs / a.actHrs) * 100) - + (b.actHrs === 0 || !b.actHrs ? 0 : (b.prodHrs / b.actHrs) * 100), sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order, render: (text, record) =>