From 121e7b30489eb50b30e1998588654293362d0624 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Thu, 6 May 2021 15:16:09 -0700 Subject: [PATCH] IO-1020 Show CCC on job detail header. --- bodyshop_translations.babel | 21 +++++++++++++++++++ .../jobs-detail-header.component.jsx | 11 ++++++++++ .../jobs-detail-rates.component.jsx | 1 - client/src/graphql/jobs.queries.js | 1 + client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + 7 files changed, 36 insertions(+), 1 deletion(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 51447326a..ee1956453 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -20652,6 +20652,27 @@ + + contracts + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + cost false diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx index 85a7d5083..1c83f06dd 100644 --- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx +++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx @@ -81,6 +81,17 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) { {job.alt_transport} + {job.cccontracts.length > 0 && ( + + {job.cccontracts.map((c) => ( + {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`} + ))} + + )} + {(job.inproduction || jobInPostProduction) && ( diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx index 4ca035382..06f9b1f69 100644 --- a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx +++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx @@ -15,7 +15,6 @@ const mapStateToProps = createStructuredSelector({ }); export function JobsDetailRates({ jobRO, form, job }) { - console.log(form.getFieldsValue()); const { t } = useTranslation(); return (
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 86106ebfd..c8fc0b778 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -574,6 +574,7 @@ export const GET_JOB_BY_PK = gql` model year plate + fleetnumber } } cieca_ttl diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 60e3ec3ed..b25d5634c 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1238,6 +1238,7 @@ "checklistdocuments": "Checklist Documents", "checklists": "Checklists", "closeconfirm": "Are you sure you want to close this job? This cannot be easily undone.", + "contracts": "CC Contracts", "cost": "Cost", "cost_labor": "Cost - Labor", "cost_parts": "Cost - Parts", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index f4add141e..61f6f573e 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1238,6 +1238,7 @@ "checklistdocuments": "", "checklists": "", "closeconfirm": "", + "contracts": "", "cost": "", "cost_labor": "", "cost_parts": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index b441faf21..8628dfc9c 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1238,6 +1238,7 @@ "checklistdocuments": "", "checklists": "", "closeconfirm": "", + "contracts": "", "cost": "", "cost_labor": "", "cost_parts": "",