diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index c16554b90..b17a11aff 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -13301,6 +13301,27 @@ + + alt_transport + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + ca_gst_registrant false diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx index 5fb15a73c..bcc93ce3e 100644 --- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx +++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx @@ -72,9 +72,12 @@ export default function ProductionBoardCard(card) { - + {card.scheduled_completion} + +
{card.alt_transport || ""}
+
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 084565bcf..2a5c4d1e0 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 @@ -156,6 +156,13 @@ const r = [ ellipsis: true, sorter: (a, b) => alphaSort(a.csr, b.csr), }, + { + title: i18n.t("jobs.fields.alt_transport"), + dataIndex: "alt_transport", + key: "alt_transport", + ellipsis: true, + sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport), + }, { title: i18n.t("jobs.fields.status"), dataIndex: "status", diff --git a/client/src/components/schedule-event/schedule-event.at.component.jsx b/client/src/components/schedule-event/schedule-event.at.component.jsx index 79d44e220..6de4942c6 100644 --- a/client/src/components/schedule-event/schedule-event.at.component.jsx +++ b/client/src/components/schedule-event/schedule-event.at.component.jsx @@ -1,6 +1,6 @@ import React from "react"; import { useMutation } from "react-apollo"; -import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries"; +import { UPDATE_JOB } from "../../graphql/jobs.queries"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; @@ -16,12 +16,12 @@ const mapDispatchToProps = (dispatch) => ({ }); export function ScheduleAtChange({ bodyshop, event }) { - const [updateAppointment] = useMutation(UPDATE_APPOINTMENT); + const [updateJob] = useMutation(UPDATE_JOB); const { t } = useTranslation(); const onClick = async ({ key }) => { - const result = await updateAppointment({ - variables: { appid: event.id, app: { alt_transport: key } }, + const result = await updateJob({ + variables: { jobId: event.job.id, job: { alt_transport: key } }, }); if (!!!result.errors) { @@ -35,7 +35,10 @@ export function ScheduleAtChange({ bodyshop, event }) { } }; const menu = ( - + {bodyshop.appt_alt_transport && bodyshop.appt_alt_transport.map((alt) => ( {alt} diff --git a/client/src/components/schedule-event/schedule-event.component.jsx b/client/src/components/schedule-event/schedule-event.component.jsx index d7b0b795b..bb79a4aaf 100644 --- a/client/src/components/schedule-event/schedule-event.component.jsx +++ b/client/src/components/schedule-event/schedule-event.component.jsx @@ -64,8 +64,8 @@ export function ScheduleEventComponent({ {(event.job && event.job.ownr_ph1) || ""} - - {event.alt_transport || ""} + + {(event.job && event.job.alt_transport) || ""}
@@ -134,8 +134,8 @@ export function ScheduleEventComponent({ (event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || "0" })`} - {event.alt_transport && ( -
{event.alt_transport}
+ {event.job && event.job.alt_transport && ( +
{event.job.alt_transport}
)} ) : ( diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx index 5c1421dfa..bfc7fde7f 100644 --- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx +++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx @@ -146,7 +146,7 @@ export function ScheduleJobModalComponent({