diff --git a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx index c12a7c6c9..e4a1981a5 100644 --- a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx @@ -80,14 +80,14 @@ const ModelInfoToolTip = ({ metadata, cardSettings }) => - {metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc ? ( - `${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}` + {metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc || metadata.v_color ? ( + `${metadata.v_model_yr || ""} ${metadata.v_color || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}` ) : (   )} diff --git a/client/src/components/production-list-columns/production-list-columns.data.jsx b/client/src/components/production-list-columns/production-list-columns.data.jsx index ff7b4c517..cca63edb6 100644 --- a/client/src/components/production-list-columns/production-list-columns.data.jsx +++ b/client/src/components/production-list-columns/production-list-columns.data.jsx @@ -140,13 +140,11 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo sortOrder: state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order, render: (text, record) => technician ? ( - <>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${ - record.v_color || "" - } ${record.plate_no || ""}`} + <>{`${record.v_model_yr || ""} ${record.v_color || ""}${record.v_make_desc || ""} ${record.v_model_desc || ""} ${record.plate_no || ""}`} ) : ( - {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${ - record.v_model_desc || "" - } ${record.v_color || ""} ${record.plate_no || ""}`} + {`${record.v_model_yr || ""} ${record.v_color || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${record.plate_no || ""}`} ) }, { @@ -621,7 +619,7 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo sortOrder: state.sortedInfo.columnKey === "dms_id" && state.sortedInfo.order } ] - : []), + : []) ]; }; export default productionListColumnsData;