From 4228d1f13d5b2a86a8156bf0ddc4e52f3b0a9aa4 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 20 Jan 2021 08:56:06 -0800 Subject: [PATCH] Added plate number to CC list views. IO-592 --- .../contracts-list/contracts-list.component.jsx | 8 +++++--- .../courtesy-cars-list/courtesy-cars-list.component.jsx | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/client/src/components/contracts-list/contracts-list.component.jsx b/client/src/components/contracts-list/contracts-list.component.jsx index cc3ecfe9f..19b095c5b 100644 --- a/client/src/components/contracts-list/contracts-list.component.jsx +++ b/client/src/components/contracts-list/contracts-list.component.jsx @@ -62,9 +62,11 @@ export default function ContractsList({ loading, contracts, refetch, total }) { //sortOrder: // state.sortedInfo.columnKey === "status" && state.sortedInfo.order, render: (text, record) => ( - {`${record.courtesycar.fleetnumber} - ${record.courtesycar.year} ${record.courtesycar.make} ${record.courtesycar.model}`} + {`${ + record.courtesycar.year + } ${record.courtesycar.make} ${record.courtesycar.model} ${ + record.courtesycar.plate ? `(${record.courtesycar.plate})` : "" + }`} ), }, { diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx index 1c8ada4dc..785d1e871 100644 --- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx +++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx @@ -75,6 +75,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) { sortOrder: state.sortedInfo.columnKey === "model" && state.sortedInfo.order, }, + { + title: t("courtesycars.fields.plate"), + dataIndex: "plate", + key: "plate", + sorter: (a, b) => alphaSort(a.plate, b.plate), + sortOrder: + state.sortedInfo.columnKey === "plate" && state.sortedInfo.order, + }, { title: t("courtesycars.labels.outwith"), dataIndex: "outwith",