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

Merged in feature/IO-3369-Fix-Parts-Status-List-Component (pull request #2559)

Browse Source 
feature/IO-3369-Fix-Parts-Status-List-Component - Add Fixes
This commit is contained in:
Dave Richer
2025-09-11 19:58:28 +00:00
parent fe78f5c7ff 3fcb36a28e
commit 38932f4bf9
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
View File

@@ -10,9 +10,12 @@ const mapStateToProps = createStructuredSelector({
const mapDispatchToProps = () => ({ const mapDispatchToProps = () => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
}); });
export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount); export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
export function JobPartsQueueCount({ bodyshop, parts, style }) { export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
const partsStatus = useMemo(() => { const partsStatus = useMemo(() => {
if (!parts) return null; if (!parts) return null;
return parts.reduce( return parts.reduce(
@@ -35,35 +38,34 @@ export function JobPartsQueueCount({ bodyshop, parts, style }) {
}, [bodyshop, parts]); }, [bodyshop, parts]);
if (!parts) return null; if (!parts) return null;
return ( return (
<Row style={style}> <Row>
<Col span={4}> <Col {...defaultColLayout}>
<Tooltip title="Total"> <Tooltip title="Total">
<Tag>{partsStatus.total}</Tag> <Tag>{partsStatus.total}</Tag>
</Tooltip> </Tooltip>
</Col> </Col>
<Col span={4}> <Col {...defaultColLayout}>
<Tooltip title="No Status"> <Tooltip title="No Status">
<Tag color="gold">{partsStatus["null"]}</Tag> <Tag color="gold">{partsStatus["null"]}</Tag>
</Tooltip> </Tooltip>
</Col> </Col>
<Col span={4}> <Col {...defaultColLayout}>
<Tooltip title={bodyshop.md_order_statuses.default_ordered}> <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
<Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag> <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
</Tooltip> </Tooltip>
</Col> </Col>
<Col span={4}> <Col {...defaultColLayout}>
<Tooltip title={bodyshop.md_order_statuses.default_received}> <Tooltip title={bodyshop.md_order_statuses.default_received}>
<Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag> <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
</Tooltip> </Tooltip>
</Col> </Col>
<Col span={4}> <Col {...defaultColLayout}>
<Tooltip title={bodyshop.md_order_statuses.default_returned}> <Tooltip title={bodyshop.md_order_statuses.default_returned}>
<Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag> <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
</Tooltip> </Tooltip>
</Col> </Col>
<Col span={4}> <Col {...defaultColLayout}>
<Tooltip title={bodyshop.md_order_statuses.default_bo}> <Tooltip title={bodyshop.md_order_statuses.default_bo}>
<Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag> <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
</Tooltip> </Tooltip>

2
client/src/components/parts-queue-list/parts-queue.list.component.jsx
View File

@@ -233,7 +233,7 @@ export function PartsQueueListComponent({ bodyshop }) {
title: t("jobs.fields.partsstatus"), title: t("jobs.fields.partsstatus"),
dataIndex: "partsstatus", dataIndex: "partsstatus",
key: "partsstatus", key: "partsstatus",
render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} /> render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
}, },
{ {
title: t("jobs.fields.comment"), title: t("jobs.fields.comment"),

2
client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
View File

@@ -147,7 +147,7 @@ export function SimplifiedPartsJobsListComponent({
title: t("jobs.fields.partsstatus"), title: t("jobs.fields.partsstatus"),
dataIndex: "partsstatus", dataIndex: "partsstatus",
key: "partsstatus", key: "partsstatus",
render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} /> render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
}, },
{ {
title: t("jobs.fields.comment"), title: t("jobs.fields.comment"),