From 53ef048f6f89b1384bccb46dc532514d68eea8f7 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Fri, 8 Mar 2024 11:24:41 -0800 Subject: [PATCH 1/2] Correct Sorters Signed-off-by: Allan Carr --- .../accounting-payables-table.component.jsx | 3 --- .../accounting-payments-table.component.jsx | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx index d8b477005..1110ddc37 100644 --- a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx +++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx @@ -138,7 +138,6 @@ export function AccountingPayablesTableComponent({ title: t("exportlogs.labels.attempts"), dataIndex: "attempts", key: "attempts", - render: (text, record) => ( ), @@ -147,8 +146,6 @@ export function AccountingPayablesTableComponent({ title: t("general.labels.actions"), dataIndex: "actions", key: "actions", - sorter: (a, b) => a.clm_total - b.clm_total, - render: (text, record) => ( - alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)), + alphaSort( + OwnerNameDisplayFunction(a.job), + OwnerNameDisplayFunction(b.job) + ), sortOrder: state.sortedInfo.columnKey === "owner" && state.sortedInfo.order, render: (text, record) => { @@ -146,8 +149,6 @@ export function AccountingPayablesTableComponent({ title: t("general.labels.actions"), dataIndex: "actions", key: "actions", - sorter: (a, b) => a.clm_total - b.clm_total, - render: (text, record) => ( Date: Fri, 8 Mar 2024 11:32:48 -0800 Subject: [PATCH 2/2] Bring in line with other components Signed-off-by: Allan Carr --- .../production-list-columns.data.js | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js index 559d32ed8..824203975 100644 --- a/client/src/components/production-list-columns/production-list-columns.data.js +++ b/client/src/components/production-list-columns/production-list-columns.data.js @@ -1,10 +1,5 @@ -import { - BorderOutlined, - BranchesOutlined, - CheckSquareOutlined, - PauseCircleOutlined, -} from "@ant-design/icons"; -import { Space, Tooltip } from "antd"; +import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons"; +import { Checkbox, Space, Tooltip } from "antd"; import i18n from "i18next"; import moment from "moment"; import { Link } from "react-router-dom"; @@ -312,12 +307,9 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => { ], onFilter: (value, record) => value.includes(record.special_coverage_policy), - render: (text, record) => - record.special_coverage_policy === true ? ( - - ) : ( - - ), + render: (text, record) => ( + + ), }, {